git: 48f05c509b86 - 2021Q1 - security/openssl: Fix /dev/crypto issue with 1.1.1k

[Bernard Spil]

The branch 2021Q1 has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=48f05c509b86f1ce4a7c9be31ed8adc891870734

commit 48f05c509b86f1ce4a7c9be31ed8adc891870734
Author:     Bernard Spil <brnrd at FreeBSD.org>
AuthorDate: 2021-04-06 10:39:33 +0000
Commit:     Bernard Spil <brnrd at FreeBSD.org>
CommitDate: 2021-04-06 10:54:17 +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 dfe401479f5c..cfe579289879 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
@@ -124,6 +127,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}/==}