From owner-dev-commits-ports-all@freebsd.org Tue Apr 13 15:20:22 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 872A25E3A49; Tue, 13 Apr 2021 15:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FKTnL3QLZz4npV; Tue, 13 Apr 2021 15:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 67DD64E64; Tue, 13 Apr 2021 15:20:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13DFKMcQ085917; Tue, 13 Apr 2021 15:20:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13DFKM3f085916; Tue, 13 Apr 2021 15:20:22 GMT (envelope-from git) Date: Tue, 13 Apr 2021 15:20:22 GMT Message-Id: <202104131520.13DFKM3f085916@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: b00fbbe58890 - main - security/openssl-quictls: Update to 3.0.0alpha14 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b00fbbe5889010754abf29da9b12ae49a61c370b Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Apr 2021 15:20:22 -0000 The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b00fbbe5889010754abf29da9b12ae49a61c370b commit b00fbbe5889010754abf29da9b12ae49a61c370b Author: Bernard Spil AuthorDate: 2021-04-13 15:17:10 +0000 Commit: Bernard Spil CommitDate: 2021-04-13 15:18:58 +0000 security/openssl-quictls: Update to 3.0.0alpha14 * Merge cryptodev fixes from openssl-devel * Improve cryptodev fixes * Fix building without MAN3 --- security/openssl-quictls/Makefile | 21 +++++++++++++-------- security/openssl-quictls/distinfo | 6 +++--- security/openssl-quictls/pkg-plist | 11 ++++++++++- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/security/openssl-quictls/Makefile b/security/openssl-quictls/Makefile index 36fec692b6ec..c69bc477db5e 100644 --- a/security/openssl-quictls/Makefile +++ b/security/openssl-quictls/Makefile @@ -1,8 +1,7 @@ # Created by: Dirk Froemberg PORTNAME= openssl -PORTVERSION= 3.0.0.a12 -PORTREVISION= 1 +PORTVERSION= 3.0.0.a14 CATEGORIES= security devel PKGNAMESUFFIX= -quictls @@ -29,7 +28,7 @@ USES= cpe perl5 USE_PERL5= build USE_GITHUB= yes GH_ACCOUNT= ${PKGNAMESUFFIX:S/-//} -GH_TAGNAME= 9398922 +GH_TAGNAME= 4fb1ff7 TEST_TARGET= test @@ -46,12 +45,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_EXCLUDE_i386= FIPS OPTIONS_GROUP_OPTIMIZE_amd64= EC @@ -68,6 +68,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 @@ -141,6 +142,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}/==} @@ -162,13 +167,13 @@ post-configure: post-configure-MAN3-off: ${REINPLACE_CMD} \ - -e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS7)|' \ - -e 's|dummy $$(MANDOCS[37]); do |dummy; do continue |' \ + -e 's|^build_man_docs:.*|build_man_docs: $$(MANDOCS1) $$(MANDOCS5)|' \ + -e 's|dummy $$(MANDOCS[37]); do |dummy; do |' \ ${WRKSRC}/Makefile post-install-SHARED-on: .for i in ${SHLIBS} - @${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i + -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/$i .endfor post-install-SHARED-off: diff --git a/security/openssl-quictls/distinfo b/security/openssl-quictls/distinfo index ec45cf06caec..070a878fda30 100644 --- a/security/openssl-quictls/distinfo +++ b/security/openssl-quictls/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1615114800 -SHA256 (quictls-openssl-3.0.0.a12-9398922_GH0.tar.gz) = 1b3b9ae3426443bf0297c6a0648ca346fff62bb49a75467b93a83d0e41263f35 -SIZE (quictls-openssl-3.0.0.a12-9398922_GH0.tar.gz) = 14290345 +TIMESTAMP = 1618312327 +SHA256 (quictls-openssl-3.0.0.a14-4fb1ff7_GH0.tar.gz) = 4dc5e3154be448353775dab85c5a5af766431e5eeb6aa6a7586dc040040579b1 +SIZE (quictls-openssl-3.0.0.a14-4fb1ff7_GH0.tar.gz) = 14542855 diff --git a/security/openssl-quictls/pkg-plist b/security/openssl-quictls/pkg-plist index 5c5a4bcd9ab6..8eae959bd485 100644 --- a/security/openssl-quictls/pkg-plist +++ b/security/openssl-quictls/pkg-plist @@ -135,7 +135,7 @@ include/openssl/x509v3.h include/openssl/x509v3err.h lib/libcrypto.a %%SHARED%%lib/engines-%%SHLIBVER%%/capi.so -%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so +%%CRYPTODEV%%%%SHARED%%lib/engines-%%SHLIBVER%%/devcrypto.so %%SHARED%%lib/engines-%%SHLIBVER%%/padlock.so %%SHARED%%lib/libcrypto.so %%SHARED%%lib/libcrypto.so.%%SHLIBVER%% @@ -233,6 +233,7 @@ man/man1/tsget.1.gz %%MAN3%%man/man3/BIO_f_md.3.gz %%MAN3%%man/man3/BIO_f_null.3.gz %%MAN3%%man/man3/BIO_f_prefix.3.gz +%%MAN3%%man/man3/BIO_f_readbuffer.3.gz %%MAN3%%man/man3/BIO_f_ssl.3.gz %%MAN3%%man/man3/BIO_find_type.3.gz %%MAN3%%man/man3/BIO_get_data.3.gz @@ -264,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 @@ -474,6 +476,7 @@ man/man1/tsget.1.gz %%MAN3%%man/man3/OSSL_CMP_exec_certreq.3.gz %%MAN3%%man/man3/OSSL_CMP_log_open.3.gz %%MAN3%%man/man3/OSSL_CMP_validate_msg.3.gz +%%MAN3%%man/man3/OSSL_CORE_MAKE_FUNC.3.gz %%MAN3%%man/man3/OSSL_CRMF_MSG_get0_tmpl.3.gz %%MAN3%%man/man3/OSSL_CRMF_MSG_set0_validity.3.gz %%MAN3%%man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3.gz @@ -488,6 +491,7 @@ man/man1/tsget.1.gz %%MAN3%%man/man3/OSSL_ENCODER_CTX_new_for_pkey.3.gz %%MAN3%%man/man3/OSSL_ENCODER_to_bio.3.gz %%MAN3%%man/man3/OSSL_HTTP_REQ_CTX.3.gz +%%MAN3%%man/man3/OSSL_HTTP_parse_url.3.gz %%MAN3%%man/man3/OSSL_HTTP_transfer.3.gz %%MAN3%%man/man3/OSSL_LIB_CTX.3.gz %%MAN3%%man/man3/OSSL_PARAM.3.gz @@ -544,6 +548,7 @@ man/man1/tsget.1.gz %%MAN3%%man/man3/RAND_egd.3.gz %%MAN3%%man/man3/RAND_get0_primary.3.gz %%MAN3%%man/man3/RAND_load_file.3.gz +%%MAN3%%man/man3/RAND_set_DRBG_type.3.gz %%MAN3%%man/man3/RAND_set_rand_method.3.gz %%MAN3%%man/man3/RC4_set_key.3.gz %%MAN3%%man/man3/RIPEMD160_Init.3.gz @@ -712,6 +717,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 @@ -848,6 +854,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