Attachment 182085 Details for Bug 217707 – Update cacti to 1.1.4

[patch] Update cacti to 1.1.4

20170425-cacti.diff (text/plain), 10.85 KB, created by Daniel Austin on 2017-04-25 17:21:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Austin

Created: 2017-04-25 17:21:38 UTC

Size: 10.85 KB

patch

obsolete

>diff -ruN net-mgmt/cacti.orig/Makefile net-mgmt/cacti/Makefile
>--- net-mgmt/cacti.orig/Makefile	2017-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/Makefile	2017-04-25 08:59:53.844677000 +0100
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/net-mgmt/cacti/Makefile 433809 2017-02-10 15:50:53Z vanilla $
> 
> PORTNAME=	cacti
>-PORTVERSION=	1.0.1
>+PORTVERSION=	1.1.4
> CATEGORIES=	net-mgmt www
> MASTER_SITES=	http://www.cacti.net/downloads/ \
> 		ftp://ftpmirror.uk/freebsd-ports/cacti/
>@@ -15,10 +15,9 @@
> RUN_DEPENDS=	rrdtool:databases/rrdtool
> 
> USES=		cpe mysql php:web shebangfix
>-USE_PHP=	ctype filter gd gmp hash json ldap mbstring openssl pcre pdo pdo_mysql posix session simplexml sockets snmp xml zlib
>+USE_PHP=	ctype filter gd gettext gmp hash json ldap mbstring openssl pcre pdo pdo_mysql posix session simplexml sockets snmp xml zlib
> NO_ARCH=	yes
> NO_BUILD=	yes
>-PKGMESSAGE=	${WRKDIR}/pkg-message
> SUB_FILES=	pkg-message
> SHEBANG_FILES=	scripts/3com_cable_modem.pl \
> 		scripts/diskfree.pl \
>@@ -40,10 +39,6 @@
> USERS?=		${CACTIUSER}
> GROUPS?=	${CACTIGROUP}
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${SITEDISTVERSION}
>-
>-SITEDISTVERSION=	${PORTVERSION:S/${PATCHLEVEL}$//}
>-
> PLIST_SUB+=	CACTIDIR=${CACTIDIR}  CACTIUSER=${CACTIUSER} \
> 		CACTIGROUP=${CACTIGROUP}
> SUB_LIST+=	CACTIDIR=${CACTIDIR} CACTIUSER=${CACTIUSER} \
>diff -ruN net-mgmt/cacti.orig/distinfo net-mgmt/cacti/distinfo
>--- net-mgmt/cacti.orig/distinfo	2017-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/distinfo	2017-04-25 08:55:55.381161000 +0100
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1486494702
>-SHA256 (cacti-1.0.1.tar.gz) = cc36b83653cecd2be0a4a239927dcdaafeb81e7fd7ad6f97c664edcb7fb07628
>-SIZE (cacti-1.0.1.tar.gz) = 7230227
>+TIMESTAMP = 1493106955
>+SHA256 (cacti-1.1.4.tar.gz) = a8eb7f8bec3e5950d91740305cd03ab4100ee5f0ef51758a24b0452153a1a6e4
>+SIZE (cacti-1.1.4.tar.gz) = 7845591
>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-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/files/patch-poller_maintenance.php	2017-04-25 14:27:31.716063000 +0100
>@@ -1,14 +1,17 @@
>---- poller_maintenance.php.orig	2017-02-04 14:23:37.951265000 +0000
>-+++ poller_maintenance.php	2017-02-04 14:24:49.403929000 +0000
>-@@ -172,10 +172,10 @@
>-  */
>- function logrotate_rotatenow () {
>- 	global $config;
>--	$log = $config['base_path'] . '/log/cacti.log';
>-+	$log = '/var/log/cacti/log';
>+--- 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 @@
>+ 
>+ 	$log = read_config_option('path_cactilog');
>+ 	if ($log == '') {
>+-		$log = $config['base_path'] . '/log/cacti.log';
>++		$log = '/var/log/cacti/log';
>+ 	}
>+ 
>  	set_config_option('logrotate_lastrun', time());
>  	clearstatcache();
>--	if (is_writable($config['base_path'] . '/log/') && is_writable($log)) {
>+ 
>+-	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);
>diff -ruN net-mgmt/cacti.orig/pkg-plist net-mgmt/cacti/pkg-plist
>--- net-mgmt/cacti.orig/pkg-plist	2017-02-10 15:50:53.000000000 +0000
>+++ net-mgmt/cacti/pkg-plist	2017-04-25 14:33:07.949511000 +0100
>@@ -197,6 +197,7 @@
> %%CACTIDIR%%/images/%%CACTIUSER%%_about_logo.gif
> %%CACTIDIR%%/images/%%CACTIUSER%%_backdrop.gif
> %%CACTIDIR%%/images/%%CACTIUSER%%_backdrop2.gif
>+%%CACTIDIR%%/images/%%CACTIUSER%%_error_image.png
> %%CACTIDIR%%/images/%%CACTIUSER%%_logo.gif
> %%CACTIDIR%%/images/%%CACTIUSER%%_logo_new.gif
> %%CACTIDIR%%/images/calendar.gif
>@@ -263,6 +264,7 @@
> %%CACTIDIR%%/images/transparent_line.gif
> %%CACTIDIR%%/images/tree.png
> %%CACTIDIR%%/images/uninstall_icon.gif
>+%%CACTIDIR%%/images/view_aggregate_children.png
> %%CACTIDIR%%/images/view_none.gif
> %%CACTIDIR%%/images/view_page.png
> %%CACTIDIR%%/include/auth.php
>@@ -280,6 +282,7 @@
> %%CACTIDIR%%/include/csrf/csrf-magic.php
> %%CACTIDIR%%/include/csrf/index.php
> %%CACTIDIR%%/include/fa/css/font-awesome.css
>+%%CACTIDIR%%/include/fa/css/font-awesome.css.map
> %%CACTIDIR%%/include/fa/css/font-awesome.min.css
> %%CACTIDIR%%/include/fa/css/index.php
> %%CACTIDIR%%/include/fa/fonts/FontAwesome.otf
>@@ -379,6 +382,7 @@
> %%CACTIDIR%%/include/js/jquery-ui.js
> %%CACTIDIR%%/include/js/jstree.js
> %%CACTIDIR%%/include/js/pace.js
>+%%CACTIDIR%%/include/js/screenfull.js
> %%CACTIDIR%%/include/layout.js
> %%CACTIDIR%%/include/main.css
> %%CACTIDIR%%/include/phpgettext/gettext.php
>@@ -756,7 +760,9 @@
> %%CACTIDIR%%/include/themes/classic/images/bar-opacity.png
> %%CACTIDIR%%/include/themes/classic/images/bar-pointer.png
> %%CACTIDIR%%/include/themes/classic/images/bar.png
>+%%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.gif
> %%CACTIDIR%%/include/themes/classic/images/%%CACTIUSER%%_logo.svg
>+%%CACTIDIR%%/include/themes/classic/images/favicon.ico
> %%CACTIDIR%%/include/themes/classic/images/index.php
> %%CACTIDIR%%/include/themes/classic/images/map-opacity.png
> %%CACTIDIR%%/include/themes/classic/images/map-pointer.png
>@@ -816,7 +822,9 @@
> %%CACTIDIR%%/include/themes/dark/images/bar.png
> %%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop.gif
> %%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_backdrop2.gif
>+%%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.gif
> %%CACTIDIR%%/include/themes/dark/images/%%CACTIUSER%%_logo.svg
>+%%CACTIDIR%%/include/themes/dark/images/favicon.ico
> %%CACTIDIR%%/include/themes/dark/images/index.php
> %%CACTIDIR%%/include/themes/dark/images/map-opacity.png
> %%CACTIDIR%%/include/themes/dark/images/map-pointer.png
>@@ -862,7 +870,9 @@
> %%CACTIDIR%%/include/themes/modern/images/bar-opacity.png
> %%CACTIDIR%%/include/themes/modern/images/bar-pointer.png
> %%CACTIDIR%%/include/themes/modern/images/bar.png
>+%%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.gif
> %%CACTIDIR%%/include/themes/modern/images/%%CACTIUSER%%_logo.svg
>+%%CACTIDIR%%/include/themes/modern/images/favicon.ico
> %%CACTIDIR%%/include/themes/modern/images/index.php
> %%CACTIDIR%%/include/themes/modern/images/map-opacity.png
> %%CACTIDIR%%/include/themes/modern/images/map-pointer.png
>@@ -895,6 +905,53 @@
> %%CACTIDIR%%/include/themes/modern/main.js
> %%CACTIDIR%%/include/themes/modern/pace.css
> %%CACTIDIR%%/include/themes/modern/rrdtheme.php
>+%%CACTIDIR%%/include/themes/paper-plane/c3.css
>+%%CACTIDIR%%/include/themes/paper-plane/default/32px.png
>+%%CACTIDIR%%/include/themes/paper-plane/default/40px.png
>+%%CACTIDIR%%/include/themes/paper-plane/default/index.php
>+%%CACTIDIR%%/include/themes/paper-plane/default/style.css
>+%%CACTIDIR%%/include/themes/paper-plane/default/style.min.css
>+%%CACTIDIR%%/include/themes/paper-plane/default/throbber.gif
>+%%CACTIDIR%%/include/themes/paper-plane/images/bar-alpha.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/bar-opacity.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/bar-pointer.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/bar.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.gif
>+%%CACTIDIR%%/include/themes/paper-plane/images/%%CACTIUSER%%_logo.svg
>+%%CACTIDIR%%/include/themes/paper-plane/images/favicon.ico
>+%%CACTIDIR%%/include/themes/paper-plane/images/index.php
>+%%CACTIDIR%%/include/themes/paper-plane/images/map-opacity.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/map-pointer.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/map.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/preview-opacity.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/tab_list.gif
>+%%CACTIDIR%%/include/themes/paper-plane/images/tab_preview.gif
>+%%CACTIDIR%%/include/themes/paper-plane/images/tab_tree.gif
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_flat_0_aaaaaa_40x100.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_flat_75_ffffff_40x100.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_55_fbf9ee_1x400.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_65_ffffff_1x400.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_75_dadada_1x400.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_75_e6e6e6_1x400.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_glass_95_fef1ec_1x400.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-bg_highlight-soft_75_cccccc_1x100.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-colorpicker.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_222222_256x240.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_2e83ff_256x240.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_454545_256x240.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_888888_256x240.png
>+%%CACTIDIR%%/include/themes/paper-plane/images/ui-icons_cd0a0a_256x240.png
>+%%CACTIDIR%%/include/themes/paper-plane/index.php
>+%%CACTIDIR%%/include/themes/paper-plane/jquery-ui.css
>+%%CACTIDIR%%/include/themes/paper-plane/jquery-ui.org.css
>+%%CACTIDIR%%/include/themes/paper-plane/jquery.colorpicker.css
>+%%CACTIDIR%%/include/themes/paper-plane/jquery.multiselect.css
>+%%CACTIDIR%%/include/themes/paper-plane/jquery.timepicker.css
>+%%CACTIDIR%%/include/themes/paper-plane/jquery.zoom.css
>+%%CACTIDIR%%/include/themes/paper-plane/main.css
>+%%CACTIDIR%%/include/themes/paper-plane/main.js
>+%%CACTIDIR%%/include/themes/paper-plane/pace.css
>+%%CACTIDIR%%/include/themes/paper-plane/rrdtheme.php
> %%CACTIDIR%%/include/themes/paw/c3.css
> %%CACTIDIR%%/include/themes/paw/default/32px.png
> %%CACTIDIR%%/include/themes/paw/default/40px.png
>@@ -906,7 +963,9 @@
> %%CACTIDIR%%/include/themes/paw/images/bar-opacity.png
> %%CACTIDIR%%/include/themes/paw/images/bar-pointer.png
> %%CACTIDIR%%/include/themes/paw/images/bar.png
>+%%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.gif
> %%CACTIDIR%%/include/themes/paw/images/%%CACTIUSER%%_logo.svg
>+%%CACTIDIR%%/include/themes/paw/images/favicon.ico
> %%CACTIDIR%%/include/themes/paw/images/index.php
> %%CACTIDIR%%/include/themes/paw/images/map-opacity.png
> %%CACTIDIR%%/include/themes/paw/images/map-pointer.png
>@@ -978,6 +1037,16 @@
> %%CACTIDIR%%/install/0_8_8h_to_1_0_0.php
> %%CACTIDIR%%/install/0_8_to_0_8_1.php
> %%CACTIDIR%%/install/1_0_0_to_1_0_1.php
>+%%CACTIDIR%%/install/1_0_1_to_1_0_2.php
>+%%CACTIDIR%%/install/1_0_2_to_1_0_3.php
>+%%CACTIDIR%%/install/1_0_3_to_1_0_4.php
>+%%CACTIDIR%%/install/1_0_4_to_1_0_5.php
>+%%CACTIDIR%%/install/1_0_5_to_1_0_6.php
>+%%CACTIDIR%%/install/1_0_6_to_1_1_0.php
>+%%CACTIDIR%%/install/1_1_0_to_1_1_1.php
>+%%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/colors.csv
> %%CACTIDIR%%/install/functions.php
> %%CACTIDIR%%/install/import_colors.php
>@@ -1045,6 +1114,8 @@
> %%CACTIDIR%%/locales/LC_MESSAGES/spanish_spain.mo
> %%CACTIDIR%%/locales/LC_MESSAGES/swedish_sweden.mo
> %%CACTIDIR%%/locales/po/%%CACTIUSER%%.pot
>+%%CACTIDIR%%/locales/po/german_germany.po
>+%%CACTIDIR%%/locales/po/russian_russia.po
> %%CACTIDIR%%/logout.php
> %%CACTIDIR%%/managers.php
> %%CACTIDIR%%/mibs/CACTI-BOOST-MIB

Flags:

freebsd-ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 217707: 180727 | 182085