MFH: r447324 r447970 r448430 r448588

- Update to 1.1.16

PR:		221205
Submitted by:	freebsd-ports@dan.me.uk(maintainer)

net-mgmt/cacti: Update to 1.1.17

- Regenerate patches

Changes:	https://www.cacti.net/release_notes.php?version=1.1.17

PR:		221499
Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)

net-mgmt/cacti: Update to 1.1.18

Changes:	https://www.cacti.net/release_notes.php?version=1.1.18

PR:		221669
Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)

net-mgmt/cacti: Update to 1.1.19

Changes:	https://www.cacti.net/release_notes.php?version=1.1.19

PR:		221693
Submitted by:	Submitted by:	Daniel Austin <freebsd-ports@dan.me.uk> (maintainer)

Approved by:	ports-secteam (with hat)

10 files changed, 26 insertions, 24 deletions

diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index cb7536007544..8496edc0b21f 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cacti
-PORTVERSION=	1.1.15
+PORTVERSION=	1.1.19
 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 6b3f08aed66f..3b21996fb3e9 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501116016
-SHA256 (cacti-1.1.15.tar.gz) = 5f0c5a1b7afd0d62fbc4f36f0017d485b8eb71d49b712d01c1ba2999ca7af9ac
-SIZE (cacti-1.1.15.tar.gz) = 8892187
+TIMESTAMP = 1503450536
+SHA256 (cacti-1.1.19.tar.gz) = 525c7d797df1361d921c99ab92b53725b9a40b8f2fb557f95958f0744acd5daf
+SIZE (cacti-1.1.19.tar.gz) = 8906595
diff --git a/net-mgmt/cacti/files/patch-include__global.php b/net-mgmt/cacti/files/patch-include__global.php
index 3119849553a9..9359b85e2555 100644
--- a/net-mgmt/cacti/files/patch-include__global.php
+++ b/net-mgmt/cacti/files/patch-include__global.php
@@ -1,6 +1,6 @@
---- include/global.php.orig	2017-04-26 00:30:09 UTC
+--- include/global.php.orig	2017-08-13 04:06:37 UTC
 +++ include/global.php
-@@ -131,7 +131,7 @@ if ($config['cacti_server_os'] == 'win32
+@@ -139,7 +139,7 @@ if ($config['cacti_server_os'] == 'win32') {
  	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
  }
  $config['include_path'] = dirname(__FILE__);
diff --git a/net-mgmt/cacti/files/patch-include__global_settings.php b/net-mgmt/cacti/files/patch-include__global_settings.php
index d1422d03c5d7..3782f5ce24a9 100644
--- a/net-mgmt/cacti/files/patch-include__global_settings.php
+++ b/net-mgmt/cacti/files/patch-include__global_settings.php
@@ -1,6 +1,6 @@
---- include/global_settings.php.orig	2017-04-26 00:30:09 UTC
+--- include/global_settings.php.orig	2017-08-13 04:06:37 UTC
 +++ include/global_settings.php
-@@ -135,9 +135,9 @@ $settings = array(
+@@ -144,9 +144,9 @@ $settings = array(
  			),
  		'path_cactilog' => array(
  			'friendly_name' => __('Cacti Log Path'),
diff --git a/net-mgmt/cacti/files/patch-install__functions.php b/net-mgmt/cacti/files/patch-install__functions.php
index 90a6c7fa7440..b8503f30b529 100644
--- a/net-mgmt/cacti/files/patch-install__functions.php
+++ b/net-mgmt/cacti/files/patch-install__functions.php
@@ -1,6 +1,6 @@
---- install/functions.php.orig	2017-04-26 00:30:09 UTC
+--- install/functions.php.orig	2017-08-13 04:06:37 UTC
 +++ install/functions.php
-@@ -421,7 +421,7 @@ function install_file_paths () {
+@@ -432,7 +432,7 @@ function install_file_paths () {
  	if (config_value_exists('path_cactilog')) {
  		$input['path_cactilog']['default'] = read_config_option('path_cactilog');
  	} else {
diff --git a/net-mgmt/cacti/files/patch-lib__clog_webapi.php b/net-mgmt/cacti/files/patch-lib__clog_webapi.php
index 205d5848928a..3020b29772cd 100644
--- a/net-mgmt/cacti/files/patch-lib__clog_webapi.php
+++ b/net-mgmt/cacti/files/patch-lib__clog_webapi.php
@@ -1,15 +1,15 @@
---- lib/clog_webapi.php.orig	2017-06-05 03:49:49 UTC
+--- lib/clog_webapi.php.orig	2017-08-13 04:06:37 UTC
 +++ lib/clog_webapi.php
-@@ -40,7 +40,7 @@ function clog_purge_logfile() {
- 	$logfile = read_config_option('path_cactilog');
+@@ -42,7 +42,7 @@ function clog_purge_logfile() {
+ 	$logfile   = read_config_option('path_cactilog');
  
  	if ($logfile == '') {
 -		$logfile = $config['base_path'] . '/log/cacti.log';
 +		$logfile = '/var/log/cacti/log';
  	}
  
- 	if (file_exists($logfile)) {
-@@ -70,7 +70,7 @@ function clog_view_logfile() {
+ 	$purgefile = dirname($logfile) . '/' . get_nfilter_request_var('filename');
+@@ -85,7 +85,7 @@ function clog_view_logfile() {
  			$logfile = $requestedFile;
  		}
  	} elseif ($logfile == '') {
diff --git a/net-mgmt/cacti/files/patch-lib__functions.php b/net-mgmt/cacti/files/patch-lib__functions.php
index 6fd755a70429..d4c5acaa47e2 100644
--- a/net-mgmt/cacti/files/patch-lib__functions.php
+++ b/net-mgmt/cacti/files/patch-lib__functions.php
@@ -1,6 +1,6 @@
---- lib/functions.php.orig	2017-04-26 00:30:09 UTC
+--- lib/functions.php.orig	2017-08-13 04:06:37 UTC
 +++ lib/functions.php
-@@ -594,7 +594,7 @@ function cacti_log($string, $output = fa
+@@ -615,7 +615,7 @@ function cacti_log($string, $output = false, $environ 
  	/* Log to Logfile */
  	if (($logdestination == 1 || $logdestination == 2) && read_config_option('log_verbosity') != POLLER_VERBOSITY_NONE) {
  		if ($logfile == '') {
diff --git a/net-mgmt/cacti/files/patch-poller_maintenance.php b/net-mgmt/cacti/files/patch-poller_maintenance.php
index 8d49da71226a..7c7fb0658b57 100644
--- a/net-mgmt/cacti/files/patch-poller_maintenance.php
+++ b/net-mgmt/cacti/files/patch-poller_maintenance.php
@@ -1,6 +1,6 @@
---- poller_maintenance.php.orig	2017-04-26 00:30:09 UTC
+--- poller_maintenance.php.orig	2017-08-13 04:06:37 UTC
 +++ poller_maintenance.php
-@@ -175,13 +175,13 @@ function logrotate_rotatenow () {
+@@ -197,14 +197,14 @@ function logrotate_rotatenow () {
  
  	$log = read_config_option('path_cactilog');
  	if ($log == '') {
@@ -9,6 +9,7 @@
  	}
  
  	set_config_option('logrotate_lastrun', time());
+ 
  	clearstatcache();
  
 -	if (is_writable(dirname($log) . '/') && is_writable($log)) {
diff --git a/net-mgmt/cacti/files/patch-utilities.php b/net-mgmt/cacti/files/patch-utilities.php
index d00d124b8c34..84e5ca58e739 100644
--- a/net-mgmt/cacti/files/patch-utilities.php
+++ b/net-mgmt/cacti/files/patch-utilities.php
@@ -1,15 +1,15 @@
---- utilities.php.orig	2017-06-05 03:49:49 UTC
+--- utilities.php.orig	2017-08-13 04:06:37 UTC
 +++ utilities.php
 @@ -877,7 +877,7 @@ function utilities_view_logfile() {
- 			$logfile = $requestedFile;
- 		}
- 	} elseif ($logfile == '') {
+ 	}
+ 
+ 	if ($logfile == '') {
 -		$logfile = $config['base_path'] . '/log/cacti.log';
 +		$logfile = '/var/log/cacti/log';
  	}
  
  	/* ================= input validation and session storage ================= */
-@@ -1194,7 +1194,7 @@ function utilities_clear_logfile() {
+@@ -1199,7 +1199,7 @@ function utilities_clear_logfile() {
  	$logfile = read_config_option('path_cactilog');
  
  	if ($logfile == '') {
diff --git a/net-mgmt/cacti/pkg-plist b/net-mgmt/cacti/pkg-plist
index 2e8b50a93c6d..6405a0f66821 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -1094,6 +1094,7 @@
 %%CACTIDIR%%/install/upgrades/1_1_8.php
 %%CACTIDIR%%/install/upgrades/1_1_11.php
 %%CACTIDIR%%/install/upgrades/1_1_14.php
+%%CACTIDIR%%/install/upgrades/1_1_17.php
 %%CACTIDIR%%/install/upgrades/index.php
 %%CACTIDIR%%/lib/aggregate.php
 %%CACTIDIR%%/lib/api_aggregate.php