]> 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 e5da670ba619614903b28f88fef872d462e935f0..b0d316236abd9a207e8db623564b6ce966369e91 100644 (file)
--- a/munin-separate-configs.patch
+++ b/munin-separate-configs.patch
@@ -1,7 +1,7 @@
-diff -ur munin-2.0.17/common/lib/Munin/Common/Defaults.pm munin-2.0.17-sep/common/lib/Munin/Common/Defaults.pm
---- munin-2.0.17/common/lib/Munin/Common/Defaults.pm   2013-08-17 12:26:06.386624187 +0200
-+++ munin-2.0.17-sep/common/lib/Munin/Common/Defaults.pm       2013-08-17 12:19:22.386149494 +0200
-@@ -18,7 +18,8 @@
+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,9 @@ diff -ur munin-2.0.17/common/lib/Munin/Common/Defaults.pm munin-2.0.17-sep/commo
  our $MUNIN_BINDIR     = '';
  our $MUNIN_SBINDIR    = '';
  our $MUNIN_DOCDIR     = '';
  our $MUNIN_BINDIR     = '';
  our $MUNIN_SBINDIR    = '';
  our $MUNIN_DOCDIR     = '';
-Only in munin-2.0.17/common/lib/Munin/Common: Defaults.pm.orig
-diff -ur munin-2.0.17/doc/installation/configuration.rst munin-2.0.17-sep/doc/installation/configuration.rst
---- munin-2.0.17/doc/installation/configuration.rst    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/doc/installation/configuration.rst        2013-08-17 12:23:16.773630125 +0200
+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 @@
  -------
  
 @@ -9,7 +9,7 @@
  -------
  
@@ -33,10 +32,10 @@ diff -ur munin-2.0.17/doc/installation/configuration.rst munin-2.0.17-sep/doc/in
  
  [node.example.com]
    address 192.0.2.4
  
  [node.example.com]
    address 192.0.2.4
-diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
---- munin-2.0.17/Makefile      2013-08-17 12:26:06.386624187 +0200
-+++ munin-2.0.17-sep/Makefile  2013-08-17 12:19:22.386149494 +0200
-@@ -56,7 +56,7 @@
+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
@@ -45,7 +44,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  
  tags:
        -rm -f TAGS
  
  tags:
        -rm -f TAGS
-@@ -71,14 +71,15 @@
+@@ -97,14 +97,15 @@
        mkdir -p $(LOGDIR)
        mkdir -p $(STATEDIR)
        mkdir -p $(SPOOLDIR)
        mkdir -p $(LOGDIR)
        mkdir -p $(STATEDIR)
        mkdir -p $(SPOOLDIR)
@@ -63,7 +62,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
        mkdir -p $(LIBDIR)
        mkdir -p $(BINDIR)
        mkdir -p $(SBINDIR)
        mkdir -p $(LIBDIR)
        mkdir -p $(BINDIR)
        mkdir -p $(SBINDIR)
-@@ -111,7 +112,7 @@
+@@ -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
@@ -72,8 +71,8 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/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 @@
- 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
@@ -88,9 +87,9 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/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 @@
+       @# 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
@@ -99,27 +98,37 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/Makefile
  
  
  install-common-prime: build-common install-common
  
  
  install-common-prime: build-common install-common
-@@ -220,7 +221,8 @@
+@@ -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'                      \
-@@ -261,7 +263,8 @@
- 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;      \
-@@ -388,7 +391,7 @@
+       $(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
@@ -128,7 +137,7 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/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;\
-@@ -396,10 +399,10 @@
+@@ -506,10 +510,10 @@
  endif
  
  node-monkeywrench: install-node
  endif
  
  node-monkeywrench: install-node
@@ -141,9 +150,9 @@ diff -ur munin-2.0.17/Makefile munin-2.0.17-sep/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 -ur munin-2.0.17/Makefile.config munin-2.0.17-sep/Makefile.config
---- munin-2.0.17/Makefile.config       2013-08-17 12:26:06.386624187 +0200
-+++ munin-2.0.17-sep/Makefile.config   2013-08-17 12:19:22.386149494 +0200
+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
  
@@ -154,12 +163,10 @@ diff -ur munin-2.0.17/Makefile.config munin-2.0.17-sep/Makefile.config
  
  # Server only - where to put munin-cron
  BINDIR     = $(PREFIX)/bin
  
  # Server only - where to put munin-cron
  BINDIR     = $(PREFIX)/bin
-Only in munin-2.0.17: Makefile.config.orig
-Only in munin-2.0.17: Makefile.orig
-diff -ur munin-2.0.17/master/_bin/munin-cgi-graph.in munin-2.0.17-sep/master/_bin/munin-cgi-graph.in
---- munin-2.0.17/master/_bin/munin-cgi-graph.in        2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-cgi-graph.in    2013-08-17 12:19:22.386149494 +0200
-@@ -44,7 +44,7 @@
+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";
@@ -168,10 +175,10 @@ diff -ur munin-2.0.17/master/_bin/munin-cgi-graph.in munin-2.0.17-sep/master/_bi
  
  my %period  = ( "day"   => 300,
                "week"  => 1800,
  
  my %period  = ( "day"   => 300,
                "week"  => 1800,
-diff -ur munin-2.0.17/master/_bin/munin-check.in munin-2.0.17-sep/master/_bin/munin-check.in
---- munin-2.0.17/master/_bin/munin-check.in    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-check.in        2013-08-17 12:19:22.386149494 +0200
-@@ -163,7 +163,7 @@
+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
  
@@ -180,10 +187,10 @@ diff -ur munin-2.0.17/master/_bin/munin-check.in munin-2.0.17-sep/master/_bin/mu
  
  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 -ur munin-2.0.17/master/_bin/munin-graph.in munin-2.0.17-sep/master/_bin/munin-graph.in
---- munin-2.0.17/master/_bin/munin-graph.in    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-graph.in        2013-08-17 12:19:22.386149494 +0200
-@@ -51,7 +51,7 @@
+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";
@@ -192,10 +199,10 @@ diff -ur munin-2.0.17/master/_bin/munin-graph.in munin-2.0.17-sep/master/_bin/mu
  
  my %period  = ( "day"   => 300,
                "week"  => 1800,
  
  my %period  = ( "day"   => 300,
                "week"  => 1800,
-diff -ur munin-2.0.17/master/_bin/munin-limits.in munin-2.0.17-sep/master/_bin/munin-limits.in
---- munin-2.0.17/master/_bin/munin-limits.in   2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-limits.in       2013-08-17 12:19:22.386149494 +0200
-@@ -66,7 +66,7 @@
+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> >>
  
@@ -204,7 +211,7 @@ diff -ur munin-2.0.17/master/_bin/munin-limits.in munin-2.0.17-sep/master/_bin/m
  
  =item B<< --always-send <severity list> >>
  
  
  =item B<< --always-send <severity list> >>
  
-@@ -114,7 +114,7 @@
+@@ -112,7 +112,7 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -213,10 +220,10 @@ diff -ur munin-2.0.17/master/_bin/munin-limits.in munin-2.0.17-sep/master/_bin/m
        @@DBDIR@@/*
        @@STATEDIR@@/*
  
        @@DBDIR@@/*
        @@STATEDIR@@/*
  
-diff -ur munin-2.0.17/master/_bin/munin-update.in munin-2.0.17-sep/master/_bin/munin-update.in
---- munin-2.0.17/master/_bin/munin-update.in   2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/_bin/munin-update.in       2013-08-17 12:19:22.386149494 +0200
-@@ -139,7 +139,7 @@
+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> >>
  
@@ -225,7 +232,7 @@ diff -ur munin-2.0.17/master/_bin/munin-update.in munin-2.0.17-sep/master/_bin/m
  
  =item B<< --[no]debug >>
  
  
  =item B<< --[no]debug >>
  
-@@ -192,7 +192,7 @@
+@@ -190,7 +190,7 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -234,9 +241,9 @@ diff -ur munin-2.0.17/master/_bin/munin-update.in munin-2.0.17-sep/master/_bin/m
        @@DBDIR@@/*
        @@LOGDIR@@/munin-update
        @@STATEDIR@@/*
        @@DBDIR@@/*
        @@LOGDIR@@/munin-update
        @@STATEDIR@@/*
-diff -ur munin-2.0.17/master/doc/munin.conf.pod.in munin-2.0.17-sep/master/doc/munin.conf.pod.in
---- munin-2.0.17/master/doc/munin.conf.pod.in  2013-08-17 12:26:06.386624187 +0200
-+++ munin-2.0.17-sep/master/doc/munin.conf.pod.in      2013-08-17 12:19:22.386149494 +0200
+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
 @@ -27,7 +27,7 @@
        [machine1.your.dom]
                address localhost
@@ -246,7 +253,7 @@ diff -ur munin-2.0.17/master/doc/munin.conf.pod.in munin-2.0.17-sep/master/doc/m
  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 @@
+@@ -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
@@ -270,10 +277,9 @@ diff -ur munin-2.0.17/master/doc/munin.conf.pod.in munin-2.0.17-sep/master/doc/m
  
  =item B<tls_verify_depth> <value>
  
  
  =item B<tls_verify_depth> <value>
  
-Only in munin-2.0.17/master/doc: munin.conf.pod.in.orig
-diff -ur munin-2.0.17/master/doc/munin-cron.pod.in munin-2.0.17-sep/master/doc/munin-cron.pod.in
---- munin-2.0.17/master/doc/munin-cron.pod.in  2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/doc/munin-cron.pod.in      2013-08-17 12:19:22.386149494 +0200
+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> >>
 @@ -22,7 +22,7 @@
  
  =item B<< --config <file> >>
@@ -283,10 +289,10 @@ diff -ur munin-2.0.17/master/doc/munin-cron.pod.in munin-2.0.17-sep/master/doc/m
  
  =back
  
  
  =back
  
-diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/extras/munin-update_old.in
---- munin-2.0.17/master/extras/munin-update_old.in     2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/extras/munin-update_old.in 2013-08-17 12:19:22.386149494 +0200
-@@ -43,7 +43,7 @@
+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;
@@ -295,7 +301,7 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
  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 @@
+@@ -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. 
@@ -304,7 +310,7 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
      --[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 @@
+@@ -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");
@@ -319,7 +325,7 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
             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 @@
+@@ -1087,7 +1087,7 @@
  
  =item B<< --config <file> >>
  
  
  =item B<< --config <file> >>
  
@@ -328,7 +334,7 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
  
  =item B<< --help >>
  
  
  =item B<< --help >>
  
-@@ -1124,7 +1124,7 @@
+@@ -1123,7 +1123,7 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -337,10 +343,10 @@ diff -ur munin-2.0.17/master/extras/munin-update_old.in munin-2.0.17-sep/master/
        @@DBDIR@@/*
        @@LOGDIR@@/munin-update
        @@STATEDIR@@/*
        @@DBDIR@@/*
        @@LOGDIR@@/munin-update
        @@STATEDIR@@/*
-diff -ur munin-2.0.17/master/lib/Munin/Master/Config.pm munin-2.0.17-sep/master/lib/Munin/Master/Config.pm
---- munin-2.0.17/master/lib/Munin/Master/Config.pm     2013-08-17 12:26:06.476625774 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/Config.pm 2013-08-17 12:19:22.386149494 +0200
-@@ -139,7 +139,7 @@
+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 ( {
@@ -349,9 +355,9 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/Config.pm munin-2.0.17-sep/master/
                dbdir            => $Munin::Common::Defaults::MUNIN_DBDIR,
                debug            => 0,
                fork             => 1,
                dbdir            => $Munin::Common::Defaults::MUNIN_DBDIR,
                debug            => 0,
                fork             => 1,
-@@ -153,9 +153,9 @@
-               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",
@@ -362,11 +368,10 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/Config.pm munin-2.0.17-sep/master/
                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",
-Only in munin-2.0.17/master/lib/Munin/Master: Config.pm.orig
-diff -ur munin-2.0.17/master/lib/Munin/Master/GraphOld.pm munin-2.0.17-sep/master/lib/Munin/Master/GraphOld.pm
---- munin-2.0.17/master/lib/Munin/Master/GraphOld.pm   2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/GraphOld.pm       2013-08-17 12:19:22.386149494 +0200
-@@ -90,7 +90,7 @@
+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;
@@ -375,9 +380,9 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/GraphOld.pm munin-2.0.17-sep/maste
  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 -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master/lib/Munin/Master/HTMLOld.pm
---- munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/HTMLOld.pm        2013-08-17 12:19:22.389482886 +0200
+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");
  
 @@ -81,7 +81,7 @@
  my @times = ("day", "week", "month", "year");
  
@@ -387,7 +392,7 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master
  my $do_usage   = 0;
  my $do_version = 0;
  my $stdout     = 0;
  my $do_usage   = 0;
  my $do_version = 0;
  my $stdout     = 0;
-@@ -857,7 +857,7 @@
+@@ -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. 
@@ -396,7 +401,7 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master
  
  ";
      exit 0;
  
  ";
      exit 0;
-@@ -892,7 +892,7 @@
+@@ -971,7 +971,7 @@
  
  =item B<< --config <file> >>
  
  
  =item B<< --config <file> >>
  
@@ -405,7 +410,7 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master
  
  =item B<< --help >>
  
  
  =item B<< --help >>
  
-@@ -915,7 +915,7 @@
+@@ -994,7 +994,7 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -414,10 +419,10 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/HTMLOld.pm munin-2.0.17-sep/master
        @@DBDIR@@/datafile
        @@LOGDIR@@/munin-html
        @@HTMLDIR@@/*
        @@DBDIR@@/datafile
        @@LOGDIR@@/munin-html
        @@HTMLDIR@@/*
-diff -ur munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm munin-2.0.17-sep/master/lib/Munin/Master/LimitsOld.pm
---- munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm  2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/LimitsOld.pm      2013-08-17 12:19:22.389482886 +0200
-@@ -52,7 +52,7 @@
+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;
@@ -426,7 +431,7 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm munin-2.0.17-sep/mast
  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 @@
+@@ -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. 
@@ -435,11 +440,10 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/LimitsOld.pm munin-2.0.17-sep/mast
  
  ";
      exit 0;
  
  ";
      exit 0;
-Only in munin-2.0.17/master/lib/Munin/Master: Node.pm.orig
-diff -ur munin-2.0.17/master/lib/Munin/Master/Utils.pm munin-2.0.17-sep/master/lib/Munin/Master/Utils.pm
---- munin-2.0.17/master/lib/Munin/Master/Utils.pm      2013-08-17 12:26:06.476625774 +0200
-+++ munin-2.0.17-sep/master/lib/Munin/Master/Utils.pm  2013-08-17 12:19:22.389482886 +0200
-@@ -115,7 +115,7 @@
+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 @@
        },
  };
  
        },
  };
  
@@ -448,10 +452,9 @@ diff -ur munin-2.0.17/master/lib/Munin/Master/Utils.pm munin-2.0.17-sep/master/l
  
  # 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");
-Only in munin-2.0.17/master/lib/Munin/Master: Utils.pm.orig
-diff -ur munin-2.0.17/master/munin.conf.in munin-2.0.17-sep/master/munin.conf.in
---- munin-2.0.17/master/munin.conf.in  2013-08-17 12:26:06.476625774 +0200
-+++ munin-2.0.17-sep/master/munin.conf.in      2013-08-17 12:19:22.389482886 +0200
+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
  
@@ -461,10 +464,9 @@ diff -ur munin-2.0.17/master/munin.conf.in munin-2.0.17-sep/master/munin.conf.in
  
  # 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"
-Only in munin-2.0.17/master: munin.conf.in.orig
-diff -ur munin-2.0.17/master/t/munin_master_config.t munin-2.0.17-sep/master/t/munin_master_config.t
---- munin-2.0.17/master/t/munin_master_config.t        2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/t/munin_master_config.t    2013-08-17 12:23:31.933897977 +0200
+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 @@
      },
  
 @@ -24,7 +24,7 @@
      },
  
@@ -474,9 +476,9 @@ diff -ur munin-2.0.17/master/t/munin_master_config.t munin-2.0.17-sep/master/t/m
          dbdir           => '/opt/munin/sandbox/var/opt/munin',
          debug           => 0,
          fork            => 1,
          dbdir           => '/opt/munin/sandbox/var/opt/munin',
          debug           => 0,
          fork            => 1,
-diff -ur munin-2.0.17/master/www/munin-htaccess.in munin-2.0.17-sep/master/www/munin-htaccess.in
---- munin-2.0.17/master/www/munin-htaccess.in  2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/master/www/munin-htaccess.in      2013-08-17 12:19:22.389482886 +0200
+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@@>
@@ -486,9 +488,9 @@ diff -ur munin-2.0.17/master/www/munin-htaccess.in munin-2.0.17-sep/master/www/m
  AuthName "Munin"
  AuthType Basic
  require valid-user
  AuthName "Munin"
  AuthType Basic
  require valid-user
-diff -ur munin-2.0.17/node/bin/munindoc munin-2.0.17-sep/node/bin/munindoc
---- munin-2.0.17/node/bin/munindoc     2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/bin/munindoc 2013-08-17 12:19:22.389482886 +0200
+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.
 @@ -48,7 +48,7 @@
  
  # Dirs in which to look for $plugin.pod and $plugin files.
@@ -498,9 +500,9 @@ diff -ur munin-2.0.17/node/bin/munindoc munin-2.0.17-sep/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 -ur munin-2.0.17/node/doc/munin-node.conf.pod munin-2.0.17-sep/node/doc/munin-node.conf.pod
---- munin-2.0.17/node/doc/munin-node.conf.pod  2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/doc/munin-node.conf.pod      2013-08-17 12:24:04.784478220 +0200
+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>
  
 @@ -91,20 +91,20 @@
  =item B<tls_private_key> <value>
  
@@ -525,9 +527,9 @@ diff -ur munin-2.0.17/node/doc/munin-node.conf.pod munin-2.0.17-sep/node/doc/mun
  
  =item B<tls_verify_depth> <value>
  
  
  =item B<tls_verify_depth> <value>
  
-diff -ur munin-2.0.17/node/extras/munin-node-simple.in munin-2.0.17-sep/node/extras/munin-node-simple.in
---- munin-2.0.17/node/extras/munin-node-simple.in      2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/extras/munin-node-simple.in  2013-08-17 12:19:22.389482886 +0200
+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;
 @@ -28,8 +28,8 @@
  
  $| = 1;
@@ -539,10 +541,10 @@ diff -ur munin-2.0.17/node/extras/munin-node-simple.in munin-2.0.17-sep/node/ext
  my $version   = "@@VERSION@@";
  
  # Empty environment
  my $version   = "@@VERSION@@";
  
  # Empty environment
-diff -ur munin-2.0.17/node/lib/Munin/Node/Config.pm munin-2.0.17-sep/node/lib/Munin/Node/Config.pm
---- munin-2.0.17/node/lib/Munin/Node/Config.pm 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/lib/Munin/Node/Config.pm     2013-08-17 12:19:22.389482886 +0200
-@@ -25,7 +25,7 @@
+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 {
@@ -551,10 +553,10 @@ diff -ur munin-2.0.17/node/lib/Munin/Node/Config.pm munin-2.0.17-sep/node/lib/Mu
          }, $class;
  
          return $instance;
          }, $class;
  
          return $instance;
-diff -ur munin-2.0.17/node/lib/Munin/Node/Server.pm munin-2.0.17-sep/node/lib/Munin/Node/Server.pm
---- munin-2.0.17/node/lib/Munin/Node/Server.pm 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/lib/Munin/Node/Server.pm     2013-08-17 12:19:22.389482886 +0200
-@@ -263,11 +263,11 @@
+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}
@@ -569,22 +571,22 @@ diff -ur munin-2.0.17/node/lib/Munin/Node/Server.pm munin-2.0.17-sep/node/lib/Mu
      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 -ur munin-2.0.17/node/lib/Munin/Node/Service.pm munin-2.0.17-sep/node/lib/Munin/Node/Service.pm
---- munin-2.0.17/node/lib/Munin/Node/Service.pm        2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/lib/Munin/Node/Service.pm    2013-08-17 12:24:22.264786886 +0200
-@@ -22,7 +22,7 @@
+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 -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
---- munin-2.0.17/node/sbin/munin-node  2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/sbin/munin-node      2013-08-17 12:19:22.389482886 +0200
-@@ -36,8 +36,8 @@
+     $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;
@@ -595,7 +597,7 @@ diff -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
  my $DEBUG    = 0;
  my $PIDEBUG  = 0;
  my $paranoia = 0;
  my $DEBUG    = 0;
  my $PIDEBUG  = 0;
  my $paranoia = 0;
-@@ -164,7 +164,7 @@
+@@ -175,7 +175,7 @@
  
  =item B<< --config <configfile> >>
  
  
  =item B<< --config <configfile> >>
  
@@ -604,7 +606,7 @@ diff -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
  
  =item B< --[no]paranoia >
  
  
  =item B< --[no]paranoia >
  
-@@ -187,9 +187,9 @@
+@@ -198,9 +198,9 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -617,9 +619,9 @@ diff -ur munin-2.0.17/node/sbin/munin-node munin-2.0.17-sep/node/sbin/munin-node
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
-diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/munin-node-configure
---- munin-2.0.17/node/sbin/munin-node-configure        2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/sbin/munin-node-configure    2013-08-17 12:19:22.489484658 +0200
+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
 @@ -76,9 +76,9 @@
  
  sub parse_args
@@ -633,7 +635,7 @@ diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/
        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 @@
+@@ -487,15 +487,15 @@
  
  =item B<< --config <file> >>
  
  
  =item B<< --config <file> >>
  
@@ -652,7 +654,7 @@ diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/
  
  =item B<< --libdir <dir> >>
  
  
  =item B<< --libdir <dir> >>
  
-@@ -648,9 +648,9 @@
+@@ -645,9 +645,9 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -665,10 +667,10 @@ diff -ur munin-2.0.17/node/sbin/munin-node-configure munin-2.0.17-sep/node/sbin/
      @@LIBDIR@@/plugins/plugins.history
      @@LIBDIR@@/plugins/*
  
      @@LIBDIR@@/plugins/plugins.history
      @@LIBDIR@@/plugins/*
  
-diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
---- munin-2.0.17/node/sbin/munin-run   2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/sbin/munin-run       2013-08-17 12:19:22.489484658 +0200
-@@ -35,7 +35,7 @@
+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;
@@ -677,7 +679,7 @@ diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
  my $DEBUG    = 0;
  my $PIDEBUG  = 0;
  my $paranoia = 0;
  my $DEBUG    = 0;
  my $PIDEBUG  = 0;
  my $paranoia = 0;
-@@ -98,7 +98,7 @@
+@@ -341,7 +341,7 @@
  sub parse_args
  {
      # Default configuration values
  sub parse_args
  {
      # Default configuration values
@@ -685,8 +687,8 @@ diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
 +    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 @@
+     my ($plugin, $arg, @extra_args);
+@@ -435,15 +435,15 @@
  
  =item B<< --config <configfile> >>
  
  
  =item B<< --config <configfile> >>
  
@@ -705,7 +707,7 @@ diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
  
  =item B<< --sconffile <file> >>
  
  
  =item B<< --sconffile <file> >>
  
-@@ -230,9 +230,9 @@
+@@ -507,9 +507,9 @@
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -718,46 +720,10 @@ diff -ur munin-2.0.17/node/sbin/munin-run munin-2.0.17-sep/node/sbin/munin-run
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
      @@STATEDIR@@/munin-node.pid
      @@LOGDIR@@/munin-node.log
  
-diff -ur munin-2.0.17/node/sbin/munin-sched munin-2.0.17-sep/node/sbin/munin-sched
---- munin-2.0.17/node/sbin/munin-sched 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/node/sbin/munin-sched     2013-08-17 12:24:54.562023692 +0200
-@@ -34,8 +34,8 @@
- 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 @@
- 
- =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 @@
- 
- =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 -ur munin-2.0.17/plugins/node.d/exim_mailqueue.in munin-2.0.17-sep/plugins/node.d/exim_mailqueue.in
---- munin-2.0.17/plugins/node.d/exim_mailqueue.in      2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/exim_mailqueue.in  2013-08-17 12:19:22.489484658 +0200
-@@ -15,7 +15,7 @@
+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
  
@@ -766,9 +732,9 @@ diff -ur munin-2.0.17/plugins/node.d/exim_mailqueue.in munin-2.0.17-sep/plugins/
  if you need to override the defaults below:
  
    [exim_mailqueue]
  if you need to override the defaults below:
  
    [exim_mailqueue]
-diff -ur munin-2.0.17/plugins/node.d/ipmi_sensor_.in munin-2.0.17-sep/plugins/node.d/ipmi_sensor_.in
---- munin-2.0.17/plugins/node.d/ipmi_sensor_.in        2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/ipmi_sensor_.in    2013-08-17 12:19:22.489484658 +0200
+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.
 @@ -17,7 +17,7 @@
  ipmitool probably needs to be run as root, and it may take more than
  10 seconds on some hosts.
@@ -788,17 +754,17 @@ diff -ur munin-2.0.17/plugins/node.d/ipmi_sensor_.in munin-2.0.17-sep/plugins/no
  
  =head1 MAGIC MARKERS
 @@ -72,7 +72,7 @@
  
  =head1 MAGIC MARKERS
 @@ -72,7 +72,7 @@
- CACHEDIR = os.environ['MUNIN_PLUGSTATE']
+ CACHEDIR = environ['MUNIN_PLUGSTATE']
  CACHEFILE = "plugin-ipmi_sensor.cache"
  CACHEAGE = 120
 -CONFIG = '@@CONFDIR@@/ipmi'
 +CONFIG = '@@NCONFDIR@@/ipmi'
  
  
  CACHEFILE = "plugin-ipmi_sensor.cache"
  CACHEAGE = 120
 -CONFIG = '@@CONFDIR@@/ipmi'
 +CONFIG = '@@NCONFDIR@@/ipmi'
  
  
- 
-diff -ur munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-sep/plugins/node.d/mysql_innodb.in
---- munin-2.0.17/plugins/node.d/mysql_innodb.in        2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/mysql_innodb.in    2013-08-17 12:19:22.489484658 +0200
+ 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
 @@ -34,7 +34,7 @@
  
  =head1 CONFIGURATION
@@ -808,9 +774,9 @@ diff -ur munin-2.0.17/plugins/node.d/mysql_innodb.in munin-2.0.17-sep/plugins/no
  if you need to override the defaults below:
  
   [mysql_innodb]
  if you need to override the defaults below:
  
   [mysql_innodb]
-diff -ur munin-2.0.17/plugins/node.d/mysql_isam_space_.in munin-2.0.17-sep/plugins/node.d/mysql_isam_space_.in
---- munin-2.0.17/plugins/node.d/mysql_isam_space_.in   2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/mysql_isam_space_.in       2013-08-17 12:19:22.489484658 +0200
+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
 @@ -8,7 +8,7 @@
  
  =head1 CONFIGURATION
@@ -820,9 +786,9 @@ diff -ur munin-2.0.17/plugins/node.d/mysql_isam_space_.in munin-2.0.17-sep/plugi
  if you need to override the defaults below:
  
   [mysql_isam_space_*]
  if you need to override the defaults below:
  
   [mysql_isam_space_*]
-diff -ur munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-sep/plugins/node.d/mysql_threads.in
---- munin-2.0.17/plugins/node.d/mysql_threads.in       2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/mysql_threads.in   2013-08-17 12:19:22.489484658 +0200
+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
 @@ -9,7 +9,7 @@
  
  =head1 CONFIGURATION
@@ -832,9 +798,9 @@ diff -ur munin-2.0.17/plugins/node.d/mysql_threads.in munin-2.0.17-sep/plugins/n
  need to override the defaults below:
  
   [mysql_threads]
  need to override the defaults below:
  
   [mysql_threads]
-diff -ur munin-2.0.17/plugins/node.d/named.in munin-2.0.17-sep/plugins/node.d/named.in
---- munin-2.0.17/plugins/node.d/named.in       2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/named.in   2013-08-17 12:19:22.489484658 +0200
+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
 @@ -34,7 +34,7 @@
  
  =head1 CONFIGURATION
@@ -844,9 +810,9 @@ diff -ur munin-2.0.17/plugins/node.d/named.in munin-2.0.17-sep/plugins/node.d/na
  if you need to override the defaults below:
  
   [named]
  if you need to override the defaults below:
  
   [named]
-diff -ur munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-sep/plugins/node.d/ntp_kernel_pll_freq.in
---- munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/ntp_kernel_pll_freq.in     2013-08-17 12:19:22.489484658 +0200
+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
 @@ -12,7 +12,7 @@
  
  No configuration
@@ -856,20 +822,20 @@ diff -ur munin-2.0.17/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.17-sep/plu
  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 @@
+@@ -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 -ur munin-2.0.17/plugins/node.d/postfix_mailstats.in munin-2.0.17-sep/plugins/node.d/postfix_mailstats.in
---- munin-2.0.17/plugins/node.d/postfix_mailstats.in   2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/postfix_mailstats.in       2013-08-17 12:19:22.489484658 +0200
+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
 @@ -8,7 +8,7 @@
  
  =head1 CONFIGURATION
@@ -879,9 +845,9 @@ diff -ur munin-2.0.17/plugins/node.d/postfix_mailstats.in munin-2.0.17-sep/plugi
  if you need to override the defaults below:
  
   [postfix_mailstats]
  if you need to override the defaults below:
  
   [postfix_mailstats]
-diff -ur munin-2.0.17/plugins/node.d/psu_.in munin-2.0.17-sep/plugins/node.d/psu_.in
---- munin-2.0.17/plugins/node.d/psu_.in        2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/psu_.in    2013-08-17 12:19:22.489484658 +0200
+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:
 @@ -15,7 +15,7 @@
  
  Example:
@@ -891,9 +857,9 @@ diff -ur munin-2.0.17/plugins/node.d/psu_.in munin-2.0.17-sep/plugins/node.d/psu
  
  ...will monitor the user "foo"
  
  
  ...will monitor the user "foo"
  
-diff -ur munin-2.0.17/plugins/node.d/squeezebox_.in munin-2.0.17-sep/plugins/node.d/squeezebox_.in
---- munin-2.0.17/plugins/node.d/squeezebox_.in 2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/squeezebox_.in     2013-08-17 12:19:22.489484658 +0200
+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
 @@ -20,7 +20,7 @@
  non-default configuration, please use the environment variables
  'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
@@ -903,9 +869,9 @@ diff -ur munin-2.0.17/plugins/node.d/squeezebox_.in munin-2.0.17-sep/plugins/nod
  
  Sample follows:
  
  
  Sample follows:
  
-diff -ur munin-2.0.17/plugins/node.d/varnish_.in munin-2.0.17-sep/plugins/node.d/varnish_.in
---- munin-2.0.17/plugins/node.d/varnish_.in    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d/varnish_.in        2013-08-17 12:19:22.492818051 +0200
+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:
  
 @@ -54,7 +54,7 @@
  You can link them yourself with something like this:
  
@@ -915,9 +881,9 @@ diff -ur munin-2.0.17/plugins/node.d/varnish_.in munin-2.0.17-sep/plugins/node.d
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/plugins/node.d.cygwin/df.in munin-2.0.17-sep/plugins/node.d.cygwin/df.in
---- munin-2.0.17/plugins/node.d.cygwin/df.in   2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.cygwin/df.in       2013-08-17 12:25:08.005594281 +0200
+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
 @@ -13,7 +13,7 @@
  
  =head1 USAGE
@@ -927,9 +893,9 @@ diff -ur munin-2.0.17/plugins/node.d.cygwin/df.in munin-2.0.17-sep/plugins/node.
  
  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 -ur munin-2.0.17/plugins/node.d.debug/if.in munin-2.0.17-sep/plugins/node.d.debug/if.in
---- munin-2.0.17/plugins/node.d.debug/if.in    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.debug/if.in        2013-08-17 12:25:17.379093018 +0200
+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
 @@ -21,7 +21,7 @@
  
  =head1 USAGE
@@ -939,9 +905,9 @@ diff -ur munin-2.0.17/plugins/node.d.debug/if.in munin-2.0.17-sep/plugins/node.d
  
  =head1 MAGIC MARKERS
  
  
  =head1 MAGIC MARKERS
  
-diff -ur munin-2.0.17/plugins/node.d.debug/tc.in munin-2.0.17-sep/plugins/node.d.debug/tc.in
---- munin-2.0.17/plugins/node.d.debug/tc.in    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.debug/tc.in        2013-08-17 12:25:26.375918427 +0200
+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
 @@ -21,7 +21,7 @@
  
  =head1 USAGE
@@ -951,9 +917,9 @@ diff -ur munin-2.0.17/plugins/node.d.debug/tc.in munin-2.0.17-sep/plugins/node.d
  
  =head1 MAGIC MARKERS
  
  
  =head1 MAGIC MARKERS
  
-diff -ur munin-2.0.17/plugins/node.d.linux/acpi.in munin-2.0.17-sep/plugins/node.d.linux/acpi.in
---- munin-2.0.17/plugins/node.d.linux/acpi.in  2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/acpi.in      2013-08-17 12:19:22.492818051 +0200
+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
 @@ -17,7 +17,7 @@
  
  =head1 USAGE
@@ -963,9 +929,9 @@ diff -ur munin-2.0.17/plugins/node.d.linux/acpi.in munin-2.0.17-sep/plugins/node
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/plugins/node.d.linux/apt.in munin-2.0.17-sep/plugins/node.d.linux/apt.in
---- munin-2.0.17/plugins/node.d.linux/apt.in   2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/apt.in       2013-08-17 12:19:22.492818051 +0200
+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
 @@ -38,7 +38,7 @@
  
  =head1 USAGE
@@ -975,10 +941,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/apt.in munin-2.0.17-sep/plugins/node.
  
  =head1 NOTES
  
  
  =head1 NOTES
  
-diff -ur munin-2.0.17/plugins/node.d.linux/df.in munin-2.0.17-sep/plugins/node.d.linux/df.in
---- munin-2.0.17/plugins/node.d.linux/df.in    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/df.in        2013-08-17 12:19:22.492818051 +0200
-@@ -28,7 +28,7 @@
+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
  
@@ -987,7 +953,7 @@ diff -ur munin-2.0.17/plugins/node.d.linux/df.in munin-2.0.17-sep/plugins/node.d
  
  You may specify filesystem specific warning and critical levels:
  
  
  You may specify filesystem specific warning and critical levels:
  
-@@ -55,7 +55,7 @@
+@@ -58,7 +58,7 @@
  
  =head1 USAGE
  
  
  =head1 USAGE
  
@@ -996,9 +962,9 @@ diff -ur munin-2.0.17/plugins/node.d.linux/df.in munin-2.0.17-sep/plugins/node.d
  
  =head1 MAGIC MARKERS
  
  
  =head1 MAGIC MARKERS
  
-diff -ur munin-2.0.17/plugins/node.d.linux/df_inode.in munin-2.0.17-sep/plugins/node.d.linux/df_inode.in
---- munin-2.0.17/plugins/node.d.linux/df_inode.in      2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/df_inode.in  2013-08-17 12:25:37.609449943 +0200
+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
 @@ -28,7 +28,7 @@
      env.warning 92
      env.critical 98
@@ -1017,9 +983,9 @@ diff -ur munin-2.0.17/plugins/node.d.linux/df_inode.in munin-2.0.17-sep/plugins/
  
  =head1 MAGIC MARKERS
  
  
  =head1 MAGIC MARKERS
  
-diff -ur munin-2.0.17/plugins/node.d.linux/fw_conntrack.in munin-2.0.17-sep/plugins/node.d.linux/fw_conntrack.in
---- munin-2.0.17/plugins/node.d.linux/fw_conntrack.in  2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/fw_conntrack.in      2013-08-17 12:19:22.492818051 +0200
+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
 @@ -11,7 +11,7 @@
  
  =head2 CONFIGURATION EXAMPLE
@@ -1029,9 +995,9 @@ diff -ur munin-2.0.17/plugins/node.d.linux/fw_conntrack.in munin-2.0.17-sep/plug
  
   [fw_*]
    user root
  
   [fw_*]
    user root
-diff -ur munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.17-sep/plugins/node.d.linux/fw_forwarded_local.in
---- munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/fw_forwarded_local.in        2013-08-17 12:19:22.492818051 +0200
+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
 @@ -10,7 +10,7 @@
  
  =head2 CONFIGURATION EXAMPLE
@@ -1041,10 +1007,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.17-se
  
   [fw_*]
    user root
  
   [fw_*]
    user root
-diff -ur munin-2.0.17/plugins/node.d.linux/fw_packets.in munin-2.0.17-sep/plugins/node.d.linux/fw_packets.in
---- munin-2.0.17/plugins/node.d.linux/fw_packets.in    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/fw_packets.in        2013-08-17 12:19:22.492818051 +0200
-@@ -11,7 +11,7 @@
+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
  
@@ -1053,9 +1019,9 @@ diff -ur munin-2.0.17/plugins/node.d.linux/fw_packets.in munin-2.0.17-sep/plugin
  
   [fw*]
    user root
  
   [fw*]
    user root
-diff -ur munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-sep/plugins/node.d.linux/iostat.in
---- munin-2.0.17/plugins/node.d.linux/iostat.in        2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/iostat.in    2013-08-17 12:19:22.492818051 +0200
+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
 @@ -24,7 +24,7 @@
  
  =head1 USAGE
@@ -1065,9 +1031,9 @@ diff -ur munin-2.0.17/plugins/node.d.linux/iostat.in munin-2.0.17-sep/plugins/no
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/plugins/node.d.linux/iostat_ios.in munin-2.0.17-sep/plugins/node.d.linux/iostat_ios.in
---- munin-2.0.17/plugins/node.d.linux/iostat_ios.in    2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/iostat_ios.in        2013-08-17 12:19:22.492818051 +0200
+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
 @@ -15,7 +15,7 @@
  
  =head1 USAGE
@@ -1077,10 +1043,10 @@ diff -ur munin-2.0.17/plugins/node.d.linux/iostat_ios.in munin-2.0.17-sep/plugin
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/plugins/node.d.linux/irqstats.in munin-2.0.17-sep/plugins/node.d.linux/irqstats.in
---- munin-2.0.17/plugins/node.d.linux/irqstats.in      2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/plugins/node.d.linux/irqstats.in  2013-08-17 12:19:22.492818051 +0200
-@@ -15,7 +15,7 @@
+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
  
@@ -1089,9 +1055,9 @@ diff -ur munin-2.0.17/plugins/node.d.linux/irqstats.in munin-2.0.17-sep/plugins/
  
  =head1 INTERPRETATION
  
  
  =head1 INTERPRETATION
  
-diff -ur munin-2.0.17/resources/hpux-init.d_munin-node.in munin-2.0.17-sep/resources/hpux-init.d_munin-node.in
---- munin-2.0.17/resources/hpux-init.d_munin-node.in   2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/resources/hpux-init.d_munin-node.in       2013-08-17 12:19:22.492818051 +0200
+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
@@ -1101,9 +1067,9 @@ diff -ur munin-2.0.17/resources/hpux-init.d_munin-node.in munin-2.0.17-sep/resou
  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 -ur munin-2.0.17/resources/linux-cron.d_munin-node.in munin-2.0.17-sep/resources/linux-cron.d_munin-node.in
---- munin-2.0.17/resources/linux-cron.d_munin-node.in  2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/resources/linux-cron.d_munin-node.in      2013-08-17 12:19:22.492818051 +0200
+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
 @@ -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
@@ -1111,9 +1077,9 @@ diff -ur munin-2.0.17/resources/linux-cron.d_munin-node.in munin-2.0.17-sep/reso
 -*/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
  
 -*/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 -ur munin-2.0.17/t/Makefile.config munin-2.0.17-sep/t/Makefile.config
---- munin-2.0.17/t/Makefile.config     2013-07-19 18:30:03.000000000 +0200
-+++ munin-2.0.17-sep/t/Makefile.config 2013-08-17 12:19:22.492818051 +0200
+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