update to librenms-1.70.1

This commit is contained in:
sthen 2020-12-03 18:04:02 +00:00
parent 5dd8481349
commit 8ba1290981
5 changed files with 784 additions and 718 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.116 2020/11/06 15:02:50 sthen Exp $
# $OpenBSD: Makefile,v 1.117 2020/12/03 18:04:02 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 = 1.69
GH_TAGNAME = 1.70.1
DISTFILES = librenms-${GH_TAGNAME}.tar.gz librenms-vendor-${GH_TAGNAME}.tar.xz:0
EPOCH = 0

View File

@ -1,4 +1,4 @@
SHA256 (librenms-1.69.tar.gz) = v5HzqJb3Cc/+7rgE4450z0welmahpPwuPjl6Cv4C7yY=
SHA256 (librenms-vendor-1.69.tar.xz) = AsFCF/MGpdOHmHb4cmxM9osYwMMnQt0Qha1zBfN8j00=
SIZE (librenms-1.69.tar.gz) = 47162432
SIZE (librenms-vendor-1.69.tar.xz) = 21951916
SHA256 (librenms-1.70.1.tar.gz) = 23MeJOz3A7pWY2PAkQOu3eCKP22qb/HmYn9kS9KEwfY=
SHA256 (librenms-vendor-1.70.1.tar.xz) = 0JxLOilRmlYnKOoxFida/8345q2PbdxJR/++7ajf+to=
SIZE (librenms-1.70.1.tar.gz) = 47603341
SIZE (librenms-vendor-1.70.1.tar.xz) = 21909108

View File

@ -1,23 +1,23 @@
$OpenBSD: patch-daily_sh,v 1.30 2020/08/01 11:16:49 sthen Exp $
$OpenBSD: patch-daily_sh,v 1.31 2020/12/03 18:04:02 sthen Exp $
Index: daily.sh
--- daily.sh.orig
+++ daily.sh
@@ -31,7 +31,7 @@ LOG_DIR=$(php -r "@include '${LIBRENMS_DIR}/config.php
@@ -32,7 +32,7 @@ LOG_DIR=$(php -r "@include '${LIBRENMS_DIR}/config.php
# get the librenms user
# shellcheck source=/var/www/librenms/.env
source "${LIBRENMS_DIR}/.env"
-LIBRENMS_USER="${LIBRENMS_USER:-librenms}"
+LIBRENMS_USER="${LIBRENMS_USER:-_librenms}"
LIBRENMS_USER_ID=$(id -u "$LIBRENMS_USER")
#######################################
@@ -126,7 +126,7 @@ set_notifiable_result() {
# Exit-Code: 0 >= min ver, 1 < min ver
#######################################
@@ -132,7 +132,7 @@ set_notifiable_result() {
check_dependencies() {
- local branch=$(git rev-parse --abbrev-ref HEAD)
+ local branch=master
local branch ver_56 ver_71 ver_72 ver_73 python3 python_deps phpver pythonver old_branches msg
- branch=$(git rev-parse --abbrev-ref HEAD)
+ branch=master
scripts/check_requirements.py > /dev/null 2>&1 || pip3 install -r requirements.txt > /dev/null 2>&1
local ver_56=$(php -r "echo (int)version_compare(PHP_VERSION, '5.6.4', '<');")
ver_56=$(php -r "echo (int)version_compare(PHP_VERSION, '5.6.4', '<');")

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-misc_config_definitions_json,v 1.9 2020/11/06 15:02:50 sthen Exp $
$OpenBSD: patch-misc_config_definitions_json,v 1.10 2020/12/03 18:04:02 sthen Exp $
Index: misc/config_definitions.json
--- misc/config_definitions.json.orig
+++ misc/config_definitions.json
@@ -3781,7 +3781,7 @@
@@ -3805,7 +3805,7 @@
},
"nfsen_rrds": {
"default": [

File diff suppressed because it is too large Load Diff