[packages/munin] Up to 2.0.76 but needs more testing

arekm arekm at pld-linux.org
Sat Mar 14 16:26:56 CET 2026


commit 128eccc11cbec59bae6ccd03f65314a5554ba93a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sat Mar 14 16:26:47 2026 +0100

    Up to 2.0.76 but needs more testing

 munin-Makefile.patch | 195 +++++++++++++++++++++++++++++++++++++++++++--------
 munin.spec           |  48 +++++++------
 2 files changed, 194 insertions(+), 49 deletions(-)
---
diff --git a/munin.spec b/munin.spec
index d4ac885..8a3ac78 100644
--- a/munin.spec
+++ b/munin.spec
@@ -8,12 +8,12 @@
 Summary:	Munin - the Linpro RRD data agent
 Summary(pl.UTF-8):	Munin - agent danych RRD Linpro
 Name:		munin
-Version:	2.0.19
-Release:	5
+Version:	2.0.76
+Release:	0.1
 License:	GPL
 Group:		Applications/WWW
-Source0:	http://downloads.sourceforge.net/munin/%{name}-%{version}.tar.gz
-# Source0-md5:	ab27d477052c0f5da4ed81edb7f95f1b
+Source0:	https://github.com/munin-monitoring/munin/archive/refs/tags/%{version}.tar.gz
+# Source0-md5:	d1c4d3818cee639866488d23e1bd855d
 Source1:	%{name}-node.init
 Source2:	%{name}.cron
 Source3:	%{name}-apache.conf
@@ -25,12 +25,10 @@ Source8:	%{name}-httpd.conf
 Source9:	%{name}-node.service
 Source10:	%{name}-asyncd.service
 Source11:	%{name}-asyncd.init
+Source12:	%{name}-plugins.conf
 Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-plugins.patch
-Patch2:		%{name}-templatedir.patch
-Patch3:		%{name}-separate-configs.patch
-Patch4:		%{name}-timeout.patch
-URL:		http://munin.sourceforge.net/
+Patch1:		%{name}-timeout.patch
+URL:		https://munin-monitoring.org/
 BuildRequires:	perl-Encode
 BuildRequires:	perl-Net-SNMP
 BuildRequires:	perl-devel
@@ -38,7 +36,7 @@ BuildRequires:	rpm-perlprov
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.671
 BuildRequires:	which
-Requires(triggerpostun):	sed >= 4.0
+Requires(postun):	sed >= 4.0
 Requires:	%{name}-common = %{version}-%{release}
 Requires:	fonts-TTF-DejaVu
 Requires:	perl-Date-Manip
@@ -128,12 +126,10 @@ Munin.
 %setup -q
 %patch -P0 -p1
 %patch -P1 -p1
-%patch -P2 -p1
-%patch -P3 -p1
-%patch -P4 -p1
 
 %build
 %{__make} -j1 build \
+	PERL5LIB=. \
 	PERL_MB_OPT="perl=%{__perl}" \
 	JCVALID=no
 
@@ -146,6 +142,7 @@ install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,cron.d,logrotate.d},%{_bindir},%{_s
 	$RPM_BUILD_ROOT%{systemdunitdir}
 
 %{__make} -j1 install \
+	PERL5LIB=. \
 	JCVALID=no \
 	CHOWN=/bin/true \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -168,8 +165,18 @@ cp -p %{SOURCE7} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
 cp -p %{SOURCE9} $RPM_BUILD_ROOT%{systemdunitdir}/munin-node.service
 cp -p %{SOURCE10} $RPM_BUILD_ROOT%{systemdunitdir}/munin-asyncd.service
 
-cp -p dists/tarball/plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}
-ln -sf %{_sysconfdir}/plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}/plugin-conf.d/munin-node
+cp -p %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/plugins.conf
+ln -sf ../plugins.conf $RPM_BUILD_ROOT%{_sysconfdir}/plugin-conf.d/munin-node
+
+%{__sed} -i \
+	-e '1s|^#!/usr/bin/env python3$|#!%{__python3}|' \
+	-e '1s|^#!/usr/bin/env python$|#!%{__python3}|' \
+	-e '1s|^#!/usr/bin/env ruby$|#!%{__ruby}|' \
+	$RPM_BUILD_ROOT%{_datadir}/munin/plugins/{ipmi_sensor_,smart_,tomcat_}
+
+# use system-provided DejaVu fonts
+rm -f $RPM_BUILD_ROOT%{_datadir}/munin/DejaVuSans.ttf \
+	$RPM_BUILD_ROOT%{_datadir}/munin/DejaVuSansMono.ttf
 
 for f in cgi-graph cgi-html graph html limits update ; do
 	touch $RPM_BUILD_ROOT/var/log/munin/munin-$f.log
@@ -260,7 +267,6 @@ fi
 %files
 %defattr(644,root,root,755)
 %dir %attr(750,munin,http) %{_webapps}/%{_webapp}
-%dir %attr(750,munin,http) %{_webapps}/%{_webapp}/munin-conf.d
 %dir %{_webapps}/%{_webapp}/templates
 %{_webapps}/%{_webapp}/templates/*.tmpl
 %dir %{_webapps}/%{_webapp}/templates/static
@@ -271,7 +277,7 @@ fi
 %{_webapps}/%{_webapp}/templates/static/*.png
 %dir %{_webapps}/%{_webapp}/templates/partial
 %{_webapps}/%{_webapp}/templates/partial/*.tmpl
-%config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/munin.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/munin.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/lighttpd.conf
@@ -289,6 +295,7 @@ fi
 %attr(755,munin,root) %{_datadir}/munin/cgi/munin-cgi-graph
 %attr(755,munin,root) %{_datadir}/munin/cgi/munin-cgi-html
 %attr(755,munin,root) %dir %{_htmldir}
+%attr(640,munin,http) %config(noreplace) %{_htmldir}/.htaccess
 %{perl_vendorlib}/Munin/Master
 %{_mandir}/man3/Munin::Master*
 %{_mandir}/man5/munin.conf*
@@ -328,18 +335,18 @@ fi
 %dir %{_sysconfdir}/plugin-conf.d
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/munin-node.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugins.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin-conf.d/munin-node
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/plugin-conf.d/munin-node
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/munin-node
 %attr(754,root,root) /etc/rc.d/init.d/munin-asyncd
 %attr(754,root,root) /etc/rc.d/init.d/munin-node
 %{systemdunitdir}/munin-asyncd.service
 %{systemdunitdir}/munin-node.service
 %attr(755,root,root) %{_bindir}/munindoc
+%attr(755,root,root) %{_bindir}/munin-get
 %attr(755,root,root) %{_sbindir}/munin-asyncd
 %attr(755,root,root) %{_sbindir}/munin-node
 %attr(755,root,root) %{_sbindir}/munin-node-configure
 %attr(755,root,root) %{_sbindir}/munin-run
-%attr(755,root,root) %{_sbindir}/munin-sched
 %{perl_vendorlib}/Munin/Node
 %{perl_vendorlib}/Munin/Plugin
 %{perl_vendorlib}/Munin/Plugin.pm
@@ -352,8 +359,8 @@ fi
 %dir %attr(770,munin,munin) /var/lib/munin/plugin-state
 %dir %attr(770,munin,munin) /var/spool/munin
 %{_mandir}/man1/munin-node*
+%{_mandir}/man1/munin-get*
 %{_mandir}/man1/munin-run*
-%{_mandir}/man1/munin-sched*
 %{_mandir}/man1/munindoc*
 %{_mandir}/man3/Munin::Node*
 %{_mandir}/man3/Munin::Plugin*
@@ -361,4 +368,3 @@ fi
 
 #%files plugins-java
 #%defattr(644,root,root,755)
-#%{_datadir}/munin/munin-jmx-plugins.jar
diff --git a/munin-Makefile.patch b/munin-Makefile.patch
index e808657..475d9ae 100644
--- a/munin-Makefile.patch
+++ b/munin-Makefile.patch
@@ -1,6 +1,16 @@
---- munin-1.4.0/Makefile~	2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0/Makefile	2009-11-30 14:33:15.977700738 +0100
-@@ -77,6 +77,7 @@
+diff -urN munin-2.0.76/Makefile munin-2.0.76-patched/Makefile
+--- munin-2.0.76/Makefile	2024-05-17 13:03:48.000000000 +0200
++++ munin-2.0.76-patched/Makefile	2026-03-14 15:50:12.053246790 +0100
+@@ -101,12 +101,13 @@
+ 	$(CHOWN) $(USER) $(LOGDIR) $(STATEDIR) $(SPOOLDIR)
+ 
+ install-master-prime: $(INFILES_MASTER) install-pre install-master
+-	mkdir -p $(CONFDIR)/templates
+-	mkdir -p $(CONFDIR)/static
+-	mkdir -p $(CONFDIR)/templates/partial
++	mkdir -p $(TEMPLATEDIR)
++	mkdir -p $(TEMPLATEDIR)/static
++	mkdir -p $(TEMPLATEDIR)/partial
  	mkdir -p $(CONFDIR)/munin-conf.d
  	mkdir -p $(LIBDIR)
  	mkdir -p $(BINDIR)
@@ -8,7 +18,26 @@
  	mkdir -p $(PERLLIB)
  	mkdir -p $(PERLLIB)/Munin/Master
  	mkdir -p $(HTMLDIR)
-@@ -99,8 +100,8 @@
+@@ -121,15 +122,15 @@
+ 	$(CHMOD) 0755 $(DBDIR)/cgi-tmp
+ 
+ 	for p in master/www/*.tmpl ;  do \
+-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/ ; \
++		$(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/ ; \
+ 	done
+ 
+ 	for p in master/static/* ; do \
+-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/static/ ; \
++		$(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/static/ ; \
+ 	done
+ 
+ 	for p in master/www/partial/*.tmpl; do \
+-		$(INSTALL) -m 0644 "$$p" $(CONFDIR)/templates/partial/ ; \
++		$(INSTALL) -m 0644 "$$p" $(TEMPLATEDIR)/partial/ ; \
+ 	done
+ 
+ 	$(INSTALL) -m 0644 master/DejaVuSansMono.ttf $(LIBDIR)/
+@@ -138,8 +139,8 @@
  	test -f $(HTMLDIR)/.htaccess || $(INSTALL) -m 0644 build/master/www/munin-htaccess $(HTMLDIR)/.htaccess
  	test -f "$(CONFDIR)/munin.conf"  || $(INSTALL) -m 0644 build/master/munin.conf $(CONFDIR)/
  
@@ -17,10 +46,37 @@
 +	$(INSTALL) -m 0755 build/master/_bin/munin-cron $(SBINDIR)/
 +	$(INSTALL) -m 0755 build/master/_bin/munin-check $(LIBDIR)/
  	$(INSTALL) -m 0755 build/master/_bin/munin-update $(LIBDIR)/
- 	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
  	$(INSTALL) -m 0755 build/master/_bin/munin-html $(LIBDIR)/
---- munin-1.4.0/Makefile.config~	2009-11-27 12:17:18.000000000 +0100
-+++ munin-1.4.0/Makefile.config	2009-11-30 14:32:28.827763277 +0100
+ 	$(INSTALL) -m 0755 build/master/_bin/munin-graph $(LIBDIR)/
+@@ -267,6 +268,7 @@
+ 		-e 's|@@GOODSH@@|$(GOODSH)|g' \
+ 		-e 's|@@BASH@@|$(BASH)|g' \
+ 		-e 's|@@HASSETR@@|$(HASSETR)|g' \
++		-e 's|@@TEMPLATEDIR@@|$(TEMPLATEDIR)|g' \
+ 		$< > $@;
+ 
+ 
+@@ -313,6 +315,7 @@
+ 		-e 's|\@\@GOODSH\@\@|$(GOODSH)|g;' \
+ 		-e 's|\@\@BASH\@\@|$(BASH)|g;' \
+ 		-e 's|\@\@HASSETR\@\@|$(HASSETR)|g;' \
++		-e 's|\@\@TEMPLATEDIR\@\@|$(TEMPLATEDIR)|g;' \
+ 		$(CONFVAR_SUBSTITUTION_FILES)
+ 
+ 
+@@ -366,7 +369,8 @@
+ 		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;' \
+ 		common/lib/Munin/Common/Defaults.pm >common/blib/lib/Munin/Common/Defaults.pm
+ 
+ 
+diff -urN munin-2.0.76/Makefile.config munin-2.0.76-patched/Makefile.config
+--- munin-2.0.76/Makefile.config	2024-05-17 13:03:48.000000000 +0200
++++ munin-2.0.76-patched/Makefile.config	2026-03-14 15:50:27.356580115 +0100
 @@ -17,10 +17,10 @@
  #
  # the base of the Munin installation.
@@ -34,7 +90,7 @@
  
  # Server only - where to put munin-cron
  BINDIR     = $(PREFIX)/bin
-@@ -32,31 +32,31 @@
+@@ -32,31 +32,32 @@
  DOCDIR     = $(PREFIX)/doc
  
  # Where to put man pages
@@ -50,6 +106,7 @@
 -CGIDIR     = $(PREFIX)/www/cgi
 +HTMLDIR    = $(DESTDIR)/var/lib/munin/html
 +CGIDIR     = $(LIBDIR)/cgi
++TEMPLATEDIR= $(DESTDIR)/etc/webapps/munin/templates
  
  # Where to put internal data for master (RRD, internal files, ...)
 -DBDIR      = $(DESTDIR)/var/opt/munin
@@ -62,7 +119,7 @@
  # Client only - Where the spool files are written. Must be writable by
  # group "munin", and should be preserved between reboots
 -SPOOLDIR   = $(DBDIR)/spool
-+SPOOLDIR  = $(DESTDIR)/var/spool/munin
++SPOOLDIR   = $(DESTDIR)/var/spool/munin
  
  # Client only - Where plugins should put their states. Must be writable by
  # group "munin", and should be preserved between reboots
@@ -75,16 +132,16 @@
  
  # Location of PID files and other statefiles. On the server, must be
  # writable by the user "munin".
-@@ -98,7 +98,7 @@
+@@ -95,7 +96,7 @@
  BASH       := /bin/bash
  
  # Server only - Where to install the perl libraries
--PERLSITELIB := $(shell $(PERL) -V:sitelib | cut -d"'" -f2)
-+PERLSITELIB := $(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
- PERLLIB    = $(DESTDIR)$(PERLSITELIB)
+-PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
++PERLLIB    = $(DESTDIR)$(shell $(PERL) -V:vendorlib | cut -d"'" -f2)
  
  # Client only - Install plugins for this architecture
-@@ -106,7 +106,7 @@
+ # the LANG=C makes tr work as expected, not regarding any locale it
+@@ -105,7 +106,7 @@
  
  # How to figure out the hostname. (Only used in default configuration
  # files)
@@ -93,23 +150,15 @@
  
  # What is the safest way to create a tempfile.
  # Default is to figure it out by testing various methods.
-@@ -126,9 +126,9 @@
- # Which command to use to check if the USER and GROUP to run Munin as, exists.
- # These will work on most modern OSes:
- #
--GETENT     := $(shell which getent || which true 2>/dev/null)
--CHECKUSER  := $(shell $(GETENT) passwd $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
--CHECKGROUP := $(shell $(GETENT) group $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
-+GETENT     := /bin/true
+@@ -151,12 +152,12 @@
+         endif
+     endif
+ endif
+-CHECKUSER  := $(shell $(CHECKUSER_COMMAND) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
+-CHECKGROUP := $(shell $(CHECKGROUP_COMMAND) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
 +CHECKUSER  := /bin/true
 +CHECKGROUP := /bin/true
  
- # For OSX, comment out the previous two lines and comment in these
- #
-@@ -146,9 +146,9 @@
- #CHECKUSER  := $(shell pwget -n $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistent. Create the user and retry; exit 2"))
- #CHECKGROUP := $(shell grget -n $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistent. Create the group and retry; exit 2"))
- 
 -CHOWN      := chown
 -CHMOD      := chmod
 -CHGRP      := chgrp
@@ -119,3 +168,93 @@
  
  # Java compiler stuff - only needed on the buildhost
  JC         := javac
+diff -urN munin-2.0.76/common/lib/Munin/Common/Defaults.pm munin-2.0.76-patched/common/lib/Munin/Common/Defaults.pm
+--- munin-2.0.76/common/lib/Munin/Common/Defaults.pm	2024-05-17 13:03:48.000000000 +0200
++++ munin-2.0.76-patched/common/lib/Munin/Common/Defaults.pm	2026-03-14 15:50:31.246580115 +0100
+@@ -30,6 +30,7 @@
+ our $MUNIN_MANDIR     = '';
+ our $MUNIN_LOGDIR     = "$COMPONENT_ROOT/log/";
+ our $MUNIN_STATEDIR   = ''; 
++our $MUNIN_TEMPLATEDIR = '';
+ our $MUNIN_USER       = getpwuid $UID;
+ our $MUNIN_GROUP      = getgrgid $GID;
+ our $MUNIN_PLUGINUSER = getpwuid $UID;
+@@ -111,4 +112,3 @@
+ Export all the package variables to the environment.
+ 
+ =back
+-
+diff -urN munin-2.0.76/contrib/munin-every-services-all-boxes-build-html.in munin-2.0.76-patched/contrib/munin-every-services-all-boxes-build-html.in
+--- munin-2.0.76/contrib/munin-every-services-all-boxes-build-html.in	2024-05-17 13:03:48.000000000 +0200
++++ munin-2.0.76-patched/contrib/munin-every-services-all-boxes-build-html.in	2026-03-14 15:50:54.703246763 +0100
+@@ -23,7 +23,7 @@
+ 
+   chown @@USER@@.@@GROUP@@ @@HTMLDIR@@/every-services-all-boxes
+ 
+-in @@CONFDIR@@/templates/munin-overview.tmpl:
++in @@TEMPLATEDIR@@/munin-overview.tmpl:
+ 
+  <div class="box">
+     <a href=every-services-all-boxes>every services on all boxes</a>
+@@ -111,4 +111,3 @@
+     print PF "<table></body></html>\n";
+     close PF;
+ }
+-
+diff -urN munin-2.0.76/master/doc/munin.conf.pod.in munin-2.0.76-patched/master/doc/munin.conf.pod.in
+--- munin-2.0.76/master/doc/munin.conf.pod.in	2024-05-17 13:03:48.000000000 +0200
++++ munin-2.0.76-patched/master/doc/munin.conf.pod.in	2026-03-14 15:50:52.009913432 +0100
+@@ -70,7 +70,7 @@
+ 
+ Directory for files tracking munin's current running state.  Required.
+ 
+-=item B<tmpldir> I<path> (Default: F<@@CONFDIR@@/templates>)
++=item B<tmpldir> I<path> (Default: F<@@TEMPLATEDIR@@>)
+ 
+ Directory for templates used to generate HTML pages.  Required.
+ 
+diff -urN munin-2.0.76/master/lib/Munin/Master/Config.pm munin-2.0.76-patched/master/lib/Munin/Master/Config.pm
+--- munin-2.0.76/master/lib/Munin/Master/Config.pm	2024-05-17 13:03:48.000000000 +0200
++++ munin-2.0.76-patched/master/lib/Munin/Master/Config.pm	2026-03-14 15:50:38.243246780 +0100
+@@ -159,8 +159,8 @@
+ 		tls_private_key  => "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.pem",
+ 		tls_verify_certificate => 0,
+ 		tls_verify_depth => 5,
+-		tmpldir          => "$Munin::Common::Defaults::MUNIN_CONFDIR/templates",
+-	        staticdir        => "$Munin::Common::Defaults::MUNIN_CONFDIR/static",
++		tmpldir          => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR",
++	        staticdir        => "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR/static",
+ 	        cgitmpdir        => "$Munin::Common::Defaults::MUNIN_DBDIR/cgi-tmp",
+ 		ssh_command      => "ssh",
+ 		ssh_options      => "-o ChallengeResponseAuthentication=no -o StrictHostKeyChecking=no",
+diff -urN munin-2.0.76/master/lib/Munin/Master/Utils.pm munin-2.0.76-patched/master/lib/Munin/Master/Utils.pm
+--- munin-2.0.76/master/lib/Munin/Master/Utils.pm	2024-05-17 13:03:48.000000000 +0200
++++ munin-2.0.76-patched/master/lib/Munin/Master/Utils.pm	2026-03-14 15:50:46.313246768 +0100
+@@ -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->{'tmpldir'}       ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/templates/";
+-    $config->{'staticdir'}     ||= "$Munin::Common::Defaults::MUNIN_CONFDIR/static/";
++    $config->{'tmpldir'}       ||= "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR";
++    $config->{'staticdir'}     ||= "$Munin::Common::Defaults::MUNIN_TEMPLATEDIR/static/";
+     $config->{'htmldir'}       ||= $Munin::Common::Defaults::MUNIN_HTMLDIR;
+     $config->{'spooldir'}      ||= $Munin::Common::Defaults::MUNIN_SPOOLDIR;
+     $config->{'#%#parent'}     = undef;
+diff -urN munin-2.0.76/master/munin.conf.in munin-2.0.76-patched/master/munin.conf.in
+--- munin-2.0.76/master/munin.conf.in	2024-05-17 13:03:48.000000000 +0200
++++ munin-2.0.76-patched/master/munin.conf.in	2026-03-14 15:50:49.073246767 +0100
+@@ -12,11 +12,11 @@
+ 
+ # Where to look for the HTML templates
+ #
+-#tmpldir	@@CONFDIR@@/templates
++#tmpldir	@@TEMPLATEDIR@@
+ 
+ # Where to look for the static www files
+ #
+-#staticdir @@CONFDIR@@/static
++#staticdir @@TEMPLATEDIR@@/static
+ 
+ # temporary cgi files are here. note that it has to be writable by 
+ # the cgi user (usually nobody or httpd).
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/munin.git/commitdiff/128eccc11cbec59bae6ccd03f65314a5554ba93a



More information about the pld-cvs-commit mailing list