update to librenms-1.53
This commit is contained in:
sthen
parent
266911a1eb
commit
fd070ab6de
@ -1,10 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.92 2019/06/03 16:06:53 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.93 2019/07/02 16:57:58 sthen Exp $
|
||||
|
||||
COMMENT = auto-discovering network management/monitoring system
|
||||
|
||||
GH_ACCOUNT = librenms
|
||||
GH_PROJECT = librenms
|
||||
GH_TAGNAME = 1.52
|
||||
GH_TAGNAME = 1.53
|
||||
DISTFILES = librenms-${GH_TAGNAME}.tar.gz librenms-vendor-${GH_TAGNAME}.tar.xz:0
|
||||
EPOCH = 0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
SHA256 (librenms-1.52.tar.gz) = sAlQhDgycZZ5ISmthNmXj7EIH45WmiDX27cLCd/xOAk=
|
||||
SHA256 (librenms-vendor-1.52.tar.xz) = U7m1KTT/T5iWTxKE8NUVBc5aS0QvPj9lnDbpweUVavQ=
|
||||
SIZE (librenms-1.52.tar.gz) = 37576809
|
||||
SIZE (librenms-vendor-1.52.tar.xz) = 26900760
|
||||
SHA256 (librenms-1.53.tar.gz) = XJ4q5I3KeyJonohz9Hvq/klb4aKHSv3Y65M5SivxAXw=
|
||||
SHA256 (librenms-vendor-1.53.tar.xz) = C0/ofDdClUA195N4QmaA0FYjZzj5K3wQL6eMv9DPm3g=
|
||||
SIZE (librenms-1.53.tar.gz) = 37762768
|
||||
SIZE (librenms-vendor-1.53.tar.xz) = 27008592
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-LibreNMS_Config_php,v 1.4 2019/04/01 13:52:45 sthen Exp $
|
||||
$OpenBSD: patch-LibreNMS_Config_php,v 1.5 2019/07/02 16:57:58 sthen Exp $
|
||||
|
||||
Index: LibreNMS/Config.php
|
||||
--- LibreNMS/Config.php.orig
|
||||
+++ LibreNMS/Config.php
|
||||
@@ -551,7 +551,7 @@ class Config
|
||||
@@ -558,7 +558,7 @@ class Config
|
||||
public static function locateBinary($binary)
|
||||
{
|
||||
if (!str_contains($binary, '/')) {
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-daily_sh,v 1.25 2019/03/06 15:08:24 sthen Exp $
|
||||
$OpenBSD: patch-daily_sh,v 1.26 2019/07/02 16:57:58 sthen Exp $
|
||||
|
||||
Index: daily.sh
|
||||
--- daily.sh.orig
|
||||
@ -10,7 +10,7 @@ Index: daily.sh
|
||||
-COMPOSER="php ${LIBRENMS_DIR}/scripts/composer_wrapper.php --no-interaction"
|
||||
+COMPOSER="%PHP% ${LIBRENMS_DIR}/scripts/composer_wrapper.php --no-interaction"
|
||||
|
||||
# set log_file, using librenms $config['log_dir'], if set
|
||||
# set log_file, using librenms 'log_dir' config setting, if set
|
||||
# otherwise we default to <LibreNMS Install Directory>/logs
|
||||
-LOG_DIR=$(php -r "@include '${LIBRENMS_DIR}/config.php'; echo isset(\$config['log_dir']) ? \$config['log_dir'] : '${LIBRENMS_DIR}/logs';")
|
||||
+LOG_DIR=$(%PHP% -r "@include '${LIBRENMS_DIR}/config.php'; echo isset(\$config['log_dir']) ? \$config['log_dir'] : '${LIBRENMS_DIR}/logs';")
|
||||
@ -48,7 +48,34 @@ Index: daily.sh
|
||||
}
|
||||
|
||||
#######################################
|
||||
@@ -185,7 +185,7 @@ main () {
|
||||
@@ -125,25 +125,8 @@ set_notifiable_result() {
|
||||
# Exit-Code: 0 >= min ver, 1 < min ver
|
||||
#######################################
|
||||
check_php_ver() {
|
||||
- local branch=$(git rev-parse --abbrev-ref HEAD)
|
||||
- local ver_56=$(php -r "echo (int)version_compare(PHP_VERSION, '5.6.4', '<');")
|
||||
- local ver_71=$(php -r "echo (int)version_compare(PHP_VERSION, '7.1.3', '<');")
|
||||
- if [[ "$branch" == "php53" ]] && [[ "$ver_56" == "0" ]]; then
|
||||
- status_run "Supported PHP version, switched back to master branch." 'git checkout master'
|
||||
- branch="master"
|
||||
- elif [[ "$branch" == "php56" ]] && [[ "$ver_71" == "0" ]]; then
|
||||
- status_run "Supported PHP version, switched back to master branch." 'git checkout master'
|
||||
- branch="master"
|
||||
- elif [[ "$branch" != "php53" ]] && [[ "$ver_56" == "1" ]]; then
|
||||
- status_run "Unsupported PHP version, switched to php53 branch." 'git checkout php53'
|
||||
- branch="php53"
|
||||
- elif [[ "$branch" != "php56" ]] && [[ "$ver_71" == "1" ]]; then
|
||||
- status_run "Unsupported PHP version, switched to php56 branch." 'git checkout php56'
|
||||
- branch="php56"
|
||||
- fi
|
||||
+ set_notifiable_result phpver master
|
||||
|
||||
- set_notifiable_result phpver ${branch}
|
||||
-
|
||||
return ${ver_res};
|
||||
}
|
||||
|
||||
@@ -185,7 +168,7 @@ main () {
|
||||
fi
|
||||
|
||||
if [[ -z "$arg" ]]; then
|
||||
@ -57,7 +84,7 @@ Index: daily.sh
|
||||
if [[ "$up" == "0" ]]; then
|
||||
${DAILY_SCRIPT} no-code-update
|
||||
set_notifiable_result update 1 # make sure there are no update notifications if update is disabled
|
||||
@@ -230,7 +230,7 @@ main () {
|
||||
@@ -230,7 +213,7 @@ main () {
|
||||
no-code-update)
|
||||
# Updates of the code are disabled, just check for schema updates
|
||||
# and clean up the db.
|
||||
@ -66,7 +93,7 @@ Index: daily.sh
|
||||
status_run 'Cleaning up DB' "$DAILY_SCRIPT cleanup"
|
||||
;;
|
||||
post-pull)
|
||||
@@ -252,7 +252,7 @@ main () {
|
||||
@@ -252,7 +235,7 @@ main () {
|
||||
fi
|
||||
|
||||
# List all tasks to do after pull in the order of execution
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-html_install_php,v 1.26 2019/01/29 22:20:37 sthen Exp $
|
||||
$OpenBSD: patch-html_install_php,v 1.27 2019/07/02 16:57:58 sthen Exp $
|
||||
|
||||
Index: html/install.php
|
||||
--- html/install.php.orig
|
||||
+++ html/install.php
|
||||
@@ -372,7 +372,8 @@ $config_file = <<<"EOD"
|
||||
@@ -375,7 +375,8 @@ $config_file = <<<"EOD"
|
||||
#\$config\['base_url'\] = "http://librenms.company.com";
|
||||
|
||||
### Enable this to use rrdcached. Be sure rrd_dir is within the rrdcached dir
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-includes_common_php,v 1.32 2019/04/18 17:20:51 sthen Exp $
|
||||
$OpenBSD: patch-includes_common_php,v 1.33 2019/07/02 16:57:58 sthen Exp $
|
||||
|
||||
Index: includes/common.php
|
||||
--- includes/common.php.orig
|
||||
+++ includes/common.php
|
||||
@@ -1156,6 +1156,9 @@ function version_info($remote = false)
|
||||
@@ -1135,6 +1135,9 @@ function version_info($remote = false)
|
||||
$output['local_sha'] = $local_sha;
|
||||
$output['local_date'] = $local_date;
|
||||
$output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
|
||||
@ -13,12 +13,12 @@ Index: includes/common.php
|
||||
}
|
||||
$output['db_schema'] = vsprintf('%s (%s)', $version->database());
|
||||
$output['php_ver'] = phpversion();
|
||||
@@ -1164,7 +1167,7 @@ function version_info($remote = false)
|
||||
($config['rrdtool'] ?: 'rrdtool') . ' --version |head -n1'
|
||||
@@ -1143,7 +1146,7 @@ function version_info($remote = false)
|
||||
Config::get('rrdtool', 'rrdtool') . ' --version |head -n1'
|
||||
)), 1, 1)));
|
||||
$output['netsnmp_ver'] = str_replace('version: ', '', rtrim(shell_exec(
|
||||
- ($config['snmpget'] ?: 'snmpget').' --version 2>&1'
|
||||
+ ($config['snmpget'] ?: 'snmpget').' -V 2>&1'
|
||||
- Config::get('snmpget', 'snmpget') . ' --version 2>&1'
|
||||
+ Config::get('snmpget', 'snmpget') . ' -V 2>&1'
|
||||
)));
|
||||
|
||||
return $output;
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-includes_defaults_inc_php,v 1.38 2019/04/30 15:25:50 sthen Exp $
|
||||
$OpenBSD: patch-includes_defaults_inc_php,v 1.39 2019/07/02 16:57:58 sthen Exp $
|
||||
|
||||
Some substitutions are done in the ports Makefile to reduce patch conflicts
|
||||
during updates.
|
||||
@ -24,7 +24,7 @@ Index: includes/defaults.inc.php
|
||||
$config['snmpbulkwalk'] = '/usr/local/bin/snmpbulkwalk';
|
||||
$config['snmptranslate'] = '/usr/local/bin/snmptranslate';
|
||||
$config['whois'] = '/usr/bin/whois';
|
||||
@@ -522,12 +523,12 @@ $config['billing']['bill_autoadd'] = 0;
|
||||
@@ -530,12 +531,12 @@ $config['billing']['bill_autoadd'] = 0;
|
||||
$config['billing']['base'] = 1000;
|
||||
// Set the base to divider bytes to kB, MB, GB ,... (1000|1024)
|
||||
// External Integration
|
||||
@ -40,7 +40,7 @@ Index: includes/defaults.inc.php
|
||||
$config['smokeping']['pings'] = 20;
|
||||
// $config['oxidized']['enabled'] = FALSE;//Set to TRUE
|
||||
// $config['oxidized']['url'] = 'http://127.0.0.1:8888';// Set the Oxidized rest URL
|
||||
@@ -535,7 +536,7 @@ $config['smokeping']['pings'] = 20;
|
||||
@@ -543,7 +544,7 @@ $config['smokeping']['pings'] = 20;
|
||||
// NFSen RRD dir.
|
||||
$config['nfsen_enable'] = 0;
|
||||
// $config['nfsen_split_char'] = "_";
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-includes_functions_php,v 1.26 2019/04/01 13:52:45 sthen Exp $
|
||||
$OpenBSD: patch-includes_functions_php,v 1.27 2019/07/02 16:57:58 sthen Exp $
|
||||
|
||||
Index: includes/functions.php
|
||||
--- includes/functions.php.orig
|
||||
+++ includes/functions.php
|
||||
@@ -472,7 +472,7 @@ function delete_device($id)
|
||||
@@ -469,7 +469,7 @@ function delete_device($id)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-includes_html_output_capture_inc_php,v 1.1 2019/04/18 17:20:51 sthen Exp $
|
||||
$OpenBSD: patch-includes_html_output_capture_inc_php,v 1.2 2019/07/02 16:57:58 sthen Exp $
|
||||
|
||||
Index: includes/html/output/capture.inc.php
|
||||
--- includes/html/output/capture.inc.php.orig
|
||||
@ -7,8 +7,8 @@ Index: includes/html/output/capture.inc.php
|
||||
|
||||
switch ($type) {
|
||||
case 'poller':
|
||||
- $cmd = ['php', $config['install_dir'] . '/poller.php', '-h', $hostname, '-r', '-f', '-d'];
|
||||
+ $cmd = ['%PHP%', $config['install_dir'] . '/poller.php', '-h', $hostname, '-r', '-f', '-d'];
|
||||
- $cmd = ['php', \LibreNMS\Config::get('install_dir') . '/poller.php', '-h', $hostname, '-r', '-f', '-d'];
|
||||
+ $cmd = ['%PHP%', \LibreNMS\Config::get('install_dir') . '/poller.php', '-h', $hostname, '-r', '-f', '-d'];
|
||||
$filename = "poller-$hostname.txt";
|
||||
break;
|
||||
case 'snmpwalk':
|
||||
@ -16,8 +16,8 @@ Index: includes/html/output/capture.inc.php
|
||||
$filename = $device['os'] . '-' . $device['hostname'] . '.snmpwalk';
|
||||
break;
|
||||
case 'discovery':
|
||||
- $cmd = ['php', $config['install_dir'] . '/discovery.php', '-h', $hostname, '-d'];
|
||||
+ $cmd = ['%PHP%', $config['install_dir'] . '/discovery.php', '-h', $hostname, '-d'];
|
||||
- $cmd = ['php', \LibreNMS\Config::get('install_dir') . '/discovery.php', '-h', $hostname, '-d'];
|
||||
+ $cmd = ['%PHP%', \LibreNMS\Config::get('install_dir') . '/discovery.php', '-h', $hostname, '-d'];
|
||||
$filename = "discovery-$hostname.txt";
|
||||
break;
|
||||
default:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user