equal
deleted
inserted
replaced
1 Upstream patch: |
|
2 https://bugzilla.redhat.com/show_bug.cgi?id=706519 |
|
3 |
|
4 diff -up mrtg-2.16.4/bin/mrtg.orig mrtg-2.16.4/bin/mrtg |
|
5 --- mrtg-2.16.4/bin/mrtg.orig 2010-12-13 14:26:25.000000000 +0100 |
|
6 +++ mrtg-2.16.4/bin/mrtg 2010-12-13 14:31:30.168311050 +0100 |
|
7 @@ -98,6 +98,7 @@ use locales_mrtg "0.07"; |
|
8 BEGIN { |
|
9 if (eval {local $SIG{__DIE__};require Socket6;}) { |
|
10 import Socket; |
|
11 + use Socket(); |
|
12 import Socket6 |
|
13 } |
|
14 } |
|
15 diff -up mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm.orig mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm |
|
16 --- mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm.orig 2010-05-17 15:59:20.000000000 +0200 |
|
17 +++ mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm 2010-12-13 14:26:25.366152933 +0100 |
|
18 @@ -146,7 +146,7 @@ BEGIN { |
|
19 |
|
20 if (eval {local $SIG{__DIE__};require Socket6;} && |
|
21 eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) { |
|
22 - import Socket6; |
|
23 + Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo)); |
|
24 $ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1"))); |
|
25 $SNMP_Session::ipv6available = 1; |
|
26 } |
|
27 @@ -601,7 +601,7 @@ use Carp; |
|
28 BEGIN { |
|
29 if($SNMP_Session::ipv6available) { |
|
30 import IO::Socket::INET6; |
|
31 - import Socket6; |
|
32 + Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo)); |
|
33 } |
|
34 } |
|
35 |
|