Date: Fri, 21 May 2021 15:18:46 GMT From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 58a2c0b4b774 - main - security/py-cryptography: fix build on FreeBSD 11 Message-ID: <202105211518.14LFIkv5037767@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=58a2c0b4b774c28cdb023d5cab9c1179b7f88af3 commit 58a2c0b4b774c28cdb023d5cab9c1179b7f88af3 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2021-05-21 15:11:07 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2021-05-21 15:11:07 +0000 security/py-cryptography: fix build on FreeBSD 11 The LibreSSL 3.3.2+ patch does not and was never intended to apply with older py-cryptography 2.9.2 that we offer for FreeBSD 11 using base OpenSSL. For now, make the LibreSSL 3.3.2+ patch conditional on SSL_DEFAULT=libressl* until FreeBSD 11 goes EOL. Reported by: dvl Fixes: 6f05c9c07cff security/py-cryptography: fix build with LibreSSL 3.3.2+ Pointy hat to: vishwin Approved by: koobs (maintainer, implicit), fluffly (mentor, implicit) PR: 255241 --- security/py-cryptography/Makefile | 6 ++++++ ...SL-3.3.2-5988 => extra-patch-Fix-build-with-LibreSSL-3.3.2-5988} | 0 2 files changed, 6 insertions(+) diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile index 6f9273719204..0e8e8337092e 100644 --- a/security/py-cryptography/Makefile +++ b/security/py-cryptography/Makefile @@ -54,6 +54,12 @@ EXTRA_PATCHES= ${PATCHDIR}/openssl102u . endif .endif +# Apply LibreSSL upstream patch that conflicts with above patch for 2.9.2 +# XXX convert back to unconditional when FreeBSD 11 goes EOL +.if ${SSL_DEFAULT:Mlibressl*} +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Fix-build-with-LibreSSL-3.3.2-5988 +.endif + .if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 post-patch: @${REINPLACE_CMD} -e 's|"-Wno-error=sign-conversion"||' \ diff --git a/security/py-cryptography/files/patch-Fix-build-with-LibreSSL-3.3.2-5988 b/security/py-cryptography/files/extra-patch-Fix-build-with-LibreSSL-3.3.2-5988 similarity index 100% rename from security/py-cryptography/files/patch-Fix-build-with-LibreSSL-3.3.2-5988 rename to security/py-cryptography/files/extra-patch-Fix-build-with-LibreSSL-3.3.2-5988
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105211518.14LFIkv5037767>