- # Server only - spool directory for data gathered from nodes by
- # munin-gather - experimental. Place on ramdisk to make munin
-diff -ur munin-1.4.0/master/doc/munin.conf.pod.in munin-1.4.0.template/master/doc/munin.conf.pod.in
---- munin-1.4.0/master/doc/munin.conf.pod.in 2009-11-27 12:17:16.000000000 +0100
-+++ munin-1.4.0.template/master/doc/munin.conf.pod.in 2009-11-30 15:51:40.016661676 +0100
-@@ -68,7 +68,7 @@
+ # Where to put internal data for master (RRD, internal files, ...)
+ DBDIR = $(DESTDIR)/var/lib/munin/db
+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