-diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile
---- munin-2.0.42.orig/Makefile 2018-09-21 02:11:11.000000000 +0000
-+++ munin-2.0.42/Makefile 2018-10-11 14:59:08.887033000 +0000
-@@ -106,6 +106,7 @@ install-master-prime: $(INFILES_MASTER)
+--- munin-2.0.65/Makefile.orig 2020-10-28 22:36:02.000000000 +0100
++++ munin-2.0.65/Makefile 2020-11-11 13:51:56.079267472 +0100
+@@ -107,6 +107,7 @@
mkdir -p $(CONFDIR)/munin-conf.d
mkdir -p $(LIBDIR)
mkdir -p $(BINDIR)
mkdir -p $(PERLLIB)
mkdir -p $(PERLLIB)/Munin/Master
mkdir -p $(HTMLDIR)
-@@ -137,8 +138,8 @@ install-master-prime: $(INFILES_MASTER)
+@@ -138,8 +139,8 @@
test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
test -f "$(CONFDIR)/munin.conf" || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
$(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
$(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
-diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config
---- munin-2.0.42.orig/Makefile.config 2018-09-21 02:11:11.000000000 +0000
-+++ munin-2.0.42/Makefile.config 2018-10-11 14:59:55.327033000 +0000
+--- munin-2.0.65/Makefile.config.orig 2020-10-28 22:36:02.000000000 +0100
++++ munin-2.0.65/Makefile.config 2020-11-11 14:00:57.830267472 +0100
@@ -17,10 +17,10 @@
#
# the base of the Munin installation.
# Server only - where to put munin-cron
BINDIR = $(PREFIX)/bin
-@@ -32,31 +32,31 @@ SBINDIR = $(PREFIX)/sbin
+@@ -32,31 +32,31 @@
DOCDIR = $(PREFIX)/doc
# Where to put man pages
# Location of PID files and other statefiles. On the server, must be
# writable by the user "munin".
-@@ -95,7 +95,7 @@ GOODSH := $(shell PATH=`getconf PATH
+@@ -95,7 +95,7 @@
BASH := /bin/bash
# Server only - Where to install the perl libraries
# Client only - Install plugins for this architecture
# the LANG=C makes tr work as expected, not regarding any locale it
-@@ -105,7 +105,7 @@ OSTYPE := $(shell uname | LANG=C tr
+@@ -105,7 +105,7 @@
# How to figure out the hostname. (Only used in default configuration
# files)
# What is the safest way to create a tempfile.
# Default is to figure it out by testing various methods.
-@@ -128,9 +128,9 @@ CGIUSER := nobody
- # Which command to use to check if the USER and GROUP to run Munin as, exists.
- # These will work on most modern OSes:
- #
--GETENT := $(shell which getent || which true 2>/dev/null)
--CHECKUSER := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
--CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
-+GETENT := /bin/true
-+CHECKUSER := /bin/true
-+CHECKGROUP := /bin/true
-
- # For OSX, comment out the previous two lines and comment in these
- #
-@@ -152,9 +152,9 @@ CHECKGROUP := $(shell $(GETENT) group $(
- #CHECKUSER := $(shell id $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
- #CHECKGROUP := $(shell grep ^$(GROUP): /etc/group >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
-
+@@ -125,38 +125,14 @@
+ # Default user to run the cgi as
+ CGIUSER := nobody
+
+-# Which command to use to check if the USER and GROUP to run Munin as, exists.
+-ifneq ($(shell which getent),)
+- # "getent" works on most modern OS
+- CHECKUSER_COMMAND := getent passwd $(USER)
+- CHECKGROUP_COMMAND := getent group $(GROUP)
+-else
+- ifeq ($(OSTYPE),darwin)
+- # This should work for OSX 10.5 (Leopard) or later
+- CHECKUSER_COMMAND := dscl . -read /Users/$(USER)
+- CHECKGROUP_COMMAND := dscl . -read /Groups/$(GROUP)
+- else
+- ifeq ($(OSTYPE),cygwin)
+- CHECKUSER_COMMAND := id $(USER)
+- CHECKGROUP_COMMAND := grep ^$(GROUP): /etc/group
+- else
+- ifeq ($(OSTYPE),hp-ux)
+- CHECKUSER_COMMAND := pwget -n $(USER)
+- CHECKGROUP_COMMAND := grget -n $(GROUP)
+- else
+- $(warning Missing test for user existence on this platform. Skipping this check and hoping for the best ...)
+- CHECKUSER_COMMAND := true
+- CHECKGROUP_COMMAND := true
+- endif
+- endif
+- endif
+-endif
+-CHECKUSER := $(shell $(CHECKUSER_COMMAND) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+-CHECKGROUP := $(shell $(CHECKGROUP_COMMAND) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
+-
-CHOWN := chown
-CHMOD := chmod
-CHGRP := chgrp
++CHECKUSER_COMMAND := /bin/true
++CHECKGROUP_COMMAND := /bin/true
++CHECKUSER := /bin/true
++CHECKGROUP := /bin/true
++
+CHOWN := /bin/true
+CHMOD := /bin/true
+CHGRP := /bin/true
-diff -urNpa munin-2.0.42.orig/dists/tarball/plugins.conf munin-2.0.42/dists/tarball/plugins.conf
---- munin-2.0.42.orig/dists/tarball/plugins.conf 2018-10-11 15:00:48.919033000 +0000
-+++ munin-2.0.42/dists/tarball/plugins.conf 2018-10-11 15:01:25.723033000 +0000
-@@ -14,6 +14,9 @@
- #
- #
-
-+[*]
-+env.logtail /usr/bin/logtail
-+
- [mysql*]
- #env.mysqlopts -u someuser
-
-@@ -31,3 +34,128 @@ user root
-
- [postfix*]
- user root
-+env.logdir /var/log
-+env.logfile maillog
-+
-+[netstat]
-+group proc
-+
-+[amavis*]
-+user root
-+env.amavislog /var/log/maillog
-+env.logfile /var/log/maillog
-+
-+[courier*]
-+user root
-+env.logfile /var/log/maillog
-+
-+[mailman]
-+user mailman
-+group (mailman)
-+
-+[bind9_rndc]
-+group (named)
-+env.querystats /var/lib/named/named.stats
-+
-+[squid*]
-+group (squid)
-+#env.squidport 3128
-+#env.squiduser manager
-+#env.squidpasswd <SECRET>
-+
-+[fw*]
-+group proc
-+
-+[if*]
-+group proc
-+
-+[dhcpd3]
-+user root
-+env.leasefile /var/lib/dhcpd/dhcpd.leases
-+env.configfile /etc/dhcpd.conf
-+
-+[ip_*]
-+user root
-+
-+[munin*]
-+user munin
-+
-+[ping_*]
-+group adm
-+
-+[port_*]
-+group proc
-+
-+[processes]
-+group proc
-+
-+[ps_*]
-+group proc
-+
-+[psu_*]
-+group proc
-+
-+[nfs*]
-+group proc
-+
-+[entropy]
-+group proc
-+
-+[open_*]
-+group proc
-+
-+[nut*]
-+env.upsname SmartUPS
-+env.upshost 127.0.0.1
-+
-+[df*]
-+#user root # if you have mode 0000 /vservers dir
-+group proc
-+
-+# Sane defaults for plugins from MuninExchange
-+
-+[apache_smaps]
-+#user root # if you have kernel with grsecurity
-+group proc
-+env.pname httpd.prefork
-+env.puser http
-+
-+[dovecot]
-+user root
-+env.logfile /var/log/maillog
-+
-+[php_eaccelerator]
-+env.user admin
-+env.password eAccelerator
-+env.url http://127.0.0.1/eaccelerator/control.php
-+
-+[proftpd*]
-+user root
-+env.logfile /var/log/xferlog
-+
-+[vsftpd*]
-+user root
-+env.logfile /var/log/vsftpd.log
-+
-+[postgrey*]
-+user root
-+env.logfile /var/log/maillog
-+
-+[nagiosstatus]
-+user root
-+env.statuslog /var/lib/nagios/status.dat
-+
-+[freeradius]
-+user root
-+env.radius_log /var/log/freeradius/radius.log
-+
-+[ipmitool_sensor*]
-+user root
-+timeout 20
-+
-+[openvpn_clients]
-+user root
-+env.logfile /var/log/openvpn/status.log
-+
-+[cupsys_pages]
-+user root
-diff -urNpa munin-2.0.42.orig/plugins/node.d/amavis.in munin-2.0.42/plugins/node.d/amavis.in
---- munin-2.0.42.orig/plugins/node.d/amavis.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d/amavis.in 2018-10-11 15:22:35.158033000 +0000
-@@ -76,7 +76,7 @@ GPLv2
+Only in munin-2.0.69: munin-plugins.patch
+diff -ur munin-2.0.69.orig/plugins/node.d/amavis.in munin-2.0.69/plugins/node.d/amavis.in
+--- munin-2.0.69.orig/plugins/node.d/amavis.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/amavis.in 2022-08-27 15:12:36.150833006 +0200
+@@ -76,7 +76,7 @@
AMAVIS_LOG=${amavislog:-/var/log/mail/mail.info}
LOGTAIL=${logtail:-logtail}
if [ "$1" = "autoconf" ]; then
if [ -f "${AMAVIS_LOG}" ] && [ -n "${LOGTAIL}" ] && [ -x "${LOGTAIL}" ] ; then
-@@ -99,7 +99,7 @@ fi
+@@ -99,7 +99,7 @@
if [ "$1" = "config" ]; then
echo 'graph_title Amavis filter statistics'
echo 'graph_category antivirus'
echo 'virus.label virus'
echo 'virus.info Number of viruses caught in email'
-@@ -117,7 +117,7 @@ virus=U
+@@ -117,7 +117,7 @@
spamm=U
spams=U
if [ -n "$TEMP_FILE" ] && [ -f "$TEMP_FILE" ]; then
if [ "$ARGS" != 0 ]; then
-diff -urNpa munin-2.0.42.orig/plugins/node.d/apache_accesses.in munin-2.0.42/plugins/node.d/apache_accesses.in
---- munin-2.0.42.orig/plugins/node.d/apache_accesses.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d/apache_accesses.in 2018-10-11 15:01:25.724033000 +0000
-@@ -103,6 +103,7 @@ if (! eval "require LWP::UserAgent;")
+diff -ur munin-2.0.69.orig/plugins/node.d/apache_accesses.in munin-2.0.69/plugins/node.d/apache_accesses.in
+--- munin-2.0.69.orig/plugins/node.d/apache_accesses.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/apache_accesses.in 2022-08-27 15:12:36.151833008 +0200
+@@ -99,6 +99,7 @@
my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
+my $HOST = exists $ENV{'host'} ? $ENV{'host'} : undef;
- if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
- {
-@@ -143,7 +144,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
+
+ # Convert an URL with the %d placeholder into a string. Allow URL without placeholder.
+@@ -147,7 +148,11 @@
if ( defined $ARGV[0] and $ARGV[0] eq "config" )
{
print "graph_args --base 1000\n";
print "graph_vlabel accesses / \${graph_period}\n";
print "graph_category apache\n";
-diff -urNpa munin-2.0.42.orig/plugins/node.d/apache_processes.in munin-2.0.42/plugins/node.d/apache_processes.in
---- munin-2.0.42.orig/plugins/node.d/apache_processes.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d/apache_processes.in 2018-10-11 15:01:25.724033000 +0000
-@@ -110,6 +110,7 @@ if (! eval "require LWP::UserAgent;")
+diff -ur munin-2.0.69.orig/plugins/node.d/apache_processes.in munin-2.0.69/plugins/node.d/apache_processes.in
+--- munin-2.0.69.orig/plugins/node.d/apache_processes.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/apache_processes.in 2022-08-27 15:12:36.151833008 +0200
+@@ -106,6 +106,7 @@
my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
+my $HOST = exists $ENV{'host'} ? $ENV{'host'} : undef;
my $SHOWFREE = !exists $ENV{'showfree'} || $ENV{'showfree'};
- if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
-@@ -150,7 +151,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
+
+@@ -154,7 +155,11 @@
if ( defined $ARGV[0] and $ARGV[0] eq "config" )
{
print "graph_args --base 1000 -l 0\n";
print "graph_category apache\n";
print "graph_order ";
-diff -urNpa munin-2.0.42.orig/plugins/node.d/apache_volume.in munin-2.0.42/plugins/node.d/apache_volume.in
---- munin-2.0.42.orig/plugins/node.d/apache_volume.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d/apache_volume.in 2018-10-11 15:01:25.724033000 +0000
-@@ -103,6 +103,7 @@ if (! eval "require LWP::UserAgent;")
+diff -ur munin-2.0.69.orig/plugins/node.d/apache_volume.in munin-2.0.69/plugins/node.d/apache_volume.in
+--- munin-2.0.69.orig/plugins/node.d/apache_volume.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/apache_volume.in 2022-08-27 15:12:36.151833008 +0200
+@@ -99,6 +99,7 @@
my $URL = exists $ENV{'url'} ? $ENV{'url'} : "http://127.0.0.1:%d/server-status?auto";
my @PORTS = exists $ENV{'ports'} ? split(' ', $ENV{'ports'}) : (80);
+my $HOST = exists $ENV{'host'} ? $ENV{'host'} : undef;
- if ( defined $ARGV[0] and $ARGV[0] eq "autoconf" )
- {
-@@ -143,7 +144,11 @@ if ( defined $ARGV[0] and $ARGV[0] eq "a
+
+ # Convert an URL with the %d placeholder into a string. Allow URL without placeholder.
+@@ -147,7 +148,11 @@
if ( defined $ARGV[0] and $ARGV[0] eq "config" )
{
print "graph_args --base 1000\n";
print "graph_vlabel bytes per \${graph_period}\n";
print "graph_category apache\n";
-diff -urNpa munin-2.0.42.orig/plugins/node.d/bind9.in munin-2.0.42/plugins/node.d/bind9.in
---- munin-2.0.42.orig/plugins/node.d/bind9.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d/bind9.in 2018-10-11 15:01:25.724033000 +0000
-@@ -53,7 +53,7 @@ GPLv2
+diff -ur munin-2.0.69.orig/plugins/node.d/bind9.in munin-2.0.69/plugins/node.d/bind9.in
+--- munin-2.0.69.orig/plugins/node.d/bind9.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/bind9.in 2022-08-27 15:12:36.151833008 +0200
+@@ -53,7 +53,7 @@
use strict;
my $QUERYLOG = $ENV{logfile} || '/var/log/bind9/query.log';
my $OTHER=0;
my %IN;
-@@ -63,7 +63,7 @@ sub get_state {
+@@ -63,7 +63,7 @@
open(Q, ">", $STATEFILE);
close(Q);
}
while (<Q>) {
chomp;
my ($q,$n) = split(/\s+/,$_,2);
-diff -urNpa munin-2.0.42.orig/plugins/node.d/courier_.in munin-2.0.42/plugins/node.d/courier_.in
---- munin-2.0.42.orig/plugins/node.d/courier_.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d/courier_.in 2018-10-11 15:01:25.725033000 +0000
-@@ -55,7 +55,7 @@ Unknown
+diff -ur munin-2.0.69.orig/plugins/node.d/courier_.in munin-2.0.69/plugins/node.d/courier_.in
+--- munin-2.0.69.orig/plugins/node.d/courier_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/courier_.in 2022-08-27 15:12:36.152833010 +0200
+@@ -55,7 +55,7 @@
COURIER_LOG=${logfile:-/var/log/mail.log}
SERVICE=${service:-$(basename "$0" | sed 's/^courier_//g')}
OFFSET_FILE=${MUNIN_PLUGSTATE}/courier_${SERVICE}.offset
case $1 in
-diff -urNpa munin-2.0.42.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.42/plugins/node.d/courier_mta_mailstats.in
---- munin-2.0.42.orig/plugins/node.d/courier_mta_mailstats.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d/courier_mta_mailstats.in 2018-10-11 15:01:25.725033000 +0000
-@@ -108,7 +108,9 @@ if(!defined $pos) {
+diff -ur munin-2.0.69.orig/plugins/node.d/courier_mta_mailstats.in munin-2.0.69/plugins/node.d/courier_mta_mailstats.in
+--- munin-2.0.69.orig/plugins/node.d/courier_mta_mailstats.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/courier_mta_mailstats.in 2022-08-27 15:12:36.152833010 +0200
+@@ -108,7 +108,9 @@
if($startsize < $pos) {
# Log rotated
$pos = 0;
}
-diff -urNpa munin-2.0.42.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.42/plugins/node.d/courier_mta_mailvolume.in
---- munin-2.0.42.orig/plugins/node.d/courier_mta_mailvolume.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d/courier_mta_mailvolume.in 2018-10-11 15:01:25.725033000 +0000
-@@ -98,7 +98,9 @@ if(!defined $pos) {
+diff -ur munin-2.0.69.orig/plugins/node.d/courier_mta_mailvolume.in munin-2.0.69/plugins/node.d/courier_mta_mailvolume.in
+--- munin-2.0.69.orig/plugins/node.d/courier_mta_mailvolume.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/courier_mta_mailvolume.in 2022-08-27 15:12:36.152833010 +0200
+@@ -98,7 +98,9 @@
if($startsize < $pos) {
# Log rotated
$pos = 0;
}
-diff -urNpa munin-2.0.42.orig/plugins/node.d/cupsys_pages.in munin-2.0.42/plugins/node.d/cupsys_pages.in
---- munin-2.0.42.orig/plugins/node.d/cupsys_pages.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d/cupsys_pages.in 2018-10-11 15:01:25.725033000 +0000
-@@ -100,7 +100,9 @@ if (!defined $pos) {
+diff -ur munin-2.0.69.orig/plugins/node.d/cupsys_pages.in munin-2.0.69/plugins/node.d/cupsys_pages.in
+--- munin-2.0.69.orig/plugins/node.d/cupsys_pages.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/cupsys_pages.in 2022-08-27 15:12:36.155833015 +0200
+@@ -105,7 +105,9 @@
}
if ($startsize < $pos) {
# Log rotated
$pos = 0;
}
-@@ -146,7 +148,7 @@ sub parselogfile {
+@@ -152,7 +154,7 @@
while (tell(LOGFILE) < $stop) {
my $line = <LOGFILE>;
chomp ($line);
if(!defined($printers{$1}) && keys(%printers) < $MAXLABEL) {
$printers{$1} += int($2)*int($3);
} elsif(defined($printers{$1})) {
-diff -urNpa munin-2.0.42.orig/plugins/node.d/foldingathome_rank.in munin-2.0.42/plugins/node.d/foldingathome_rank.in
---- munin-2.0.42.orig/plugins/node.d/foldingathome_rank.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/foldingathome_rank.in 2018-10-11 15:01:25.726033000 +0000
+diff -ur munin-2.0.69.orig/plugins/node.d/foldingathome_rank.in munin-2.0.69/plugins/node.d/foldingathome_rank.in
+--- munin-2.0.69.orig/plugins/node.d/foldingathome_rank.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/foldingathome_rank.in 2022-08-27 15:12:36.155833015 +0200
@@ -12,7 +12,7 @@
# scripts):
#%# family=contrib
if [ "$1" = "config" ]; then
echo 'graph_title Folding@Home Rank'
-diff -urNpa munin-2.0.42.orig/plugins/node.d/mailman.in munin-2.0.42/plugins/node.d/mailman.in
---- munin-2.0.42.orig/plugins/node.d/mailman.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/mailman.in 2018-10-11 15:01:25.726033000 +0000
-@@ -39,7 +39,13 @@ $members = 0;
+diff -ur munin-2.0.69.orig/plugins/node.d/mailman.in munin-2.0.69/plugins/node.d/mailman.in
+--- munin-2.0.69.orig/plugins/node.d/mailman.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/mailman.in 2022-08-27 15:12:36.156833017 +0200
+@@ -39,7 +39,13 @@
# System paths
$logfile = $ENV{'logfile'} || "/var/log/mailman/post";
$libdir = $ENV{'libdir'} || "/var/lib/mailman";
if (-f "$logfile.0")
{
-@@ -104,7 +110,9 @@ if(!defined $pos) {
- $startsize = 0;
- } elsif($startsize < $pos) {
- # Log rotated
-- parseMailmanLog($rotlogfile, $pos, (stat $rotlogfile)[7]);
-+ if (-f $rotlogfile) {
-+ parseMailmanLog($rotlogfile, $pos, (stat $rotlogfile)[7]);
-+ }
- $pos = 0;
- }
-
-diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_.in munin-2.0.42/plugins/node.d/mysql_.in
---- munin-2.0.42.orig/plugins/node.d/mysql_.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/mysql_.in 2018-10-11 15:01:25.727033000 +0000
-@@ -50,6 +50,7 @@ Non-default example:
+diff -ur munin-2.0.69.orig/plugins/node.d/mysql_.in munin-2.0.69/plugins/node.d/mysql_.in
+--- munin-2.0.69.orig/plugins/node.d/mysql_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/mysql_.in 2022-08-27 15:12:36.156833017 +0200
+@@ -50,6 +50,7 @@
env.mysqlconnection DBI:mysql:information_schema;host=127.0.0.1;port=3306
env.mysqluser munin
env.mysqlpassword geheim
env.cachenamespace munin_mysql_pri
[mysql2_*]
env.mysqlconnection DBI:mysql:information_schema;host=127.0.0.1;port=13306
-@@ -189,6 +190,7 @@ my %config = (
+@@ -194,6 +195,7 @@
'user' => $ENV{'mysqluser'} || 'root',
'password' => $ENV{'mysqlpassword'} || '',
'cache_namespace' => $ENV{'cachenamespace'} || 'munin_mysql',
);
-@@ -1111,8 +1113,10 @@ sub update_data {
+@@ -1117,8 +1119,10 @@
update_variables($dbh);
update_plugins($dbh);
update_innodb($dbh);
$shared_memory_cache->set('data', $data);
$shared_memory_cache->set('graphs', nfreeze(\%graphs));
-diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_innodb.in munin-2.0.42/plugins/node.d/mysql_innodb.in
---- munin-2.0.42.orig/plugins/node.d/mysql_innodb.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/mysql_innodb.in 2018-10-11 15:01:25.727033000 +0000
+diff -ur munin-2.0.69.orig/plugins/node.d/mysql_innodb.in munin-2.0.69/plugins/node.d/mysql_innodb.in
+--- munin-2.0.69.orig/plugins/node.d/mysql_innodb.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/mysql_innodb.in 2022-08-27 15:12:36.156833017 +0200
@@ -1,4 +1,4 @@
-#!@@GOODSH@@
+#!@@BASH@@
: << =cut
-diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.42/plugins/node.d/mysql_slowqueries.in
---- munin-2.0.42.orig/plugins/node.d/mysql_slowqueries.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/mysql_slowqueries.in 2018-10-11 15:18:55.849033000 +0000
-@@ -61,6 +61,6 @@ if [ "$1" = "config" ]; then
+diff -ur munin-2.0.69.orig/plugins/node.d/mysql_slowqueries.in munin-2.0.69/plugins/node.d/mysql_slowqueries.in
+--- munin-2.0.69.orig/plugins/node.d/mysql_slowqueries.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/mysql_slowqueries.in 2022-08-27 15:12:36.156833017 +0200
+@@ -61,6 +61,6 @@
exit 0
fi
+/bin/printf "queries.value "
# shellcheck disable=SC2086
("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo a a a a a a a a U) | awk '{print $9}'
-diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_threads.in munin-2.0.42/plugins/node.d/mysql_threads.in
---- munin-2.0.42.orig/plugins/node.d/mysql_threads.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/mysql_threads.in 2018-10-11 15:19:08.599033000 +0000
-@@ -70,6 +70,6 @@ if [ "$1" = "config" ]; then
+diff -ur munin-2.0.69.orig/plugins/node.d/mysql_threads.in munin-2.0.69/plugins/node.d/mysql_threads.in
+--- munin-2.0.69.orig/plugins/node.d/mysql_threads.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/mysql_threads.in 2022-08-27 15:12:36.156833017 +0200
+@@ -70,6 +70,6 @@
exit 0
fi
+/bin/printf "threads.value "
# shellcheck disable=SC2086
("$MYSQLADMIN" $MYSQLOPTS status 2>/dev/null || echo 'a a a U') | awk '{print $4}'
-diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_.in munin-2.0.42/plugins/node.d/ntp_.in
---- munin-2.0.42.orig/plugins/node.d/ntp_.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/ntp_.in 2018-10-11 15:01:25.728033000 +0000
-@@ -57,26 +57,26 @@ use Net::DNS;
- use Net::IP;
-
- if ($ARGV[0] and $ARGV[0] eq "autoconf") {
-- `ntpq -c help >/dev/null 2>/dev/null`;
-+ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
- if ($CHILD_ERROR eq "0") {
-- if (`ntpq -n -c peers | wc -l` > 0) {
-+ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) {
- print "yes\n";
- exit 0;
- } else {
-- print "no (ntpq -p returned no peers)\n";
-+ print "no (/usr/sbin/ntpq -p returned no peers)\n";
- exit 0;
- }
+diff -ur munin-2.0.69.orig/plugins/node.d/ntp_.in munin-2.0.69/plugins/node.d/ntp_.in
+--- munin-2.0.69.orig/plugins/node.d/ntp_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/ntp_.in 2022-08-27 15:12:36.157833019 +0200
+@@ -70,9 +70,9 @@
+ if (!$has_requirements) {
+ print "no (missing Net::DNS or Net::IP modules)\n";
} else {
-- print "no (ntpq not found)\n";
-+ print "no (/usr/sbin/ntpq not found)\n";
- exit 0;
- }
+- `ntpq -c help >/dev/null 2>/dev/null`;
++ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
+ if ($CHILD_ERROR eq "0") {
+- if (`ntpq -n -c peers | wc -l` > 0) {
++ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) {
+ print "yes\n";
+ } else {
+ print "no (ntpq -p returned no peers)\n";
+@@ -85,10 +85,10 @@
}
if ($ARGV[0] and $ARGV[0] eq "suggest") {
$peerinfo =~ s/\R/ /g;
my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
print $peer_addr, "\n" unless $peer_addr eq "0.0.0.0";
-@@ -108,7 +108,7 @@ my $srcadr;
- my $delay;
- my $offset;
- my $jitter;
+@@ -120,12 +120,12 @@
+ my $delay = "U";
+ my $offset = "U";
+ my $jitter = "U";
-my @associations = `ntpq -c associations`;
+my @associations = `/usr/sbin/ntpq -c associations`;
foreach my $line (@associations) {
if ($line =~ m/^\s*\d+/) {
-diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.42/plugins/node.d/ntp_kernel_err.in
---- munin-2.0.42.orig/plugins/node.d/ntp_kernel_err.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/ntp_kernel_err.in 2018-10-11 15:21:12.578033000 +0000
-@@ -32,7 +32,7 @@ EOF
+ my (undef, undef, $assid, undef, undef, undef, undef, undef, undef, undef) = split(/\s+/, $line);
+- chomp(my $peerinfo = `ntpq -n -c "readvar $assid srcadr,delay,offset,jitter"`);
++ chomp(my $peerinfo = `/usr/sbin/ntpq -n -c "readvar $assid srcadr,delay,offset,jitter"`);
+ $peerinfo =~ s/\R/ /g;
+ ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/);
+ ($delay) = ($peerinfo =~ m/delay=([^, ]+)/);
+@@ -165,7 +165,7 @@
+ ASSOCS: foreach my $line (@associations) {
+ if ($line =~ m/^\s*\d+/) {
+ my (undef, undef, $assid, undef, undef, undef, undef, undef, undef, undef) = split(/\s+/, $line);
+- chomp(my $peerinfo = `ntpq -n -c "readvar $assid srcadr,delay,offset,jitter"`);
++ chomp(my $peerinfo = `/usr/sbin/ntpq -n -c "readvar $assid srcadr,delay,offset,jitter"`);
+ $peerinfo =~ s/\R/ /g;
+ ($srcadr) = ($peerinfo =~ m/srcadr=([^, ]+)/);
+ ($delay) = ($peerinfo =~ m/delay=([^, ]+)/);
+diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_err.in munin-2.0.69/plugins/node.d/ntp_kernel_err.in
+--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_err.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/ntp_kernel_err.in 2022-08-27 15:12:36.157833019 +0200
+@@ -32,7 +32,7 @@
export PATH=/usr/local/sbin:$PATH
if [ "$1" = "autoconf" ]; then
awk 'BEGIN { ev=1; }
/^estimated error:/ { ev=0; }
END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }'
-@@ -51,9 +51,9 @@ fi
+@@ -51,10 +51,10 @@
printf 'ntp_err.value '
--if [ "$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ]
-+if [ "$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ]
- then
-- ntpq -c kerninfo | awk '/^estimated error:/ { print $3 / 1000 }'
-+ /usr/sbin/ntpq -c kerninfo | awk '/^estimated error:/ { print $3 / 1000 }'
+-ntpq_name=$(ntpq -c version | sed 's/[^[:alpha:]].*//')
+-ntpq_version=$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]')
++ntpq_name=$(/usr/sbin/ntpq -c version | sed 's/[^[:alpha:]].*//')
++ntpq_version=$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]')
+ if [ "$ntpq_name" = "ntpq" ] && [ "$(echo "$ntpq_version" | tr -d '.')" -lt 427 ]; then
+- ntpdc -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3) }'
++ /usr/sbin/ntpdc -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3) }'
else
-- ntpdc -c kerninfo | awk '/^estimated error:/ { print $3 }'
-+ /usr/sbin/ntpdc -c kerninfo | awk '/^estimated error:/ { print $3 }'
+- ntpq -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3 / 1000) }'
++ /usr/sbin/ntpq -c kerninfo | awk '/^estimated error:/ { printf("%.9f\n", $3 / 1000) }'
fi
-diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in
---- munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 15:20:02.850033000 +0000
-@@ -39,7 +39,7 @@ EOF
+diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in
+--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in 2022-08-27 15:12:36.157833019 +0200
+@@ -35,7 +35,7 @@
export PATH=/usr/local/sbin:$PATH
if [ "$1" = "autoconf" ]; then
awk 'BEGIN { ev=1; }
/^pll frequency:/ { ev=0; }
END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }'
-@@ -65,11 +65,11 @@ fi
+@@ -61,12 +61,12 @@
printf 'ntp_pll_freq.value '
--if [ "$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ]
-+if [ "$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ]
- then
-- cmd=ntpq
-+ cmd=/usr/sbin/ntpq
- else
+-ntpq_name=$(ntpq -c version | sed 's/[^[:alpha:]].*//')
+-ntpq_version=$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]')
++ntpq_name=$(/usr/sbin/ntpq -c version | sed 's/[^[:alpha:]].*//')
++ntpq_version=$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]')
+ if [ "$ntpq_name" = "ntpq" ] && [ "$(echo "$ntpq_version" | tr -d '.')" -lt 427 ]; then
- cmd=ntpdc
+ cmd=/usr/sbin/ntpdc
+ else
+- cmd=ntpq
++ cmd=/usr/sbin/ntpq
fi
- $cmd -c kerninfo | awk -v fcomp=$fcomp '/^pll frequency:/ { print $3 + fcomp }'
-diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.42/plugins/node.d/ntp_kernel_pll_off.in
---- munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_off.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/ntp_kernel_pll_off.in 2018-10-11 15:20:26.379033000 +0000
-@@ -32,7 +32,7 @@ EOF
+ "$cmd" -c kerninfo | awk -v "fcomp=$fcomp" '/^pll frequency:/ { printf("%.9f\n", $3 + fcomp) }'
+diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_off.in munin-2.0.69/plugins/node.d/ntp_kernel_pll_off.in
+--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_off.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/ntp_kernel_pll_off.in 2022-08-27 15:12:36.159833023 +0200
+@@ -32,7 +32,7 @@
export PATH=/usr/local/sbin:$PATH
if [ "$1" = "autoconf" ]; then
awk 'BEGIN { ev=1; }
/^pll offset:/ { ev=0; }
END { if (ev == 0) { print "yes";} else { print "no (command ntpq or ntpdc not found)"; } exit 0; }'
-@@ -51,9 +51,9 @@ fi
+@@ -51,10 +51,10 @@
printf 'ntp_pll_off.value '
--if [ "$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ]
-+if [ "$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]' | tr -d '.')" -ge 427 ]
- then
-- ntpq -c kerninfo | awk '/^pll offset:/ { print $3 / 1000 }'
-+ /usr/sbin/ntpq -c kerninfo | awk '/^pll offset:/ { print $3 / 1000 }'
+-ntpq_name=$(ntpq -c version | sed 's/[^[:alpha:]].*//')
+-ntpq_version=$(ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]')
++ntpq_name=$(/usr/sbin/ntpq -c version | sed 's/[^[:alpha:]].*//')
++ntpq_version=$(/usr/sbin/ntpq -c version | grep --extended-regexp --only-matching '[[:digit:]]\.[[:digit:]]\.[[:digit:]]')
+ if [ "$ntpq_name" = "ntpq" ] && [ "$(echo "$ntpq_version" | tr -d '.')" -lt 427 ]; then
+- ntpdc -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3) }'
++ /usr/sbin/ntpdc -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3) }'
else
-- ntpdc -c kerninfo | awk '/^pll offset:/ { print $3 }'
-+ /usr/sbin/ntpdc -c kerninfo | awk '/^pll offset:/ { print $3 }'
+- ntpq -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3 / 1000) }'
++ /usr/sbin/ntpq -c kerninfo | awk '/^pll offset:/ { printf("%.9f\n", $3 / 1000) }'
fi
-diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_offset.in munin-2.0.42/plugins/node.d/ntp_offset.in
---- munin-2.0.42.orig/plugins/node.d/ntp_offset.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/ntp_offset.in 2018-10-11 15:01:25.729033000 +0000
-@@ -42,9 +42,9 @@ nodelay=${nodelay:-}
+diff -ur munin-2.0.69.orig/plugins/node.d/ntp_offset.in munin-2.0.69/plugins/node.d/ntp_offset.in
+--- munin-2.0.69.orig/plugins/node.d/ntp_offset.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/ntp_offset.in 2022-08-27 15:12:36.160833025 +0200
+@@ -43,9 +43,9 @@
do_autoconf () {
0)
echo 'no (unable to list peers)'
exit 0
-@@ -61,7 +61,7 @@ do_autoconf () {
+@@ -62,7 +62,7 @@
}
do_config () {
# shellcheck disable=SC2086
set - $syspeer
-@@ -91,7 +91,7 @@ EOF
+@@ -95,7 +95,7 @@
do_ () {
# Fetch operation
# shellcheck disable=SC2086
set - $syspeer
-diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_states.in munin-2.0.42/plugins/node.d/ntp_states.in
---- munin-2.0.42.orig/plugins/node.d/ntp_states.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/ntp_states.in 2018-10-11 15:01:25.729033000 +0000
-@@ -77,10 +77,10 @@ sub make_hash {
+diff -ur munin-2.0.69.orig/plugins/node.d/ntp_states.in munin-2.0.69/plugins/node.d/ntp_states.in
+--- munin-2.0.69.orig/plugins/node.d/ntp_states.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/ntp_states.in 2022-08-27 15:12:36.160833025 +0200
+@@ -54,9 +54,9 @@
+ if (!$has_net_dns) {
+ print "no (missing perl module Net::DNS)\n";
+ } else {
+- `ntpq -c help >/dev/null 2>/dev/null`;
++ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
+ if ($CHILD_ERROR eq "0") {
+- if (`ntpq -n -c peers | wc -l` > 0) {
++ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) {
+ print "yes\n";
+ } else {
+ print "no (ntpq -p returned no peers)\n";
+@@ -98,10 +98,10 @@
# 1 63933 931a yes yes none outlier sys_peer 1
# 2 63934 943a yes yes none candidate sys_peer 3
$peerinfo =~ s/\s//g;
my ($peer_addr) = ($peerinfo =~ m/srcadr=(.*)/);
-@@ -141,17 +141,17 @@ sub make_names {
- }
-
- if ($ARGV[0] and $ARGV[0] eq "autoconf") {
-- `ntpq -c help >/dev/null 2>/dev/null`;
-+ `/usr/sbin/ntpq -c help >/dev/null 2>/dev/null`;
- if ($CHILD_ERROR eq "0") {
-- if (`ntpq -n -c peers | wc -l` > 0) {
-+ if (`/usr/sbin/ntpq -n -c peers | wc -l` > 0) {
- print "yes\n";
- exit 0;
- } else {
-- print "no (ntpq -p returned no peers)\n";
-+ print "no (/usr/sbin/ntpq -p returned no peers)\n";
- exit 0;
- }
- } else {
-- print "no (ntpq not found)\n";
-+ print "no (/usr/sbin/ntpq not found)\n";
- exit 0;
- }
- }
-diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_misc.in munin-2.0.42/plugins/node.d/nut_misc.in
---- munin-2.0.42.orig/plugins/node.d/nut_misc.in 2018-10-11 15:00:48.916033000 +0000
-+++ munin-2.0.42/plugins/node.d/nut_misc.in 2018-10-11 15:01:25.729033000 +0000
-@@ -38,7 +38,8 @@ use strict;
+diff -ur munin-2.0.69.orig/plugins/node.d/nut_misc.in munin-2.0.69/plugins/node.d/nut_misc.in
+--- munin-2.0.69.orig/plugins/node.d/nut_misc.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/nut_misc.in 2022-08-27 15:12:36.160833025 +0200
+@@ -38,7 +38,8 @@
my %status;
my %config = (
upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
);
-@@ -48,11 +49,6 @@ my %graph = (
+@@ -48,11 +49,6 @@
type => 'GAUGE',
draw => 'LINE2'
},
'battery_runtime' => {
label => 'runtime - min',
type => 'GAUGE',
-@@ -76,7 +72,12 @@ my %graph = (
+@@ -76,7 +72,12 @@
);
if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) {
#print "graph_args -l 110\n";
#print "graph_vlabel Misc\n";
foreach my $key (keys %graph) {
-@@ -89,7 +90,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq 'c
+@@ -89,7 +90,7 @@
}
sub fetch_values {
while ($data =~ /([a-z.]+): (.+)\b/g) {
my $label = $1;
my $value = $2;
-diff -urNpa munin-2.0.42.orig/plugins/node.d/nut_volts.in munin-2.0.42/plugins/node.d/nut_volts.in
---- munin-2.0.42.orig/plugins/node.d/nut_volts.in 2018-10-11 15:00:48.917033000 +0000
-+++ munin-2.0.42/plugins/node.d/nut_volts.in 2018-10-11 15:01:25.730033000 +0000
-@@ -14,7 +14,8 @@ use strict;
+diff -ur munin-2.0.69.orig/plugins/node.d/nut_volts.in munin-2.0.69/plugins/node.d/nut_volts.in
+--- munin-2.0.69.orig/plugins/node.d/nut_volts.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/nut_volts.in 2022-08-27 15:12:36.160833025 +0200
+@@ -14,7 +14,8 @@
my %status;
my %config = (
upsc => $ENV{"upsc"} ? $ENV{"upsc"} : 'upsc'
);
-@@ -24,16 +25,6 @@ my %graph = (
+@@ -24,16 +25,6 @@
type => 'GAUGE',
draw => 'LINE2'
},
'output_voltage' => {
label => 'output',
type => 'GAUGE',
-@@ -42,7 +33,12 @@ my %graph = (
+@@ -42,7 +33,12 @@
);
if ( defined $ARGV[0] and $ARGV[0] eq 'config' ) {
print "graph_args -l 115\n";
print "graph_vlabel Volts\n";
foreach my $key (keys %graph) {
-@@ -55,7 +51,7 @@ if ( defined $ARGV[0] and $ARGV[0] eq 'c
+@@ -55,7 +51,7 @@
}
sub fetch_values {
while ($data =~ /([a-z.]+): (.+)\b/g) {
my $label = $1;
my $value = $2;
-diff -urNpa munin-2.0.42.orig/plugins/node.d/perdition.in munin-2.0.42/plugins/node.d/perdition.in
---- munin-2.0.42.orig/plugins/node.d/perdition.in 2018-10-11 15:00:48.917033000 +0000
-+++ munin-2.0.42/plugins/node.d/perdition.in 2018-10-11 15:01:25.730033000 +0000
-@@ -53,7 +53,7 @@ Unknown
+diff -ur munin-2.0.69.orig/plugins/node.d/perdition.in munin-2.0.69/plugins/node.d/perdition.in
+--- munin-2.0.69.orig/plugins/node.d/perdition.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/perdition.in 2022-08-27 15:12:36.161833027 +0200
+@@ -53,7 +53,7 @@
# Set the location of the perdition logs
PERDITION_LOG=${logfile:-/var/log/perdition.log}
OFFSET_FILE=${MUNIN_PLUGSTATE}/perdition.offset
case $1 in
autoconf|detect)
-diff -urNpa munin-2.0.42.orig/plugins/node.d/pop_stats.in munin-2.0.42/plugins/node.d/pop_stats.in
---- munin-2.0.42.orig/plugins/node.d/pop_stats.in 2018-10-11 15:00:48.917033000 +0000
-+++ munin-2.0.42/plugins/node.d/pop_stats.in 2018-10-11 15:01:25.730033000 +0000
-@@ -68,7 +68,9 @@ if (!defined $pos)
+diff -ur munin-2.0.69.orig/plugins/node.d/pop_stats.in munin-2.0.69/plugins/node.d/pop_stats.in
+--- munin-2.0.69.orig/plugins/node.d/pop_stats.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/pop_stats.in 2022-08-27 15:12:36.161833027 +0200
+@@ -68,7 +68,9 @@
if ($startsize < $pos)
{
# Log rotated
$pos = 0;
}
-diff -urNpa munin-2.0.42.orig/plugins/node.d/postgres_scans_.in munin-2.0.42/plugins/node.d/postgres_scans_.in
---- munin-2.0.42.orig/plugins/node.d/postgres_scans_.in 2018-10-11 15:00:48.917033000 +0000
-+++ munin-2.0.42/plugins/node.d/postgres_scans_.in 2018-10-11 15:01:25.730033000 +0000
-@@ -65,7 +65,6 @@ my $pg = Munin::Plugin::Pgsql->new(
+diff -ur munin-2.0.69.orig/plugins/node.d/postgres_scans_.in munin-2.0.69/plugins/node.d/postgres_scans_.in
+--- munin-2.0.69.orig/plugins/node.d/postgres_scans_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/postgres_scans_.in 2022-08-27 15:12:36.161833027 +0200
+@@ -65,7 +65,6 @@
vlabel => 'Scans / sec',
basequery =>
"SELECT COALESCE(sum(seq_scan),0) AS sequential, COALESCE(sum(idx_scan),0) AS index FROM pg_stat_user_tables",
pivotquery => 1,
configquery =>
"VALUES ('sequential','Sequential scans'), ('index','Index scans')",
-diff -urNpa munin-2.0.42.orig/plugins/node.d/postgres_tuples_.in munin-2.0.42/plugins/node.d/postgres_tuples_.in
---- munin-2.0.42.orig/plugins/node.d/postgres_tuples_.in 2018-10-11 15:00:48.917033000 +0000
-+++ munin-2.0.42/plugins/node.d/postgres_tuples_.in 2018-10-11 15:01:25.730033000 +0000
-@@ -74,7 +74,6 @@ my $pg = Munin::Plugin::Pgsql->new(
+diff -ur munin-2.0.69.orig/plugins/node.d/postgres_tuples_.in munin-2.0.69/plugins/node.d/postgres_tuples_.in
+--- munin-2.0.69.orig/plugins/node.d/postgres_tuples_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/postgres_tuples_.in 2022-08-27 15:12:36.161833027 +0200
+@@ -74,7 +74,6 @@
. " COALESCE(sum(n_tup_del),0) AS deleted FROM pg_stat_user_tables",
],
],
pivotquery => 1,
configquery => [
"VALUES ('seqread','Tuples sequentally read'), ('idxfetch','Tuples index fetched'), ('inserted','Tuples inserted'),"
-diff -urNpa munin-2.0.42.orig/plugins/node.d/slapd_.in munin-2.0.42/plugins/node.d/slapd_.in
---- munin-2.0.42.orig/plugins/node.d/slapd_.in 2018-10-11 15:00:48.917033000 +0000
-+++ munin-2.0.42/plugins/node.d/slapd_.in 2018-10-11 15:01:25.730033000 +0000
-@@ -37,7 +37,7 @@ use vars qw ( $config $param $act $scope
+diff -ur munin-2.0.69.orig/plugins/node.d/slapd_.in munin-2.0.69/plugins/node.d/slapd_.in
+--- munin-2.0.69.orig/plugins/node.d/slapd_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/slapd_.in 2022-08-27 15:12:36.161833027 +0200
+@@ -37,7 +37,7 @@
# Change these to reflect your LDAP ACL. The given DN must have
# read access to the Monitor branch.
my $server = ($ENV{'server'} || 'localhost');
my $userdn = ($ENV{'binddn'} || '');
my $userpw = ($ENV{'bindpw'} || '');
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat.in munin-2.0.42/plugins/node.d.linux/iostat.in
---- munin-2.0.42.orig/plugins/node.d.linux/iostat.in 2018-10-11 15:00:48.914033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/iostat.in 2018-10-11 15:01:25.731033000 +0000
-@@ -173,7 +173,7 @@ sub fetch_detailed() {
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/iostat.in munin-2.0.69/plugins/node.d.linux/iostat.in
+--- munin-2.0.69.orig/plugins/node.d.linux/iostat.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/iostat.in 2022-08-27 15:16:13.861246722 +0200
+@@ -169,7 +169,7 @@
if ($tmpnam =~ /\d+$/ and !$include_numbered) {
- # Special case for devices like cXdXpX,
- # like the cciss driver
-- next unless $tmpnam =~ /\/c\d+d\d+$/
-+ next unless $tmpnam =~ /\/.*d\d+$/
+ # Special case for devices like cXdXpX, like the cciss driver,
+ # or nvmeXnXpX for nvme.
+- next unless ($tmpnam =~ /\/c\d+d\d+$/ || $tmpnam =~ /nvme\d+n\d+$/)
++ next unless ($tmpnam =~ /\/.*d\d+$/ || $tmpnam =~ /nvme\d+n\d+$/)
}
next unless grep { $_ } @fields;
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/ip_.in munin-2.0.42/plugins/node.d.linux/ip_.in
---- munin-2.0.42.orig/plugins/node.d.linux/ip_.in 2018-10-11 15:00:48.914033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/ip_.in 2018-10-11 15:12:04.650033000 +0000
-@@ -128,14 +128,14 @@ case $IP in
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/ip_.in munin-2.0.69/plugins/node.d.linux/ip_.in
+--- munin-2.0.69.orig/plugins/node.d.linux/ip_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/ip_.in 2022-08-27 15:12:36.162833029 +0200
+@@ -128,14 +128,14 @@
# This is a fun hack to make the plugin ip6 compatible.
# Suggested in ticket #439 by "jodal".
eval 'iptables() {
echo "no (could not run iptables as user $(whoami))"
exit 0
else
-@@ -148,10 +148,10 @@ if [[ "$1" == "autoconf" ]]; then
+@@ -148,10 +148,10 @@
fi
fi
fi
exit 0
fi
-@@ -185,5 +185,5 @@ fi;
+@@ -185,5 +185,5 @@
# Escape .'s so they don't match _everything_?
escaped_ip=${IP//./\\.}
-iptables -L "$OUTPUT" -v -n -x -w | awk "/$escaped_ip"'[ /]/ { print "out.value " $2; exit 0; }'
+/usr/sbin/iptables -L "$INPUT" -v -n -x -w | awk "/$escaped_ip"'[ /]/ { print "in.value " $2; exit 0; }'
+/usr/sbin/iptables -L "$OUTPUT" -v -n -x -w | awk "/$escaped_ip"'[ /]/ { print "out.value " $2; exit 0; }'
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/load.in munin-2.0.42/plugins/node.d.linux/load.in
---- munin-2.0.42.orig/plugins/node.d.linux/load.in 2018-10-11 15:00:48.914033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/load.in 2018-10-11 15:01:25.731033000 +0000
-@@ -59,20 +59,20 @@ if [ "$1" = "config" ]; then
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/load.in munin-2.0.69/plugins/node.d.linux/load.in
+--- munin-2.0.69.orig/plugins/node.d.linux/load.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/load.in 2022-08-27 15:12:36.162833029 +0200
+@@ -59,20 +59,20 @@
# one machine answer for several)
# The title of the graph
# These two read the environment for warning values for the field
# "load". If "load_warning" or "warning" aren't set in the
# environment, no warning levels are set. Likewise for "load_critical"
-@@ -82,8 +82,8 @@ if [ "$1" = "config" ]; then
+@@ -82,8 +82,8 @@
# This one is purely to add an explanation to the web page. The first
# one is for the graph itself, while the second one is for the field
# "load".
# Last, if run with the "config"-parameter, quit here (don't
# display any data)
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/nfs_client.in munin-2.0.42/plugins/node.d.linux/nfs_client.in
---- munin-2.0.42.orig/plugins/node.d.linux/nfs_client.in 2018-10-11 15:00:48.914033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/nfs_client.in 2018-10-11 15:12:43.768033000 +0000
-@@ -31,7 +31,7 @@ NFS=/proc/net/rpc/nfs
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/nfs_client.in munin-2.0.69/plugins/node.d.linux/nfs_client.in
+--- munin-2.0.69.orig/plugins/node.d.linux/nfs_client.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/nfs_client.in 2022-08-27 15:12:36.162833029 +0200
+@@ -31,7 +31,7 @@
proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit"
if [ "$1" = "autoconf" ]; then
if grep -q proc3 "$NFS"; then
echo yes
else
-@@ -56,11 +56,66 @@ if [ "$1" = "config" ]; then
+@@ -56,11 +56,66 @@
exit 0
fi
+ print "commit.value " nfs_commit
}' $NFS
-
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/nfsd.in munin-2.0.42/plugins/node.d.linux/nfsd.in
---- munin-2.0.42.orig/plugins/node.d.linux/nfsd.in 2018-10-11 15:00:48.914033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/nfsd.in 2018-10-11 15:13:00.220033000 +0000
-@@ -31,7 +31,7 @@ NFSD=/proc/net/rpc/nfsd
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/nfsd.in munin-2.0.69/plugins/node.d.linux/nfsd.in
+--- munin-2.0.69.orig/plugins/node.d.linux/nfsd.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/nfsd.in 2022-08-27 15:12:36.162833029 +0200
+@@ -31,7 +31,7 @@
proc="getattr setattr lookup access readlink read write create mkdir symlink mknod remove rmdir rename link readdir readdirplus fsstat fsinfo pathconf commit"
if [ "$1" = "autoconf" ]; then
grep -q proc3 "$NFSD"
if grep -q proc3 "$NFSD"; then
echo yes
-@@ -57,9 +57,66 @@ if [ "$1" = "config" ]; then
+@@ -57,9 +57,66 @@
exit 0
fi
+ print "pathconf.value " nfs_pathconf
+ print "commit.value " nfs_commit
+}' $NFSD
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.42/plugins/node.d.linux/vlan_inetuse_.in
---- munin-2.0.42.orig/plugins/node.d.linux/vlan_inetuse_.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/vlan_inetuse_.in 2018-10-11 15:13:31.770033000 +0000
-@@ -37,7 +37,7 @@ my %contraries = ("dpt" => "spt", "spt"
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/vlan_inetuse_.in munin-2.0.69/plugins/node.d.linux/vlan_inetuse_.in
+--- munin-2.0.69.orig/plugins/node.d.linux/vlan_inetuse_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/vlan_inetuse_.in 2022-08-27 15:12:36.163833031 +0200
+@@ -37,7 +37,7 @@
my %in_octets = ();
my %out_octets = ();
die "Could not run iptables: $!\n";
while (<IN>)
{
-@@ -51,7 +51,7 @@ while (<IN>)
+@@ -51,7 +51,7 @@
close IN;
die "Error running iptables. Dying\n" if $?;
die "Could not run iptables: $!\n";
while (<IN>)
{
-@@ -67,7 +67,7 @@ while (<IN>)
+@@ -67,7 +67,7 @@
}
}
close IN;
if ($ARGV[0] and $ARGV[0] eq "config")
{
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.42/plugins/node.d.linux/vlan_linkuse_.in
---- munin-2.0.42.orig/plugins/node.d.linux/vlan_linkuse_.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/vlan_linkuse_.in 2018-10-11 15:13:55.670033000 +0000
-@@ -29,7 +29,7 @@ my %contraries = ("dpt" => "spt", "spt"
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/vlan_linkuse_.in munin-2.0.69/plugins/node.d.linux/vlan_linkuse_.in
+--- munin-2.0.69.orig/plugins/node.d.linux/vlan_linkuse_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/vlan_linkuse_.in 2022-08-27 15:12:36.163833031 +0200
+@@ -29,7 +29,7 @@
my %in_octets = ();
my %out_octets = ();
die "Could not run iptables: $!\n";
while (<IN>)
{
-@@ -60,7 +60,7 @@ while (<IN>)
+@@ -60,7 +60,7 @@
close IN;
die "Error running iptables. Dying\n" if $?;
die "Could not run iptables: $!\n";
while (<IN>)
{
-@@ -84,5 +84,5 @@ while (<IN>)
+@@ -84,5 +84,5 @@
}
}
close IN;
-die "Error running iptables. Dying\n" if $?;
+die "Error running /usr/sbin/iptables. Dying\n" if $?;
# vim:syntax=perl
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.42/plugins/node.d.linux/vserver_resources.in
---- munin-2.0.42.orig/plugins/node.d.linux/vserver_resources.in 2018-10-11 15:00:48.915033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/vserver_resources.in 2018-10-11 15:18:05.899033000 +0000
-@@ -247,6 +247,12 @@ if [ "$1" = "config" ]; then
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/vserver_resources.in munin-2.0.69/plugins/node.d.linux/vserver_resources.in
+--- munin-2.0.69.orig/plugins/node.d.linux/vserver_resources.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/vserver_resources.in 2022-08-27 15:12:36.163833031 +0200
+@@ -247,6 +247,12 @@
echo 'graph_vlabel ANON pages'
echo 'graph_info Shows anonymous memory (human readable) used by each vserver.'
;;
FILES)
echo 'graph_title Files used by vserver'
echo 'graph_args --base 1024k -l 0'
-@@ -283,6 +289,30 @@ if [ "$1" = "config" ]; then
+@@ -283,6 +289,30 @@
echo 'graph_vlabel SHM pages'
echo 'graph_info Shows shared memory (human readable) used by each vserver.'
;;
*)
echo "$RESOURCE not defined."
exit 1
-@@ -301,53 +331,108 @@ if [ "$1" = "config" ]; then
+@@ -301,53 +331,108 @@
case "$RESOURCE" in
PROC)
;;
*)
echo "$RESOURCE not defined."
-@@ -358,7 +443,7 @@ if [ "$1" = "config" ]; then
- if [ ! -z "$LIMITS" ] && [ "$LIMITS" = 1 ]; then
+@@ -358,7 +443,7 @@
+ if [ -n "$LIMITS" ] && [ "$LIMITS" = 1 ]; then
LIMIT=$(grep "$RESOURCE" "/proc/virtual/$xid/limit" | cut -f 4)
if [ "${LIMIT:-0}" -gt 0 ]; then
- echo "$NAME.critical $LIMIT"
fi
fi
done
-@@ -369,8 +454,18 @@ fi
+@@ -369,8 +454,18 @@
for xid in $XIDS ; do
LABEL=$(grep "NodeName" "/proc/virtual/$xid/$NAMELOC" | cut -f 2)
NAME=$(echo "$LABEL" | cut -d. -f1 | tr '-' '_')
-diff -urNpa munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.42/common/lib/Munin/Common/Defaults.pm
---- munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:24:44.276033000 +0000
-+++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:25:02.395033000 +0000
-@@ -18,7 +18,8 @@ my $COMPONENT_ROOT = dirname(__FILE__) .
+diff -ur munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.69/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm 2022-08-27 15:17:33.865403125 +0200
++++ munin-2.0.69/common/lib/Munin/Common/Defaults.pm 2022-08-27 15:18:27.509508002 +0200
+@@ -16,7 +16,8 @@
our $DROPDOWNLIMIT = 1;
our $MUNIN_PREFIX = '';
our $MUNIN_BINDIR = '';
our $MUNIN_SBINDIR = '';
our $MUNIN_DOCDIR = '';
-diff -urNpa munin-2.0.42.orig/doc/installation/configuration.rst munin-2.0.42/doc/installation/configuration.rst
---- munin-2.0.42.orig/doc/installation/configuration.rst 2018-10-11 15:24:44.284033000 +0000
-+++ munin-2.0.42/doc/installation/configuration.rst 2018-10-11 15:25:02.395033000 +0000
-@@ -9,7 +9,7 @@ Plugins
+diff -ur munin-2.0.69.orig/doc/installation/configuration.rst munin-2.0.69/doc/installation/configuration.rst
+--- munin-2.0.69.orig/doc/installation/configuration.rst 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/doc/installation/configuration.rst 2022-08-27 15:18:27.509508002 +0200
+@@ -9,7 +9,7 @@
-------
Decide which plugins to use. The munin node runs all plugins present
The quick auto-plug-and-play solution:
-@@ -59,7 +59,7 @@ Master
+@@ -59,7 +59,7 @@
Add some nodes
--------------
[node.example.com]
address 192.0.2.4
-diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile
---- munin-2.0.42.orig/Makefile 2018-10-11 15:24:44.275033000 +0000
-+++ munin-2.0.42/Makefile 2018-10-11 16:29:37.518033000 +0000
-@@ -81,7 +81,7 @@ uninstall:
+diff -ur munin-2.0.69.orig/Makefile munin-2.0.69/Makefile
+--- munin-2.0.69.orig/Makefile 2022-08-27 15:17:33.866403127 +0200
++++ munin-2.0.69/Makefile 2022-08-27 15:18:27.510508004 +0200
+@@ -82,7 +82,7 @@
# a new config. Target _only_ suitable for maintainers.
unconfig:
rm -f $(HTMLDIR)/.htaccess
tags:
-rm -f TAGS
-@@ -96,14 +96,15 @@ install-pre: Makefile Makefile.config
+@@ -97,14 +97,15 @@
mkdir -p $(LOGDIR)
mkdir -p $(STATEDIR)
mkdir -p $(SPOOLDIR)
mkdir -p $(LIBDIR)
mkdir -p $(BINDIR)
mkdir -p $(SBINDIR)
-@@ -136,7 +137,7 @@ install-master-prime: $(INFILES_MASTER)
+@@ -137,7 +138,7 @@
$(INSTALL) -m 0644 master/DejaVuSans.ttf $(LIBDIR)/
test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
$(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
$(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
-@@ -157,14 +158,14 @@ install-node-plugins: install-plugins-pr
- install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
+@@ -155,14 +156,14 @@
+ install-plugins-prime: install-plugins build $(PLUGINS) $(MAKEFILES)
@$(CHECKGROUP)
- mkdir -p $(CONFDIR)/plugins
@# Process the OS specific plugins at the end. Otherwise they would be overridden by the
@# generic ones.
-@@ -204,7 +205,7 @@ install-async:
+@@ -202,7 +203,7 @@
install-node-prime: install-node-pre install-node
install-node-pre: build/node/munin-node.conf install-pre
install-common-prime: build-common install-common
-@@ -240,7 +241,8 @@ build/%: %.in
+@@ -238,7 +239,8 @@
@echo "$< -> $@"
@mkdir -p build/`dirname $<`
@sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
-e 's|@@BINDIR@@|$(BINDIR)|g' \
-e 's|@@SBINDIR@@|$(SBINDIR)|g' \
-e 's|@@DOCDIR@@|$(DOCDIR)|g' \
-@@ -283,7 +285,8 @@ $(CONFVAR_SUBSTITUTION_DEP_FILES): build
+@@ -286,7 +288,8 @@
substitute-confvar-inline:
perl -p -i -e 's|\@\@PREFIX\@\@|$(PREFIX)|g;' \
-e 's|\@\@BINDIR\@\@|$(BINDIR)|g;' \
-e 's|\@\@SBINDIR\@\@|$(SBINDIR)|g;' \
-e 's|\@\@DOCDIR\@\@|$(DOCDIR)|g;' \
-@@ -339,7 +342,8 @@ common/blib/lib/Munin/Common/Defaults.pm
+@@ -343,7 +346,8 @@
substitute-build-defaults-inline:
rm -f common/blib/lib/Munin/Common/Defaults.pm
$(PERL) -pe 's{(PREFIX\s+=\s).*}{\1q{$(PREFIX)};}x; \
s{(BINDIR\s+=\s).*}{\1q{$(BINDIR)};}x; \
s{(SBINDIR\s+=\s).*}{\1q{$(SBINDIR)};}x; \
s{(DOCDIR\s+=\s).*}{\1q{$(DOCDIR)};}x; \
-@@ -493,7 +497,7 @@ old-test: t/*.t
+@@ -498,7 +502,7 @@
$(MAKE) $@ CONFIG=t/Makefile.config
else
test_plugins = id_default id_root env
@for test in t/*.t; do \
echo -n "$$test: "; \
PERL5LIB=$(PERLLIB) $(PERL) $$test;\
-@@ -501,10 +505,10 @@ old-test: t/*.t t/install $(addprefix $(
+@@ -506,10 +510,10 @@
endif
node-monkeywrench: install-node
cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
$(SBINDIR)/munin-node-configure --suggest
echo 'Done?'
-diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config
---- munin-2.0.42.orig/Makefile.config 2018-10-11 15:24:44.282033000 +0000
-+++ munin-2.0.42/Makefile.config 2018-10-11 15:25:02.396033000 +0000
+diff -ur munin-2.0.69.orig/Makefile.config munin-2.0.69/Makefile.config
+--- munin-2.0.69.orig/Makefile.config 2022-08-27 15:17:33.866403127 +0200
++++ munin-2.0.69/Makefile.config 2022-08-27 15:18:27.510508004 +0200
@@ -20,7 +20,8 @@
PREFIX = $(DESTDIR)/usr
# Server only - where to put munin-cron
BINDIR = $(PREFIX)/bin
-diff -urNpa munin-2.0.42.orig/Makefile.rej munin-2.0.42/Makefile.rej
---- munin-2.0.42.orig/Makefile.rej 2018-10-11 15:24:44.282033000 +0000
-+++ munin-2.0.42/Makefile.rej 1970-01-01 00:00:00.000000000 +0000
-@@ -1,20 +0,0 @@
----- Makefile 2015-09-08 10:02:24.000000000 +0000
--+++ Makefile 2015-09-08 10:12:45.899593251 +0000
--@@ -249,6 +249,7 @@ build/%: %.in
-- -e 's|@@GOODSH@@|$(GOODSH)|g' \
-- -e 's|@@BASH@@|$(BASH)|g' \
-- -e 's|@@HASSETR@@|$(HASSETR)|g' \
--+ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
-- $< > $@;
--
--
--@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm
-- s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
-- s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \
-- s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \
--- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \
--+ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \
--+ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\
-- $< > $@
--
-- build-doc: build-doc-stamp Makefile Makefile.config
-diff -urNpa munin-2.0.42.orig/master/_bin/munin-cgi-graph.in munin-2.0.42/master/_bin/munin-cgi-graph.in
---- munin-2.0.42.orig/master/_bin/munin-cgi-graph.in 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/_bin/munin-cgi-graph.in 2018-10-11 15:25:02.396033000 +0000
-@@ -44,7 +44,7 @@ use Munin::Master::Logger;
+diff -ur munin-2.0.69.orig/master/_bin/munin-cgi-graph.in munin-2.0.69/master/_bin/munin-cgi-graph.in
+--- munin-2.0.69.orig/master/_bin/munin-cgi-graph.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/_bin/munin-cgi-graph.in 2022-08-27 15:18:27.510508004 +0200
+@@ -42,7 +42,7 @@
use Log::Log4perl qw( :easy );
my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
my %period = ( "day" => 300,
"week" => 1800,
-diff -urNpa munin-2.0.42.orig/master/_bin/munin-check.in munin-2.0.42/master/_bin/munin-check.in
---- munin-2.0.42.orig/master/_bin/munin-check.in 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/_bin/munin-check.in 2018-10-11 15:25:02.396033000 +0000
-@@ -163,7 +163,7 @@ done
+diff -ur munin-2.0.69.orig/master/_bin/munin-check.in munin-2.0.69/master/_bin/munin-check.in
+--- munin-2.0.69.orig/master/_bin/munin-check.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/_bin/munin-check.in 2022-08-27 15:18:27.510508004 +0200
+@@ -162,7 +162,7 @@
norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
norec=yes perm_ok @@PLUGSTATE@@ 775
echo "Check done. Please note that this script only checks most things,"
echo "not all things."
-diff -urNpa munin-2.0.42.orig/master/_bin/munin-graph.in munin-2.0.42/master/_bin/munin-graph.in
---- munin-2.0.42.orig/master/_bin/munin-graph.in 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/_bin/munin-graph.in 2018-10-11 15:25:02.396033000 +0000
-@@ -51,7 +51,7 @@ use Munin::Master::Logger;
+diff -ur munin-2.0.69.orig/master/_bin/munin-graph.in munin-2.0.69/master/_bin/munin-graph.in
+--- munin-2.0.69.orig/master/_bin/munin-graph.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/_bin/munin-graph.in 2022-08-27 15:18:27.510508004 +0200
+@@ -53,7 +53,7 @@
use Log::Log4perl qw( :easy );
my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
my %period = ( "day" => 300,
"week" => 1800,
-diff -urNpa munin-2.0.42.orig/master/_bin/munin-limits.in munin-2.0.42/master/_bin/munin-limits.in
---- munin-2.0.42.orig/master/_bin/munin-limits.in 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/_bin/munin-limits.in 2018-10-11 15:25:02.396033000 +0000
-@@ -66,7 +66,7 @@ Limit contacts to those of E<lt>contact<
+diff -ur munin-2.0.69.orig/master/_bin/munin-limits.in munin-2.0.69/master/_bin/munin-limits.in
+--- munin-2.0.69.orig/master/_bin/munin-limits.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/_bin/munin-limits.in 2022-08-27 15:18:27.511508005 +0200
+@@ -64,7 +64,7 @@
=item B<< --config <file> >>
=item B<< --always-send <severity list> >>
-@@ -114,7 +114,7 @@ configuration file contains the necessar
+@@ -112,7 +112,7 @@
=head1 FILES
@@DBDIR@@/*
@@STATEDIR@@/*
-diff -urNpa munin-2.0.42.orig/master/_bin/munin-update.in munin-2.0.42/master/_bin/munin-update.in
---- munin-2.0.42.orig/master/_bin/munin-update.in 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/_bin/munin-update.in 2018-10-11 15:25:02.396033000 +0000
-@@ -139,7 +139,7 @@ munin-update [options]
+diff -ur munin-2.0.69.orig/master/_bin/munin-update.in munin-2.0.69/master/_bin/munin-update.in
+--- munin-2.0.69.orig/master/_bin/munin-update.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/_bin/munin-update.in 2022-08-27 15:18:27.524508030 +0200
+@@ -137,7 +137,7 @@
=item B<< --config_file=<file> >>
=item B<< --[no]debug >>
-@@ -192,7 +192,7 @@ and the directories to store them in.
+@@ -190,7 +190,7 @@
=head1 FILES
@@DBDIR@@/*
@@LOGDIR@@/munin-update
@@STATEDIR@@/*
-diff -urNpa munin-2.0.42.orig/master/doc/munin.conf.pod.in munin-2.0.42/master/doc/munin.conf.pod.in
---- munin-2.0.42.orig/master/doc/munin.conf.pod.in 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/doc/munin.conf.pod.in 2018-10-11 15:25:02.396033000 +0000
-@@ -27,7 +27,7 @@ something like:
+diff -ur munin-2.0.69.orig/master/doc/munin.conf.pod.in munin-2.0.69/master/doc/munin.conf.pod.in
+--- munin-2.0.69.orig/master/doc/munin.conf.pod.in 2022-08-27 15:17:33.866403127 +0200
++++ munin-2.0.69/master/doc/munin.conf.pod.in 2022-08-27 15:18:27.524508030 +0200
+@@ -27,7 +27,7 @@
[machine1.your.dom]
address localhost
If your placement deviates from this norm, use the "--config
E<lt>fileE<gt>"-option when running the munin-* programs.
-@@ -162,20 +162,20 @@ is C<no>. Affects: munin-update.
+@@ -188,20 +188,20 @@
=item B<tls_private_key> <value>
This directive sets the location of the private key to be used for
=item B<tls_verify_depth> <value>
-diff -urNpa munin-2.0.42.orig/master/doc/munin-cron.pod.in munin-2.0.42/master/doc/munin-cron.pod.in
---- munin-2.0.42.orig/master/doc/munin-cron.pod.in 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/doc/munin-cron.pod.in 2018-10-11 15:25:02.396033000 +0000
-@@ -22,7 +22,7 @@ Limit hosts to E<lt>hostE<gt>. Multiple
+diff -ur munin-2.0.69.orig/master/doc/munin-cron.pod.in munin-2.0.69/master/doc/munin-cron.pod.in
+--- munin-2.0.69.orig/master/doc/munin-cron.pod.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/doc/munin-cron.pod.in 2022-08-27 15:18:27.524508030 +0200
+@@ -22,7 +22,7 @@
=item B<< --config <file> >>
=back
-diff -urNpa munin-2.0.42.orig/master/extras/munin-update_old.in munin-2.0.42/master/extras/munin-update_old.in
---- munin-2.0.42.orig/master/extras/munin-update_old.in 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/extras/munin-update_old.in 2018-10-11 15:25:02.396033000 +0000
-@@ -43,7 +43,7 @@ my $DEBUG=0;
+diff -ur munin-2.0.69.orig/master/extras/munin-update_old.in munin-2.0.69/master/extras/munin-update_old.in
+--- munin-2.0.69.orig/master/extras/munin-update_old.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/extras/munin-update_old.in 2022-08-27 15:18:27.525508032 +0200
+@@ -42,7 +42,7 @@
my $STATS;
my $cli_do_fork;
my $cli_timeout;
my $config;
my $do_fork = 1;
my $serversocket = "munin-server-socket.$$";
-@@ -159,7 +159,7 @@ Options:
+@@ -158,7 +158,7 @@
--host <host> Limit graphed hosts to <host>. Multiple --host options
may be supplied.
--config <file> Use <file> as configuration file.
--[no]debug View debug messages. [--nodebug]
--[no]fork Don't fork one instance for each host. [--fork]
--timeout=<seconds> TCP timeout when talking to clients. [$timeout]
-@@ -752,11 +752,11 @@ sub run_starttls_if_required {
+@@ -751,11 +751,11 @@
my $ca_cert;
my $tls_verify;
$key = $cert = munin_get ($config, "tls_pem");
unless defined $ca_cert;
$tls_verify=&munin_get ($config, "tls_verify_certificate", "no");
$depth=&munin_get ($config, "tls_verify_depth", 5);
-@@ -1088,7 +1088,7 @@ Limit fetched data to those from E<lt>ho
+@@ -1087,7 +1087,7 @@
=item B<< --config <file> >>
=item B<< --help >>
-@@ -1124,7 +1124,7 @@ and the directories to store them in.
+@@ -1123,7 +1123,7 @@
=head1 FILES
@@DBDIR@@/*
@@LOGDIR@@/munin-update
@@STATEDIR@@/*
-diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Config.pm munin-2.0.42/master/lib/Munin/Master/Config.pm
---- munin-2.0.42.orig/master/lib/Munin/Master/Config.pm 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/Config.pm 2018-10-11 15:25:02.397033000 +0000
-@@ -140,7 +140,7 @@ my %booleans = map {$_ => 1} qw(
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Config.pm munin-2.0.69/master/lib/Munin/Master/Config.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/Config.pm 2022-08-27 15:17:33.866403127 +0200
++++ munin-2.0.69/master/lib/Munin/Master/Config.pm 2022-08-27 15:18:27.525508032 +0200
+@@ -138,7 +138,7 @@
root_instance => 1,
config => bless ( {
dbdir => $Munin::Common::Defaults::MUNIN_DBDIR,
debug => 0,
fork => 1,
-@@ -154,9 +154,9 @@ my %booleans = map {$_ => 1} qw(
- rundir => $Munin::Common::Defaults::MUNIN_STATEDIR,
- timeout => 180,
+@@ -154,9 +154,9 @@
+ timeout_fetch_one_node => 180,
+ timeout_fetch_all_nodes => 240,
tls => 'disabled',
- tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem",
- tls_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
tls_verify_certificate => 0,
tls_verify_depth => 5,
tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
-diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.42/master/lib/Munin/Master/GraphOld.pm
---- munin-2.0.42.orig/master/lib/Munin/Master/GraphOld.pm 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/GraphOld.pm 2018-10-11 15:25:02.397033000 +0000
-@@ -97,7 +97,7 @@ my $skip_locking = 0;
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.69/master/lib/Munin/Master/GraphOld.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/GraphOld.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/lib/Munin/Master/GraphOld.pm 2022-08-27 15:18:27.525508032 +0200
+@@ -98,7 +98,7 @@
my $skip_stats = 0;
my $stdout = 0;
my $force_run_as_root = 0;
my $libdir = $Munin::Common::Defaults::MUNIN_LIBDIR;
# Note: Nothing by default is more convenient and elliminates code while
# for cgi graphing - but it breaks how munin-graph expected stuff to work.
-diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.42/master/lib/Munin/Master/HTMLOld.pm
---- munin-2.0.42.orig/master/lib/Munin/Master/HTMLOld.pm 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/HTMLOld.pm 2018-10-11 15:25:02.397033000 +0000
-@@ -83,7 +83,7 @@ use Log::Log4perl qw( :easy );
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.69/master/lib/Munin/Master/HTMLOld.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/HTMLOld.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/lib/Munin/Master/HTMLOld.pm 2022-08-27 15:18:27.526508034 +0200
+@@ -81,7 +81,7 @@
my @times = ("day", "week", "month", "year");
my $DEBUG = 0;
my $do_usage = 0;
my $do_version = 0;
my $stdout = 0;
-@@ -859,7 +859,7 @@ Options:
+@@ -936,7 +936,7 @@
--service <service> Compatibility. No effect.
--host <host> Compatibility. No effect.
--config <file> Use <file> as configuration file.
";
exit 0;
-@@ -894,7 +894,7 @@ Compatibility. No effect.
+@@ -971,7 +971,7 @@
=item B<< --config <file> >>
=item B<< --help >>
-@@ -917,7 +917,7 @@ Munin-html creates the html pages.
+@@ -994,7 +994,7 @@
=head1 FILES
@@DBDIR@@/datafile
@@LOGDIR@@/munin-html
@@HTMLDIR@@/*
-diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.42/master/lib/Munin/Master/LimitsOld.pm
---- munin-2.0.42.orig/master/lib/Munin/Master/LimitsOld.pm 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/LimitsOld.pm 2018-10-11 15:25:02.397033000 +0000
-@@ -52,7 +52,7 @@ use Munin::Master::Utils;
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.69/master/lib/Munin/Master/LimitsOld.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/LimitsOld.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/lib/Munin/Master/LimitsOld.pm 2022-08-27 15:18:27.526508034 +0200
+@@ -57,7 +57,7 @@
use Munin::Common::Defaults;
my $DEBUG = 0;
my $do_usage = 0;
my $do_version = 0;
my @limit_hosts = ();
-@@ -242,7 +242,7 @@ Options:
+@@ -247,7 +247,7 @@
--contact <contact> Limit notified contacts to <contact>. Multiple
--contact options may be supplied.
--config <file> Use <file> as configuration file.
";
exit 0;
-diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm munin-2.0.42/master/lib/Munin/Master/Utils.pm
---- munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/Utils.pm 2018-10-11 15:25:02.397033000 +0000
-@@ -114,7 +114,7 @@ my $config_parts = {
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm munin-2.0.69/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm 2022-08-27 15:17:33.867403129 +0200
++++ munin-2.0.69/master/lib/Munin/Master/Utils.pm 2022-08-27 15:18:27.526508034 +0200
+@@ -112,7 +112,7 @@
},
};
# Fields to copy when "aliasing" a field
my @COPY_FIELDS = ("label", "draw", "type", "rrdfile", "fieldname", "info");
-diff -urNpa munin-2.0.42.orig/master/munin.conf.in munin-2.0.42/master/munin.conf.in
---- munin-2.0.42.orig/master/munin.conf.in 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/master/munin.conf.in 2018-10-11 15:25:02.397033000 +0000
+diff -ur munin-2.0.69.orig/master/munin.conf.in munin-2.0.69/master/munin.conf.in
+--- munin-2.0.69.orig/master/munin.conf.in 2022-08-27 15:17:33.867403129 +0200
++++ munin-2.0.69/master/munin.conf.in 2022-08-27 15:18:27.527508036 +0200
@@ -24,7 +24,7 @@
# cgitmpdir @@DBDIR@@/cgi-tmp
# You can choose the time reference for "DERIVE" like graphs, and show
# "per minute", "per hour" values instead of the default "per second"
-diff -urNpa munin-2.0.42.orig/master/t/munin_master_config.t munin-2.0.42/master/t/munin_master_config.t
---- munin-2.0.42.orig/master/t/munin_master_config.t 2018-10-11 15:24:44.285033000 +0000
-+++ munin-2.0.42/master/t/munin_master_config.t 2018-10-11 15:25:02.398033000 +0000
-@@ -24,7 +24,7 @@ my $fasit = {
+diff -ur munin-2.0.69.orig/master/t/munin_master_config.t munin-2.0.69/master/t/munin_master_config.t
+--- munin-2.0.69.orig/master/t/munin_master_config.t 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/t/munin_master_config.t 2022-08-27 15:18:27.529508040 +0200
+@@ -24,7 +24,7 @@
},
config => {
dbdir => '/opt/munin/sandbox/var/opt/munin',
debug => 0,
fork => 1,
-diff -urNpa munin-2.0.42.orig/master/www/munin-htaccess.in munin-2.0.42/master/www/munin-htaccess.in
---- munin-2.0.42.orig/master/www/munin-htaccess.in 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/master/www/munin-htaccess.in 2018-10-11 15:25:02.398033000 +0000
+diff -ur munin-2.0.69.orig/master/www/munin-htaccess.in munin-2.0.69/master/www/munin-htaccess.in
+--- munin-2.0.69.orig/master/www/munin-htaccess.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/www/munin-htaccess.in 2022-08-27 15:18:27.529508040 +0200
@@ -9,7 +9,7 @@
#
# <directory @@HTMLDIR@@>
AuthName "Munin"
AuthType Basic
require valid-user
-diff -urNpa munin-2.0.42.orig/node/bin/munindoc munin-2.0.42/node/bin/munindoc
---- munin-2.0.42.orig/node/bin/munindoc 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/bin/munindoc 2018-10-11 15:25:02.398033000 +0000
-@@ -48,7 +48,7 @@ my $plugin_re = quotemeta($plugin);
+diff -ur munin-2.0.69.orig/node/bin/munindoc munin-2.0.69/node/bin/munindoc
+--- munin-2.0.69.orig/node/bin/munindoc 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/node/bin/munindoc 2022-08-27 15:18:27.530508042 +0200
+@@ -48,7 +48,7 @@
# Dirs in which to look for $plugin.pod and $plugin files.
my @DIRS = ("$Munin::Common::Defaults::MUNIN_LIBDIR/plugins",
"$Munin::Common::Defaults::MUNIN_PERLLIB");
File::Find::find({wanted => \&wanted_pod}, @DIRS);
-diff -urNpa munin-2.0.42.orig/node/doc/munin-node.conf.pod munin-2.0.42/node/doc/munin-node.conf.pod
---- munin-2.0.42.orig/node/doc/munin-node.conf.pod 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/doc/munin-node.conf.pod 2018-10-11 15:25:02.398033000 +0000
-@@ -91,20 +91,20 @@ is C<no>.
+diff -ur munin-2.0.69.orig/node/doc/munin-node.conf.pod munin-2.0.69/node/doc/munin-node.conf.pod
+--- munin-2.0.69.orig/node/doc/munin-node.conf.pod 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/node/doc/munin-node.conf.pod 2022-08-27 15:18:27.530508042 +0200
+@@ -91,20 +91,20 @@
=item B<tls_private_key> <value>
This directive sets the location of the private key to be used for
=item B<tls_verify_depth> <value>
-diff -urNpa munin-2.0.42.orig/node/extras/munin-node-simple.in munin-2.0.42/node/extras/munin-node-simple.in
---- munin-2.0.42.orig/node/extras/munin-node-simple.in 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/extras/munin-node-simple.in 2018-10-11 15:25:02.398033000 +0000
-@@ -28,8 +28,8 @@ use strict;
+diff -ur munin-2.0.69.orig/node/extras/munin-node-simple.in munin-2.0.69/node/extras/munin-node-simple.in
+--- munin-2.0.69.orig/node/extras/munin-node-simple.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/node/extras/munin-node-simple.in 2022-08-27 15:18:27.530508042 +0200
+@@ -28,8 +28,8 @@
$| = 1;
my $version = "@@VERSION@@";
# Empty environment
-diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Config.pm munin-2.0.42/node/lib/Munin/Node/Config.pm
---- munin-2.0.42.orig/node/lib/Munin/Node/Config.pm 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/lib/Munin/Node/Config.pm 2018-10-11 15:25:02.398033000 +0000
-@@ -25,7 +25,7 @@ my %booleans = map {$_ => 1} qw(
+diff -ur munin-2.0.69.orig/node/lib/Munin/Node/Config.pm munin-2.0.69/node/lib/Munin/Node/Config.pm
+--- munin-2.0.69.orig/node/lib/Munin/Node/Config.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/node/lib/Munin/Node/Config.pm 2022-08-27 15:18:27.530508042 +0200
+@@ -23,7 +23,7 @@
my ($class) = @_;
$instance ||= bless {
}, $class;
return $instance;
-diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Server.pm munin-2.0.42/node/lib/Munin/Node/Server.pm
---- munin-2.0.42.orig/node/lib/Munin/Node/Server.pm 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/lib/Munin/Node/Server.pm 2018-10-11 15:25:02.398033000 +0000
-@@ -272,11 +272,11 @@ sub _process_starttls_command {
+diff -ur munin-2.0.69.orig/node/lib/Munin/Node/Server.pm munin-2.0.69/node/lib/Munin/Node/Server.pm
+--- munin-2.0.69.orig/node/lib/Munin/Node/Server.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/node/lib/Munin/Node/Server.pm 2022-08-27 15:18:27.531508044 +0200
+@@ -273,11 +273,11 @@
my $mode = $session->{tls_mode};
my $key = $config->{tls_private_key}
my $tls_verify = $config->{tls_verify_certificate}
|| 0;
my $tls_match = $config->{tls_match};
-diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Service.pm munin-2.0.42/node/lib/Munin/Node/Service.pm
---- munin-2.0.42.orig/node/lib/Munin/Node/Service.pm 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/lib/Munin/Node/Service.pm 2018-10-11 15:25:02.398033000 +0000
-@@ -22,7 +22,7 @@ sub new
+diff -ur munin-2.0.69.orig/node/lib/Munin/Node/Service.pm munin-2.0.69/node/lib/Munin/Node/Service.pm
+--- munin-2.0.69.orig/node/lib/Munin/Node/Service.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/node/lib/Munin/Node/Service.pm 2022-08-27 15:18:27.531508044 +0200
+@@ -20,7 +20,7 @@
my ($class, %args) = @_;
# Set defaults
- $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/plugins";
+ $args{servicedir} ||= "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugins";
- $args{defuser} ||= getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER;
- $args{defgroup} ||= getgrnam $Munin::Common::Defaults::MUNIN_GROUP;
-diff -urNpa munin-2.0.42.orig/node/sbin/munin-node munin-2.0.42/node/sbin/munin-node
---- munin-2.0.42.orig/node/sbin/munin-node 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/sbin/munin-node 2018-10-11 15:25:02.398033000 +0000
-@@ -36,8 +36,8 @@ use Munin::Node::Service;
+ $args{defuser} = getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER unless defined($args{defuser});
+ $args{defgroup} = getgrnam $Munin::Common::Defaults::MUNIN_GROUP unless defined($args{defgroup});
+diff -ur munin-2.0.69.orig/node/sbin/munin-node munin-2.0.69/node/sbin/munin-node
+--- munin-2.0.69.orig/node/sbin/munin-node 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/node/sbin/munin-node 2022-08-27 15:18:27.531508044 +0200
+@@ -34,8 +34,8 @@
use Munin::Node::Server;
my $servicedir;
my $DEBUG = 0;
my $PIDEBUG = 0;
my $paranoia = 0;
-@@ -164,7 +164,7 @@ and returning the output they produce.
+@@ -175,7 +175,7 @@
=item B<< --config <configfile> >>
=item B< --[no]paranoia >
-@@ -187,9 +187,9 @@ may enable debugging. [--nopidebug]
+@@ -198,9 +198,9 @@
=head1 FILES
@@STATEDIR@@/munin-node.pid
@@LOGDIR@@/munin-node.log
-diff -urNpa munin-2.0.42.orig/node/sbin/munin-node-configure munin-2.0.42/node/sbin/munin-node-configure
---- munin-2.0.42.orig/node/sbin/munin-node-configure 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/sbin/munin-node-configure 2018-10-11 15:25:02.399033000 +0000
-@@ -76,9 +76,9 @@ sub main
+diff -ur munin-2.0.69.orig/node/sbin/munin-node-configure munin-2.0.69/node/sbin/munin-node-configure
+--- munin-2.0.69.orig/node/sbin/munin-node-configure 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/node/sbin/munin-node-configure 2022-08-27 15:18:27.531508044 +0200
+@@ -76,9 +76,9 @@
sub parse_args
{
my $libdir = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
my $debug = 0;
-@@ -487,15 +487,15 @@ may enable debugging.
+@@ -487,15 +487,15 @@
=item B<< --config <file> >>
=item B<< --libdir <dir> >>
-@@ -649,9 +649,9 @@ not this works with any particular devic
+@@ -645,9 +645,9 @@
=head1 FILES
@@LIBDIR@@/plugins/plugins.history
@@LIBDIR@@/plugins/*
-diff -urNpa munin-2.0.42.orig/node/sbin/munin-run munin-2.0.42/node/sbin/munin-run
---- munin-2.0.42.orig/node/sbin/munin-run 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/sbin/munin-run 2018-10-11 15:25:02.399033000 +0000
-@@ -35,7 +35,7 @@ use Munin::Node::Service;
+diff -ur munin-2.0.69.orig/node/sbin/munin-run munin-2.0.69/node/sbin/munin-run
+--- munin-2.0.69.orig/node/sbin/munin-run 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/node/sbin/munin-run 2022-08-27 15:18:27.532508046 +0200
+@@ -21,7 +21,7 @@
my $services;
my $servicedir;
my $DEBUG = 0;
my $PIDEBUG = 0;
my $paranoia = 0;
-@@ -98,7 +98,7 @@ sub main
+@@ -341,7 +341,7 @@
sub parse_args
{
# Default configuration values
+ my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
my $sconffile;
- my ($plugin, $arg);
-@@ -189,15 +189,15 @@ as they are under munin-node.
+ my ($plugin, $arg, @extra_args);
+@@ -435,15 +435,15 @@
=item B<< --config <configfile> >>
=item B<< --sconffile <file> >>
-@@ -230,9 +230,9 @@ Show version information.
+@@ -507,9 +507,9 @@
=head1 FILES
@@STATEDIR@@/munin-node.pid
@@LOGDIR@@/munin-node.log
-diff -urNpa munin-2.0.42.orig/node/sbin/munin-sched munin-2.0.42/node/sbin/munin-sched
---- munin-2.0.42.orig/node/sbin/munin-sched 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/sbin/munin-sched 2018-10-11 15:25:02.399033000 +0000
-@@ -34,8 +34,8 @@ use Munin::Node::Config;
- use Munin::Node::ProxySpooler;
-
- my $servicedir;
--my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
--my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
-+my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
-+my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
- my $spooldir = $Munin::Common::Defaults::MUNIN_SPOOLDIR;
-
- my ($host, $port);
-@@ -164,7 +164,7 @@ and returning the output they produce.
-
- =item B<< --config <configfile> >>
-
--Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
-+Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
-
- =item B< --[no]paranoia >
-
-@@ -182,9 +182,9 @@ View debug messages. This can be very v
-
- =head1 FILES
-
-- @@CONFDIR@@/munin-node.conf
-- @@CONFDIR@@/plugins/*
-- @@CONFDIR@@/plugin-conf.d/*
-+ @@NCONFDIR@@/munin-node.conf
-+ @@NCONFDIR@@/plugins/*
-+ @@NCONFDIR@@/plugin-conf.d/*
- @@STATEDIR@@/munin-sched.pid
- @@LOGDIR@@/munin-sched.log
-
-diff -urNpa munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in munin-2.0.42/plugins/node.d/exim_mailqueue.in
---- munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in 2018-10-11 15:24:44.280033000 +0000
-+++ munin-2.0.42/plugins/node.d/exim_mailqueue.in 2018-10-11 15:25:02.399033000 +0000
-@@ -17,7 +17,7 @@ examine the queue directories. This is
+diff -ur munin-2.0.69.orig/plugins/node.d/exim_mailqueue.in munin-2.0.69/plugins/node.d/exim_mailqueue.in
+--- munin-2.0.69.orig/plugins/node.d/exim_mailqueue.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/exim_mailqueue.in 2022-08-27 15:18:27.532508046 +0200
+@@ -17,7 +17,7 @@
[exim_*]
user exim
if you need to override the defaults below:
[exim_mailqueue]
-diff -urNpa munin-2.0.42.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.42/plugins/node.d/ipmi_sensor_.in
---- munin-2.0.42.orig/plugins/node.d/ipmi_sensor_.in 2018-10-11 15:24:44.280033000 +0000
-+++ munin-2.0.42/plugins/node.d/ipmi_sensor_.in 2018-10-11 15:25:02.399033000 +0000
-@@ -17,7 +17,7 @@ Inspired by code written by Peter Palfra
+diff -ur munin-2.0.69.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.69/plugins/node.d/ipmi_sensor_.in
+--- munin-2.0.69.orig/plugins/node.d/ipmi_sensor_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/ipmi_sensor_.in 2022-08-27 15:18:27.532508046 +0200
+@@ -17,7 +17,7 @@
ipmitool probably needs to be run as root, and it may take more than
10 seconds on some hosts.
[ipmi_sensor_*]
user root
-@@ -49,7 +49,7 @@ with this program; if not, write to the
+@@ -49,7 +49,7 @@
=head1 BUGS
variables.
=head1 MAGIC MARKERS
-@@ -72,7 +72,7 @@ import re
+@@ -72,7 +72,7 @@
CACHEDIR = environ['MUNIN_PLUGSTATE']
CACHEFILE = "plugin-ipmi_sensor.cache"
CACHEAGE = 120
def normalize_sensor(name):
-diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_innodb.in munin-2.0.42/plugins/node.d/mysql_innodb.in
---- munin-2.0.42.orig/plugins/node.d/mysql_innodb.in 2018-10-11 15:24:44.282033000 +0000
-+++ munin-2.0.42/plugins/node.d/mysql_innodb.in 2018-10-11 15:25:02.399033000 +0000
-@@ -34,7 +34,7 @@ the default INNODB tablespace, do the fo
+diff -ur munin-2.0.69.orig/plugins/node.d/mysql_innodb.in munin-2.0.69/plugins/node.d/mysql_innodb.in
+--- munin-2.0.69.orig/plugins/node.d/mysql_innodb.in 2022-08-27 15:12:36.156833017 +0200
++++ munin-2.0.69/plugins/node.d/mysql_innodb.in 2022-08-27 15:18:27.533508047 +0200
+@@ -34,7 +34,7 @@
=head1 CONFIGURATION
if you need to override the defaults below:
[mysql_innodb]
-diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.42/plugins/node.d/mysql_isam_space_.in
---- munin-2.0.42.orig/plugins/node.d/mysql_isam_space_.in 2018-10-11 15:24:44.280033000 +0000
-+++ munin-2.0.42/plugins/node.d/mysql_isam_space_.in 2018-10-11 15:25:02.399033000 +0000
-@@ -8,7 +8,7 @@ on isam and myisam tables on a mysql ser
+diff -ur munin-2.0.69.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.69/plugins/node.d/mysql_isam_space_.in
+--- munin-2.0.69.orig/plugins/node.d/mysql_isam_space_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/mysql_isam_space_.in 2022-08-27 15:18:27.533508047 +0200
+@@ -8,7 +8,7 @@
=head1 CONFIGURATION
if you need to override the defaults below:
[mysql_isam_space_*]
-diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_threads.in munin-2.0.42/plugins/node.d/mysql_threads.in
---- munin-2.0.42.orig/plugins/node.d/mysql_threads.in 2018-10-11 15:24:44.280033000 +0000
-+++ munin-2.0.42/plugins/node.d/mysql_threads.in 2018-10-11 15:25:02.399033000 +0000
-@@ -9,7 +9,7 @@ mysql_threads - Plugin to monitor the nu
+diff -ur munin-2.0.69.orig/plugins/node.d/mysql_threads.in munin-2.0.69/plugins/node.d/mysql_threads.in
+--- munin-2.0.69.orig/plugins/node.d/mysql_threads.in 2022-08-27 15:12:36.156833017 +0200
++++ munin-2.0.69/plugins/node.d/mysql_threads.in 2022-08-27 15:18:27.533508047 +0200
+@@ -9,7 +9,7 @@
=head1 CONFIGURATION
need to override the defaults below:
[mysql_threads]
-diff -urNpa munin-2.0.42.orig/plugins/node.d/named.in munin-2.0.42/plugins/node.d/named.in
---- munin-2.0.42.orig/plugins/node.d/named.in 2018-10-11 15:24:44.280033000 +0000
-+++ munin-2.0.42/plugins/node.d/named.in 2018-10-11 15:25:02.399033000 +0000
-@@ -34,7 +34,7 @@ restrictions on the log file.
+diff -ur munin-2.0.69.orig/plugins/node.d/named.in munin-2.0.69/plugins/node.d/named.in
+--- munin-2.0.69.orig/plugins/node.d/named.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/named.in 2022-08-27 15:18:27.533508047 +0200
+@@ -34,7 +34,7 @@
=head1 CONFIGURATION
if you need to override the defaults below:
[named]
-diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in
---- munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 15:24:44.282033000 +0000
-+++ munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 16:30:23.898033000 +0000
-@@ -12,7 +12,7 @@ the NTP status
+diff -ur munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in
+--- munin-2.0.69.orig/plugins/node.d/ntp_kernel_pll_freq.in 2022-08-27 15:12:36.157833019 +0200
++++ munin-2.0.69/plugins/node.d/ntp_kernel_pll_freq.in 2022-08-27 15:18:27.534508049 +0200
+@@ -12,7 +12,7 @@
No configuration
should contain a number to be added to the frequency read by ntpdc.
=head1 AUTHORS
-@@ -46,8 +46,8 @@ if [ "$1" = "autoconf" ]; then
+@@ -42,8 +42,8 @@
exit 0
fi
else
fcomp=0
fi
-diff -urNpa munin-2.0.42.orig/plugins/node.d/postfix_mailstats.in munin-2.0.42/plugins/node.d/postfix_mailstats.in
---- munin-2.0.42.orig/plugins/node.d/postfix_mailstats.in 2018-10-11 15:24:44.281033000 +0000
-+++ munin-2.0.42/plugins/node.d/postfix_mailstats.in 2018-10-11 15:25:02.400033000 +0000
-@@ -8,7 +8,7 @@ rejected by postfix
+diff -ur munin-2.0.69.orig/plugins/node.d/postfix_mailstats.in munin-2.0.69/plugins/node.d/postfix_mailstats.in
+--- munin-2.0.69.orig/plugins/node.d/postfix_mailstats.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/postfix_mailstats.in 2022-08-27 15:18:27.534508049 +0200
+@@ -8,7 +8,7 @@
=head1 CONFIGURATION
if you need to override the defaults below:
[postfix_mailstats]
-diff -urNpa munin-2.0.42.orig/plugins/node.d/psu_.in munin-2.0.42/plugins/node.d/psu_.in
---- munin-2.0.42.orig/plugins/node.d/psu_.in 2018-10-11 15:24:44.281033000 +0000
-+++ munin-2.0.42/plugins/node.d/psu_.in 2018-10-11 15:25:02.400033000 +0000
-@@ -15,7 +15,7 @@ we wish to graph.
+diff -ur munin-2.0.69.orig/plugins/node.d/psu_.in munin-2.0.69/plugins/node.d/psu_.in
+--- munin-2.0.69.orig/plugins/node.d/psu_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/psu_.in 2022-08-27 15:18:27.534508049 +0200
+@@ -15,7 +15,7 @@
Example:
...will monitor the user "foo"
-diff -urNpa munin-2.0.42.orig/plugins/node.d/squeezebox_.in munin-2.0.42/plugins/node.d/squeezebox_.in
---- munin-2.0.42.orig/plugins/node.d/squeezebox_.in 2018-10-11 15:24:44.282033000 +0000
-+++ munin-2.0.42/plugins/node.d/squeezebox_.in 2018-10-11 15:25:02.400033000 +0000
-@@ -20,7 +20,7 @@ SqueezeCenter. If the plugin is run from
+diff -ur munin-2.0.69.orig/plugins/node.d/squeezebox_.in munin-2.0.69/plugins/node.d/squeezebox_.in
+--- munin-2.0.69.orig/plugins/node.d/squeezebox_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/squeezebox_.in 2022-08-27 15:18:27.534508049 +0200
+@@ -20,7 +20,7 @@
non-default configuration, please use the environment variables
'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
nc(1) binary is not called "nc", or not the one in $PATH, please define it
Sample follows:
-diff -urNpa munin-2.0.42.orig/plugins/node.d/varnish_.in munin-2.0.42/plugins/node.d/varnish_.in
---- munin-2.0.42.orig/plugins/node.d/varnish_.in 2018-10-11 15:24:44.282033000 +0000
-+++ munin-2.0.42/plugins/node.d/varnish_.in 2018-10-11 15:25:02.400033000 +0000
-@@ -54,7 +54,7 @@ session, session_herd
+diff -ur munin-2.0.69.orig/plugins/node.d/varnish_.in munin-2.0.69/plugins/node.d/varnish_.in
+--- munin-2.0.69.orig/plugins/node.d/varnish_.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d/varnish_.in 2022-08-27 15:18:27.535508051 +0200
+@@ -54,7 +54,7 @@
You can link them yourself with something like this:
ln -s @@LIBDIR@@/plugins/varnish_ \
=head1 INTERPRETATION
-diff -urNpa munin-2.0.42.orig/plugins/node.d.cygwin/df.in munin-2.0.42/plugins/node.d.cygwin/df.in
---- munin-2.0.42.orig/plugins/node.d.cygwin/df.in 2018-10-11 15:24:44.277033000 +0000
-+++ munin-2.0.42/plugins/node.d.cygwin/df.in 2018-10-11 15:25:02.400033000 +0000
-@@ -13,7 +13,7 @@ Cygwin 1.7.x or higher systems with core
+diff -ur munin-2.0.69.orig/plugins/node.d.cygwin/df.in munin-2.0.69/plugins/node.d.cygwin/df.in
+--- munin-2.0.69.orig/plugins/node.d.cygwin/df.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.cygwin/df.in 2022-08-27 15:18:27.535508051 +0200
+@@ -13,7 +13,7 @@
=head1 USAGE
The plugin excludes per default the following special, read-only or
dynamically allocating file systems from graphing:
-diff -urNpa munin-2.0.42.orig/plugins/node.d.debug/if.in munin-2.0.42/plugins/node.d.debug/if.in
---- munin-2.0.42.orig/plugins/node.d.debug/if.in 2018-10-11 15:24:44.277033000 +0000
-+++ munin-2.0.42/plugins/node.d.debug/if.in 2018-10-11 15:25:02.400033000 +0000
-@@ -21,7 +21,7 @@ variable. For example:
+diff -ur munin-2.0.69.orig/plugins/node.d.debug/if.in munin-2.0.69/plugins/node.d.debug/if.in
+--- munin-2.0.69.orig/plugins/node.d.debug/if.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.debug/if.in 2022-08-27 15:18:27.535508051 +0200
+@@ -21,7 +21,7 @@
=head1 USAGE
=head1 MAGIC MARKERS
-diff -urNpa munin-2.0.42.orig/plugins/node.d.debug/tc.in munin-2.0.42/plugins/node.d.debug/tc.in
---- munin-2.0.42.orig/plugins/node.d.debug/tc.in 2018-10-11 15:24:44.277033000 +0000
-+++ munin-2.0.42/plugins/node.d.debug/tc.in 2018-10-11 15:25:02.400033000 +0000
-@@ -21,7 +21,7 @@ For example:
+diff -ur munin-2.0.69.orig/plugins/node.d.debug/tc.in munin-2.0.69/plugins/node.d.debug/tc.in
+--- munin-2.0.69.orig/plugins/node.d.debug/tc.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.debug/tc.in 2022-08-27 15:18:27.535508051 +0200
+@@ -21,7 +21,7 @@
=head1 USAGE
=head1 MAGIC MARKERS
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/acpi.in munin-2.0.42/plugins/node.d.linux/acpi.in
---- munin-2.0.42.orig/plugins/node.d.linux/acpi.in 2018-10-11 15:24:44.278033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/acpi.in 2018-10-11 15:25:02.401033000 +0000
-@@ -17,7 +17,7 @@ Load the 'thermal' kernel module and the
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/acpi.in munin-2.0.69/plugins/node.d.linux/acpi.in
+--- munin-2.0.69.orig/plugins/node.d.linux/acpi.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/acpi.in 2022-08-27 15:18:27.536508053 +0200
+@@ -17,7 +17,7 @@
=head1 USAGE
=head1 INTERPRETATION
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/apt.in munin-2.0.42/plugins/node.d.linux/apt.in
---- munin-2.0.42.orig/plugins/node.d.linux/apt.in 2018-10-11 15:24:44.278033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/apt.in 2018-10-11 15:25:02.401033000 +0000
-@@ -38,7 +38,7 @@ Remember to randomize when these cronjob
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/apt.in munin-2.0.69/plugins/node.d.linux/apt.in
+--- munin-2.0.69.orig/plugins/node.d.linux/apt.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/apt.in 2022-08-27 15:18:27.536508053 +0200
+@@ -38,7 +38,7 @@
=head1 USAGE
=head1 NOTES
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/df.in munin-2.0.42/plugins/node.d.linux/df.in
---- munin-2.0.42.orig/plugins/node.d.linux/df.in 2018-10-11 15:24:44.278033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/df.in 2018-10-11 15:25:02.401033000 +0000
-@@ -31,7 +31,7 @@ This configuration snipplet is an exampl
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/df.in munin-2.0.69/plugins/node.d.linux/df.in
+--- munin-2.0.69.orig/plugins/node.d.linux/df.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/df.in 2022-08-27 15:18:27.536508053 +0200
+@@ -31,7 +31,7 @@
env.warning 92
env.critical 98
You may specify filesystem specific warning and critical levels:
-@@ -58,7 +58,7 @@ RE will not be included.
+@@ -58,7 +58,7 @@
=head1 USAGE
=head1 MAGIC MARKERS
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/df_inode.in munin-2.0.42/plugins/node.d.linux/df_inode.in
---- munin-2.0.42.orig/plugins/node.d.linux/df_inode.in 2018-10-11 15:24:44.278033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/df_inode.in 2018-10-11 15:25:02.401033000 +0000
-@@ -28,7 +28,7 @@ This configuration snipplet is an exampl
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/df_inode.in munin-2.0.69/plugins/node.d.linux/df_inode.in
+--- munin-2.0.69.orig/plugins/node.d.linux/df_inode.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/df_inode.in 2022-08-27 15:18:27.536508053 +0200
+@@ -28,7 +28,7 @@
env.warning 92
env.critical 98
You may specify filesystem specific warning and critical levels:
-@@ -55,7 +55,7 @@ RE will not be included.
+@@ -55,7 +55,7 @@
=head1 USAGE
=head1 MAGIC MARKERS
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.42/plugins/node.d.linux/fw_conntrack.in
---- munin-2.0.42.orig/plugins/node.d.linux/fw_conntrack.in 2018-10-11 15:24:44.278033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/fw_conntrack.in 2018-10-11 15:25:02.401033000 +0000
-@@ -11,7 +11,7 @@ This plugin must run with root privilege
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.69/plugins/node.d.linux/fw_conntrack.in
+--- munin-2.0.69.orig/plugins/node.d.linux/fw_conntrack.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/fw_conntrack.in 2022-08-27 15:18:27.537508055 +0200
+@@ -11,7 +11,7 @@
=head2 CONFIGURATION EXAMPLE
[fw_*]
user root
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.42/plugins/node.d.linux/fw_forwarded_local.in
---- munin-2.0.42.orig/plugins/node.d.linux/fw_forwarded_local.in 2018-10-11 15:24:44.278033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/fw_forwarded_local.in 2018-10-11 15:25:02.401033000 +0000
-@@ -10,7 +10,7 @@ This plugin must run with root privilege
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.69/plugins/node.d.linux/fw_forwarded_local.in
+--- munin-2.0.69.orig/plugins/node.d.linux/fw_forwarded_local.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/fw_forwarded_local.in 2022-08-27 15:18:27.537508055 +0200
+@@ -10,7 +10,7 @@
=head2 CONFIGURATION EXAMPLE
[fw_*]
user root
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_packets.in munin-2.0.42/plugins/node.d.linux/fw_packets.in
---- munin-2.0.42.orig/plugins/node.d.linux/fw_packets.in 2018-10-11 15:24:44.278033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/fw_packets.in 2018-10-11 15:25:02.401033000 +0000
-@@ -14,7 +14,7 @@ This plugin must run with root privilege
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/fw_packets.in munin-2.0.69/plugins/node.d.linux/fw_packets.in
+--- munin-2.0.69.orig/plugins/node.d.linux/fw_packets.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/fw_packets.in 2022-08-27 15:18:27.537508055 +0200
+@@ -14,7 +14,7 @@
=head1 CONFIGURATION EXAMPLE
[fw*]
user root
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat.in munin-2.0.42/plugins/node.d.linux/iostat.in
---- munin-2.0.42.orig/plugins/node.d.linux/iostat.in 2018-10-11 15:24:44.279033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/iostat.in 2018-10-11 15:25:02.401033000 +0000
-@@ -24,7 +24,7 @@ guest OS/dom-U IO-traffic originates in.
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/iostat.in munin-2.0.69/plugins/node.d.linux/iostat.in
+--- munin-2.0.69.orig/plugins/node.d.linux/iostat.in 2022-08-27 15:16:13.861246722 +0200
++++ munin-2.0.69/plugins/node.d.linux/iostat.in 2022-08-27 15:18:27.537508055 +0200
+@@ -24,7 +24,7 @@
=head1 USAGE
=head1 INTERPRETATION
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.42/plugins/node.d.linux/iostat_ios.in
---- munin-2.0.42.orig/plugins/node.d.linux/iostat_ios.in 2018-10-11 15:24:44.278033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/iostat_ios.in 2018-10-11 15:25:02.401033000 +0000
-@@ -15,7 +15,7 @@ None needed
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.69/plugins/node.d.linux/iostat_ios.in
+--- munin-2.0.69.orig/plugins/node.d.linux/iostat_ios.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/iostat_ios.in 2022-08-27 15:18:27.538508057 +0200
+@@ -15,7 +15,7 @@
=head1 USAGE
=head1 INTERPRETATION
-diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/irqstats.in munin-2.0.42/plugins/node.d.linux/irqstats.in
---- munin-2.0.42.orig/plugins/node.d.linux/irqstats.in 2018-10-11 15:24:44.278033000 +0000
-+++ munin-2.0.42/plugins/node.d.linux/irqstats.in 2018-10-11 15:25:02.401033000 +0000
-@@ -18,7 +18,7 @@ None needed
+diff -ur munin-2.0.69.orig/plugins/node.d.linux/irqstats.in munin-2.0.69/plugins/node.d.linux/irqstats.in
+--- munin-2.0.69.orig/plugins/node.d.linux/irqstats.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/plugins/node.d.linux/irqstats.in 2022-08-27 15:18:27.538508057 +0200
+@@ -18,7 +18,7 @@
=head1 USAGE
=head1 INTERPRETATION
-diff -urNpa munin-2.0.42.orig/resources/hpux-init.d_munin-node.in munin-2.0.42/resources/hpux-init.d_munin-node.in
---- munin-2.0.42.orig/resources/hpux-init.d_munin-node.in 2018-10-11 15:24:44.287033000 +0000
-+++ munin-2.0.42/resources/hpux-init.d_munin-node.in 2018-10-11 15:25:02.402033000 +0000
+diff -ur munin-2.0.69.orig/resources/hpux-init.d_munin-node.in munin-2.0.69/resources/hpux-init.d_munin-node.in
+--- munin-2.0.69.orig/resources/hpux-init.d_munin-node.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/resources/hpux-init.d_munin-node.in 2022-08-27 15:18:27.538508057 +0200
@@ -6,7 +6,7 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin
NAME=munin-node
RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE)
PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE)
MYCONF=/etc/rc.config.d/muninconf
-diff -urNpa munin-2.0.42.orig/resources/linux-cron.d_munin-node.in munin-2.0.42/resources/linux-cron.d_munin-node.in
---- munin-2.0.42.orig/resources/linux-cron.d_munin-node.in 2018-10-11 15:24:44.287033000 +0000
-+++ munin-2.0.42/resources/linux-cron.d_munin-node.in 2018-10-11 15:25:02.402033000 +0000
-@@ -8,5 +8,5 @@ MAILTO=root
+diff -ur munin-2.0.69.orig/resources/linux-cron.d_munin-node.in munin-2.0.69/resources/linux-cron.d_munin-node.in
+--- munin-2.0.69.orig/resources/linux-cron.d_munin-node.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/resources/linux-cron.d_munin-node.in 2022-08-27 15:18:27.538508057 +0200
+@@ -8,5 +8,5 @@
# an hour (12 invokations an hour, 1 in 12 chance that the update will
# happen), but ensure that there will never be more than two hour (7200
# seconds) interval between updates..
-*/5 * * * * root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null
+*/5 * * * * root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null
-diff -urNpa munin-2.0.42.orig/t/Makefile.config munin-2.0.42/t/Makefile.config
---- munin-2.0.42.orig/t/Makefile.config 2018-10-11 15:24:44.287033000 +0000
-+++ munin-2.0.42/t/Makefile.config 2018-10-11 15:25:02.402033000 +0000
+diff -ur munin-2.0.69.orig/t/Makefile.config munin-2.0.69/t/Makefile.config
+--- munin-2.0.69.orig/t/Makefile.config 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/t/Makefile.config 2022-08-27 15:18:27.539508059 +0200
@@ -9,7 +9,8 @@
PREFIX = $(PWD)/t/install
-diff -urNpa munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.42/common/lib/Munin/Common/Defaults.pm
---- munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:23:51.538033000 +0000
-+++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:24:16.385033000 +0000
-@@ -32,6 +32,7 @@ our $MUNIN_SPOOLDIR = '';
+diff -ur munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.69/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/common/lib/Munin/Common/Defaults.pm 2022-08-27 15:17:33.865403125 +0200
+@@ -30,6 +30,7 @@
our $MUNIN_MANDIR = '';
our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/";
our $MUNIN_STATEDIR = '';
our $MUNIN_USER = getpwuid $UID;
our $MUNIN_GROUP = getgrgid $GID;
our $MUNIN_PLUGINUSER = getpwuid $UID;
-diff -urNpa munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in
---- munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in 2018-10-11 15:23:51.545033000 +0000
-+++ munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in 2018-10-11 15:24:16.386033000 +0000
-@@ -23,7 +23,7 @@ optional for find : -mtime -30 ; will ig
+diff -ur munin-2.0.69.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.69/contrib/munin-every-services-all-boxes-build-html.in
+--- munin-2.0.69.orig/contrib/munin-every-services-all-boxes-build-html.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/contrib/munin-every-services-all-boxes-build-html.in 2022-08-27 15:17:33.865403125 +0200
+@@ -23,7 +23,7 @@
chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes
<div class="box">
<a href=every-services-all-boxes>every services on all boxes</a>
-diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile
---- munin-2.0.42.orig/Makefile 2018-10-11 15:23:51.545033000 +0000
-+++ munin-2.0.42/Makefile 2018-10-11 15:24:16.386033000 +0000
-@@ -100,9 +100,9 @@ install-pre: Makefile Makefile.config
+diff -ur munin-2.0.69.orig/Makefile munin-2.0.69/Makefile
+--- munin-2.0.69.orig/Makefile 2022-08-27 15:12:18.268799133 +0200
++++ munin-2.0.69/Makefile 2022-08-27 15:17:33.866403127 +0200
+@@ -101,9 +101,9 @@
$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
install-master-prime: $(INFILES_MASTER) install-pre install-master
mkdir -p $(CONFDIR)/munin-conf.d
mkdir -p $(LIBDIR)
mkdir -p $(BINDIR)
-@@ -121,15 +121,15 @@ install-master-prime: $(INFILES_MASTER)
+@@ -122,15 +122,15 @@
$(CHMOD) 0755 $(DBDIR)/cgi-tmp
for p in master/www/*.tmpl ; do \
done
$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
-diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config
---- munin-2.0.42.orig/Makefile.config 2018-10-11 15:23:51.545033000 +0000
-+++ munin-2.0.42/Makefile.config 2018-10-11 15:24:16.386033000 +0000
-@@ -40,6 +40,7 @@ LIBDIR = $(PREFIX)/share/munin
+@@ -268,6 +268,7 @@
+ -e 's|@@GOODSH@@|$(GOODSH)|g' \
+ -e 's|@@BASH@@|$(BASH)|g' \
+ -e 's|@@HASSETR@@|$(HASSETR)|g' \
++ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
+ $< > $@;
+
+
+@@ -314,6 +315,7 @@
+ -e 's|\@\@GOODSH\@\@|$(GOODSH)|g;' \
+ -e 's|\@\@BASH\@\@|$(BASH)|g;' \
+ -e 's|\@\@HASSETR\@\@|$(HASSETR)|g;' \
++ -e 's|\@\@TEMPLATEDIR\@\@|$(TEMPLATEDIR)|g;' \
+ $(CONFVAR_SUBSTITUTION_FILES)
+
+
+@@ -367,7 +369,8 @@
+ s{(PLUGINUSER\s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
+ s{(GOODSH\s+=\s).*}{\1q{$(GOODSH)};}x; \
+ s{(BASH\s+=\s).*}{\1q{$(BASH)};}x; \
+- s{(HASSETR\s+=\s).*}{\1q{$(HASSETR)};}x;' \
++ s{(HASSETR\s+=\s).*}{\1q{$(HASSETR)};}x; \
++ s{(TEMPLATEDIR\s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;' \
+ common/lib/Munin/Common/Defaults.pm >common/blib/lib/Munin/Common/Defaults.pm
+
+
+diff -ur munin-2.0.69.orig/Makefile.config munin-2.0.69/Makefile.config
+--- munin-2.0.69.orig/Makefile.config 2022-08-27 15:12:18.268799133 +0200
++++ munin-2.0.69/Makefile.config 2022-08-27 15:17:33.866403127 +0200
+@@ -40,6 +40,7 @@
# Server only - Output directory
HTMLDIR = $(DESTDIR)/var/lib/munin/html
CGIDIR = $(LIBDIR)/cgi
# Where to put internal data for master (RRD, internal files, ...)
DBDIR = $(DESTDIR)/var/lib/munin/db
-diff -urNpa munin-2.0.42.orig/Makefile.rej munin-2.0.42/Makefile.rej
---- munin-2.0.42.orig/Makefile.rej 1970-01-01 00:00:00.000000000 +0000
-+++ munin-2.0.42/Makefile.rej 2018-10-11 15:24:16.386033000 +0000
-@@ -0,0 +1,20 @@
-+--- Makefile 2015-09-08 10:02:24.000000000 +0000
-++++ Makefile 2015-09-08 10:12:45.899593251 +0000
-+@@ -249,6 +249,7 @@ build/%: %.in
-+ -e 's|@@GOODSH@@|$(GOODSH)|g' \
-+ -e 's|@@BASH@@|$(BASH)|g' \
-+ -e 's|@@HASSETR@@|$(HASSETR)|g' \
-++ -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
-+ $< > $@;
-+
-+
-+@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm
-+ s{(PLUGINUSER \s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
-+ s{(GOODSH \s+=\s).*}{\1q{$(GOODSH)};}x; \
-+ s{(BASH \s+=\s).*}{\1q{$(BASH)};}x; \
-+- s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;' \
-++ s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x; \
-++ s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\
-+ $< > $@
-+
-+ build-doc: build-doc-stamp Makefile Makefile.config
-diff -urNpa munin-2.0.42.orig/master/doc/munin.conf.pod.in munin-2.0.42/master/doc/munin.conf.pod.in
---- munin-2.0.42.orig/master/doc/munin.conf.pod.in 2018-10-11 15:23:51.547033000 +0000
-+++ munin-2.0.42/master/doc/munin.conf.pod.in 2018-10-11 15:24:16.387033000 +0000
-@@ -70,7 +70,7 @@ Directory for HTML pages and graphs. Re
+diff -ur munin-2.0.69.orig/master/doc/munin.conf.pod.in munin-2.0.69/master/doc/munin.conf.pod.in
+--- munin-2.0.69.orig/master/doc/munin.conf.pod.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/doc/munin.conf.pod.in 2022-08-27 15:17:33.866403127 +0200
+@@ -70,7 +70,7 @@
Directory for files tracking munin's current running state. Required.
Directory for templates used to generate HTML pages. Required.
-diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Config.pm munin-2.0.42/master/lib/Munin/Master/Config.pm
---- munin-2.0.42.orig/master/lib/Munin/Master/Config.pm 2018-10-11 15:23:51.547033000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/Config.pm 2018-10-11 15:24:16.387033000 +0000
-@@ -159,8 +159,8 @@ my %booleans = map {$_ => 1} qw(
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Config.pm munin-2.0.69/master/lib/Munin/Master/Config.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/Config.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/lib/Munin/Master/Config.pm 2022-08-27 15:17:33.866403127 +0200
+@@ -159,8 +159,8 @@
tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
tls_verify_certificate => 0,
tls_verify_depth => 5,
cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp",
ssh_command => "ssh",
ssh_options => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no",
-diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm munin-2.0.42/master/lib/Munin/Master/Utils.pm
---- munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm 2018-10-11 15:23:51.547033000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/Utils.pm 2018-10-11 15:24:16.387033000 +0000
-@@ -1001,8 +1001,8 @@ sub munin_readconfig_base {
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm munin-2.0.69/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/lib/Munin/Master/Utils.pm 2022-08-27 15:17:33.867403129 +0200
+@@ -999,8 +999,8 @@
$config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_STATEDIR;
$config->{'dbdir'} ||= $Munin::Common::Defaults::MUNIN_DBDIR;
$config->{'logdir'} ||= $Munin::Common::Defaults::MUNIN_LOGDIR;
$config->{'htmldir'} ||= $Munin::Common::Defaults::MUNIN_HTMLDIR;
$config->{'spooldir'} ||= $Munin::Common::Defaults::MUNIN_SPOOLDIR;
$config->{'#%#parent'} = undef;
-diff -urNpa munin-2.0.42.orig/master/munin.conf.in munin-2.0.42/master/munin.conf.in
---- munin-2.0.42.orig/master/munin.conf.in 2018-10-11 15:23:51.548033000 +0000
-+++ munin-2.0.42/master/munin.conf.in 2018-10-11 15:24:16.387033000 +0000
+diff -ur munin-2.0.69.orig/master/munin.conf.in munin-2.0.69/master/munin.conf.in
+--- munin-2.0.69.orig/master/munin.conf.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/munin.conf.in 2022-08-27 15:17:33.867403129 +0200
@@ -12,11 +12,11 @@
# Where to look for the HTML templates
-diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Node.pm munin-2.0.42/master/lib/Munin/Master/Node.pm
---- munin-2.0.42.orig/master/lib/Munin/Master/Node.pm 2018-10-11 16:33:01.036033000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/Node.pm 2018-10-11 16:34:05.467033000 +0000
-@@ -37,7 +37,7 @@ sub new {
+diff -ur munin-2.0.65.orig/master/lib/Munin/Master/Node.pm munin-2.0.65/master/lib/Munin/Master/Node.pm
+--- munin-2.0.65.orig/master/lib/Munin/Master/Node.pm 2020-10-28 22:36:02.000000000 +0100
++++ munin-2.0.65/master/lib/Munin/Master/Node.pm 2021-01-04 18:05:50.646803396 +0100
+@@ -38,7 +38,7 @@
pid => undef,
writer => undef,
master_capabilities => "multigraph dirtyconfig",
# Condtional build:
%bcond_with sybase # add Sybase support to munin-node
-%include /usr/lib/rpm/macros.perl
Summary: Munin - the Linpro RRD data agent
Summary(pl.UTF-8): Munin - agent danych RRD Linpro
Name: munin
-Version: 2.0.42
-Release: 1
+Version: 2.0.75
+Release: 2
License: GPL
Group: Applications/WWW
Source0: https://github.com/munin-monitoring/munin/archive/%{version}.tar.gz
-# Source0-md5: 802394c56aa714a97b8535c8d6388b17
+# Source0-md5: e793d7d139df7cd7730089186a3afc28
Source1: %{name}-node.init
Source2: %{name}.cron
Source3: %{name}-apache.conf
Source8: %{name}-httpd.conf
Source11: %{name}-asyncd.init
Source12: %{name}-asyncd.sysconfig
+Source13: plugins.conf
Patch0: %{name}-Makefile.patch
Patch1: %{name}-plugins.patch
Patch2: %{name}-templatedir.patch
Patch3: %{name}-separate-configs.patch
Patch4: %{name}-timeout.patch
+Patch5: shebang.patch
URL: http://munin.sourceforge.net/
BuildRequires: perl-Encode
+BuildRequires: perl-Module-Build
BuildRequires: perl-Net-SNMP
BuildRequires: perl-devel
BuildRequires: rpm-perlprov
BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 1.671
BuildRequires: which
-Requires(triggerpostun): sed >= 4.0
+Requires(postun): sed >= 4.0
Requires: %{name}-common = %{version}-%{release}
Requires: fonts-TTF-DejaVu
Requires: perl-Date-Manip
Requires(post,preun): /sbin/chkconfig
Requires: %{name}-common = %{version}-%{release}
Requires: logtail
-Requires: logtool
-#Requires: perl-Config-General
Requires: perl-Net-Netmask
Requires: perl-Net-SNMP
Requires: perl-Net-Server
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
%{__make} -j1 build \
cp -p %{SOURCE6} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf
-cp -p dists/tarball/plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}
ln -sf %{_sysconfdir}/plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}/plugin-conf.d/munin-node
for f in cgi-graph cgi-html graph html limits update ; do
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin-conf.d/munin-node
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/munin-node
%attr(754,root,root) /etc/rc.d/init.d/munin-node
+%attr(755,root,root) %{_bindir}/munin-get
%attr(755,root,root) %{_bindir}/munindoc
%attr(755,root,root) %{_sbindir}/munin-node
%attr(755,root,root) %{_sbindir}/munin-node-configure
%attr(755,root,root) %{_sbindir}/munin-run
-%attr(755,root,root) %{_sbindir}/munin-sched
%{perl_vendorlib}/Munin/Node
%{perl_vendorlib}/Munin/Plugin
%{perl_vendorlib}/Munin/Plugin.pm
%endif
%dir %attr(770,munin,munin) /var/lib/munin/plugin-state
%dir %attr(770,munin,munin) /var/spool/munin
+%{_mandir}/man1/munin-get*
%{_mandir}/man1/munin-node*
%{_mandir}/man1/munin-run*
-%{_mandir}/man1/munin-sched*
%{_mandir}/man1/munindoc*
%{_mandir}/man3/Munin::Node*
%{_mandir}/man3/Munin::Plugin*
--- /dev/null
+# This file is used to configure how the plugins are invoked.
+# Place in /etc/munin/plugin-conf.d/ or corresponding directory.
+#
+# PLEASE NOTE: Changes in the plugin-conf.d directory are only
+# read at munin-node startup, so restart at any changes.
+#
+# user <user> # Set the user to run the plugin as
+# group <group> # Set the group to run the plugin as
+# command <command> # Run <command> instead of the plugin. %c
+# expands to what would normally be run.
+# env.<variable> <value> # Sets <variable> in the plugin's environment, see the
+# individual plugins to find out which variables they
+# care about.
+#
+#
+
+[*]
+env.logtail /usr/bin/logtail
+
+[mysql*]
+#env.mysqlopts -u someuser
+
+[exim*]
+group mail
+
+[cps*]
+user root
+
+[apt]
+user root
+
+[vlan*]
+user root
+
+[postfix*]
+user root
+env.logdir /var/log
+env.logfile maillog
+
+[netstat]
+group proc
+
+[amavis*]
+user root
+env.amavislog /var/log/maillog
+env.logfile /var/log/maillog
+
+[courier*]
+user root
+env.logfile /var/log/maillog
+
+[mailman]
+user mailman
+group (mailman)
+
+[bind9_rndc]
+group (named)
+env.querystats /var/lib/named/named.stats
+
+[squid*]
+group (squid)
+#env.squidport 3128
+#env.squiduser manager
+#env.squidpasswd <SECRET>
+
+[fw*]
+group proc
+
+[if*]
+group proc
+
+[dhcpd3]
+user root
+env.leasefile /var/lib/dhcpd/dhcpd.leases
+env.configfile /etc/dhcpd.conf
+
+[ip_*]
+user root
+
+[munin*]
+user munin
+
+[ping_*]
+group adm
+
+[port_*]
+group proc
+
+[processes]
+group proc
+
+[ps_*]
+group proc
+
+[psu_*]
+group proc
+
+[nfs*]
+group proc
+
+[entropy]
+group proc
+
+[open_*]
+group proc
+
+[nut*]
+env.upsname SmartUPS
+env.upshost 127.0.0.1
+
+[df*]
+#user root # if you have mode 0000 /vservers dir
+group proc
+
+# Sane defaults for plugins from MuninExchange
+
+[apache_smaps]
+#user root # if you have kernel with grsecurity
+group proc
+env.pname httpd.prefork
+env.puser http
+
+[dovecot]
+user root
+env.logfile /var/log/maillog
+
+[php_eaccelerator]
+env.user admin
+env.password eAccelerator
+env.url http://127.0.0.1/eaccelerator/control.php
+
+[proftpd*]
+user root
+env.logfile /var/log/xferlog
+
+[vsftpd*]
+user root
+env.logfile /var/log/vsftpd.log
+
+[postgrey*]
+user root
+env.logfile /var/log/maillog
+
+[nagiosstatus]
+user root
+env.statuslog /var/lib/nagios/status.dat
+
+[freeradius]
+user root
+env.radius_log /var/log/freeradius/radius.log
+
+[ipmitool_sensor*]
+user root
+timeout 20
+
+[openvpn_clients]
+user root
+env.logfile /var/log/openvpn/status.log
+
+[cupsys_pages]
+user root
--- /dev/null
+diff -u munin-2.0.75.orig/Makefile.config munin-2.0.75/Makefile.config
+--- munin-2.0.75.orig/Makefile.config 2023-10-25 10:03:45.000000000 +0200
++++ munin-2.0.75/Makefile.config 2024-01-11 01:01:31.148011121 +0100
+@@ -66,10 +66,10 @@
+ PERL := $(shell which perl)
+
+ # The python interpreter to use (used by some plugins)
+-PYTHON := /usr/bin/env python3
++PYTHON := /usr/bin/python3
+
+ # The ruby interpreter to use (used by some plugins)
+-RUBY := /usr/bin/env ruby
++RUBY := /usr/bin/ruby
+
+ # The java runtime to use (used by some plugins)
+ JAVARUN := /usr/bin/java
TLD / packages / munin.git / commitdiff