- up to 1.2.6

diff --git a/cacti-ss_disk-array-indices.patch b/cacti-ss_disk-array-indices.patch
deleted file mode 100644 (file)
index 8806e3e..0000000
--- a/cacti-ss_disk-array-indices.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./scripts/ss_host_disk.php 2008-10-05 18:19:17.656634044 +0300
-+++ ./scripts/ss_host_disk.php 2008-10-07 11:07:10.120905407 +0300
-@@ -86,12 +86,16 @@ function ss_host_disk($hostname, $host_i
-                               $snmp_auth_password, $snmp_auth_protocol, $snmp_priv_passphrase, $snmp_priv_protocol,
-                               $snmp_context, $snmp_port, $snmp_timeout, $ping_retries, $max_oids, SNMP_POLLER)
-                       );
-+              if (empty($arr_index))
-+                      return;
- 
-               $arr = ss_host_disk_reindex(
-                       cacti_snmp_walk($hostname, $snmp_community, $oids[$arg], $snmp_version, $snmp_auth_username,
-                               $snmp_auth_password, $snmp_auth_protocol, $snmp_priv_passphrase, $snmp_priv_protocol,
-                               $snmp_context, $snmp_port, $snmp_timeout, $ping_retries, $max_oids, SNMP_POLLER)
-                       );
-+              if (empty($arr))
-+                      return; // we likely already got error already earlier, like "Timeout: No Response from localhost:161"
- 
-               for ($i=0;($i<sizeof($arr_index));$i++) {
-                       print $arr_index[$i] . '!' . $arr[$i] . "\n";
-

diff --git a/cacti.spec b/cacti.spec
index c2490c624e9f0cd12a5ad570fe8ecff675bd9d28..c1b7a125694b181c449b946ac9533e840395e8c4 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -4,12 +4,12 @@
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
-Version:       1.2.1
-Release:       2
+Version:       1.2.6
+Release:       1
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: dd90a6c851a14cc4d4019b32368a493f
+# Source0-md5: 87b19877f1a9f4017d07f464150f6296
 Source2:       %{name}.crontab
 Source3:       %{name}-apache.conf
 Source4:       %{name}-lighttpd.conf
@@ -22,7 +22,7 @@ Patch3:               %{name}-ioerror.patch
 Patch4:                %{name}-webroot.patch
 Patch5:                %{name}-linux_memory.patch
 Patch6:                %{name}-log-verbosity.patch
-Patch7:                %{name}-ss_disk-array-indices.patch
+
 Patch8:                host_name-url.patch
 # http://www.cacti.net/download_patches.php
 # Patch100: ..
@@ -148,7 +148,7 @@ Dokumentacja do Cacti w formacie HTML.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
+
 # ?
 # %patch8 -p1