Attachment 182169 Details for Bug 218949 – Update cacti to 1.1.5

[patch] Update cacti to 1.1.5

20170428-cacti.diff (text/plain), 7.71 KB, created by Daniel Austin on 2017-04-29 08:18:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2017-04-29 08:18:37 UTC

Size: 7.71 KB

patch

obsolete

>diff -ruN net-mgmt/cacti.orig/Makefile net-mgmt/cacti/Makefile
>--- net-mgmt/cacti.orig/Makefile	2017-04-26 08:35:06.000000000 +0100
>+++ net-mgmt/cacti/Makefile	2017-04-28 22:01:50.097856000 +0100
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/net-mgmt/cacti/Makefile 439432 2017-04-26 07:35:06Z pi $
> 
> PORTNAME=	cacti
>-PORTVERSION=	1.1.4
>+PORTVERSION=	1.1.5
> CATEGORIES=	net-mgmt www
> MASTER_SITES=	http://www.cacti.net/downloads/ \
> 		ftp://ftpmirror.uk/freebsd-ports/cacti/
>diff -ruN net-mgmt/cacti.orig/distinfo net-mgmt/cacti/distinfo
>--- net-mgmt/cacti.orig/distinfo	2017-04-26 08:35:06.000000000 +0100
>+++ net-mgmt/cacti/distinfo	2017-04-28 22:02:08.962481000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1493106955
>-SHA256 (cacti-1.1.4.tar.gz) = a8eb7f8bec3e5950d91740305cd03ab4100ee5f0ef51758a24b0452153a1a6e4
>-SIZE (cacti-1.1.4.tar.gz) = 7845591
>+TIMESTAMP = 1493413328
>+SHA256 (cacti-1.1.5.tar.gz) = 47d47ec7fa64615dae15d292a9879535e74a9a684718dc65dbe0c755d4e2cc4d
>+SIZE (cacti-1.1.5.tar.gz) = 7845954
>diff -ruN net-mgmt/cacti.orig/files/patch-include__global.php net-mgmt/cacti/files/patch-include__global.php
>--- net-mgmt/cacti.orig/files/patch-include__global.php	2017-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/files/patch-include__global.php	2017-04-28 22:10:44.510499000 +0100
>@@ -1,6 +1,6 @@
>---- include/global.php.orig	2017-02-04 14:12:12.747287000 +0000
>-+++ include/global.php	2017-02-04 14:12:32.931726000 +0000
>-@@ -126,7 +126,7 @@
>+--- include/global.php.orig	2017-04-28 21:09:17 UTC
>++++ include/global.php
>+@@ -131,7 +131,7 @@ if ($config['cacti_server_os'] == 'win32
>  	$config['library_path'] = preg_replace("/(.*[\/])include/", "\\1lib", dirname(__FILE__));
>  }
>  $config['include_path'] = dirname(__FILE__);
>diff -ruN net-mgmt/cacti.orig/files/patch-include__global_settings.php net-mgmt/cacti/files/patch-include__global_settings.php
>--- net-mgmt/cacti.orig/files/patch-include__global_settings.php	2017-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/files/patch-include__global_settings.php	2017-04-28 22:10:44.515827000 +0100
>@@ -1,6 +1,6 @@
>---- include/global_settings.php.orig	2017-02-04 14:13:42.140386000 +0000
>-+++ include/global_settings.php	2017-02-04 14:20:35.592474000 +0000
>-@@ -135,9 +135,9 @@
>+--- include/global_settings.php.orig	2017-04-28 21:09:29 UTC
>++++ include/global_settings.php
>+@@ -135,9 +135,9 @@ $settings = array(
>  			),
>  		'path_cactilog' => array(
>  			'friendly_name' => __('Cacti Log Path'),
>diff -ruN net-mgmt/cacti.orig/files/patch-install__functions.php net-mgmt/cacti/files/patch-install__functions.php
>--- net-mgmt/cacti.orig/files/patch-install__functions.php	2017-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/files/patch-install__functions.php	2017-04-28 22:10:44.520849000 +0100
>@@ -1,6 +1,6 @@
>---- install/functions.php.orig	2017-02-04 14:21:02.093580000 +0000
>-+++ install/functions.php	2017-02-04 14:21:31.615575000 +0000
>-@@ -365,7 +365,7 @@
>+--- install/functions.php.orig	2017-04-28 21:09:40 UTC
>++++ install/functions.php
>+@@ -421,7 +421,7 @@ function install_file_paths () {
>  	if (config_value_exists('path_cactilog')) {
>  		$input['path_cactilog']['default'] = read_config_option('path_cactilog');
>  	} else {
>diff -ruN net-mgmt/cacti.orig/files/patch-lib__clog_webapi.php net-mgmt/cacti/files/patch-lib__clog_webapi.php
>--- net-mgmt/cacti.orig/files/patch-lib__clog_webapi.php	2017-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/files/patch-lib__clog_webapi.php	2017-04-28 22:10:44.526038000 +0100
>@@ -1,6 +1,6 @@
>---- lib/clog_webapi.php.orig	2017-02-04 14:22:42.713430000 +0000
>-+++ lib/clog_webapi.php	2017-02-04 14:23:10.949163000 +0000
>-@@ -40,7 +40,7 @@
>+--- lib/clog_webapi.php.orig	2017-04-28 21:09:57 UTC
>++++ lib/clog_webapi.php
>+@@ -40,7 +40,7 @@ function clog_purge_logfile() {
>  	$logfile = read_config_option('path_cactilog');
>  
>  	if ($logfile == '') {
>@@ -9,7 +9,7 @@
>  	}
>  
>  	if (file_exists($logfile)) {
>-@@ -64,7 +64,7 @@
>+@@ -64,7 +64,7 @@ function clog_view_logfile() {
>  	$logfile = read_config_option('path_cactilog');
>  
>  	if ($logfile == '') {
>diff -ruN net-mgmt/cacti.orig/files/patch-lib__functions.php net-mgmt/cacti/files/patch-lib__functions.php
>--- net-mgmt/cacti.orig/files/patch-lib__functions.php	2017-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/files/patch-lib__functions.php	2017-04-28 22:10:44.531259000 +0100
>@@ -1,8 +1,8 @@
>---- lib/functions.php.orig	2017-02-04 14:16:43.886716000 +0000
>-+++ lib/functions.php	2017-02-04 14:22:18.219392000 +0000
>-@@ -649,7 +649,7 @@
>+--- lib/functions.php.orig	2017-04-28 21:10:08 UTC
>++++ lib/functions.php
>+@@ -594,7 +594,7 @@ function cacti_log($string, $output = fa
>  	/* Log to Logfile */
>- 	if ((($logdestination == 1) || ($logdestination == 2)) && (read_config_option('log_verbosity') != POLLER_VERBOSITY_NONE)) {
>+ 	if (($logdestination == 1 || $logdestination == 2) && read_config_option('log_verbosity') != POLLER_VERBOSITY_NONE) {
>  		if ($logfile == '') {
> -			$logfile = $config['base_path'] . '/log/cacti.log';
> +			$logfile = '/var/log/cacti/log';
>diff -ruN net-mgmt/cacti.orig/files/patch-poller_maintenance.php net-mgmt/cacti/files/patch-poller_maintenance.php
>--- net-mgmt/cacti.orig/files/patch-poller_maintenance.php	2017-04-26 08:35:06.000000000 +0100
>+++ net-mgmt/cacti/files/patch-poller_maintenance.php	2017-04-28 22:10:44.536415000 +0100
>@@ -1,6 +1,6 @@
>---- poller_maintenance.php.orig	2017-04-24 03:25:50.000000000 +0100
>-+++ poller_maintenance.php	2017-04-25 14:27:06.327800000 +0100
>-@@ -175,13 +175,13 @@
>+--- poller_maintenance.php.orig	2017-04-28 21:10:21 UTC
>++++ poller_maintenance.php
>+@@ -175,13 +175,13 @@ function logrotate_rotatenow () {
>  
>  	$log = read_config_option('path_cactilog');
>  	if ($log == '') {
>diff -ruN net-mgmt/cacti.orig/files/patch-scripts__diskfree.pl net-mgmt/cacti/files/patch-scripts__diskfree.pl
>--- net-mgmt/cacti.orig/files/patch-scripts__diskfree.pl	2014-08-15 19:11:34.000000000 +0100
>+++ net-mgmt/cacti/files/patch-scripts__diskfree.pl	2017-04-28 22:10:44.541579000 +0100
>@@ -1,8 +1,9 @@
>---- ./scripts/diskfree.pl.orig	2014-08-15 15:39:51.000000000 +0200
>-+++ ./scripts/diskfree.pl	2014-08-15 15:40:16.000000000 +0200
>+--- scripts/diskfree.pl.orig	2017-04-28 21:10:37 UTC
>++++ scripts/diskfree.pl
> @@ -1,5 +1,5 @@
>- #!/usr/bin/perl
>+-#!/usr/bin/perl
> -open(PROCESS,"df --block-size=1024 -P $ARGV[0] | grep -v Filesystem |");
>++#!/usr/local/bin/perl
> +open(PROCESS,"df -k $ARGV[0] | grep -v Filesystem |");
>  foreach (<PROCESS>) {
>  	if ($_ =~ /($ARGV[0])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])(.* )(.*[0-9])%(.* )/) {
>diff -ruN net-mgmt/cacti.orig/files/patch-utilities.php net-mgmt/cacti/files/patch-utilities.php
>--- net-mgmt/cacti.orig/files/patch-utilities.php	2017-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/files/patch-utilities.php	2017-04-28 22:10:44.546710000 +0100
>@@ -1,6 +1,6 @@
>---- utilities.php.orig	2017-02-04 14:25:11.346062000 +0000
>-+++ utilities.php	2017-02-04 14:25:39.435371000 +0000
>-@@ -869,7 +869,7 @@
>+--- utilities.php.orig	2017-04-28 21:10:27 UTC
>++++ utilities.php
>+@@ -872,7 +872,7 @@ function utilities_view_logfile() {
>  	$logfile = read_config_option('path_cactilog');
>  
>  	if ($logfile == '') {
>@@ -9,7 +9,7 @@
>  	}
>  
>  	/* helps determine output color */
>-@@ -1149,7 +1149,7 @@
>+@@ -1155,7 +1155,7 @@ function utilities_clear_logfile() {
>  	$logfile = read_config_option('path_cactilog');
>  
>  	if ($logfile == '') {
>diff -ruN net-mgmt/cacti.orig/pkg-plist net-mgmt/cacti/pkg-plist
>--- net-mgmt/cacti.orig/pkg-plist	2017-04-26 08:35:06.000000000 +0100
>+++ net-mgmt/cacti/pkg-plist	2017-04-28 23:11:07.047942000 +0100
>@@ -1047,6 +1047,7 @@
> %%CACTIDIR%%/install/1_1_1_to_1_1_2.php
> %%CACTIDIR%%/install/1_1_2_to_1_1_3.php
> %%CACTIDIR%%/install/1_1_3_to_1_1_4.php
>+%%CACTIDIR%%/install/1_1_4_to_1_1_5.php
> %%CACTIDIR%%/install/colors.csv
> %%CACTIDIR%%/install/functions.php
> %%CACTIDIR%%/install/import_colors.php

Flags:

freebsd-ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 218949: 182169