From nobody Sat Feb 03 04:21:52 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TRfc119lHz590mb; Sat, 3 Feb 2024 04:21:53 +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 4TRfc10Mncz4vFh; Sat, 3 Feb 2024 04:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706934113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HffNLC/Gz17vZZI09KnevxlvdMn0xObX+TtQGsYzHc=; b=YbGG+wQ8WMGnA8EzFWWFW9+59jzqwCevQKG30+XPOHxJNal7C57mLqORjkPERx/ARTwh94 K6zUmyG6JDFki0KwK9n/cvLco7xR6+iMP169JVomAeiCtwCMw4T68AoQBZFjtjcGRjhBKK Ul98FYUHZQCi9qH2b6loARyQHCw/6Bgdq0prDBTndi6dFCv9azunz02QEaHDJPM4+jQcv+ oTlBpwsY6gIBB9PdqhgiHL5a3uZDOmJSId2T5YXOmcZNxIuef4uWdpZzSn+V6YyeoceJYJ BFx39JxwgR6zbPV1y/R90RpZiXY7kqAWbecN9XVel6wawi5PNDZOfovuTv+61A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706934113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+HffNLC/Gz17vZZI09KnevxlvdMn0xObX+TtQGsYzHc=; b=Dz20uhb3/QLlFl6iWUUtU9N1FKqV57bWrIu7r02UYcgbTjUNNqn24M8Jq3ziC79dnKKkkX iFnui+9MB6qbAz6ahdWF2aEDDNFqnUdDFYs58A1JXpxA6i352/f+nGe3ShUpU/wAB3+H3a m3z4ovInbArbrEoqRNBpH4jeVuiCTUJP1PizoUaabo2FhZ4RMavWLwiJkT3Keo1xrosnxZ Oe1TftK0M6OyV9IxTkjygdCkjNWN3WG6WCJYGQftbTWMqwWBu+ftiD8g1UoGXv+X91c0yq 7kZVWSWKbhhg2WvV2i2UFwfwx7NTvFLdvm8gdhDaH8Jbf6nxI9kfCYeNzTsRbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706934113; a=rsa-sha256; cv=none; b=MswYn3B/s9VAcnPnRisiwJwbjrsJvlNQptbrsH+kCn3c+Vpgh0z2Fr2YGCAI2Rx1j0Rhj3 6gV0ts0WNb+eIptvCSPG8w3CyBSnoAGTkqTCXZQrk8sYLn2Xop+EySZxMOj+YAtc0W/4vP 5TuYqWdQiWIUJXY8rPnjQtGgHUpe89gQMABNkm/yIhc8T3jceW2ceZP2nqIuH/NSyvlJx+ aGQ52YKvFPb535ujNniGyUgWKI5/nFQBl6hTW0g1xxdQtYgqV7HkaKVUEsr8Q4x3w3NiDg H/z4EKenLQHluRPFiFeI9YjmedZvIL7m+cLxNcqRL/Xsa2XO6fAcQRjGyOBg0Q== 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 4TRfc06MJjzys5; Sat, 3 Feb 2024 04:21:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4134LqfI096022; Sat, 3 Feb 2024 04:21:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4134Lqn8096019; Sat, 3 Feb 2024 04:21:52 GMT (envelope-from git) Date: Sat, 3 Feb 2024 04:21:52 GMT Message-Id: <202402030421.4134Lqn8096019@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 8f6099e035f3 - main - security/mbedtls: Update to 2.28.7 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f6099e035f385631915063e8ed5e34d581b5d2a Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8f6099e035f385631915063e8ed5e34d581b5d2a commit 8f6099e035f385631915063e8ed5e34d581b5d2a Author: Daniel Engberg AuthorDate: 2024-02-03 04:09:25 +0000 Commit: Daniel Engberg CommitDate: 2024-02-03 04:21:48 +0000 security/mbedtls: Update to 2.28.7 - Switch to CMake, this is more inline with other distros and simplifies port - Modernize port to follow Porters Handbook more closely - Drop configuration patch and use upstream's supplied tool instead Changelog: https://github.com/Mbed-TLS/mbedtls/releases/tag/v2.28.7 PR: 276661 Reviewed by: tijl (maintainer) --- security/mbedtls/Makefile | 37 ++++++++++++---------- security/mbedtls/distinfo | 6 ++-- .../mbedtls/files/patch-include_mbedtls_config.h | 29 ----------------- security/mbedtls/pkg-plist | 17 +++------- 4 files changed, 27 insertions(+), 62 deletions(-) diff --git a/security/mbedtls/Makefile b/security/mbedtls/Makefile index dd4c87fc05e1..925bfa3da98d 100644 --- a/security/mbedtls/Makefile +++ b/security/mbedtls/Makefile @@ -1,6 +1,6 @@ PORTNAME= mbedtls -PORTVERSION= 2.28.6 DISTVERSIONPREFIX=${PORTNAME}- +DISTVERSION= 2.28.7 CATEGORIES= security devel MAINTAINER= tijl@FreeBSD.org @@ -11,30 +11,33 @@ LICENSE= APACHE20 GPLv2+ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE -USES= gmake python:test shebangfix +USES= cmake:testing python:build,test shebangfix SHEBANG_FILES= scripts/*.py tests/scripts/*.py +USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= Mbed-TLS -ALL_TARGET= no_test -TEST_TARGET= test -MAKE_ENV= PYTHON=${PYTHON_CMD} SHARED=1 -USE_LDCONFIG= yes +PORTSCOUT= limit:^${DISTVERSION:R:S/./\./g}\. +PLIST_SUB= DISTVERSION=${DISTVERSION} + +CMAKE_TESTING_ON= ENABLE_TESTING -PORTSCOUT= limit:^${PORTVERSION:R:S/./\./g}\. +CMAKE_OFF= ENABLE_TESTING +CMAKE_ON= CMAKE_BUILD_RPATH_USE_ORIGIN \ + ENABLE_PROGRAMS \ + ENABLE_ZLIB_SUPPORT \ + LINK_WITH_PTHREAD \ + USE_SHARED_MBEDTLS_LIBRARY -post-patch: - @${RM} ${WRKSRC}/include/mbedtls/*.orig - @${REINPLACE_CMD} \ - -e 's/PREFIX/NAMEPREFIX/' \ - -e 's/$$(DESTDIR)/&$$(PREFIX)/' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile +pre-configure: + @${WRKSRC}/scripts/config.py -f ${WRKSRC}/include/mbedtls/config.h set MBEDTLS_SSL_DTLS_SRTP + @${WRKSRC}/scripts/config.py -f ${WRKSRC}/include/mbedtls/config.h set MBEDTLS_THREADING_C + @${WRKSRC}/scripts/config.py -f ${WRKSRC}/include/mbedtls/config.h set MBEDTLS_THREADING_PTHREAD post-install: - ${FIND} ${STAGEDIR}${PREFIX}/bin -type f -not -name \*.sh \ - -exec ${STRIP_CMD} {} + - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + @cd ${STAGEDIR}${PREFIX}/bin && for f in *; do \ + ${MV} "$$f" "mbedtls_$$f"; \ + done .include diff --git a/security/mbedtls/distinfo b/security/mbedtls/distinfo index 5e03bfd1cd4a..b52fa7e7ad9b 100644 --- a/security/mbedtls/distinfo +++ b/security/mbedtls/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699528221 -SHA256 (Mbed-TLS-mbedtls-mbedtls-2.28.6_GH0.tar.gz) = 18cac49f4efef7269d233972bb09c57ace40d992229fa49804e7b10cf0debe43 -SIZE (Mbed-TLS-mbedtls-mbedtls-2.28.6_GH0.tar.gz) = 3988909 +TIMESTAMP = 1706348469 +SHA256 (Mbed-TLS-mbedtls-mbedtls-2.28.7_GH0.tar.gz) = 4390bc4ab1ea9a1ddf3725f540d0f80838c656d1d7987a1cee8b4da43e4571de +SIZE (Mbed-TLS-mbedtls-mbedtls-2.28.7_GH0.tar.gz) = 3990571 diff --git a/security/mbedtls/files/patch-include_mbedtls_config.h b/security/mbedtls/files/patch-include_mbedtls_config.h deleted file mode 100644 index fa23d72d7946..000000000000 --- a/security/mbedtls/files/patch-include_mbedtls_config.h +++ /dev/null @@ -1,29 +0,0 @@ ---- include/mbedtls/config.h.orig 2021-12-15 13:47:54 UTC -+++ include/mbedtls/config.h -@@ -1946,7 +1946,7 @@ - * - * Uncomment this to enable support for use_srtp extension. - */ --//#define MBEDTLS_SSL_DTLS_SRTP -+#define MBEDTLS_SSL_DTLS_SRTP - - /** - * \def MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE -@@ -2129,7 +2129,7 @@ - * - * Uncomment this to enable pthread mutexes. - */ --//#define MBEDTLS_THREADING_PTHREAD -+#define MBEDTLS_THREADING_PTHREAD - - /** - * \def MBEDTLS_USE_PSA_CRYPTO -@@ -3452,7 +3452,7 @@ - * - * Enable this layer to allow use of mutexes within mbed TLS - */ --//#define MBEDTLS_THREADING_C -+#define MBEDTLS_THREADING_C - - /** - * \def MBEDTLS_TIMING_C diff --git a/security/mbedtls/pkg-plist b/security/mbedtls/pkg-plist index f98edaf834e3..2a3e902aae56 100644 --- a/security/mbedtls/pkg-plist +++ b/security/mbedtls/pkg-plist @@ -8,26 +8,14 @@ bin/mbedtls_crypto_examples bin/mbedtls_dh_client bin/mbedtls_dh_genprime bin/mbedtls_dh_server -bin/mbedtls_dlopen -bin/mbedtls_dlopen_demo.sh bin/mbedtls_dtls_client bin/mbedtls_dtls_server bin/mbedtls_ecdh_curve25519 bin/mbedtls_ecdsa -bin/mbedtls_fuzz_client -bin/mbedtls_fuzz_dtlsclient -bin/mbedtls_fuzz_dtlsserver -bin/mbedtls_fuzz_privkey -bin/mbedtls_fuzz_pubkey -bin/mbedtls_fuzz_server -bin/mbedtls_fuzz_x509crl -bin/mbedtls_fuzz_x509crt -bin/mbedtls_fuzz_x509csr bin/mbedtls_gen_entropy bin/mbedtls_gen_key bin/mbedtls_gen_random_ctr_drbg bin/mbedtls_gen_random_havege -bin/mbedtls_generate_cpp_dummy_build.sh bin/mbedtls_generic_sum bin/mbedtls_hello bin/mbedtls_key_app @@ -43,6 +31,7 @@ bin/mbedtls_pk_encrypt bin/mbedtls_pk_sign bin/mbedtls_pk_verify bin/mbedtls_psa_constant_names +bin/mbedtls_ssl_pthread_server bin/mbedtls_query_compile_time_config bin/mbedtls_req_app bin/mbedtls_rsa_decrypt @@ -62,7 +51,6 @@ bin/mbedtls_ssl_server bin/mbedtls_ssl_server2 bin/mbedtls_strerror bin/mbedtls_udp_proxy -bin/mbedtls_udp_proxy_wrapper.sh bin/mbedtls_zeroize include/mbedtls/aes.h include/mbedtls/aesni.h @@ -162,10 +150,13 @@ include/psa/crypto_types.h include/psa/crypto_values.h lib/libmbedcrypto.a lib/libmbedcrypto.so +lib/libmbedcrypto.so.%%DISTVERSION%% lib/libmbedcrypto.so.7 lib/libmbedtls.a lib/libmbedtls.so lib/libmbedtls.so.14 +lib/libmbedtls.so.%%DISTVERSION%% lib/libmbedx509.a lib/libmbedx509.so lib/libmbedx509.so.1 +lib/libmbedx509.so.%%DISTVERSION%%