.gitignore

@@ -1,2 +1,2 @@
-/mrtg-2.17.10.tar.gz
-/mrtg-2.17.10.tar.gz.md5
+/mrtg-2.17.7.tar.gz
+/mrtg-2.17.7.tar.gz.md5

mrtg-2.17.4-cfgmaker-ifhighspeed.patch

@@ -1,9 +1,9 @@
-diff -up mrtg-2.17.10/bin/cfgmaker.orig mrtg-2.17.10/bin/cfgmaker
---- mrtg-2.17.10/bin/cfgmaker.orig	2022-01-20 08:05:38.441966441 +0100
-+++ mrtg-2.17.10/bin/cfgmaker	2022-01-20 08:05:59.947909140 +0100
+diff -up mrtg-2.17.7/bin/cfgmaker.orig mrtg-2.17.7/bin/cfgmaker
+--- mrtg-2.17.7/bin/cfgmaker.orig	2018-08-08 13:14:19.609048676 +0200
++++ mrtg-2.17.7/bin/cfgmaker	2018-08-08 13:15:17.795102892 +0200
 @@ -224,7 +224,7 @@ sub InterfaceInfo($$$$$) {
  #            maximum value (4,294,967,295) and ifHighSpeed must be used
- #            to report the interface's speed.  For a sub-layer which has
+ #            to report the interace's speed.  For a sub-layer which has
  #            no concept of bandwidth, this object should be zero."
 -            if ( (not defined $value) || ($value == 2**32-1) ) {
 +            if ( (not defined $value) || ($value == 2**32-1) || ($value == 2**32-2)) {

mrtg-2.17.7-traffic-sum-man-option.patch

@@ -0,0 +1,12 @@
+diff -up mrtg-2.17.7/bin/mrtg-traffic-sum.orig mrtg-2.17.7/bin/mrtg-traffic-sum
+--- mrtg-2.17.7/bin/mrtg-traffic-sum.orig	2018-10-18 12:21:12.616589922 +0200
++++ mrtg-2.17.7/bin/mrtg-traffic-sum	2018-10-18 12:23:10.852648709 +0200
+@@ -58,7 +58,7 @@ sub mailout($$);
+ sub main()
+ {
+     # parse options
+-    GetOptions(\%opt, 'min=i','help|h', 'catch=s', 'email=s','version','range=s','units=s') or exit(1);
++    GetOptions(\%opt, 'min=i','help|h', 'catch=s', 'email=s','version','range=s','units=s','man') or exit(1);
+     if($opt{help})     { pod2usage(1) }
+     if($opt{man})      { pod2usage(-exitstatus => 0, -verbose => 2) }
+     if($opt{version})  { print "mrtg-traffic-sum $Revision\n"; exit(0) }

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

@@ -10,8 +10,8 @@
 
 Summary:   Multi Router Traffic Grapher
 Name:      mrtg
-Version:   2.17.10
-Release:   12%{?dist}
+Version:   2.17.7
+Release:   13%{?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,9 @@ 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
+# Patch3: fixes 'man' option in mrtg-traffic-sum, see rhbz#1612188
+Patch3:    mrtg-2.17.7-traffic-sum-man-option.patch
+License:   GPLv2+
 Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
@@ -80,10 +81,10 @@ 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
+%patch3 -p1 -b .traffic-sum-man-option
 
 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 +152,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 +177,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,52 +210,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
-
-* Thu Jan 20 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.10-1
-- Update to mrtg-2.17.10
-  Resolves: #2041965
-
-* Thu Sep 23 2021 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.17.8-1
-- Update to mrtg-2.17.8
-  Resolves: #1990765
-
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.17.7-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (mrtg-2.17.10.tar.gz) = b1c5232f1b3dcec39adc4fb5a423738f9470ad470e91c6a918cf3f875e71af263d8e03694c3d66129b2653fa498d8d9d9b95349fe90e9d2e0b3ed6c09d06e080
-SHA512 (mrtg-2.17.10.tar.gz.md5) = 3969a24f542daa4e513ab03dc6ced38160818e7ddfdf35f7c4c4323442d8cd35314baba0f5c443634e1d409769b6a9f4bebfa5ea970bec8ff1fcd7bcfd1c7d5d
+SHA512 (mrtg-2.17.7.tar.gz) = b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768
+SHA512 (mrtg-2.17.7.tar.gz.md5) = 146bf77c985e54e949daceb3bfe2b7c8f67f7f1c495a3e666957a91514c6fcadeb02ecc5d42d8536fef1b9e70779018736ffe602c216f6c283c9f784f0cad50f