Attachment #191186 for bug #226334

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

Lines 1-7 Link Here

(-)net-mgmt/cacti/Makefile (-1 / +1 lines)
1	# $FreeBSD: head/net-mgmt/cacti/Makefile 462312 2018-02-19 12:41:09Z dbaio $	1	# $FreeBSD: head/net-mgmt/cacti/Makefile 462312 2018-02-19 12:41:09Z dbaio $
2		2
3	PORTNAME= cacti	3	PORTNAME= cacti
4	PORTVERSION= 1.1.35	4	PORTVERSION= 1.1.36
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 = 1519043380	1	TIMESTAMP = 1520108099
2	SHA256 (cacti-1.1.35.tar.gz) = eea42008adb699d900bd4555b0c34691389015e0c9dac43fc07e9ddb9a537ffd	2	SHA256 (cacti-1.1.36.tar.gz) = 9a9cbe54b51a4161ddc84234a7e4210dae279375fd2b1715511d426672327a11
3	SIZE (cacti-1.1.35.tar.gz) = 8999651	3	SIZE (cacti-1.1.36.tar.gz) = 9018560

Lines 1-10 Link Here

(-)net-mgmt/cacti/files/patch-include__global_settings.php (-3 / +3 lines)
1	--- include/global_settings.php.orig 2017-08-13 04:06:37 UTC	1	--- include/global_settings.php.orig 2018-02-26 01:12:03 UTC
2	+++ include/global_settings.php	2	+++ include/global_settings.php
3	@@ -144,9 +144,9 @@ $settings = array(	3	@@ -143,9 +143,9 @@ $settings = array(
4	),	4	),
5	'path_cactilog' => array(	5	'path_cactilog' => array(
6	'friendly_name' => __('Cacti Log Path'),	6	'friendly_name' => __('Cacti Log Path'),
7	- 'description' => __('The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)'),	7	- 'description' => __('The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)'),
8	+ 'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),	8	+ 'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),
9	'method' => 'filepath',	9	'method' => 'filepath',
10	- 'default' => $config['base_path'] . '/log/cacti.log',	10	- 'default' => $config['base_path'] . '/log/cacti.log',




--- poller_maintenance.php.orig	2018-02-26 01:12:04 UTC
+++ poller_maintenance.php
@@ -223,7 +223,7 @@ function logrotate_rotatenow () {
 
 	$log = read_config_option('path_cactilog');
 	if ($log == '') {
-		$log = $config['base_path'] . '/log/cacti.log';
+		$log = /var/log/cacti/log';
 	}
 
 	$run_time = time();
 
 	clearstatcache();
 
-	if (is_writable(dirname($log) . '/') && is_writable($log)) {
+	if (is_writable('/var/log/cacti') && is_writable($log)) {
 		$perms = octdec(substr(decoct( fileperms($log) ), 2));
 		$owner = fileowner($log);
 		$group = filegroup($log);

Return to bug 226334

Lines 1-19 Link Here

(-)net-mgmt/cacti/files/patch-poller_maintenance.php (-12 / +4 lines)
1	--- poller_maintenance.php.orig 2017-08-13 04:06:37 UTC	1	--- poller_maintenance.php.orig 2018-02-26 01:12:04 UTC
2	+++ poller_maintenance.php	2	+++ poller_maintenance.php
3	@@ -197,14 +197,14 @@ function logrotate_rotatenow () {	3	@@ -223,7 +223,7 @@ function logrotate_rotatenow () {
4		4
5	$log = read_config_option('path_cactilog');	5	$log = read_config_option('path_cactilog');
6	if ($log == '') {	6	if ($log == '') {
7	- $log = $config['base_path'] . '/log/cacti.log';	7	- $log = $config['base_path'] . '/log/cacti.log';
8	+ $log = '/var/log/cacti/log';	8	+ $log = /var/log/cacti/log';
9	}	9	}
10		10
11	set_config_option('logrotate_lastrun', time());	11	$run_time = time();
12
13	clearstatcache();
14
15	- if (is_writable(dirname($log) . '/') && is_writable($log)) {
16	+ if (is_writable('/var/log/cacti') && is_writable($log)) {
17	$perms = octdec(substr(decoct( fileperms($log) ), 2));
18	$owner = fileowner($log);
19	$group = filegroup($log);

Lines 436-442 Link Here

(-)net-mgmt/cacti/pkg-plist (-1 / +1 lines)
436	%%CACTIDIR%%/include/js/pace.js	436	%%CACTIDIR%%/include/js/pace.js
437	%%CACTIDIR%%/include/js/screenfull.js	437	%%CACTIDIR%%/include/js/screenfull.js
438	%%CACTIDIR%%/include/layout.js	438	%%CACTIDIR%%/include/layout.js
439	%%CACTIDIR%%/include/main.css
440	%%CACTIDIR%%/include/phpgettext/gettext.php	439	%%CACTIDIR%%/include/phpgettext/gettext.php
441	%%CACTIDIR%%/include/phpgettext/streams.php	440	%%CACTIDIR%%/include/phpgettext/streams.php
442	%%CACTIDIR%%/include/phpmailer/LICENSE	441	%%CACTIDIR%%/include/phpmailer/LICENSE
Lines 1148-1153 Link Here
1148	%%CACTIDIR%%/install/upgrades/1_1_31.php	1147	%%CACTIDIR%%/install/upgrades/1_1_31.php
1149	%%CACTIDIR%%/install/upgrades/1_1_34.php	1148	%%CACTIDIR%%/install/upgrades/1_1_34.php
1150	%%CACTIDIR%%/install/upgrades/1_1_35.php	1149	%%CACTIDIR%%/install/upgrades/1_1_35.php
		1150	%%CACTIDIR%%/install/upgrades/1_1_36.php
1151	%%CACTIDIR%%/install/upgrades/index.php	1151	%%CACTIDIR%%/install/upgrades/index.php
1152	%%CACTIDIR%%/lib/aggregate.php	1152	%%CACTIDIR%%/lib/aggregate.php
1153	%%CACTIDIR%%/lib/api_aggregate.php	1153	%%CACTIDIR%%/lib/api_aggregate.php