--- net-mgmt/cacti/Makefile 2017-08-04 11:56:11.000000000 +0100 +++ net-mgmt/cacti/Makefile 2017-08-13 12:22:50.769654000 +0100 @@ -1,7 +1,7 @@ # $FreeBSD: head/net-mgmt/cacti/Makefile 447324 2017-08-04 10:56:11Z wen $ 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/ --- net-mgmt/cacti/distinfo 2017-08-04 11:56:11.000000000 +0100 +++ net-mgmt/cacti/distinfo 2017-08-13 12:23:02.500980000 +0100 @@ -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 --- net-mgmt/cacti/files/patch-poller_maintenance.php 2017-04-29 16:44:00.000000000 +0100 +++ net-mgmt/cacti/files/patch-poller_maintenance.php 2017-08-13 15:50:49.252586000 +0100 @@ -1,6 +1,6 @@ ---- poller_maintenance.php.orig 2017-04-26 00:30:09 UTC +--- poller_maintenance.php.orig 2017-08-13 05:06:37.000000000 +0100 +++ poller_maintenance.php -@@ -175,13 +175,13 @@ function logrotate_rotatenow () { +@@ -197,14 +197,14 @@ $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)) { --- net-mgmt/cacti/files/patch-utilities.php 2017-06-10 16:00:34.000000000 +0100 +++ net-mgmt/cacti/files/patch-utilities.php 2017-08-13 15:50:51.874267000 +0100 @@ -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 == '') { --- net-mgmt/cacti/pkg-plist 2017-07-27 02:19:51.000000000 +0100 +++ net-mgmt/cacti/pkg-plist 2017-08-13 15:52:30.975602000 +0100 @@ -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