Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Apr 2021 11:43:35 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: 5dd3123de243 - main - security/openssl-devel: Update to 3.0.0-alpha14
Message-ID:  <202104091143.139BhZ0E052940@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=5dd3123de243e32c77eb792f46c9fce41f00c11c

commit 5dd3123de243e32c77eb792f46c9fce41f00c11c
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2021-04-09 11:40:52 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2021-04-09 11:42:19 +0000

    security/openssl-devel: Update to 3.0.0-alpha14
    
     * and fix cryptodev on < 13
    
    PR:             254643
    Reported by:    <cryx-freebsd h3q com>
    Reviewed by:    wollman
---
 security/openssl-devel/Makefile  | 12 +++++++++---
 security/openssl-devel/distinfo  |  6 +++---
 security/openssl-devel/pkg-plist |  5 +++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile
index ec20eb80a1e8..94f813bdd455 100644
--- a/security/openssl-devel/Makefile
+++ b/security/openssl-devel/Makefile
@@ -1,7 +1,7 @@
 # Created by: Dirk Froemberg <dirk@FreeBSD.org>
 
 PORTNAME=	openssl
-DISTVERSION=	3.0.0-alpha13
+DISTVERSION=	3.0.0-alpha14
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
@@ -42,12 +42,13 @@ OPTIONS_GROUP_MODULES=	FIPS LEGACY
 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 DES EC FIPS GOST 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
 
@@ -63,6 +64,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
@@ -136,6 +138,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}/==}
 
diff --git a/security/openssl-devel/distinfo b/security/openssl-devel/distinfo
index 4cf5ac0cedbd..a5abf6796ebd 100644
--- a/security/openssl-devel/distinfo
+++ b/security/openssl-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615473285
-SHA256 (openssl-3.0.0-alpha13.tar.gz) = c88cbb9d330b4daa3dbb5af1ed511d5062253291a56e09fd17e9ac013a20f8a3
-SIZE (openssl-3.0.0-alpha13.tar.gz) = 14211501
+TIMESTAMP = 1617886410
+SHA256 (openssl-3.0.0-alpha14.tar.gz) = 78a935e1d314d66cccaa68931702a52d42015b47c3c44bec631de9f5705cb6c0
+SIZE (openssl-3.0.0-alpha14.tar.gz) = 14392548
diff --git a/security/openssl-devel/pkg-plist b/security/openssl-devel/pkg-plist
index 74d7cef996f6..54793a095bfb 100644
--- a/security/openssl-devel/pkg-plist
+++ b/security/openssl-devel/pkg-plist
@@ -265,6 +265,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/BN_cmp.3.gz
 %%MAN3%%man/man3/BN_copy.3.gz
 %%MAN3%%man/man3/BN_generate_prime.3.gz
+%%MAN3%%man/man3/BN_mod_exp_mont.3.gz
 %%MAN3%%man/man3/BN_mod_inverse.3.gz
 %%MAN3%%man/man3/BN_mod_mul_montgomery.3.gz
 %%MAN3%%man/man3/BN_mod_mul_reciprocal.3.gz
@@ -715,6 +716,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/SSL_state_string.3.gz
 %%MAN3%%man/man3/SSL_want.3.gz
 %%MAN3%%man/man3/SSL_write.3.gz
+%%MAN3%%man/man3/TS_RESP_CTX_new.3.gz
 %%MAN3%%man/man3/TS_VERIFY_CTX_set_certs.3.gz
 %%MAN3%%man/man3/UI_STRING.3.gz
 %%MAN3%%man/man3/UI_UTIL_read_pw.3.gz
@@ -851,6 +853,9 @@ man/man5/x509v3_config.5.gz
 %%MAN3%%man/man7/ct.7.gz
 %%MAN3%%man/man7/des_modes.7.gz
 %%MAN3%%man/man7/evp.7.gz
+%%MAN3%%man/man7/life_cycle-kdf.7.gz
+%%MAN3%%man/man7/life_cycle-mac.7.gz
+%%MAN3%%man/man7/life_cycle-rand.7.gz
 %%MAN3%%man/man7/openssl-core.h.7.gz
 %%MAN3%%man/man7/openssl-core_dispatch.h.7.gz
 %%MAN3%%man/man7/openssl-core_names.h.7.gz



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104091143.139BhZ0E052940>