From: bluhm <bluhm@openbsd.org>
Date: Wed, 22 Dec 2021 15:54:01 +0000 (+0000)
Subject: Replace deprecated IO::Socket::INET6 with IO::Socket::IP.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e7c2632ab27bd5e57b323e98205c275ee966abbf;p=openbsd

Replace deprecated IO::Socket::INET6 with IO::Socket::IP.
---

diff --git a/regress/usr.sbin/httpd/tests/Client.pm b/regress/usr.sbin/httpd/tests/Client.pm
index f4fe5c072bd..e4730a60e83 100644
--- a/regress/usr.sbin/httpd/tests/Client.pm
+++ b/regress/usr.sbin/httpd/tests/Client.pm
@@ -1,6 +1,6 @@
-#	$OpenBSD: Client.pm,v 1.2 2018/05/19 13:57:43 jsing Exp $
+#	$OpenBSD: Client.pm,v 1.3 2021/12/22 15:54:01 bluhm Exp $
 
-# Copyright (c) 2010-2015 Alexander Bluhm <bluhm@openbsd.org>
+# Copyright (c) 2010-2021 Alexander Bluhm <bluhm@openbsd.org>
 # Copyright (c) 2015 Reyk Floeter <reyk@openbsd.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
@@ -24,7 +24,6 @@ use Carp;
 use Socket;
 use Socket6;
 use IO::Socket;
-use IO::Socket::INET6;
 use IO::Socket::SSL;
 
 sub new {
@@ -52,7 +51,7 @@ sub child {
 	delete $self->{cs};
 
 	$SSL_ERROR = "";
-	my $iosocket = $self->{tls} ? "IO::Socket::SSL" : "IO::Socket::INET6";
+	my $iosocket = $self->{tls} ? "IO::Socket::SSL" : "IO::Socket::IP";
 	my $cs = $iosocket->new(
 	    Proto		=> "tcp",
 	    Domain		=> $self->{connectdomain},
diff --git a/regress/usr.sbin/httpd/tests/LICENSE b/regress/usr.sbin/httpd/tests/LICENSE
index a5303a4f523..55dd5410b11 100644
--- a/regress/usr.sbin/httpd/tests/LICENSE
+++ b/regress/usr.sbin/httpd/tests/LICENSE
@@ -1,4 +1,4 @@
-# Copyright (c) 2010-2017 Alexander Bluhm <bluhm@openbsd.org>
+# Copyright (c) 2010-2021 Alexander Bluhm <bluhm@openbsd.org>
 # Copyright (c) 2014,2015 Reyk Floeter <reyk@openbsd.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
diff --git a/regress/usr.sbin/httpd/tests/Makefile b/regress/usr.sbin/httpd/tests/Makefile
index c23e6b894dd..3afb588ce93 100644
--- a/regress/usr.sbin/httpd/tests/Makefile
+++ b/regress/usr.sbin/httpd/tests/Makefile
@@ -1,7 +1,6 @@
-#	$OpenBSD: Makefile,v 1.15 2021/12/02 17:10:53 kn Exp $
+#	$OpenBSD: Makefile,v 1.16 2021/12/22 15:54:01 bluhm Exp $
 
 # The following ports must be installed for the regression tests:
-# p5-IO-Socket-INET6	object interface for AF_INET and AF_INET6 domain sockets
 # p5-Socket6		Perl defines relating to AF_INET6 sockets
 # p5-IO-Socket-SSL	perl interface to SSL sockets
 #
@@ -9,14 +8,13 @@
 # are missing print a warning and skip the tests, but do not fail.
 
 PERL_REQUIRE !=	perl -Mstrict -Mwarnings -e ' \
-    eval { require IO::Socket::INET6 } or print $@; \
     eval { require Socket6 } or print $@; \
     eval { require IO::Socket::SSL } or print $@; \
 '
 .if ! empty (PERL_REQUIRE)
 regress:
 	@echo "${PERL_REQUIRE}"
-	@echo 'run "pkg_add p5-IO-Socket-INET6 p5-Socket6 p5-IO-Socket-SSL"'
+	@echo 'run "pkg_add p5-Socket6 p5-IO-Socket-SSL"'
 	@echo SKIPPED
 .endif
 
diff --git a/regress/usr.sbin/httpd/tests/funcs.pl b/regress/usr.sbin/httpd/tests/funcs.pl
index fde38073467..76c7ff44db1 100644
--- a/regress/usr.sbin/httpd/tests/funcs.pl
+++ b/regress/usr.sbin/httpd/tests/funcs.pl
@@ -1,6 +1,6 @@
-#	$OpenBSD: funcs.pl,v 1.8 2017/07/14 13:31:44 bluhm Exp $
+#	$OpenBSD: funcs.pl,v 1.9 2021/12/22 15:54:01 bluhm Exp $
 
-# Copyright (c) 2010-2017 Alexander Bluhm <bluhm@openbsd.org>
+# Copyright (c) 2010-2021 Alexander Bluhm <bluhm@openbsd.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -23,7 +23,6 @@ use Digest::MD5;
 use Socket;
 use Socket6;
 use IO::Socket;
-use IO::Socket::INET6;
 
 sub find_ports {
 	my %args = @_;
@@ -33,7 +32,7 @@ sub find_ports {
 
 	my @sockets = (1..$num);
 	foreach my $s (@sockets) {
-		$s = IO::Socket::INET6->new(
+		$s = IO::Socket::IP->new(
 		    Proto  => "tcp",
 		    Domain => $domain,
 		    $addr ? (LocalAddr => $addr) : (),