From 27012de62a80add6fb84bc97e9787543acae81c4 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 23 Sep 2021 13:08:02 +0200 Subject: [PATCH 01/15] Update to mrtg-2.17.8 Signed-off-by: Vitezslav Crhonek --- .gitignore | 2 ++ mrtg-2.17.7-traffic-sum-man-option.patch | 12 ------------ mrtg.spec | 11 ++++++----- sources | 4 ++-- 4 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 mrtg-2.17.7-traffic-sum-man-option.patch diff --git a/.gitignore b/.gitignore index 7e4f9fb..f4d0afd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /mrtg-2.17.7.tar.gz /mrtg-2.17.7.tar.gz.md5 +/mrtg-2.17.8.tar.gz +/mrtg-2.17.8.tar.gz.md5 diff --git a/mrtg-2.17.7-traffic-sum-man-option.patch b/mrtg-2.17.7-traffic-sum-man-option.patch deleted file mode 100644 index c547faf..0000000 --- a/mrtg-2.17.7-traffic-sum-man-option.patch +++ /dev/null @@ -1,12 +0,0 @@ -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) } diff --git a/mrtg.spec b/mrtg.spec index d4e7161..7a38517 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -10,8 +10,8 @@ Summary: Multi Router Traffic Grapher Name: mrtg -Version: 2.17.7 -Release: 13%{?dist} +Version: 2.17.8 +Release: 1%{?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,6 @@ 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: 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 @@ -84,7 +82,6 @@ Custom SELinux policy module %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}_" @@ -214,6 +211,10 @@ fi %endif %changelog +* Thu Sep 23 2021 Vitezslav Crhonek - 2.17.8-1 +- Update to mrtg-2.17.8 + Resolves: #1990765 + * Thu Jul 22 2021 Fedora Release Engineering - 2.17.7-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index c80672a..e04e67f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mrtg-2.17.7.tar.gz) = b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768 -SHA512 (mrtg-2.17.7.tar.gz.md5) = 146bf77c985e54e949daceb3bfe2b7c8f67f7f1c495a3e666957a91514c6fcadeb02ecc5d42d8536fef1b9e70779018736ffe602c216f6c283c9f784f0cad50f +SHA512 (mrtg-2.17.8.tar.gz) = c1dbeb5ce065b2b071d18e1eec1100d56eb7c4c654562de530139acee27ad57614354b74e3d0777cb6d4470a58ed6acae0f1af9c6f7115bf329132a68b6e0aaa +SHA512 (mrtg-2.17.8.tar.gz.md5) = 06509698e604c0ee4306faaaa795f589a46420f470a0b5dd722232b5982a00c324de133fada37f131d8840b7c6ac0669877b8f7b380c608e6b5efa0857f191f9 From b280c8105d0d2625771ed3794b7a16106da7cd4d Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 20 Jan 2022 12:02:47 +0100 Subject: [PATCH 02/15] Update to mrtg-2.17.10 --- .gitignore | 6 ++---- mrtg-2.17.4-cfgmaker-ifhighspeed.patch | 8 ++++---- mrtg.spec | 6 +++++- sources | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index f4d0afd..61e9911 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/mrtg-2.17.7.tar.gz -/mrtg-2.17.7.tar.gz.md5 -/mrtg-2.17.8.tar.gz -/mrtg-2.17.8.tar.gz.md5 +/mrtg-2.17.10.tar.gz +/mrtg-2.17.10.tar.gz.md5 diff --git a/mrtg-2.17.4-cfgmaker-ifhighspeed.patch b/mrtg-2.17.4-cfgmaker-ifhighspeed.patch index 3ec8bf7..0b401f4 100644 --- a/mrtg-2.17.4-cfgmaker-ifhighspeed.patch +++ b/mrtg-2.17.4-cfgmaker-ifhighspeed.patch @@ -1,9 +1,9 @@ -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 +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 @@ -224,7 +224,7 @@ sub InterfaceInfo($$$$$) { # maximum value (4,294,967,295) and ifHighSpeed must be used - # to report the interace's speed. For a sub-layer which has + # to report the interface'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)) { diff --git a/mrtg.spec b/mrtg.spec index 7a38517..a9d0c34 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -10,7 +10,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg -Version: 2.17.8 +Version: 2.17.10 Release: 1%{?dist} URL: http://oss.oetiker.ch/mrtg/ Source0: http://oss.oetiker.ch/mrtg/pub/mrtg-%{version}.tar.gz @@ -211,6 +211,10 @@ fi %endif %changelog +* Thu Jan 20 2022 Vitezslav Crhonek - 2.17.10-1 +- Update to mrtg-2.17.10 + Resolves: #2041965 + * Thu Sep 23 2021 Vitezslav Crhonek - 2.17.8-1 - Update to mrtg-2.17.8 Resolves: #1990765 diff --git a/sources b/sources index e04e67f..40483cd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mrtg-2.17.8.tar.gz) = c1dbeb5ce065b2b071d18e1eec1100d56eb7c4c654562de530139acee27ad57614354b74e3d0777cb6d4470a58ed6acae0f1af9c6f7115bf329132a68b6e0aaa -SHA512 (mrtg-2.17.8.tar.gz.md5) = 06509698e604c0ee4306faaaa795f589a46420f470a0b5dd722232b5982a00c324de133fada37f131d8840b7c6ac0669877b8f7b380c608e6b5efa0857f191f9 +SHA512 (mrtg-2.17.10.tar.gz) = b1c5232f1b3dcec39adc4fb5a423738f9470ad470e91c6a918cf3f875e71af263d8e03694c3d66129b2653fa498d8d9d9b95349fe90e9d2e0b3ed6c09d06e080 +SHA512 (mrtg-2.17.10.tar.gz.md5) = 3969a24f542daa4e513ab03dc6ced38160818e7ddfdf35f7c4c4323442d8cd35314baba0f5c443634e1d409769b6a9f4bebfa5ea970bec8ff1fcd7bcfd1c7d5d From 9d80b096bd4faf3a4807438f928152ddf8143c54 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 23:53:27 +0000 Subject: [PATCH 03/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mrtg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index a9d0c34..3754c25 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 1%{?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 @@ -211,6 +211,9 @@ fi %endif %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 2.17.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Vitezslav Crhonek - 2.17.10-1 - Update to mrtg-2.17.10 Resolves: #2041965 From c1080602cf39175e6030c35ec809e7eacd53ad47 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 16 Dec 2022 17:01:29 +0100 Subject: [PATCH 04/15] Port configure script to C99 Related to: --- mrtg-configure-c99.patch | 32 ++++++++++++++++++++++++++++++++ mrtg.spec | 7 ++++++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 mrtg-configure-c99.patch diff --git a/mrtg-configure-c99.patch b/mrtg-configure-c99.patch new file mode 100644 index 0000000..bc0831c --- /dev/null +++ b/mrtg-configure-c99.patch @@ -0,0 +1,32 @@ +Avoid an implicit declaration of exit. This prevents compilation +failures in case compilers switch to rejecting implicit function +declarations by default. + +Submitted upstream: + +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" diff --git a/mrtg.spec b/mrtg.spec index 3754c25..0d55415 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 2%{?dist} +Release: 3%{?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,6 +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: GPLv2+ Requires(post): systemd-units Requires(preun): systemd-units @@ -82,6 +83,7 @@ Custom SELinux policy module %patch0 -p1 -b .lib64 %patch1 -p1 -b .socket6 %patch2 -p1 -b .ifhighspeed +%patch3 -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}_" @@ -211,6 +213,9 @@ fi %endif %changelog +* Fri Dec 16 2022 Florian Weimer - 2.17.10-3 +- Port configure script to C99 + * Thu Jul 21 2022 Fedora Release Engineering - 2.17.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8f74ee2a253153587e52fc3e0e7b28712f2bb5f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 20:53:31 +0000 Subject: [PATCH 05/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mrtg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index 0d55415..fbf0663 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 3%{?dist} +Release: 4%{?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 Jan 19 2023 Fedora Release Engineering - 2.17.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Dec 16 2022 Florian Weimer - 2.17.10-3 - Port configure script to C99 From 5d612cdc2e5b0d3feff97a9542a98c5559bf2456 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 25 Apr 2023 13:53:55 +0200 Subject: [PATCH 06/15] SPDX migration --- mrtg.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mrtg.spec b/mrtg.spec index fbf0663..9b5190b 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 4%{?dist} +Release: 5%{?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 @@ -39,7 +39,7 @@ 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: GPLv2+ +License: GPL-2.0-or-later Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -213,6 +213,9 @@ fi %endif %changelog +* Tue Apr 25 2023 Vitezslav Crhonek - 2.17.10-5 +- SPDX migration + * Thu Jan 19 2023 Fedora Release Engineering - 2.17.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1eee0038c2aa45f52f1298e949da6b89a9415a53 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 15:57:53 +0000 Subject: [PATCH 07/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mrtg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index 9b5190b..c67d961 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 5%{?dist} +Release: 6%{?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 20 2023 Fedora Release Engineering - 2.17.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 25 2023 Vitezslav Crhonek - 2.17.10-5 - SPDX migration From ed1f0af53e397af8965398acac8c4ee3ebc4e0e1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 08:48:52 +0000 Subject: [PATCH 08/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mrtg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index c67d961..e9b970c 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 6%{?dist} +Release: 7%{?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 +* Sun Jan 21 2024 Fedora Release Engineering - 2.17.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 2.17.10-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From bde49709998c411cc045a2f71f5d9c3fe37b9cfa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:15:20 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mrtg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index e9b970c..e27c4ac 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.10 -Release: 7%{?dist} +Release: 8%{?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 Jan 25 2024 Fedora Release Engineering - 2.17.10-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 2.17.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 55316ec68c67d9fe3ca3a91b1b3b774b9e0c8f9f Mon Sep 17 00:00:00 2001 From: Zdenek Pytela Date: Tue, 6 Feb 2024 21:31:18 +0100 Subject: [PATCH 10/15] Rename all /var/run file context entries to /run With the 1f76e522a ("Rename all /var/run file context entries to /run") selinux-policy commit, all /var/run file context entries moved to /run and the equivalency was inverted. Subsequently, changes in mrtg.fc need to be done, too, in a similar manner. Together with that, the "/run/lock = /var/lock" equivalency was also inverted and entries moved. --- mrtg.fc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mrtg.fc b/mrtg.fc index 340735d..b235a1b 100644 --- a/mrtg.fc +++ b/mrtg.fc @@ -7,10 +7,10 @@ /var/lib/mrtg(/.*)? gen_context(system_u:object_r:mrtg_var_lib_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) +/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/log/mrtg.* gen_context(system_u:object_r:mrtg_log_t,s0) -/var/run/mrtg\.pid -- gen_context(system_u:object_r:mrtg_var_run_t,s0) +/run/mrtg\.pid -- gen_context(system_u:object_r:mrtg_var_run_t,s0) From 8f4fd3e46751827705dc78d752edd925c3176666 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 11/15] 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 12/15] 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 13/15] 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 14/15] 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 15/15] 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