Date: Mon, 14 Aug 2017 23:20:01 +0000 (UTC) From: "Danilo G. Baio" <dbaio@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447970 - in head/net-mgmt/cacti: . files Message-ID: <201708142320.v7ENK1A0015901@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dbaio Date: Mon Aug 14 23:20:01 2017 New Revision: 447970 URL: https://svnweb.freebsd.org/changeset/ports/447970 Log: 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) Modified: head/net-mgmt/cacti/Makefile head/net-mgmt/cacti/distinfo head/net-mgmt/cacti/files/patch-include__global.php head/net-mgmt/cacti/files/patch-include__global_settings.php head/net-mgmt/cacti/files/patch-install__functions.php head/net-mgmt/cacti/files/patch-lib__clog_webapi.php head/net-mgmt/cacti/files/patch-lib__functions.php head/net-mgmt/cacti/files/patch-poller_maintenance.php head/net-mgmt/cacti/files/patch-utilities.php head/net-mgmt/cacti/pkg-plist Modified: head/net-mgmt/cacti/Makefile ============================================================================== --- head/net-mgmt/cacti/Makefile Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/Makefile Mon Aug 14 23:20:01 2017 (r447970) @@ -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/ Modified: head/net-mgmt/cacti/distinfo ============================================================================== --- head/net-mgmt/cacti/distinfo Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/distinfo Mon Aug 14 23:20:01 2017 (r447970) @@ -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 Modified: head/net-mgmt/cacti/files/patch-include__global.php ============================================================================== --- head/net-mgmt/cacti/files/patch-include__global.php Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/files/patch-include__global.php Mon Aug 14 23:20:01 2017 (r447970) @@ -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__); Modified: head/net-mgmt/cacti/files/patch-include__global_settings.php ============================================================================== --- head/net-mgmt/cacti/files/patch-include__global_settings.php Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/files/patch-include__global_settings.php Mon Aug 14 23:20:01 2017 (r447970) @@ -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'), Modified: head/net-mgmt/cacti/files/patch-install__functions.php ============================================================================== --- head/net-mgmt/cacti/files/patch-install__functions.php Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/files/patch-install__functions.php Mon Aug 14 23:20:01 2017 (r447970) @@ -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 { Modified: head/net-mgmt/cacti/files/patch-lib__clog_webapi.php ============================================================================== --- head/net-mgmt/cacti/files/patch-lib__clog_webapi.php Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/files/patch-lib__clog_webapi.php Mon Aug 14 23:20:01 2017 (r447970) @@ -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 == '') { Modified: head/net-mgmt/cacti/files/patch-lib__functions.php ============================================================================== --- head/net-mgmt/cacti/files/patch-lib__functions.php Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/files/patch-lib__functions.php Mon Aug 14 23:20:01 2017 (r447970) @@ -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 == '') { Modified: head/net-mgmt/cacti/files/patch-poller_maintenance.php ============================================================================== --- head/net-mgmt/cacti/files/patch-poller_maintenance.php Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/files/patch-poller_maintenance.php Mon Aug 14 23:20:01 2017 (r447970) @@ -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)) { Modified: head/net-mgmt/cacti/files/patch-utilities.php ============================================================================== --- head/net-mgmt/cacti/files/patch-utilities.php Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/files/patch-utilities.php Mon Aug 14 23:20:01 2017 (r447970) @@ -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 == '') { Modified: head/net-mgmt/cacti/pkg-plist ============================================================================== --- head/net-mgmt/cacti/pkg-plist Mon Aug 14 22:42:53 2017 (r447969) +++ head/net-mgmt/cacti/pkg-plist Mon Aug 14 23:20:01 2017 (r447970) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708142320.v7ENK1A0015901>