update to librenms-21.9.1

This commit is contained in:
sthen 2021-10-03 19:30:52 +00:00
parent 84507fa906
commit 1259801fc9
5 changed files with 14 additions and 14 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.132 2021/09/17 10:46:15 sthen Exp $
# $OpenBSD: Makefile,v 1.133 2021/10/03 19:30:52 sthen Exp $
COMMENT= auto-discovering network management/monitoring system
# changelogs at https://github.com/librenms/librenms/releases
GH_ACCOUNT= librenms
GH_PROJECT= librenms
GH_TAGNAME= 21.9.0
GH_TAGNAME= 21.9.1
DISTFILES= librenms-${GH_TAGNAME}.tar.gz librenms-vendor-${GH_TAGNAME}.tar.xz:0
EPOCH= 0

View File

@ -1,4 +1,4 @@
SHA256 (librenms-21.9.0.tar.gz) = qQDkJq6vUzThCyx0jvilB6H4YzlArGpzMzIiwJ7E/2E=
SHA256 (librenms-vendor-21.9.0.tar.xz) = eD6Bq8jyo0jNN7mxzrRvff10pRs1sunKGsPcLxWw3AA=
SIZE (librenms-21.9.0.tar.gz) = 52039805
SIZE (librenms-vendor-21.9.0.tar.xz) = 22187136
SHA256 (librenms-21.9.1.tar.gz) = cKvEhq9/EQLLkGog2Kw7S+mqJvIyUztMWJ/+yEQeHrE=
SHA256 (librenms-vendor-21.9.1.tar.xz) = wnFYHWiQr6N3xaepX9MKcbvh/Msyd3QCxQrNmsiUfBU=
SIZE (librenms-21.9.1.tar.gz) = 52038915
SIZE (librenms-vendor-21.9.1.tar.xz) = 22188004

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-LibreNMS_Config_php,v 1.15 2021/06/20 11:33:06 sthen Exp $
$OpenBSD: patch-LibreNMS_Config_php,v 1.16 2021/10/03 19:30:52 sthen Exp $
openbsd (and netbsd) whereis don't support -b, neither do they prefix the
output with the name of the searched command.
@ -6,7 +6,7 @@ output with the name of the searched command.
Index: LibreNMS/Config.php
--- LibreNMS/Config.php.orig
+++ LibreNMS/Config.php
@@ -503,8 +503,12 @@ class Config
@@ -507,8 +507,12 @@ class Config
public static function locateBinary($binary)
{
if (! Str::contains($binary, '/')) {

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-LibreNMS_OS_Routeros_php,v 1.1 2021/06/25 16:29:54 sthen Exp $
$OpenBSD: patch-LibreNMS_OS_Routeros_php,v 1.2 2021/10/03 19:30:52 sthen Exp $
From 1125750d3c7c332f2ca43f4518a4588b0c708392 Mon Sep 17 00:00:00 2001
From: Stuart Henderson <stu@spacehopper.org>
@ -10,7 +10,7 @@ https://github.com/librenms/librenms/pull/12976
Index: LibreNMS/OS/Routeros.php
--- LibreNMS/OS/Routeros.php.orig
+++ LibreNMS/OS/Routeros.php
@@ -221,8 +221,9 @@ class Routeros extends OS implements
@@ -222,8 +222,9 @@ class Routeros extends OS implements
if (is_null($this->data)) {
$wl60 = snmpwalk_cache_oid($this->getDeviceArray(), 'mtxrWl60GTable', [], 'MIKROTIK-MIB');
$wlap = snmpwalk_cache_oid($this->getDeviceArray(), 'mtxrWlApTable', [], 'MIKROTIK-MIB');
@ -21,7 +21,7 @@ Index: LibreNMS/OS/Routeros.php
$this->data = $this->data + $wl60sta;
}
@@ -265,6 +266,18 @@ class Routeros extends OS implements
@@ -266,6 +267,18 @@ class Routeros extends OS implements
'SSID: ' . $entry['mtxrWlApSsid'],
$entry[$oid]
);
@ -40,7 +40,7 @@ Index: LibreNMS/OS/Routeros.php
} else {
$sensors[] = new WirelessSensor(
$type,
@@ -281,55 +294,82 @@ class Routeros extends OS implements
@@ -282,55 +295,82 @@ class Routeros extends OS implements
return $sensors;
}

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-misc_config_definitions_json,v 1.15 2021/07/17 09:29:55 sthen Exp $
$OpenBSD: patch-misc_config_definitions_json,v 1.16 2021/10/03 19:30:52 sthen Exp $
Index: misc/config_definitions.json
--- misc/config_definitions.json.orig
+++ misc/config_definitions.json
@@ -3869,7 +3869,7 @@
@@ -3970,7 +3970,7 @@
},
"nfsen_rrds": {
"default": [