14 files changed, 35 insertions, 6 deletions

diff --git a/sysutils/munin-common/distinfo b/sysutils/munin-common/distinfo
index 08be5bac7fad..4e07b4939d27 100644
--- a/sysutils/munin-common/distinfo
+++ b/sysutils/munin-common/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1579522454
-SHA256 (munin-2.0.53.tar.gz) = 30579d1249b420d4d890aafac00ce0f52afba5e74104ced40f9821c49abcd493
-SIZE (munin-2.0.53.tar.gz) = 2263588
+TIMESTAMP = 1580129850
+SHA256 (munin-2.0.54.tar.gz) = 9930cebb0328a15b30edd7f4920ca89b61a24db5f55d0f70d76c00620daec3b3
+SIZE (munin-2.0.54.tar.gz) = 2264058
diff --git a/sysutils/munin-common/files/patch-Makefile b/sysutils/munin-common/files/patch-Makefile
index 605fa1914edd..546c5e912239 100644
--- a/sysutils/munin-common/files/patch-Makefile
+++ b/sysutils/munin-common/files/patch-Makefile
@@ -1,3 +1,5 @@
+Install things at the correct places.
+
 --- Makefile.orig	2019-11-20 19:39:52 UTC
 +++ Makefile
 @@ -95,96 +95,77 @@ install: install-master-prime install-common-prime ins
diff --git a/sysutils/munin-common/files/patch-Makefile.config b/sysutils/munin-common/files/patch-Makefile.config
index db0c45144d5e..0fc496941c9f 100644
--- a/sysutils/munin-common/files/patch-Makefile.config
+++ b/sysutils/munin-common/files/patch-Makefile.config
@@ -1,3 +1,5 @@
+Make locations overridables. (Passed as MAKE_ARGS.)
+
 --- Makefile.config.orig	2018-07-24 11:34:38 UTC
 +++ Makefile.config
 @@ -17,62 +17,62 @@
diff --git a/sysutils/munin-common/files/patch-node_munin-node.conf.in b/sysutils/munin-common/files/patch-node_munin-node.conf.in
index 58a7ad15cc4c..43472cb4351e 100644
--- a/sysutils/munin-common/files/patch-node_munin-node.conf.in
+++ b/sysutils/munin-common/files/patch-node_munin-node.conf.in
@@ -1,3 +1,6 @@
+FreeBSD uses wheel as gid 0
+Ignore .sample files, they're sample from packages.
+
 --- node/munin-node.conf.in.orig	2014-11-24 21:46:24 UTC
 +++ node/munin-node.conf.in
 @@ -10,7 +10,7 @@ background 1
diff --git a/sysutils/munin-common/files/patch-node_sbin_munin-node b/sysutils/munin-common/files/patch-node_sbin_munin-node
index b0acdec0560a..761a5718f591 100644
--- a/sysutils/munin-common/files/patch-node_sbin_munin-node
+++ b/sysutils/munin-common/files/patch-node_sbin_munin-node
@@ -1,3 +1,6 @@
+plugins run in taint mode because the uid is changed, so the path must not
+contain writable directories.
+
 --- node/sbin/munin-node.orig	2014-11-24 21:46:24 UTC
 +++ node/sbin/munin-node
 @@ -54,6 +54,10 @@ sub main
diff --git a/sysutils/munin-common/files/patch-node_sbin_munin-node-configure b/sysutils/munin-common/files/patch-node_sbin_munin-node-configure
index b83164780a53..bf97fdccb1ae 100644
--- a/sysutils/munin-common/files/patch-node_sbin_munin-node-configure
+++ b/sysutils/munin-common/files/patch-node_sbin_munin-node-configure
@@ -1,3 +1,6 @@
+plugins run in taint mode because the uid is changed, so the path must not
+contain writable directories.
+
 --- node/sbin/munin-node-configure.orig	2014-11-24 21:46:24 UTC
 +++ node/sbin/munin-node-configure
 @@ -23,6 +23,10 @@ use warnings;
diff --git a/sysutils/munin-common/files/patch-node_sbin_munin-run b/sysutils/munin-common/files/patch-node_sbin_munin-run
index d1af74d4a398..0da215e3af89 100644
--- a/sysutils/munin-common/files/patch-node_sbin_munin-run
+++ b/sysutils/munin-common/files/patch-node_sbin_munin-run
@@ -1,6 +1,9 @@
---- node/sbin/munin-run.orig	2020-01-15 21:12:19 UTC
+plugins run in taint mode because the uid is changed, so the path must not
+contain writable directories.
+
+--- node/sbin/munin-run.orig	2020-01-20 19:32:33 UTC
 +++ node/sbin/munin-run
-@@ -110,6 +110,9 @@ sub main
+@@ -115,6 +115,9 @@ sub main
          $ENV{$key} =~ /^(.*)$/s;
          $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 856691d8c2f2..4ca24fc2adc8 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,3 +1,5 @@
+Ignore autofs too.
+
 --- plugins/node.d.freebsd/df.in.orig	2018-06-29 00:50:01 UTC
 +++ plugins/node.d.freebsd/df.in
 @@ -24,7 +24,7 @@ if [ "$1" = "autoconf" ]; then
diff --git a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in
index 3cec29e23c11..491c862ed96f 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d.freebsd_iostat.in
@@ -1,3 +1,6 @@
+- iostat returns kB, not MB.
+- Remove silly limits on IO
+
 --- plugins/node.d.freebsd/iostat.in.orig	2014-11-24 21:46:24 UTC
 +++ plugins/node.d.freebsd/iostat.in
 @@ -41,7 +41,7 @@ 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 f6e4562ef6cd..f4751218458d 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_ipmi__.in
@@ -1,3 +1,5 @@
+awk works just fine here.
+
 --- plugins/node.d/ipmi_.in.orig	2017-01-18 20:25:20 UTC
 +++ plugins/node.d/ipmi_.in
 @@ -73,7 +73,7 @@ export CONFIG MEASURE
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_multiping.in b/sysutils/munin-common/files/patch-plugins_node.d_multiping.in
index f14d4bde3724..b1085e2fde0a 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_multiping.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_multiping.in
@@ -1,3 +1,5 @@
+Initialize variable.
+
 --- plugins/node.d/multiping.in.orig	2018-12-19 20:56:49 UTC
 +++ plugins/node.d/multiping.in
 @@ -58,6 +58,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Bos
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in b/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in
index 35f8ca323051..61f219811f2b 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_multips__memory.in
@@ -1,3 +1,5 @@
+awk works just fine here.
+
 --- plugins/node.d/multips_memory.in.orig	2018-09-21 02:11:11 UTC
 +++ plugins/node.d/multips_memory.in
 @@ -137,7 +137,7 @@ fi
diff --git a/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in b/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in
index 1faed84e3414..c07217d13b7a 100644
--- a/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in
+++ b/sysutils/munin-common/files/patch-plugins_node.d_nutups__.in
@@ -1,3 +1,5 @@
+Allow overriding some variables.
+
 --- plugins/node.d/nutups_.in.orig	2018-07-24 11:34:38 UTC
 +++ plugins/node.d/nutups_.in
 @@ -7,21 +7,25 @@
diff --git a/sysutils/munin-common/munin.mk b/sysutils/munin-common/munin.mk
index 740ab5bde917..7de7cf1f2928 100644
--- a/sysutils/munin-common/munin.mk
+++ b/sysutils/munin-common/munin.mk
@@ -1,6 +1,6 @@
 LICENSE=	GPLv2
 
-MUNIN_VERSION=	2.0.53
+MUNIN_VERSION=	2.0.54
 MUNIN_SITES=	http://downloads.munin-monitoring.org/munin/stable/${MUNIN_VERSION}/
 DISTINFO_FILE=	${.CURDIR}/../../sysutils/munin-common/distinfo
 PATCHDIR=	${.CURDIR}/../../sysutils/munin-common/files