-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-09-21 02:11:11.000000000 +0000
-+++ munin-2.0.42/common/lib/Munin/Common/Defaults.pm 2018-10-12 11:46:23.059033000 +0000
-@@ -32,6 +32,7 @@ our $MUNIN_SPOOLDIR = '';
+diff -ur munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm munin-2.0.69/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.69.orig/common/lib/Munin/Common/Defaults.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/common/lib/Munin/Common/Defaults.pm 2022-08-27 15:17:33.865403125 +0200
+@@ -30,6 +30,7 @@
our $MUNIN_MANDIR = '';
our $MUNIN_LOGDIR = "$COMPONENT_ROOT/log/";
our $MUNIN_STATEDIR = '';
our $MUNIN_USER = getpwuid $UID;
our $MUNIN_GROUP = getgrgid $GID;
our $MUNIN_PLUGINUSER = getpwuid $UID;
-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-09-21 02:11:11.000000000 +0000
-+++ munin-2.0.42/contrib/munin-every-services-all-boxes-build-html.in 2018-10-12 11:46:23.059033000 +0000
-@@ -23,7 +23,7 @@ optional for find : -mtime -30 ; will ig
+diff -ur munin-2.0.69.orig/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.69/contrib/munin-every-services-all-boxes-build-html.in
+--- munin-2.0.69.orig/contrib/munin-every-services-all-boxes-build-html.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/contrib/munin-every-services-all-boxes-build-html.in 2022-08-27 15:17:33.865403125 +0200
+@@ -23,7 +23,7 @@
chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes
<div class="box">
<a href=every-services-all-boxes>every services on all boxes</a>
-diff -urNpa munin-2.0.42.orig/Makefile munin-2.0.42/Makefile
---- munin-2.0.42.orig/Makefile 2018-10-12 11:45:59.366033000 +0000
-+++ munin-2.0.42/Makefile 2018-10-12 11:46:35.187033000 +0000
-@@ -100,9 +100,9 @@ install-pre: Makefile Makefile.config
+diff -ur munin-2.0.69.orig/Makefile munin-2.0.69/Makefile
+--- munin-2.0.69.orig/Makefile 2022-08-27 15:12:18.268799133 +0200
++++ munin-2.0.69/Makefile 2022-08-27 15:17:33.866403127 +0200
+@@ -101,9 +101,9 @@
$(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)
-@@ -121,15 +121,15 @@ install-master-prime: $(INFILES_MASTER)
+@@ -122,15 +122,15 @@
$(CHMOD) 0755 $(DBDIR)/cgi-tmp
for p in master/www/*.tmpl ; do \
done
$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
-@@ -270,6 +270,7 @@ build/%: %.in
+@@ -268,6 +268,7 @@
-e 's|@@GOODSH@@|$(GOODSH)|g' \
-e 's|@@BASH@@|$(BASH)|g' \
-e 's|@@HASSETR@@|$(HASSETR)|g' \
$< > $@;
-@@ -312,6 +313,7 @@ substitute-confvar-inline:
+@@ -314,6 +315,7 @@
-e 's|\@\@GOODSH\@\@|$(GOODSH)|g;' \
-e 's|\@\@BASH\@\@|$(BASH)|g;' \
-e 's|\@\@HASSETR\@\@|$(HASSETR)|g;' \
$(CONFVAR_SUBSTITUTION_FILES)
-@@ -365,7 +367,8 @@ substitute-build-defaults-inline:
+@@ -367,7 +369,8 @@
s{(PLUGINUSER\s+=\s).*}{\1q{$(PLUGINUSER)};}x; \
s{(GOODSH\s+=\s).*}{\1q{$(GOODSH)};}x; \
s{(BASH\s+=\s).*}{\1q{$(BASH)};}x; \
common/lib/Munin/Common/Defaults.pm >common/blib/lib/Munin/Common/Defaults.pm
-diff -urNpa munin-2.0.42.orig/Makefile.config munin-2.0.42/Makefile.config
---- munin-2.0.42.orig/Makefile.config 2018-10-12 11:45:59.366033000 +0000
-+++ munin-2.0.42/Makefile.config 2018-10-12 11:46:23.060033000 +0000
-@@ -40,6 +40,7 @@ LIBDIR = $(PREFIX)/share/munin
+diff -ur munin-2.0.69.orig/Makefile.config munin-2.0.69/Makefile.config
+--- munin-2.0.69.orig/Makefile.config 2022-08-27 15:12:18.268799133 +0200
++++ munin-2.0.69/Makefile.config 2022-08-27 15:17:33.866403127 +0200
+@@ -40,6 +40,7 @@
# Server only - Output directory
HTMLDIR = $(DESTDIR)/var/lib/munin/html
CGIDIR = $(LIBDIR)/cgi
# Where to put internal data for master (RRD, internal files, ...)
DBDIR = $(DESTDIR)/var/lib/munin/db
-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-09-21 02:11:11.000000000 +0000
-+++ munin-2.0.42/master/doc/munin.conf.pod.in 2018-10-12 11:46:23.060033000 +0000
-@@ -70,7 +70,7 @@ Directory for HTML pages and graphs. Re
+diff -ur munin-2.0.69.orig/master/doc/munin.conf.pod.in munin-2.0.69/master/doc/munin.conf.pod.in
+--- munin-2.0.69.orig/master/doc/munin.conf.pod.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/doc/munin.conf.pod.in 2022-08-27 15:17:33.866403127 +0200
+@@ -70,7 +70,7 @@
Directory for files tracking munin's current running state. Required.
Directory for templates used to generate HTML pages. Required.
-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-09-21 02:11:11.000000000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/Config.pm 2018-10-12 11:46:23.060033000 +0000
-@@ -159,8 +159,8 @@ my %booleans = map {$_ => 1} qw(
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Config.pm munin-2.0.69/master/lib/Munin/Master/Config.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/Config.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/lib/Munin/Master/Config.pm 2022-08-27 15:17:33.866403127 +0200
+@@ -159,8 +159,8 @@
tls_private_key => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
tls_verify_certificate => 0,
tls_verify_depth => 5,
cgitmpdir => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp",
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-09-21 02:11:11.000000000 +0000
-+++ munin-2.0.42/master/lib/Munin/Master/Utils.pm 2018-10-12 11:46:23.060033000 +0000
-@@ -1001,8 +1001,8 @@ sub munin_readconfig_base {
+diff -ur munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm munin-2.0.69/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.69.orig/master/lib/Munin/Master/Utils.pm 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/lib/Munin/Master/Utils.pm 2022-08-27 15:17:33.867403129 +0200
+@@ -999,8 +999,8 @@
$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 -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-09-21 02:11:11.000000000 +0000
-+++ munin-2.0.42/master/munin.conf.in 2018-10-12 11:46:23.060033000 +0000
+diff -ur munin-2.0.69.orig/master/munin.conf.in munin-2.0.69/master/munin.conf.in
+--- munin-2.0.69.orig/master/munin.conf.in 2021-11-22 23:12:17.000000000 +0100
++++ munin-2.0.69/master/munin.conf.in 2022-08-27 15:17:33.867403129 +0200
@@ -12,11 +12,11 @@
# Where to look for the HTML templates