From 5a37652f4e2c3afceca42ed8e51ba8186468a839 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 12 Aug 2024 14:43:32 -0400
Subject: [PATCH] dislocker: rebuild for mbedtls-3.6.0

---
 srcpkgs/dislocker/patches/cross.patch    | 12 ++++++++++
 srcpkgs/dislocker/patches/mbedtls3.patch | 28 ++++++++++++++++++++++++
 srcpkgs/dislocker/template               |  2 +-
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/dislocker/patches/cross.patch
 create mode 100644 srcpkgs/dislocker/patches/mbedtls3.patch

diff --git a/srcpkgs/dislocker/patches/cross.patch b/srcpkgs/dislocker/patches/cross.patch
new file mode 100644
index 00000000000..d2468dafd96
--- /dev/null
+++ b/srcpkgs/dislocker/patches/cross.patch
@@ -0,0 +1,12 @@
+--- a/cmake/FindPolarSSL.cmake
++++ b/cmake/FindPolarSSL.cmake
+@@ -67,7 +67,7 @@
+ else()
+   execute_process(
+-    COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/version.h
++    COMMAND grep -w "MBEDTLS_VERSION_STRING" ${POLARSSL_INCLUDE_DIRS}/${POLARSSL_INC_FOLDER}/build_info.h
+-    COMMAND sed -e "s@\s\+@ @g"
++    COMMAND sed -e "s@\\s\\+@ @g"
+     COMMAND cut -d\  -f3
+     COMMAND sed -e "s@\"@@g"
+     OUTPUT_VARIABLE POLARSSL_VERSION_STRING
diff --git a/srcpkgs/dislocker/patches/mbedtls3.patch b/srcpkgs/dislocker/patches/mbedtls3.patch
new file mode 100644
index 00000000000..2f31a168585
--- /dev/null
+++ b/srcpkgs/dislocker/patches/mbedtls3.patch
@@ -0,0 +1,28 @@
+From 2cfbba2c8cc07e529622ba134d0a6982815d2b30 Mon Sep 17 00:00:00 2001
+From: "Julio C. Rocha" <dev@rocha.red>
+Date: Wed, 13 Sep 2023 19:07:27 -0700
+Subject: [PATCH] Support mbedtls 3
+
+---
+ include/dislocker/ssl_bindings.h.in | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/include/dislocker/ssl_bindings.h.in b/include/dislocker/ssl_bindings.h.in
+index c1990b2..34e05df 100644
+--- a/include/dislocker/ssl_bindings.h.in
++++ b/include/dislocker/ssl_bindings.h.in
+@@ -26,8 +26,13 @@
+ /*
+  * Here stand the bindings for polarssl SHA256/SHA2/SHA-2 function for dislocker
+  */
+-#include "@POLARSSL_INC_FOLDER@/config.h"
+ #include "@POLARSSL_INC_FOLDER@/version.h"
++#if MBEDTLS_VERSION_MAJOR >= 3
++#include "@POLARSSL_INC_FOLDER@/mbedtls_config.h"
++#include "@POLARSSL_INC_FOLDER@/compat-2.x.h"
++#else
++#include "@POLARSSL_INC_FOLDER@/config.h"
++#endif
+ #include "@POLARSSL_INC_FOLDER@/aes.h"
+ 
+ // Function's name changed
diff --git a/srcpkgs/dislocker/template b/srcpkgs/dislocker/template
index bd92028fe16..539f0a718f8 100644
--- a/srcpkgs/dislocker/template
+++ b/srcpkgs/dislocker/template
@@ -1,7 +1,7 @@
 # Template file for 'dislocker'
 pkgname=dislocker
 version=0.7.3
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DLIB_INSTALL_DIR=lib"
 makedepends="mbedtls-devel fuse-devel"