4 files changed, 4 insertions, 94 deletions

diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 1eb4b35a3010..ee16f18f6aaf 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537780253
-SHA256 (munin-2.0.42.tar.gz) = 0f1b72e5339944b53a01867cdd09d6b399bfe470ea3b16017914e00b4d4ed110
-SIZE (munin-2.0.42.tar.gz) = 2252959
+TIMESTAMP = 1542802138
+SHA256 (munin-2.0.43.tar.gz) = 17d788ce0b3d633b22d5f54086fb5de53d52e82bc1cdd53d55c2e0aa95151549
+SIZE (munin-2.0.43.tar.gz) = 2257914
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
deleted file mode 100644
index 2540dd9b0428..000000000000
--- a/sysutils/munin-common/files/patch-plugins_node.d_bind9__rndc.in
+++ /dev/null
@@ -1,52 +0,0 @@
---- plugins/node.d/bind9_rndc.in.orig	2018-09-21 02:11:11 UTC
-+++ plugins/node.d/bind9_rndc.in
-@@ -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 ) {
-@@ -126,20 +127,13 @@ chomp $line;
- if ($line eq '++ Incoming Requests ++') {
-     # new format
- 
--    %IN = (
--           requests => 0,
--           responses => 0,
--           success => 0,
--           auth_answer => 0,
--           nonauth_answer => 0,
--           nxrrset => 0,
--           failure => 0,
--           nxdomain => 0,
--           recursion => 0,
--           duplicates => 0,
--           transfers => 0,
--           rejections => 0,
--          );
-+    @IN_KEYS = ('requests', 'responses', 'success', 'auth_answer',
-+                'nonauth_answer', 'nxrrset', 'failure', 'nxdomain',
-+                'recursion', 'duplicates', 'transfers', 'rejections');
-+    %IN = ();
-+    for my $key (@IN_KEYS) {
-+        $IN{$key} = 0;
-+    }
- 
-     # jump to server stats section
-     while ($line ne '++ Name Server Statistics ++') {
-@@ -199,11 +193,11 @@ if (defined($ARGV[0]) and ($ARGV[0] eq '
-     print "graph_vlabel queries / \${graph_period}\n";
-     print "graph_category dns\n";
- 
--    for my $key (keys %IN) {
-+    for my $key (@IN_KEYS) {
-         print "query_$key.label $key\n";
-         print "query_$key.type DERIVE\n";
-         print "query_$key.min 0\n";
-     }
- } else {
--    print "query_$_.value $IN{$_}\n" for keys %IN;
-+    print "query_$_.value $IN{$_}\n" for @IN_KEYS;
- }
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in b/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in
deleted file mode 100644
index 9d8f65ea1ec7..000000000000
--- a/sysutils/munin-common/files/patch-plugins_node.d_squeezebox__.in
+++ /dev/null
@@ -1,38 +0,0 @@
---- plugins/node.d/squeezebox_.in.orig	2018-09-21 02:11:11 UTC
-+++ plugins/node.d/squeezebox_.in
-@@ -153,7 +153,7 @@ if [ "$CMD" = "years" ]; then
- 		printf "graph_order y"
-                 echo "${years_array// / y}"
- 
--                for i in $(seq 0 "$no_of_years"); do
-+                for i in $(jot - 0 "$no_of_years"); do
-                         year=${arr1[$i]}
-                         if [ "$year" = 0 ]; then
-                                 echo "y0.label No year"
-@@ -168,7 +168,7 @@ if [ "$CMD" = "years" ]; then
-                 done
-                 exit 0
-         fi
--        for i in $(seq 0 "$no_of_years"); do
-+        for i in $(jot - 0 "$no_of_years"); do
-                 year=${arr1[$i]}
-                 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
-@@ -180,7 +180,7 @@ elif [ "$CMD" = "signalstrength" ] || [ 
-             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
-+            for ID in $(jot - 0 "$COUNT"); do
-                 MAC=$(printf "%b" "player id $ID ?\\nexit\\n" | "$NC" "$HOST" "$PORT" | cut -d " " -f 4 | sed 's/%3A/:/g')
-                 NAME=$(printf "%b" "player name $MAC ?\\nexit\\n" | "$NC" "$HOST" "$PORT" | cut -d " " -f 4 | sed 's/%20/ /g')
-                 MAC2=${MAC//:/}
-@@ -191,7 +191,7 @@ elif [ "$CMD" = "signalstrength" ] || [ 
-         fi
-         COUNT=$(printf "%b" 'player count ?\nexit\n' | "$NC" "$HOST" "$PORT" | cut -d " " -f 3)
-         (( COUNT-- ))
--        for ID in $(seq 0 "$COUNT"); do
-+        for ID in $(jot - 0 "$COUNT"); do
-             MAC=$(printf "%b" "player id $ID ?\\nexit\\n" | "$NC" "$HOST" "$PORT" | cut -d " " -f 4 | sed 's/%3A/:/g')
-             VAL=$(printf "%b" "$MAC $CMD ?\\nexit\\n"| "$NC" "$HOST" "$PORT" | cut -d " " -f 2- | sed "s/$CMD //")
-             MAC2=${MAC//:/}
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index 358c056eb378..cc528e1e7a65 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -1,6 +1,6 @@
 LICENSE=	GPLv2
 
-MUNIN_VERSION=	2.0.42
+MUNIN_VERSION=	2.0.43
 MUNIN_SITES=	http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/munin-common/distinfo
 PATCHDIR=	${.CURDIR}/../../sysutils/munin-common/files