net-mgmt/cacti: Update to 1.1.36

This is a bugfix release.

PR:		226334
Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)
Approved by:	tcberner (mentor, implicit)

5 files changed, 12 insertions, 20 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index 179e48a36992..e5950c736fd1 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cacti
-PORTVERSION=	1.1.35
+PORTVERSION=	1.1.36
 CATEGORIES=	net-mgmt www
 MASTER_SITES=	http://www.cacti.net/downloads/ \
 		ftp://ftpmirror.uk/freebsd-ports/cacti/
diff --git a/net-mgmt/cacti/distinfo b/net-mgmt/cacti/distinfo
index d117b94cb61b..6e2ac2400046 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519043380
-SHA256 (cacti-1.1.35.tar.gz) = eea42008adb699d900bd4555b0c34691389015e0c9dac43fc07e9ddb9a537ffd
-SIZE (cacti-1.1.35.tar.gz) = 8999651
+TIMESTAMP = 1520108099
+SHA256 (cacti-1.1.36.tar.gz) = 9a9cbe54b51a4161ddc84234a7e4210dae279375fd2b1715511d426672327a11
+SIZE (cacti-1.1.36.tar.gz) = 9018560
diff --git a/net-mgmt/cacti/files/patch-include__global_settings.php b/net-mgmt/cacti/files/patch-include__global_settings.php
index 3782f5ce24a9..61f26937a64d 100644
--- a/net-mgmt/cacti/files/patch-include__global_settings.php
+++ b/net-mgmt/cacti/files/patch-include__global_settings.php
@@ -1,10 +1,10 @@
---- include/global_settings.php.orig	2017-08-13 04:06:37 UTC
+--- include/global_settings.php.orig	2018-02-26 01:12:03 UTC
 +++ include/global_settings.php
-@@ -144,9 +144,9 @@ $settings = array(
+@@ -143,9 +143,9 @@ $settings = array(
  			),
  		'path_cactilog' => array(
  			'friendly_name' => __('Cacti Log Path'),
--			'description' => __('The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)'),
+-			'description' => __('The path to your Cacti log file (if blank, defaults to &lt;path_cacti&gt;/log/cacti.log)'),
 +			'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),
  			'method' => 'filepath',
 -			'default' => $config['base_path'] . '/log/cacti.log',
diff --git a/net-mgmt/cacti/files/patch-poller_maintenance.php b/net-mgmt/cacti/files/patch-poller_maintenance.php
index 7c7fb0658b57..f2e397ec4d1e 100644
--- a/net-mgmt/cacti/files/patch-poller_maintenance.php
+++ b/net-mgmt/cacti/files/patch-poller_maintenance.php
@@ -1,19 +1,11 @@
---- poller_maintenance.php.orig	2017-08-13 04:06:37 UTC
+--- poller_maintenance.php.orig	2018-02-26 01:12:04 UTC
 +++ poller_maintenance.php
-@@ -197,14 +197,14 @@ function logrotate_rotatenow () {
+@@ -223,7 +223,7 @@ function logrotate_rotatenow () {
  
  	$log = read_config_option('path_cactilog');
  	if ($log == '') {
 -		$log = $config['base_path'] . '/log/cacti.log';
-+		$log = '/var/log/cacti/log';
++		$log = /var/log/cacti/log';
  	}
  
- 	set_config_option('logrotate_lastrun', time());
- 
- 	clearstatcache();
- 
--	if (is_writable(dirname($log) . '/') && is_writable($log)) {
-+	if (is_writable('/var/log/cacti') && is_writable($log)) {
- 		$perms = octdec(substr(decoct( fileperms($log) ), 2));
- 		$owner = fileowner($log);
- 		$group = filegroup($log);
+ 	$run_time = time();
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index fcdb2f0a737d..f1946b8d3e5f 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -436,7 +436,6 @@
 %%CACTIDIR%%/include/js/pace.js
 %%CACTIDIR%%/include/js/screenfull.js
 %%CACTIDIR%%/include/layout.js
-%%CACTIDIR%%/include/main.css
 %%CACTIDIR%%/include/phpgettext/gettext.php
 %%CACTIDIR%%/include/phpgettext/streams.php
 %%CACTIDIR%%/include/phpmailer/LICENSE
@@ -1148,6 +1147,7 @@
 %%CACTIDIR%%/install/upgrades/1_1_31.php
 %%CACTIDIR%%/install/upgrades/1_1_34.php
 %%CACTIDIR%%/install/upgrades/1_1_35.php
+%%CACTIDIR%%/install/upgrades/1_1_36.php
 %%CACTIDIR%%/install/upgrades/index.php
 %%CACTIDIR%%/lib/aggregate.php
 %%CACTIDIR%%/lib/api_aggregate.php