Attachment #181735 for bug #218608

Lines 4-9 Link Here

(-)Makefile (+3 lines)
4	PORTNAME= librenms	4	PORTNAME= librenms
5	PORTVERSION= 1.26	5	PORTVERSION= 1.26
6	PORTEPOCH= 1	6	PORTEPOCH= 1
		7	PORTREVISION= 1
7	CATEGORIES= net-mgmt	8	CATEGORIES= net-mgmt
8		9
9	MAINTAINER= bofh@FreeBSD.org	10	MAINTAINER= bofh@FreeBSD.org
Lines 149-154 Link Here
149	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}	150	@${ECHO_CMD} "@group ${WWWGRP}" >> ${TMPPLIST}
150	@${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d \| ${SORT} \| \	151	@${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d \| ${SORT} \| \
151	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}	152	${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
		153	@${FIND} -s ${STAGEDIR}${WWWDIR} -type d \| \
		154	${SED} -e 's#^${STAGEDIR}#@dir #' >> ${TMPPLIST}
152	${INSTALL_DATA} ${WRKSRC}/config.php.default \	155	${INSTALL_DATA} ${WRKSRC}/config.php.default \
153	${STAGEDIR}/${WWWDIR}/config.php.sample	156	${STAGEDIR}/${WWWDIR}/config.php.sample
154	@${ECHO} @sample ${WWWDIR}/config.php.sample >> ${TMPPLIST}	157	@${ECHO} @sample ${WWWDIR}/config.php.sample >> ${TMPPLIST}




--- 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) {

Lines 16-21 Link Here

(-)files/pkg-message.in (+1 lines)
16	- Installation directory is %%WWWDIR%%	16	- Installation directory is %%WWWDIR%%
17	- The following lines should be added to /etc/crontab:	17	- The following lines should be added to /etc/crontab:
18		18
		19	PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
19	33 /6 * * www cd %%WWWDIR%% && %%PHP%% discovery.php -h all >> /dev/null 2>&1	20	33 /6 * * www cd %%WWWDIR%% && %%PHP%% discovery.php -h all >> /dev/null 2>&1
20	/5 * * * www cd %%WWWDIR%% && %%PHP%% discovery.php -h new >> /dev/null 2>&1	21	/5 * * * www cd %%WWWDIR%% && %%PHP%% discovery.php -h new >> /dev/null 2>&1
21	/5 * * * www cd %%WWWDIR%% && %%PYTHON%% poller-wrapper.py 16 >> /dev/null 2>&1	22	/5 * * * www cd %%WWWDIR%% && %%PYTHON%% poller-wrapper.py 16 >> /dev/null 2>&1

Return to bug 218608

Line 0 Link Here

(-)files/patch-validate.php (+39 lines)
	1	--- validate.php.orig 2017-04-11 18:45:34 UTC
	2	+++ validate.php
	3	@@ -108,13 +108,6 @@ if (!($username === 'root' \|\| (isset($co
	4	print_fail('You need to run this script as root' . (isset($config['user']) ? ' or '.$config['user'] : ''));
	5	}
	6
	7	-if ($git_found === true) {
	8	- if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) {
	9	- $commit_date = new DateTime('@'.$versions['local_date'], new DateTimeZone(date_default_timezone_get()));
	10	- print_warn("Your install is out of date, last update: " . $commit_date->format('r'));
	11	- }
	12	-}
	13	-
	14	// Check php modules we use to make sure they are loaded
	15	$extensions = array('pcre','curl','session','snmp','mcrypt');
	16	foreach ($extensions as $extension) {
	17	@@ -302,22 +295,6 @@ if (dbFetchCell('SELECT COUNT(*) FROM `d
	18	}
	19
	20
	21	-if ($git_found === true) {
	22	- if ($versions['local_branch'] != 'master') {
	23	- print_warn("Your local git branch is not master, this will prevent automatic updates.");
	24	- }
	25	-
	26	- // check for modified files
	27	- $modifiedcmd = 'git diff --name-only --exit-code';
	28	- if ($username === 'root') {
	29	- $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';
	30	- }
	31	- exec($modifiedcmd, $cmdoutput, $code);
	32	- if ($code !== 0 && !empty($cmdoutput)) {
	33	- print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");
	34	- print_list($cmdoutput, "\t %s\n");
	35	- }
	36	-}
	37	// Modules test
	38	$modules = explode(',', $options['m']);
	39	foreach ($modules as $module) {