Attachment 181682 Details for Bug 218351 – Revised patch

[patch] Revised patch

patch.diff (text/plain), 3.43 KB, created by Jonathan Price on 2017-04-11 10:14:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Price

Created: 2017-04-11 10:14:26 UTC

Size: 3.43 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 437919)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	librenms
>-PORTVERSION=	1.25
>+PORTVERSION=	1.26
> PORTEPOCH=	1
> CATEGORIES=	net-mgmt
> 
>@@ -15,16 +15,16 @@
> GH_ACCOUNT=	librenms
> 
> USES=		php:cli python shebangfix
>-SHEBANG_FILES=	mibs/process.pl scripts/deploy-docs.sh scripts/ifAlias \
>+SHEBANG_FILES=	mibs/process.pl scripts/deploy-docs.sh \
> 		scripts/Migration/Standard_Conversion/convert_no_xml.sh \
> 		scripts/Migration/Standard_Conversion/destwork_no_xml.sh \
> 		scripts/Migration/Standard_Conversion/mkdir.sh \
> 		scripts/Migration/XML_Conversion/convert.sh \
> 		scripts/Migration/XML_Conversion/destwork.sh \
>-		scripts/Migration/XML_Conversion/mkdir.sh validate.php \
>+		scripts/Migration/XML_Conversion/mkdir.sh \
> 		scripts/removespikes.php scripts/agent-local/nfs-stats.sh \
> 		scripts/removespikes.pl scripts/watchmaillog/watchmaillog.pl
>-USE_PHP=	ctype filter gd json mcrypt mysqli session snmp tokenizer xml
>+USE_PHP=	ctype curl filter gd hash json mcrypt mysqli openssl session simplexml snmp tokenizer xml
> 
> NO_BUILD=	yes
> 
>@@ -64,12 +64,13 @@
> 
> ROOT_FILES=	addhost.php adduser.php	alerts.php build-base.php build.sql \
> 		billing-calculate.php \
>-		check-services.php config_to_json.php daily.php daily.sh \
>-		delhost.php discovery.php dist-pollers.php irc.php \
>-		poll-billing.php poller.php poller-service.py poller-wrapper.py renamehost.php \
>+		check-services.php composer.json config_to_json.php cronic daily.php daily.sh \
>+		delhost.php discovery-wrapper.py discovery.php dist-pollers.php irc.php \
>+		mkdocs.yml pbin.sh phpunit.xml poll-billing.php poller.php poller-service.py \
>+		poller-wrapper.py readmegen.yml renamehost.php services-wrapper.py \
> 		snmp-scan.php snmptrap.php syslog.php validate.php
> 
>-ROOT_DIRS=	LibreNMS contrib html includes lib mibs scripts sql-schema
>+ROOT_DIRS=	LibreNMS contrib doc html includes lib mibs misc scripts sql-schema tests vendor
> 
> DOCS=		AUTHORS.md CHANGELOG CONTRIBUTING.md LICENSE.txt README.md
> PORTDOCS=	*
>Index: distinfo
>===================================================================
>--- distinfo	(revision 437919)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1489149658
>-SHA256 (librenms-librenms-1.25_GH0.tar.gz) = 7b966c668dd215dd35add4d96f5cb04b63e83956e9db32a962dfd9da2717827d
>-SIZE (librenms-librenms-1.25_GH0.tar.gz) = 55302189
>+TIMESTAMP = 1491554959
>+SHA256 (librenms-librenms-1.26_GH0.tar.gz) = cc76a343296c48a6a2423efc9138e2a52d2827178ba733c0714dc6ef38d264e8
>+SIZE (librenms-librenms-1.26_GH0.tar.gz) = 57165188
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 437919)
>+++ files/pkg-message.in	(working copy)
>@@ -19,5 +19,9 @@
> 33	*/6	*	*	*	www	cd %%WWWDIR%% && %%PHP%% discovery.php -h all >> /dev/null 2>&1
> */5	*	*	*	*	www	cd %%WWWDIR%% && %%PHP%% discovery.php -h new >> /dev/null 2>&1
> */5	*	*	*	*	www	cd %%WWWDIR%% && %%PYTHON%% poller-wrapper.py 16 >> /dev/null 2>&1
>-15	0	*	*	*	www	sh %%WWWDIR%%/daily.sh >> /dev/null 2>&1
>+15	0	*	*	*	www	%%LOCALBASE%%/bin/bash %%WWWDIR%%/daily.sh >> /dev/null 2>&1
> *	*	*	*	*	www	%%PHP%% %%WWWDIR%%/alerts.php >> /dev/null 2>&1
>+*/5 	*	*	*	*	www	%%PHP%% %%WWWDIR%%/poll-billing.php >> /dev/null 2>&1
>+01	*	*	*	*	www	%%PHP%% %%WWWDIR%%/billing-calculate.php >> /dev/null 2>&1
>+*/5	*	*	*	*	www	%%PHP%% %%WWWDIR%%/check-services.php >> /dev/null 2>&1
>+

Actions: View | Diff

Attachments on bug 218351: 181565 | 181682 | 181691 | 181693