From owner-svn-ports-head@freebsd.org Fri Dec 13 06:02:09 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 012691E3A67; Fri, 13 Dec 2019 06:02:09 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Z0S06GJFz4ZBd; Fri, 13 Dec 2019 06:02:08 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D22E57CD2; Fri, 13 Dec 2019 06:02:08 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBD628gO083218; Fri, 13 Dec 2019 06:02:08 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBD628fM083215; Fri, 13 Dec 2019 06:02:08 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201912130602.xBD628fM083215@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 13 Dec 2019 06:02:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r519967 - in head/security/testssl.sh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/security/testssl.sh: . files X-SVN-Commit-Revision: 519967 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Dec 2019 06:02:09 -0000 Author: tobik Date: Fri Dec 13 06:02:07 2019 New Revision: 519967 URL: https://svnweb.freebsd.org/changeset/ports/519967 Log: security/testssl.sh: Update to 3.0rc6 - Hook up tests Changes: https://github.com/drwetter/testssl.sh/releases/tag/3.0rc6 Modified: head/security/testssl.sh/Makefile head/security/testssl.sh/distinfo head/security/testssl.sh/files/patch-testssl.sh head/security/testssl.sh/pkg-plist Modified: head/security/testssl.sh/Makefile ============================================================================== --- head/security/testssl.sh/Makefile Fri Dec 13 06:01:06 2019 (r519966) +++ head/security/testssl.sh/Makefile Fri Dec 13 06:02:07 2019 (r519967) @@ -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 Modified: head/security/testssl.sh/distinfo ============================================================================== --- head/security/testssl.sh/distinfo Fri Dec 13 06:01:06 2019 (r519966) +++ head/security/testssl.sh/distinfo Fri Dec 13 06:02:07 2019 (r519967) @@ -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 Modified: head/security/testssl.sh/files/patch-testssl.sh ============================================================================== --- head/security/testssl.sh/files/patch-testssl.sh Fri Dec 13 06:01:06 2019 (r519966) +++ head/security/testssl.sh/files/patch-testssl.sh Fri Dec 13 06:02:07 2019 (r519967) @@ -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= ./testssl.sh " +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 Modified: head/security/testssl.sh/pkg-plist ============================================================================== --- head/security/testssl.sh/pkg-plist Fri Dec 13 06:01:06 2019 (r519966) +++ head/security/testssl.sh/pkg-plist Fri Dec 13 06:02:07 2019 (r519967) @@ -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