Attachment 183322 Details for Bug 219854 – Update cacti to 1.1.9

[patch] Update cacti to 1.1.9

20170607-cacti.diff (text/plain), 3.90 KB, created by Daniel Austin on 2017-06-08 07:44:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2017-06-08 07:44:35 UTC

Size: 3.90 KB

patch

obsolete

>diff -ruN net-mgmt/cacti.orig/Makefile net-mgmt/cacti/Makefile
>--- net-mgmt/cacti.orig/Makefile	2017-05-26 10:11:41.000000000 +0100
>+++ net-mgmt/cacti/Makefile	2017-06-06 22:55:54.765657000 +0100
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/net-mgmt/cacti/Makefile 441766 2017-05-26 09:11:41Z joneum $
> 
> 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 -ruN net-mgmt/cacti.orig/distinfo net-mgmt/cacti/distinfo
>--- net-mgmt/cacti.orig/distinfo	2017-05-26 10:11:41.000000000 +0100
>+++ net-mgmt/cacti/distinfo	2017-06-06 22:56:17.978707000 +0100
>@@ -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 -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-04-29 16:44:00.000000000 +0100
>+++ net-mgmt/cacti/files/patch-lib__clog_webapi.php	2017-06-07 01:34:34.783592000 +0100
>@@ -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 -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-04-29 16:44:00.000000000 +0100
>+++ net-mgmt/cacti/files/patch-utilities.php	2017-06-07 01:37:18.461414000 +0100
>@@ -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 -ruN net-mgmt/cacti.orig/pkg-plist net-mgmt/cacti/pkg-plist
>--- net-mgmt/cacti.orig/pkg-plist	2017-05-26 10:11:41.000000000 +0100
>+++ net-mgmt/cacti/pkg-plist	2017-06-07 01:40:17.501302000 +0100
>@@ -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

Flags:

freebsd-ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 219854: 183322