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

(-)net-mgmt/cacti/Makefile (-1 / +1 lines)
Lines 1-7 Link Here
1
# $FreeBSD: head/net-mgmt/cacti/Makefile 439432 2017-04-26 07:35:06Z pi $
1
# $FreeBSD: head/net-mgmt/cacti/Makefile 439432 2017-04-26 07:35:06Z pi $
2
2
3
PORTNAME=	cacti
3
PORTNAME=	cacti
4
PORTVERSION=	1.1.4
4
PORTVERSION=	1.1.5
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/
(-)net-mgmt/cacti/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1493106955
1
TIMESTAMP = 1493413328
2
SHA256 (cacti-1.1.4.tar.gz) = a8eb7f8bec3e5950d91740305cd03ab4100ee5f0ef51758a24b0452153a1a6e4
2
SHA256 (cacti-1.1.5.tar.gz) = 47d47ec7fa64615dae15d292a9879535e74a9a684718dc65dbe0c755d4e2cc4d
3
SIZE (cacti-1.1.4.tar.gz) = 7845591
3
SIZE (cacti-1.1.5.tar.gz) = 7845954
(-)net-mgmt/cacti/files/patch-include__global.php (-3 / +3 lines)
Lines 1-6 Link Here
1
--- include/global.php.orig	2017-02-04 14:12:12.747287000 +0000
1
--- include/global.php.orig	2017-04-28 21:09:17 UTC
2
+++ include/global.php	2017-02-04 14:12:32.931726000 +0000
2
+++ include/global.php
3
@@ -126,7 +126,7 @@
3
@@ -131,7 +131,7 @@ if ($config['cacti_server_os'] == 'win32
4
 	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
4
 	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
5
 }
5
 }
6
 $config['include_path'] = dirname(__FILE__);
6
 $config['include_path'] = dirname(__FILE__);
(-)net-mgmt/cacti/files/patch-include__global_settings.php (-3 / +3 lines)
Lines 1-6 Link Here
1
--- include/global_settings.php.orig	2017-02-04 14:13:42.140386000 +0000
1
--- include/global_settings.php.orig	2017-04-28 21:09:29 UTC
2
+++ include/global_settings.php	2017-02-04 14:20:35.592474000 +0000
2
+++ include/global_settings.php
3
@@ -135,9 +135,9 @@
3
@@ -135,9 +135,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'),
(-)net-mgmt/cacti/files/patch-install__functions.php (-3 / +3 lines)
Lines 1-6 Link Here
1
--- install/functions.php.orig	2017-02-04 14:21:02.093580000 +0000
1
--- install/functions.php.orig	2017-04-28 21:09:40 UTC
2
+++ install/functions.php	2017-02-04 14:21:31.615575000 +0000
2
+++ install/functions.php
3
@@ -365,7 +365,7 @@
3
@@ -421,7 +421,7 @@ function install_file_paths () {
4
 	if (config_value_exists('path_cactilog')) {
4
 	if (config_value_exists('path_cactilog')) {
5
 		$input['path_cactilog']['default'] = read_config_option('path_cactilog');
5
 		$input['path_cactilog']['default'] = read_config_option('path_cactilog');
6
 	} else {
6
 	} else {
(-)net-mgmt/cacti/files/patch-lib__clog_webapi.php (-4 / +4 lines)
Lines 1-6 Link Here
1
--- lib/clog_webapi.php.orig	2017-02-04 14:22:42.713430000 +0000
1
--- lib/clog_webapi.php.orig	2017-04-28 21:09:57 UTC
2
+++ lib/clog_webapi.php	2017-02-04 14:23:10.949163000 +0000
2
+++ lib/clog_webapi.php
3
@@ -40,7 +40,7 @@
3
@@ -40,7 +40,7 @@ function clog_purge_logfile() {
4
 	$logfile = read_config_option('path_cactilog');
4
 	$logfile = read_config_option('path_cactilog');
5
 
5
 
6
 	if ($logfile == '') {
6
 	if ($logfile == '') {
Lines 9-15 Link Here
9
 	}
9
 	}
10
 
10
 
11
 	if (file_exists($logfile)) {
11
 	if (file_exists($logfile)) {
12
@@ -64,7 +64,7 @@
12
@@ -64,7 +64,7 @@ function clog_view_logfile() {
13
 	$logfile = read_config_option('path_cactilog');
13
 	$logfile = read_config_option('path_cactilog');
14
 
14
 
15
 	if ($logfile == '') {
15
 	if ($logfile == '') {
(-)net-mgmt/cacti/files/patch-lib__functions.php (-4 / +4 lines)
Lines 1-8 Link Here
1
--- lib/functions.php.orig	2017-02-04 14:16:43.886716000 +0000
1
--- lib/functions.php.orig	2017-04-28 21:10:08 UTC
2
+++ lib/functions.php	2017-02-04 14:22:18.219392000 +0000
2
+++ lib/functions.php
3
@@ -649,7 +649,7 @@
3
@@ -594,7 +594,7 @@ function cacti_log($string, $output = fa
4
 	/* Log to Logfile */
4
 	/* Log to Logfile */
5
 	if ((($logdestination == 1) || ($logdestination == 2)) && (read_config_option('log_verbosity') != POLLER_VERBOSITY_NONE)) {
5
 	if (($logdestination == 1 || $logdestination == 2) && read_config_option('log_verbosity') != POLLER_VERBOSITY_NONE) {
6
 		if ($logfile == '') {
6
 		if ($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';
(-)net-mgmt/cacti/files/patch-poller_maintenance.php (-3 / +3 lines)
Lines 1-6 Link Here
1
--- poller_maintenance.php.orig	2017-04-24 03:25:50.000000000 +0100
1
--- poller_maintenance.php.orig	2017-04-28 21:10:21 UTC
2
+++ poller_maintenance.php	2017-04-25 14:27:06.327800000 +0100
2
+++ poller_maintenance.php
3
@@ -175,13 +175,13 @@
3
@@ -175,13 +175,13 @@ 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 == '') {
(-)net-mgmt/cacti/files/patch-scripts__diskfree.pl (-3 / +4 lines)
Lines 1-8 Link Here
1
--- ./scripts/diskfree.pl.orig	2014-08-15 15:39:51.000000000 +0200
1
--- scripts/diskfree.pl.orig	2017-04-28 21:10:37 UTC
2
+++ ./scripts/diskfree.pl	2014-08-15 15:40:16.000000000 +0200
2
+++ scripts/diskfree.pl
3
@@ -1,5 +1,5 @@
3
@@ -1,5 +1,5 @@
4
 #!/usr/bin/perl
4
-#!/usr/bin/perl
5
-open(PROCESS,"df --block-size=1024 -P $ARGV[0] | grep -v Filesystem |");
5
-open(PROCESS,"df --block-size=1024 -P $ARGV[0] | grep -v Filesystem |");
6
+#!/usr/local/bin/perl
6
+open(PROCESS,"df -k $ARGV[0] | grep -v Filesystem |");
7
+open(PROCESS,"df -k $ARGV[0] | grep -v Filesystem |");
7
 foreach (<PROCESS>) {
8
 foreach (<PROCESS>) {
8
 	if ($_ =~ /($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )/) {
9
 	if ($_ =~ /($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )/) {
(-)net-mgmt/cacti/files/patch-utilities.php (-4 / +4 lines)
Lines 1-6 Link Here
1
--- utilities.php.orig	2017-02-04 14:25:11.346062000 +0000
1
--- utilities.php.orig	2017-04-28 21:10:27 UTC
2
+++ utilities.php	2017-02-04 14:25:39.435371000 +0000
2
+++ utilities.php
3
@@ -869,7 +869,7 @@
3
@@ -872,7 +872,7 @@ function utilities_view_logfile() {
4
 	$logfile = read_config_option('path_cactilog');
4
 	$logfile = read_config_option('path_cactilog');
5
 
5
 
6
 	if ($logfile == '') {
6
 	if ($logfile == '') {
Lines 9-15 Link Here
9
 	}
9
 	}
10
 
10
 
11
 	/* helps determine output color */
11
 	/* helps determine output color */
12
@@ -1149,7 +1149,7 @@
12
@@ -1155,7 +1155,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 == '') {
(-)net-mgmt/cacti/pkg-plist (+1 lines)
Lines 1047-1052 Link Here
1047
%%CACTIDIR%%/install/1_1_1_to_1_1_2.php
1047
%%CACTIDIR%%/install/1_1_1_to_1_1_2.php
1048
%%CACTIDIR%%/install/1_1_2_to_1_1_3.php
1048
%%CACTIDIR%%/install/1_1_2_to_1_1_3.php
1049
%%CACTIDIR%%/install/1_1_3_to_1_1_4.php
1049
%%CACTIDIR%%/install/1_1_3_to_1_1_4.php
1050
%%CACTIDIR%%/install/1_1_4_to_1_1_5.php
1050
%%CACTIDIR%%/install/colors.csv
1051
%%CACTIDIR%%/install/colors.csv
1051
%%CACTIDIR%%/install/functions.php
1052
%%CACTIDIR%%/install/functions.php
1052
%%CACTIDIR%%/install/import_colors.php
1053
%%CACTIDIR%%/install/import_colors.php

Return to bug 218949