From 2ecc22f473ab17ce3e600a137a779d428403cfcd Mon Sep 17 00:00:00 2001 From: Malte Gejr Date: Wed, 11 Jun 2025 09:03:56 +0200 Subject: [PATCH] mbedtls2: update to 2.28.10 --- srcpkgs/mbedtls2/patches/gcc14.patch | 59 ---------------------------- srcpkgs/mbedtls2/template | 4 +- 2 files changed, 2 insertions(+), 61 deletions(-) delete mode 100644 srcpkgs/mbedtls2/patches/gcc14.patch diff --git a/srcpkgs/mbedtls2/patches/gcc14.patch b/srcpkgs/mbedtls2/patches/gcc14.patch deleted file mode 100644 index 523134b8846..00000000000 --- a/srcpkgs/mbedtls2/patches/gcc14.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 990a88cd53d40ff42481a2c200b05f656507f326 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Thu, 25 Jan 2024 20:48:56 +0000 -Subject: [PATCH] tests: fix `calloc()` argument list (`gcc-14` fix) - -`gcc-14` added a new `-Wcalloc-transposed-args` warning recently. It -detected minor infelicity in `calloc()` API usage in `mbedtls`: - - In file included from /build/mbedtls/tests/include/test/ssl_helpers.h:19, - from /build/mbedtls/tests/src/test_helpers/ssl_helpers.c:11: - /build/mbedtls/tests/src/test_helpers/ssl_helpers.c: In function 'mbedtls_test_init_handshake_options': - /build/mbedtls/tests/include/test/macros.h:128:46: - error: 'calloc' sizes specified with 'sizeof' in the earlier argument - and not in the later argument [-Werror=calloc-transposed-args] - 128 | (pointer) = mbedtls_calloc(sizeof(*(pointer)), \ - | ^ - -Signed-off-by: Sergei Trofimovich ---- - tests/include/test/macros.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/tests/include/test/macros.h b/tests/include/test/macros.h -index 894fc6727cc8..3c347e17e901 100644 ---- a/tests/include/test/macros.h -+++ b/tests/include/test/macros.h -@@ -135,8 +135,8 @@ - do { \ - TEST_ASSERT((pointer) == NULL); \ - if ((item_count) != 0) { \ -- (pointer) = mbedtls_calloc(sizeof(*(pointer)), \ -- (item_count)); \ -+ (pointer) = mbedtls_calloc((item_count), \ -+ sizeof(*(pointer))); \ - TEST_ASSERT((pointer) != NULL); \ - } \ - } while (0) -@@ -165,8 +165,8 @@ - #define TEST_CALLOC_NONNULL(pointer, item_count) \ - do { \ - TEST_ASSERT((pointer) == NULL); \ -- (pointer) = mbedtls_calloc(sizeof(*(pointer)), \ -- (item_count)); \ -+ (pointer) = mbedtls_calloc((item_count), \ -+ sizeof(*(pointer))); \ - if (((pointer) == NULL) && ((item_count) == 0)) { \ - (pointer) = mbedtls_calloc(1, 1); \ - } \ -@@ -185,8 +185,8 @@ - do { \ - TEST_ASSERT((pointer) == NULL); \ - if ((item_count) != 0) { \ -- (pointer) = mbedtls_calloc(sizeof(*(pointer)), \ -- (item_count)); \ -+ (pointer) = mbedtls_calloc((item_count), \ -+ sizeof(*(pointer))); \ - TEST_ASSUME((pointer) != NULL); \ - } \ - } while (0) diff --git a/srcpkgs/mbedtls2/template b/srcpkgs/mbedtls2/template index 2c2ff4f5fe0..38f80d07750 100644 --- a/srcpkgs/mbedtls2/template +++ b/srcpkgs/mbedtls2/template @@ -1,6 +1,6 @@ # Template file for 'mbedtls2' pkgname=mbedtls2 -version=2.28.8 +version=2.28.10 revision=1 build_style=cmake configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1" @@ -11,7 +11,7 @@ license="Apache-2.0" homepage="https://tls.mbed.org/" changelog="https://raw.githubusercontent.com/ARMmbed/mbedtls/mbedtls-${version%.*}/ChangeLog" distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz" -checksum="4fef7de0d8d542510d726d643350acb3cdb9dc76ad45611b59c9aa08372b4213" +checksum=0f2e0525903a89ae1d39ce439d858be66933bda54c5b6102b72a29ed8fe7c088 pre_configure() { ./scripts/config.pl set MBEDTLS_THREADING_C