From owner-svn-ports-all@freebsd.org Tue Aug 6 10:19:32 2019 Return-Path: Delivered-To: svn-ports-all@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 BB0EFBE7B4; Tue, 6 Aug 2019 10:19:32 +0000 (UTC) (envelope-from kai@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 462rGX4bpcz3PCd; Tue, 6 Aug 2019 10:19:32 +0000 (UTC) (envelope-from kai@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 7B1C72A744; Tue, 6 Aug 2019 10:19:32 +0000 (UTC) (envelope-from kai@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x76AJWgr091883; Tue, 6 Aug 2019 10:19:32 GMT (envelope-from kai@FreeBSD.org) Received: (from kai@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x76AJVJi091880; Tue, 6 Aug 2019 10:19:31 GMT (envelope-from kai@FreeBSD.org) Message-Id: <201908061019.x76AJVJi091880@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kai set sender to kai@FreeBSD.org using -f From: Kai Knoblich Date: Tue, 6 Aug 2019 10:19:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r508245 - in branches/2019Q3: devel devel/py-flaky security/py-openssl X-SVN-Group: ports-branches X-SVN-Commit-Author: kai X-SVN-Commit-Paths: in branches/2019Q3: devel devel/py-flaky security/py-openssl X-SVN-Commit-Revision: 508245 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Aug 2019 10:19:32 -0000 Author: kai Date: Tue Aug 6 10:19:31 2019 New Revision: 508245 URL: https://svnweb.freebsd.org/changeset/ports/508245 Log: MFH: r508128 r508146 [NEW PORT] devel/py-flaky * Merge devel/py-flaky to 2019Q3 to cover the TEST_DEPENDS for security/py-openssl. security/py-openssl: Update to 19.0.0 While I'm here: * Improve the "do-test" target to easen future QA and add the required dependencies for it. * Sort variables a bit according to the PHB to pet portclippy/portlint. Changelog: Backward-incompatible changes: * X509Store.add_cert no longer raises an error if one add a duplicate cert * pyOpenSSL now works with OpenSSL 1.1.1 * pyOpenSSL now handles NUL bytes in X509Name.get_components() PR: 237006 Submitted by: timp87@gmail.com (based on) Approved by: sbz (maintainer) Approved by: ports-secteam (joneum) Added: branches/2019Q3/devel/py-flaky/ - copied from r508128, head/devel/py-flaky/ Modified: branches/2019Q3/devel/Makefile branches/2019Q3/security/py-openssl/Makefile branches/2019Q3/security/py-openssl/distinfo Directory Properties: branches/2019Q3/ (props changed) Modified: branches/2019Q3/devel/Makefile ============================================================================== --- branches/2019Q3/devel/Makefile Tue Aug 6 10:01:09 2019 (r508244) +++ branches/2019Q3/devel/Makefile Tue Aug 6 10:19:31 2019 (r508245) @@ -4392,6 +4392,7 @@ SUBDIR += py-flake8-import-order SUBDIR += py-flake8-polyfill SUBDIR += py-flake8-quotes + SUBDIR += py-flaky SUBDIR += py-flask-babel SUBDIR += py-flatbuffers SUBDIR += py-flex Modified: branches/2019Q3/security/py-openssl/Makefile ============================================================================== --- branches/2019Q3/security/py-openssl/Makefile Tue Aug 6 10:01:09 2019 (r508244) +++ branches/2019Q3/security/py-openssl/Makefile Tue Aug 6 10:19:31 2019 (r508245) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openssl -PORTVERSION= 18.0.0 +PORTVERSION= 19.0.0 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,9 +16,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.2.1:security/py-cryptography@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.5.2:devel/py-six@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=3.0.1:devel/py-pytest@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flaky>0:devel/py-flaky@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \ + ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -OPTIONS_DEFINE= EXAMPLES - USES= cpe python USE_PYTHON= autoplist concurrent distutils pythonprefix @@ -29,11 +31,25 @@ CPE_PRODUCT= py${PORTNAME} PORTEXAMPLES= * +OPTIONS_DEFINE= EXAMPLES + post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) +# These tests will be skipped due the following reasons: +# +# * test_connect_refused: Avoid stalling in build environments that don't have +# a internet connection +# * test_set_verify_callback_exception: Fails on *BSD systems, see also +# https://github.com/pyca/pyopenssl/issues/656 for further details +# +# The system clock must be in sync otherwise the test "test_verify_with_time" +# will fail. do-test: - @(cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test) + @cd ${WRKSRC} && \ + ${SET_ENV} LC_ALL=en_US.UTF-8 ${PYTHON_CMD} -m pytest -rs -v -k ' \ + not test_connect_refused and \ + not test_set_verify_callback_exception' .include Modified: branches/2019Q3/security/py-openssl/distinfo ============================================================================== --- branches/2019Q3/security/py-openssl/distinfo Tue Aug 6 10:01:09 2019 (r508244) +++ branches/2019Q3/security/py-openssl/distinfo Tue Aug 6 10:19:31 2019 (r508245) @@ -1,3 +1,3 @@ TIMESTAMP = 1540136888 -SHA256 (pyOpenSSL-18.0.0.tar.gz) = 6488f1423b00f73b7ad5167885312bb0ce410d3312eb212393795b53c8caa580 -SIZE (pyOpenSSL-18.0.0.tar.gz) = 167296 +SHA256 (pyOpenSSL-19.0.0.tar.gz) = aeca66338f6de19d1aa46ed634c3b9ae519a64b458f8468aec688e7e3c20f200 +SIZE (pyOpenSSL-19.0.0.tar.gz) = 168551