-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 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/common/lib/Munin/Common/Defaults.pm 2015-09-08 10:12:45.556593251 +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:23:51.538033000 +0000
++++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm 2018-10-11 15:24:16.385033000 +0000
@@ -32,6 +32,7 @@ our $MUNIN_SPOOLDIR = '';
our $MUNIN_MANDIR = '';
our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/";
our $MUNIN_USER = getpwuid $UID;
our $MUNIN_GROUP = getgrgid $GID;
our $MUNIN_PLUGINUSER = getpwuid $UID;
-diff -urNp munin-2.0.25.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.25/contrib/munin-every-services-all-boxes-build-html.in
---- munin-2.0.25.orig/contrib/munin-every-services-all-boxes-build-html.in 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/contrib/munin-every-services-all-boxes-build-html.in 2015-09-08 10:12:45.898593251 +0000
+diff -urNpa munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in
+--- munin-2.0.42.orig/contrib/munin-every-services-all-boxes-build-html.in 2018-10-11 15:23:51.545033000 +0000
++++ munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in 2018-10-11 15:24:16.386033000 +0000
@@ -23,7 +23,7 @@ optional for find : -mtime -30 ; will ig
chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes
<div class="box">
<a href=every-services-all-boxes>every services on all boxes</a>
-diff -urNp munin-2.0.25.orig/Makefile munin-2.0.25/Makefile
---- munin-2.0.25.orig/Makefile 2015-09-08 10:02:24.000000000 +0000
-+++ munin-2.0.25/Makefile 2015-09-08 10:12:45.899593251 +0000
-@@ -75,9 +75,9 @@ install-pre: Makefile Makefile.config
+diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile
+--- munin-2.0.42.orig/Makefile 2018-10-11 15:23:51.545033000 +0000
++++ munin-2.0.42/Makefile 2018-10-11 15:24:16.386033000 +0000
+@@ -100,9 +100,9 @@ install-pre: Makefile Makefile.config
$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
install-master-prime: $(INFILES_MASTER) install-pre install-master
mkdir -p $(CONFDIR)/munin-conf.d
mkdir -p $(LIBDIR)
mkdir -p $(BINDIR)
-@@ -96,15 +96,15 @@ install-master-prime: $(INFILES_MASTER)
+@@ -121,15 +121,15 @@ install-master-prime: $(INFILES_MASTER)
$(CHMOD) 0755 $(DBDIR)/cgi-tmp
for p in master/www/*.tmpl ; do \
done
$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
-@@ -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 -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:02:24.000000000 +0000
-+++ munin-2.0.25/Makefile.config 2015-09-08 10:12:45.899593251 +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:23:51.545033000 +0000
++++ munin-2.0.42/Makefile.config 2018-10-11 15:24:16.386033000 +0000
@@ -40,6 +40,7 @@ LIBDIR = $(PREFIX)/share/munin
# Server only - Output directory
HTMLDIR = $(DESTDIR)/var/lib/munin/html
# Where to put internal data for master (RRD, internal files, ...)
DBDIR = $(DESTDIR)/var/lib/munin/db
-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 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/doc/munin.conf.pod.in 2015-09-08 10:12:45.899593251 +0000
+diff -urNpa munin-2.0.42.orig/Makefile.rej munin-2.0.42/Makefile.rej
+--- munin-2.0.42.orig/Makefile.rej 1970-01-01 00:00:00.000000000 +0000
++++ munin-2.0.42/Makefile.rej 2018-10-11 15:24:16.386033000 +0000
+@@ -0,0 +1,20 @@
++--- 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/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:23:51.547033000 +0000
++++ munin-2.0.42/master/doc/munin.conf.pod.in 2018-10-11 15:24:16.387033000 +0000
@@ -70,7 +70,7 @@ Directory for HTML pages and graphs. Re
Directory for files tracking munin's current running state. Required.
Directory for templates used to generate HTML pages. Required.
-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 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/lib/Munin/Master/Config.pm 2015-09-08 10:12:45.900593251 +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:23:51.547033000 +0000
++++ munin-2.0.42/master/lib/Munin/Master/Config.pm 2018-10-11 15:24:16.387033000 +0000
@@ -159,8 +159,8 @@ my %booleans = map {$_ => 1} qw(
tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
tls_verify_certificate => 0,
+ tmpldir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
+ staticdir => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR/static",
cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp",
- }, $class ),
-
-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 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/lib/Munin/Master/Utils.pm 2015-09-08 10:12:45.901593251 +0000
-@@ -1018,8 +1018,8 @@ sub munin_readconfig_base {
+ ssh_command => "ssh",
+ ssh_options => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no",
+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:23:51.547033000 +0000
++++ munin-2.0.42/master/lib/Munin/Master/Utils.pm 2018-10-11 15:24:16.387033000 +0000
+@@ -1001,8 +1001,8 @@ sub munin_readconfig_base {
$config->{'rundir'} ||= $Munin::Common::Defaults::MUNIN_STATEDIR;
$config->{'dbdir'} ||= $Munin::Common::Defaults::MUNIN_DBDIR;
$config->{'logdir'} ||= $Munin::Common::Defaults::MUNIN_LOGDIR;
$config->{'htmldir'} ||= $Munin::Common::Defaults::MUNIN_HTMLDIR;
$config->{'spooldir'} ||= $Munin::Common::Defaults::MUNIN_SPOOLDIR;
$config->{'#%#parent'} = undef;
-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 2014-11-24 21:46:24.000000000 +0000
-+++ munin-2.0.25/master/munin.conf.in 2015-09-08 10:12:45.901593251 +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:23:51.548033000 +0000
++++ munin-2.0.42/master/munin.conf.in 2018-10-11 15:24:16.387033000 +0000
@@ -12,11 +12,11 @@
# Where to look for the HTML templates