]> TLD Linux GIT Repositories - packages/munin.git/blobdiff - munin-separate-configs.patch
TLD / packages / munin.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- logtool seems no longer needed (not found anywhere in sources)
[packages/munin.git] / munin-separate-configs.patch
diff --git a/munin-separate-configs.patch b/munin-separate-configs.patch
index b247733cd6ad67a13682e2aa5516277e44487f89..b0d316236abd9a207e8db623564b6ce966369e91 100644 (file)
--- a/munin-separate-configs.patch
+++ b/munin-separate-configs.patch
@@ -1,7 +1,7 @@
-diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/common/lib/Munin/Common/Defaults.pm
---- munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm      2015-09-08 10:12:45.000000000 +0000
-+++ munin-2.0.25/common/lib/Munin/Common/Defaults.pm   2015-09-08 10:13:31.731593251 +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 $DROPDOWNLIMIT     = 1;
  
  our $MUNIN_PREFIX     = '';
@@ -11,10 +11,10 @@ diff -urNp munin-2.0.25.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.25/co
  our $MUNIN_BINDIR     = '';
  our $MUNIN_SBINDIR    = '';
  our $MUNIN_DOCDIR     = '';
  our $MUNIN_BINDIR     = '';
  our $MUNIN_SBINDIR    = '';
  our $MUNIN_DOCDIR     = '';
-diff -urNp munin-2.0.25.orig/doc/installation/configuration.rst munin-2.0.25/doc/installation/configuration.rst
---- munin-2.0.25.orig/doc/installation/configuration.rst       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/doc/installation/configuration.rst    2015-09-08 10:13:31.732593251 +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
  -------
  
  Decide which plugins to use. The munin node runs all plugins present
@@ -23,7 +23,7 @@ diff -urNp munin-2.0.25.orig/doc/installation/configuration.rst munin-2.0.25/doc
  
  The quick auto-plug-and-play solution:
  
  
  The quick auto-plug-and-play solution:
  
-@@ -59,7 +59,7 @@ Master
+@@ -59,7 +59,7 @@
  Add some nodes
  --------------
  
  Add some nodes
  --------------
  
@@ -32,10 +32,10 @@ diff -urNp munin-2.0.25.orig/doc/installation/configuration.rst munin-2.0.25/doc
  
  [node.example.com]
    address 192.0.2.4
  
  [node.example.com]
    address 192.0.2.4
-diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
---- munin-2.0.25.orig/Makefile 2015-09-08 10:12:45.000000000 +0000
-+++ munin-2.0.25/Makefile      2015-09-08 10:13:31.733593251 +0000
-@@ -56,7 +56,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
  # a new config.  Target _only_ suitable for maintainers.
  unconfig:
        rm -f $(HTMLDIR)/.htaccess
@@ -44,7 +44,7 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
  
  tags:
        -rm -f TAGS
  
  tags:
        -rm -f TAGS
-@@ -71,14 +71,15 @@ install-pre: Makefile Makefile.config
+@@ -97,14 +97,15 @@
        mkdir -p $(LOGDIR)
        mkdir -p $(STATEDIR)
        mkdir -p $(SPOOLDIR)
        mkdir -p $(LOGDIR)
        mkdir -p $(STATEDIR)
        mkdir -p $(SPOOLDIR)
@@ -62,7 +62,7 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
        mkdir -p $(LIBDIR)
        mkdir -p $(BINDIR)
        mkdir -p $(SBINDIR)
        mkdir -p $(LIBDIR)
        mkdir -p $(BINDIR)
        mkdir -p $(SBINDIR)
-@@ -111,7 +112,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 0644 master/DejaVuSans.ttf $(LIBDIR)/
  
        test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
@@ -71,8 +71,8 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
  
        $(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
        $(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
  
        $(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
        $(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
-@@ -140,14 +141,14 @@ endif
- 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
        @$(CHECKGROUP)
  
 -      mkdir -p $(CONFDIR)/plugins
@@ -87,9 +87,9 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
 -      $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
 +      $(CHMOD) 0755 $(NCONFDIR)/plugin-conf.d
  
 -      $(CHMOD) 0755 $(CONFDIR)/plugin-conf.d
 +      $(CHMOD) 0755 $(NCONFDIR)/plugin-conf.d
  
-       for p in build/plugins/node.d/* build/plugins/node.d.$(OSTYPE)/* ; do \
-           if test -f "$$p" ; then                            \
-@@ -184,7 +185,7 @@ install-async:
+       @# Process the OS specific plugins at the end. Otherwise they would be overridden by the
+       @# generic ones.
+@@ -202,7 +203,7 @@
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre
  install-node-prime: install-node-pre install-node
  
  install-node-pre: build/node/munin-node.conf install-pre
@@ -98,27 +98,37 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
  
  
  install-common-prime: build-common install-common
  
  
  install-common-prime: build-common install-common
-@@ -220,7 +221,8 @@ build/%: %.in
+@@ -238,7 +239,8 @@
        @echo "$< -> $@"
        @mkdir -p build/`dirname $<`
        @echo "$< -> $@"
        @mkdir -p build/`dirname $<`
-       @sed -e 's|@@PREFIX@@|$(PREFIX)|g'                      \
--             -e 's|@@CONFDIR@@|$(CONFDIR)|g'                    \
-+             -e 's|@@MCONFDIR@@|$(MCONFDIR)|g'                  \
-+             -e 's|@@NCONFDIR@@|$(NCONFDIR)|g'                  \
-              -e 's|@@BINDIR@@|$(BINDIR)|g'                      \
-              -e 's|@@SBINDIR@@|$(SBINDIR)|g'                    \
-              -e 's|@@DOCDIR@@|$(DOCDIR)|g'                      \
-@@ -301,7 +303,8 @@ build-common-pre: common/Build
- common/blib/lib/Munin/Common/Defaults.pm: common/lib/Munin/Common/Defaults.pm build-common-pre
+       @sed -e 's|@@PREFIX@@|$(PREFIX)|g' \
+-              -e 's|@@CONFDIR@@|$(CONFDIR)|g' \
++              -e 's|@@MCONFDIR@@|$(MCONFDIR)|g' \
++              -e 's|@@NCONFDIR@@|$(NCONFDIR)|g' \
+               -e 's|@@BINDIR@@|$(BINDIR)|g' \
+               -e 's|@@SBINDIR@@|$(SBINDIR)|g' \
+               -e 's|@@DOCDIR@@|$(DOCDIR)|g' \
+@@ -286,7 +288,8 @@
+ 
+ substitute-confvar-inline:
+       perl -p -i -e 's|\@\@PREFIX\@\@|$(PREFIX)|g;' \
+-              -e 's|\@\@CONFDIR\@\@|$(CONFDIR)|g;' \
++              -e 's|\@\@MCONFDIR\@\@|$(MCONFDIR)|g;' \
++              -e 's|\@\@NCONFDIR\@\@|$(NCONFDIR)|g;' \
+               -e 's|\@\@BINDIR\@\@|$(BINDIR)|g;' \
+               -e 's|\@\@SBINDIR\@\@|$(SBINDIR)|g;' \
+               -e 's|\@\@DOCDIR\@\@|$(DOCDIR)|g;' \
+@@ -343,7 +346,8 @@
+ substitute-build-defaults-inline:
        rm -f common/blib/lib/Munin/Common/Defaults.pm
        rm -f common/blib/lib/Munin/Common/Defaults.pm
-       $(PERL) -pe 's{(PREFIX     \s+=\s).*}{\1q{$(PREFIX)};}x;   \
--                  s{(CONFDIR    \s+=\s).*}{\1q{$(CONFDIR)};}x;     \
-+                  s{(MCONFDIR    \s+=\s).*}{\1q{$(MCONFDIR)};}x;   \
-+                  s{(NCONFDIR    \s+=\s).*}{\1q{$(NCONFDIR)};}x;   \
-                   s{(BINDIR     \s+=\s).*}{\1q{$(BINDIR)};}x;      \
-                   s{(SBINDIR    \s+=\s).*}{\1q{$(SBINDIR)};}x;     \
-                   s{(DOCDIR     \s+=\s).*}{\1q{$(DOCDIR)};}x;      \
-@@ -428,7 +431,7 @@ old-test: t/*.t
+       $(PERL) -pe 's{(PREFIX\s+=\s).*}{\1q{$(PREFIX)};}x; \
+-              s{(CONFDIR\s+=\s).*}{\1q{$(CONFDIR)};}x; \
++              s{(MCONFDIR\s+=\s).*}{\1q{$(MCONFDIR)};}x; \
++              s{(NCONFDIR\s+=\s).*}{\1q{$(NCONFDIR)};}x; \
+               s{(BINDIR\s+=\s).*}{\1q{$(BINDIR)};}x; \
+               s{(SBINDIR\s+=\s).*}{\1q{$(SBINDIR)};}x; \
+               s{(DOCDIR\s+=\s).*}{\1q{$(DOCDIR)};}x; \
+@@ -498,7 +502,7 @@
        $(MAKE) $@ CONFIG=t/Makefile.config
  else
  test_plugins = id_default id_root env
        $(MAKE) $@ CONFIG=t/Makefile.config
  else
  test_plugins = id_default id_root env
@@ -127,7 +137,7 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
        @for test in t/*.t; do \
                echo -n "$$test: "; \
                PERL5LIB=$(PERLLIB) $(PERL) $$test;\
        @for test in t/*.t; do \
                echo -n "$$test: "; \
                PERL5LIB=$(PERLLIB) $(PERL) $$test;\
-@@ -436,10 +439,10 @@ old-test: t/*.t t/install $(addprefix $(
+@@ -506,10 +510,10 @@
  endif
  
  node-monkeywrench: install-node
  endif
  
  node-monkeywrench: install-node
@@ -140,9 +150,9 @@ diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
        cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
        $(SBINDIR)/munin-node-configure --suggest
        echo 'Done?'
        cp monkeywrench/plugin-break*_ $(LIBDIR)/plugins/
        $(SBINDIR)/munin-node-configure --suggest
        echo 'Done?'
-diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config
---- munin-2.0.25.orig/Makefile.config  2015-09-08 10:12:45.000000000 +0000
-+++ munin-2.0.25/Makefile.config       2015-09-08 10:13:31.733593251 +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
  
 @@ -20,7 +20,8 @@
  PREFIX     = $(DESTDIR)/usr
  
@@ -153,10 +163,10 @@ diff -urNp munin-2.0.25.orig/Makefile.config munin-2.0.25/Makefile.config
  
  # Server only - where to put munin-cron
  BINDIR     = $(PREFIX)/bin
  
  # Server only - where to put munin-cron
  BINDIR     = $(PREFIX)/bin
-diff -urNp munin-2.0.25.orig/master/_bin/munin-cgi-graph.in munin-2.0.25/master/_bin/munin-cgi-graph.in
---- munin-2.0.25.orig/master/_bin/munin-cgi-graph.in   2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/_bin/munin-cgi-graph.in        2015-09-08 10:13:31.734593251 +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";
  use Log::Log4perl qw( :easy );
  
  my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
@@ -165,10 +175,10 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-cgi-graph.in munin-2.0.25/master/
  
  my %period  = ( "day"   => 300,
                "week"  => 1800,
  
  my %period  = ( "day"   => 300,
                "week"  => 1800,
-diff -urNp munin-2.0.25.orig/master/_bin/munin-check.in munin-2.0.25/master/_bin/munin-check.in
---- munin-2.0.25.orig/master/_bin/munin-check.in       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/_bin/munin-check.in    2015-09-08 10:13:31.734593251 +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
  
  norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
  norec=yes perm_ok @@PLUGSTATE@@ 775
  
@@ -177,10 +187,10 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-check.in munin-2.0.25/master/_bin
  
  echo "Check done.  Please note that this script only checks most things,"
  echo "not all things."
  
  echo "Check done.  Please note that this script only checks most things,"
  echo "not all things."
-diff -urNp munin-2.0.25.orig/master/_bin/munin-graph.in munin-2.0.25/master/_bin/munin-graph.in
---- munin-2.0.25.orig/master/_bin/munin-graph.in       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/_bin/munin-graph.in    2015-09-08 10:13:31.735593251 +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";
  use Log::Log4perl qw( :easy );
  
  my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
@@ -189,10 +199,10 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-graph.in munin-2.0.25/master/_bin
  
  my %period  = ( "day"   => 300,
                "week"  => 1800,
  
  my %period  = ( "day"   => 300,
                "week"  => 1800,
-diff -urNp munin-2.0.25.orig/master/_bin/munin-limits.in munin-2.0.25/master/_bin/munin-limits.in
---- munin-2.0.25.orig/master/_bin/munin-limits.in      2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/_bin/munin-limits.in   2015-09-08 10:13:31.735593251 +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<< --config <file> >>
  
@@ -201,7 +211,7 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-limits.in munin-2.0.25/master/_bi
  
  =item B<< --always-send <severity list> >>
  
  
  =item B<< --always-send <severity list> >>
  
-@@ -114,7 +114,7 @@ configuration file contains the necessar
+@@ -112,7 +112,7 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -210,10 +220,10 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-limits.in munin-2.0.25/master/_bi
        @@DBDIR@@/*
        @@STATEDIR@@/*
  
        @@DBDIR@@/*
        @@STATEDIR@@/*
  
-diff -urNp munin-2.0.25.orig/master/_bin/munin-update.in munin-2.0.25/master/_bin/munin-update.in
---- munin-2.0.25.orig/master/_bin/munin-update.in      2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/_bin/munin-update.in   2015-09-08 10:13:31.735593251 +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<< --config_file=<file> >>
  
@@ -222,7 +232,7 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-update.in munin-2.0.25/master/_bi
  
  =item B<< --[no]debug >>
  
  
  =item B<< --[no]debug >>
  
-@@ -192,7 +192,7 @@ and the directories to store them in.
+@@ -190,7 +190,7 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -231,10 +241,10 @@ diff -urNp munin-2.0.25.orig/master/_bin/munin-update.in munin-2.0.25/master/_bi
        @@DBDIR@@/*
        @@LOGDIR@@/munin-update
        @@STATEDIR@@/*
        @@DBDIR@@/*
        @@LOGDIR@@/munin-update
        @@STATEDIR@@/*
-diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/doc/munin.conf.pod.in
---- munin-2.0.25.orig/master/doc/munin.conf.pod.in     2015-09-08 10:12:45.000000000 +0000
-+++ munin-2.0.25/master/doc/munin.conf.pod.in  2015-09-08 10:13:31.736593251 +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
  
        [machine1.your.dom]
                address localhost
  
@@ -243,7 +253,7 @@ diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/do
  If your placement deviates from this norm, use the "--config
  E<lt>fileE<gt>"-option when running the munin-* programs.
  
  If your placement deviates from this norm, use the "--config
  E<lt>fileE<gt>"-option when running the munin-* programs.
  
-@@ -149,20 +149,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_private_key> <value>
  
  This directive sets the location of the private key to be used for
@@ -267,10 +277,10 @@ diff -urNp munin-2.0.25.orig/master/doc/munin.conf.pod.in munin-2.0.25/master/do
  
  =item B<tls_verify_depth> <value>
  
  
  =item B<tls_verify_depth> <value>
  
-diff -urNp munin-2.0.25.orig/master/doc/munin-cron.pod.in munin-2.0.25/master/doc/munin-cron.pod.in
---- munin-2.0.25.orig/master/doc/munin-cron.pod.in     2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/doc/munin-cron.pod.in  2015-09-08 10:13:31.736593251 +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> >>
  
  
  =item B<< --config <file> >>
  
@@ -279,10 +289,10 @@ diff -urNp munin-2.0.25.orig/master/doc/munin-cron.pod.in munin-2.0.25/master/do
  
  =back
  
  
  =back
  
-diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/master/extras/munin-update_old.in
---- munin-2.0.25.orig/master/extras/munin-update_old.in        2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/extras/munin-update_old.in     2015-09-08 10:13:31.736593251 +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 $STATS;
  my $cli_do_fork;
  my $cli_timeout;
@@ -291,7 +301,7 @@ diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/mast
  my $config;
  my $do_fork = 1;
  my $serversocket  = "munin-server-socket.$$";
  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. 
      --host <host>     Limit graphed hosts to <host>. Multiple --host options
                        may be supplied.
      --config <file>   Use <file> as configuration file. 
@@ -300,7 +310,7 @@ diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/mast
      --[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]
      --[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");
        my $ca_cert;
        my $tls_verify;
          $key = $cert = munin_get ($config, "tls_pem");
@@ -315,7 +325,7 @@ diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/mast
             unless defined $ca_cert;
          $tls_verify=&munin_get ($config, "tls_verify_certificate", "no");
          $depth=&munin_get ($config, "tls_verify_depth", 5);
             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<< --config <file> >>
  
@@ -324,7 +334,7 @@ diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/mast
  
  =item B<< --help >>
  
  
  =item B<< --help >>
  
-@@ -1124,7 +1124,7 @@ and the directories to store them in.
+@@ -1123,7 +1123,7 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -333,10 +343,10 @@ diff -urNp munin-2.0.25.orig/master/extras/munin-update_old.in munin-2.0.25/mast
        @@DBDIR@@/*
        @@LOGDIR@@/munin-update
        @@STATEDIR@@/*
        @@DBDIR@@/*
        @@LOGDIR@@/munin-update
        @@STATEDIR@@/*
-diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/master/lib/Munin/Master/Config.pm
---- munin-2.0.25.orig/master/lib/Munin/Master/Config.pm        2015-09-08 10:12:45.000000000 +0000
-+++ munin-2.0.25/master/lib/Munin/Master/Config.pm     2015-09-08 10:13:31.737593251 +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 ( {
            root_instance => 1, 
  
            config      => bless ( {
@@ -345,9 +355,9 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/mast
                dbdir            => $Munin::Common::Defaults::MUNIN_DBDIR,
                debug            => 0,
                fork             => 1,
                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              => 'disabled',
 -              tls_ca_certificate => "$Munin::Common::Defaults::MUNIN_CONFDIR/cacert.pem",
 -              tls_certificate  => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
@@ -358,10 +368,10 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Config.pm munin-2.0.25/mast
                tls_verify_certificate => 0,
                tls_verify_depth => 5,
                tmpldir          => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
                tls_verify_certificate => 0,
                tls_verify_depth => 5,
                tmpldir          => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
-diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.25/master/lib/Munin/Master/GraphOld.pm
---- munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm      2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/lib/Munin/Master/GraphOld.pm   2015-09-08 10:13:31.738593251 +0000
-@@ -92,7 +92,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 $skip_stats     = 0;
  my $stdout         = 0;
  my $force_run_as_root = 0;
@@ -370,10 +380,10 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.25/ma
  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.
  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 -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm
---- munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/lib/Munin/Master/HTMLOld.pm    2015-09-08 10:13:31.738593251 +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 @times = ("day", "week", "month", "year");
  
  my $DEBUG      = 0;
@@ -382,7 +392,7 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/mas
  my $do_usage   = 0;
  my $do_version = 0;
  my $stdout     = 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. 
      --service <service>       Compatibility. No effect.
      --host <host>     Compatibility. No effect.
      --config <file>   Use <file> as configuration file. 
@@ -391,7 +401,7 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/mas
  
  ";
      exit 0;
  
  ";
      exit 0;
-@@ -894,7 +894,7 @@ Compatibility. No effect.
+@@ -971,7 +971,7 @@
  
  =item B<< --config <file> >>
  
  
  =item B<< --config <file> >>
  
@@ -400,7 +410,7 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/mas
  
  =item B<< --help >>
  
  
  =item B<< --help >>
  
-@@ -917,7 +917,7 @@ Munin-html creates the html pages.
+@@ -994,7 +994,7 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -409,10 +419,10 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.25/mas
        @@DBDIR@@/datafile
        @@LOGDIR@@/munin-html
        @@HTMLDIR@@/*
        @@DBDIR@@/datafile
        @@LOGDIR@@/munin-html
        @@HTMLDIR@@/*
-diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm
---- munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm     2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/lib/Munin/Master/LimitsOld.pm  2015-09-08 10:13:31.739593251 +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;
  use Munin::Common::Defaults;
  
  my $DEBUG          = 0;
@@ -421,7 +431,7 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.25/m
  my $do_usage       = 0;
  my $do_version     = 0;
  my @limit_hosts    = ();
  my $do_usage       = 0;
  my $do_version     = 0;
  my @limit_hosts    = ();
-@@ -230,7 +230,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. 
      --contact <contact>       Limit notified contacts to <contact>. Multiple 
                        --contact options may be supplied.
      --config <file>   Use <file> as configuration file. 
@@ -430,10 +440,10 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.25/m
  
  ";
      exit 0;
  
  ";
      exit 0;
-diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/master/lib/Munin/Master/Utils.pm
---- munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm 2015-09-08 10:12:45.000000000 +0000
-+++ munin-2.0.25/master/lib/Munin/Master/Utils.pm      2015-09-08 10:13:31.740593251 +0000
-@@ -115,7 +115,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 @@
        },
  };
  
        },
  };
  
@@ -442,9 +452,9 @@ diff -urNp munin-2.0.25.orig/master/lib/Munin/Master/Utils.pm munin-2.0.25/maste
  
  # Fields to copy when "aliasing" a field
  my @COPY_FIELDS    = ("label", "draw", "type", "rrdfile", "fieldname", "info");
  
  # Fields to copy when "aliasing" a field
  my @COPY_FIELDS    = ("label", "draw", "type", "rrdfile", "fieldname", "info");
-diff -urNp munin-2.0.25.orig/master/munin.conf.in munin-2.0.25/master/munin.conf.in
---- munin-2.0.25.orig/master/munin.conf.in     2015-09-08 10:12:45.000000000 +0000
-+++ munin-2.0.25/master/munin.conf.in  2015-09-08 10:13:31.740593251 +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
  
 @@ -24,7 +24,7 @@
  # cgitmpdir @@DBDIR@@/cgi-tmp
  
@@ -454,10 +464,10 @@ diff -urNp munin-2.0.25.orig/master/munin.conf.in munin-2.0.25/master/munin.conf
  
  # You can choose the time reference for "DERIVE" like graphs, and show
  # "per minute", "per hour" values instead of the default "per second"
  
  # You can choose the time reference for "DERIVE" like graphs, and show
  # "per minute", "per hour" values instead of the default "per second"
-diff -urNp munin-2.0.25.orig/master/t/munin_master_config.t munin-2.0.25/master/t/munin_master_config.t
---- munin-2.0.25.orig/master/t/munin_master_config.t   2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/t/munin_master_config.t        2015-09-08 10:13:31.741593251 +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 => {
      },
  
      config => {
@@ -466,9 +476,9 @@ diff -urNp munin-2.0.25.orig/master/t/munin_master_config.t munin-2.0.25/master/
          dbdir           => '/opt/munin/sandbox/var/opt/munin',
          debug           => 0,
          fork            => 1,
          dbdir           => '/opt/munin/sandbox/var/opt/munin',
          debug           => 0,
          fork            => 1,
-diff -urNp munin-2.0.25.orig/master/www/munin-htaccess.in munin-2.0.25/master/www/munin-htaccess.in
---- munin-2.0.25.orig/master/www/munin-htaccess.in     2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/www/munin-htaccess.in  2015-09-08 10:13:31.741593251 +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@@>
 @@ -9,7 +9,7 @@
  # 
  # <directory @@HTMLDIR@@>
@@ -478,10 +488,10 @@ diff -urNp munin-2.0.25.orig/master/www/munin-htaccess.in munin-2.0.25/master/ww
  AuthName "Munin"
  AuthType Basic
  require valid-user
  AuthName "Munin"
  AuthType Basic
  require valid-user
-diff -urNp munin-2.0.25.orig/node/bin/munindoc munin-2.0.25/node/bin/munindoc
---- munin-2.0.25.orig/node/bin/munindoc        2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/bin/munindoc     2015-09-08 10:13:31.742593251 +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",
  
  # Dirs in which to look for $plugin.pod and $plugin files.
  my @DIRS = ("$Munin::Common::Defaults::MUNIN_LIBDIR/plugins",
@@ -490,10 +500,10 @@ diff -urNp munin-2.0.25.orig/node/bin/munindoc munin-2.0.25/node/bin/munindoc
              "$Munin::Common::Defaults::MUNIN_PERLLIB");
  
  File::Find::find({wanted => \&wanted_pod}, @DIRS);
              "$Munin::Common::Defaults::MUNIN_PERLLIB");
  
  File::Find::find({wanted => \&wanted_pod}, @DIRS);
-diff -urNp munin-2.0.25.orig/node/doc/munin-node.conf.pod munin-2.0.25/node/doc/munin-node.conf.pod
---- munin-2.0.25.orig/node/doc/munin-node.conf.pod     2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/doc/munin-node.conf.pod  2015-09-08 10:13:31.742593251 +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_private_key> <value>
  
  This directive sets the location of the private key to be used for
@@ -517,10 +527,10 @@ diff -urNp munin-2.0.25.orig/node/doc/munin-node.conf.pod munin-2.0.25/node/doc/
  
  =item B<tls_verify_depth> <value>
  
  
  =item B<tls_verify_depth> <value>
  
-diff -urNp munin-2.0.25.orig/node/extras/munin-node-simple.in munin-2.0.25/node/extras/munin-node-simple.in
---- munin-2.0.25.orig/node/extras/munin-node-simple.in 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/extras/munin-node-simple.in      2015-09-08 10:13:31.742593251 +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;
  
  
  $| = 1;
  
@@ -531,10 +541,10 @@ diff -urNp munin-2.0.25.orig/node/extras/munin-node-simple.in munin-2.0.25/node/
  my $version   = "@@VERSION@@";
  
  # Empty environment
  my $version   = "@@VERSION@@";
  
  # Empty environment
-diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Config.pm munin-2.0.25/node/lib/Munin/Node/Config.pm
---- munin-2.0.25.orig/node/lib/Munin/Node/Config.pm    2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/lib/Munin/Node/Config.pm 2015-09-08 10:13:31.743593251 +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 {
          my ($class) = @_;
  
          $instance ||= bless {
@@ -543,10 +553,10 @@ diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Config.pm munin-2.0.25/node/lib
          }, $class;
  
          return $instance;
          }, $class;
  
          return $instance;
-diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Server.pm munin-2.0.25/node/lib/Munin/Node/Server.pm
---- munin-2.0.25.orig/node/lib/Munin/Node/Server.pm    2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/lib/Munin/Node/Server.pm 2015-09-08 10:13:31.744593251 +0000
-@@ -263,11 +263,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 $mode = $session->{tls_mode};
  
      my $key        = $config->{tls_private_key}
@@ -561,22 +571,22 @@ diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Server.pm munin-2.0.25/node/lib
      my $tls_verify = $config->{tls_verify_certificate}
                    || 0;
      my $tls_match  = $config->{tls_match};
      my $tls_verify = $config->{tls_verify_certificate}
                    || 0;
      my $tls_match  = $config->{tls_match};
-diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Service.pm munin-2.0.25/node/lib/Munin/Node/Service.pm
---- munin-2.0.25.orig/node/lib/Munin/Node/Service.pm   2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/lib/Munin/Node/Service.pm        2015-09-08 10:13:31.744593251 +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";
  
      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 -urNp munin-2.0.25.orig/node/sbin/munin-node munin-2.0.25/node/sbin/munin-node
---- munin-2.0.25.orig/node/sbin/munin-node     2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/sbin/munin-node  2015-09-08 10:13:31.745593251 +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;
  use Munin::Node::Server;
  
  my $servicedir;
@@ -587,7 +597,7 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node munin-2.0.25/node/sbin/munin-n
  my $DEBUG    = 0;
  my $PIDEBUG  = 0;
  my $paranoia = 0;
  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<< --config <configfile> >>
  
@@ -596,7 +606,7 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node munin-2.0.25/node/sbin/munin-n
  
  =item B< --[no]paranoia >
  
  
  =item B< --[no]paranoia >
  
-@@ -187,9 +187,9 @@ may enable debugging. [--nopidebug]
+@@ -198,9 +198,9 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -609,10 +619,10 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node munin-2.0.25/node/sbin/munin-n
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
-diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sbin/munin-node-configure
---- munin-2.0.25.orig/node/sbin/munin-node-configure   2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/sbin/munin-node-configure        2015-09-08 10:13:31.745593251 +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
  {
  
  sub parse_args
  {
@@ -625,7 +635,7 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sb
        my $libdir     = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
  
        my $debug = 0;
        my $libdir     = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
  
        my $debug = 0;
-@@ -492,15 +492,15 @@ may enable debugging.
+@@ -487,15 +487,15 @@
  
  =item B<< --config <file> >>
  
  
  =item B<< --config <file> >>
  
@@ -644,7 +654,7 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sb
  
  =item B<< --libdir <dir> >>
  
  
  =item B<< --libdir <dir> >>
  
-@@ -648,9 +648,9 @@ not this works with any particular devic
+@@ -645,9 +645,9 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -657,10 +667,10 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-node-configure munin-2.0.25/node/sb
      @@LIBDIR@@/plugins/plugins.history
      @@LIBDIR@@/plugins/*
  
      @@LIBDIR@@/plugins/plugins.history
      @@LIBDIR@@/plugins/*
  
-diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-run
---- munin-2.0.25.orig/node/sbin/munin-run      2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/sbin/munin-run   2015-09-08 10:13:31.746593251 +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 $services;
  my $servicedir;
@@ -669,7 +679,7 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-ru
  my $DEBUG    = 0;
  my $PIDEBUG  = 0;
  my $paranoia = 0;
  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
  sub parse_args
  {
      # Default configuration values
@@ -677,8 +687,8 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-ru
 +    my $sconfdir   = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
      my $sconffile;
  
 +    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<< --config <configfile> >>
  
@@ -697,7 +707,7 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-ru
  
  =item B<< --sconffile <file> >>
  
  
  =item B<< --sconffile <file> >>
  
-@@ -230,9 +230,9 @@ Show version information.
+@@ -507,9 +507,9 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -710,46 +720,10 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-run munin-2.0.25/node/sbin/munin-ru
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
-diff -urNp munin-2.0.25.orig/node/sbin/munin-sched munin-2.0.25/node/sbin/munin-sched
---- munin-2.0.25.orig/node/sbin/munin-sched    2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/node/sbin/munin-sched 2015-09-08 10:13:31.747593251 +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 -urNp munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in munin-2.0.25/plugins/node.d/exim_mailqueue.in
---- munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/exim_mailqueue.in      2015-09-08 10:13:31.747593251 +0000
-@@ -15,7 +15,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
  
    [exim_*]
      user exim
  
@@ -758,10 +732,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/exim_mailqueue.in munin-2.0.25/plugi
  if you need to override the defaults below:
  
    [exim_mailqueue]
  if you need to override the defaults below:
  
    [exim_mailqueue]
-diff -urNp munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.25/plugins/node.d/ipmi_sensor_.in
---- munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in   2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/ipmi_sensor_.in        2015-09-08 10:13:31.747593251 +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.
  
  ipmitool probably needs to be run as root, and it may take more than
  10 seconds on some hosts.
  
@@ -770,7 +744,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.25/plugins
  
   [ipmi_sensor_*]
    user root
  
   [ipmi_sensor_*]
    user root
-@@ -49,7 +49,7 @@ with this program; if not, write to the
+@@ -49,7 +49,7 @@
  
  =head1 BUGS
  
  
  =head1 BUGS
  
@@ -779,7 +753,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.25/plugins
  variables.
  
  =head1 MAGIC MARKERS
  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
  CACHEDIR = environ['MUNIN_PLUGSTATE']
  CACHEFILE = "plugin-ipmi_sensor.cache"
  CACHEAGE = 120
@@ -787,11 +761,11 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.25/plugins
 +CONFIG = '@@NCONFDIR@@/ipmi'
  
  
 +CONFIG = '@@NCONFDIR@@/ipmi'
  
  
- 
-diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_innodb.in munin-2.0.25/plugins/node.d/mysql_innodb.in
---- munin-2.0.25.orig/plugins/node.d/mysql_innodb.in   2015-09-08 10:05:48.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/mysql_innodb.in        2015-09-08 10:13:31.748593251 +0000
-@@ -34,7 +34,7 @@ the default INNODB tablespace, do the fo
+ def normalize_sensor(name):
+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
  
  
  =head1 CONFIGURATION
  
@@ -800,10 +774,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_innodb.in munin-2.0.25/plugins
  if you need to override the defaults below:
  
   [mysql_innodb]
  if you need to override the defaults below:
  
   [mysql_innodb]
-diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.25/plugins/node.d/mysql_isam_space_.in
---- munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in      2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/mysql_isam_space_.in   2015-09-08 10:13:31.748593251 +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
  
  
  =head1 CONFIGURATION
  
@@ -812,10 +786,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.25/pl
  if you need to override the defaults below:
  
   [mysql_isam_space_*]
  if you need to override the defaults below:
  
   [mysql_isam_space_*]
-diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_threads.in munin-2.0.25/plugins/node.d/mysql_threads.in
---- munin-2.0.25.orig/plugins/node.d/mysql_threads.in  2015-09-08 10:05:48.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/mysql_threads.in       2015-09-08 10:13:31.748593251 +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
  
  
  =head1 CONFIGURATION
  
@@ -824,10 +798,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/mysql_threads.in munin-2.0.25/plugin
  need to override the defaults below:
  
   [mysql_threads]
  need to override the defaults below:
  
   [mysql_threads]
-diff -urNp munin-2.0.25.orig/plugins/node.d/named.in munin-2.0.25/plugins/node.d/named.in
---- munin-2.0.25.orig/plugins/node.d/named.in  2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/named.in       2015-09-08 10:13:31.749593251 +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
  
  
  =head1 CONFIGURATION
  
@@ -836,10 +810,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/named.in munin-2.0.25/plugins/node.d
  if you need to override the defaults below:
  
   [named]
  if you need to override the defaults below:
  
   [named]
-diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in
---- munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in    2015-09-08 10:05:48.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/ntp_kernel_pll_freq.in 2015-09-08 10:13:31.749593251 +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
  
  
  No configuration
  
@@ -848,21 +822,21 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.25/
  should contain a number to be added to the frequency read by ntpdc.
  
  =head1 AUTHORS
  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
  
      exit 0
  fi
  
--if [ -f @@CONFDIR@@/ntp-freq-comp ]; then
--    fcomp=`cat @@CONFDIR@@/ntp-freq-comp`
-+if [ -f @@NCONFDIR@@/ntp-freq-comp ]; then
-+    fcomp=`cat @@NCONFDIR@@/ntp-freq-comp`
+-if [ -f "@@CONFDIR@@/ntp-freq-comp" ]; then
+-    fcomp=$(cat "@@CONFDIR@@/ntp-freq-comp")
++if [ -f "@@NCONFDIR@@/ntp-freq-comp" ]; then
++    fcomp=$(cat "@@NCONFDIR@@/ntp-freq-comp")
  else
      fcomp=0
  fi
  else
      fcomp=0
  fi
-diff -urNp munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in munin-2.0.25/plugins/node.d/postfix_mailstats.in
---- munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in      2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/postfix_mailstats.in   2015-09-08 10:13:31.749593251 +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
  
  
  =head1 CONFIGURATION
  
@@ -871,10 +845,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/postfix_mailstats.in munin-2.0.25/pl
  if you need to override the defaults below:
  
   [postfix_mailstats]
  if you need to override the defaults below:
  
   [postfix_mailstats]
-diff -urNp munin-2.0.25.orig/plugins/node.d/psu_.in munin-2.0.25/plugins/node.d/psu_.in
---- munin-2.0.25.orig/plugins/node.d/psu_.in   2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/psu_.in        2015-09-08 10:13:31.750593251 +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:
  
  
  Example:
  
@@ -883,10 +857,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/psu_.in munin-2.0.25/plugins/node.d/
  
  ...will monitor the user "foo"
  
  
  ...will monitor the user "foo"
  
-diff -urNp munin-2.0.25.orig/plugins/node.d/squeezebox_.in munin-2.0.25/plugins/node.d/squeezebox_.in
---- munin-2.0.25.orig/plugins/node.d/squeezebox_.in    2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/squeezebox_.in 2015-09-08 10:13:31.750593251 +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
  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
@@ -895,10 +869,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/squeezebox_.in munin-2.0.25/plugins/
  
  Sample follows:
  
  
  Sample follows:
  
-diff -urNp munin-2.0.25.orig/plugins/node.d/varnish_.in munin-2.0.25/plugins/node.d/varnish_.in
---- munin-2.0.25.orig/plugins/node.d/varnish_.in       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d/varnish_.in    2015-09-08 10:13:31.750593251 +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_ \
  You can link them yourself with something like this:
  
    ln -s @@LIBDIR@@/plugins/varnish_ \
@@ -907,10 +881,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/varnish_.in munin-2.0.25/plugins/nod
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -urNp munin-2.0.25.orig/plugins/node.d.cygwin/df.in munin-2.0.25/plugins/node.d.cygwin/df.in
---- munin-2.0.25.orig/plugins/node.d.cygwin/df.in      2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.cygwin/df.in   2015-09-08 10:13:31.751593251 +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
  
  
  =head1 USAGE
  
@@ -919,10 +893,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.cygwin/df.in munin-2.0.25/plugins/no
  
  The plugin excludes per default the following special, read-only or
  dynamically allocating file systems from graphing:
  
  The plugin excludes per default the following special, read-only or
  dynamically allocating file systems from graphing:
-diff -urNp munin-2.0.25.orig/plugins/node.d.debug/if.in munin-2.0.25/plugins/node.d.debug/if.in
---- munin-2.0.25.orig/plugins/node.d.debug/if.in       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.debug/if.in    2015-09-08 10:13:31.751593251 +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 USAGE
  
@@ -931,10 +905,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.debug/if.in munin-2.0.25/plugins/nod
  
  =head1 MAGIC MARKERS
  
  
  =head1 MAGIC MARKERS
  
-diff -urNp munin-2.0.25.orig/plugins/node.d.debug/tc.in munin-2.0.25/plugins/node.d.debug/tc.in
---- munin-2.0.25.orig/plugins/node.d.debug/tc.in       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.debug/tc.in    2015-09-08 10:13:31.751593251 +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 USAGE
  
@@ -943,10 +917,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.debug/tc.in munin-2.0.25/plugins/nod
  
  =head1 MAGIC MARKERS
  
  
  =head1 MAGIC MARKERS
  
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/acpi.in munin-2.0.25/plugins/node.d.linux/acpi.in
---- munin-2.0.25.orig/plugins/node.d.linux/acpi.in     2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/acpi.in  2015-09-08 10:13:31.751593251 +0000
-@@ -17,7 +17,7 @@ Load the 'thermal_zone' kernel module an
+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 USAGE
  
@@ -955,10 +929,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/acpi.in munin-2.0.25/plugins/n
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/apt.in munin-2.0.25/plugins/node.d.linux/apt.in
---- munin-2.0.25.orig/plugins/node.d.linux/apt.in      2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/apt.in   2015-09-08 10:13:31.752593251 +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 USAGE
  
@@ -967,10 +941,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/apt.in munin-2.0.25/plugins/no
  
  =head1 NOTES
  
  
  =head1 NOTES
  
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df.in munin-2.0.25/plugins/node.d.linux/df.in
---- munin-2.0.25.orig/plugins/node.d.linux/df.in       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/df.in    2015-09-08 10:13:31.752593251 +0000
-@@ -28,7 +28,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
  
      env.warning 92
      env.critical 98
  
@@ -979,7 +953,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df.in munin-2.0.25/plugins/nod
  
  You may specify filesystem specific warning and critical levels:
  
  
  You may specify filesystem specific warning and critical levels:
  
-@@ -55,7 +55,7 @@ RE will not be included.
+@@ -58,7 +58,7 @@
  
  =head1 USAGE
  
  
  =head1 USAGE
  
@@ -988,10 +962,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df.in munin-2.0.25/plugins/nod
  
  =head1 MAGIC MARKERS
  
  
  =head1 MAGIC MARKERS
  
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df_inode.in munin-2.0.25/plugins/node.d.linux/df_inode.in
---- munin-2.0.25.orig/plugins/node.d.linux/df_inode.in 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/df_inode.in      2015-09-08 10:13:31.752593251 +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
  
      env.warning 92
      env.critical 98
  
@@ -1000,7 +974,7 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df_inode.in munin-2.0.25/plugi
  
  You may specify filesystem specific warning and critical levels:
  
  
  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 USAGE
  
@@ -1009,10 +983,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/df_inode.in munin-2.0.25/plugi
  
  =head1 MAGIC MARKERS
  
  
  =head1 MAGIC MARKERS
  
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.25/plugins/node.d.linux/fw_conntrack.in
---- munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in     2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/fw_conntrack.in  2015-09-08 10:13:31.753593251 +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
  
  
  =head2 CONFIGURATION EXAMPLE
  
@@ -1021,10 +995,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.25/p
  
   [fw_*]
    user root
  
   [fw_*]
    user root
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.25/plugins/node.d.linux/fw_forwarded_local.in
---- munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/fw_forwarded_local.in    2015-09-08 10:13:31.753593251 +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
  
  
  =head2 CONFIGURATION EXAMPLE
  
@@ -1033,10 +1007,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.
  
   [fw_*]
    user root
  
   [fw_*]
    user root
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in munin-2.0.25/plugins/node.d.linux/fw_packets.in
---- munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/fw_packets.in    2015-09-08 10:13:31.754593251 +0000
-@@ -11,7 +11,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
  
  
  =head1 CONFIGURATION EXAMPLE
  
@@ -1045,10 +1019,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/fw_packets.in munin-2.0.25/plu
  
   [fw*]
    user root
  
   [fw*]
    user root
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat.in munin-2.0.25/plugins/node.d.linux/iostat.in
---- munin-2.0.25.orig/plugins/node.d.linux/iostat.in   2015-09-08 10:05:55.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/iostat.in        2015-09-08 10:13:31.754593251 +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 USAGE
  
@@ -1057,10 +1031,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat.in munin-2.0.25/plugins
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.25/plugins/node.d.linux/iostat_ios.in
---- munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in       2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/iostat_ios.in    2015-09-08 10:13:31.754593251 +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 USAGE
  
@@ -1069,10 +1043,10 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.25/plu
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -urNp munin-2.0.25.orig/plugins/node.d.linux/irqstats.in munin-2.0.25/plugins/node.d.linux/irqstats.in
---- munin-2.0.25.orig/plugins/node.d.linux/irqstats.in 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/plugins/node.d.linux/irqstats.in      2015-09-08 10:13:31.754593251 +0000
-@@ -15,7 +15,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 USAGE
  
@@ -1081,9 +1055,9 @@ diff -urNp munin-2.0.25.orig/plugins/node.d.linux/irqstats.in munin-2.0.25/plugi
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -urNp munin-2.0.25.orig/resources/hpux-init.d_munin-node.in munin-2.0.25/resources/hpux-init.d_munin-node.in
---- munin-2.0.25.orig/resources/hpux-init.d_munin-node.in      2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/resources/hpux-init.d_munin-node.in   2015-09-08 10:13:31.755593251 +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
 @@ -6,7 +6,7 @@
  PATH=/sbin:/bin:/usr/sbin:/usr/bin
  NAME=munin-node
@@ -1093,19 +1067,19 @@ diff -urNp munin-2.0.25.orig/resources/hpux-init.d_munin-node.in munin-2.0.25/re
  RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE)
  PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE)
  MYCONF=/etc/rc.config.d/muninconf
  RUN_AS=$(awk '$1~/user/{print$2}' $CONFFILE)
  PIDFILE=$(awk '$1~/pid/{print$2}' $CONFFILE)
  MYCONF=/etc/rc.config.d/muninconf
-diff -urNp munin-2.0.25.orig/resources/linux-cron.d_munin-node.in munin-2.0.25/resources/linux-cron.d_munin-node.in
---- munin-2.0.25.orig/resources/linux-cron.d_munin-node.in     2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/resources/linux-cron.d_munin-node.in  2015-09-08 10:13:31.755593251 +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
  
  # 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 -urNp munin-2.0.25.orig/t/Makefile.config munin-2.0.25/t/Makefile.config
---- munin-2.0.25.orig/t/Makefile.config        2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/t/Makefile.config     2015-09-08 10:13:31.755593251 +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
  
 @@ -9,7 +9,8 @@
  PREFIX     = $(PWD)/t/install
  
Munin - the Linpro RRD data agent