Attachment #185065 for bug #221260

View | Details | Raw Unified | Return to bug 221260
Collapse All | Expand All

Lines 2-8 Link Here

(-)net-mgmt/librenms/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= librenms	4	PORTNAME= librenms
5	PORTVERSION= 1.28	5	PORTVERSION= 1.30
6	PORTEPOCH= 1	6	PORTEPOCH= 1
7	CATEGORIES= net-mgmt	7	CATEGORIES= net-mgmt
8		8
Lines 87-93 Link Here
87	delhost.php discovery-wrapper.py discovery.php dist-pollers.php irc.php \	87	delhost.php discovery-wrapper.py discovery.php dist-pollers.php irc.php \
88	mkdocs.yml pbin.sh phpunit.xml poll-billing.php poller.php poller-service.py \	88	mkdocs.yml pbin.sh phpunit.xml poll-billing.php poller.php poller-service.py \
89	poller-wrapper.py readmegen.yml renamehost.php services-wrapper.py \	89	poller-wrapper.py readmegen.yml renamehost.php services-wrapper.py \
90	snmp-scan.php snmptrap.php syslog.php validate.php	90	snmptrap.php syslog.php validate.php
91		91
92	ROOT_DIRS= LibreNMS contrib doc html includes lib mibs misc scripts sql-schema tests vendor	92	ROOT_DIRS= LibreNMS contrib doc html includes lib mibs misc scripts sql-schema tests vendor
93		93

Lines 1-3 Link Here

(-)net-mgmt/librenms/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1496573562	1	TIMESTAMP = 1501701207
2	SHA256 (librenms-librenms-1.28_GH0.tar.gz) = ef77dbbbd90c67f2620f1eb2ff57d07903faca9e2a54b20e5fbe9cc247fe4a91	2	SHA256 (librenms-librenms-1.30_GH0.tar.gz) = 36bca9cf97a4e7af53f57e5afe38c8ebd295f50a39496429de6b672873ca4ddf
3	SIZE (librenms-librenms-1.28_GH0.tar.gz) = 57805277	3	SIZE (librenms-librenms-1.30_GH0.tar.gz) = 59717251




--- daily.sh.orig	2017-07-30 08:31:34.000000000 +0000
+++ daily.sh	2017-08-05 22:02:25.038764000 +0000
@@ -123,29 +123,6 @@
     fi
 
     if [[ -z "$arg" ]]; then

-            exit
-        elif [[ "$up" == "1" ]]; then
-            # Update to Master-Branch
-            git checkout vendor/ --quiet > /dev/null 2>&1
-            old_ver=$(git show --pretty="%H" -s HEAD)
-            status_run 'Updating to latest codebase' 'git pull --quiet' 'update'
-            new_ver=$(git show --pretty="%H" -s HEAD)

-            fi
-        elif [[ "$up" == "3" ]]; then
-            # Update to last Tag
-            git checkout vendor/ --quiet > /dev/null 2>&1
-            old_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
-            status_run 'Updating to latest release' 'git fetch --tags && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))' 'update'
-            new_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))

 
         cnf=$(echo $(grep '\[.distributed_poller.\]' config.php | egrep -v -e '^//' -e '^#' | cut -d = -f 2 | sed 's/;//g'))
         if ((${BASH_VERSINFO[0]} < 4)); then
@@ -167,7 +146,6 @@ main () {
             post-pull)
                 # List all tasks to do after pull in the order of execution
                 status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
-                status_run 'Updating submodules' "$DAILY_SCRIPT submodules"
                 status_run 'Cleaning up DB' "$DAILY_SCRIPT cleanup"
                 status_run 'Fetching notifications' "$DAILY_SCRIPT notifications"
                 status_run 'Caching PeeringDB data' "$DAILY_SCRIPT peeringdb"




--- includes/common.php.orig	2017-07-30 08:31:34.000000000 +0000
+++ includes/common.php	2017-08-05 22:10:23.012133000 +0000
@@ -1117,11 +1117,9 @@
             curl_setopt($api, CURLOPT_CONNECTTIMEOUT, 5);
             $output['github'] = json_decode(curl_exec($api), true);
         }
-        list($local_sha, $local_date) = explode('|', rtrim(`git show --pretty='%H|%ct' -s HEAD`));
-        $output['local_ver']    = rtrim(`git describe --tags`);
-        $output['local_sha']    = $local_sha;
+        $output['local_ver']    = '%%PORTVERSION%%';
+        $output['local_sha']    = '%%PORTVERSION%%';
         $output['local_date']   = $local_date;
-        $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
     }
     $output['db_schema']   = get_db_schema() ?: '?';
     $output['php_ver']     = phpversion();




--- includes/defaults.inc.php.orig	2017-07-30 08:31:34.000000000 +0000
+++ includes/defaults.inc.php	2017-08-05 22:26:45.770086000 +0000
@@ -42,24 +42,24 @@
 $config['own_hostname'] = 'localhost';
 
 // Location of executables
-$config['rrdtool']                  = '/usr/bin/rrdtool';
+$config['rrdtool']                  = '/usr/local/bin/rrdtool';
 $config['rrdtool_version']          = 1.4; // Doesn't need to contain minor numbers.
-$config['fping']                    = '/usr/bin/fping';
-$config['fping6']                   = 'fping6';
+$config['fping']                    = '/usr/local/sbin/fping';
 $config['fping6']                   = 'fping6';
 $config['fping_options']['retries'] = 3;
 $config['fping_options']['timeout'] = 500;
 $config['fping_options']['count']   = 3;

+$config['ping']           = '/sbin/ping';
+$config['mtr']            = '/usr/local/bin/mtr';
+$config['nmap']           = '/usr/local/bin/nmap';
+$config['nagios_plugins'] = '/usr/local/libexec/plugins';
+$config['ipmitool']       = '/usr/local/bin/ipmitool';
+$config['virsh']          = '/usr/local/bin/virsh';
+$config['dot']            = '/usr/local/bin/dot';

Return to bug 221260

Lines 1-6 Link Here

(-)net-mgmt/librenms/files/patch-daily.sh (-11 / +5 lines)
1	--- daily.sh.orig 2017-03-26 12:06:00 UTC	1	--- daily.sh.orig 2017-07-30 08:31:34.000000000 +0000
2	+++ daily.sh	2	+++ daily.sh 2017-08-05 22:02:25.038764000 +0000
3	@@ -123,27 +123,6 @@ main () {	3	@@ -123,29 +123,6 @@
4	fi	4	fi
5		5
6	if [[ -z "$arg" ]]; then	6	if [[ -z "$arg" ]]; then
Lines 10-15 Link Here
10	- exit	10	- exit
11	- elif [[ "$up" == "1" ]]; then	11	- elif [[ "$up" == "1" ]]; then
12	- # Update to Master-Branch	12	- # Update to Master-Branch
		13	- git checkout vendor/ --quiet > /dev/null 2>&1
13	- old_ver=$(git show --pretty="%H" -s HEAD)	14	- old_ver=$(git show --pretty="%H" -s HEAD)
14	- status_run 'Updating to latest codebase' 'git pull --quiet' 'update'	15	- status_run 'Updating to latest codebase' 'git pull --quiet' 'update'
15	- new_ver=$(git show --pretty="%H" -s HEAD)	16	- new_ver=$(git show --pretty="%H" -s HEAD)
Lines 18-23 Link Here
18	- fi	19	- fi
19	- elif [[ "$up" == "3" ]]; then	20	- elif [[ "$up" == "3" ]]; then
20	- # Update to last Tag	21	- # Update to last Tag
		22	- git checkout vendor/ --quiet > /dev/null 2>&1
21	- old_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))	23	- old_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
22	- status_run 'Updating to latest release' 'git fetch --tags && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))' 'update'	24	- status_run 'Updating to latest release' 'git fetch --tags && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))' 'update'
23	- new_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))	25	- new_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
Lines 28-38 Link Here
28		30
29	cnf=$(echo $(grep '\[.distributed_poller.\]' config.php \| egrep -v -e '^//' -e '^#' \| cut -d = -f 2 \| sed 's/;//g'))	31	cnf=$(echo $(grep '\[.distributed_poller.\]' config.php \| egrep -v -e '^//' -e '^#' \| cut -d = -f 2 \| sed 's/;//g'))
30	if ((${BASH_VERSINFO[0]} < 4)); then	32	if ((${BASH_VERSINFO[0]} < 4)); then
31	@@ -167,7 +146,6 @@ main () {
32	post-pull)
33	# List all tasks to do after pull in the order of execution
34	status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
35	- status_run 'Updating submodules' "$DAILY_SCRIPT submodules"
36	status_run 'Cleaning up DB' "$DAILY_SCRIPT cleanup"
37	status_run 'Fetching notifications' "$DAILY_SCRIPT notifications"
38	status_run 'Caching PeeringDB data' "$DAILY_SCRIPT peeringdb"

Lines 1-14 Link Here

(-)net-mgmt/librenms/files/patch-includes_common.php (-4 / +6 lines)
1	--- includes/common.php.orig 2017-03-26 12:06:00 UTC	1	--- includes/common.php.orig 2017-07-30 08:31:34.000000000 +0000
2	+++ includes/common.php	2	+++ includes/common.php 2017-08-05 22:10:23.012133000 +0000
3	@@ -1098,10 +1098,8 @@ function version_info($remote = true)	3	@@ -1117,11 +1117,9 @@
4	curl_setopt($api, CURLOPT_CONNECTTIMEOUT, 5);	4	curl_setopt($api, CURLOPT_CONNECTTIMEOUT, 5);
5	$output['github'] = json_decode(curl_exec($api), true);	5	$output['github'] = json_decode(curl_exec($api), true);
6	}	6	}
7	- list($local_sha, $local_date) = explode('\|', rtrim(`git show --pretty='%H\|%ct' -s HEAD`));	7	- list($local_sha, $local_date) = explode('\|', rtrim(`git show --pretty='%H\|%ct' -s HEAD`));
		8	- $output['local_ver'] = rtrim(`git describe --tags`);
8	- $output['local_sha'] = $local_sha;	9	- $output['local_sha'] = $local_sha;
		10	+ $output['local_ver'] = '%%PORTVERSION%%';
9	+ $output['local_sha'] = '%%PORTVERSION%%';	11	+ $output['local_sha'] = '%%PORTVERSION%%';
10	$output['local_date'] = $local_date;	12	$output['local_date'] = $local_date;
11	- $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);	13	- $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
12	}	14	}
13	$output['db_schema'] = dbFetchCell('SELECT version FROM dbSchema');	15	$output['db_schema'] = get_db_schema() ?: '?';
14	$output['php_ver'] = phpversion();	16	$output['php_ver'] = phpversion();

Lines 1-16 Link Here

(-)net-mgmt/librenms/files/patch-includes_defaults.inc.php (-9 / +5 lines)
1	--- includes/defaults.inc.php.orig 2017-03-26 12:06:00 UTC	1	--- includes/defaults.inc.php.orig 2017-07-30 08:31:34.000000000 +0000
2	+++ includes/defaults.inc.php	2	+++ includes/defaults.inc.php 2017-08-05 22:26:45.770086000 +0000
3	@@ -41,26 +41,26 @@ $config['db_port'] = 3306;	3	@@ -42,24 +42,24 @@
4	$config['own_hostname'] = 'localhost';	4	$config['own_hostname'] = 'localhost';
5		5
6	// Location of executables	6	// Location of executables
7	-$config['rrdtool'] = '/usr/bin/rrdtool';
8	+$config['rrdtool'] = '/usr/local/bin/rrdtool';
9	$config['rrdtool_version'] = 1.4; // Doesn't need to contain minor numbers.
10	-$config['fping'] = '/usr/bin/fping';	7	-$config['fping'] = '/usr/bin/fping';
11	-$config['fping6'] = 'fping6';
12	+$config['fping'] = '/usr/local/sbin/fping';	8	+$config['fping'] = '/usr/local/sbin/fping';
13	+$config['fping6'] = '/usr/local/sbin/fping6';	9	$config['fping6'] = 'fping6';
14	$config['fping_options']['retries'] = 3;	10	$config['fping_options']['retries'] = 3;
15	$config['fping_options']['timeout'] = 500;	11	$config['fping_options']['timeout'] = 500;
16	$config['fping_options']['count'] = 3;	12	$config['fping_options']['count'] = 3;
Lines 33-39 Link Here
33	+$config['ping'] = '/sbin/ping';	29	+$config['ping'] = '/sbin/ping';
34	+$config['mtr'] = '/usr/local/bin/mtr';	30	+$config['mtr'] = '/usr/local/bin/mtr';
35	+$config['nmap'] = '/usr/local/bin/nmap';	31	+$config['nmap'] = '/usr/local/bin/nmap';
36	+$config['nagios_plugins'] = '/usr/local/libexec/nagios';	32	+$config['nagios_plugins'] = '/usr/local/libexec/plugins';
37	+$config['ipmitool'] = '/usr/local/bin/ipmitool';	33	+$config['ipmitool'] = '/usr/local/bin/ipmitool';
38	+$config['virsh'] = '/usr/local/bin/virsh';	34	+$config['virsh'] = '/usr/local/bin/virsh';
39	+$config['dot'] = '/usr/local/bin/dot';	35	+$config['dot'] = '/usr/local/bin/dot';