From e8ed097faa3eb141ddf9aa7a13ce8782fa8160c5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 03:24:21 +0000 Subject: [PATCH 01/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 b8d341d..1abf728 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.4 -Release: 21%{?dist} +Release: 22%{?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 @@ -140,6 +140,9 @@ fi %{_unitdir}/mrtg.timer %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 2.17.4-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 2.17.4-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 9bb4bcba0ac032043db54ce7bb9cf533274b1d1f Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 22 Feb 2018 09:33:58 +0100 Subject: [PATCH 02/38] Add BuildRequires gcc --- mrtg.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index 1abf728..b167741 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.4 -Release: 22%{?dist} +Release: 23%{?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 @@ -40,6 +40,7 @@ Requires: gd BuildRequires: gd-devel, libpng-devel BuildRequires: perl-generators BuildRequires: systemd-units +BuildRequires: gcc %global __find_requires %{SOURCE3} %global __find_provides %{SOURCE6} @@ -140,6 +141,9 @@ fi %{_unitdir}/mrtg.timer %changelog +* Thu Feb 22 2018 Vitezslav Crhonek - 2.17.4-23 +- Add BuildRequires gcc + * Thu Feb 08 2018 Fedora Release Engineering - 2.17.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 41b3f0f698a1dbaf895fd5d7f39c20a5929b4ad8 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 22 Feb 2018 09:35:19 +0100 Subject: [PATCH 03/38] Remove Group tag --- mrtg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index b167741..b94c8ed 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -31,7 +31,6 @@ Patch3: mrtg-2.17.4-cfgmaker-ifhighspeed.patch # Patch4: fix uninitialized value errors in cfgmaker Patch4: mrtg-2.17.4-cfgmaker-uninitialized-value.patch License: GPLv2+ -Group: Applications/Internet Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units @@ -143,6 +142,7 @@ fi %changelog * Thu Feb 22 2018 Vitezslav Crhonek - 2.17.4-23 - Add BuildRequires gcc +- Remove Group tag * Thu Feb 08 2018 Fedora Release Engineering - 2.17.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 7dd2ae58670bc0458f11ef9b7c8629cb74cc5127 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 11:07:38 +0000 Subject: [PATCH 04/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 b94c8ed..7a25c28 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.4 -Release: 23%{?dist} +Release: 24%{?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 @@ -140,6 +140,9 @@ fi %{_unitdir}/mrtg.timer %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.17.4-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 22 2018 Vitezslav Crhonek - 2.17.4-23 - Add BuildRequires gcc - Remove Group tag From 35d7797333c0850566d840cb331cf94216a94663 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 9 Aug 2018 09:43:23 +0200 Subject: [PATCH 05/38] Update to mrtg-2.17.7, Use %%license --- .gitignore | 14 +----- mrtg-2.15.0-lib64.patch | 47 ++++++++++--------- mrtg-2.17.2-socket6-fix.patch | 18 +++---- mrtg-2.17.4-cfgmaker-ifhighspeed.patch | 6 +-- ...-2.17.4-cfgmaker-uninitialized-value.patch | 42 ----------------- mrtg.spec | 25 +++++----- sources | 4 +- 7 files changed, 54 insertions(+), 102 deletions(-) delete mode 100644 mrtg-2.17.4-cfgmaker-uninitialized-value.patch diff --git a/.gitignore b/.gitignore index cd481b2..7e4f9fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,2 @@ -mrtg-2.16.3.tar.gz -mrtg-2.16.3.tar.gz.md5.gpg -/mrtg-2.16.4.tar.gz -/mrtg-2.16.4.tar.gz.md5 -/mrtg-2.17.0.tar.gz -/mrtg-2.17.0.tar.gz.md5 -/mrtg-2.17.2.tar.gz -/mrtg-2.17.2.tar.gz.md5 -/mrtg-2.17.3.tar.gz -/mrtg-2.17.3.tar.gz.md5 -/mrtg-2.17.4.tar.gz -/mrtg-2.17.4.tar.gz.md5 +/mrtg-2.17.7.tar.gz +/mrtg-2.17.7.tar.gz.md5 diff --git a/mrtg-2.15.0-lib64.patch b/mrtg-2.15.0-lib64.patch index 004a29a..53a88ec 100644 --- a/mrtg-2.15.0-lib64.patch +++ b/mrtg-2.15.0-lib64.patch @@ -1,9 +1,7 @@ -Blech, give us a relatively simple way to drop in "lib" or "lib64", as -appropriate. Needs fixing to be more correct. - ---- mrtg-2.15.0/bin/cfgmaker.lib64 2006-12-06 01:10:06.000000000 +0100 -+++ mrtg-2.15.0/bin/cfgmaker 2006-12-06 12:35:16.000000000 +0100 -@@ -44,7 +44,7 @@ +diff -up mrtg-2.17.7/bin/cfgmaker.orig mrtg-2.17.7/bin/cfgmaker +--- mrtg-2.17.7/bin/cfgmaker.orig 2018-07-13 08:09:56.000000000 +0200 ++++ mrtg-2.17.7/bin/cfgmaker 2018-08-08 13:07:38.419241131 +0200 +@@ -44,7 +44,7 @@ BEGIN { use FindBin; use lib "${FindBin::Bin}"; @@ -12,20 +10,10 @@ appropriate. Needs fixing to be more correct. use MRTG_lib "2.100015"; use Getopt::Long; ---- mrtg-2.15.0/bin/mrtg-traffic-sum.lib64 2006-12-06 12:37:19.000000000 +0100 -+++ mrtg-2.15.0/bin/mrtg-traffic-sum 2006-12-06 12:38:18.000000000 +0100 -@@ -23,7 +23,7 @@ - - use FindBin; - use lib "${FindBin::Bin}"; --use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; -+use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2"; - use MRTG_lib "2.090017"; - use POSIX qw(mktime); - ---- mrtg-2.15.0/bin/indexmaker.lib64 2006-12-06 01:10:06.000000000 +0100 -+++ mrtg-2.15.0/bin/indexmaker 2006-12-06 12:35:16.000000000 +0100 -@@ -48,7 +48,7 @@ +diff -up mrtg-2.17.7/bin/indexmaker.orig mrtg-2.17.7/bin/indexmaker +--- mrtg-2.17.7/bin/indexmaker.orig 2018-07-13 08:09:56.000000000 +0200 ++++ mrtg-2.17.7/bin/indexmaker 2018-08-08 13:08:41.187309764 +0200 +@@ -48,7 +48,7 @@ BEGIN { use FindBin; use lib "${FindBin::Bin}"; @@ -34,9 +22,10 @@ appropriate. Needs fixing to be more correct. use MRTG_lib "2.100016"; use Getopt::Long; ---- mrtg-2.15.0/bin/mrtg.lib64 2006-12-06 01:10:06.000000000 +0100 -+++ mrtg-2.15.0/bin/mrtg 2006-12-06 12:35:16.000000000 +0100 -@@ -81,7 +81,7 @@ +diff -up mrtg-2.17.7/bin/mrtg.orig mrtg-2.17.7/bin/mrtg +--- mrtg-2.17.7/bin/mrtg.orig 2018-07-13 08:09:56.000000000 +0200 ++++ mrtg-2.17.7/bin/mrtg 2018-08-08 13:09:07.459338491 +0200 +@@ -81,7 +81,7 @@ ERR use FindBin; use lib "${FindBin::Bin}"; @@ -45,3 +34,15 @@ appropriate. Needs fixing to be more correct. use Getopt::Long; use Math::BigFloat; +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 2017-03-05 15:09:52.000000000 +0100 ++++ mrtg-2.17.7/bin/mrtg-traffic-sum 2018-08-08 13:08:17.650284034 +0200 +@@ -33,7 +33,7 @@ BEGIN { + + use FindBin; + use lib "${FindBin::Bin}"; +-use lib "${FindBin::Bin}${main::SL}..${main::SL}lib${main::SL}mrtg2"; ++use lib "${FindBin::Bin}${main::SL}..${main::SL}@@lib@@${main::SL}mrtg2"; + use MRTG_lib "2.090017"; + use POSIX qw(mktime); + diff --git a/mrtg-2.17.2-socket6-fix.patch b/mrtg-2.17.2-socket6-fix.patch index 1f919c2..5f08189 100644 --- a/mrtg-2.17.2-socket6-fix.patch +++ b/mrtg-2.17.2-socket6-fix.patch @@ -1,7 +1,7 @@ -diff -up mrtg-2.17.3/bin/mrtg.orig mrtg-2.17.3/bin/mrtg ---- mrtg-2.17.3/bin/mrtg.orig 2011-12-07 14:24:11.926747910 +0100 -+++ mrtg-2.17.3/bin/mrtg 2011-12-07 14:25:33.522162313 +0100 -@@ -300,7 +300,7 @@ sub main { +diff -up mrtg-2.17.7/bin/mrtg.orig mrtg-2.17.7/bin/mrtg +--- mrtg-2.17.7/bin/mrtg.orig 2018-08-08 13:09:59.682296406 +0200 ++++ mrtg-2.17.7/bin/mrtg 2018-08-08 13:11:01.089173582 +0200 +@@ -302,7 +302,7 @@ sub main { if ($cfg{enableipv6} eq 'yes') { if ( eval {local $SIG{__DIE__};require Socket; require Socket6; require IO::Socket::INET6;}) { import Socket; @@ -10,14 +10,14 @@ diff -up mrtg-2.17.3/bin/mrtg.orig mrtg-2.17.3/bin/mrtg debug('base', "IPv6 libraries found, IPv6 enabled."); } else { warn "$NOW: WARNING: IPv6 libraries not found, IPv6 disabled.\n"; -diff -up mrtg-2.17.3/lib/mrtg2/SNMP_Session.pm.orig mrtg-2.17.3/lib/mrtg2/SNMP_Session.pm ---- mrtg-2.17.3/lib/mrtg2/SNMP_Session.pm.orig 2011-12-07 14:25:45.606223538 +0100 -+++ mrtg-2.17.3/lib/mrtg2/SNMP_Session.pm 2011-12-07 14:27:21.593713162 +0100 +diff -up mrtg-2.17.7/lib/mrtg2/SNMP_Session.pm.orig mrtg-2.17.7/lib/mrtg2/SNMP_Session.pm +--- mrtg-2.17.7/lib/mrtg2/SNMP_Session.pm.orig 2018-07-13 08:09:56.000000000 +0200 ++++ mrtg-2.17.7/lib/mrtg2/SNMP_Session.pm 2018-08-08 13:13:15.361988807 +0200 @@ -146,7 +146,7 @@ BEGIN { if (eval {local $SIG{__DIE__};require Socket6;} && eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) { -- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo unpack_sockaddr_in6)); +- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo)); + Socket6->import(qw(inet_pton getaddrinfo inet_ntop)); $ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1"))); $SNMP_Session::ipv6available = 1; @@ -26,7 +26,7 @@ diff -up mrtg-2.17.3/lib/mrtg2/SNMP_Session.pm.orig mrtg-2.17.3/lib/mrtg2/SNMP_S BEGIN { if($SNMP_Session::ipv6available) { import IO::Socket::INET6; -- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo unpack_sockaddr_in6)); +- Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo)); + Socket6->import(qw(inet_pton getaddrinfo inet_ntop)); } } diff --git a/mrtg-2.17.4-cfgmaker-ifhighspeed.patch b/mrtg-2.17.4-cfgmaker-ifhighspeed.patch index 79c16ae..3ec8bf7 100644 --- a/mrtg-2.17.4-cfgmaker-ifhighspeed.patch +++ b/mrtg-2.17.4-cfgmaker-ifhighspeed.patch @@ -1,6 +1,6 @@ -diff -up mrtg-2.17.4/bin/cfgmaker.orig mrtg-2.17.4/bin/cfgmaker ---- mrtg-2.17.4/bin/cfgmaker.orig 2012-06-28 13:26:04.457533598 +0200 -+++ mrtg-2.17.4/bin/cfgmaker 2012-06-28 13:27:50.514045178 +0200 +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 interace's speed. For a sub-layer which has diff --git a/mrtg-2.17.4-cfgmaker-uninitialized-value.patch b/mrtg-2.17.4-cfgmaker-uninitialized-value.patch deleted file mode 100644 index 433263e..0000000 --- a/mrtg-2.17.4-cfgmaker-uninitialized-value.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up mrtg-2.17.4/bin/cfgmaker.orig mrtg-2.17.4/bin/cfgmaker ---- mrtg-2.17.4/bin/cfgmaker.orig 2015-09-07 13:12:23.960003553 +0200 -+++ mrtg-2.17.4/bin/cfgmaker 2015-09-07 13:13:16.694253515 +0200 -@@ -1369,22 +1369,23 @@ sub addrouter() { - # tenderly and populate the $$flags{}{} hashes accordingly. - for my $g (@{$$opt{"global"}}) { - my ($t,$fs); -- $g =~ /^options\[([_^\$])\]:\s*(.*)$/i; -- $t = $1; -- $fs = $2; -- $t =~ s/_/default/; -- $t =~ s/\^/prepend/; -- $t =~ s/\$/append/; -+ if ($g =~ /^options\[([_^\$])\]:\s*(.*)$/i) { -+ $t = $1; -+ $fs = $2; -+ $t =~ s/_/default/; -+ $t =~ s/\^/prepend/; -+ $t =~ s/\$/append/; - -- # If a line like "options[X]:" is found clear -- # all flags for that category and then go to next -- # --global 'Options[..' line if any. -- if ($fs =~ /^\s*$/) { -- $$flags{$t} = {}; -- next; -- } else { -- for my $f (split /\s*,\s*/,$fs) { -- $$flags{$t}{$f} = "set"; -+ # If a line like "options[X]:" is found clear -+ # all flags for that category and then go to next -+ # --global 'Options[..' line if any. -+ if ($fs =~ /^\s*$/) { -+ $$flags{$t} = {}; -+ next; -+ } else { -+ for my $f (split /\s*,\s*/,$fs) { -+ $$flags{$t}{$f} = "set"; -+ } - } - } - } diff --git a/mrtg.spec b/mrtg.spec index 7a25c28..55b2afd 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -5,8 +5,8 @@ Summary: Multi Router Traffic Grapher Name: mrtg -Version: 2.17.4 -Release: 24%{?dist} +Version: 2.17.7 +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 @@ -25,11 +25,9 @@ Source8: mrtg.service # Source9: systemd timer file Source9: mrtg.timer Patch0: mrtg-2.15.0-lib64.patch -Patch2: mrtg-2.17.2-socket6-fix.patch -# Patch3: some devices return 2**32-2 on ifSpeed (e. g. IBM FibreChannel switches) -Patch3: mrtg-2.17.4-cfgmaker-ifhighspeed.patch -# Patch4: fix uninitialized value errors in cfgmaker -Patch4: mrtg-2.17.4-cfgmaker-uninitialized-value.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 License: GPLv2+ Requires(post): systemd-units Requires(preun): systemd-units @@ -52,9 +50,8 @@ images which provide a LIVE visual representation of this traffic. %prep %setup -q %patch0 -p1 -b .lib64 -%patch2 -p1 -b .socket6 -%patch3 -p1 -b .ifhighspeed -%patch4 -p1 -b .cfgmaker-uninitialized-value +%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}_" @@ -122,7 +119,8 @@ fi %systemd_postun_with_restart mrtg.service %files -%doc contrib CHANGES COPYING COPYRIGHT README THANKS +%license COPYING +%doc contrib CHANGES COPYRIGHT README THANKS %dir %{_sysconfdir}/mrtg %config(noreplace) %{_sysconfdir}/mrtg/mrtg.cfg %config(noreplace) %{_sysconfdir}/httpd/conf.d/mrtg.conf @@ -140,6 +138,11 @@ fi %{_unitdir}/mrtg.timer %changelog +* Thu Aug 09 2018 Vitezslav Crhonek - 2.17.7-1 +- Use %%license +- Update to mrtg-2.17.7 + Resolves: #1600933 + * Fri Jul 13 2018 Fedora Release Engineering - 2.17.4-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 28503a5..c80672a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -197565e97f97212eef7b414463c8d40c mrtg-2.17.4.tar.gz -606cfe9387ac7b43bf3981977189c124 mrtg-2.17.4.tar.gz.md5 +SHA512 (mrtg-2.17.7.tar.gz) = b25ab38416213bc5128612724530f36f4a855bb66a65f8bbe4bdafef05d2688eed68f5c3df1e13193102507a4114e71ec226ad32dd6b4d3ae2e2291320d8e768 +SHA512 (mrtg-2.17.7.tar.gz.md5) = 146bf77c985e54e949daceb3bfe2b7c8f67f7f1c495a3e666957a91514c6fcadeb02ecc5d42d8536fef1b9e70779018736ffe602c216f6c283c9f784f0cad50f From fba333614ac48113043489e3fbbc37c1776d64fc Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 18 Oct 2018 13:45:37 +0200 Subject: [PATCH 06/38] Fix mrtg-traffic-sum incorrectly ignores 'man' option --- mrtg-2.17.7-traffic-sum-man-option.patch | 12 ++++++++++++ mrtg.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 mrtg-2.17.7-traffic-sum-man-option.patch diff --git a/mrtg-2.17.7-traffic-sum-man-option.patch b/mrtg-2.17.7-traffic-sum-man-option.patch new file mode 100644 index 0000000..c547faf --- /dev/null +++ b/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) } diff --git a/mrtg.spec b/mrtg.spec index 55b2afd..f3ff4d8 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -28,6 +28,8 @@ 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 @@ -52,6 +54,7 @@ images which provide a LIVE visual representation of this traffic. %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}_" @@ -138,6 +141,10 @@ fi %{_unitdir}/mrtg.timer %changelog +* Thu Oct 18 2018 Vitezslav Crhonek - 2.17.7-2 +- Fix mrtg-traffic-sum incorrectly ignores 'man' option + Resolves: #1612188 + * Thu Aug 09 2018 Vitezslav Crhonek - 2.17.7-1 - Use %%license - Update to mrtg-2.17.7 From 2c9f29cc9058217661b446183e6354f1e85193e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 11:37:01 +0000 Subject: [PATCH 07/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 f3ff4d8..91fc6fe 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -141,6 +141,9 @@ fi %{_unitdir}/mrtg.timer %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 2.17.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Oct 18 2018 Vitezslav Crhonek - 2.17.7-2 - Fix mrtg-traffic-sum incorrectly ignores 'man' option Resolves: #1612188 From 043320c8507e57f79d7d1210ea90628a12336a73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 17:51:11 +0000 Subject: [PATCH 08/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 91fc6fe..58a377e 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -141,6 +141,9 @@ fi %{_unitdir}/mrtg.timer %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.17.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 2.17.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0f1454f2af2a37754c9bbdb13946f588310b8caa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 14:12:40 +0000 Subject: [PATCH 09/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 58a377e..e920cd3 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -141,6 +141,9 @@ fi %{_unitdir}/mrtg.timer %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.17.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.17.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 7a7d6e65f26dff8d55e1c9a3cb01c6f20f639d0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:33:58 +0000 Subject: [PATCH 10/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 e920cd3..bf62a8a 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -141,6 +141,9 @@ fi %{_unitdir}/mrtg.timer %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.17.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 2.17.7-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From f97338f5c62f7fafa06dab31b9cf638b6271f831 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 9 Nov 2020 13:29:58 +0100 Subject: [PATCH 11/38] Add Requires perl-locale --- mrtg.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mrtg.spec b/mrtg.spec index bf62a8a..01cf2f9 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -34,7 +34,7 @@ License: GPLv2+ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Requires: perl-Socket6 perl-IO-Socket-INET6 +Requires: perl-Socket6 perl-IO-Socket-INET6 perl-locale Requires: gd BuildRequires: gd-devel, libpng-devel BuildRequires: perl-generators @@ -141,6 +141,10 @@ fi %{_unitdir}/mrtg.timer %changelog +* Mon Nov 09 2020 Vitezslav Crhonek - 2.17.7-7 +- Add Requires perl-locale + Resolves: #1895580 + * Tue Jul 28 2020 Fedora Release Engineering - 2.17.7-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From df4de57ea2ba80707045b2881902762685f6baaa Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 7 Jan 2021 02:05:08 +0000 Subject: [PATCH 12/38] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- mrtg.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mrtg.spec b/mrtg.spec index 01cf2f9..5785acc 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -36,6 +36,7 @@ Requires(preun): systemd-units Requires(postun): systemd-units Requires: perl-Socket6 perl-IO-Socket-INET6 perl-locale Requires: gd +BuildRequires: make BuildRequires: gd-devel, libpng-devel BuildRequires: perl-generators BuildRequires: systemd-units From 27b61080c471ef2b25df655c9472a048a9694921 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 20:56:20 +0000 Subject: [PATCH 13/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 5785acc..92d2b69 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -142,6 +142,9 @@ fi %{_unitdir}/mrtg.timer %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.17.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Nov 09 2020 Vitezslav Crhonek - 2.17.7-7 - Add Requires perl-locale Resolves: #1895580 From 144d93f31c7ed9353342d84f9f8ab886723df52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 2 Mar 2021 16:13:23 +0100 Subject: [PATCH 14/38] Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. --- mrtg.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index 92d2b69..dc1c34e 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -142,6 +142,10 @@ fi %{_unitdir}/mrtg.timer %changelog +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.17.7-9 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + * Tue Jan 26 2021 Fedora Release Engineering - 2.17.7-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From aedca7c2aeb6d641a02a7c1a1381649fe4a3036e Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Mon, 12 Apr 2021 09:46:51 +0200 Subject: [PATCH 15/38] Add SELinux subpackage --- mrtg.fc | 16 ++++++ mrtg.if | 88 ++++++++++++++++++++++++++++++++ mrtg.spec | 72 +++++++++++++++++++++++++- mrtg.te | 149 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 324 insertions(+), 1 deletion(-) create mode 100644 mrtg.fc create mode 100644 mrtg.if create mode 100644 mrtg.te diff --git a/mrtg.fc b/mrtg.fc new file mode 100644 index 0000000..340735d --- /dev/null +++ b/mrtg.fc @@ -0,0 +1,16 @@ +/etc/mrtg.* gen_context(system_u:object_r:mrtg_etc_t,s0) +/etc/mrtg/mrtg\.ok -- gen_context(system_u:object_r:mrtg_lock_t,s0) + +/etc/rc\.d/init\.d/mrtg -- gen_context(system_u:object_r:mrtg_initrc_exec_t,s0) + +/usr/bin/mrtg -- gen_context(system_u:object_r:mrtg_exec_t,s0) + +/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) + +/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) diff --git a/mrtg.if b/mrtg.if new file mode 100644 index 0000000..2346458 --- /dev/null +++ b/mrtg.if @@ -0,0 +1,88 @@ +## Network traffic graphing. + +######################################## +## +## Read mrtg lib files. +## +## +## +## Domain allowed access. +## +## +# +interface(`mrtg_read_lib_files',` + gen_require(` + type mrtg_var_lib_t; + ') + + files_search_var_lib($1) + read_files_pattern($1, mrtg_var_lib_t, mrtg_var_lib_t) +') + +######################################## +## +## Create and append mrtg log files. +## +## +## +## Domain allowed access. +## +## +# +interface(`mrtg_append_create_logs',` + gen_require(` + type mrtg_log_t; + ') + + logging_search_logs($1) + append_files_pattern($1, mrtg_log_t, mrtg_log_t) + create_files_pattern($1, mrtg_log_t, mrtg_log_t) +') + +######################################## +## +## All of the rules required to +## administrate an mrtg environment. +## +## +## +## Domain allowed access. +## +## +## +## +## Role allowed access. +## +## +## +# +interface(`mrtg_admin',` + gen_require(` + type mrtg_t, mrtg_var_run_t, mrtg_initrc_exec_t; + type mrtg_var_lib_t, mrtg_lock_t, mrtg_log_t; + type mrtg_etc_t; + ') + + allow $1 mrtg_t:process { ptrace signal_perms }; + ps_process_pattern($1, mrtg_t) + + init_labeled_script_domtrans($1, mrtg_initrc_exec_t) + domain_system_change_exemption($1) + role_transition $2 mrtg_initrc_exec_t system_r; + allow $2 system_r; + + files_search_etc($1) + admin_pattern($1, mrtg_etc_t) + + files_search_locks($1) + admin_pattern($1, mrtg_lock_t) + + logging_search_logs($1) + admin_pattern($1, mrtg_log_t) + + files_search_pids($1) + admin_pattern($1, mrtg_var_run_t) + + files_search_var_lib($1) + admin_pattern($1, mrtg_var_lib_t) +') diff --git a/mrtg.spec b/mrtg.spec index dc1c34e..1fb2f6e 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -3,10 +3,15 @@ %global contentdir %{_localstatedir}/www/%{name} %global libdir %{_localstatedir}/lib/mrtg +# defining macros needed by SELinux +%global with_selinux 1 +%global selinuxtype targeted +%global modulename mrtg + Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -24,6 +29,11 @@ Source7: mrtg.tmpfiles Source8: mrtg.service # Source9: systemd timer file Source9: mrtg.timer +# Source100-102: selinux policy for mrtg, extracted +# from https://github.com/fedora-selinux/selinux-policy +Source100: %{modulename}.te +Source101: %{modulename}.if +Source102: %{modulename}.fc 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) @@ -36,6 +46,11 @@ Requires(preun): systemd-units Requires(postun): systemd-units Requires: perl-Socket6 perl-IO-Socket-INET6 perl-locale Requires: gd +%if 0%{?with_selinux} +# This ensures that the *-selinux package and all it’s dependencies are not pulled +# into containers and other systems that do not use SELinux +Requires: (%{name}-selinux if selinux-policy-%{selinuxtype}) +%endif BuildRequires: make BuildRequires: gd-devel, libpng-devel BuildRequires: perl-generators @@ -50,6 +65,20 @@ The Multi Router Traffic Grapher (MRTG) is a tool to monitor the traffic load on network-links. MRTG generates HTML pages containing PNG images which provide a LIVE visual representation of this traffic. +%if 0%{?with_selinux} +# SELinux subpackage +%package selinux +Summary: mrtg SELinux policy +BuildArch: noarch +Requires: selinux-policy-%{selinuxtype} +Requires(post): selinux-policy-%{selinuxtype} +BuildRequires: selinux-policy-devel +%{?selinux_requires} + +%description selinux +Custom SELinux policy module +%endif + %prep %setup -q %patch0 -p1 -b .lib64 @@ -75,6 +104,15 @@ find contrib -type f -exec \ find contrib -name "*.pl" -exec %{__perl} -e 's;\015;;gi' -p -i \{\} \; find contrib -type f | xargs chmod a-x +%if 0%{?with_selinux} +# SELinux policy (originally from selinux-policy-contrib) +# this policy module will override the production module +mkdir selinux +cp -p %{SOURCE100} %{SOURCE101} %{SOURCE102} selinux/ +make -f %{_datadir}/selinux/devel/Makefile %{modulename}.pp +bzip2 -9 %{modulename}.pp +%endif + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -107,6 +145,10 @@ done sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_mandir}/man1/*.1 +%if 0%{?with_selinux} +install -D -m 0644 %{modulename}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2 +%endif + %post install -d -m 0755 -o root -g root /var/lock/mrtg restorecon /var/lock/mrtg @@ -122,6 +164,24 @@ fi %postun %systemd_postun_with_restart mrtg.service +%if 0%{?with_selinux} +# SELinux contexts are saved so that only affected files can be +# relabeled after the policy module installation +%pre selinux +%selinux_relabel_pre -s %{selinuxtype} + +%post selinux +%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2 + +%postun selinux +if [ $1 -eq 0 ]; then + %selinux_modules_uninstall -s %{selinuxtype} %{modulename} +fi + +%posttrans selinux +%selinux_relabel_post -s %{selinuxtype} +%endif + %files %license COPYING %doc contrib CHANGES COPYRIGHT README THANKS @@ -141,7 +201,17 @@ fi %{_unitdir}/mrtg.service %{_unitdir}/mrtg.timer +%if 0%{?with_selinux} +%files selinux +%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.* +%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} +%endif + %changelog +* Mon Apr 12 2021 Vitezslav Crhonek - 2.17.7-10 +- Incorporate -selinux subpackage + See https://fedoraproject.org/wiki/SELinux/IndependentPolicy + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 2.17.7-9 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/mrtg.te b/mrtg.te new file mode 100644 index 0000000..fa86320 --- /dev/null +++ b/mrtg.te @@ -0,0 +1,149 @@ +policy_module(mrtg, 1.9.0) + +######################################## +# +# Declarations +# + +type mrtg_t; +type mrtg_exec_t; +init_system_domain(mrtg_t, mrtg_exec_t) + +type mrtg_initrc_exec_t; +init_script_file(mrtg_initrc_exec_t) + +type mrtg_etc_t; +files_config_file(mrtg_etc_t) + +type mrtg_lock_t; +files_lock_file(mrtg_lock_t) + +type mrtg_log_t; +logging_log_file(mrtg_log_t) + +type mrtg_var_lib_t; +files_type(mrtg_var_lib_t) + +type mrtg_var_run_t; +files_pid_file(mrtg_var_run_t) + +######################################## +# +# Local policy +# + +allow mrtg_t self:capability { setgid setuid chown }; +dontaudit mrtg_t self:capability sys_tty_config; +allow mrtg_t self:process signal_perms; +allow mrtg_t self:fifo_file rw_fifo_file_perms; + +allow mrtg_t mrtg_etc_t:dir list_dir_perms; +allow mrtg_t mrtg_etc_t:file read_file_perms; +allow mrtg_t mrtg_etc_t:lnk_file read_lnk_file_perms; + +allow mrtg_t mrtg_lock_t:dir manage_dir_perms; +allow mrtg_t mrtg_lock_t:file manage_file_perms; +allow mrtg_t mrtg_lock_t:lnk_file manage_lnk_file_perms; +files_lock_filetrans(mrtg_t, mrtg_lock_t, { dir file }) + +manage_dirs_pattern(mrtg_t, mrtg_log_t, mrtg_log_t) +append_files_pattern(mrtg_t, mrtg_log_t, mrtg_log_t) +create_files_pattern(mrtg_t, mrtg_log_t, mrtg_log_t) +setattr_files_pattern(mrtg_t, mrtg_log_t, mrtg_log_t) +logging_log_filetrans(mrtg_t, mrtg_log_t, { dir file }) + +manage_files_pattern(mrtg_t, mrtg_var_lib_t, mrtg_var_lib_t) +manage_lnk_files_pattern(mrtg_t, mrtg_var_lib_t, mrtg_var_lib_t) + +allow mrtg_t mrtg_var_run_t:file manage_file_perms; +files_pid_filetrans(mrtg_t, mrtg_var_run_t, file) + +kernel_read_system_state(mrtg_t) +kernel_read_network_state(mrtg_t) +kernel_read_kernel_sysctls(mrtg_t) + +corecmd_exec_bin(mrtg_t) +corecmd_exec_shell(mrtg_t) + +corenet_all_recvfrom_netlabel(mrtg_t) +corenet_tcp_sendrecv_generic_if(mrtg_t) +corenet_tcp_sendrecv_generic_node(mrtg_t) + +corenet_sendrecv_all_client_packets(mrtg_t) +corenet_tcp_connect_all_ports(mrtg_t) +corenet_tcp_sendrecv_all_ports(mrtg_t) + +dev_read_sysfs(mrtg_t) +dev_read_urand(mrtg_t) + +domain_use_interactive_fds(mrtg_t) +domain_dontaudit_search_all_domains_state(mrtg_t) + +files_getattr_tmp_dirs(mrtg_t) +files_read_etc_runtime_files(mrtg_t) +files_search_var(mrtg_t) +files_search_locks(mrtg_t) +files_search_var_lib(mrtg_t) +files_search_spool(mrtg_t) + +fs_search_auto_mountpoints(mrtg_t) +fs_getattr_all_fs(mrtg_t) +fs_list_inotifyfs(mrtg_t) + +term_dontaudit_use_console(mrtg_t) + +init_use_fds(mrtg_t) +init_use_script_ptys(mrtg_t) +init_read_utmp(mrtg_t) +init_dontaudit_write_utmp(mrtg_t) + +auth_use_nsswitch(mrtg_t) + +libs_read_lib_files(mrtg_t) + +logging_send_syslog_msg(mrtg_t) + +selinux_dontaudit_getattr_dir(mrtg_t) + +userdom_use_inherited_user_terminals(mrtg_t) +userdom_dontaudit_read_user_home_content_files(mrtg_t) +userdom_dontaudit_use_unpriv_user_fds(mrtg_t) +userdom_dontaudit_list_admin_dir(mrtg_t) + +netutils_domtrans_ping(mrtg_t) + +ifdef(`enable_mls',` + corenet_udp_sendrecv_lo_if(mrtg_t) +') + +optional_policy(` + apache_manage_sys_content(mrtg_t) +') + +optional_policy(` + cron_system_entry(mrtg_t, mrtg_exec_t) +') + +optional_policy(` + hostname_exec(mrtg_t) +') + +optional_policy(` + hddtemp_domtrans(mrtg_t) +') + +optional_policy(` + seutil_sigchld_newrole(mrtg_t) +') + +optional_policy(` + quota_dontaudit_getattr_db(mrtg_t) +') + +optional_policy(` + snmp_read_snmp_var_lib_files(mrtg_t) +') + +optional_policy(` + udev_read_db(mrtg_t) +') From 85fb1d64450fb2f2168406a79877c3b97979ab70 Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Mon, 12 Apr 2021 19:52:06 +0200 Subject: [PATCH 16/38] selinux: move relabeling to %post/%postun - move %selinux_relabel_post to %post/%postun This ensures that the service is assigned the right label before it is started. - Add "%systemd_postun_with_restart" on first install and uninstall This is where the daemon binary changes label (policy is added/removed from the system). Signed-off-by: Vit Mojzis --- mrtg.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/mrtg.spec b/mrtg.spec index 1fb2f6e..fa8bac3 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -172,14 +172,20 @@ fi %post selinux %selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2 +%selinux_relabel_post -s %{selinuxtype} + +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 +fi %postun selinux if [ $1 -eq 0 ]; then %selinux_modules_uninstall -s %{selinuxtype} %{modulename} + %selinux_relabel_post -s %{selinuxtype} + # the service needs to be restarted for the custom label to be removed + %systemd_postun_with_restart mrtg.service fi - -%posttrans selinux -%selinux_relabel_post -s %{selinuxtype} %endif %files From 50a7b89696cd844edc52678110b35079e8e4fc23 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Wed, 14 Apr 2021 10:15:59 +0200 Subject: [PATCH 17/38] Add DSP test --- tests/tests-DSP.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 tests/tests-DSP.yml diff --git a/tests/tests-DSP.yml b/tests/tests-DSP.yml new file mode 100644 index 0000000..6e2ba72 --- /dev/null +++ b/tests/tests-DSP.yml @@ -0,0 +1,37 @@ +- hosts: localhost + + roles: + - role: standard-test-beakerlib + tags: + - classic + repositories: + - repo: https://pagure.io/DSP_test.git + dest: DSP_test + version: master + + tests: + - DSP_test + environment: + # RPM package containing the policy module + TEST_RPM: mrtg-selinux + # policy module name + TEST_POLICY: mrtg + # policy sources will be extracted from corresponding .src.rpm + # policy tar filename regexp (e.g. "usbguard-selinux*.tar.gz") + # or empty string if policy sources are not inside a tar archive + POLICY_TAR: '' + # path to policy sources (in of the tar archive) -- //.(te|if|fc) + # or path in the src.rpm if there is no tar archive -- //.(te|if|fc) + # can contain wildcards (e.g. for versions etc.) + POLICY_PATH: . + + required_packages: + - policycoreutils + - selinux-policy + - selinux-policy-targeted + - setools-console + - libselinux-utils + - rpm + - tar + - git + - mrtg From a61345dd3268a32a1a2cd0b74ca713f09270ae4f Mon Sep 17 00:00:00 2001 From: Vit Mojzis Date: Wed, 14 Apr 2021 13:13:21 +0200 Subject: [PATCH 18/38] selinux: sort permissions as per refpolicy style guide https://github.com/SELinuxProject/refpolicy/wiki/StyleGuide --- mrtg.te | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrtg.te b/mrtg.te index fa86320..9636408 100644 --- a/mrtg.te +++ b/mrtg.te @@ -32,7 +32,7 @@ files_pid_file(mrtg_var_run_t) # Local policy # -allow mrtg_t self:capability { setgid setuid chown }; +allow mrtg_t self:capability { chown setgid setuid }; dontaudit mrtg_t self:capability sys_tty_config; allow mrtg_t self:process signal_perms; allow mrtg_t self:fifo_file rw_fifo_file_perms; From eba46e2097ade433da0e3c363ff17abb3b5196cf Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 18 May 2021 14:52:18 +0200 Subject: [PATCH 19/38] Update and improve mrtg.service --- mrtg.service | 2 +- mrtg.spec | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mrtg.service b/mrtg.service index e480970..4d98199 100644 --- a/mrtg.service +++ b/mrtg.service @@ -30,7 +30,7 @@ ExecStart=/usr/bin/mrtg /etc/mrtg/mrtg.cfg --lock-file /var/lock/mrtg/mrtg_l --c # - RunAsDaemon: no; (periodic invocation) : #Type=oneshot Type=simple -StandardOutput=syslog +LogLevelMax=notice [Install] WantedBy=multi-user.target diff --git a/mrtg.spec b/mrtg.spec index fa8bac3..01e945c 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -214,6 +214,12 @@ fi %endif %changelog +* Tue May 18 2021 Vitezslav Crhonek - 2.17.7-11 +- Remove deprecated StandardOutput=syslog +- Add LogLevelMax=notice to avoid loggin each start/stop of the service + when mrtg.timer is used + Resolves: #911766 + * Mon Apr 12 2021 Vitezslav Crhonek - 2.17.7-10 - Incorporate -selinux subpackage See https://fedoraproject.org/wiki/SELinux/IndependentPolicy From f94e69df5ee12562012bdbbb552da226055c28e3 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 8 Jun 2021 13:59:32 +0200 Subject: [PATCH 20/38] Ship interface file within -selinux subpackage Signed-off-by: Vitezslav Crhonek --- mrtg.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mrtg.spec b/mrtg.spec index 01e945c..a73d722 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,12 +6,13 @@ # defining macros needed by SELinux %global with_selinux 1 %global selinuxtype targeted +%global moduletype contrib %global modulename mrtg Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -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 @@ -147,6 +148,7 @@ sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_mandir}/man1/*.1 %if 0%{?with_selinux} install -D -m 0644 %{modulename}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2 +install -D -p -m 0644 selinux/%{modulename}.if %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{name}.if %endif %post @@ -210,10 +212,14 @@ fi %if 0%{?with_selinux} %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.* +%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} %endif %changelog +* Tue Jun 08 2021 Vitezslav Crhonek - 2.17.7-12 +- Ship interface file within -selinux subpackage + * Tue May 18 2021 Vitezslav Crhonek - 2.17.7-11 - Remove deprecated StandardOutput=syslog - Add LogLevelMax=notice to avoid loggin each start/stop of the service From b547bf699928453063125c52fd368029fdcaf769 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 8 Jun 2021 14:53:45 +0200 Subject: [PATCH 21/38] selinux: update path for interface file Signed-off-by: Vitezslav Crhonek --- mrtg.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mrtg.spec b/mrtg.spec index a73d722..fa944e5 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -6,7 +6,6 @@ # defining macros needed by SELinux %global with_selinux 1 %global selinuxtype targeted -%global moduletype contrib %global modulename mrtg Summary: Multi Router Traffic Grapher @@ -148,7 +147,7 @@ sed -i 's;@@lib@@;%{_lib};g' "$RPM_BUILD_ROOT"%{_mandir}/man1/*.1 %if 0%{?with_selinux} install -D -m 0644 %{modulename}.pp.bz2 %{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.bz2 -install -D -p -m 0644 selinux/%{modulename}.if %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}/%{name}.if +install -D -p -m 0644 selinux/%{modulename}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if %endif %post @@ -212,7 +211,7 @@ fi %if 0%{?with_selinux} %files selinux %{_datadir}/selinux/packages/%{selinuxtype}/%{modulename}.pp.* -%{_datadir}/selinux/devel/include/%{moduletype}/%{modulename}.if +%{_datadir}/selinux/devel/include/distributed/%{modulename}.if %ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{modulename} %endif From 3eac5068a830384c2858b4c66f59e3875f435d80 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Tue, 22 Jun 2021 10:21:20 +0200 Subject: [PATCH 22/38] Remove %systemd_postun_with_restart from %postun Signed-off-by: Vitezslav Crhonek --- mrtg.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/mrtg.spec b/mrtg.spec index fa944e5..b1f0a41 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -184,8 +184,6 @@ fi if [ $1 -eq 0 ]; then %selinux_modules_uninstall -s %{selinuxtype} %{modulename} %selinux_relabel_post -s %{selinuxtype} - # the service needs to be restarted for the custom label to be removed - %systemd_postun_with_restart mrtg.service fi %endif From f96f94557488a252952cd0b74cefa402c7681df0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:31:02 +0000 Subject: [PATCH 23/38] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 b1f0a41..d4e7161 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -11,7 +11,7 @@ Summary: Multi Router Traffic Grapher Name: mrtg Version: 2.17.7 -Release: 12%{?dist} +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 @@ -214,6 +214,9 @@ fi %endif %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 2.17.7-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jun 08 2021 Vitezslav Crhonek - 2.17.7-12 - Ship interface file within -selinux subpackage From 27012de62a80add6fb84bc97e9787543acae81c4 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 23 Sep 2021 13:08:02 +0200 Subject: [PATCH 24/38] 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 25/38] 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 26/38] 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 27/38] 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 28/38] 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 29/38] 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 30/38] 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 31/38] 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 32/38] 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 33/38] 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 34/38] 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 35/38] 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 36/38] 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 37/38] 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 38/38] 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