mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00
Code Issues Releases Activity

net-mgmt/librenms: Update version 1.45=>1.47

Browse Source 
PR:		234645
Submitted by:	dvl
Relnotes:	https://github.com/librenms/librenms/releases
This commit is contained in:
Muhammad Moinur Rahman 2019-01-12 11:14:13 +00:00
parent a7e3648209
commit 4975cbead9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=490043
5 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net-mgmt/librenms/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= librenms
PORTVERSION= 1.45
PORTREVISION= 2
PORTVERSION= 1.47
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= LOCAL/dvl:vendor
@ -19,7 +18,7 @@ USES= python${PY_MYSQL} shebangfix
# RELEASE_TIMESTAMP is used for a patch inside the vendor code
# it represents the release date via: git show --pretty='%H|%ct' -s 1.42.01
# It sits here so you remember to update it with each release
RELEASE_TIMESTAMP= 1539772408
RELEASE_TIMESTAMP= 1546180156
# perhaps we also need python-memcache python-mysqldb
RUN_DEPENDS+= rrdtool:databases/rrdtool \
@ -30,7 +29,7 @@ RUN_DEPENDS+= rrdtool:databases/rrdtool \
bash:shells/bash \
sudo:security/sudo
USE_PHP= ctype curl filter gd hash json ldap mbstring mysqli openssl pdo pdo_mysql posix session simplexml snmp tokenizer xml zip
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
@ -72,8 +71,7 @@ SHEBANG_FILES= scripts/auth_test.php scripts/deploy-docs.sh scripts/github-remov
scripts/Migration/XML_Conversion/convert.sh \
scripts/Migration/XML_Conversion/destwork.sh \
scripts/Migration/XML_Conversion/mkdir.sh \
scripts/removespikes.php scripts/agent-local/nfs-stats.sh \
scripts/removespikes.pl scripts/watchmaillog/watchmaillog.pl \
scripts/removespikes.pl scripts/removespikes.php 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 \
@ -128,16 +126,15 @@ NO_ARCH= yes
APACHEMOD_USES= php:mod
APACHEMOD_USES_OFF= php:web
APACHEMOD_USE= USES=apache:run,22+
post-patch:
${REINPLACE_CMD} 's|%%PORTNAME%%|${PORTNAME}|g' ${WRKSRC}/config.php.default
${REINPLACE_CMD} 's|%%WWW_USER%%|${WWW_USER}|g' ${WRKSRC}/config.php.default
${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php
${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/includes/common.php
${REINPLACE_CMD} 's|%%RELEASE_TIMESTAMP%%|${RELEASE_TIMESTAMP}|g' ${WRKSRC}/includes/common.php
${REINPLACE_CMD} -e 's|/opt/librenms|${WWWDIR}|' ${WRKSRC}/html/install.php
${RM} ${WRKSRC}/LibreNMS/Validations/Updates.php
@${REINPLACE_CMD} 's|%%PORTNAME%%|${PORTNAME}|g' ${WRKSRC}/config.php.default
@${REINPLACE_CMD} 's|%%WWW_USER%%|${WWW_USER}|g' ${WRKSRC}/config.php.default
@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/poller-wrapper.py ${WRKSRC}/poller.php
@${REINPLACE_CMD} 's|%%PORTVERSION%%|${PORTVERSION}|g' ${WRKSRC}/includes/common.php
@${REINPLACE_CMD} 's|%%RELEASE_TIMESTAMP%%|${RELEASE_TIMESTAMP}|g' ${WRKSRC}/includes/common.php
@${REINPLACE_CMD} -e 's|/opt/librenms|${WWWDIR}|' ${WRKSRC}/html/install.php
@${RM} ${WRKSRC}/LibreNMS/Validations/Updates.php
do-install:
${MKDIR} ${STAGEDIR}/${WWWDIR}

10
net-mgmt/librenms/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1540995479
SHA256 (librenms-vendor-1.45.tar.gz) = 2c67feacbb448591528870d4c55448f8bcb804bdb1845902cdb2dc1b9f4846f3
SIZE (librenms-vendor-1.45.tar.gz) = 31718828
SHA256 (librenms-librenms-1.45_GH0.tar.gz) = b3365bf88c40c0ee098edbf2b34510e737f357c483560f04926775c4dea9954d
SIZE (librenms-librenms-1.45_GH0.tar.gz) = 30880140
TIMESTAMP = 1547281452
SHA256 (librenms-vendor-1.47.tar.gz) = 582ef6422dde449791c93953905d00deefe1c7f09b65167acebb49cd1f56d8a5
SIZE (librenms-vendor-1.47.tar.gz) = 31703568
SHA256 (librenms-librenms-1.47_GH0.tar.gz) = cbd99253845f4a4c310b8705e9bac291e91a26701f89e67fc8e165b1c5a459e4
SIZE (librenms-librenms-1.47_GH0.tar.gz) = 32387151

4
net-mgmt/librenms/files/patch-.env.example
View File

@ -1,5 +1,5 @@
--- .env.example.orig 2018-08-29 21:46:24.417728000 +0000
+++ .env.example 2018-08-29 21:46:59.231222000 +0000
--- .env.example.orig 2019-01-11 21:46:24 UTC
+++ .env.example
@@ -1,8 +1,12 @@
APP_KEY=

7
net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php
View File

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

12
net-mgmt/librenms/files/patch-LibreNMS_Validations_Dependencies.php
View File

@ -1,12 +0,0 @@
--- 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+)?)/',