Attachment 191186 Details for Bug 226334 – Update cacti to 1.1.36

[patch] Update cacti to 1.1.36

20180303-cacti.diff (text/plain), 3.89 KB, created by Daniel Austin on 2018-03-03 21:14:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2018-03-03 21:14:28 UTC

Size: 3.89 KB

patch

obsolete

>diff -ruN net-mgmt/cacti.orig/Makefile net-mgmt/cacti/Makefile
>--- net-mgmt/cacti.orig/Makefile	2018-02-19 12:41:09.000000000 +0000
>+++ net-mgmt/cacti/Makefile	2018-03-03 20:14:53.632647000 +0000
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/net-mgmt/cacti/Makefile 462312 2018-02-19 12:41:09Z dbaio $
> 
> PORTNAME=	cacti
>-PORTVERSION=	1.1.35
>+PORTVERSION=	1.1.36
> 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	2018-02-19 12:41:09.000000000 +0000
>+++ net-mgmt/cacti/distinfo	2018-03-03 20:14:59.778175000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1519043380
>-SHA256 (cacti-1.1.35.tar.gz) = eea42008adb699d900bd4555b0c34691389015e0c9dac43fc07e9ddb9a537ffd
>-SIZE (cacti-1.1.35.tar.gz) = 8999651
>+TIMESTAMP = 1520108099
>+SHA256 (cacti-1.1.36.tar.gz) = 9a9cbe54b51a4161ddc84234a7e4210dae279375fd2b1715511d426672327a11
>+SIZE (cacti-1.1.36.tar.gz) = 9018560
>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-08-15 00:20:01.000000000 +0100
>+++ net-mgmt/cacti/files/patch-include__global_settings.php	2018-03-03 20:27:22.906545000 +0000
>@@ -1,10 +1,10 @@
>---- include/global_settings.php.orig	2017-08-13 04:06:37 UTC
>+--- include/global_settings.php.orig	2018-02-26 01:12:03 UTC
> +++ include/global_settings.php
>-@@ -144,9 +144,9 @@ $settings = array(
>+@@ -143,9 +143,9 @@ $settings = array(
>  			),
>  		'path_cactilog' => array(
>  			'friendly_name' => __('Cacti Log Path'),
>--			'description' => __('The path to your Cacti log file (if blank, defaults to <path_cacti>/log/cacti.log)'),
>+-			'description' => __('The path to your Cacti log file (if blank, defaults to &lt;path_cacti&gt;/log/cacti.log)'),
> +			'description' => __('The path to your Cacti log file (if blank, defaults to /var/log/cacti/log)'),
>  			'method' => 'filepath',
> -			'default' => $config['base_path'] . '/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-08-15 00:20:01.000000000 +0100
>+++ net-mgmt/cacti/files/patch-poller_maintenance.php	2018-03-03 20:30:33.309780000 +0000
>@@ -1,19 +1,11 @@
>---- poller_maintenance.php.orig	2017-08-13 04:06:37 UTC
>+--- poller_maintenance.php.orig	2018-02-26 01:12:04 UTC
> +++ poller_maintenance.php
>-@@ -197,14 +197,14 @@ function logrotate_rotatenow () {
>+@@ -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';
>++		$log = /var/log/cacti/log';
>  	}
>  
>- 	set_config_option('logrotate_lastrun', 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);
>+ 	$run_time = time();
>diff -ruN net-mgmt/cacti.orig/pkg-plist net-mgmt/cacti/pkg-plist
>--- net-mgmt/cacti.orig/pkg-plist	2018-02-19 12:41:09.000000000 +0000
>+++ net-mgmt/cacti/pkg-plist	2018-03-03 20:33:39.988837000 +0000
>@@ -436,7 +436,6 @@
> %%CACTIDIR%%/include/js/pace.js
> %%CACTIDIR%%/include/js/screenfull.js
> %%CACTIDIR%%/include/layout.js
>-%%CACTIDIR%%/include/main.css
> %%CACTIDIR%%/include/phpgettext/gettext.php
> %%CACTIDIR%%/include/phpgettext/streams.php
> %%CACTIDIR%%/include/phpmailer/LICENSE
>@@ -1148,6 +1147,7 @@
> %%CACTIDIR%%/install/upgrades/1_1_31.php
> %%CACTIDIR%%/install/upgrades/1_1_34.php
> %%CACTIDIR%%/install/upgrades/1_1_35.php
>+%%CACTIDIR%%/install/upgrades/1_1_36.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 226334: 191186