Upgrade to 1.33.01

6 files changed, 15 insertions, 118 deletions

diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile
index 67d44b703b67..a92f45805fff 100644
--- a/net-mgmt/librenms/Makefile
+++ b/net-mgmt/librenms/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	librenms
-PORTVERSION=	1.28
+PORTVERSION=	1.33.01
 PORTEPOCH=	1
 CATEGORIES=	net-mgmt
 
@@ -15,8 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	librenms
 
 USES=		php:cli python shebangfix
-SHEBANG_FILES=	mibs/process.pl scripts/auth_test.php scripts/deploy-docs.sh \
-		scripts/deploy-schema.sh scripts/github-remove \
+SHEBANG_FILES=	scripts/auth_test.php scripts/deploy-docs.sh scripts/github-remove \
 		scripts/Migration/Standard_Conversion/convert_no_xml.sh \
 		scripts/Migration/Standard_Conversion/destwork_no_xml.sh \
 		scripts/Migration/Standard_Conversion/mkdir.sh \
@@ -87,7 +86,7 @@ ROOT_FILES=	addhost.php adduser.php	alerts.php build-base.php build.sql \
 		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
 
diff --git a/net-mgmt/librenms/distinfo b/net-mgmt/librenms/distinfo
index ecfb30cb10e0..1a32f00e4573 100644
--- a/net-mgmt/librenms/distinfo
+++ b/net-mgmt/librenms/distinfo
@@ -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 = 1511119483
+SHA256 (librenms-librenms-1.33.01_GH0.tar.gz) = ca5f3d5a606efd445291c14126c9216d1a595dc37f330cc00284d5d42f6bf5e9
+SIZE (librenms-librenms-1.33.01_GH0.tar.gz) = 60473613
diff --git a/net-mgmt/librenms/files/patch-daily.sh b/net-mgmt/librenms/files/patch-daily.sh
deleted file mode 100644
index 1020e9ad21d3..000000000000
--- a/net-mgmt/librenms/files/patch-daily.sh
+++ /dev/null
@@ -1,38 +0,0 @@
---- daily.sh.orig	2017-03-26 12:06:00 UTC
-+++ daily.sh
-@@ -123,27 +123,6 @@ main () {
-     fi
- 
-     if [[ -z "$arg" ]]; then
--        up=$(php daily.php -f update >&2; echo $?)
--        if [[ "$up" == "0" ]]; then
--            $DAILY_SCRIPT no-code-update
--            exit
--        elif [[ "$up" == "1" ]]; then
--            # Update to Master-Branch
--            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)
--            if [ "$old_ver" != "$new_ver" ]; then
--                status_run "Updated from $old_ver to $new_ver" ''
--            fi
--        elif [[ "$up" == "3" ]]; then
--            # Update to last Tag
--            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'))
--            if [[ "$old_ver" != "$new_ver" ]]; then
--                status_run "Updated from $old_ver to $new_ver" ''
--            fi
--        fi
- 
-         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"
diff --git a/net-mgmt/librenms/files/patch-includes_common.php b/net-mgmt/librenms/files/patch-includes_common.php
deleted file mode 100644
index 974dc867c257..000000000000
--- a/net-mgmt/librenms/files/patch-includes_common.php
+++ /dev/null
@@ -1,14 +0,0 @@
---- includes/common.php.orig	2017-03-26 12:06:00 UTC
-+++ includes/common.php
-@@ -1098,10 +1098,8 @@ function version_info($remote = true)
-             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_sha']    = $local_sha;
-+        $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['php_ver']     = phpversion();
diff --git a/net-mgmt/librenms/files/patch-includes_defaults.inc.php b/net-mgmt/librenms/files/patch-includes_defaults.inc.php
index 9f199e135410..759fd6bad45e 100644
--- a/net-mgmt/librenms/files/patch-includes_defaults.inc.php
+++ b/net-mgmt/librenms/files/patch-includes_defaults.inc.php
@@ -1,17 +1,6 @@
---- includes/defaults.inc.php.orig	2017-03-26 12:06:00 UTC
-+++ includes/defaults.inc.php
-@@ -41,26 +41,26 @@ $config['db_port']               = 3306;
- $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['fping_options']['retries'] = 3;
+--- includes/defaults.inc.php.orig	2017-11-01 17:55:06.000000000 +0000
++++ includes/defaults.inc.php	2017-11-20 21:06:51.816968000 +0000
+@@ -48,19 +48,19 @@
  $config['fping_options']['timeout'] = 500;
  $config['fping_options']['count']   = 3;
  $config['fping_options']['millisec'] = 200;
@@ -21,21 +10,21 @@
 +$config['snmpwalk']                  = '/usr/local/bin/snmpwalk';
 +$config['snmpget']                   = '/usr/local/bin/snmpget';
 +$config['snmpbulkwalk']              = '/usr/local/bin/snmpbulkwalk';
+ $config['snmptranslate']             = '/usr/bin/snmptranslate';
  $config['whois']          = '/usr/bin/whois';
 -$config['ping']           = '/bin/ping';
 -$config['mtr']            = '/usr/bin/mtr';
 -$config['nmap']           = '/usr/bin/nmap';
--$config['nagios_plugins'] = '/usr/lib/nagios/plugins';
++$config['ping']           = '/sbin/ping';
++$config['mtr']            = '/usr/local/bin/mtr';
++$config['nmap']           = '/usr/local/bin/nmap';
+ $config['nagios_plugins'] = '/usr/lib/nagios/plugins';
 -$config['ipmitool']       = '/usr/bin/ipmitool';
 -$config['virsh']          = '/usr/bin/virsh';
 -$config['dot']            = '/usr/bin/dot';
 -$config['sfdp']           = '/usr/bin/sfdp';
-+$config['ping']           = '/sbin/ping';
-+$config['mtr']            = '/usr/local/bin/mtr';
-+$config['nmap']           = '/usr/local/bin/nmap';
-+$config['nagios_plugins'] = '/usr/local/libexec/nagios';
 +$config['ipmitool']       = '/usr/local/bin/ipmitool';
-+$config['virsh']          = '/usr/local/bin/virsh';
++$config['virsh']          = '/usr/lacal/bin/virsh';
 +$config['dot']            = '/usr/local/bin/dot';
 +$config['sfdp']           = '/usr/local/bin/sfdp';
  
diff --git a/net-mgmt/librenms/files/patch-validate.php b/net-mgmt/librenms/files/patch-validate.php
deleted file mode 100644
index e51e72d137f2..000000000000
--- a/net-mgmt/librenms/files/patch-validate.php
+++ /dev/null
@@ -1,39 +0,0 @@
---- validate.php.orig	2017-04-11 18:45:34 UTC
-+++ validate.php
-@@ -108,13 +108,6 @@ if (!($username === 'root' || (isset($co
-     print_fail('You need to run this script as root' . (isset($config['user']) ? ' or '.$config['user'] : ''));
- }
- 
--if ($git_found === true) {
--    if ($config['update_channel'] == 'master' && $cur_sha != $versions['github']['sha']) {
--        $commit_date = new DateTime('@'.$versions['local_date'], new DateTimeZone(date_default_timezone_get()));
--        print_warn("Your install is out of date, last update: " . $commit_date->format('r'));
--    }
--}
--
- // Check php modules we use to make sure they are loaded
- $extensions = array('pcre','curl','session','snmp','mcrypt');
- foreach ($extensions as $extension) {
-@@ -302,22 +295,6 @@ if (dbFetchCell('SELECT COUNT(*) FROM `d
- }
- 
- 
--if ($git_found === true) {
--    if ($versions['local_branch'] != 'master') {
--        print_warn("Your local git branch is not master, this will prevent automatic updates.");
--    }
--
--    // check for modified files
--    $modifiedcmd = 'git diff --name-only --exit-code';
--    if ($username === 'root') {
--        $modifiedcmd = 'su '.$config['user'].' -c "'.$modifiedcmd.'"';
--    }
--    exec($modifiedcmd, $cmdoutput, $code);
--    if ($code !== 0 && !empty($cmdoutput)) {
--        print_warn("Your local git contains modified files, this could prevent automatic updates.\nModified files:");
--        print_list($cmdoutput, "\t %s\n");
--    }
--}
- // Modules test
- $modules = explode(',', $options['m']);
- foreach ($modules as $module) {