components/mrtg/patches/mrtg-2.16.4-Socket6-fix.patch
author Vladimir Marek <Vladimir.Marek@oracle.com>
Thu, 17 Dec 2015 01:32:45 -0800
changeset 5239 a4bfde1dd226
permissions -rw-r--r--
22369771 Move MRTG to Userland
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5239
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     1
Upstream patch:
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     2
https://bugzilla.redhat.com/show_bug.cgi?id=706519
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     3
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     4
diff -up mrtg-2.16.4/bin/mrtg.orig mrtg-2.16.4/bin/mrtg
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     5
--- mrtg-2.16.4/bin/mrtg.orig	2010-12-13 14:26:25.000000000 +0100
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     6
+++ mrtg-2.16.4/bin/mrtg	2010-12-13 14:31:30.168311050 +0100
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     7
@@ -98,6 +98,7 @@ use locales_mrtg "0.07";
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     8
 BEGIN {
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
     9
     if (eval {local $SIG{__DIE__};require Socket6;})  {
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    10
 	import Socket;
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    11
+	use Socket();
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    12
 	import Socket6
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    13
     }    
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    14
 }
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    15
diff -up mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm.orig mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    16
--- mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm.orig	2010-05-17 15:59:20.000000000 +0200
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    17
+++ mrtg-2.16.4/lib/mrtg2/SNMP_Session.pm	2010-12-13 14:26:25.366152933 +0100
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    18
@@ -146,7 +146,7 @@ BEGIN {
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    19
 
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    20
     if (eval {local $SIG{__DIE__};require Socket6;} &&
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    21
        eval {local $SIG{__DIE__};require IO::Socket::INET6; IO::Socket::INET6->VERSION("1.26");}) {
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    22
-	import Socket6;
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    23
+	Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    24
 	$ipv6_addr_len = length(pack_sockaddr_in6(161, inet_pton(AF_INET6(), "::1")));
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    25
 	$SNMP_Session::ipv6available = 1;
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    26
     }
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    27
@@ -601,7 +601,7 @@ use Carp;
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    28
 BEGIN {
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    29
     if($SNMP_Session::ipv6available) {
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    30
 	import IO::Socket::INET6;
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    31
-	import Socket6;
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    32
+	Socket6->import(qw(pack_sockaddr_in6 inet_pton getaddrinfo));
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    33
     }
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    34
 }
a4bfde1dd226 22369771 Move MRTG to Userland
Vladimir Marek <Vladimir.Marek@oracle.com>
parents:
diff changeset
    35