From 8f4fd3e46751827705dc78d752edd925c3176666 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 1/5] Eliminate use of obsolete %patchN syntax (#2283636) --- mrtg.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mrtg.spec b/mrtg.spec index e27c4ac..15519a2 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -80,10 +80,10 @@ Custom SELinux policy module %prep %setup -q -%patch0 -p1 -b .lib64 -%patch1 -p1 -b .socket6 -%patch2 -p1 -b .ifhighspeed -%patch3 -p1 -b .c99 +%patch -P0 -p1 -b .lib64 +%patch -P1 -p1 -b .socket6 +%patch -P2 -p1 -b .ifhighspeed +%patch -P3 -p1 -b .c99 for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_" From 048f02b0cdb92be6ad9b85b0aa68b19d5368c858 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 18:49:41 +0000 Subject: [PATCH 2/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mrtg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index 15519a2..505abbc 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 8%{?dist} +Release: 9%{?dist} URL: http://oss.oetiker.ch/mrtg/ Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5 @@ -213,6 +213,9 @@ fi %endif %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.17.10-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 2.17.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 50cedf0152b8d9426da36c05225887c35d78cd22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:18:18 +0000 Subject: [PATCH 3/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mrtg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index 505abbc..ba20aab 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 9%{?dist} +Release: 10%{?dist} URL: http://oss.oetiker.ch/mrtg/ Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5 @@ -213,6 +213,9 @@ fi %endif %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.17.10-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 2.17.10-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e7ebc6a1df5a6a781244077bbe80ba604e49f566 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 4 Feb 2025 12:06:24 +0100 Subject: [PATCH 4/5] Update spec file parts related to independent SELinux policy --- mrtg.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mrtg.spec b/mrtg.spec index ba20aab..ad2f9f8 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 10%{?dist} +Release: 11%{?dist} URL: http://oss.oetiker.ch/mrtg/ Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5 @@ -151,7 +151,6 @@ install -D -p -m 0644 selinux/%{modulename}.if %{buildroot}%{_datadir}/selinux/d %post install -d -m 0755 -o root -g root /var/lock/mrtg -restorecon /var/lock/mrtg %systemd_post mrtg.service %preun @@ -176,7 +175,7 @@ fi if [ "$1" -le "1" ]; then # First install # the service needs to be restarted for the custom label to be applied - %systemd_postun_with_restart mrtg.service + %systemd_postun_with_restart mrtg.service &> /dev/null || : fi %postun selinux @@ -209,10 +208,14 @@ fi %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.* %{_datadir}/selinux/devel/include/distributed/%{modulename}.if -%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} +%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} %endif %changelog +* Tue Feb 04 2025 Vitezslav Crhonek - 2.17.10-11 +- Remove redundand restorecon call, redirect safe to ignore output + to /dev/null, mark module directory to avoid rpm verification + * Fri Jan 17 2025 Fedora Release Engineering - 2.17.10-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 2fa25f7d6d3c1f4545153669efa552248bc94a3f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:26:32 +0000 Subject: [PATCH 5/5] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mrtg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index ad2f9f8..1f24bd2 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 11%{?dist} +Release: 12%{?dist} URL: http://oss.oetiker.ch/mrtg/ Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz Source1: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz.md5 @@ -212,6 +212,9 @@ fi %endif %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.17.10-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Feb 04 2025 Vitezslav Crhonek - 2.17.10-11 - Remove redundand restorecon call, redirect safe to ignore output to /dev/null, mark module directory to avoid rpm verification