1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00

security/py-openssl: unbreak run for consumers

Partially revert r566075 to previous py-openssl release only for
${OSVERSION} < 1200085 and base OpenSSL 1.0.2 with PORTEPOCH bump

This step is needed because since 20.0 release py-openssl have dropped off support
for openssl < 1.1.0 which still in base fo FreeBSD 11.4+ branch

Due to dependency on recent cryptography, bump py-cryptography to 3.3.2 release
under same conditions as py-openssl. 3.3.2 was last release which not requred Rust to build

With hat:	ports-secteam
Pointy hat to:	sbz (for skip dependencies verification and no reaction to complains)
Reported by:	many via ML
This commit is contained in:
Dima Panov 2021-02-25 13:32:25 +00:00
parent 4b8b16c513
commit d2a8beaf97
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=566534
4 changed files with 25 additions and 2 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= cryptography
PORTVERSION= 2.9.2
PORTVERSION= 3.3.2
CATEGORIES= security python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@ -43,10 +43,14 @@ TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
# 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

View File

@ -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

View File

@ -29,6 +29,21 @@ NO_ARCH= yes
CPE_VENDOR= jean-paul_calderone
CPE_PRODUCT= py${PORTNAME}
# Use options.mk to use OSVERSION and handle redefine PORTEPOCH
.include <bsd.port.options.mk>
# 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

View File

@ -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