Attachment 185065 Details for Bug 221260 – patch to 1.30

[patch] patch to 1.30

patch.librenms (text/plain), 6.44 KB, created by Dan Langille on 2017-08-05 22:44:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dan Langille

Created: 2017-08-05 22:44:25 UTC

Size: 6.44 KB

patch

obsolete

>Index: net-mgmt/librenms/Makefile
>===================================================================
>--- net-mgmt/librenms/Makefile	(revision 446662)
>+++ net-mgmt/librenms/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	librenms
>-PORTVERSION=	1.28
>+PORTVERSION=	1.30
> PORTEPOCH=	1
> CATEGORIES=	net-mgmt
> 
>@@ -87,7 +87,7 @@
> 		delhost.php discovery-wrapper.py discovery.php dist-pollers.php irc.php \
> 		mkdocs.yml pbin.sh phpunit.xml poll-billing.php poller.php poller-service.py \
> 		poller-wrapper.py readmegen.yml renamehost.php services-wrapper.py \
>-		snmp-scan.php snmptrap.php syslog.php validate.php
>+		snmptrap.php syslog.php validate.php
> 
> ROOT_DIRS=	LibreNMS contrib doc html includes lib mibs misc scripts sql-schema tests vendor
> 
>Index: net-mgmt/librenms/distinfo
>===================================================================
>--- net-mgmt/librenms/distinfo	(revision 446662)
>+++ net-mgmt/librenms/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1496573562
>-SHA256 (librenms-librenms-1.28_GH0.tar.gz) = ef77dbbbd90c67f2620f1eb2ff57d07903faca9e2a54b20e5fbe9cc247fe4a91
>-SIZE (librenms-librenms-1.28_GH0.tar.gz) = 57805277
>+TIMESTAMP = 1501701207
>+SHA256 (librenms-librenms-1.30_GH0.tar.gz) = 36bca9cf97a4e7af53f57e5afe38c8ebd295f50a39496429de6b672873ca4ddf
>+SIZE (librenms-librenms-1.30_GH0.tar.gz) = 59717251
>Index: net-mgmt/librenms/files/patch-daily.sh
>===================================================================
>--- net-mgmt/librenms/files/patch-daily.sh	(revision 446662)
>+++ net-mgmt/librenms/files/patch-daily.sh	(working copy)
>@@ -1,6 +1,6 @@
>---- daily.sh.orig	2017-03-26 12:06:00 UTC
>-+++ daily.sh
>-@@ -123,27 +123,6 @@ main () {
>+--- daily.sh.orig	2017-07-30 08:31:34.000000000 +0000
>++++ daily.sh	2017-08-05 22:02:25.038764000 +0000
>+@@ -123,29 +123,6 @@
>      fi
>  
>      if [[ -z "$arg" ]]; then
>@@ -10,6 +10,7 @@
> -            exit
> -        elif [[ "$up" == "1" ]]; then
> -            # Update to Master-Branch
>+-            git checkout vendor/ --quiet > /dev/null 2>&1
> -            old_ver=$(git show --pretty="%H" -s HEAD)
> -            status_run 'Updating to latest codebase' 'git pull --quiet' 'update'
> -            new_ver=$(git show --pretty="%H" -s HEAD)
>@@ -18,6 +19,7 @@
> -            fi
> -        elif [[ "$up" == "3" ]]; then
> -            # Update to last Tag
>+-            git checkout vendor/ --quiet > /dev/null 2>&1
> -            old_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
> -            status_run 'Updating to latest release' 'git fetch --tags && git checkout $(git describe --tags $(git rev-list --tags --max-count=1))' 'update'
> -            new_ver=$(git describe --exact-match --tags $(git log -n1 --pretty='%h'))
>@@ -28,11 +30,3 @@
>  
>          cnf=$(echo $(grep '\[.distributed_poller.\]' config.php | egrep -v -e '^//' -e '^#' | cut -d = -f 2 | sed 's/;//g'))
>          if ((${BASH_VERSINFO[0]} < 4)); then
>-@@ -167,7 +146,6 @@ main () {
>-             post-pull)
>-                 # List all tasks to do after pull in the order of execution
>-                 status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
>--                status_run 'Updating submodules' "$DAILY_SCRIPT submodules"
>-                 status_run 'Cleaning up DB' "$DAILY_SCRIPT cleanup"
>-                 status_run 'Fetching notifications' "$DAILY_SCRIPT notifications"
>-                 status_run 'Caching PeeringDB data' "$DAILY_SCRIPT peeringdb"
>Index: net-mgmt/librenms/files/patch-includes_common.php
>===================================================================
>--- net-mgmt/librenms/files/patch-includes_common.php	(revision 446662)
>+++ net-mgmt/librenms/files/patch-includes_common.php	(working copy)
>@@ -1,14 +1,16 @@
>---- includes/common.php.orig	2017-03-26 12:06:00 UTC
>-+++ includes/common.php
>-@@ -1098,10 +1098,8 @@ function version_info($remote = true)
>+--- includes/common.php.orig	2017-07-30 08:31:34.000000000 +0000
>++++ includes/common.php	2017-08-05 22:10:23.012133000 +0000
>+@@ -1117,11 +1117,9 @@
>              curl_setopt($api, CURLOPT_CONNECTTIMEOUT, 5);
>              $output['github'] = json_decode(curl_exec($api), true);
>          }
> -        list($local_sha, $local_date) = explode('|', rtrim(`git show --pretty='%H|%ct' -s HEAD`));
>+-        $output['local_ver']    = rtrim(`git describe --tags`);
> -        $output['local_sha']    = $local_sha;
>++        $output['local_ver']    = '%%PORTVERSION%%';
> +        $output['local_sha']    = '%%PORTVERSION%%';
>          $output['local_date']   = $local_date;
> -        $output['local_branch'] = rtrim(`git rev-parse --abbrev-ref HEAD`);
>      }
>-     $output['db_schema']   = dbFetchCell('SELECT version FROM dbSchema');
>+     $output['db_schema']   = get_db_schema() ?: '?';
>      $output['php_ver']     = phpversion();
>Index: net-mgmt/librenms/files/patch-includes_defaults.inc.php
>===================================================================
>--- net-mgmt/librenms/files/patch-includes_defaults.inc.php	(revision 446662)
>+++ net-mgmt/librenms/files/patch-includes_defaults.inc.php	(working copy)
>@@ -1,16 +1,12 @@
>---- includes/defaults.inc.php.orig	2017-03-26 12:06:00 UTC
>-+++ includes/defaults.inc.php
>-@@ -41,26 +41,26 @@ $config['db_port']               = 3306;
>+--- includes/defaults.inc.php.orig	2017-07-30 08:31:34.000000000 +0000
>++++ includes/defaults.inc.php	2017-08-05 22:26:45.770086000 +0000
>+@@ -42,24 +42,24 @@
>  $config['own_hostname'] = 'localhost';
>  
>  // Location of executables
>--$config['rrdtool']                  = '/usr/bin/rrdtool';
>-+$config['rrdtool']                  = '/usr/local/bin/rrdtool';
>- $config['rrdtool_version']          = 1.4; // Doesn't need to contain minor numbers.
> -$config['fping']                    = '/usr/bin/fping';
>--$config['fping6']                   = 'fping6';
> +$config['fping']                    = '/usr/local/sbin/fping';
>-+$config['fping6']                   = '/usr/local/sbin/fping6';
>+ $config['fping6']                   = 'fping6';
>  $config['fping_options']['retries'] = 3;
>  $config['fping_options']['timeout'] = 500;
>  $config['fping_options']['count']   = 3;
>@@ -33,7 +29,7 @@
> +$config['ping']           = '/sbin/ping';
> +$config['mtr']            = '/usr/local/bin/mtr';
> +$config['nmap']           = '/usr/local/bin/nmap';
>-+$config['nagios_plugins'] = '/usr/local/libexec/nagios';
>++$config['nagios_plugins'] = '/usr/local/libexec/plugins';
> +$config['ipmitool']       = '/usr/local/bin/ipmitool';
> +$config['virsh']          = '/usr/local/bin/virsh';
> +$config['dot']            = '/usr/local/bin/dot';

Actions: View | Diff

Attachments on bug 221260: 185065