From bd96046b8c6fe7e7c4152dfbac411793bb01896e Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Tue, 27 Sep 2022 15:18:25 +1000 Subject: [PATCH] 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) --- README | 2 +- README.md | 2 +- bin/tests/system/conf.sh.in | 2 +- bin/tests/system/conf.sh.win32 | 2 +- bin/tests/system/testsock6.pl | 9 +++++---- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README b/README index 5d5328f34d..e8d1a18540 100644 --- 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 ab3aaf74c1..26146f684b 100644 --- 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 96c82477bb..1a34d1bdb6 100644 --- 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 dd5c7af514..b39b2d560c 100644 --- 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 9071fdf54e..91955e7590 100644 --- 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); }