-diff -urNpa munin-2.0.42.orig/node/sbin/munin-sched munin-2.0.42/node/sbin/munin-sched
---- munin-2.0.42.orig/node/sbin/munin-sched 2018-10-11 15:24:44.286033000 +0000
-+++ munin-2.0.42/node/sbin/munin-sched 2018-10-11 15:25:02.399033000 +0000
-@@ -34,8 +34,8 @@ use Munin::Node::Config;
- use Munin::Node::ProxySpooler;
-
- my $servicedir;
--my $sconfdir = "$Munin::Common::Defaults::MUNIN_CONFDIR/plugin-conf.d";
--my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin-node.conf";
-+my $sconfdir = "$Munin::Common::Defaults::MUNIN_NCONFDIR/plugin-conf.d";
-+my $conffile = "$Munin::Common::Defaults::MUNIN_NCONFDIR/munin-node.conf";
- my $spooldir = $Munin::Common::Defaults::MUNIN_SPOOLDIR;
-
- my ($host, $port);
-@@ -164,7 +164,7 @@ and returning the output they produce.
-
- =item B<< --config <configfile> >>
-
--Use E<lt>fileE<gt> as configuration file. [@@CONFDIR@@/munin-node.conf]
-+Use E<lt>fileE<gt> as configuration file. [@@NCONFDIR@@/munin-node.conf]
-
- =item B< --[no]paranoia >
-
-@@ -182,9 +182,9 @@ View debug messages. This can be very v
-
- =head1 FILES
-
-- @@CONFDIR@@/munin-node.conf
-- @@CONFDIR@@/plugins/*
-- @@CONFDIR@@/plugin-conf.d/*
-+ @@NCONFDIR@@/munin-node.conf
-+ @@NCONFDIR@@/plugins/*
-+ @@NCONFDIR@@/plugin-conf.d/*
- @@STATEDIR@@/munin-sched.pid
- @@LOGDIR@@/munin-sched.log
-
-diff -urNpa munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in munin-2.0.42/plugins/node.d/exim_mailqueue.in
---- munin-2.0.42.orig/plugins/node.d/exim_mailqueue.in 2018-10-11 15:24:44.280033000 +0000
-+++ munin-2.0.42/plugins/node.d/exim_mailqueue.in 2018-10-11 15:25:02.399033000 +0000
-@@ -17,7 +17,7 @@ examine the queue directories. This is