4 files changed, 31 insertions, 19 deletions

diff --git a/security/testssl.sh/Makefile b/security/testssl.sh/Makefile
index e8b6fe776465..1ce3c42f0ff9 100644
--- a/security/testssl.sh/Makefile
+++ b/security/testssl.sh/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	testssl.sh
-DISTVERSION=	3.0rc5
+DISTVERSION=	3.0rc6
 CATEGORIES=	security
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -10,18 +10,20 @@ COMMENT=	Test TLS/SSL encryption anywhere on any port
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	bash:shells/bash \
-		${LOCALBASE}/openssl-unsafe/bin/openssl:security/openssl-unsafe
+RUN_DEPENDS=	${LOCALBASE}/openssl-unsafe/bin/openssl:security/openssl-unsafe \
+		bash:shells/bash
+TEST_DEPENDS=	p5-JSON>=0:converters/p5-JSON
 
-USES=		shebangfix
+USES=		perl5 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	drwetter
+USE_PERL5=	test
+SHEBANG_FILES=	testssl.sh utils/*
+TEST_ENV=	TESTSSL_INSTALL_DIR=${WRKSRC}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-SHEBANG_FILES=	testssl.sh utils/*
-
 post-patch:
 	@${REINPLACE_CMD} -e '/elif test_openssl_suffix/d' \
 		-e 's@OPENSSL=PREFIX@OPENSSL=${PREFIX}@' \
@@ -30,10 +32,18 @@ post-patch:
 		${WRKSRC}/testssl.sh
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/testssl.sh ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/testssl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	@${MKDIR} ${STAGEDIR}${DATADIR}/etc ${STAGEDIR}${DATADIR}/utils
-	@cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/etc
-	@cd ${WRKSRC}/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils
+	${INSTALL_SCRIPT} ${WRKSRC}/testssl.sh \
+		${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/testssl.1 \
+		${STAGEDIR}${MAN1PREFIX}/man/man1
+	@cd ${WRKSRC} && \
+		${COPYTREE_SHARE} "etc utils" ${STAGEDIR}${DATADIR}
+
+do-test:
+# Run the badssl.com test as a sanity check.  The full test suite
+# opens too many network connections and might take too long to
+# run.
+	@cd ${WRKSRC} && \
+		${SETENV} ${TEST_ENV} prove -v t/51_badssl.com.t
 
 .include <bsd.port.mk>
diff --git a/security/testssl.sh/distinfo b/security/testssl.sh/distinfo
index b747f5c69ad7..61ca97e11844 100644
--- a/security/testssl.sh/distinfo
+++ b/security/testssl.sh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556211810
-SHA256 (drwetter-testssl.sh-3.0rc5_GH0.tar.gz) = 6118f08b88c0075f39820296f0d76889165dd67e64dbfdfd1104d6d122a938c9
-SIZE (drwetter-testssl.sh-3.0rc5_GH0.tar.gz) = 9181084
+TIMESTAMP = 1576123689
+SHA256 (drwetter-testssl.sh-3.0rc6_GH0.tar.gz) = fc5aee354e5350448ac48294dee04c34989a21517d2181ff83738b6858eb12f2
+SIZE (drwetter-testssl.sh-3.0rc6_GH0.tar.gz) = 9198338
diff --git a/security/testssl.sh/files/patch-testssl.sh b/security/testssl.sh/files/patch-testssl.sh
index 800c59ddbeb4..3682b3941005 100644
--- a/security/testssl.sh/files/patch-testssl.sh
+++ b/security/testssl.sh/files/patch-testssl.sh
@@ -1,12 +1,12 @@
---- testssl.sh.orig	2018-09-08 11:00:02 UTC
+--- testssl.sh.orig	2019-12-11 11:41:31 UTC
 +++ testssl.sh
-@@ -188,6 +188,9 @@ TERM_CURRPOS=0                                        
+@@ -190,6 +190,9 @@ TERM_CURRPOS=0                                        
  ########### Defining (and presetting) variables which can be changed
  #
  # Following variables make use of $ENV and can be used like "OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <URI>"
 +if [[ -z "$OPENSSL" ]] ; then
 +     OPENSSL=PREFIX/openssl-unsafe/bin/openssl
 +fi
- declare -x OPENSSL OPENSSL_TIMEOUT
- PHONE_OUT=${PHONE_OUT:-false}           # Whether testssl can retrieve CRLs and OCSP
- FAST_SOCKET=${FAST_SOCKET:-false}       # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production
+ declare -x OPENSSL
+ OPENSSL_TIMEOUT=${OPENSSL_TIMEOUT:-""}  # Default connect timeout with openssl before we call the server side unreachable
+ CONNECT_TIMEOUT=${CONNECT_TIMEOUT:-""}  # Default connect timeout with sockets before we call the server side unreachable
diff --git a/security/testssl.sh/pkg-plist b/security/testssl.sh/pkg-plist
index d1e86f4c22f9..8e682a00acbb 100644
--- a/security/testssl.sh/pkg-plist
+++ b/security/testssl.sh/pkg-plist
@@ -18,6 +18,8 @@ man/man1/testssl.1.gz
 %%DATADIR%%/utils/checkcert.sh
 %%DATADIR%%/utils/create_ca_hashes.sh
 %%DATADIR%%/utils/curves.bash
+%%DATADIR%%/utils/docker-debian10.tls13only.start.sh
+%%DATADIR%%/utils/docker-nginx.tls13-earlydata.start.sh
 %%DATADIR%%/utils/generate_static_cipher_lists.sh
 %%DATADIR%%/utils/gmap2testssl.sh
 %%DATADIR%%/utils/heartbleed.bash