components/mrtg/patches/mrtg-2.16.4-Socket6-fix.patch
changeset 5297 e9b84fd24a41
parent 5295 5c98bff030f2
child 5298 2de3b6013893
--- a/components/mrtg/patches/mrtg-2.16.4-Socket6-fix.patch	Tue Jan 19 14:00:51 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-Upstream patch:
-https://bugzilla.redhat.com/show_bug.cgi?id=706519
-
-diff -up mrtg-2.16.4/bin/mrtg.orig mrtg-2.16.4/bin/mrtg
---- mrtg-2.16.4/bin/mrtg.orig	2010-12-13 14:26:25.000000000 +0100
-+++ mrtg-2.16.4/bin/mrtg	2010-12-13 14:31:30.168311050 +0100
-@@ -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.orig mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm
---- mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm.orig	2010-05-17 15:59:20.000000000 +0200
-+++ mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm	2010-12-13 14:26:25.366152933 +0100
-@@ -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 getaddrinfo));
- 	$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 getaddrinfo));
-     }
- }
-