Attachment 203285 Details for Bug 236927 – Update cacti to 1.2.3

[patch] Update cacti to 1.2.3

20190331-cacti.diff (text/plain), 5.24 KB, created by Daniel Austin on 2019-04-01 06:55:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2019-04-01 06:55:43 UTC

Size: 5.24 KB

patch

obsolete

>diff -ruN net-mgmt/cacti.orig/Makefile net-mgmt/cacti/Makefile
>--- net-mgmt/cacti.orig/Makefile	2019-01-25 15:16:06.000000000 +0000
>+++ net-mgmt/cacti/Makefile	2019-03-31 14:49:23.425094000 +0100
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/net-mgmt/cacti/Makefile 491152 2019-01-25 15:16:06Z swills $
> 
> PORTNAME=	cacti
>-PORTVERSION=	1.2.1
>+PORTVERSION=	1.2.3
> 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	2019-01-25 15:16:06.000000000 +0000
>+++ net-mgmt/cacti/distinfo	2019-03-31 14:49:40.569167000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1548269224
>-SHA256 (cacti-1.2.1.tar.gz) = c1cd7c2417253c72e499c97a01123b1561de67aa6406dd2b687f05b7ce05309a
>-SIZE (cacti-1.2.1.tar.gz) = 23775742
>+TIMESTAMP = 1554040180
>+SHA256 (cacti-1.2.3.tar.gz) = 3bd711cb425d51defbcc6d7f5761f886822fd3d004977bb74eca202431cdf51c
>+SIZE (cacti-1.2.3.tar.gz) = 23977004
>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	2019-01-06 16:32:03.000000000 +0000
>+++ net-mgmt/cacti/files/patch-include__global.php	2019-03-31 21:50:06.966523000 +0100
>@@ -1,6 +1,6 @@
>---- include/global.php.orig	2019-01-03 02:14:26 UTC
>+--- include/global.php.orig	2019-03-30 23:40:22 UTC
> +++ include/global.php
>-@@ -173,7 +173,7 @@ if ($config['cacti_server_os'] == 'win32') {
>+@@ -216,7 +216,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-install__functions.php net-mgmt/cacti/files/patch-install__functions.php
>--- net-mgmt/cacti.orig/files/patch-install__functions.php	2019-01-06 16:32:03.000000000 +0000
>+++ net-mgmt/cacti/files/patch-install__functions.php	2019-03-31 21:50:06.974889000 +0100
>@@ -1,11 +1,11 @@
>---- install/functions.php.orig	2019-01-03 02:14:26 UTC
>+--- install/functions.php.orig	2019-03-30 23:40:23 UTC
> +++ install/functions.php
>-@@ -528,7 +528,7 @@ function install_file_paths() {
>- 	/* log file path */
>- 	$input['path_cactilog'] = $settings['path']['path_cactilog'];
>- 	if (empty($input['path_cactilog']['default'])) {
>--		$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
>-+		$input['path_cactilog']['default'] = '/var/log/cacti/log';
>- 	}
>- 
>- 	/* stderr log file path */
>+@@ -533,7 +533,7 @@ function install_file_paths() {
>+ 	if (!config_value_exists('path_cactilog')) {
>+ 		$input['path_cactilog'] = $settings['path']['path_cactilog'];
>+ 		if (empty($input['path_cactilog']['default'])) {
>+-			$input['path_cactilog']['default'] = $config['base_path'] . '/log/cacti.log';
>++			$input['path_cactilog']['default'] = '/var/log/cacti/log';
>+ 		}
>+ 	} else {
>+ 		$input['path_cactilog'] = $settings['path']['path_cactilog'];
>diff -ruN net-mgmt/cacti.orig/pkg-plist net-mgmt/cacti/pkg-plist
>--- net-mgmt/cacti.orig/pkg-plist	2019-01-25 15:16:06.000000000 +0000
>+++ net-mgmt/cacti/pkg-plist	2019-03-31 21:54:23.301548000 +0100
>@@ -1635,10 +1635,13 @@
> %%CACTIDIR%%/include/vendor/index.php
> %%CACTIDIR%%/include/vendor/phpgettext/gettext.php
> %%CACTIDIR%%/include/vendor/phpgettext/streams.php
>+%%CACTIDIR%%/include/vendor/phpmailer/COMMITMENT
> %%CACTIDIR%%/include/vendor/phpmailer/LICENSE
> %%CACTIDIR%%/include/vendor/phpmailer/README.md
> %%CACTIDIR%%/include/vendor/phpmailer/SECURITY.md
> %%CACTIDIR%%/include/vendor/phpmailer/VERSION
>+%%CACTIDIR%%/include/vendor/phpmailer/composer.json
>+%%CACTIDIR%%/include/vendor/phpmailer/get_oauth_token.php
> %%CACTIDIR%%/include/vendor/phpmailer/index.php
> %%CACTIDIR%%/include/vendor/phpmailer/language/index.php
> %%CACTIDIR%%/include/vendor/phpmailer/language/phpmailer.lang-am.php
>@@ -1738,6 +1741,7 @@
> %%CACTIDIR%%/install/install.js
> %%CACTIDIR%%/install/install.php
> %%CACTIDIR%%/install/step_json.php
>+%%CACTIDIR%%/install/templates/Cacti_Stats.xml.gz
> %%CACTIDIR%%/install/templates/Generic_SNMP_Device.xml.gz
> %%CACTIDIR%%/install/templates/Local_Linux_Machine.xml.gz
> %%CACTIDIR%%/install/templates/NetSNMP_Device.xml.gz
>@@ -1782,6 +1786,8 @@
> %%CACTIDIR%%/install/upgrades/1_1_37.php
> %%CACTIDIR%%/install/upgrades/1_2_0.php
> %%CACTIDIR%%/install/upgrades/1_2_1.php
>+%%CACTIDIR%%/install/upgrades/1_2_2.php
>+%%CACTIDIR%%/install/upgrades/1_2_3.php
> %%CACTIDIR%%/install/upgrades/index.php
> %%CACTIDIR%%/lib/aggregate.php
> %%CACTIDIR%%/lib/api_aggregate.php
>@@ -1803,6 +1809,7 @@
> %%CACTIDIR%%/lib/export.php
> %%CACTIDIR%%/lib/functions.php
> %%CACTIDIR%%/lib/graph_variables.php
>+%%CACTIDIR%%/lib/graphs.php
> %%CACTIDIR%%/lib/html.php
> %%CACTIDIR%%/lib/html_filter.php
> %%CACTIDIR%%/lib/html_form.php
>@@ -1882,6 +1889,7 @@
> %%CACTIDIR%%/locales/po/vi-VN.po
> %%CACTIDIR%%/locales/po/zh-CN.po
> %%CACTIDIR%%/locales/po/zh-TW.po
>+%%CACTIDIR%%/locales/update-pot.sh
> %%CACTIDIR%%/logout.php
> %%CACTIDIR%%/managers.php
> %%CACTIDIR%%/mibs/CACTI-BOOST-MIB
>@@ -1936,6 +1944,7 @@
> %%CACTIDIR%%/scripts/ss_fping.php
> %%CACTIDIR%%/scripts/ss_host_cpu.php
> %%CACTIDIR%%/scripts/ss_host_disk.php
>+%%CACTIDIR%%/scripts/ss_hstats.php
> %%CACTIDIR%%/scripts/ss_net_snmp_disk_bytes.php
> %%CACTIDIR%%/scripts/ss_net_snmp_disk_io.php
> %%CACTIDIR%%/scripts/ss_sql.php

Flags:

freebsd-ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 236927: 203285