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 5d5328f34de3891f79928e17a909c7b8c2241f99..e8d1a18540fba5748a188cb5b23b4b5eb112cc9a 100644 (file)
--- a/README
+++ b/README
@@ -578,7 +578,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 ab3aaf74c1eb24a5e53f21cfa00b1fb5099a239c..26146f684bdf95c7d1fd01e839d70a7ceeacadc5 100644 (file)
--- a/README.md
+++ b/README.md
@@ -594,7 +594,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.in b/bin/tests/system/conf.sh.in
index 96c82477bbf67f6799e6c92f799cd642534390ce..1a34d1bdb69a9e32f4c04ca4b6114fc0d1d0daa6 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -160,7 +160,7 @@ PERL=@PERL@
 
 testsock6() {
        if test -n "$PERL" \
-               && $PERL -e "use IO::Socket::INET6;" 2> /dev/null \
+               && $PERL -e "use IO::Socket::IP;" 2> /dev/null \
                && grep "^#define WANT_IPV6 1" "$TOP/config.h" > /dev/null 2>&1
        then
                $PERL "$TOP/bin/tests/system/testsock6.pl" "$@"

diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index dd5c7af5142ff4c4d7d736304a5a36a5c55275c0..b39b2d560c7f428627ea0209f3f0cd270fae9e0e 100644 (file)
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -161,7 +161,7 @@ PERL=/usr/bin/perl
 
 testsock6() {
        if test -n "$PERL" \
-               && $PERL -e "use IO::Socket::INET6;" 2> /dev/null \
+               && $PERL -e "use IO::Socket::IP;" 2> /dev/null \
                && grep "^#define WANT_IPV6 1" "$TOP/config.h" > /dev/null 2>&1
        then
                $PERL "$TOP/bin/tests/system/testsock6.pl" "$@"

diff --git a/bin/tests/system/testsock6.pl b/bin/tests/system/testsock6.pl
index 9071fdf54e5f1f9c34c869b7e460f00314a937f2..91955e75904d6eafe69b4222f9e91727bae3877c 100644 (file)
--- a/bin/tests/system/testsock6.pl
+++ b/bin/tests/system/testsock6.pl
@@ -11,13 +11,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);
 }