From owner-svn-ports-branches@freebsd.org Tue Aug 29 15:19:53 2017 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CC967DDE207; Tue, 29 Aug 2017 15:19:53 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A613266236; Tue, 29 Aug 2017 15:19:53 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7TFJqUl090173; Tue, 29 Aug 2017 15:19:52 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7TFJpT5090162; Tue, 29 Aug 2017 15:19:51 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201708291519.v7TFJpT5090162@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 29 Aug 2017 15:19:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448926 - in branches/2017Q3/net-mgmt/cacti: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2017Q3/net-mgmt/cacti: . files X-SVN-Commit-Revision: 448926 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Aug 2017 15:19:53 -0000 Author: feld Date: Tue Aug 29 15:19:51 2017 New Revision: 448926 URL: https://svnweb.freebsd.org/changeset/ports/448926 Log: 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 (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 (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 (maintainer) Approved by: ports-secteam (with hat) Modified: branches/2017Q3/net-mgmt/cacti/Makefile branches/2017Q3/net-mgmt/cacti/distinfo branches/2017Q3/net-mgmt/cacti/files/patch-include__global.php branches/2017Q3/net-mgmt/cacti/files/patch-include__global_settings.php branches/2017Q3/net-mgmt/cacti/files/patch-install__functions.php branches/2017Q3/net-mgmt/cacti/files/patch-lib__clog_webapi.php branches/2017Q3/net-mgmt/cacti/files/patch-lib__functions.php branches/2017Q3/net-mgmt/cacti/files/patch-poller_maintenance.php branches/2017Q3/net-mgmt/cacti/files/patch-utilities.php branches/2017Q3/net-mgmt/cacti/pkg-plist Directory Properties: branches/2017Q3/ (props changed) Modified: branches/2017Q3/net-mgmt/cacti/Makefile ============================================================================== --- branches/2017Q3/net-mgmt/cacti/Makefile Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/Makefile Tue Aug 29 15:19:51 2017 (r448926) @@ -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/ Modified: branches/2017Q3/net-mgmt/cacti/distinfo ============================================================================== --- branches/2017Q3/net-mgmt/cacti/distinfo Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/distinfo Tue Aug 29 15:19:51 2017 (r448926) @@ -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 Modified: branches/2017Q3/net-mgmt/cacti/files/patch-include__global.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-include__global.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-include__global.php Tue Aug 29 15:19:51 2017 (r448926) @@ -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: branches/2017Q3/net-mgmt/cacti/files/patch-include__global_settings.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-include__global_settings.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-include__global_settings.php Tue Aug 29 15:19:51 2017 (r448926) @@ -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: branches/2017Q3/net-mgmt/cacti/files/patch-install__functions.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-install__functions.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-install__functions.php Tue Aug 29 15:19:51 2017 (r448926) @@ -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: branches/2017Q3/net-mgmt/cacti/files/patch-lib__clog_webapi.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-lib__clog_webapi.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-lib__clog_webapi.php Tue Aug 29 15:19:51 2017 (r448926) @@ -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: branches/2017Q3/net-mgmt/cacti/files/patch-lib__functions.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-lib__functions.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-lib__functions.php Tue Aug 29 15:19:51 2017 (r448926) @@ -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: branches/2017Q3/net-mgmt/cacti/files/patch-poller_maintenance.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-poller_maintenance.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-poller_maintenance.php Tue Aug 29 15:19:51 2017 (r448926) @@ -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: branches/2017Q3/net-mgmt/cacti/files/patch-utilities.php ============================================================================== --- branches/2017Q3/net-mgmt/cacti/files/patch-utilities.php Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/files/patch-utilities.php Tue Aug 29 15:19:51 2017 (r448926) @@ -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: branches/2017Q3/net-mgmt/cacti/pkg-plist ============================================================================== --- branches/2017Q3/net-mgmt/cacti/pkg-plist Tue Aug 29 15:03:01 2017 (r448925) +++ branches/2017Q3/net-mgmt/cacti/pkg-plist Tue Aug 29 15:19:51 2017 (r448926) @@ -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