Attachment #200813 for bug #234645




# $FreeBSD$

PORTNAME=	librenms
PORTVERSION=	1.47
PORTREVISION=	0
PORTEPOCH=	1
CATEGORIES=	net-mgmt
MASTER_SITES=	LOCAL/dvl:vendor

		bash:shells/bash \
		sudo:security/sudo

USE_PHP=	ctype curl filter gd hash json ldap mbstring mysqli openssl pdo pdo_mysql phar posix session simplexml snmp tokenizer xml zip

USE_GITHUB=	yes
GH_ACCOUNT=	librenms

		scripts/Migration/XML_Conversion/convert.sh \
		scripts/Migration/XML_Conversion/destwork.sh \
		scripts/Migration/XML_Conversion/mkdir.sh \
		scripts/removespikes.pl scripts/removespikes.php scripts/watchmaillog/watchmaillog.pl \
		scripts/removespikes.pl scripts/watchmaillog/watchmaillog.pl \
		poller.php poller-wrapper.py \
		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-includes.php \
		../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/flush-definition-cache.php \

Lines 1-5 Link Here

(-)net-mgmt/librenms/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1540995479	1	TIMESTAMP = 1546629723
2	SHA256 (librenms-vendor-1.45.tar.gz) = 2c67feacbb448591528870d4c55448f8bcb804bdb1845902cdb2dc1b9f4846f3	2	SHA256 (librenms-vendor-1.47.tar.gz) = 582ef6422dde449791c93953905d00deefe1c7f09b65167acebb49cd1f56d8a5
3	SIZE (librenms-vendor-1.45.tar.gz) = 31718828	3	SIZE (librenms-vendor-1.47.tar.gz) = 31703568
4	SHA256 (librenms-librenms-1.45_GH0.tar.gz) = b3365bf88c40c0ee098edbf2b34510e737f357c483560f04926775c4dea9954d	4	SHA256 (librenms-librenms-1.47_GH0.tar.gz) = cbd99253845f4a4c310b8705e9bac291e91a26701f89e67fc8e165b1c5a459e4
5	SIZE (librenms-librenms-1.45_GH0.tar.gz) = 30880140	5	SIZE (librenms-librenms-1.47_GH0.tar.gz) = 32387151

Lines 1-10 Link Here

(-)net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php (-4 / +3 lines)
1	--- LibreNMS/Util/FileLock.php.orig 2018-01-14 15:32:35 UTC	1	--- LibreNMS/Util/FileLock.php.orig 2018-12-30 14:29:16 UTC
2	+++ LibreNMS/Util/FileLock.php	2	+++ LibreNMS/Util/FileLock.php
3	@@ -45,7 +45,7 @@ class FileLock implements Lock	3	@@ -47,6 +47,7 @@ class FileLock implements Lock
4	global $config;
5		4
6	$this->name = $lock_name;	5	$this->name = $lock_name;
7	- $this->file = "$config[install_dir]/.$lock_name.lock";	6	$this->file = "$install_dir/.$lock_name.lock";
8	+ $this->file = "/tmp/.$lock_name.lock";	7	+ $this->file = "/tmp/.$lock_name.lock";
9	$this->handle = fopen($this->file, "w+");	8	$this->handle = fopen($this->file, "w+");
10	}	9	}




--- LibreNMS/Validations/Dependencies.php.orig	2018-10-24 19:04:18 UTC
+++ LibreNMS/Validations/Dependencies.php
@@ -38,6 +38,9 @@ class Dependencies extends BaseValidatio
      */
     public function validate(Validator $validator)
     {
+        $validator->ok("Installed from package; no Composer required");
+        return;
+
         $composer_output = trim(shell_exec($validator->getBaseDir() . '/scripts/composer_wrapper.php --version'));
         $found = preg_match(
             '/Composer.*(\d+\.\d+\.\d+(-RC\d*|-beta\d?|-alpha\d+)?)/',

Return to bug 234645

Lines 2-9 Link Here

(-)net-mgmt/librenms/Makefile (-5 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= librenms	4	PORTNAME= librenms
5	PORTVERSION= 1.45	5	PORTVERSION= 1.47
6	PORTREVISION= 2	6	PORTREVISION= 0
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= net-mgmt	8	CATEGORIES= net-mgmt
9	MASTER_SITES= LOCAL/dvl:vendor	9	MASTER_SITES= LOCAL/dvl:vendor
Lines 30-36 Link Here
30	bash:shells/bash \	30	bash:shells/bash \
31	sudo:security/sudo	31	sudo:security/sudo
32		32
33	USE_PHP= ctype curl filter gd hash json ldap mbstring mysqli openssl pdo pdo_mysql posix session simplexml snmp tokenizer xml zip	33	USE_PHP= ctype curl filter gd hash json ldap mbstring mysqli openssl pdo pdo_mysql phar posix session simplexml snmp tokenizer xml zip
34		34
35	USE_GITHUB= yes	35	USE_GITHUB= yes
36	GH_ACCOUNT= librenms	36	GH_ACCOUNT= librenms
Lines 72-79 Link Here
72	scripts/Migration/XML_Conversion/convert.sh \	72	scripts/Migration/XML_Conversion/convert.sh \
73	scripts/Migration/XML_Conversion/destwork.sh \	73	scripts/Migration/XML_Conversion/destwork.sh \
74	scripts/Migration/XML_Conversion/mkdir.sh \	74	scripts/Migration/XML_Conversion/mkdir.sh \
75	scripts/removespikes.php scripts/agent-local/nfs-stats.sh \	75	scripts/removespikes.pl scripts/removespikes.php scripts/watchmaillog/watchmaillog.pl \
76	scripts/removespikes.pl scripts/watchmaillog/watchmaillog.pl \
77	poller.php poller-wrapper.py \	76	poller.php poller-wrapper.py \
78	../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-includes.php \	77	../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-includes.php \
79	../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/flush-definition-cache.php \	78	../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/flush-definition-cache.php \

Lines 1-12 Link Here

(-)net-mgmt/librenms/files/patch-LibreNMS_Validations_Dependencies.php (-12 lines)
1	--- LibreNMS/Validations/Dependencies.php.orig 2018-10-24 19:04:18 UTC
2	+++ LibreNMS/Validations/Dependencies.php
3	@@ -38,6 +38,9 @@ class Dependencies extends BaseValidatio
4	*/
5	public function validate(Validator $validator)
6	{
7	+ $validator->ok("Installed from package; no Composer required");
8	+ return;
9	+
10	$composer_output = trim(shell_exec($validator->getBaseDir() . '/scripts/composer_wrapper.php --version'));
11	$found = preg_match(
12	'/Composer.(\d+\.\d+\.\d+(-RC\d\|-beta\d?\|-alpha\d+)?)/',