mrtg-configure-c99.patch

@@ -1,32 +0,0 @@
-Avoid an implicit declaration of exit.  This prevents compilation
-failures in case compilers switch to rejecting implicit function
-declarations by default.
-
-Submitted upstream: <https://github.com/oetiker/mrtg/pull/104>
-
-diff --git a/configure b/configure
-index 07b0fbda88c3847a..8b87d2750822c02b 100755
---- a/configure
-+++ b/configure
-@@ -3670,7 +3670,7 @@ else
-                 char buffer[1000];
-                 sprintf (buffer, "%${format}u", a);
-                 sscanf (buffer, "%${format}u", &b);
--                exit (b!=a);
-+                return b!=a;
-             }
- 
- _ACEOF
-diff --git a/configure.ac b/configure.ac
-index 1416f3c2d6e2f645..939725ccf306fb2f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,7 +37,7 @@ AC_CACHE_VAL(mr_cv_long_long_format_specifier,[
-                 char buffer[1000];
-                 sprintf (buffer, "%${format}u", a);
-                 sscanf (buffer, "%${format}u", &b);
--                exit (b!=a);
-+                return b!=a;
-             }
-             ]])],[mr_cv_long_long_format_specifier="%${format}d"
-             mr_cv_long_long_format="${format}d"

mrtg.fc

@@ -7,10 +7,10 @@
 
 /var/lib/mrtg(/.*)?	gen_context(system_u:object_r:mrtg_var_lib_t,s0)
 
-/run/lock/mrtg(/.*)?	gen_context(system_u:object_r:mrtg_lock_t,s0)
-/run/lock/mrtg-rrd(/.*)?	gen_context(system_u:object_r:mrtg_lock_t,s0)
-/run/lock/subsys/mrtg	--	gen_context(system_u:object_r:mrtg_lock_t,s0)
+/var/lock/mrtg(/.*)?	gen_context(system_u:object_r:mrtg_lock_t,s0)
+/var/lock/mrtg-rrd(/.*)?	gen_context(system_u:object_r:mrtg_lock_t,s0)
+/var/lock/subsys/mrtg	--	gen_context(system_u:object_r:mrtg_lock_t,s0)
 
 /var/log/mrtg.*	gen_context(system_u:object_r:mrtg_log_t,s0)
 
-/run/mrtg\.pid	--	gen_context(system_u:object_r:mrtg_var_run_t,s0)
+/var/run/mrtg\.pid	--	gen_context(system_u:object_r:mrtg_var_run_t,s0)

mrtg.spec

@@ -11,7 +11,7 @@
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
 Version:   2.17.10
-Release:   12%{?dist}
+Release:   2%{?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
@@ -38,8 +38,7 @@ Patch0:    mrtg-2.15.0-lib64.patch
 Patch1:    mrtg-2.17.2-socket6-fix.patch
 # Patch2: some devices return 2**32-2 on ifSpeed (e. g. IBM FibreChannel switches)
 Patch2:    mrtg-2.17.4-cfgmaker-ifhighspeed.patch
-Patch3:    mrtg-configure-c99.patch
-License:   GPL-2.0-or-later
+License:   GPLv2+
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -80,10 +79,9 @@ Custom SELinux policy module
 
 %prep
 %setup -q
-%patch -P0 -p1 -b .lib64
-%patch -P1 -p1 -b .socket6
-%patch -P2 -p1 -b .ifhighspeed
-%patch -P3 -p1 -b .c99
+%patch0 -p1 -b .lib64
+%patch1 -p1 -b .socket6
+%patch2 -p1 -b .ifhighspeed
 
 for i in doc/mrtg-forum.1 doc/mrtg-squid.1 CHANGES; do
     iconv -f iso-8859-1 -t utf-8 < "$i" > "${i}_"
@@ -151,6 +149,7 @@ 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
@@ -175,7 +174,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 &> /dev/null || :
+   %systemd_postun_with_restart mrtg.service
 fi
 
 %postun selinux
@@ -208,41 +207,10 @@ fi
 %files selinux
 %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.*
 %{_datadir}/selinux/devel/include/distributed/%{modulename}.if
-%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename}
+%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename}
 %endif
 
 %changelog
-* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.10-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Feb 04 2025 Vitezslav Crhonek <vcrhonek@redhat.com> - 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 <releng@fedoraproject.org> - 2.17.10-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.10-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.10-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.10-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.10-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Apr 25 2023 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.10-5
-- SPDX migration
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.10-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Dec 16 2022 Florian Weimer <fweimer@redhat.com> - 2.17.10-3
-- Port configure script to C99
-
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild