Date: Tue, 27 Apr 2021 12:37:51 GMT From: Dan Langille <dvl@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ce2ed9dfe985 - main - Update to 21.4.0 Message-ID: <202104271237.13RCbptP088036@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce2ed9dfe985a5e228bfe79d184115da262b271f commit ce2ed9dfe985a5e228bfe79d184115da262b271f Author: Dan Langille <dvl@FreeBSD.org> AuthorDate: 2021-04-27 01:32:28 +0000 Commit: Dan Langille <dvl@FreeBSD.org> CommitDate: 2021-04-27 12:37:45 +0000 Update to 21.4.0 re https://docs.librenms.org/General/Changelog/#2140 --- net-mgmt/librenms/Makefile | 4 ++-- net-mgmt/librenms/distinfo | 10 +++++----- .../librenms/files/patch-LibreNMS_Util_Version.php | 11 ----------- .../files/patch-LibreNMS_Validations_Programs.php | 10 ---------- .../files/patch-LibreNMS_Validations_System.php | 20 -------------------- .../files/patch-LibreNMS_Validations_User.php | 18 ------------------ 6 files changed, 7 insertions(+), 66 deletions(-) diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index f4dc25413e2b..7cb6d8910d6b 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,7 +1,7 @@ # Created by: Muhammad Moinur Rahman<bofh@FreeBSD.org> PORTNAME= librenms -PORTVERSION= 21.3.0 +PORTVERSION= 21.4.0 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -17,7 +17,7 @@ USES= shebangfix python php # 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= 1616284710 +RELEASE_TIMESTAMP= 1618718707 # perhaps we also need python-memcache python-mysqldb RUN_DEPENDS+= rrdtool:databases/rrdtool \ diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index efb0015021a7..b7d7de5a4479 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1616683224 -SHA256 (librenms-vendor-21.3.0.tar.gz) = e06532500ac6aba46745de24dbb263fa481345cd0884f6b667ade69a20ce39ee -SIZE (librenms-vendor-21.3.0.tar.gz) = 28253811 -SHA256 (librenms-librenms-21.3.0_GH0.tar.gz) = cf3cc5bd4fb7ebeb68ad731fea9601a009b87ef738f7063c6a33690a47483dc0 -SIZE (librenms-librenms-21.3.0_GH0.tar.gz) = 49218982 +TIMESTAMP = 1619467734 +SHA256 (librenms-vendor-21.4.0.tar.gz) = 6124a4d1e085492408a5db029c9a2aa7cddd4af9a58c39af9593dbc8f1419faf +SIZE (librenms-vendor-21.4.0.tar.gz) = 28394137 +SHA256 (librenms-librenms-21.4.0_GH0.tar.gz) = 65dd589fbead15b0fbb190f2686919b427914dbd380bd676ada601b95d47d643 +SIZE (librenms-librenms-21.4.0_GH0.tar.gz) = 49797892 diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Util_Version.php b/net-mgmt/librenms/files/patch-LibreNMS_Util_Version.php deleted file mode 100644 index b12791032842..000000000000 --- a/net-mgmt/librenms/files/patch-LibreNMS_Util_Version.php +++ /dev/null @@ -1,11 +0,0 @@ ---- LibreNMS/Util/Version.php.orig 2020-07-20 20:50:27 UTC -+++ LibreNMS/Util/Version.php -@@ -92,7 +92,7 @@ class Version - - public static function python() - { -- $proc = new Process(['python3', '--version']); -+ $proc = new Process(['/usr/local/bin/python3', '--version']); - $proc->run(); - - if ($proc->getExitCode() !== 0) { diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_Programs.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_Programs.php deleted file mode 100644 index 937a3e9af87a..000000000000 --- a/net-mgmt/librenms/files/patch-LibreNMS_Validations_Programs.php +++ /dev/null @@ -1,10 +0,0 @@ ---- LibreNMS/Validations/Programs.php.orig 2020-07-10 19:56:16 UTC -+++ LibreNMS/Validations/Programs.php -@@ -96,6 +96,7 @@ class Programs extends BaseValidation - - private function failFping($validator, $cmd, $output) - { -+ $validator->warn("fping FAILURES can be ignored if running LibreNMS in a jail without ::1. You may want to test it manually: fping ::1"); - $validator->fail( - "$cmd could not be executed. $cmd must have CAP_NET_RAW capability (getcap) or suid. Selinux exclusions may be required.\n ($output)" - ); diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php deleted file mode 100644 index f3c02c13593a..000000000000 --- a/net-mgmt/librenms/files/patch-LibreNMS_Validations_System.php +++ /dev/null @@ -1,20 +0,0 @@ ---- LibreNMS/Validations/System.php.orig 2021-03-25 16:28:19 UTC -+++ LibreNMS/Validations/System.php -@@ -39,7 +39,7 @@ class System extends BaseValidation - $install_dir = $validator->getBaseDir(); - - $lnms = `which lnms 2>/dev/null`; -- if (empty($lnms)) { -+ if (empty($lnms) && !Config::get('installed_from_package')) { - $validator->warn('Global lnms shortcut not installed. lnms command must be run with full path', "sudo ln -s $install_dir/lnms /usr/bin/lnms"); - } - -@@ -50,7 +50,7 @@ class System extends BaseValidation - } - - $rotation_file = '/etc/logrotate.d/librenms'; -- if (! file_exists($rotation_file)) { -+ if (! file_exists($rotation_file) && !Config::get('installed_from_package')) { - $validator->warn('Log rotation not enabled, could cause disk space issues', "sudo cp $install_dir/misc/librenms.logrotate $rotation_file"); - } - } diff --git a/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php b/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php deleted file mode 100644 index 06dd1febbba0..000000000000 --- a/net-mgmt/librenms/files/patch-LibreNMS_Validations_User.php +++ /dev/null @@ -1,18 +0,0 @@ ---- LibreNMS/Validations/User.php.orig 2020-07-10 19:56:16 UTC -+++ LibreNMS/Validations/User.php -@@ -84,6 +84,7 @@ class User extends BaseValidation - "sudo chmod -R ug=rwX $rrd_dir $log_dir $dir/bootstrap/cache/ $dir/storage/", - ]; - -+ if (!Config::get('installed_from_package')) { - $find_result = rtrim(`find $dir \! -user $lnms_username -o \! -group $lnms_groupname 2> /dev/null`); - if (!empty($find_result)) { - // Ignore files created by the webserver -@@ -117,6 +118,7 @@ class User extends BaseValidation - $validator->result($result); - return; - } -+ } - } - } else { - $validator->warn("You don't have LIBRENMS_USER set, this most likely needs to be set to librenms");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104271237.13RCbptP088036>