--- net-mgmt/librenms/Makefile (revision 489257) +++ net-mgmt/librenms/Makefile (working copy) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 1.45 -PORTREVISION= 2 +PORTVERSION= 1.47 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -19,7 +19,7 @@ # 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 +30,7 @@ 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 +72,7 @@ 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 \ --- net-mgmt/librenms/distinfo (revision 489257) +++ net-mgmt/librenms/distinfo (working copy) @@ -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 = 1546629723 +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 --- net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php (revision 489257) +++ net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php (working copy) @@ -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+"); } --- net-mgmt/librenms/files/patch-LibreNMS_Validations_Dependencies.php (revision 489257) +++ net-mgmt/librenms/files/patch-LibreNMS_Validations_Dependencies.php (nonexistent) @@ -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+)?)/',