Accepting request 1297094 from server:monitoring

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1297094
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/munin?expand=0&rev=40

munin-2.0.72.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cda0bbd1af142c000e5c1177ffe5b03c4771062e32324fcaf6e94e466fcf2876
-size 2258511

munin-2.0.75.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9ea2c8d81b96a19e8f26bb9ee6b2cc35790997a53e574c2d4beaf170e5173553
+size 2258514

munin-node.logrotate

@@ -1,4 +1,4 @@
-/var/log/munin/munin-node.log {
+/var/log/munin-node/munin-node.log {
 	daily
 	missingok
 	rotate 7

munin-node.service

@@ -15,8 +15,8 @@ ProtectControlGroups=true
 # end of automatic additions 
 Type=forking
 ExecStart=/usr/sbin/munin-node
-ExecStartPre=/usr/bin/mkdir -p /var/run/munin/
+ExecStartPre=/usr/bin/mkdir -p /var/run/munin-node/
-PIDFile=/var/run/munin/munin-node.pid
+PIDFile=/var/run/munin-node/munin-node.pid
 
 [Install]
 WantedBy=multi-user.target

munin-node.tmpfiles

@@ -1 +1,2 @@
 d /run/munin 0755 munin munin - -
+d /run/munin-node 0755 root root - -

munin-remove-deprecated-INET6.patch

@@ -148,3 +148,33 @@ Index: munin-2.0.72/contrib/Net-Server.patch
       $prop->{_HUP}->[$i]->fdopen($fd, 'w')
         or $self->fatal("Can't open to file descriptor [$!]");
  
+
+https://github.com/munin-monitoring/munin/pull/1661
+From: Bernhard M. Wiedemann <bwiedemann suse de>
+Date: Fri, 25 Jul 2025 15:55:27 +0200
+Subject: [PATCH] Fix IPv6 node connections
+
+Commit 012b33a702155ba7c96fd62028a3559364693c7e changed from
+IO::Socket::INET6 to IO::Socket::IP but that silently changed the meaning
+of our default local_address 0 from :: to 0.0.0.0
+which made IPv6-connections fail by default.
+
+By explicitly defaulting to :: we fix IPv6 connections to munin-node.
+
+Fixes #1402
+
+https://github.com/munin-monitoring/munin/issues/1402#issuecomment-3116582211
+
+diff --git a/master/lib/Munin/Master/Config.pm b/master/lib/Munin/Master/Config.pm
+index a943ee5..ac5953b 100644
+--- a/master/lib/Munin/Master/Config.pm
++++ b/master/lib/Munin/Master/Config.pm
+@@ -146,7 +146,7 @@ my %booleans = map {$_ => 1} qw(
+ 		graph_data_size  => 'normal',
+ 		graph_strategy   => 'cron',
+ 		groups           => {},
+-		local_address    => 0,
++		local_address    => '::',
+ 		logdir           => $Munin::Common::Defaults::MUNIN_LOGDIR,
+ 		max_processes    => 16,
+ 		rundir           => $Munin::Common::Defaults::MUNIN_STATEDIR,

munin.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Jul 25 13:42:56 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.de>
+
+- Update to 2.0.75
+  * replace Date::Manip with Date::Parse
+- extend munin-remove-deprecated-INET6.patch to fix IPv6
+
+-------------------------------------------------------------------
+Tue Jul  8 13:03:35 UTC 2025 - Bernhard Wiedemann <bwiedemann@suse.de>
+
+- Let munin-node use its own log and run sub-directory
+  to avoid privilege escalation (boo#1246089)
+
+-------------------------------------------------------------------
+Tue Jun 17 11:42:04 UTC 2025 - Lubos Kocman <lubos.kocman@suse.com>
+
+- Drop dependency on fast-cgi which was replaced in 2.0.x by munin-httpd
+  https://guide.munin-monitoring.org/en/latest/reference/munin-httpd.html
+
+-------------------------------------------------------------------
+Sun Sep 29 20:48:44 UTC 2024 - Thorsten Kukuk <kukuk@suse.com>
+
+- Add /srv/www directories to filelist [bsc#1231027]
+
 -------------------------------------------------------------------
 Thu Jun 13 10:19:33 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

munin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package munin
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 %define plugindir %{_prefix}/lib/munin/plugins
 %define active_by_default 0
 Name:           munin
-Version:        2.0.72
+Version:        2.0.75
 Release:        0
 Summary:        Network-wide graphing framework (grapher/gatherer)
 License:        GPL-2.0-only
@@ -71,8 +71,7 @@ Requires:       perl-base = %{perl_version}
 Requires:       perl-rrdtool
 Requires:       rrdtool
 Requires:       shadow
-Requires:       spawn-fcgi
+Requires:       perl(Date::Parse)
-Requires:       perl(Date::Manip)
 Requires:       perl(FCGI)
 Requires:       perl(File::Copy::Recursive)
 Requires:       perl(HTML::Template)
@@ -194,7 +193,7 @@ unzip %{SOURCE13}
 %__install -m0644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/cron.d/munin
 %endif
 
-%__mkdir_p %{buildroot}/%{logdir}
+%__mkdir_p %{buildroot}/%{logdir} %{buildroot}/%{logdir}-node
 %__mkdir_p %{buildroot}/%{htmldir}
 %__mkdir_p %{buildroot}/%{dbdir}
 %__mkdir_p %{buildroot}/%{dbdir}/plugin-state
@@ -209,6 +208,11 @@ ln munin-gsa-master/README.md README.gsa
 %python3_fix_shebang_path %{buildroot}/%{plugindir}/*
 %endif
 
+# for boo#1246089
+sed -i 's,/var/log/munin/,/var/log/munin-node/,;
+        s,/var/run/munin/,/var/run/munin-node/,' \
+        %{buildroot}/etc/munin/munin-node.conf
+
 # Fix rpmlint warning: This script uses 'env' as an interpreter.
 for F in \
 	%{buildroot}/%{_prefix}/lib/munin/plugins/ipmi_sensor_ \
@@ -300,6 +304,7 @@ fi
 %{_prefix}/lib/munin/munin-update
 %{_prefix}/lib/munin/DejaVuSans.ttf
 %{_prefix}/lib/munin/DejaVuSansMono.ttf
+%dir %{cgidir}
 %{cgidir}/munin-cgi-graph
 %{cgidir}/munin-cgi-html
 %{_prefix}/lib/tmpfiles.d/munin.conf
@@ -313,6 +318,8 @@ fi
 %dir %{_sysconfdir}/cron.d
 %config %{_sysconfdir}/cron.d/munin
 %endif
+%dir /srv/www
+%dir /srv/www/htdocs
 %attr(0755, munin, munin) %dir %{htmldir}
 %attr(0444, munin, munin) %{htmldir}/.htaccess
 %dir %{_sysconfdir}/munin
@@ -450,11 +457,11 @@ fi
 %{_mandir}/man3/Munin::Plugin.3pm.gz
 %{_mandir}/man3/Munin::Plugin::Pgsql.3pm.gz
 %{_mandir}/man3/Munin::Plugin::SNMP.3pm.gz
-%attr(0750, munin, munin) %dir %{logdir}
 %attr(0755, munin, munin) %dir %{dbdir}
 %attr(0775, nobody, nobody) %dir %{dbdir}/plugin-state
-%ghost %{logdir}/munin-node.log
+%attr(0750, root, root) %dir %{logdir}-node
-%ghost /run/munin
+%ghost %{logdir}-node/munin-node.log
+%ghost /run/munin-node
 %dir %{_prefix}/lib/firewalld
 %dir %{_prefix}/lib/firewalld/services
 %{_prefix}/lib/firewalld/services/munin-node.xml