- up to 1.2.11

diff --git a/cacti-webroot.patch b/cacti-webroot.patch
index 5936c1f011386be74324f924fcf48b4df8cc82e8..c87b7198949579e053b30777291ec5ba75d05cc7 100644 (file)
--- a/cacti-webroot.patch
+++ b/cacti-webroot.patch
@@ -1,12 +1,11 @@
---- /poller.php~       2008-10-05 16:54:15.000000000 +0300
-+++ /poller.php        2008-10-05 16:57:05.946911539 +0300
-@@ -424,7 +424,7 @@ while ($poller_runs_completed < $poller_
-       $started_processes = 0;
+--- cacti-1.2.11/poller.php~   2020-05-01 01:21:10.000000000 +0200
++++ cacti-1.2.11/poller.php    2020-05-01 01:22:05.873227629 +0200
+@@ -438,7 +438,7 @@ while ($poller_runs_completed < $poller_
        $first_host        = 0;
        $last_host         = 0;
+       $rrds_processed    = 0;
 -      $webroot           = addslashes(($config['cacti_server_os'] == 'win32') ? strtr(strtolower(substr(dirname(__FILE__), 0, 1)) . substr(dirname(__FILE__), 1),"\\", '/') : dirname(__FILE__));
-+      $webroot = $config['base_path'];
++      $webroot = $config['base_path';
  
        // update web paths for the poller
        set_config_option('path_webroot', $webroot);
-

diff --git a/cacti.spec b/cacti.spec
index ea84a15c753ac0bbcb16dc6d0522086d5f5f4e79..ba8143daccd9bf053beda4ec0f8edda5bb500236 100644 (file)
--- a/cacti.spec
+++ b/cacti.spec
@@ -3,12 +3,12 @@
 Summary:       Cacti is a PHP frontend for rrdtool
 Summary(pl.UTF-8):     Cacti - frontend w PHP do rrdtoola
 Name:          cacti
-Version:       1.2.9
+Version:       1.2.11
 Release:       1
 License:       GPL v2
 Group:         Applications/WWW
 Source0:       http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5: 1561dac3fddc4385389fe64b5a7c7067
+# Source0-md5: 1adf5f97d6ddbfc76aaef4e927b8bd8a
 Source2:       %{name}.crontab
 Source3:       %{name}-apache.conf
 Source4:       %{name}-lighttpd.conf