git: 9a070ee6d3e1 - 2026Q2 - security/mbedtls4: Update 4.1.0 => 4.2.0 (fix 10 CVEs)

The branch 2026Q2 has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9a070ee6d3e149080ca6c37eb9d1dcb6f0273310

commit 9a070ee6d3e149080ca6c37eb9d1dcb6f0273310
Author:     Paavo-Einari Kaipila <pkaipila@gmail.com>
AuthorDate: 2026-07-08 13:55:15 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-07-08 13:58:19 +0000

    security/mbedtls4: Update 4.1.0 => 4.2.0 (fix 10 CVEs)
    
    Changelog:
    https://github.com/Mbed-TLS/mbedtls/releases/tag/mbedtls-4.2.0
    
    - Parametrize PKGNAMESUFFIX.
    - Improve PORTSCOUT.
    
    PR:             296595
    Security:       CVE-2026-50581
    Security:       CVE-2026-50640
    Security:       CVE-2026-50580
    Security:       CVE-2026-50586
    Security:       CVE-2026-50588
    Security:       CVE-2026-50579
    Security:       CVE-2026-54441
    Security:       CVE-2026-50585
    Security:       CVE-2026-25832
    Security:       CVE-2026-49300
    Sponsored by:   UNIS Labs
    MFH:            2026Q2
    
    (cherry picked from commit 2162d1df3425fc85695529db4ba754c57766aab1)
---
 security/mbedtls4/Makefile                           | 13 +++----------
 security/mbedtls4/distinfo                           |  8 +++-----
 security/mbedtls4/files/patch-library_CMakeLists.txt | 11 -----------
 security/mbedtls4/pkg-plist                          |  2 +-
 4 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/security/mbedtls4/Makefile b/security/mbedtls4/Makefile
index 0a4b66e45444..f65005287aec 100644
--- a/security/mbedtls4/Makefile
+++ b/security/mbedtls4/Makefile
@@ -1,15 +1,8 @@
 PORTNAME=	mbedtls
-DISTVERSION=	4.1.0
-PORTREVISION=	1
+DISTVERSION=	4.2.0
 CATEGORIES=	security devel
 MASTER_SITES=	https://github.com/Mbed-TLS/${PORTNAME}/releases/download/${DISTNAME}/
-PKGNAMESUFFIX=	4
-
-PATCH_SITES=	https://github.com/Mbed-TLS/${PORTNAME}/commit/
-PATCHFILES=	5fc28f401666f3ab3338168f6dcee71e6b468a4e.patch:-p1
-# Fix a TLS 1.2 client regression that caused valid ServerKeyExchange
-# signatures using rsa_pss_rsae_* to be rejected.
-# https://github.com/Mbed-TLS/mbedtls/issues/10668
+PKGNAMESUFFIX=	${DISTVERSION:R:R}
 
 MAINTAINER=	pkaipila@gmail.com
 COMMENT=	Embedded SSL/TLS and cryptography library
@@ -34,7 +27,7 @@ CMAKE_TESTING_JOBS=	1
 
 CONFLICTS_INSTALL=	mbedtls3
 
-PORTSCOUT=	limit:^${DISTVERSION:R:S/./\./g}\.
+PORTSCOUT=	limit:^${DISTVERSION:R:R:S/./\./g}\.
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
diff --git a/security/mbedtls4/distinfo b/security/mbedtls4/distinfo
index badd48273317..82fbceabf5f6 100644
--- a/security/mbedtls4/distinfo
+++ b/security/mbedtls4/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1777117771
-SHA256 (mbedtls-4.1.0.tar.bz2) = 377a09cf8eb81b5fb2707045e5522d5489d3309fed5006c9874e60558fc81d10
-SIZE (mbedtls-4.1.0.tar.bz2) = 7009629
-SHA256 (5fc28f401666f3ab3338168f6dcee71e6b468a4e.patch) = 1d2522273d11d420a55e8a86b8df0b4482be61e6ec42f8c8e029acba727bc4c0
-SIZE (5fc28f401666f3ab3338168f6dcee71e6b468a4e.patch) = 8585
+TIMESTAMP = 1783502665
+SHA256 (mbedtls-4.2.0.tar.bz2) = 2bed9d713b4668f76553b097e72b8aa30bc8f112a940d7ae228d524bbde6ffea
+SIZE (mbedtls-4.2.0.tar.bz2) = 7395873
diff --git a/security/mbedtls4/files/patch-library_CMakeLists.txt b/security/mbedtls4/files/patch-library_CMakeLists.txt
deleted file mode 100644
index 152b6b8424ec..000000000000
--- a/security/mbedtls4/files/patch-library_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/CMakeLists.txt.orig	2025-10-14 16:14:11 UTC
-+++ library/CMakeLists.txt
-@@ -362,7 +362,7 @@ foreach(target IN LISTS tf_psa_crypto_library_targets)
-                     RENAME "libmbedcrypto.so.${MBEDTLS_VERSION}"
-             )
-             install(CODE "
--                set(_libdir \"\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\")
-+                set(_libdir \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\")
- 
-                 execute_process(COMMAND \"\${CMAKE_COMMAND}\" -E create_symlink
-                                 \"libmbedcrypto.so.${MBEDTLS_VERSION}\"
diff --git a/security/mbedtls4/pkg-plist b/security/mbedtls4/pkg-plist
index 318783df18b2..1df3cb381aac 100644
--- a/security/mbedtls4/pkg-plist
+++ b/security/mbedtls4/pkg-plist
@@ -161,7 +161,7 @@ lib/libmbedx509.so.%%DISTVERSION%%
 lib/libmbedx509.so.9
 lib/libtfpsacrypto.a
 lib/libtfpsacrypto.so
-lib/libtfpsacrypto.so.1.1.0
+lib/libtfpsacrypto.so.1.2.0
 lib/libtfpsacrypto.so.2
 libdata/pkgconfig/mbedcrypto.pc
 libdata/pkgconfig/mbedtls.pc