From 40e2932cdedd98be827d39de1c12b9625f668a74 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Fri, 1 May 2020 01:23:20 +0200 Subject: [PATCH] - up to 1.2.11 --- cacti-webroot.patch | 11 +++++------ cacti.spec | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cacti-webroot.patch b/cacti-webroot.patch index 5936c1f..c87b719 100644 --- 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 ea84a15..ba8143d 100644 --- 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 -- 2.44.0