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)

diff --git a/README.md b/README.md
index 6e39de51e788394f1d707b3e6d1c92ee9ae2179b..ad2b29bbc88cc24ca2c887df294715d5871df9b3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -128,7 +128,7 @@ multiple servers to run locally and communicate with each other). 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 are skipped if these are not available. Some tests require Python
 and the `dnspython` module and are 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 ab0f6897509af3042cdf1b3538c05b8efb3ac98e..2d1c8a83abffa976169d87e8d51bb825a417c389 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_SRCDIR/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);
 }