Update to 2.0.59.

7 files changed, 17 insertions, 17 deletions

diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index b4f3997d638c..79d782a9ac57 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583926528
-SHA256 (munin-2.0.57.tar.gz) = b51ca4fd73c3ceb232c17ef4d8ba96ae2d39482df6532109ae2baaf2da0eb297
-SIZE (munin-2.0.57.tar.gz) = 2266092
+TIMESTAMP = 1585594593
+SHA256 (munin-2.0.59.tar.gz) = 89121257444577467ad73f87490eeb79740188d82d0dcfb2a2b0b3dd15131bcd
+SIZE (munin-2.0.59.tar.gz) = 2267792
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 546c5e912239..ce699e809003 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -1,8 +1,8 @@
 Install things at the correct places.
 
---- Makefile.orig	2019-11-20 19:39:52 UTC
+--- Makefile.orig	2020-03-24 12:31:00 UTC
 +++ Makefile
-@@ -95,96 +95,77 @@ install: install-master-prime install-common-prime ins
+@@ -94,96 +94,77 @@ install: install-master-prime install-common-prime ins
  
  install-pre: $(MAKEFILES)
  	@$(CHECKUSER)
@@ -137,7 +137,7 @@ Install things at the correct places.
  		fi \
  	done
  
-@@ -195,14 +176,14 @@ install-plugins-java: build-plugins-java
+@@ -194,14 +175,14 @@ install-plugins-java: build-plugins-java
  install-async-prime: install-async
  
  install-async:
@@ -156,7 +156,7 @@ Install things at the correct places.
  
  
  install-common-prime: build-common install-common
-@@ -519,7 +500,7 @@ t/install:
+@@ -518,7 +499,7 @@ t/install:
  
  # This builds */Build from Build.PL
  %/Build: %/Build.PL
@@ -165,7 +165,7 @@ Install things at the correct places.
  
  build-%: %/Build
  	cd $* && $(PERL) Build
-@@ -535,6 +516,7 @@ install-%: %/Build
+@@ -534,6 +515,7 @@ install-%: %/Build
  		--install_path script=$(BINDIR) \
  		--install_path sbin=$(SBINDIR) \
  		--install_path bindoc=$(MANDIR)/man1 \
diff --git a/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm b/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm
index a56a02f1f999..158454d90628 100644
--- a/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm
+++ b/sysutils/munin-common/files/patch-node_lib_Munin_Node_Server.pm
@@ -1,9 +1,9 @@
 Backporting: https://github.com/munin-monitoring/munin/commit/8ff5d5a9ec8b7ffd99dce61fee42defe7bda3b29
 See also: http://munin-monitoring.org/ticket/1451
 
---- node/lib/Munin/Node/Server.pm.orig	2020-03-09 01:59:44 UTC
+--- node/lib/Munin/Node/Server.pm.orig	2020-03-24 12:31:00 UTC
 +++ node/lib/Munin/Node/Server.pm
-@@ -343,7 +343,7 @@ sub _print_service {
+@@ -341,7 +341,7 @@ sub _print_service {
  sub _list_services {
      my ($session, $node) = @_;
  
diff --git a/sysutils/munin-common/files/patch-node_sbin_munin-node b/sysutils/munin-common/files/patch-node_sbin_munin-node
index 375d0f33577a..2f422f81ae0b 100644
--- a/sysutils/munin-common/files/patch-node_sbin_munin-node
+++ b/sysutils/munin-common/files/patch-node_sbin_munin-node
@@ -1,9 +1,9 @@
 plugins run in taint mode because the uid is changed, so the path must not
 contain writable directories.
 
---- node/sbin/munin-node.orig	2020-03-09 01:59:44 UTC
+--- node/sbin/munin-node.orig	2020-03-24 12:31:00 UTC
 +++ node/sbin/munin-node
-@@ -55,6 +55,10 @@ sub main
+@@ -53,6 +53,10 @@ sub main
          $ENV{$key} = $1;
      }
  
diff --git a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in
index 4ca24fc2adc8..ac04099b2ec3 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_df.in
@@ -1,8 +1,8 @@
 Ignore autofs too.
 
---- plugins/node.d.freebsd/df.in.orig	2018-06-29 00:50:01 UTC
+--- plugins/node.d.freebsd/df.in.orig	2020-03-24 12:31:00 UTC
 +++ plugins/node.d.freebsd/df.in
-@@ -24,7 +24,7 @@ if [ "$1" = "autoconf" ]; then
+@@ -22,7 +22,7 @@ if [ "$1" = "autoconf" ]; then
  	exit 0
  fi
  
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in b/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in
index f4751218458d..ec85b72b42ef 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in
@@ -1,8 +1,8 @@
 awk works just fine here.
 
---- plugins/node.d/ipmi_.in.orig	2017-01-18 20:25:20 UTC
+--- plugins/node.d/ipmi_.in.orig	2020-03-24 12:31:00 UTC
 +++ plugins/node.d/ipmi_.in
-@@ -73,7 +73,7 @@ export CONFIG MEASURE
+@@ -76,7 +76,7 @@ export CONFIG MEASURE
  
  #### Work is done in this awk script
  
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index 16ac55925952..bf1d6df1768e 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -1,6 +1,6 @@
 LICENSE=	GPLv2
 
-MUNIN_VERSION=	2.0.57
+MUNIN_VERSION=	2.0.59
 MUNIN_SITES=	http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/munin-common/distinfo
 PATCHDIR=	${.CURDIR}/../../sysutils/munin-common/files