mrtg/mrtg-2.16.4-Socket6-fix.patch

33 lines
1.1 KiB
Diff
Raw Normal View History

2010-11-22 14:37:13 +00:00
diff -up mrtg-2.16.4/bin/mrtg.BAD mrtg-2.16.4/bin/mrtg
--- mrtg-2.16.4/bin/mrtg.BAD 2010-11-22 09:13:33.713368000 -0500
+++ mrtg-2.16.4/bin/mrtg 2010-11-22 09:14:10.503368001 -0500
@@ -98,6 +98,7 @@ use locales_mrtg "0.07";
BEGIN {
if (eval {local $SIG{__DIE__};require Socket6;}) {
import Socket;
+ use Socket();
import Socket6
}
}
diff -up mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm.BAD mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm
--- mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm.BAD 2010-11-22 09:12:52.934368000 -0500
+++ mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm 2010-11-22 09:13:26.219368002 -0500
@@ -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");}) {
- import Socket6;
+ Socket6->import(qw(pack_sockaddr_in6 inet_pton));
$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
$SNMP_Session::ipv6available = 1;
}
@@ -601,7 +601,7 @@ use Carp;
BEGIN {
if($SNMP_Session::ipv6available) {
import IO::Socket::INET6;
- import Socket6;
+ Socket6->import(qw(pack_sockaddr_in6 inet_pton));
}
}