From 85125fe8f31712c4131708f1b68e07708151b16f Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Sat, 30 Mar 2024 17:46:36 +0100
Subject: [PATCH] mbedtls: 3.5.2 -> 3.6.0

---
 mbedtls/.signature |  7 ++++---
 mbedtls/Pkgfile    | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mbedtls/.signature b/mbedtls/.signature
index 4599e5f4c..ba97051de 100644
--- a/mbedtls/.signature
+++ b/mbedtls/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zSb8TKmKCdgwVsGs0iJY5u0KHJVG1i9EXYvTqZoHvRKdr9ZfqG3Ne4iT3bsVAB8JVwhtr/0C0KMqsZQFFyLAA4=
-SHA256 (Pkgfile) = 9aba1fe66862632b4bd6efe31e2278a2d9305411cb15bdf266e093ba5b4f82a3
+RWSagIOpLGJF35VUC56vfEixKGfJoeshx+dkL1waLHMTo850QYqATdbfKXcjTSn1WpNpPJjxmzyQlSfPM714JFDUYZ8Qa3KgmgM=
+SHA256 (Pkgfile) = 58816931c74ba441984ee1ffe472a0f114b3d983494f8361e8a2af0f904465c3
 SHA256 (.footprint) = 457cc76cbb99ed27a0068d931766d210de54d52e5a555619006a9205de2088b5
-SHA256 (mbedtls-3.5.2.tar.gz) = eedecc468b3f8d052ef05a9d42bf63f04c8a1c50d1c5a94c251c681365a2c723
+SHA256 (mbedtls-3.6.0.tar.gz) = b527b4e859c1dd38c0f3ecc4fd784ce53326f19996f9328af75ce46f88136627
+SHA256 (mbedtls-framework-750634d3a51eb9d61b59fd5d801546927c946588.tar.gz) = 4845b5ae123c036cf9ec9e0ff0478a24b2be95450fc36a0fb80e2748518b424f
diff --git a/mbedtls/Pkgfile b/mbedtls/Pkgfile
index fab407294..029264a64 100644
--- a/mbedtls/Pkgfile
+++ b/mbedtls/Pkgfile
@@ -4,11 +4,16 @@
 # Depends on: python3-jsonschema python3-jinja2
 
 name=mbedtls
-version=3.5.2
+version=3.6.0
 release=1
-source=(https://github.com/ARMmbed/mbedtls/archive/$name-$version.tar.gz)
+_framework=750634d3a51eb9d61b59fd5d801546927c946588
+source=(https://github.com/ARMmbed/mbedtls/archive/$name-$version.tar.gz
+  https://github.com/Mbed-TLS/mbedtls-framework/archive/$_framework/mbedtls-framework-$_framework.tar.gz)
 
 build() {
+  rm -rf $name-$name-$version/framework
+  mv mbedtls-framework-$_framework $name-$name-$version/framework
+
   cmake -S $name-$name-$version -B build -G Ninja \
     -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_INSTALL_LIBDIR=lib \
@@ -16,7 +21,6 @@ build() {
     -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
     -D USE_SHARED_MBEDTLS_LIBRARY=ON \
     -D USE_STATIC_MBEDTLS_LIBRARY=ON \
-    -D ENABLE_ZLIB_SUPPORT=ON \
     -D INSTALL_MBEDTLS_HEADERS=ON \
     -D MBEDTLS_FATAL_WARNINGS=OFF \
     -Wno-dev