From 9603b89d1603509ba99d3a9fd2ae0e2db5481e4c Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Wed, 7 May 2025 18:01:30 +0200
Subject: [PATCH] mbedtls: update to 3.6.3.

---
 srcpkgs/mbedtls/patches/gcc14.patch | 13 +++++++++++++
 srcpkgs/mbedtls/template            | 13 +++----------
 2 files changed, 16 insertions(+), 10 deletions(-)
 create mode 100644 srcpkgs/mbedtls/patches/gcc14.patch

diff --git a/srcpkgs/mbedtls/patches/gcc14.patch b/srcpkgs/mbedtls/patches/gcc14.patch
new file mode 100644
index 00000000000..a826447e9f1
--- /dev/null
+++ b/srcpkgs/mbedtls/patches/gcc14.patch
@@ -0,0 +1,13 @@
+Ref https://github.com/Mbed-TLS/mbedtls/issues/9003
+
+--- a/library/common.h
++++ b/library/common.h
+@@ -199,7 +199,7 @@ static inline void mbedtls_xor(unsigned
+         uint8x16_t x = veorq_u8(v1, v2);
+         vst1q_u8(r + i, x);
+     }
+-#if defined(__IAR_SYSTEMS_ICC__)
++#if defined(__IAR_SYSTEMS_ICC__) || defined(MBEDTLS_COMPILER_IS_GCC)
+     /* This if statement helps some compilers (e.g., IAR) optimise out the byte-by-byte tail case
+      * where n is a constant multiple of 16.
+      * For other compilers (e.g. recent gcc and clang) it makes no difference if n is a compile-time
diff --git a/srcpkgs/mbedtls/template b/srcpkgs/mbedtls/template
index 5a8daaf1966..72cc8ad399f 100644
--- a/srcpkgs/mbedtls/template
+++ b/srcpkgs/mbedtls/template
@@ -1,8 +1,7 @@
 # Template file for 'mbedtls'
 pkgname=mbedtls
-version=3.6.2
+version=3.6.3
 revision=1
-_framework_ver=d9a70c758a5a511020240bbcc86f6d647d64fe96
 build_style=cmake
 configure_args="-DENABLE_TESTING=1 -DUSE_SHARED_MBEDTLS_LIBRARY=1"
 hostmakedepends="python3 perl"
@@ -11,15 +10,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 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
- https://github.com/Mbed-TLS/mbedtls-framework/archive/${_framework_ver}.tar.gz>framework-${_framework_ver}.tar.gz"
-checksum="f4a876b1f6921ad0aefb445f974ef62414d33928640b2c45555c5e64a196a1a8
+distfiles="https://github.com/ARMmbed/mbedtls/archive/refs/tags/v${version}.tar.gz"
+checksum="e69c4c13377e89b9d696006ef9c8258e3be75b6dbd464cfd573360482b1a1f4e
  d46acd6cb103d00d6e545631467e36363f6fc270b2c051be94d543eb0831393b"
-skip_extraction="framework-${_framework_ver}.tar.gz"
-
-post_extract() {
-	vsrcextract -C framework "framework-${_framework_ver}.tar.gz"
-}
 
 pre_configure() {
 	./scripts/config.pl set MBEDTLS_THREADING_C