Attachment 181735 Details for Bug 218608 – Patch file

[patch] Patch file

patch.diff (text/plain), 3.40 KB, created by Jonathan Price on 2017-04-12 18:14:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Price

Created: 2017-04-12 18:14:39 UTC

Size: 3.40 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 438399)
>+++ Makefile	(working copy)
>@@ -4,6 +4,7 @@
> PORTNAME=	librenms
> PORTVERSION=	1.26
> PORTEPOCH=	1
>+PORTREVISION=	1
> CATEGORIES=	net-mgmt
> 
> MAINTAINER=	bofh@FreeBSD.org
>@@ -149,6 +150,8 @@
> 	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
> 	@${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \
> 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
>+	@${FIND} -s ${STAGEDIR}${WWWDIR} -type d | \
>+		${SED} -e 's#^${STAGEDIR}#@dir #' >> ${TMPPLIST}
> 	${INSTALL_DATA} ${WRKSRC}/config.php.default \
> 	       ${STAGEDIR}/${WWWDIR}/config.php.sample
> 	@${ECHO} @sample ${WWWDIR}/config.php.sample >> ${TMPPLIST}
>Index: files/patch-validate.php
>===================================================================
>--- files/patch-validate.php	(nonexistent)
>+++ files/patch-validate.php	(working copy)
>@@ -0,0 +1,39 @@
>+--- validate.php.orig	2017-04-11 18:45:34 UTC
>++++ validate.php
>+@@ -108,13 +108,6 @@ if (!($username === 'root' || (isset($co
>+     print_fail('You need to run this script as root' . (isset($config['user']) ? ' or '.$config['user'] : ''));
>+ }
>+ 
>+-if ($git_found === true) {
>+-    if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) {
>+-        $commit_date = new DateTime('@'.$versions['local_date'], new DateTimeZone(date_default_timezone_get()));
>+-        print_warn("Your install is out of date, last update: " . $commit_date->format('r'));
>+-    }
>+-}
>+-
>+ // Check php modules we use to make sure they are loaded
>+ $extensions = array('pcre','curl','session','snmp','mcrypt');
>+ foreach ($extensions as $extension) {
>+@@ -302,22 +295,6 @@ if (dbFetchCell('SELECT COUNT(*) FROM `d
>+ }
>+ 
>+ 
>+-if ($git_found === true) {
>+-    if ($versions['local_branch'] != 'master') {
>+-        print_warn("Your local git branch is not master, this will prevent automatic updates.");
>+-    }
>+-
>+-    // check for modified files
>+-    $modifiedcmd = 'git diff --name-only --exit-code';
>+-    if ($username === 'root') {
>+-        $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';
>+-    }
>+-    exec($modifiedcmd, $cmdoutput, $code);
>+-    if ($code !== 0 && !empty($cmdoutput)) {
>+-        print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");
>+-        print_list($cmdoutput, "\t %s\n");
>+-    }
>+-}
>+ // Modules test
>+ $modules = explode(',', $options['m']);
>+ foreach ($modules as $module) {
>
>Property changes on: files/patch-validate.php
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/pkg-message.in
>===================================================================
>--- files/pkg-message.in	(revision 438399)
>+++ files/pkg-message.in	(working copy)
>@@ -16,6 +16,7 @@
> - Installation directory is %%WWWDIR%%
> - The following lines should be added to /etc/crontab:
> 
>+PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
> 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

Actions: View | Diff

Attachments on bug 218608: 181735 | 182437