diff --git a/mrtg-2.15.0-lib64.patch b/mrtg-2.15.0-lib64.patch index 53a88ecb4343a44225e286a784a48d2b454906e4..9004b24f626622f7cde4181434d4c9fbe649766d 100644 --- a/mrtg-2.15.0-lib64.patch +++ b/mrtg-2.15.0-lib64.patch @@ -1,7 +1,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 { +diff --color -urN mrtg-2.17.10-old/bin/cfgmaker mrtg-2.17.10/bin/cfgmaker +--- mrtg-2.17.10-old/bin/cfgmaker 2022-01-19 18:25:15.000000000 +0800 ++++ mrtg-2.17.10/bin/cfgmaker 2022-06-11 20:34:50.456508492 +0800 +@@ -44,7 +44,7 @@ use FindBin; use lib "${FindBin::Bin}"; @@ -10,10 +10,10 @@ diff -up mrtg-2.17.7/bin/cfgmaker.orig mrtg-2.17.7/bin/cfgmaker use MRTG_lib "2.100015"; use Getopt::Long; -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 { +diff --color -urN mrtg-2.17.10-old/bin/indexmaker mrtg-2.17.10/bin/indexmaker +--- mrtg-2.17.10-old/bin/indexmaker 2022-01-19 18:25:15.000000000 +0800 ++++ mrtg-2.17.10/bin/indexmaker 2022-06-11 20:34:50.456508492 +0800 +@@ -48,7 +48,7 @@ use FindBin; use lib "${FindBin::Bin}"; @@ -22,10 +22,10 @@ diff -up mrtg-2.17.7/bin/indexmaker.orig mrtg-2.17.7/bin/indexmaker use MRTG_lib "2.100016"; use Getopt::Long; -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 +diff --color -urN mrtg-2.17.10-old/bin/mrtg mrtg-2.17.10/bin/mrtg +--- mrtg-2.17.10-old/bin/mrtg 2022-01-19 18:25:15.000000000 +0800 ++++ mrtg-2.17.10/bin/mrtg 2022-06-11 20:34:50.457508492 +0800 +@@ -81,7 +81,7 @@ use FindBin; use lib "${FindBin::Bin}"; @@ -34,10 +34,10 @@ diff -up mrtg-2.17.7/bin/mrtg.orig mrtg-2.17.7/bin/mrtg 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 { +diff --color -urN mrtg-2.17.10-old/bin/mrtg-traffic-sum mrtg-2.17.10/bin/mrtg-traffic-sum +--- mrtg-2.17.10-old/bin/mrtg-traffic-sum 2021-10-08 20:05:24.000000000 +0800 ++++ mrtg-2.17.10/bin/mrtg-traffic-sum 2022-06-11 20:34:50.457508492 +0800 +@@ -33,7 +33,7 @@ use FindBin; use lib "${FindBin::Bin}"; diff --git a/mrtg-2.17.10.tar.gz b/mrtg-2.17.10.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b48c14780383246dc0dde109eba46f4ed960033b Binary files /dev/null and b/mrtg-2.17.10.tar.gz differ diff --git a/mrtg-2.17.10.tar.gz.md5 b/mrtg-2.17.10.tar.gz.md5 new file mode 100644 index 0000000000000000000000000000000000000000..3477c5db37cee24cb371e7674b00b47ea380d1b5 --- /dev/null +++ b/mrtg-2.17.10.tar.gz.md5 @@ -0,0 +1 @@ +ab1c14acc9af4221f459707339f361b3 mrtg-2.17.10.tar.gz diff --git a/mrtg-2.17.2-socket6-fix.patch b/mrtg-2.17.2-socket6-fix.patch index 5f08189d29e576ca32deb282e7933299c9c5782e..02c2c8502c08075c0c40297f94789500fe4987f8 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.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 { +diff --color -urN mrtg-2.17.10-old/bin/mrtg mrtg-2.17.10/bin/mrtg +--- mrtg-2.17.10-old/bin/mrtg 2022-06-12 00:26:55.342765220 +0800 ++++ mrtg-2.17.10/bin/mrtg 2022-06-12 00:27:05.221751838 +0800 +@@ -332,7 +332,7 @@ if ($cfg{enableipv6} eq 'yes') { if ( eval {local $SIG{__DIE__};require Socket; require Socket6; require IO::Socket::INET6;}) { import Socket; @@ -10,10 +10,10 @@ diff -up mrtg-2.17.7/bin/mrtg.orig mrtg-2.17.7/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.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 { +diff --color -urN mrtg-2.17.10-old/lib/mrtg2/SNMP_Session.pm mrtg-2.17.10/lib/mrtg2/SNMP_Session.pm +--- mrtg-2.17.10-old/lib/mrtg2/SNMP_Session.pm 2022-01-19 18:25:16.000000000 +0800 ++++ mrtg-2.17.10/lib/mrtg2/SNMP_Session.pm 2022-06-12 00:27:05.221751838 +0800 +@@ -146,7 +146,7 @@ if (eval {local $SIG{__DIE__};require Socket6;} && eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) { @@ -22,7 +22,7 @@ diff -up mrtg-2.17.7/lib/mrtg2/SNMP_Session.pm.orig mrtg-2.17.7/lib/mrtg2/SNMP_S $ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1"))); $SNMP_Session::ipv6available = 1; } -@@ -601,7 +601,7 @@ use Carp; +@@ -601,7 +601,7 @@ BEGIN { if($SNMP_Session::ipv6available) { import IO::Socket::INET6; diff --git a/mrtg-2.17.4-cfgmaker-ifhighspeed.patch b/mrtg-2.17.4-cfgmaker-ifhighspeed.patch index 3ec8bf703e4a79352aefedde22b27c0e78a80394..af75201d15502010486bbaed94d26870d76b2c98 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 -@@ -224,7 +224,7 @@ sub InterfaceInfo($$$$$) { +diff --color -urN mrtg-2.17.10-old/bin/cfgmaker mrtg-2.17.10/bin/cfgmaker +--- mrtg-2.17.10-old/bin/cfgmaker 2022-01-19 18:25:15.000000000 +0800 ++++ mrtg-2.17.10/bin/cfgmaker 2022-06-11 20:36:35.761392115 +0800 +@@ -224,7 +224,7 @@ # 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-2.17.7.tar.gz b/mrtg-2.17.7.tar.gz deleted file mode 100644 index 468092a5548b03e6877f48d15b9c835aadac90f6..0000000000000000000000000000000000000000 Binary files a/mrtg-2.17.7.tar.gz and /dev/null differ diff --git a/mrtg-2.17.7.tar.gz.md5 b/mrtg-2.17.7.tar.gz.md5 deleted file mode 100644 index 7c6cb84f3a54f6dc12f2d816dd072320c2670d57..0000000000000000000000000000000000000000 --- a/mrtg-2.17.7.tar.gz.md5 +++ /dev/null @@ -1 +0,0 @@ -eada3870c0419e425299401486600d95 mrtg-2.17.7.tar.gz diff --git a/mrtg.spec b/mrtg.spec index da06d4a3daac18656b7891539fe424568a50e8b2..5d5c9daa6044d6b6ab951ad59f26c46064477456 100644 --- a/mrtg.spec +++ b/mrtg.spec @@ -5,8 +5,8 @@ %global __find_provides %_sourcedir/filter-provides-mrtg.sh Name: mrtg -Version: 2.17.7 -Release: 3 +Version: 2.17.10 +Release: 1 Summary: Multi Router Traffic Grapher License: GPLv2+ @@ -122,5 +122,8 @@ fi %{_mandir}/*/* %changelog +* Sat Jun 11 2022 YukariChiba - 2.17.10-1 +- Upgrade version + * Thu Nov 21 2019 openEuler Buildteam - 2.17.7-3 - Package init