socat: Update to 1.7.3.3

pkgsrc changes:
 - Adjust test related definition
 - Remove no longer needed patches

Changes:
1.7.3.3:
--------
Corrections:
 Makefile.in did not specify dependencies of filan on vsnprintf_r.o
 and snprinterr.o
 Added definition of FILAN_OBJS
 Thanks to Craig Leres, Clayton Shotwell, and Chris Packham for
 providing patches.

 configure option --enable-msglevel did not work with numbers

 The autoconf mechanism for determining SHIFT_OFFSET did not work when
 cross compiling.
 Thanks to Max Freisinger from Gentoo for sending a patch.

 Socat still depended on obsolete gethostbyname() function, thus
 compiling with MUSL libc failed.
 Problem reported by Kennedy33.

 The async signal safe diagnostic system used FDs 3 and 4 internally, so
 use of appropriate fdin or fdout led to failures.
 Test: DIAG_FDIN
 Problem reported by Onur Sentürk.

 The socket based mechanism for passing messages and signal information
 from signal handler to process could reach and kill the wrong process.
 Introduces functions diag_sock_pair(), diag_fork()
 Thanks to Darren Zhao for analysing and reporting this problem.

 Option ipv6-join-group did not work because it was applied in the wrong
 phase
 Test: UDP6MULTICAST_UNIDIR
 Thanks to Angus Gratton for sending a patch.

 Setting ispeed and ospeed failed for some serial devices because the
 two settings were applied with two different get/set cycles, Thanks to
 Alexandre Fenyo for providing an initial patch.
 However, the actual fix is part of a conceptual change of the termios
 module that aims for applying all changes in a single tcsetaddr call.
 Fixes FreeBSD Bug 198441

 Termios options TAB0,TAB1,TAB2,TAB3, and XTABS did not have an effect.
 Thanks to Alan Walters for reporting this bug.

 Substituted cumbersom ISPEED_OFFSET mechanism for cfsetispeed() calls

 With TCP6-LISTEN and the other passive IPv6 addresses the range option
 just failed: due to a bug in the syntax parser and two more bugs in
 the xiocheckrange_ip6() function.
 The syntax has now been changed from "[::1/128]" to "[::1]/128"!
 Thanks Leah Neukirchen for sending an initial fix.

 For name resolution Socat only checked the first character of the host
 name to decide if it is an IPv4 address. This was not RFC conform. This
 fix removes the possibility for use of IPv4 addresses with IPv6, e.g.
 TCP6:127.0.0.1:80
 Thanks to Nicolas Fournil for reporting this issue.

 Print a useful error message when single character options appear to be
 merged in Socat invocation
        Test: SOCCAT_OPT_HINT

 Fixed some docu typos.
 Thanks to Travis Wellman, Thomas <tjps636>, Dan Kenigsberg,
 Julian Zinn, and Simon Matter

Porting:
 OpenSSL functions TLS1_client_method() and similar are
 deprecated. Socat now uses recommended TLS_client_method(). The old
 functions and dependend option openssl-method can still be
 used when configuring socat with --enable-openssl-method

 Shell scripts in socat distribution are now headed with:
 #! /usr/bin/env bash
 to make them better portable to systems without /bin/bash
 Thanks to Maya Rashish for sending a patch

 RES_AAONLY, RES_PRIMARY are deprecated. You can still enable them with
 configure option --enable-res-deprecated.

 New versions of OpenSSL preset SSL_MODE_AUTO_RETRY which may hang socat.
 Solution: clear SSL_MODE_AUTO_RETRY when it is set.

 Renamed configure.in to configure.ac and set an appropriate symlink for
 older environments.
 Related Gentoo bug 426262: Warning on configure.in
 Thanks to Francesco Turco for reporting that warning.

 Fixed new IPv6 range code for platforms without s6_addr32 component.

Testing:
 test.sh: Show a warning when phase-1 (insecure phase) of a security
 test fails

 OpenSSL tests failed on actual Linux distributions. Measures:
 Increased key lengths from 768 to 1024 bits
 Added test.sh option -C to delete temp certs from prevsious runs
 Provide DH-parameter in certificate in PEM
 OpenSSL s_server option -verify 0 must be omitted
 OpenSSL authentication method aNULL no longer works
 Failure of cipher aNULL is not a failure
 Failure of methods SSL3 and SSL23 is desired

 test.sh depended on ifconfig and netstat utilities which are no longer
 available in some distributions. test.sh now checks for and prefers
 ip and ss.
 Thanks to Ruediger Meier for reporting this problem.

 More corrections to test.sh:
 Language settings could still influence test results
 netstat was still required
 Suppress usleep deprecated messag
 Force use of IPv4 with some certificates
 Set timeout for UDPxMAXCHILDREN tests

Git:
 Added missing Config/Makefile.DragonFly-2-8-2,
 Config/config.DragonFly-2-8-2.h
 Removed testcert.conf (to be generated by test.sh)

Cosmetics:
 Simplified handling of missing termios defines.

New features:
 Permit combined -d options as -dd etc.

4 files changed, 9 insertions, 78 deletions

diff --git a/net/socat/Makefile b/net/socat/Makefile
index d862c3f83a4..3e3d62292d2 100644
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2018/07/04 13:40:31 jperkin Exp $
+# $NetBSD: Makefile,v 1.41 2019/04/07 19:26:56 leot Exp $
 
-DISTNAME=	socat-1.7.3.2
-PKGREVISION=	1
+DISTNAME=	socat-1.7.3.3
 CATEGORIES=	net
 MASTER_SITES=	http://www.dest-unreach.org/socat/download/
 
@@ -12,11 +11,10 @@ LICENSE=	gnu-gpl-v2
 
 GNU_CONFIGURE=		YES
 
-USE_TOOLS+=	bash # test tool
+USE_TOOLS+=	bash:test
 REPLACE_BASH+=	*.sh
 
-do-test:
-	cd ${WRKSRC} && ${MAKE} test
+TEST_TARGET=	test
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/socat/distinfo b/net/socat/distinfo
index 9b5615b7918..770a05dd888 100644
--- a/net/socat/distinfo
+++ b/net/socat/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.25 2017/11/11 19:43:06 maya Exp $
+$NetBSD: distinfo,v 1.26 2019/04/07 19:26:56 leot Exp $
 
-SHA1 (socat-1.7.3.2.tar.gz) = 28eca1f8efeadde3f96c1ac89e553c28d736d41d
-RMD160 (socat-1.7.3.2.tar.gz) = b20967255460adb348aa90f42aaa6bea062f4b7c
-SHA512 (socat-1.7.3.2.tar.gz) = 540658b2a3d1b87673196282e5c62b97681bd0f1d1e4759ff9d72909d11060235ee9e9521a973603c1b00376436a9444248e5fbc0ffac65f8edb9c9bc28e7972
-Size (socat-1.7.3.2.tar.gz) = 611707 bytes
-SHA1 (patch-mytypes.h) = 94df5a47f7fbadf867e0994edeeb857b467021df
-SHA1 (patch-test.sh) = f8e123d3e1a71d6ec34dc2dc42c6de0875a47754
+SHA1 (socat-1.7.3.3.tar.gz) = acbb6c4c303a9bd8428c7846545849f25d92bd76
+RMD160 (socat-1.7.3.3.tar.gz) = ed1e304fe3e0c7cffdab6dbb1f5f752c3dd53ca4
+SHA512 (socat-1.7.3.3.tar.gz) = b3ea4cb6081f7778a0281a3ec36ea7e5daf07dc19f2e0de08f767417112776e96e1bcac7962ebb6dd8b960ad91fc4a452f0da8327736d50e215e4ab43947ff78
+Size (socat-1.7.3.3.tar.gz) = 614101 bytes
diff --git a/net/socat/patches/patch-mytypes.h b/net/socat/patches/patch-mytypes.h
deleted file mode 100644
index ac614d7797f..00000000000
--- a/net/socat/patches/patch-mytypes.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-mytypes.h,v 1.3 2015/07/25 14:43:23 bsiegert Exp $
-
-Use stdbool.
-
---- mytypes.h.orig	2010-10-06 07:25:30.000000000 +0000
-+++ mytypes.h
-@@ -10,6 +10,7 @@
- #ifndef HAVE_TYPE_BOOL
- #  undef bool
- typedef enum { false, true } bool;
-+#include <stdbool.h>
- #endif
- 
- #ifndef Min
diff --git a/net/socat/patches/patch-test.sh b/net/socat/patches/patch-test.sh
deleted file mode 100644
index f7b4a6faf40..00000000000
--- a/net/socat/patches/patch-test.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-test.sh,v 1.1 2017/11/11 19:43:06 maya Exp $
-
-Avoid hard coding /bin/bash so much
-
---- test.sh.orig	2017-11-11 19:17:54.549032453 +0000
-+++ test.sh
-@@ -698,7 +698,7 @@ for addr in proxy; do
-     done
-     echo $OPTS
-     # prepare dummy server
--    $SOCAT tcp-l:$PORT,reuseaddr,crlf exec:"/bin/bash proxyecho.sh" || echo "cannot start proxyecho.sh" >&2 &
-+    $SOCAT tcp-l:$PORT,reuseaddr,crlf exec:"bash proxyecho.sh" || echo "cannot start proxyecho.sh" >&2 &
- 	pid=$!
- 	sleep 1
-     for o in $(filloptionvalues $OPTS|tr ',' ' '); do
-@@ -4548,7 +4548,7 @@ te="$td/test$N.stderr"
- tdiff="$td/test$N.diff"
- da="test$N $(date) $RANDOM"; da="$da$($ECHO '\r')"
- #CMD2="$TRACE $SOCAT tcp4-l:$PORT,crlf SYSTEM:\"read; read; $ECHO \\\"HTTP/1.0 200 OK\n\\\"; cat\""
--CMD2="$TRACE $SOCAT $opts tcp4-l:$PORT,reuseaddr,crlf exec:\"/bin/bash proxyecho.sh\""
-+CMD2="$TRACE $SOCAT $opts tcp4-l:$PORT,reuseaddr,crlf exec:\"bash proxyecho.sh\""
- CMD="$TRACE $SOCAT $opts - proxy:$LOCALHOST:127.0.0.1:1000,pf=ip4,proxyport=$PORT"
- printf "test $F_n $TEST... " $N
- eval "$CMD2 2>\"${te}2\" &"
-@@ -4594,7 +4594,7 @@ te="$td/test$N.stderr"
- tdiff="$td/test$N.diff"
- da="test$N $(date) $RANDOM"; da="$da$($ECHO '\r')"
- #CMD2="$TRACE $SOCAT $opts tcp6-l:$PORT,crlf SYSTEM:\"read; read; $ECHO \\\"HTTP/1.0 200 OK\n\\\"; cat\""
--CMD2="$TRACE $SOCAT $opts tcp6-l:$PORT,reuseaddr,crlf exec:\"/bin/bash proxyecho.sh\""
-+CMD2="$TRACE $SOCAT $opts tcp6-l:$PORT,reuseaddr,crlf exec:\"bash proxyecho.sh\""
- CMD="$TRACE $SOCAT $opts - proxy:$LOCALHOST6:127.0.0.1:1000,proxyport=$PORT"
- printf "test $F_n $TEST... " $N
- eval "$CMD2 2>\"${te}2\" &"
-@@ -4828,7 +4828,7 @@ te="$td/test$N.stderr"
- tdiff="$td/test$N.diff"
- da="test$N $(date) $RANDOM"; da="$da$($ECHO '\r')"
- #CMD2="$TRACE $SOCAT $opts tcp-l:$PORT,crlf SYSTEM:\"read; read; $ECHO \\\"HTTP/1.0 200 OK\n\\\"; cat\""
--CMD2="$TRACE $SOCAT $opts tcp4-l:$PORT,reuseaddr,crlf exec:\"/bin/bash proxyecho.sh -w 2\""
-+CMD2="$TRACE $SOCAT $opts tcp4-l:$PORT,reuseaddr,crlf exec:\"bash proxyecho.sh -w 2\""
- CMD="$TRACE $SOCAT $opts - proxy:$LOCALHOST:127.0.0.1:1000,pf=ip4,proxyport=$PORT"
- printf "test $F_n $TEST... " $N
- eval "$CMD2 2>\"${te}1\" &"
-@@ -6335,7 +6335,7 @@ $PRINTF "test $F_n $TEST... " $N
- #$TRACE $SOCAT $opts echo SYSTEM:'exec /bin/bash -c "echo \$PPID '">$tpp"'; echo \$$ '">$tp; read x\"",nofork 2>"$te"; stat=$?
- tsh="$td/test$N.sh"
- cat <<EOF >"$tsh"
--#! /bin/bash
-+#! /usr/bin/env bash
- echo \$PPID >"$tpp"
- echo \$\$ >"$tp"
- read x