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