IO::Socket::INET6 has been replaced by IO::Socket::IP

IO::Socket::INET6 is no longer being maintained and its functionality
has been replaced by IO::Socket::IP.

(cherry picked from commit d1983adc22f7cb0e995f74636ba022e81fb2b734)
(cherry picked from commit fff8de843017ac770e55f4f31abcff2c96df4410)

diff --git a/README b/README
index cac2dd062cce9de395c0c2938138c6fe5298326c..dff5b3c71eef53f81dec58dbd13d006222ec2521 100644 (file)
--- a/README
+++ b/README
@@ -138,7 +138,7 @@ multiple servers to run locally and communicate with one another). These
 IP addresses can be configured by running the command bin/tests/system/
 ifconfig.sh up as root.
 
-Some tests require Perl and the Net::DNS and/or IO::Socket::INET6 modules,
+Some tests require Perl and the Net::DNS and/or IO::Socket::IP modules,
 and will be skipped if these are not available. Some tests require Python
 and the dnspython module and will be skipped if these are not available.
 See bin/tests/system/README for further details.

diff --git a/README.md b/README.md
index 9a6ff6e9cef834a437d8eaf44fe595c8633a17c3..2d4be2429384746f62ddff0fee4b45c0dbb7c362 100644 (file)
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ multiple servers to run locally and communicate with one another).  These
 IP addresses can be configured by running the command
 `bin/tests/system/ifconfig.sh up` as root.
 
-Some tests require Perl and the `Net::DNS` and/or `IO::Socket::INET6` modules,
+Some tests require Perl and the `Net::DNS` and/or `IO::Socket::IP` modules,
 and will be skipped if these are not available. Some tests require Python
 and the `dnspython` module and will be skipped if these are not available.
 See bin/tests/system/README for further details.

diff --git a/bin/tests/system/conf.sh.common b/bin/tests/system/conf.sh.common
index e87acca6006aae41069c863b043792a1dde02a2c..a91c0d9f4e9d36b2203d870fbc72469008b4ccfb 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -12,7 +12,7 @@
 # information regarding copyright ownership.
 
 testsock6() {
-       if test -n "$PERL" && $PERL -e "use IO::Socket::INET6;" 2> /dev/null
+       if test -n "$PERL" && $PERL -e "use IO::Socket::IP;" 2> /dev/null
        then
                $PERL "$TOP/bin/tests/system/testsock6.pl" "$@"
        else

diff --git a/bin/tests/system/testsock6.pl b/bin/tests/system/testsock6.pl
index 59036849a45f3c692b30533a7d8becfee95baef1..9d4e5b7a8f5a77c2a222119cd819c183058b4e6e 100644 (file)
--- a/bin/tests/system/testsock6.pl
+++ b/bin/tests/system/testsock6.pl
@@ -13,13 +13,14 @@
 
 require 5.001;
 
-use IO::Socket::INET6;
+use IO::Socket::IP;
 
 foreach $addr (@ARGV) {
        my $sock;
-       $sock = IO::Socket::INET6->new(LocalAddr => $addr,
-                                       LocalPort => 0,
-                                       Proto     => tcp)
+       $sock = IO::Socket::IP->new(LocalAddr => $addr,
+                                   Domain => PF_INET6,
+                                    LocalPort => 0,
+                                    Proto     => tcp)
                              or die "Can't bind : $@\n";
        close($sock);
 }