]> 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
- updated to 2.0.42
[packages/munin.git] / munin-separate-configs.patch
diff --git a/munin-separate-configs.patch b/munin-separate-configs.patch
index b247733cd6ad67a13682e2aa5516277e44487f89..8e17281db15a7aaf568c31256c1aed60e00df761 100644 (file)
--- a/munin-separate-configs.patch
+++ b/munin-separate-configs.patch
@@ -1,6 +1,6 @@
-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
+diff -urNpa munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.42/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.42.orig/common/lib/Munin/Common/Defaults.pm      2018-10-11 15:24:44.276033000 +0000
++++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm   2018-10-11 15:25:02.395033000 +0000
 @@ -18,7 +18,8 @@ my $COMPONENT_ROOT = dirname(__FILE__) .
  our $DROPDOWNLIMIT     = 1;
  
 @@ -18,7 +18,8 @@ my $COMPONENT_ROOT = dirname(__FILE__) .
  our $DROPDOWNLIMIT     = 1;
  
@@ -11,9 +11,9 @@ 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
+diff -urNpa munin-2.0.42.orig/doc/installation/configuration.rst munin-2.0.42/doc/installation/configuration.rst
+--- munin-2.0.42.orig/doc/installation/configuration.rst       2018-10-11 15:24:44.284033000 +0000
++++ munin-2.0.42/doc/installation/configuration.rst    2018-10-11 15:25:02.395033000 +0000
 @@ -9,7 +9,7 @@ Plugins
  -------
  
 @@ -9,7 +9,7 @@ Plugins
  -------
  
@@ -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 -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile
+--- munin-2.0.42.orig/Makefile 2018-10-11 15:24:44.275033000 +0000
++++ munin-2.0.42/Makefile      2018-10-11 16:29:37.518033000 +0000
+@@ -81,7 +81,7 @@ uninstall:
  # 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
+@@ -96,14 +96,15 @@ install-pre: Makefile Makefile.config
        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)
+@@ -136,7 +137,7 @@ install-master-prime: $(INFILES_MASTER)
        $(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,7 +71,7 @@ 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
+@@ -157,14 +158,14 @@ install-node-plugins: install-plugins-pr
  install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
        @$(CHECKGROUP)
  
  install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
        @$(CHECKGROUP)
  
@@ -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.
+@@ -204,7 +205,7 @@ install-async:
  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
+@@ -240,7 +241,8 @@ build/%: %.in
        @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' \
+@@ -283,7 +285,8 @@ $(CONFVAR_SUBSTITUTION_DEP_FILES): build
+ 
+ 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;' \
+@@ -339,7 +342,8 @@ common/blib/lib/Munin/Common/Defaults.pm
+ 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; \
+@@ -493,7 +497,7 @@ old-test: t/*.t
        $(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 $(
+@@ -501,10 +505,10 @@ old-test: t/*.t t/install $(addprefix $(
  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 -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config
+--- munin-2.0.42.orig/Makefile.config  2018-10-11 15:24:44.282033000 +0000
++++ munin-2.0.42/Makefile.config       2018-10-11 15:25:02.396033000 +0000
 @@ -20,7 +20,8 @@
  PREFIX     = $(DESTDIR)/usr
  
 @@ -20,7 +20,8 @@
  PREFIX     = $(DESTDIR)/usr
  
@@ -153,9 +163,33 @@ 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
+diff -urNpa munin-2.0.42.orig/Makefile.rej munin-2.0.42/Makefile.rej
+--- munin-2.0.42.orig/Makefile.rej     2018-10-11 15:24:44.282033000 +0000
++++ munin-2.0.42/Makefile.rej  1970-01-01 00:00:00.000000000 +0000
+@@ -1,20 +0,0 @@
+---- Makefile  2015-09-08 10:02:24.000000000 +0000
+-+++ Makefile  2015-09-08 10:12:45.899593251 +0000
+-@@ -249,6 +249,7 @@ build/%: %.in
+-              -e 's|@@GOODSH@@|$(GOODSH)|g'                      \
+-              -e 's|@@BASH@@|$(BASH)|g'                          \
+-              -e 's|@@HASSETR@@|$(HASSETR)|g'                    \
+-+             -e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g'            \
+-              $< > $@;
+- 
+- 
+-@@ -326,7 +327,8 @@ common/blib/lib/Munin/Common/Defaults.pm
+-                   s{(PLUGINUSER      \s+=\s).*}{\1q{$(PLUGINUSER)};}x;  \
+-                   s{(GOODSH  \s+=\s).*}{\1q{$(GOODSH)};}x;      \
+-                   s{(BASH    \s+=\s).*}{\1q{$(BASH)};}x;        \
+--                  s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;'    \
+-+                  s{(HASSETR \s+=\s).*}{\1q{$(HASSETR)};}x;     \
+-+                  s{(TEMPLATEDIR \s+=\s).*}{\1q{$(TEMPLATEDIR)};}x;'\
+-                   $< > $@
+- 
+- build-doc: build-doc-stamp Makefile Makefile.config
+diff -urNpa munin-2.0.42.orig/master/_bin/munin-cgi-graph.in munin-2.0.42/master/_bin/munin-cgi-graph.in
+--- munin-2.0.42.orig/master/_bin/munin-cgi-graph.in   2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/_bin/munin-cgi-graph.in        2018-10-11 15:25:02.396033000 +0000
 @@ -44,7 +44,7 @@ use Munin::Master::Logger;
  use Log::Log4perl qw( :easy );
  
 @@ -44,7 +44,7 @@ use Munin::Master::Logger;
  use Log::Log4perl qw( :easy );
  
@@ -165,9 +199,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/_bin/munin-check.in munin-2.0.42/master/_bin/munin-check.in
+--- munin-2.0.42.orig/master/_bin/munin-check.in       2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/_bin/munin-check.in    2018-10-11 15:25:02.396033000 +0000
 @@ -163,7 +163,7 @@ done
  norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
  norec=yes perm_ok @@PLUGSTATE@@ 775
 @@ -163,7 +163,7 @@ done
  norec=yes owner_ok @@PLUGSTATE@@ @@PLUGINUSER@@
  norec=yes perm_ok @@PLUGSTATE@@ 775
@@ -177,9 +211,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/_bin/munin-graph.in munin-2.0.42/master/_bin/munin-graph.in
+--- munin-2.0.42.orig/master/_bin/munin-graph.in       2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/_bin/munin-graph.in    2018-10-11 15:25:02.396033000 +0000
 @@ -51,7 +51,7 @@ use Munin::Master::Logger;
  use Log::Log4perl qw( :easy );
  
 @@ -51,7 +51,7 @@ use Munin::Master::Logger;
  use Log::Log4perl qw( :easy );
  
@@ -189,9 +223,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/_bin/munin-limits.in munin-2.0.42/master/_bin/munin-limits.in
+--- munin-2.0.42.orig/master/_bin/munin-limits.in      2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/_bin/munin-limits.in   2018-10-11 15:25:02.396033000 +0000
 @@ -66,7 +66,7 @@ Limit contacts to those of E<lt>contact<
  
  =item B<< --config <file> >>
 @@ -66,7 +66,7 @@ Limit contacts to those of E<lt>contact<
  
  =item B<< --config <file> >>
@@ -210,9 +244,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/_bin/munin-update.in munin-2.0.42/master/_bin/munin-update.in
+--- munin-2.0.42.orig/master/_bin/munin-update.in      2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/_bin/munin-update.in   2018-10-11 15:25:02.396033000 +0000
 @@ -139,7 +139,7 @@ munin-update [options]
  
  =item B<< --config_file=<file> >>
 @@ -139,7 +139,7 @@ munin-update [options]
  
  =item B<< --config_file=<file> >>
@@ -231,9 +265,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/doc/munin.conf.pod.in munin-2.0.42/master/doc/munin.conf.pod.in
+--- munin-2.0.42.orig/master/doc/munin.conf.pod.in     2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/doc/munin.conf.pod.in  2018-10-11 15:25:02.396033000 +0000
 @@ -27,7 +27,7 @@ something like:
        [machine1.your.dom]
                address localhost
 @@ -27,7 +27,7 @@ something like:
        [machine1.your.dom]
                address localhost
@@ -243,7 +277,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.
+@@ -162,20 +162,20 @@ is C<no>.  Affects: munin-update.
  =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,9 +301,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/doc/munin-cron.pod.in munin-2.0.42/master/doc/munin-cron.pod.in
+--- munin-2.0.42.orig/master/doc/munin-cron.pod.in     2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/doc/munin-cron.pod.in  2018-10-11 15:25:02.396033000 +0000
 @@ -22,7 +22,7 @@ Limit hosts to E<lt>hostE<gt>. Multiple
  
  =item B<< --config <file> >>
 @@ -22,7 +22,7 @@ Limit hosts to E<lt>hostE<gt>. Multiple
  
  =item B<< --config <file> >>
@@ -279,9 +313,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/extras/munin-update_old.in munin-2.0.42/master/extras/munin-update_old.in
+--- munin-2.0.42.orig/master/extras/munin-update_old.in        2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/extras/munin-update_old.in     2018-10-11 15:25:02.396033000 +0000
 @@ -43,7 +43,7 @@ my $DEBUG=0;
  my $STATS;
  my $cli_do_fork;
 @@ -43,7 +43,7 @@ my $DEBUG=0;
  my $STATS;
  my $cli_do_fork;
@@ -333,9 +367,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Config.pm munin-2.0.42/master/lib/Munin/Master/Config.pm
+--- munin-2.0.42.orig/master/lib/Munin/Master/Config.pm        2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/lib/Munin/Master/Config.pm     2018-10-11 15:25:02.397033000 +0000
 @@ -140,7 +140,7 @@ my %booleans = map {$_ => 1} qw(
            root_instance => 1, 
  
 @@ -140,7 +140,7 @@ my %booleans = map {$_ => 1} qw(
            root_instance => 1, 
  
@@ -358,10 +392,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 -urNpa munin-2.0.42.orig/master/lib/Munin/Master/GraphOld.pm munin-2.0.42/master/lib/Munin/Master/GraphOld.pm
+--- munin-2.0.42.orig/master/lib/Munin/Master/GraphOld.pm      2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/lib/Munin/Master/GraphOld.pm   2018-10-11 15:25:02.397033000 +0000
+@@ -97,7 +97,7 @@ my $skip_locking   = 0;
  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,9 +404,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/HTMLOld.pm munin-2.0.42/master/lib/Munin/Master/HTMLOld.pm
+--- munin-2.0.42.orig/master/lib/Munin/Master/HTMLOld.pm       2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/lib/Munin/Master/HTMLOld.pm    2018-10-11 15:25:02.397033000 +0000
 @@ -83,7 +83,7 @@ use Log::Log4perl qw( :easy );
  my @times = ("day", "week", "month", "year");
  
 @@ -83,7 +83,7 @@ use Log::Log4perl qw( :easy );
  my @times = ("day", "week", "month", "year");
  
@@ -409,9 +443,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/lib/Munin/Master/LimitsOld.pm munin-2.0.42/master/lib/Munin/Master/LimitsOld.pm
+--- munin-2.0.42.orig/master/lib/Munin/Master/LimitsOld.pm     2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/lib/Munin/Master/LimitsOld.pm  2018-10-11 15:25:02.397033000 +0000
 @@ -52,7 +52,7 @@ use Munin::Master::Utils;
  use Munin::Common::Defaults;
  
 @@ -52,7 +52,7 @@ use Munin::Master::Utils;
  use Munin::Common::Defaults;
  
@@ -421,7 +455,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:
+@@ -242,7 +242,7 @@ Options:
      --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 +464,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 -urNpa munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm munin-2.0.42/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.42.orig/master/lib/Munin/Master/Utils.pm 2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/lib/Munin/Master/Utils.pm      2018-10-11 15:25:02.397033000 +0000
+@@ -114,7 +114,7 @@ my $config_parts = {
        },
  };
  
        },
  };
  
@@ -442,9 +476,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 -urNpa munin-2.0.42.orig/master/munin.conf.in munin-2.0.42/master/munin.conf.in
+--- munin-2.0.42.orig/master/munin.conf.in     2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/master/munin.conf.in  2018-10-11 15:25:02.397033000 +0000
 @@ -24,7 +24,7 @@
  # cgitmpdir @@DBDIR@@/cgi-tmp
  
 @@ -24,7 +24,7 @@
  # cgitmpdir @@DBDIR@@/cgi-tmp
  
@@ -454,9 +488,9 @@ 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
+diff -urNpa munin-2.0.42.orig/master/t/munin_master_config.t munin-2.0.42/master/t/munin_master_config.t
+--- munin-2.0.42.orig/master/t/munin_master_config.t   2018-10-11 15:24:44.285033000 +0000
++++ munin-2.0.42/master/t/munin_master_config.t        2018-10-11 15:25:02.398033000 +0000
 @@ -24,7 +24,7 @@ my $fasit = {
      },
  
 @@ -24,7 +24,7 @@ my $fasit = {
      },
  
@@ -466,9 +500,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 -urNpa munin-2.0.42.orig/master/www/munin-htaccess.in munin-2.0.42/master/www/munin-htaccess.in
+--- munin-2.0.42.orig/master/www/munin-htaccess.in     2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/master/www/munin-htaccess.in  2018-10-11 15:25:02.398033000 +0000
 @@ -9,7 +9,7 @@
  # 
  # <directory @@HTMLDIR@@>
 @@ -9,7 +9,7 @@
  # 
  # <directory @@HTMLDIR@@>
@@ -478,9 +512,9 @@ 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
+diff -urNpa munin-2.0.42.orig/node/bin/munindoc munin-2.0.42/node/bin/munindoc
+--- munin-2.0.42.orig/node/bin/munindoc        2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/bin/munindoc     2018-10-11 15:25:02.398033000 +0000
 @@ -48,7 +48,7 @@ my $plugin_re = quotemeta($plugin);
  
  # Dirs in which to look for $plugin.pod and $plugin files.
 @@ -48,7 +48,7 @@ my $plugin_re = quotemeta($plugin);
  
  # Dirs in which to look for $plugin.pod and $plugin files.
@@ -490,9 +524,9 @@ 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
+diff -urNpa munin-2.0.42.orig/node/doc/munin-node.conf.pod munin-2.0.42/node/doc/munin-node.conf.pod
+--- munin-2.0.42.orig/node/doc/munin-node.conf.pod     2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/doc/munin-node.conf.pod  2018-10-11 15:25:02.398033000 +0000
 @@ -91,20 +91,20 @@ is C<no>.
  =item B<tls_private_key> <value>
  
 @@ -91,20 +91,20 @@ is C<no>.
  =item B<tls_private_key> <value>
  
@@ -517,9 +551,9 @@ 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
+diff -urNpa munin-2.0.42.orig/node/extras/munin-node-simple.in munin-2.0.42/node/extras/munin-node-simple.in
+--- munin-2.0.42.orig/node/extras/munin-node-simple.in 2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/extras/munin-node-simple.in      2018-10-11 15:25:02.398033000 +0000
 @@ -28,8 +28,8 @@ use strict;
  
  $| = 1;
 @@ -28,8 +28,8 @@ use strict;
  
  $| = 1;
@@ -531,9 +565,9 @@ 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
+diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Config.pm munin-2.0.42/node/lib/Munin/Node/Config.pm
+--- munin-2.0.42.orig/node/lib/Munin/Node/Config.pm    2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/lib/Munin/Node/Config.pm 2018-10-11 15:25:02.398033000 +0000
 @@ -25,7 +25,7 @@ my %booleans = map {$_ => 1} qw(
          my ($class) = @_;
  
 @@ -25,7 +25,7 @@ my %booleans = map {$_ => 1} qw(
          my ($class) = @_;
  
@@ -543,10 +577,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 -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Server.pm munin-2.0.42/node/lib/Munin/Node/Server.pm
+--- munin-2.0.42.orig/node/lib/Munin/Node/Server.pm    2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/lib/Munin/Node/Server.pm 2018-10-11 15:25:02.398033000 +0000
+@@ -272,11 +272,11 @@ sub _process_starttls_command {
      my $mode = $session->{tls_mode};
  
      my $key        = $config->{tls_private_key}
      my $mode = $session->{tls_mode};
  
      my $key        = $config->{tls_private_key}
@@ -561,9 +595,9 @@ 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
+diff -urNpa munin-2.0.42.orig/node/lib/Munin/Node/Service.pm munin-2.0.42/node/lib/Munin/Node/Service.pm
+--- munin-2.0.42.orig/node/lib/Munin/Node/Service.pm   2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/lib/Munin/Node/Service.pm        2018-10-11 15:25:02.398033000 +0000
 @@ -22,7 +22,7 @@ sub new
      my ($class, %args) = @_;
  
 @@ -22,7 +22,7 @@ sub new
      my ($class, %args) = @_;
  
@@ -573,9 +607,9 @@ diff -urNp munin-2.0.25.orig/node/lib/Munin/Node/Service.pm munin-2.0.25/node/li
  
      $args{defuser}  ||= getpwnam $Munin::Common::Defaults::MUNIN_PLUGINUSER;
      $args{defgroup} ||= getgrnam $Munin::Common::Defaults::MUNIN_GROUP;
  
      $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
+diff -urNpa munin-2.0.42.orig/node/sbin/munin-node munin-2.0.42/node/sbin/munin-node
+--- munin-2.0.42.orig/node/sbin/munin-node     2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/sbin/munin-node  2018-10-11 15:25:02.398033000 +0000
 @@ -36,8 +36,8 @@ use Munin::Node::Service;
  use Munin::Node::Server;
  
 @@ -36,8 +36,8 @@ use Munin::Node::Service;
  use Munin::Node::Server;
  
@@ -609,9 +643,9 @@ 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
+diff -urNpa munin-2.0.42.orig/node/sbin/munin-node-configure munin-2.0.42/node/sbin/munin-node-configure
+--- munin-2.0.42.orig/node/sbin/munin-node-configure   2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/sbin/munin-node-configure        2018-10-11 15:25:02.399033000 +0000
 @@ -76,9 +76,9 @@ sub main
  
  sub parse_args
 @@ -76,9 +76,9 @@ sub main
  
  sub parse_args
@@ -625,7 +659,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 @@ may enable debugging.
  
  =item B<< --config <file> >>
  
  
  =item B<< --config <file> >>
  
@@ -644,7 +678,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
+@@ -649,9 +649,9 @@ not this works with any particular devic
  
  =head1 FILES
  
  
  =head1 FILES
  
@@ -657,9 +691,9 @@ 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
+diff -urNpa munin-2.0.42.orig/node/sbin/munin-run munin-2.0.42/node/sbin/munin-run
+--- munin-2.0.42.orig/node/sbin/munin-run      2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/sbin/munin-run   2018-10-11 15:25:02.399033000 +0000
 @@ -35,7 +35,7 @@ use Munin::Node::Service;
  
  my $services;
 @@ -35,7 +35,7 @@ use Munin::Node::Service;
  
  my $services;
@@ -710,9 +744,9 @@ 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
+diff -urNpa munin-2.0.42.orig/node/sbin/munin-sched munin-2.0.42/node/sbin/munin-sched
+--- munin-2.0.42.orig/node/sbin/munin-sched    2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/sbin/munin-sched 2018-10-11 15:25:02.399033000 +0000
 @@ -34,8 +34,8 @@ use Munin::Node::Config;
  use Munin::Node::ProxySpooler;
  
 @@ -34,8 +34,8 @@ use Munin::Node::Config;
  use Munin::Node::ProxySpooler;
  
@@ -746,10 +780,10 @@ diff -urNp munin-2.0.25.orig/node/sbin/munin-sched munin-2.0.25/node/sbin/munin-
      @@STATEDIR@@/munin-sched.pid
      @@LOGDIR@@/munin-sched.log
  
      @@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 -urNpa munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in munin-2.0.42/plugins/node.d/exim_mailqueue.in
+--- munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in 2018-10-11 15:24:44.280033000 +0000
++++ munin-2.0.42/plugins/node.d/exim_mailqueue.in      2018-10-11 15:25:02.399033000 +0000
+@@ -17,7 +17,7 @@ examine the queue directories.  This is
    [exim_*]
      user exim
  
    [exim_*]
      user exim
  
@@ -758,9 +792,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d/ipmi_sensor_.in munin-2.0.42/plugins/node.d/ipmi_sensor_.in
+--- munin-2.0.42.orig/plugins/node.d/ipmi_sensor_.in   2018-10-11 15:24:44.280033000 +0000
++++ munin-2.0.42/plugins/node.d/ipmi_sensor_.in        2018-10-11 15:25:02.399033000 +0000
 @@ -17,7 +17,7 @@ Inspired by code written by Peter Palfra
  ipmitool probably needs to be run as root, and it may take more than
  10 seconds on some hosts.
 @@ -17,7 +17,7 @@ Inspired by code written by Peter Palfra
  ipmitool probably needs to be run as root, and it may take more than
  10 seconds on some hosts.
@@ -787,10 +821,10 @@ 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
+ def normalize_sensor(name):
+diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_innodb.in munin-2.0.42/plugins/node.d/mysql_innodb.in
+--- munin-2.0.42.orig/plugins/node.d/mysql_innodb.in   2018-10-11 15:24:44.282033000 +0000
++++ munin-2.0.42/plugins/node.d/mysql_innodb.in        2018-10-11 15:25:02.399033000 +0000
 @@ -34,7 +34,7 @@ the default INNODB tablespace, do the fo
  
  =head1 CONFIGURATION
 @@ -34,7 +34,7 @@ the default INNODB tablespace, do the fo
  
  =head1 CONFIGURATION
@@ -800,9 +834,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_isam_space_.in munin-2.0.42/plugins/node.d/mysql_isam_space_.in
+--- munin-2.0.42.orig/plugins/node.d/mysql_isam_space_.in      2018-10-11 15:24:44.280033000 +0000
++++ munin-2.0.42/plugins/node.d/mysql_isam_space_.in   2018-10-11 15:25:02.399033000 +0000
 @@ -8,7 +8,7 @@ on isam and myisam tables on a mysql ser
  
  =head1 CONFIGURATION
 @@ -8,7 +8,7 @@ on isam and myisam tables on a mysql ser
  
  =head1 CONFIGURATION
@@ -812,9 +846,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d/mysql_threads.in munin-2.0.42/plugins/node.d/mysql_threads.in
+--- munin-2.0.42.orig/plugins/node.d/mysql_threads.in  2018-10-11 15:24:44.280033000 +0000
++++ munin-2.0.42/plugins/node.d/mysql_threads.in       2018-10-11 15:25:02.399033000 +0000
 @@ -9,7 +9,7 @@ mysql_threads - Plugin to monitor the nu
  
  =head1 CONFIGURATION
 @@ -9,7 +9,7 @@ mysql_threads - Plugin to monitor the nu
  
  =head1 CONFIGURATION
@@ -824,9 +858,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d/named.in munin-2.0.42/plugins/node.d/named.in
+--- munin-2.0.42.orig/plugins/node.d/named.in  2018-10-11 15:24:44.280033000 +0000
++++ munin-2.0.42/plugins/node.d/named.in       2018-10-11 15:25:02.399033000 +0000
 @@ -34,7 +34,7 @@ restrictions on the log file.
  
  =head1 CONFIGURATION
 @@ -34,7 +34,7 @@ restrictions on the log file.
  
  =head1 CONFIGURATION
@@ -836,9 +870,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in
+--- munin-2.0.42.orig/plugins/node.d/ntp_kernel_pll_freq.in    2018-10-11 15:24:44.282033000 +0000
++++ munin-2.0.42/plugins/node.d/ntp_kernel_pll_freq.in 2018-10-11 16:30:23.898033000 +0000
 @@ -12,7 +12,7 @@ the NTP status
  
  No configuration
 @@ -12,7 +12,7 @@ the NTP status
  
  No configuration
@@ -852,16 +886,16 @@ diff -urNp munin-2.0.25.orig/plugins/node.d/ntp_kernel_pll_freq.in munin-2.0.25/
      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
+diff -urNpa munin-2.0.42.orig/plugins/node.d/postfix_mailstats.in munin-2.0.42/plugins/node.d/postfix_mailstats.in
+--- munin-2.0.42.orig/plugins/node.d/postfix_mailstats.in      2018-10-11 15:24:44.281033000 +0000
++++ munin-2.0.42/plugins/node.d/postfix_mailstats.in   2018-10-11 15:25:02.400033000 +0000
 @@ -8,7 +8,7 @@ rejected by postfix
  
  =head1 CONFIGURATION
 @@ -8,7 +8,7 @@ rejected by postfix
  
  =head1 CONFIGURATION
@@ -871,9 +905,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d/psu_.in munin-2.0.42/plugins/node.d/psu_.in
+--- munin-2.0.42.orig/plugins/node.d/psu_.in   2018-10-11 15:24:44.281033000 +0000
++++ munin-2.0.42/plugins/node.d/psu_.in        2018-10-11 15:25:02.400033000 +0000
 @@ -15,7 +15,7 @@ we wish to graph.
  
  Example:
 @@ -15,7 +15,7 @@ we wish to graph.
  
  Example:
@@ -883,9 +917,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d/squeezebox_.in munin-2.0.42/plugins/node.d/squeezebox_.in
+--- munin-2.0.42.orig/plugins/node.d/squeezebox_.in    2018-10-11 15:24:44.282033000 +0000
++++ munin-2.0.42/plugins/node.d/squeezebox_.in 2018-10-11 15:25:02.400033000 +0000
 @@ -20,7 +20,7 @@ SqueezeCenter. If the plugin is run from
  non-default configuration, please use the environment variables
  'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
 @@ -20,7 +20,7 @@ SqueezeCenter. If the plugin is run from
  non-default configuration, please use the environment variables
  'squeezebox_host' and 'squeezebox_port' to connect. Also, if your
@@ -895,9 +929,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d/varnish_.in munin-2.0.42/plugins/node.d/varnish_.in
+--- munin-2.0.42.orig/plugins/node.d/varnish_.in       2018-10-11 15:24:44.282033000 +0000
++++ munin-2.0.42/plugins/node.d/varnish_.in    2018-10-11 15:25:02.400033000 +0000
 @@ -54,7 +54,7 @@ session, session_herd
  You can link them yourself with something like this:
  
 @@ -54,7 +54,7 @@ session, session_herd
  You can link them yourself with something like this:
  
@@ -907,9 +941,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d.cygwin/df.in munin-2.0.42/plugins/node.d.cygwin/df.in
+--- munin-2.0.42.orig/plugins/node.d.cygwin/df.in      2018-10-11 15:24:44.277033000 +0000
++++ munin-2.0.42/plugins/node.d.cygwin/df.in   2018-10-11 15:25:02.400033000 +0000
 @@ -13,7 +13,7 @@ Cygwin 1.7.x or higher systems with core
  
  =head1 USAGE
 @@ -13,7 +13,7 @@ Cygwin 1.7.x or higher systems with core
  
  =head1 USAGE
@@ -919,9 +953,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d.debug/if.in munin-2.0.42/plugins/node.d.debug/if.in
+--- munin-2.0.42.orig/plugins/node.d.debug/if.in       2018-10-11 15:24:44.277033000 +0000
++++ munin-2.0.42/plugins/node.d.debug/if.in    2018-10-11 15:25:02.400033000 +0000
 @@ -21,7 +21,7 @@ variable.  For example:
  
  =head1 USAGE
 @@ -21,7 +21,7 @@ variable.  For example:
  
  =head1 USAGE
@@ -931,9 +965,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d.debug/tc.in munin-2.0.42/plugins/node.d.debug/tc.in
+--- munin-2.0.42.orig/plugins/node.d.debug/tc.in       2018-10-11 15:24:44.277033000 +0000
++++ munin-2.0.42/plugins/node.d.debug/tc.in    2018-10-11 15:25:02.400033000 +0000
 @@ -21,7 +21,7 @@ For example:
  
  =head1 USAGE
 @@ -21,7 +21,7 @@ For example:
  
  =head1 USAGE
@@ -943,10 +977,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 -urNpa munin-2.0.42.orig/plugins/node.d.linux/acpi.in munin-2.0.42/plugins/node.d.linux/acpi.in
+--- munin-2.0.42.orig/plugins/node.d.linux/acpi.in     2018-10-11 15:24:44.278033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/acpi.in  2018-10-11 15:25:02.401033000 +0000
+@@ -17,7 +17,7 @@ Load the 'thermal' kernel module and the
  
  =head1 USAGE
  
  
  =head1 USAGE
  
@@ -955,9 +989,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/apt.in munin-2.0.42/plugins/node.d.linux/apt.in
+--- munin-2.0.42.orig/plugins/node.d.linux/apt.in      2018-10-11 15:24:44.278033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/apt.in   2018-10-11 15:25:02.401033000 +0000
 @@ -38,7 +38,7 @@ Remember to randomize when these cronjob
  
  =head1 USAGE
 @@ -38,7 +38,7 @@ Remember to randomize when these cronjob
  
  =head1 USAGE
@@ -967,10 +1001,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 -urNpa munin-2.0.42.orig/plugins/node.d.linux/df.in munin-2.0.42/plugins/node.d.linux/df.in
+--- munin-2.0.42.orig/plugins/node.d.linux/df.in       2018-10-11 15:24:44.278033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/df.in    2018-10-11 15:25:02.401033000 +0000
+@@ -31,7 +31,7 @@ This configuration snipplet is an exampl
      env.warning 92
      env.critical 98
  
      env.warning 92
      env.critical 98
  
@@ -979,7 +1013,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 @@ RE will not be included.
  
  =head1 USAGE
  
  
  =head1 USAGE
  
@@ -988,9 +1022,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/df_inode.in munin-2.0.42/plugins/node.d.linux/df_inode.in
+--- munin-2.0.42.orig/plugins/node.d.linux/df_inode.in 2018-10-11 15:24:44.278033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/df_inode.in      2018-10-11 15:25:02.401033000 +0000
 @@ -28,7 +28,7 @@ This configuration snipplet is an exampl
      env.warning 92
      env.critical 98
 @@ -28,7 +28,7 @@ This configuration snipplet is an exampl
      env.warning 92
      env.critical 98
@@ -1009,9 +1043,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_conntrack.in munin-2.0.42/plugins/node.d.linux/fw_conntrack.in
+--- munin-2.0.42.orig/plugins/node.d.linux/fw_conntrack.in     2018-10-11 15:24:44.278033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/fw_conntrack.in  2018-10-11 15:25:02.401033000 +0000
 @@ -11,7 +11,7 @@ This plugin must run with root privilege
  
  =head2 CONFIGURATION EXAMPLE
 @@ -11,7 +11,7 @@ This plugin must run with root privilege
  
  =head2 CONFIGURATION EXAMPLE
@@ -1021,9 +1055,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_forwarded_local.in munin-2.0.42/plugins/node.d.linux/fw_forwarded_local.in
+--- munin-2.0.42.orig/plugins/node.d.linux/fw_forwarded_local.in       2018-10-11 15:24:44.278033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/fw_forwarded_local.in    2018-10-11 15:25:02.401033000 +0000
 @@ -10,7 +10,7 @@ This plugin must run with root privilege
  
  =head2 CONFIGURATION EXAMPLE
 @@ -10,7 +10,7 @@ This plugin must run with root privilege
  
  =head2 CONFIGURATION EXAMPLE
@@ -1033,10 +1067,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 -urNpa munin-2.0.42.orig/plugins/node.d.linux/fw_packets.in munin-2.0.42/plugins/node.d.linux/fw_packets.in
+--- munin-2.0.42.orig/plugins/node.d.linux/fw_packets.in       2018-10-11 15:24:44.278033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/fw_packets.in    2018-10-11 15:25:02.401033000 +0000
+@@ -14,7 +14,7 @@ This plugin must run with root privilege
  
  =head1 CONFIGURATION EXAMPLE
  
  
  =head1 CONFIGURATION EXAMPLE
  
@@ -1045,9 +1079,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat.in munin-2.0.42/plugins/node.d.linux/iostat.in
+--- munin-2.0.42.orig/plugins/node.d.linux/iostat.in   2018-10-11 15:24:44.279033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/iostat.in        2018-10-11 15:25:02.401033000 +0000
 @@ -24,7 +24,7 @@ guest OS/dom-U IO-traffic originates in.
  
  =head1 USAGE
 @@ -24,7 +24,7 @@ guest OS/dom-U IO-traffic originates in.
  
  =head1 USAGE
@@ -1057,9 +1091,9 @@ 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
+diff -urNpa munin-2.0.42.orig/plugins/node.d.linux/iostat_ios.in munin-2.0.42/plugins/node.d.linux/iostat_ios.in
+--- munin-2.0.42.orig/plugins/node.d.linux/iostat_ios.in       2018-10-11 15:24:44.278033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/iostat_ios.in    2018-10-11 15:25:02.401033000 +0000
 @@ -15,7 +15,7 @@ None needed
  
  =head1 USAGE
 @@ -15,7 +15,7 @@ None needed
  
  =head1 USAGE
@@ -1069,10 +1103,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 -urNpa munin-2.0.42.orig/plugins/node.d.linux/irqstats.in munin-2.0.42/plugins/node.d.linux/irqstats.in
+--- munin-2.0.42.orig/plugins/node.d.linux/irqstats.in 2018-10-11 15:24:44.278033000 +0000
++++ munin-2.0.42/plugins/node.d.linux/irqstats.in      2018-10-11 15:25:02.401033000 +0000
+@@ -18,7 +18,7 @@ None needed
  
  =head1 USAGE
  
  
  =head1 USAGE
  
@@ -1081,9 +1115,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 -urNpa munin-2.0.42.orig/resources/hpux-init.d_munin-node.in munin-2.0.42/resources/hpux-init.d_munin-node.in
+--- munin-2.0.42.orig/resources/hpux-init.d_munin-node.in      2018-10-11 15:24:44.287033000 +0000
++++ munin-2.0.42/resources/hpux-init.d_munin-node.in   2018-10-11 15:25:02.402033000 +0000
 @@ -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,9 +1127,9 @@ 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
+diff -urNpa munin-2.0.42.orig/resources/linux-cron.d_munin-node.in munin-2.0.42/resources/linux-cron.d_munin-node.in
+--- munin-2.0.42.orig/resources/linux-cron.d_munin-node.in     2018-10-11 15:24:44.287033000 +0000
++++ munin-2.0.42/resources/linux-cron.d_munin-node.in  2018-10-11 15:25:02.402033000 +0000
 @@ -8,5 +8,5 @@ MAILTO=root
  # 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 @@ MAILTO=root
  # 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
@@ -1103,9 +1137,9 @@ diff -urNp munin-2.0.25.orig/resources/linux-cron.d_munin-node.in munin-2.0.25/r
 -*/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 -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 -urNpa munin-2.0.42.orig/t/Makefile.config munin-2.0.42/t/Makefile.config
+--- munin-2.0.42.orig/t/Makefile.config        2018-10-11 15:24:44.287033000 +0000
++++ munin-2.0.42/t/Makefile.config     2018-10-11 15:25:02.402033000 +0000
 @@ -9,7 +9,8 @@
  PREFIX     = $(PWD)/t/install
  
 @@ -9,7 +9,8 @@
  PREFIX     = $(PWD)/t/install
  
Munin - the Linpro RRD data agent