diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index 79b25401c0cf..ca86e5f8c11b 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= librenms -PORTVERSION= 1.54 +PORTVERSION= 1.55 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -18,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= 1564368454 +RELEASE_TIMESTAMP= 1567484342 # perhaps we also need python-memcache python-mysqldb RUN_DEPENDS+= rrdtool:databases/rrdtool \ @@ -77,7 +77,6 @@ SHEBANG_FILES= scripts/auth_test.php scripts/deploy-docs.sh scripts/github-remov ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/flush-definition-cache.php \ ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/old-remove-require-once.php \ ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/config-scanner.php \ - ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/flush.php \ ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/add-vimline.php \ ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/remove-trailing-whitespace.php \ ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/merge-library.php \ @@ -87,7 +86,6 @@ SHEBANG_FILES= scripts/auth_test.php scripts/deploy-docs.sh scripts/github-remov ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-schema-cache.php \ ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/old-remove-schema-def.php \ ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/generate-entity-file.php \ - ../${PORTNAME}-vendor-${PORTVERSION}/ezyang/htmlpurifier/maintenance/update-config.php \ ../${PORTNAME}-vendor-${PORTVERSION}/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php \ ../${PORTNAME}-vendor-${PORTVERSION}/tecnickcom/tcpdf/tools/tcpdf_addfont.php diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index b20426bd2c53..05944e57d82f 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1567343557 -SHA256 (librenms-vendor-1.54.tar.gz) = 4ec8ae34494ae3239878e31abec9d35e507d17364457fce9a8c07ad3ba95b1bc -SIZE (librenms-vendor-1.54.tar.gz) = 32803235 -SHA256 (librenms-librenms-1.54_GH0.tar.gz) = 1bf8b092086c570005223d004e44ca6813c8c73b0d6ecb5b79f85f704c96d2f9 -SIZE (librenms-librenms-1.54_GH0.tar.gz) = 38085800 +TIMESTAMP = 1569512374 +SHA256 (librenms-vendor-1.55.tar.gz) = 134da418c83ffd4b3704c378d1ca3804c49ce1d3c599835742f1425065a347f1 +SIZE (librenms-vendor-1.55.tar.gz) = 32947502 +SHA256 (librenms-librenms-1.55_GH0.tar.gz) = 1d38138f6c9a1ee9c14da4d829121485786629ffef422d6acd45efc5bb0b6e9b +SIZE (librenms-librenms-1.55_GH0.tar.gz) = 39969023 diff --git a/net-mgmt/librenms/files/patch-includes_defaults.inc.php b/net-mgmt/librenms/files/patch-includes_defaults.inc.php index 52b77758f7f9..3229f0b15bdd 100644 --- a/net-mgmt/librenms/files/patch-includes_defaults.inc.php +++ b/net-mgmt/librenms/files/patch-includes_defaults.inc.php @@ -1,6 +1,6 @@ ---- includes/defaults.inc.php.orig 2018-10-17 10:33:28 UTC +--- includes/defaults.inc.php.orig 2019-09-03 04:19:02 UTC +++ includes/defaults.inc.php -@@ -49,19 +49,19 @@ $config['own_hostname'] = 'localhost'; +@@ -49,20 +49,20 @@ $config['own_hostname'] = 'localhost'; $config['fping_options']['timeout'] = 500; $config['fping_options']['count'] = 3; $config['fping_options']['interval'] = 500; @@ -16,19 +16,20 @@ -$config['ping'] = '/bin/ping'; -$config['mtr'] = '/usr/bin/mtr'; -$config['nmap'] = '/usr/bin/nmap'; --$config['nagios_plugins'] = '/usr/lib/nagios/plugins'; ++$config['ping'] = '/dbin/ping'; ++$config['mtr'] = '/usr/local/bin/mtr'; ++$config['nmap'] = '/usr/local/bin/nmap'; + $config['nagios_plugins'] = '/usr/lib/nagios/plugins'; -$config['ipmitool'] = '/usr/bin/ipmitool'; -$config['virsh'] = '/usr/bin/virsh'; -$config['dot'] = '/usr/bin/dot'; -$config['sfdp'] = '/usr/bin/sfdp'; -+$config['ping'] = '/sbin/ping'; -+$config['mtr'] = '/usr/local/sbin/mtr'; -+$config['nmap'] = '/usr/local/bin/nmap'; -+$config['nagios_plugins'] = '/usr/local/libexec/nagios'; +-$config['nfdump'] = '/usr/bin/nfdump'; +$config['ipmitool'] = '/usr/local/bin/ipmitool'; +$config['virsh'] = '/usr/local/bin/virsh'; +$config['dot'] = '/usr/local/bin/dot'; +$config['sfdp'] = '/usr/local/bin/sfdp'; ++$config['nfdump'] = '/usr/local/bin/nfdump'; $config['slow_statistics'] = true; // THIS WILL CHANGE TO FALSE IN FUTURE