mbedtls: bump version

net-libs/mbedtls/mbedtls-2.28.9.recipe

@@ -5,18 +5,18 @@ products, facilitating this functionality with a minimal coding footprint."
 HOMEPAGE="https://tls.mbed.org/"
 COPYRIGHT="2006-2018 ARM Limited"
 LICENSE="Apache v2"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://github.com/ARMmbed/mbedtls/archive/mbedtls-$portVersion.tar.gz"
-CHECKSUM_SHA256="ea2049c2dd4868693998d5a9780e198194be5aea1706ff4a9d4f882f18c0a101"
+CHECKSUM_SHA256="53231b898f908dde38879bf27a29ddf670dee252dec37681f2c1f83588c0c40e"
 SOURCE_DIR="mbedtls-mbedtls-$portVersion"
 PATCHES="mbedtls-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libVersionmbedCrypto="6.25.0"
-libVersionembedTls="13.25.0"
-libVersionembedX509="1.25.0"
+libVersionmbedCrypto="7.28.9"
+libVersionembedTls="14.28.9"
+libVersionembedX509="1.28.9"
 libVersionembedCryptoCompat="$libVersionmbedCrypto compat >= ${libVersionmbedCrypto%%.*}"
 libVersionembedTlsCompat="$libVersionembedTls compat >= ${libVersionembedTls%%.*}"
 libVersionembedX509Compat="$libVersionembedX509 compat >= ${libVersionembedX509%%.*}"
@@ -112,10 +112,9 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:ccache
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
-	cmd:make
+	cmd:ninja
 	cmd:perl
 	cmd:python3
 	cmd:sed
@@ -124,20 +123,21 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	export LDFLAGS="-lnetwork"
-	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
+	cmake -Bbuild -S. -G Ninja -DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=$prefix \
 		-DLIB_INSTALL_DIR=$libDir \
 		-DINCLUDE_INSTALL_DIR=$includeDir \
 		-DUSE_SHARED_MBEDTLS_LIBRARY=ON \
 		-DUSE_STATIC_MBEDTLS_LIBRARY=OFF \
 		-DENABLE_ZLIB_SUPPORT=ON \
-		-DMBEDTLS_FATAL_WARNINGS=OFF
-	make -C build $jobArgs
+		-DMBEDTLS_FATAL_WARNINGS=OFF \
+		-Wno-dev
+	cmake --build build $jobArgs
 }
 
 INSTALL()
 {
-	make -C build install
+	cmake --install build
 
 	# remove useless binary
 	rm -r $prefix/bin/hello

net-libs/mbedtls/patches/mbedtls-2.25.0.patchset

@@ -1,64 +0,0 @@
-From 476757ef4923fc1cab36d65e3373b2383ad90a5f Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Sun, 13 Dec 2020 20:50:16 +0000
-Subject: Use variable to install headers
-
-
-diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
-index 62c0f62..3288afd 100644
---- a/include/CMakeLists.txt
-+++ b/include/CMakeLists.txt
-@@ -6,11 +6,11 @@ if(INSTALL_MBEDTLS_HEADERS)
-     file(GLOB psa_headers "psa/*.h")
- 
-     install(FILES ${headers}
--        DESTINATION include/mbedtls
-+        DESTINATION ${INCLUDE_INSTALL_DIR}/mbedtls
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
- 
-     install(FILES ${psa_headers}
--        DESTINATION include/psa
-+        DESTINATION ${INCLUDE_INSTALL_DIR}/psa
-         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
- 
- endif(INSTALL_MBEDTLS_HEADERS)
--- 
-2.28.0
-
-
-From ca2707ac6d600e690678bb813ea5145d39facb88 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Mon, 14 Dec 2020 22:38:15 +0000
-Subject: Fix reference to python3
-
-
-diff --git a/tests/Makefile b/tests/Makefile
-index 511db9d..8957262 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -42,6 +42,10 @@ ifdef WINDOWS
- WINDOWS_BUILD=1
- endif
- 
-+ifdef HAIKU
-+HAIKU_BUILD=1
-+endif
-+
- ifdef WINDOWS_BUILD
- DLEXT=dll
- EXEXT=.exe
-@@ -55,7 +59,11 @@ DLEXT ?= so
- EXEXT=
- SHARED_SUFFIX=
- # python2 for POSIX since FreeBSD has only python2 as default.
-+ifdef !HAIKU_BUILD #we use python3 on Haiku
- PYTHON ?= python2
-+else
-+PYTHON ?= python3
-+endif
- endif
- 
- # Zlib shared library extensions:
--- 
-2.28.0
-

net-libs/mbedtls/patches/mbedtls-2.28.9.patchset

@@ -0,0 +1,27 @@
+From 1e0b20a7664b4cc954edadd49371449003f8cb9c Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sun, 13 Dec 2020 20:50:16 +0000
+Subject: Use variable to install headers
+
+
+diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
+index 11b417b..f501b1e 100644
+--- a/include/CMakeLists.txt
++++ b/include/CMakeLists.txt
+@@ -6,11 +6,11 @@ if(INSTALL_MBEDTLS_HEADERS)
+     file(GLOB psa_headers "psa/*.h")
+ 
+     install(FILES ${headers}
+-        DESTINATION include/mbedtls
++        DESTINATION ${INCLUDE_INSTALL_DIR}/mbedtls
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+ 
+     install(FILES ${psa_headers}
+-        DESTINATION include/psa
++        DESTINATION ${INCLUDE_INSTALL_DIR}/psa
+         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+ 
+ endif(INSTALL_MBEDTLS_HEADERS)
+-- 
+2.45.2
+