[packages/cacti] - up to 1.1.36

[arekm]

commit d848f1538e57c7590ee935d0e0046c259da64822
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Mar 3 20:50:50 2018 +0100

    - up to 1.1.36

 cacti-config.patch | 9 ++++++---
 cacti.spec         | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/cacti.spec b/cacti.spec
index 4ad19d7..3fdf662 100644
--- 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.1.35
+Version:	1.1.36
 Release:	1
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://www.cacti.net/downloads/%{name}-%{version}.tar.gz
-# Source0-md5:	e5b19a34480d262d520b6e9d009e738d
+# Source0-md5:	dba0422ba64c6ccc312b74ae2fa58bf5
 Source2:	%{name}.crontab
 Source3:	%{name}-apache.conf
 Source4:	%{name}-lighttpd.conf
diff --git a/cacti-config.patch b/cacti-config.patch
index 15d2562..cc6e304 100644
--- a/cacti-config.patch
+++ b/cacti-config.patch
@@ -1,10 +1,13 @@
 --- cacti-0.8.7b/include/global.php	2008-10-05 04:38:29.740276226 +0300
 +++ cacti-0.8.7g/include/global.php	2010-12-13 12:10:44.312310245 +0200
-@@ -65,7 +65,7 @@ $url_path = '/cacti/';
+@@ -64,10 +64,7 @@ $url_path = '/cacti/';
+ /* allow upto 5000 items to be selected */
  ini_set('max_input_vars', '5000');
  
- /* Include configuration */
--include(dirname(__FILE__) . '/config.php');
+-/* Include configuration, or use the defaults */
+-if (file_exists(dirname(__FILE__) . '/config.php')) {
+-	include(dirname(__FILE__) . '/config.php');
+-}
 +require '/etc/webapps/cacti/config.php';
  
  if (isset($config['cacti_version'])) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cacti.git/commitdiff/d848f1538e57c7590ee935d0e0046c259da64822