From a881836b8d80e48405bcfe6de3c47b9da501bf07 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:26:34 +0000 Subject: [PATCH 1/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- munin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/munin.spec b/munin.spec index d9a1781..eab9b4a 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.76 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Network-wide resource monitoring tool License: GPL-2.0-only URL: http://munin-monitoring.org/ @@ -659,6 +659,9 @@ exit 0 %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.0.76-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Oct 21 2024 Kim B. Heino - 2.0.76-3 - Don't restart firewalld on package update, rhbz #2295597 From 5335015f6bed36694c479ef9fbb01ede49608557 Mon Sep 17 00:00:00 2001 From: "Kim B. Heino" Date: Mon, 27 Jan 2025 15:34:48 +0200 Subject: [PATCH 2/7] rhbz 2340895: Fix build on Fedora 42 --- munin.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/munin.spec b/munin.spec index eab9b4a..cab509d 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.76 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Network-wide resource monitoring tool License: GPL-2.0-only URL: http://munin-monitoring.org/ @@ -232,6 +232,7 @@ FastCGI so you don't need this package. sed -i -e ' s,^PREFIX = \(.*\),PREFIX = $(DESTDIR)%{_prefix},; + s,^SBINDIR = \(.*\),SBINDIR = $(DESTDIR)%{_sbindir},; s,^CONFDIR = \(.*\),CONFDIR = $(DESTDIR)%{_sysconfdir}/munin,; s,^DOCDIR = \(.*\),DOCDIR = $(DESTDIR)%{_docdir}/%{name}-%{version},; s,^MANDIR = \(.*\),MANDIR = $(DESTDIR)%{_mandir},; @@ -659,6 +660,9 @@ exit 0 %changelog +* Mon Jan 27 2025 Kim B. Heino - 2.0.76-5 +- rhbz 2340895: Fix build on Fedora 42 + * Fri Jan 17 2025 Fedora Release Engineering - 2.0.76-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 14d481ff843d2d2aaa8978f1542ad88afbbcc67d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 15:53:23 +0100 Subject: [PATCH 3/7] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- munin.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/munin.spec b/munin.spec index cab509d..781090b 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.76 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Network-wide resource monitoring tool License: GPL-2.0-only URL: http://munin-monitoring.org/ @@ -92,7 +92,6 @@ Requires: perl(Taint::Runtime) Requires: perl(Text::Balanced) Requires: perl(Time::HiRes) Requires: rrdtool -Requires(pre): shadow-utils %{?systemd_requires} BuildArch: noarch @@ -131,7 +130,6 @@ Requires: perl(Net::CIDR) Requires: perl(Net::SSLeay) Requires: perl(Net::Server) Requires: procps-ng -Requires(pre): shadow-utils Requires(pre): %{_sbindir}/semanage Requires(pre): %{_sbindir}/restorecon %{?systemd_requires} @@ -160,7 +158,6 @@ SNMP or similar technology. %package common Summary: Network-wide resource monitoring tool (common files) Requires: acl -Requires(pre): shadow-utils %{?systemd_requires} BuildArch: noarch @@ -266,6 +263,11 @@ cp %SOURCE16 . cp %SOURCE17 . cp %SOURCE18 . +# Create a sysusers.d config file +cat >munin.sysusers.conf </dev/null || groupadd -r munin -getent passwd munin >/dev/null || useradd -r -g munin -d %{_sharedstatedir}/munin -s /bin/sh -c "Munin user" munin -exit 0 %post @@ -582,6 +582,7 @@ exit 0 %config(noreplace) %ghost %{_sysconfdir}/httpd/conf.d/munin.conf %config(noreplace) %ghost %{_sysconfdir}/httpd/conf.d/munin-cgi.conf %config(noreplace) %ghost %{_localstatedir}/www/html/munin/.htaccess +%{_sysusersdir}/munin.conf %files node @@ -660,6 +661,9 @@ exit 0 %changelog +* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.0.76-6 +- Add sysusers.d config file to allow rpm to create users/groups automatically + * Mon Jan 27 2025 Kim B. Heino - 2.0.76-5 - rhbz 2340895: Fix build on Fedora 42 From b9d3bae50ab2e9b5137bc7d9245fd7f2bc73c190 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:30:37 +0000 Subject: [PATCH 4/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- munin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/munin.spec b/munin.spec index 781090b..01e9565 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.76 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Network-wide resource monitoring tool License: GPL-2.0-only URL: http://munin-monitoring.org/ @@ -661,6 +661,9 @@ exit 0 %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.0.76-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 2.0.76-6 - Add sysusers.d config file to allow rpm to create users/groups automatically From 11f3c22afc88319d4755d15abfc9685f8ce62dd6 Mon Sep 17 00:00:00 2001 From: "Kim B. Heino" Date: Sun, 28 Dec 2025 20:09:31 +0200 Subject: [PATCH 5/7] rhbz 2406177: Move sysusers.d config to munin-common --- munin.spec | 50 ++++++++++++-------------------------------------- munin.sysusers | 1 + 2 files changed, 13 insertions(+), 38 deletions(-) create mode 100644 munin.sysusers diff --git a/munin.spec b/munin.spec index 01e9565..41d1715 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.76 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Network-wide resource monitoring tool License: GPL-2.0-only URL: http://munin-monitoring.org/ @@ -36,6 +36,9 @@ Source33: munin-cgi-graph.socket Source34: munin-cgi-html.service Source35: munin-cgi-html.socket +# Common sources +Source40: munin.sysusers + # Patches Patch101: 21b3d860c17d7997d64267963f91ed75ca8a3e03.patch Patch102: cd842e36f3ab1a55c05304d6b78dc07048bd8f84.patch @@ -159,6 +162,7 @@ SNMP or similar technology. Summary: Network-wide resource monitoring tool (common files) Requires: acl %{?systemd_requires} +%{?sysusers_requires_compat} BuildArch: noarch @@ -263,11 +267,6 @@ cp %SOURCE16 . cp %SOURCE17 . cp %SOURCE18 . -# Create a sysusers.d config file -cat >munin.sysusers.conf </dev/null)" ]; then - mv -f %{_sysconfdir}/munin/conf.d/* %{_sysconfdir}/munin/munin-conf.d/ -fi -exit 0 - - -%triggerpostun -- munin < 2.0.69-2 -if [ -d %{_sysconfdir}/munin/conf.d ]; then - if ! rmdir %{_sysconfdir}/munin/conf.d 2>/dev/null; then - mv -f %{_sysconfdir}/munin/conf.d %{_sysconfdir}/munin/conf.d.rpmold - fi -fi -if [ -f %{_sysconfdir}/munin/munin.conf.rpmnew ]; then - if [ -n "$(ls %{_sysconfdir}/munin/munin-conf.d/* 2>/dev/null)" ]; then - ln -sf munin-conf.d %{_sysconfdir}/munin/conf.d - fi -fi -exit 0 - - -%pre node -getent group munin >/dev/null || groupadd -r munin -getent passwd munin >/dev/null || useradd -r -g munin -d %{_sharedstatedir}/munin -s /bin/sh -c "Munin user" munin -exit 0 - - %post node # Create log file [ -f %{_localstatedir}/log/munin-node/munin-node.log ] || \ @@ -503,9 +476,7 @@ fi %pre common -getent group munin >/dev/null || groupadd -r munin -getent passwd munin >/dev/null || useradd -r -g munin -d %{_sharedstatedir}/munin -s /bin/sh -c "Munin user" munin -exit 0 +%sysusers_create_compat %{SOURCE40} %post nginx @@ -582,7 +553,6 @@ exit 0 %config(noreplace) %ghost %{_sysconfdir}/httpd/conf.d/munin.conf %config(noreplace) %ghost %{_sysconfdir}/httpd/conf.d/munin-cgi.conf %config(noreplace) %ghost %{_localstatedir}/www/html/munin/.htaccess -%{_sysusersdir}/munin.conf %files node @@ -630,6 +600,7 @@ exit 0 %dir %{perl_vendorlib}/Munin %{perl_vendorlib}/Munin/Common %{_tmpfilesdir}/%{name}.conf +%{_sysusersdir}/munin.conf %attr(0775, root, munin) %dir %{_rundir}/munin @@ -661,6 +632,9 @@ exit 0 %changelog +* Sun Dec 28 2025 Kim B. Heino - 2.0.76-8 +- rhbz 2406177: Move sysusers.d config to munin-common + * Thu Jul 24 2025 Fedora Release Engineering - 2.0.76-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/munin.sysusers b/munin.sysusers new file mode 100644 index 0000000..50515ab --- /dev/null +++ b/munin.sysusers @@ -0,0 +1 @@ +u munin - "Munin user" /var/lib/munin /bin/sh From eaf3b3bfab0799ae5b6fb3e46b283bb8b1d04059 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 21:47:02 +0000 Subject: [PATCH 6/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- munin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/munin.spec b/munin.spec index 41d1715..883440f 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.76 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Network-wide resource monitoring tool License: GPL-2.0-only URL: http://munin-monitoring.org/ @@ -632,6 +632,9 @@ fi %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2.0.76-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Sun Dec 28 2025 Kim B. Heino - 2.0.76-8 - rhbz 2406177: Move sysusers.d config to munin-common From adb3603dc922c36b2fd3f41eb0d9eebd255e0e2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 09:09:21 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- munin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/munin.spec b/munin.spec index 883440f..85e913d 100644 --- a/munin.spec +++ b/munin.spec @@ -1,6 +1,6 @@ Name: munin Version: 2.0.76 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Network-wide resource monitoring tool License: GPL-2.0-only URL: http://munin-monitoring.org/ @@ -632,6 +632,9 @@ fi %changelog +* Thu Jul 16 2026 Fedora Release Engineering - 2.0.76-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Jan 16 2026 Fedora Release Engineering - 2.0.76-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild