Update to 2.0.36.

Sponsored by:	Absolight

8 files changed, 11 insertions, 239 deletions

diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 6624dc86f1ed..2130a8d19801 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1509105915
-SHA256 (munin-2.0.34.tar.gz) = ae9a314db0790882fdd4b2d3debe06248d541cb6c5705be4dbb1f8d9d6d66ca7
-SIZE (munin-2.0.34.tar.gz) = 1342411
+TIMESTAMP = 1522066415
+SHA256 (munin-2.0.36.tar.gz) = bf48e3e900c72d11f8104de43d8e39c26d532ebe239a364f95cfc414c143e1d8
+SIZE (munin-2.0.36.tar.gz) = 2053780
diff --git a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__.in b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__.in
deleted file mode 100644
index 51afb50f933b..000000000000
--- a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__.in
+++ /dev/null
@@ -1,65 +0,0 @@
---- plugins/node.d.freebsd/if_.in.orig	2014-11-24 21:46:24 UTC
-+++ plugins/node.d.freebsd/if_.in
-@@ -22,7 +22,7 @@
- INTERFACE=${0##*if_}
- 
- if [ "$1" = "autoconf" ]; then
--	if [ -x /usr/bin/netstat ]; then
-+	if [ -x /sbin/ifconfig -o -x /usr/bin/netstat ]; then
- 		echo yes
- 		exit 0
- 	else
-@@ -32,8 +32,12 @@ if [ "$1" = "autoconf" ]; then
- fi
- 
- if [ "$1" = "suggest" ]; then
--	if [ -x /usr/bin/netstat ]; then
--		netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
-+	if [ -x /sbin/ifconfig ]
-+	then
-+		ifconfig -l | sed -Ee 's/[[:<:]](pfsync|faith|pf(log|sync)|lo|plip|carp|enc|fwe)[^ ]*//g' | xargs -n 1 echo
-+		exit 0
-+	elif [ -x /usr/bin/netstat ]; then
-+		netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pf(log|sync)/d' -e '/<Link#[0-9]*>/s/\** .*//p'
- 		exit 0
- 	else
- 		exit 1
-@@ -68,8 +72,14 @@ BEGIN { rsum = 0; osum = 0; }
- /<Link#[0-9]*>/ {
- 	if (NF == 10) { 
- 		rsum += $6; osum += $9;
--	} else {
--		rsum += $7; osum += $10;
-+	} else if (NF == 11) {
-+		if ($4 ~ /:/) {
-+			rsum += $7; osum += $10;
-+		} else {
-+			rsum += $7; osum += $10;
-+		}
-+	} else { # NF == 12
-+		rsum += $8; osum += $11;
- 	}
- }
- END {
-@@ -83,9 +93,18 @@ else
- 	if (NF == 10) { 
- 		print "rbytes.value", $6;
- 		print "obytes.value", $9;
--	} else {
--		print "rbytes.value", $7;
--		print "obytes.value", $10;
-+	} else if (NF == 11) {
-+		if ($4 ~ /:/) {
-+			print "rbytes.value", $7;
-+			print "obytes.value", $10;
-+		} else {
-+			print "rbytes.value", $7;
-+			print "obytes.value", $10;
-+		}
-+	} else { # NF == 12
-+		print "rbytes.value", $8;
-+		print "obytes.value", $11;
- 	}
- }'
- fi
-+
diff --git a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__errcoll__.in b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__errcoll__.in
deleted file mode 100644
index 85ec6c6d0dce..000000000000
--- a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__errcoll__.in
+++ /dev/null
@@ -1,49 +0,0 @@
---- plugins/node.d.freebsd/if_errcoll_.in.orig	2014-11-24 21:46:24 UTC
-+++ plugins/node.d.freebsd/if_errcoll_.in
-@@ -19,7 +19,7 @@
- INTERFACE=${0##*if_errcoll_}
- 
- if [ "$1" = "autoconf" ]; then
--	if [ -x /usr/bin/netstat ]; then
-+	if [ -x /sbin/ifconfig -o -x /usr/bin/netstat ]; then
- 		echo yes
- 		exit 0
- 	else
-@@ -29,8 +29,12 @@ if [ "$1" = "autoconf" ]; then
- fi
- 
- if [ "$1" = "suggest" ]; then
--	if [ -x /usr/bin/netstat ]; then
--		netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
-+	if [ -x /sbin/ifconfig ]
-+	then
-+		ifconfig -l | sed -Ee 's/[[:<:]](pfsync|faith|pf(log|sync)|lo|plip|carp|enc|fwe)[^ ]*//g' | xargs -n 1 echo
-+		exit 0
-+	elif [ -x /usr/bin/netstat ]; then
-+		netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pf(log|sync)/d' -e '/<Link#[0-9]*>/s/\** .*//p'
- 		exit 0
- 	else
- 		exit 1
-@@ -59,9 +63,19 @@ fi;
- 		print "ierrors.value", $5;
- 		print "oerrors.value", $8;
- 		print "collisions.value", $10;
--	} else {
-+	} else if (NF == 11) {
-+		if ($4 ~ /:/) {
-+			print "ierrors.value", $6;
-+			print "oerrors.value", $9;
-+			print "collisions.value", $11;
-+		} else {
-+			print "ierrors.value", $5;
-+			print "oerrors.value", $9;
-+			print "collisions.value", $11;
-+		}
-+	} else { # NF == 12
- 		print "ierrors.value", $6;
--		print "oerrors.value", $9;
--		print "collisions.value", $11;
-+		print "oerrors.value", $10;
-+		print "collisions.value", $12;
- 	}
- }'
diff --git a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__packets__.in b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__packets__.in
deleted file mode 100644
index 23b4536a8b87..000000000000
--- a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_if__packets__.in
+++ /dev/null
@@ -1,113 +0,0 @@
---- plugins/node.d.freebsd/if_packets_.in.orig	2014-12-10 15:34:51 UTC
-+++ plugins/node.d.freebsd/if_packets_.in
-@@ -0,0 +1,110 @@
-+#!@@GOODSH@@
-+# -*- sh -*-
-+#
-+# Wildcard-plugin to monitor network interfaces. To monitor an
-+# interface, link if_packets_<interface> to this file. E.g.
-+#
-+#    ln -s /usr/share/munin/node/plugins-auto/if_packets_ /etc/munin/node.d/if_packets_eth0
-+#
-+# ...will monitor eth0.
-+#
-+# To aggregate all network interfaces on the system (except lo0),
-+# link if_packets_aggregated to this file.
-+#
-+# Any device found in /usr/bin/netstat can be monitored.
-+#
-+# Magic markers (optional - used by munin-config and some installation
-+# scripts):
-+#
-+#%# family=auto
-+#%# capabilities=autoconf suggest
-+
-+INTERFACE=${0##*if_packets_}
-+
-+if [ "$1" = "autoconf" ]; then
-+	if [ -x /sbin/ifconfig -o -x /usr/bin/netstat ]; then
-+		echo yes
-+		exit 0
-+	else
-+		echo "no (/usr/bin/netstat not found)"
-+		exit 0
-+	fi
-+fi
-+
-+if [ "$1" = "suggest" ]; then
-+	if [ -x /sbin/ifconfig ]
-+	then
-+		ifconfig -l | sed -Ee 's/[[:<:]](pfsync|faith|pf(log|sync)|lo|plip|carp|enc|fwe)[^ ]*//g' | xargs -n 1 echo
-+		exit 0
-+	elif [ -x /usr/bin/netstat ]; then
-+		netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pf(log|sync)/d' -e '/<Link#[0-9]*>/s/\** .*//p'
-+		exit 0
-+	else
-+		exit 1
-+	fi
-+fi
-+
-+if [ "$1" = "config" ]; then
-+
-+	echo "graph_order rpackets opackets"
-+	echo "graph_title $INTERFACE pps"
-+	echo 'graph_args --base 1000'
-+	echo 'graph_vlabel packets per ${graph_period} in (-) / out (+)'
-+	echo 'graph_category network'
-+	echo "graph_info This graph shows the packets counter of the $INTERFACE network interface. Please note that the traffic is shown in packets per second."
-+	echo 'rpackets.label received'
-+	echo 'rpackets.type COUNTER'
-+	echo 'rpackets.graph no'
-+
-+	echo 'rpackets.min 0'
-+	echo 'opackets.label pps'
-+	echo 'opackets.type COUNTER'
-+	echo 'opackets.negative rpackets'
-+
-+	echo 'opackets.min 0'
-+	echo "opackets.info Packets sent (+) and received (-) on the $INTERFACE network interface."
-+	exit 0
-+fi
-+
-+if [ "$INTERFACE" = "aggregated" ]; then
-+	/usr/bin/netstat -i -b -n | grep -v '^lo' | awk '
-+BEGIN { rsum = 0; osum = 0; }
-+/<Link#[0-9]*>/ {
-+	if (NF == 10) { 
-+		rsum += $4; osum += $7;
-+	} else if (NF == 11) {
-+		if ($4 ~ /:/) {
-+			rsum += $5; osum += $8;
-+		} else {
-+			rsum += $4; osum += $8;
-+		}
-+	} else { # NF == 12
-+		rsum += $6; osum += $9;
-+	}
-+}
-+END {
-+	printf "rpackets.value %i\n", rsum;
-+	printf "opackets.value %i\n", osum;
-+}'
-+
-+else
-+	/usr/bin/netstat -i -b -n -I $INTERFACE | awk '
-+/<Link#[0-9]*>/ {
-+	if (NF == 10) {
-+		print "rpackets.value", $4;
-+		print "opackets.value", $7;
-+	} else if (NF == 11) {
-+		if ($4 ~ /:/) {
-+			print "rpackets.value", $5;
-+			print "opackets.value", $8;
-+		} else {
-+			print "rpackets.value", $4;
-+			print "opackets.value", $8;
-+		}
-+	} else { # NF == 12
-+		print "rpackets.value", $5;
-+		print "opackets.value", $9;
-+	}
-+}'
-+fi
-+
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in b/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in
index be5344bbb3ee..73813b7e92a6 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in
@@ -1,14 +1,14 @@
---- plugins/node.d/bind9_rndc.in.orig	2014-11-24 21:46:24 UTC
+--- plugins/node.d/bind9_rndc.in.orig	2018-03-25 14:01:24 UTC
 +++ plugins/node.d/bind9_rndc.in
-@@ -63,6 +63,7 @@ use strict;
- my $rndc = defined($ENV{rndc}) ? $ENV{rndc} : '/usr/sbin/rndc';
+@@ -65,6 +65,7 @@ my $rndc = defined($ENV{rndc}) ? $ENV{rn
+ my $rndc_options = defined($ENV{rndc_options}) ? $ENV{rndc_options} : '';
  my $querystats = $ENV{querystats} || '/var/run/named.stats';
  my %IN;
 +my @IN_KEYS;
  
  # attempt to create log file if it doesn't exist
  if ( ! -r $querystats ) {
-@@ -124,20 +125,13 @@ chomp $line;
+@@ -126,20 +127,13 @@ chomp $line;
  if ($line eq '++ Incoming Requests ++') {
      # new format
  
@@ -36,7 +36,7 @@
  
      # jump to server stats section
      while ($line ne '++ Name Server Statistics ++') {
-@@ -197,11 +191,11 @@ if (defined($ARGV[0]) and ($ARGV[0] eq '
+@@ -199,11 +193,11 @@ if (defined($ARGV[0]) and ($ARGV[0] eq '
      print "graph_vlabel queries / \${graph_period}\n";
      print "graph_category BIND\n";
  
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in b/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in
index 9b70cf35cecf..45d58d17a9e8 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in
@@ -1,4 +1,4 @@
---- plugins/node.d/squeezebox_.in.orig	2014-11-24 21:46:24 UTC
+--- plugins/node.d/squeezebox_.in.orig	2018-03-25 14:01:24 UTC
 +++ plugins/node.d/squeezebox_.in
 @@ -157,7 +157,7 @@ if [ "$CMD" = "years" ]; then
  		printf "graph_order y"
@@ -19,7 +19,7 @@
  		printf "y%s.value " ${year}
  		printf "%b" "albums 0 0 year:${year}\nexit\n" | $NC $HOST $PORT | sed 's/%3A/:/g' | cut -d ':' -f 3
 @@ -183,7 +183,7 @@ elif [ "$CMD" = "signalstrength" -o "$CM
-             echo "graph_category Squeezebox"
+             echo "graph_category radio"
              COUNT=$(printf "%b" "player count ?\nexit\n" | $NC $HOST $PORT | cut -d " " -f 3)
              (( COUNT-- ))
 -            for ID in $(seq 0 $COUNT); do
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index 8878f2693c69..be31094778f0 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -1,4 +1,4 @@
-MUNIN_VERSION=	2.0.34
+MUNIN_VERSION=	2.0.36
 MUNIN_SITES=	http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/munin-common/distinfo
 PATCHDIR=	${.CURDIR}/../../sysutils/munin-common/files
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index 484aa5bcfb95..f328c3dec37c 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	munin
 PORTVERSION=	${MUNIN_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	${MUNIN_SITES}
 PKGNAMESUFFIX=	-node