From 2e128802fd27d6f263929071e072404d98b07d91 Mon Sep 17 00:00:00 2001 From: dbaio Date: Mon, 14 Aug 2017 23:20:01 +0000 Subject: 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 (maintainer) --- net-mgmt/cacti/Makefile | 2 +- net-mgmt/cacti/distinfo | 6 +++--- net-mgmt/cacti/files/patch-include__global.php | 4 ++-- net-mgmt/cacti/files/patch-include__global_settings.php | 4 ++-- net-mgmt/cacti/files/patch-install__functions.php | 4 ++-- net-mgmt/cacti/files/patch-lib__clog_webapi.php | 10 +++++----- net-mgmt/cacti/files/patch-lib__functions.php | 4 ++-- net-mgmt/cacti/files/patch-poller_maintenance.php | 5 +++-- net-mgmt/cacti/files/patch-utilities.php | 10 +++++----- net-mgmt/cacti/pkg-plist | 1 + 10 files changed, 26 insertions(+), 24 deletions(-) (limited to 'net-mgmt/cacti') diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile index 1ba46bf463e..b4828409347 100644 --- a/net-mgmt/cacti/Makefile +++ b/net-mgmt/cacti/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cacti -PORTVERSION= 1.1.16 +PORTVERSION= 1.1.17 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 f11194fd15b..aa30d6c7cc8 100644 --- a/net-mgmt/cacti/distinfo +++ b/net-mgmt/cacti/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1501842212 -SHA256 (cacti-1.1.16.tar.gz) = 97640c45859603b1a86d94fb917c1595515d08ed07e6c91cb953c97051389939 -SIZE (cacti-1.1.16.tar.gz) = 8893348 +TIMESTAMP = 1502623382 +SHA256 (cacti-1.1.17.tar.gz) = 80a86823e0b4b173aa1e480181d6c176cff26cc9da23552eab2e98d3766e36e7 +SIZE (cacti-1.1.17.tar.gz) = 8896553 diff --git a/net-mgmt/cacti/files/patch-include__global.php b/net-mgmt/cacti/files/patch-include__global.php index 3119849553a..9359b85e255 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 d1422d03c5d..3782f5ce24a 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 90a6c7fa744..b8503f30b52 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 205d5848928..3020b29772c 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 6fd755a7042..d4c5acaa47e 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 8d49da71226..7c7fb0658b5 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 d00d124b8c3..84e5ca58e73 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 2e8b50a93c6..6405a0f6682 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 -- cgit