Download raw body.
munin: unbreak if_/if_pps_ suggest
On Sun, Sep 13, 2026 at 10:45:05AM +0000, Job Snijders wrote:
> ps. how do you work with these patches of patches? what are the simple
> steps to regenerate these normally?
I discovered update-patches(1), nice!
Here are properly regenerated patches.
I'd also suggest we change the default bind address to be 127.0.0.1,
because the software by default only allows connections from 127.0.0.1
- so no point in listening on more addresses than would work
out-of-the-box anyway.
The trick to get autoconf / suggest working for 'if_' is to stop trying
to invoke 'ifconfig -l' (unsure what that ever was supposed to do) and
use extended regular expressions in the sed invocation through '-E'.
The amavis bit is just patch normalisation noise because last time I
touched that file I didn't use the update-patches...
OK?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
diff -u -p -r1.125 Makefile
--- Makefile 23 Aug 2026 08:51:41 -0000 1.125
+++ Makefile 13 Sep 2026 14:55:10 -0000
@@ -9,7 +9,7 @@ GH_TAGNAME = 2.0.76
PKGNAME-main = munin-node-${GH_TAGNAME}
PKGNAME-server =munin-server-${GH_TAGNAME}
CATEGORIES = net
-REVISION = 2
+REVISION = 3
HOMEPAGE = https://munin-monitoring.org/
Index: patches/patch-node_munin-node_conf_in
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-node_munin-node_conf_in,v
diff -u -p -r1.5 patch-node_munin-node_conf_in
--- patches/patch-node_munin-node_conf_in 11 Mar 2022 19:46:25 -0000 1.5
+++ patches/patch-node_munin-node_conf_in 13 Sep 2026 14:55:10 -0000
@@ -1,5 +1,6 @@
---- node/munin-node.conf.in.orig Fri May 10 22:59:50 2013
-+++ node/munin-node.conf.in Sun May 26 22:02:43 2013
+Index: node/munin-node.conf.in
+--- node/munin-node.conf.in.orig
++++ node/munin-node.conf.in
@@ -10,7 +10,7 @@ background 1
setsid 1
@@ -9,3 +10,14 @@
# This is the timeout for the whole transaction.
# Units are in sec. Default is 15 min
+@@ -56,8 +56,8 @@ allow ^::1$
+ # cidr_deny 192.0.2.42/32
+
+ # Which address to bind to;
+-host *
+-# host 127.0.0.1
++# host *
++host 127.0.0.1
+
+ # And which port
+ port 4949
Index: patches/patch-plugins_node_d_amavis_in
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-plugins_node_d_amavis_in,v
diff -u -p -r1.5 patch-plugins_node_d_amavis_in
--- patches/patch-plugins_node_d_amavis_in 23 Aug 2026 08:51:41 -0000 1.5
+++ patches/patch-plugins_node_d_amavis_in 13 Sep 2026 14:55:10 -0000
@@ -26,7 +26,7 @@ Index: plugins/node.d/amavis.in
group adm
=head1 INTERPRETATION
-@@ -74,14 +74,14 @@ GPLv2
+@@ -74,12 +74,12 @@ GPLv2
=cut
Index: patches/patch-plugins_node_d_openbsd_if__in
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-plugins_node_d_openbsd_if__in,v
diff -u -p -r1.8 patch-plugins_node_d_openbsd_if__in
--- patches/patch-plugins_node_d_openbsd_if__in 17 Nov 2025 07:01:24 -0000 1.8
+++ patches/patch-plugins_node_d_openbsd_if__in 13 Sep 2026 14:55:10 -0000
@@ -13,24 +13,36 @@ Index: plugins/node.d.openbsd/if_.in
#
# To aggregate all network interfaces on the system (except lo0),
# link if_aggregated to this file.
-@@ -31,13 +31,15 @@ if [ "$1" = "autoconf" ]; then
- fi
+@@ -19,8 +19,6 @@
+ #%# family=auto
+ #%# capabilities=autoconf suggest
+
+-INTERFACE=${0##*if_}
+-
+ if [ "$1" = "autoconf" ]; then
+ if [ -x /sbin/ifconfig -o -x /usr/bin/netstat ]; then
+ echo yes
+@@ -32,26 +30,29 @@ if [ "$1" = "autoconf" ]; then
fi
-+DESCR=$(/sbin/ifconfig ${INTERFACE} | /usr/bin/awk -F ': ' '/description:(.*)$/ {print substr($2, 1, 12);}')
-+
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
+- 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
++ if [ -x /usr/bin/netstat ]; then
++ netstat -i -b -n | sed -n -E -e '/^faith/d' -e '/^(enc|lo)[0-9]/d' -e '/^pf(log|sync)/d' -e '/<Link>/s/\** .*//p'
exit 0
- elif [ -x /usr/bin/netstat ]; then
+- 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'
-+ netstat -i -b -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pf(log|sync)/d' -e '/<Link>/s/\** .*//p'
- exit 0
+- exit 0
else
exit 1
-@@ -47,11 +49,15 @@ fi
+ fi
+ fi
+
++INTERFACE=${0##*if_}
++DESCR=$(/sbin/ifconfig ${INTERFACE} | /usr/bin/awk -F ': ' '/description:(.*)$/ {print substr($2, 1, 12);}')
++
if [ "$1" = "config" ]; then
echo "graph_order rbytes obytes"
@@ -48,7 +60,7 @@ Index: plugins/node.d.openbsd/if_.in
echo 'rbytes.label received'
echo 'rbytes.type DERIVE'
echo 'rbytes.graph no'
-@@ -69,9 +75,11 @@ fi
+@@ -69,9 +70,11 @@ fi
if [ "$INTERFACE" = "aggregated" ]; then
/usr/bin/netstat -i -b -n | grep -v '^lo' | awk '
BEGIN { rsum = 0; osum = 0; }
@@ -63,7 +75,7 @@ Index: plugins/node.d.openbsd/if_.in
} else if (NF == 11) {
if ($4 ~ /:/) {
rsum += $7; osum += $10;
-@@ -79,7 +87,7 @@ BEGIN { rsum = 0; osum = 0; }
+@@ -79,7 +82,7 @@ BEGIN { rsum = 0; osum = 0; }
rsum += $7; osum += $10;
}
} else { # NF == 12
@@ -72,7 +84,7 @@ Index: plugins/node.d.openbsd/if_.in
}
}
END {
-@@ -89,17 +97,20 @@ END {
+@@ -89,17 +92,20 @@ END {
else
/usr/bin/netstat -i -b -n -I $INTERFACE | awk '
Index: patches/patch-plugins_node_d_openbsd_if_pps__in
===================================================================
RCS file: /cvs/ports/net/munin/patches/patch-plugins_node_d_openbsd_if_pps__in,v
diff -u -p -r1.1 patch-plugins_node_d_openbsd_if_pps__in
--- patches/patch-plugins_node_d_openbsd_if_pps__in 17 Nov 2025 07:01:24 -0000 1.1
+++ patches/patch-plugins_node_d_openbsd_if_pps__in 13 Sep 2026 14:55:10 -0000
@@ -1,17 +1,31 @@
Index: plugins/node.d.openbsd/if_pps_.in
--- plugins/node.d.openbsd/if_pps_.in.orig
+++ plugins/node.d.openbsd/if_pps_.in
-@@ -31,6 +31,8 @@ if [ "$1" = "autoconf" ]; then
+@@ -18,9 +18,6 @@
+ #%# family=auto
+ #%# capabilities=autoconf suggest
+
+-
+-INTERFACE=`basename $0 | sed 's/^if_pps_//g'`
+-
+ if [ "$1" = "autoconf" ]; then
+ if [ -x /usr/bin/netstat ]; then
+ echo yes
+@@ -33,16 +30,23 @@ fi
+
+ if [ "$1" = "suggest" ]; then
+ if [ -x /usr/bin/netstat ]; then
+- netstat -i -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link>/s/\** .*//p'
++ netstat -i -n | sed -n -E -e '/^faith/d' -e '/^(enc|lo)[0-9]/d' -e '/^pf(log|sync)/d' -e '/<Link>/s/\** .*//p'
+ exit 0
+ else
+ exit 1
fi
fi
++INTERFACE=`basename $0 | sed 's/^if_pps_//g'`
+DESCR=$(/sbin/ifconfig ${INTERFACE} | /usr/bin/awk -F ': ' '/description:(.*)$/ {print substr($2, 1, 12);}')
+
- if [ "$1" = "suggest" ]; then
- if [ -x /usr/bin/netstat ]; then
- netstat -i -n | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link>/s/\** .*//p'
-@@ -42,7 +44,11 @@ fi
-
if [ "$1" = "config" ]; then
echo "graph_order rpkt opkt"
- echo "graph_title $INTERFACE packets"
munin: unbreak if_/if_pps_ suggest