36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
diff -up mrtg-2.16.1/lib/mrtg2/SNMP_Session.pm.BAD mrtg-2.16.1/lib/mrtg2/SNMP_Session.pm
|
|
--- mrtg-2.16.1/lib/mrtg2/SNMP_Session.pm.BAD 2008-04-18 07:25:55.000000000 -0400
|
|
+++ mrtg-2.16.1/lib/mrtg2/SNMP_Session.pm 2008-04-18 07:26:30.000000000 -0400
|
|
@@ -138,7 +138,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;
|
|
}
|
|
@@ -592,7 +592,7 @@ use Carp;
|
|
BEGIN {
|
|
if($SNMP_Session::ipv6available) {
|
|
import IO::Socket::INET6;
|
|
- import Socket6;
|
|
+ Socket6->import(qw(pack_sockaddr_in6 inet_pton));
|
|
}
|
|
}
|
|
|
|
diff -up mrtg-2.16.1/bin/mrtg.orig mrtg-2.16.1/bin/mrtg
|
|
--- mrtg-2.16.1/bin/mrtg.orig 2008-04-18 07:28:19.000000000 -0400
|
|
+++ mrtg-2.16.1/bin/mrtg 2008-04-18 07:29:33.000000000 -0400
|
|
@@ -97,8 +97,8 @@ use locales_mrtg "0.07";
|
|
# necessary for dead host detection (for IPv6 name lookups).
|
|
BEGIN {
|
|
if (eval {local $SIG{__DIE__};require Socket6;}) {
|
|
- import Socket;
|
|
- import Socket6
|
|
+ use Socket();
|
|
+ import Socket6;
|
|
}
|
|
}
|
|
|