diff options
| author | Dan Langille <dvl@FreeBSD.org> | 2024-09-30 23:30:49 +0000 |
|---|---|---|
| committer | Dan Langille <dvl@FreeBSD.org> | 2024-09-30 23:32:37 +0000 |
| commit | 5c2fc509422bd425ef97e759e4992c5798119f85 (patch) | |
| tree | e61db9314b2be98719f7b696852d4b38d344fffa | |
| parent | 8c28336a759ee1769422fdcedded609666c684bc (diff) | |
| download | ports-5c2fc509422bd425ef97e759e4992c5798119f85.tar.gz ports-5c2fc509422bd425ef97e759e4992c5798119f85.zip | |
net-mgmt/librenms: Update to 24.9.1
re: https://github.com/librenms/librenms/releases/tag/24.9.0
https://github.com/librenms/librenms/releases/tag/24.9.1
| -rw-r--r-- | net-mgmt/librenms/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/librenms/distinfo | 10 | ||||
| -rw-r--r-- | net-mgmt/librenms/files/patch-LibreNMS_____init____.py | 8 | ||||
| -rw-r--r-- | net-mgmt/librenms/files/patch-snmp-scan.py | 22 |
4 files changed, 17 insertions, 27 deletions
diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index 2b7c52de8669..aac7c8ea0d5d 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -1,5 +1,5 @@ PORTNAME= librenms -PORTVERSION= 24.8.1 +PORTVERSION= 24.9.1 PORTEPOCH= 1 CATEGORIES= net-mgmt MASTER_SITES= LOCAL/dvl:vendor @@ -128,7 +128,7 @@ _SCRIPT_FILES= daily.sh lnms # _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= 1724295000 +_RELEASE_TIMESTAMP= 1727653222 _ROOT_DIRS= LibreNMS app bootstrap config database doc html \ includes lang licenses mibs misc resources routes \ scripts tests diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo index fff8c484536c..397c97554c40 100644 --- a/net-mgmt/librenms/distinfo +++ b/net-mgmt/librenms/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1724628501 -SHA256 (librenms-vendor-24.8.1.tar.gz) = 5df89fec5d1eaa5edf2d788a62e46946436610bd67df5a95586326e7447a7001 -SIZE (librenms-vendor-24.8.1.tar.gz) = 28735982 -SHA256 (librenms-librenms-24.8.1_GH0.tar.gz) = 4eb7686219b6c3dc6718f93f6a9236603b2c8375287ae1866fe1cc482e5bbfde -SIZE (librenms-librenms-24.8.1_GH0.tar.gz) = 63157612 +TIMESTAMP = 1727699903 +SHA256 (librenms-vendor-24.9.1.tar.gz) = d6015b8f05f2c2979fada2a78f6cfdf832b22fe8fbe9b5afee9e31502f9f6dd7 +SIZE (librenms-vendor-24.9.1.tar.gz) = 28771446 +SHA256 (librenms-librenms-24.9.1_GH0.tar.gz) = 29c05df5408ff6c8be255fd91b5a03e75e9b28f0da4128ba6079cfe142b717ec +SIZE (librenms-librenms-24.9.1_GH0.tar.gz) = 64213981 diff --git a/net-mgmt/librenms/files/patch-LibreNMS_____init____.py b/net-mgmt/librenms/files/patch-LibreNMS_____init____.py index a648688daae8..f520a8d968f8 100644 --- a/net-mgmt/librenms/files/patch-LibreNMS_____init____.py +++ b/net-mgmt/librenms/files/patch-LibreNMS_____init____.py @@ -1,11 +1,11 @@ ---- LibreNMS/__init__.py.orig 2023-09-19 01:59:06 UTC +--- LibreNMS/__init__.py.orig 2024-09-29 23:40:22 UTC +++ LibreNMS/__init__.py @@ -167,7 +167,7 @@ def get_config_data(base_dir): ) logger.debug("Traceback:", exc_info=True) -- config_cmd = ["/usr/bin/env", "php", "%s/config_to_json.php" % base_dir] -+ config_cmd = "/usr/local/bin/php %s/config_to_json.php" % base_dir +- config_cmd = ["/usr/bin/env", "php", "%s/lnms" % base_dir, "config:get", "--dump"] ++ config_cmd = ["%%LOCALBASE%%/bin/php", "%s/lnms" % base_dir, "config:get", "--dump"] try: exit_code, output = command_runner(config_cmd, timeout=300, stderr=False) if exit_code != 0: @@ -14,7 +14,7 @@ if script.endswith(".php"): # save calling the sh process - base = ("/usr/bin/env", "php") -+ base = ("%%LOCALBASE%%/bin/php",) ++ base = ("%%LOCALBASE%%/bin/php",) else: base = () diff --git a/net-mgmt/librenms/files/patch-snmp-scan.py b/net-mgmt/librenms/files/patch-snmp-scan.py index 35f95c508731..9ad6f58ec911 100644 --- a/net-mgmt/librenms/files/patch-snmp-scan.py +++ b/net-mgmt/librenms/files/patch-snmp-scan.py @@ -1,21 +1,11 @@ ---- snmp-scan.py.orig 2023-10-04 12:28:53 UTC +--- snmp-scan.py.orig 2024-09-30 20:13:09 UTC +++ snmp-scan.py -@@ -133,8 +133,7 @@ def scan_host(scan_ip): - return Result(scan_ip, hostname, Outcome.NODNS, "DNS not Resolved") - - arguments = [ -- "/usr/bin/env", -- "lnms", -+ "%%LOCALBASE%%/bin/lnms", - "device:add", - "-g", - POLLER_GROUP, -@@ -259,7 +258,7 @@ Example: 192.168.0.1/32 will be treated as a single ho - chdir(install_dir) +@@ -265,7 +265,7 @@ Example: 192.168.0.1/32 will be treated as a single ho try: CONFIG = json.loads( -- check_output(["/usr/bin/env", "php", "config_to_json.php"]).decode() -+ check_output(["%%LOCALBASE%%/bin/php", "config_to_json.php"]).decode() + check_output( +- ["/usr/bin/env", "php", "lnms", "config:get", "--dump"] ++ ["%%LOCALBASE%%/bin/php", "config_to_json.php"] + ).decode() ) except CalledProcessError as e: - parser.error( |