Date: Tue, 6 Apr 2021 10:47:05 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 64d94165652f - main - security/openssl: Fix /dev/crypto issue with 1.1.1k Message-ID: <202104061047.136Al5uu097497@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=64d94165652f40041bf71bdf7a775f867e7b80a9 commit 64d94165652f40041bf71bdf7a775f867e7b80a9 Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2021-04-06 10:39:33 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2021-04-06 10:45:45 +0000 security/openssl: Fix /dev/crypto issue with 1.1.1k PR: 254643 Reported by: <cryx-freebsd h3q com> Reviewed by: wollman --- security/openssl/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 49b040554cfa..5baae5bb1bae 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -3,6 +3,7 @@ PORTNAME= openssl PORTVERSION= 1.1.1k +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security devel MASTER_SITES= https://www.openssl.org/source/ \ @@ -40,12 +41,13 @@ OPTIONS_GROUP_OPTIMIZE= ASM SSE2 THREADS OPTIONS_DEFINE_i386= I386 OPTIONS_GROUP_PROTOCOLS=NEXTPROTONEG SCTP SSL3 TLS1 TLS1_1 TLS1_2 -OPTIONS_DEFINE= ASYNC CT KTLS MAN3 RFC3779 SHARED ZLIB +OPTIONS_DEFINE= ASYNC CRYPTODEV CT KTLS MAN3 RFC3779 SHARED ZLIB OPTIONS_DEFAULT=ASM ASYNC CT GOST DES EC KTLS MAN3 MD4 NEXTPROTONEG RC2 \ RC4 RMD160 SCTP SHARED SSE2 THREADS TLS1 TLS1_1 TLS1_2 -OPTIONS_EXCLUDE=${${OSVERSION} < 1300042:?KTLS:} +OPTIONS_EXCLUDE=${${OSVERSION} < 1300042:?KTLS:} \ + ${${OSVERSION} > 1300000:?CRYPTODEV:} OPTIONS_GROUP_OPTIMIZE_amd64= EC @@ -61,6 +63,7 @@ ARIA_DESC= ARIA (South Korean standard) ASM_DESC= Assembler code ASYNC_DESC= Asynchronous mode CIPHERS_DESC= Block Cipher Support +CRYPTODEV_DESC= /dev/crypto support CT_DESC= Certificate Transparency Support DES_DESC= (Triple) Data Encryption Standard EC_DESC= Optimize NIST elliptic curves @@ -123,6 +126,10 @@ ZLIB_CONFIGURE_ON= zlib-dynamic IGNORE= the OpenSSL port can not be installed over the base version .endif +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 && !${PORT_OPTIONS:MCRYPTODEV} +CONFIGURE_ARGS+= no-devcryptoeng +.endif + OPENSSLDIR?= ${PREFIX}/openssl PLIST_SUB+= OPENSSLDIR=${OPENSSLDIR:S=^${PREFIX}/==}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104061047.136Al5uu097497>