Update to 1.1.7
This commit is contained in:
parent
3adda01f08
commit
aec77e760a
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,3 +13,4 @@
|
|||||||
/cacti-1.1.4.tar.gz
|
/cacti-1.1.4.tar.gz
|
||||||
/cacti-1.1.5.tar.gz
|
/cacti-1.1.5.tar.gz
|
||||||
/cacti-1.1.6.tar.gz
|
/cacti-1.1.6.tar.gz
|
||||||
|
/cacti-1.1.7.tar.gz
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
From f76503b790d059c59070c69e07a1ebe882aff30f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Patrick <patrick@patrickrademaker.nl>
|
|
||||||
Date: Sat, 13 May 2017 00:01:13 +0200
|
|
||||||
Subject: [PATCH] Bugfix for issue#687
|
|
||||||
|
|
||||||
--- a/lib/data_query.php
|
|
||||||
+++ b/lib/data_query.php
|
|
||||||
@@ -762,7 +762,7 @@ function data_query_rewrite_indexes(&$errmsg, $host_id, $snmp_query_id, $rewrite
|
|
||||||
foreach($oid_items as $item){
|
|
||||||
$matches = array();
|
|
||||||
if(preg_match('/^\|query_([^|]+)\|$/', $item, $matches)){
|
|
||||||
- $iv = mysql_real_escape_string($matches[1]);
|
|
||||||
+ $iv = db_qstr($matches[1]);
|
|
||||||
if(is_array($fields_processed) && !in_array($iv, $fields_processed)){
|
|
||||||
$errmsg[] = "rewrite_index='$rewrite_index': '$iv' is not processed yet, could not use it as index source";
|
|
||||||
continue;
|
|
@ -1,6 +1,6 @@
|
|||||||
Name: cacti
|
Name: cacti
|
||||||
Version: 1.1.6
|
Version: 1.1.7
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: An rrd based graphing tool
|
Summary: An rrd based graphing tool
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.cacti.net/
|
URL: http://www.cacti.net/
|
||||||
@ -9,7 +9,6 @@ Source1: cacti-httpd.conf
|
|||||||
Source2: cacti.logrotate
|
Source2: cacti.logrotate
|
||||||
Source3: cacti.README.fedora
|
Source3: cacti.README.fedora
|
||||||
Source4: %{name}.cron
|
Source4: %{name}.cron
|
||||||
Patch0: cacti-fix-php7-db-access.patch
|
|
||||||
|
|
||||||
# Requires PHP 5.3+
|
# Requires PHP 5.3+
|
||||||
Requires: php(language) >= 5.3
|
Requires: php(language) >= 5.3
|
||||||
@ -70,7 +69,6 @@ driven.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# cacti's build is a noop
|
# cacti's build is a noop
|
||||||
@ -164,6 +162,9 @@ fi
|
|||||||
%attr(-,root,root) %{_localstatedir}/lib/%{name}/lib
|
%attr(-,root,root) %{_localstatedir}/lib/%{name}/lib
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 22 2017 Morten Stevens <mstevens@fedoraproject.org> - 1.1.7-1
|
||||||
|
- Update to 1.1.7
|
||||||
|
|
||||||
* Sat May 13 2017 Morten Stevens <mstevens@fedoraproject.org> - 1.1.6-2
|
* Sat May 13 2017 Morten Stevens <mstevens@fedoraproject.org> - 1.1.6-2
|
||||||
- Fix PHP requirements
|
- Fix PHP requirements
|
||||||
- Cacti db access not compatible with PHP 7 (#1450578)
|
- Cacti db access not compatible with PHP 7 (#1450578)
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (cacti-1.1.6.tar.gz) = e8fd1fefb9060e9a246b04148593ad0b11cc0fba8ebc09e0e11d62586bf051df3a6ed8bca80d4eab4ead2b8a7cbc9de5bc8bfa404dfc9f5eac581b18365061b3
|
SHA512 (cacti-1.1.7.tar.gz) = 33c35d1f8d07478d40c756c87f6c1aad3d327e9b42bb4aa5131738ace4b6f9feef4a042b154c894f5a71ba627652e6f2eab286f023e1bf29abb88ed9c21b19f0
|
||||||
|
Loading…
Reference in New Issue
Block a user