Index: head/security/py-cryptography/Makefile =================================================================== --- head/security/py-cryptography/Makefile (revision 566533) +++ head/security/py-cryptography/Makefile (revision 566534) @@ -1,66 +1,70 @@ # Created by: Kubilay Kocak # $FreeBSD$ PORTNAME= cryptography -PORTVERSION= 2.9.2 +PORTVERSION= 3.3.2 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= koobs@FreeBSD.org COMMENT= Cryptographic recipes and primitives for Python developers LICENSE= APACHE20 BSD3CLAUSE LICENSE_COMB= dual LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.BSD BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=${PORTVERSION}:security/py-cryptography-vectors@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>=3.6.0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} # Python 2.7, 3.5-3.8 USES= compiler:env python:3.6+ ssl USE_PYTHON= autoplist concurrent distutils CFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} .include # OpenSSL 1.0.2t got some curve matching parameter code backported before it # has reached its End-of-Life and security/py-cryptography already had some # code to handle this case, but it assumed OpenSSL 1.1.0+ . # # This has been fixed in 3.0-23-g241f8450 of security/py-cryptography and to be # clear: It isn't a security fix but rather a workaround to handle unnamed but # really named curves with OpenSSL 1.0.2t/u . + +# We need to keep old py-cryptography and py-openssl for 11.x release +# due to outdated OpenSSL version in base .if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} == "base" . if ${OSVERSION} >= 1103500 && ${OSVERSION} < 1200085 # 1103500 352193 2019-09-10 11.3-STABLE got OpenSSL 1.0.2t # 1200085 339270 2018-10-19 12.0-STABLE got OpenSSL 1.1.1 +PORTVERSION= 2.9.2 EXTRA_PATCHES= ${PATCHDIR}/openssl102u . endif .endif .if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 post-patch: @${REINPLACE_CMD} -e 's|"-Wno-error=sign-conversion"||' \ ${WRKSRC}/src/_cffi_src/build_openssl.py .endif post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so do-test: @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -q -v -rs -o addopts= .include Index: head/security/py-cryptography/distinfo =================================================================== --- head/security/py-cryptography/distinfo (revision 566533) +++ head/security/py-cryptography/distinfo (revision 566534) @@ -1,3 +1,5 @@ -TIMESTAMP = 1596263213 +TIMESTAMP = 1614253508 SHA256 (cryptography-2.9.2.tar.gz) = a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229 SIZE (cryptography-2.9.2.tar.gz) = 517571 +SHA256 (cryptography-3.3.2.tar.gz) = 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed +SIZE (cryptography-3.3.2.tar.gz) = 539883 Index: head/security/py-openssl/Makefile =================================================================== --- head/security/py-openssl/Makefile (revision 566533) +++ head/security/py-openssl/Makefile (revision 566534) @@ -1,48 +1,63 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= openssl PORTVERSION= 20.0.1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= pyOpenSSL-${PORTVERSION} MAINTAINER= sbz@FreeBSD.org COMMENT= Python interface to the OpenSSL library LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=2.8: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 USES= cpe python:3.6+ USE_PYTHON= autoplist concurrent distutils pythonprefix NO_ARCH= yes CPE_VENDOR= jean-paul_calderone CPE_PRODUCT= py${PORTNAME} +# Use options.mk to use OSVERSION and handle redefine PORTEPOCH +.include + +# We need to keep old py-cryptography and py-penssl for 11.x release +# due to outdated OpenSSL version in base +.if ${OPSYS} == FreeBSD && ${SSL_DEFAULT} == "base" +. if ${OSVERSION} >= 1103500 && ${OSVERSION} < 1200085 +# 1103500 352193 2019-09-10 11.3-STABLE got OpenSSL 1.0.2t +# 1200085 339270 2018-10-19 12.0-STABLE got OpenSSL 1.1.1 +#.sinclude "${.CURDIR}/Makefile.${OPSYS}-${OSREL:R}" +PORTVERSION= 19.1.0 +PORTEPOCH= 1 +. endif +.endif + # 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} && ${SET_ENV} LC_ALL=en_US.UTF-8 ${TEST_ENV} \ PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \ ${PYTHON_CMD} -m pytest -rs -v -k \ 'not test_connect_refused and \ not test_set_verify_callback_exception' .include Index: head/security/py-openssl/distinfo =================================================================== --- head/security/py-openssl/distinfo (revision 566533) +++ head/security/py-openssl/distinfo (revision 566534) @@ -1,3 +1,5 @@ TIMESTAMP = 1613747780 +SHA256 (pyOpenSSL-19.1.0.tar.gz) = 9a24494b2602aaf402be5c9e30a0b82d4a5c67528fe8fb475e3f3bc00dd69507 +SIZE (pyOpenSSL-19.1.0.tar.gz) = 160510 SHA256 (pyOpenSSL-20.0.1.tar.gz) = 4c231c759543ba02560fcd2480c48dcec4dae34c9da7d3747c508227e0624b51 SIZE (pyOpenSSL-20.0.1.tar.gz) = 173736