diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index 4f55a5de5595..14a00dd0a412 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 1.66 -PORTREVISION= 1 +PORTVERSION= 1.70.1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -19,7 +18,7 @@ USES= shebangfix python # 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= 1596087334 +RELEASE_TIMESTAMP= 1606919946 # perhaps we also need python-memcache python-mysqldb RUN_DEPENDS+= rrdtool:databases/rrdtool \ @@ -46,7 +45,7 @@ USERS= www NO_BUILD= yes OPTIONS_DEFINE= FPING IPMITOOL LIBVIRT MYSQLD NAGPLUGINS NMAP WMIC DOCS EXAMPLES X11 -OPTIONS_DEFAULT= FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC +OPTIONS_DEFAULT= FPING IPMITOOL LIBVIRT NAGPLUGINS NMAP PYPOLLER WMIC FPING_DESC= Enable fping support ping monitoring IPMITOOL_DESC= Enable support for monitoring hardware IPMI @@ -87,11 +86,11 @@ SUB_LIST+= PHP="${PHPBASE}/bin/php" PYTHON=${PYTHON_CMD} \ USER="${WWWOWN}" GROUP="${WWWGRP}" WWWDIR="${WWWDIR}" ROOT_FILES= addhost.php adduser.php alerts.php artisan billing-calculate.php \ - build-base.php build.sql check-services.php composer.json \ + check-services.php composer.json \ composer.lock config.php.default config_to_json.php cronic daily.php \ delhost.php discovery-wrapper.py discovery.php dist-pollers.php irc.php \ librenms-service.py mkdocs.yml pbin.sh phpunit.xml ping.php poll-billing.php poller.php \ - poller-wrapper.py readmegen.yml renamehost.php snmp-scan.py \ + poller-wrapper.py renamehost.php snmp-scan.py \ snmptrap.php syslog.php validate.php SCRIPT_FILES= daily.sh lnms @@ -108,13 +107,13 @@ OTHER_DIRS= html/js/lang \ storage/logs \ tests/Browser/console \ tests/Browser/screenshots \ - vendor/amenadiel/jpgraph/tests/_output \ - vendor/amenadiel/jpgraph/tests/_support/_generated \ - vendor/php-amqplib/php-amqplib/docs + vendor/librenms/laravel-vue-i18n-generator/tests/output \ + vendor/ramsey/collection/bin \ + vendor/symfony/string/Resources/bin DOCS= AUTHORS.md CHANGELOG.md CONTRIBUTING.md LICENSE.txt README.md PORTDOCS= * -PORTEXAMPLES= snmp.conf.example snmpd.conf.example +PORTEXAMPLES= snmpd.conf.example NO_ARCH= yes post-patch: @@ -137,7 +136,7 @@ do-install: .endfor ${MKDIR} ${STAGEDIR}/${WWWDIR}/vendor (cd ${WRKDIR}/${PORTNAME}-vendor-${PORTVERSION} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/vendor) - + # As of 1.66_1, the package installs bootstrap/cache # This was previously left to the code to populate. # That causese problems when the code doesn't do that update. diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index ae651fb9f790..b6d1e547a3ca 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1596654257 -SHA256 (librenms-vendor-1.66.tar.gz) = f08f081dc50a5fdc90dc3fd04195c58df51eb41aa47796f596858072874ba388 -SIZE (librenms-vendor-1.66.tar.gz) = 27668445 -SHA256 (librenms-librenms-1.66_GH0.tar.gz) = 1e05675d719f93527762fefca4d0a54756ab26d959ea03cab58aca3cb822b7c6 -SIZE (librenms-librenms-1.66_GH0.tar.gz) = 45889619 +TIMESTAMP = 1608472644 +SHA256 (librenms-vendor-1.70.1.tar.gz) = d8f5c8e3af145f65f56bc4bbbd5881bf819f05807aba9a043524d76e2134ef71 +SIZE (librenms-vendor-1.70.1.tar.gz) = 28043632 +SHA256 (librenms-librenms-1.70.1_GH0.tar.gz) = db731e24ecf703ba566363c09103aedde08a3f6daa6ff1e6627f644bd284c1f6 +SIZE (librenms-librenms-1.70.1_GH0.tar.gz) = 47603341 diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php b/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php deleted file mode 100644 index 45b2ac192747..000000000000 --- a/net-mgmt/librenms/files/patch-LibreNMS_Util_FileLock.php +++ /dev/null @@ -1,10 +0,0 @@ ---- LibreNMS/Util/FileLock.php.orig 2018-12-30 14:29:16 UTC -+++ LibreNMS/Util/FileLock.php -@@ -47,6 +47,7 @@ class FileLock implements Lock - - $this->name = $lock_name; - $this->file = "$install_dir/.$lock_name.lock"; -+ $this->file = "/tmp/.$lock_name.lock"; - $this->handle = fopen($this->file, "w+"); - } -