Attachment #183322 for bug #219854

View | Details | Raw Unified | Return to bug 219854
Collapse All | Expand All

Lines 1-7 Link Here

(-)net-mgmt/cacti/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/net-mgmt/cacti/Makefile 441766 2017-05-26 09:11:41Z joneum $	1	# $FreeBSD: head/net-mgmt/cacti/Makefile 441766 2017-05-26 09:11:41Z joneum $
2		2
3	PORTNAME= cacti	3	PORTNAME= cacti
4	PORTVERSION= 1.1.7	4	PORTVERSION= 1.1.9
5	CATEGORIES= net-mgmt www	5	CATEGORIES= net-mgmt www
6	MASTER_SITES= http://www.cacti.net/downloads/ \	6	MASTER_SITES= http://www.cacti.net/downloads/ \
7	ftp://ftpmirror.uk/freebsd-ports/cacti/	7	ftp://ftpmirror.uk/freebsd-ports/cacti/

Lines 1-3 Link Here

(-)net-mgmt/cacti/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1495560273	1	TIMESTAMP = 1496786177
2	SHA256 (cacti-1.1.7.tar.gz) = e6dcbcef54c42ee7920559d9afc7ba6f53c77a2f7054e8d58a83af304c24f969	2	SHA256 (cacti-1.1.9.tar.gz) = 329b9a9b388f1a11c92c483a404c8ad0d0e63720cfed12edd82bec866950d67c
3	SIZE (cacti-1.1.7.tar.gz) = 8523998	3	SIZE (cacti-1.1.9.tar.gz) = 8720015




--- 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');

 	}
 
 	if (file_exists($logfile)) {
@@ -70,7 +70,7 @@ function clog_view_logfile() {
 			$logfile = $requestedFile;
 		}
 	} elseif ($logfile == '') {
-		$logfile = $config['base_path'] . '/log/cacti.log';
+		$logfile = '/var/log/cacti/log';
 	}
 
 	/* ================= input validation and session storage ================= */




--- utilities.php.orig	2017-06-05 03:49:49 UTC
+++ utilities.php
@@ -877,7 +877,7 @@ function utilities_view_logfile() {
 			$logfile = $requestedFile;
 		}
 	} elseif ($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() {
 	$logfile = read_config_option('path_cactilog');
 
 	if ($logfile == '') {

Return to bug 219854

Lines 1-4 Link Here

(-)net-mgmt/cacti/files/patch-lib__clog_webapi.php (-7 / +7 lines)
1	--- lib/clog_webapi.php.orig 2017-04-26 00:30:09 UTC	1	--- lib/clog_webapi.php.orig 2017-06-05 03:49:49 UTC
2	+++ lib/clog_webapi.php	2	+++ lib/clog_webapi.php
3	@@ -40,7 +40,7 @@ function clog_purge_logfile() {	3	@@ -40,7 +40,7 @@ function clog_purge_logfile() {
4	$logfile = read_config_option('path_cactilog');	4	$logfile = read_config_option('path_cactilog');
Lines 9-20 Link Here
9	}	9	}
10		10
11	if (file_exists($logfile)) {	11	if (file_exists($logfile)) {
12	@@ -64,7 +64,7 @@ function clog_view_logfile() {	12	@@ -70,7 +70,7 @@ function clog_view_logfile() {
13	$logfile = read_config_option('path_cactilog');	13	$logfile = $requestedFile;
14		14	}
15	if ($logfile == '') {	15	} elseif ($logfile == '') {
16	- $logfile = './log/cacti.log';	16	- $logfile = $config['base_path'] . '/log/cacti.log';
17	+ $logfile = '/var/log/cacti/log';	17	+ $logfile = '/var/log/cacti/log';
18	}	18	}
19		19
20	/* helps determine output color */	20	/* ================= input validation and session storage ================= */

Lines 1-15 Link Here

(-)net-mgmt/cacti/files/patch-utilities.php (-7 / +7 lines)
1	--- utilities.php.orig 2017-04-26 00:30:09 UTC	1	--- utilities.php.orig 2017-06-05 03:49:49 UTC
2	+++ utilities.php	2	+++ utilities.php
3	@@ -872,7 +872,7 @@ function utilities_view_logfile() {	3	@@ -877,7 +877,7 @@ function utilities_view_logfile() {
4	$logfile = read_config_option('path_cactilog');	4	$logfile = $requestedFile;
5		5	}
6	if ($logfile == '') {	6	} elseif ($logfile == '') {
7	- $logfile = $config['base_path'] . '/log/cacti.log';	7	- $logfile = $config['base_path'] . '/log/cacti.log';
8	+ $logfile = '/var/log/cacti/log';	8	+ $logfile = '/var/log/cacti/log';
9	}	9	}
10		10
11	/* helps determine output color */	11	/* ================= input validation and session storage ================= */
12	@@ -1155,7 +1155,7 @@ function utilities_clear_logfile() {	12	@@ -1194,7 +1194,7 @@ function utilities_clear_logfile() {
13	$logfile = read_config_option('path_cactilog');	13	$logfile = read_config_option('path_cactilog');
14		14
15	if ($logfile == '') {	15	if ($logfile == '') {

Lines 257-262 Link Here

(-)net-mgmt/cacti/pkg-plist (+3 lines)
257	%%CACTIDIR%%/images/tab_preview.gif	257	%%CACTIDIR%%/images/tab_preview.gif
258	%%CACTIDIR%%/images/tab_settings.gif	258	%%CACTIDIR%%/images/tab_settings.gif
259	%%CACTIDIR%%/images/tab_settings_down.gif	259	%%CACTIDIR%%/images/tab_settings_down.gif
		260	%%CACTIDIR%%/images/tab_template_blue.gif
		261	%%CACTIDIR%%/images/tab_template_red.gif
260	%%CACTIDIR%%/images/tab_tree.gif	262	%%CACTIDIR%%/images/tab_tree.gif
261	%%CACTIDIR%%/images/table.png	263	%%CACTIDIR%%/images/table.png
262	%%CACTIDIR%%/images/table_go.png	264	%%CACTIDIR%%/images/table_go.png
Lines 1041-1046 Link Here
1041	%%CACTIDIR%%/install/upgrades/1_1_4.php	1043	%%CACTIDIR%%/install/upgrades/1_1_4.php
1042	%%CACTIDIR%%/install/upgrades/1_1_6.php	1044	%%CACTIDIR%%/install/upgrades/1_1_6.php
1043	%%CACTIDIR%%/install/upgrades/1_1_7.php	1045	%%CACTIDIR%%/install/upgrades/1_1_7.php
		1046	%%CACTIDIR%%/install/upgrades/1_1_8.php
1044	%%CACTIDIR%%/install/upgrades/index.php	1047	%%CACTIDIR%%/install/upgrades/index.php
1045	%%CACTIDIR%%/lib/aggregate.php	1048	%%CACTIDIR%%/lib/aggregate.php
1046	%%CACTIDIR%%/lib/api_aggregate.php	1049	%%CACTIDIR%%/lib/api_aggregate.php