-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 -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;
our $MUNIN_PREFIX = '';
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
-@@ -9,7 +9,7 @@
+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
-------
Decide which plugins to use. The munin node runs all plugins present
The quick auto-plug-and-play solution:
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ Master
Add some nodes
--------------
[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 -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
tags:
-rm -f TAGS
-@@ -71,14 +71,15 @@
+@@ -96,14 +96,15 @@ install-pre: Makefile Makefile.config
mkdir -p $(LOGDIR)
mkdir -p $(STATEDIR)
mkdir -p $(SPOOLDIR)
mkdir -p $(LIBDIR)
mkdir -p $(BINDIR)
mkdir -p $(SBINDIR)
-@@ -111,7 +112,7 @@
+@@ -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 0755 build/master/_bin/munin-cron $(SBINDIR)/
$(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
-@@ -140,14 +141,14 @@
+@@ -157,14 +158,14 @@ install-node-plugins: install-plugins-pr
install-plugins-prime: install-plugins build $(PLUGINS) Makefile Makefile.config
@$(CHECKGROUP)
- $(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.
+@@ -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-common-prime: build-common install-common
-@@ -220,7 +221,8 @@
+@@ -240,7 +241,8 @@ build/%: %.in
@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' \
+@@ -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
- $(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; \
+@@ -493,7 +497,7 @@ old-test: t/*.t
$(MAKE) $@ CONFIG=t/Makefile.config
else
test_plugins = id_default id_root env
@for test in t/*.t; do \
echo -n "$$test: "; \
PERL5LIB=$(PERLLIB) $(PERL) $$test;\
-@@ -396,10 +399,10 @@
+@@ -501,10 +505,10 @@ old-test: t/*.t t/install $(addprefix $(
endif
node-monkeywrench: install-node
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 -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
# 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 -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 );
my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
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 -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
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 -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 );
my $GRAPHER = "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-graph";
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 -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> >>
=item B<< --always-send <severity list> >>
-@@ -114,7 +114,7 @@
+@@ -114,7 +114,7 @@ configuration file contains the necessar
=head1 FILES
@@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 -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> >>
=item B<< --[no]debug >>
-@@ -192,7 +192,7 @@
+@@ -192,7 +192,7 @@ and the directories to store them in.
=head1 FILES
@@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
-@@ -27,7 +27,7 @@
+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
If your placement deviates from this norm, use the "--config
E<lt>fileE<gt>"-option when running the munin-* programs.
-@@ -149,20 +149,20 @@
+@@ -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_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
-@@ -22,7 +22,7 @@
+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> >>
=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 -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;
my $cli_timeout;
my $config;
my $do_fork = 1;
my $serversocket = "munin-server-socket.$$";
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ Options:
--host <host> Limit graphed hosts to <host>. Multiple --host options
may be supplied.
--config <file> Use <file> as configuration file.
--[no]debug View debug messages. [--nodebug]
--[no]fork Don't fork one instance for each host. [--fork]
--timeout=<seconds> TCP timeout when talking to clients. [$timeout]
-@@ -752,11 +752,11 @@
+@@ -752,11 +752,11 @@ sub run_starttls_if_required {
my $ca_cert;
my $tls_verify;
$key = $cert = munin_get ($config, "tls_pem");
unless defined $ca_cert;
$tls_verify=&munin_get ($config, "tls_verify_certificate", "no");
$depth=&munin_get ($config, "tls_verify_depth", 5);
-@@ -1088,7 +1088,7 @@
+@@ -1088,7 +1088,7 @@ Limit fetched data to those from E<lt>ho
=item B<< --config <file> >>
=item B<< --help >>
-@@ -1124,7 +1124,7 @@
+@@ -1124,7 +1124,7 @@ and the directories to store them in.
=head1 FILES
@@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 -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,
config => bless ( {
dbdir => $Munin::Common::Defaults::MUNIN_DBDIR,
debug => 0,
fork => 1,
-@@ -153,9 +153,9 @@
+@@ -154,9 +154,9 @@ my %booleans = map {$_ => 1} qw(
rundir => $Munin::Common::Defaults::MUNIN_STATEDIR,
timeout => 180,
tls => 'disabled',
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 -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 $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
-@@ -81,7 +81,7 @@
+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");
my $DEBUG = 0;
my $do_usage = 0;
my $do_version = 0;
my $stdout = 0;
-@@ -857,7 +857,7 @@
+@@ -859,7 +859,7 @@ Options:
--service <service> Compatibility. No effect.
--host <host> Compatibility. No effect.
--config <file> Use <file> as configuration file.
";
exit 0;
-@@ -892,7 +892,7 @@
+@@ -894,7 +894,7 @@ Compatibility. No effect.
=item B<< --config <file> >>
=item B<< --help >>
-@@ -915,7 +915,7 @@
+@@ -917,7 +917,7 @@ Munin-html creates the html pages.
=head1 FILES
@@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 -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;
my $DEBUG = 0;
my $do_usage = 0;
my $do_version = 0;
my @limit_hosts = ();
-@@ -230,7 +230,7 @@
+@@ -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.
";
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 -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 = {
},
};
# 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 -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
# 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
-@@ -24,7 +24,7 @@
+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 = {
},
config => {
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 -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@@>
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
-@@ -48,7 +48,7 @@
+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.
my @DIRS = ("$Munin::Common::Defaults::MUNIN_LIBDIR/plugins",
"$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
-@@ -91,20 +91,20 @@
+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>
This directive sets the location of the private key to be used for
=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
-@@ -28,8 +28,8 @@
+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;
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 -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) = @_;
$instance ||= bless {
}, $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 -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 $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 -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) = @_;
# Set defaults
$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 @@
+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;
my $servicedir;
my $DEBUG = 0;
my $PIDEBUG = 0;
my $paranoia = 0;
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ and returning the output they produce.
=item B<< --config <configfile> >>
=item B< --[no]paranoia >
-@@ -187,9 +187,9 @@
+@@ -187,9 +187,9 @@ may enable debugging. [--nopidebug]
=head1 FILES
@@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
-@@ -76,9 +76,9 @@
+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
{
my $libdir = "$Munin::Common::Defaults::MUNIN_LIBDIR/plugins";
my $debug = 0;
-@@ -492,15 +492,15 @@
+@@ -487,15 +487,15 @@ may enable debugging.
=item B<< --config <file> >>
=item B<< --libdir <dir> >>
-@@ -648,9 +648,9 @@
+@@ -649,9 +649,9 @@ not this works with any particular devic
=head1 FILES
@@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 -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;
my $servicedir;
my $DEBUG = 0;
my $PIDEBUG = 0;
my $paranoia = 0;
-@@ -98,7 +98,7 @@
+@@ -98,7 +98,7 @@ sub main
sub parse_args
{
# Default configuration values
my $sconffile;
my ($plugin, $arg);
-@@ -189,15 +189,15 @@
+@@ -189,15 +189,15 @@ as they are under munin-node.
=item B<< --config <configfile> >>
=item B<< --sconffile <file> >>
-@@ -230,9 +230,9 @@
+@@ -230,9 +230,9 @@ Show version information.
=head1 FILES
@@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 @@
+diff -urNpa munin-2.0.42.orig/node/sbin/munin-sched munin-2.0.42/node/sbin/munin-sched
+--- munin-2.0.42.orig/node/sbin/munin-sched 2018-10-11 15:24:44.286033000 +0000
++++ munin-2.0.42/node/sbin/munin-sched 2018-10-11 15:25:02.399033000 +0000
+@@ -34,8 +34,8 @@ use Munin::Node::Config;
use Munin::Node::ProxySpooler;
my $servicedir;
my $spooldir = $Munin::Common::Defaults::MUNIN_SPOOLDIR;
my ($host, $port);
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ and returning the output they produce.
=item B<< --config <configfile> >>
=item B< --[no]paranoia >
-@@ -182,9 +182,9 @@
+@@ -182,9 +182,9 @@ View debug messages. This can be very v
=head1 FILES
@@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 -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
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
-@@ -17,7 +17,7 @@
+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.
[ipmi_sensor_*]
user root
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ with this program; if not, write to the
=head1 BUGS
variables.
=head1 MAGIC MARKERS
-@@ -72,7 +72,7 @@
- CACHEDIR = os.environ['MUNIN_PLUGSTATE']
+@@ -72,7 +72,7 @@ import re
+ CACHEDIR = environ['MUNIN_PLUGSTATE']
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
-@@ -34,7 +34,7 @@
+ 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
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
-@@ -8,7 +8,7 @@
+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
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
-@@ -9,7 +9,7 @@
+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
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
-@@ -34,7 +34,7 @@
+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
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
-@@ -12,7 +12,7 @@
+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
should contain a number to be added to the frequency read by ntpdc.
=head1 AUTHORS
-@@ -46,8 +46,8 @@
+@@ -46,8 +46,8 @@ if [ "$1" = "autoconf" ]; then
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
-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
-@@ -8,7 +8,7 @@
+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
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
-@@ -15,7 +15,7 @@
+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:
...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
-@@ -20,7 +20,7 @@
+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
nc(1) binary is not called "nc", or not the one in $PATH, please define it
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
-@@ -54,7 +54,7 @@
+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:
ln -s @@LIBDIR@@/plugins/varnish_ \
=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
-@@ -13,7 +13,7 @@
+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
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
-@@ -21,7 +21,7 @@
+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
=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
-@@ -21,7 +21,7 @@
+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
=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
-@@ -17,7 +17,7 @@
+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 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
-@@ -38,7 +38,7 @@
+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
=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 -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
You may specify filesystem specific warning and critical levels:
-@@ -55,7 +55,7 @@
+@@ -58,7 +58,7 @@ RE will not be included.
=head1 USAGE
=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
-@@ -28,7 +28,7 @@
+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
You may specify filesystem specific warning and critical levels:
-@@ -55,7 +55,7 @@
+@@ -55,7 +55,7 @@ RE will not be included.
=head1 USAGE
=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
-@@ -11,7 +11,7 @@
+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
[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
-@@ -10,7 +10,7 @@
+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
[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 -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
[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
-@@ -24,7 +24,7 @@
+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
=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
-@@ -15,7 +15,7 @@
+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
=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 -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 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 -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
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
-@@ -8,5 +8,5 @@
+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
# seconds) interval between updates..
-*/5 * * * * root [ -x @@CONFDIR@@/plugins/apt ] && @@CONFDIR@@/plugins/apt update 7200 12 >/dev/null
+*/5 * * * * root [ -x @@NCONFDIR@@/plugins/apt ] && @@NCONFDIR@@/plugins/apt update 7200 12 >/dev/null
-diff -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 -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
TLD / packages / munin.git / blobdiff