aboutsummaryrefslogtreecommitdiffstats
path: root/net-mgmt
diff options
context:
space:
mode:
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/cacti/Makefile2
-rw-r--r--net-mgmt/cacti/distinfo6
-rw-r--r--net-mgmt/cacti/files/patch-lib__clog_webapi.php14
-rw-r--r--net-mgmt/cacti/files/patch-utilities.php14
-rw-r--r--net-mgmt/cacti/pkg-plist3
5 files changed, 21 insertions, 18 deletions
diff --git a/net-mgmt/cacti/Makefile b/net-mgmt/cacti/Makefile
index c6a5a925177d..5778d5a96eea 100644
--- a/net-mgmt/cacti/Makefile
+++ b/net-mgmt/cacti/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= cacti
-PORTVERSION= 1.1.7
+PORTVERSION= 1.1.9
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 662fa6f96f3a..037ba5d584ec 100644
--- a/net-mgmt/cacti/distinfo
+++ b/net-mgmt/cacti/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495560273
-SHA256 (cacti-1.1.7.tar.gz) = e6dcbcef54c42ee7920559d9afc7ba6f53c77a2f7054e8d58a83af304c24f969
-SIZE (cacti-1.1.7.tar.gz) = 8523998
+TIMESTAMP = 1496786177
+SHA256 (cacti-1.1.9.tar.gz) = 329b9a9b388f1a11c92c483a404c8ad0d0e63720cfed12edd82bec866950d67c
+SIZE (cacti-1.1.9.tar.gz) = 8720015
diff --git a/net-mgmt/cacti/files/patch-lib__clog_webapi.php b/net-mgmt/cacti/files/patch-lib__clog_webapi.php
index ee21474ba9aa..205d5848928a 100644
--- a/net-mgmt/cacti/files/patch-lib__clog_webapi.php
+++ b/net-mgmt/cacti/files/patch-lib__clog_webapi.php
@@ -1,4 +1,4 @@
---- lib/clog_webapi.php.orig 2017-04-26 00:30:09 UTC
+--- lib/clog_webapi.php.orig 2017-06-05 03:49:49 UTC
+++ lib/clog_webapi.php
@@ -40,7 +40,7 @@ function clog_purge_logfile() {
$logfile = read_config_option('path_cactilog');
@@ -9,12 +9,12 @@
}
if (file_exists($logfile)) {
-@@ -64,7 +64,7 @@ function clog_view_logfile() {
- $logfile = read_config_option('path_cactilog');
-
- if ($logfile == '') {
-- $logfile = './log/cacti.log';
+@@ -70,7 +70,7 @@ function clog_view_logfile() {
+ $logfile = $requestedFile;
+ }
+ } elseif ($logfile == '') {
+- $logfile = $config['base_path'] . '/log/cacti.log';
+ $logfile = '/var/log/cacti/log';
}
- /* helps determine output color */
+ /* ================= input validation and session storage ================= */
diff --git a/net-mgmt/cacti/files/patch-utilities.php b/net-mgmt/cacti/files/patch-utilities.php
index 8ae2fcb90db3..d00d124b8c34 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-04-26 00:30:09 UTC
+--- utilities.php.orig 2017-06-05 03:49:49 UTC
+++ utilities.php
-@@ -872,7 +872,7 @@ function utilities_view_logfile() {
- $logfile = read_config_option('path_cactilog');
-
- if ($logfile == '') {
+@@ -877,7 +877,7 @@ function utilities_view_logfile() {
+ $logfile = $requestedFile;
+ }
+ } elseif ($logfile == '') {
- $logfile = $config['base_path'] . '/log/cacti.log';
+ $logfile = '/var/log/cacti/log';
}
- /* helps determine output color */
-@@ -1155,7 +1155,7 @@ function utilities_clear_logfile() {
+ /* ================= input validation and session storage ================= */
+@@ -1194,7 +1194,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 781f00f67261..ba09c60831f2 100644
--- a/net-mgmt/cacti/pkg-plist
+++ b/net-mgmt/cacti/pkg-plist
@@ -257,6 +257,8 @@
%%CACTIDIR%%/images/tab_preview.gif
%%CACTIDIR%%/images/tab_settings.gif
%%CACTIDIR%%/images/tab_settings_down.gif
+%%CACTIDIR%%/images/tab_template_blue.gif
+%%CACTIDIR%%/images/tab_template_red.gif
%%CACTIDIR%%/images/tab_tree.gif
%%CACTIDIR%%/images/table.png
%%CACTIDIR%%/images/table_go.png
@@ -1041,6 +1043,7 @@
%%CACTIDIR%%/install/upgrades/1_1_4.php
%%CACTIDIR%%/install/upgrades/1_1_6.php
%%CACTIDIR%%/install/upgrades/1_1_7.php
+%%CACTIDIR%%/install/upgrades/1_1_8.php
%%CACTIDIR%%/install/upgrades/index.php
%%CACTIDIR%%/lib/aggregate.php
%%CACTIDIR%%/lib/api_aggregate.php