From 7c9eeca1ee971d969208c94bc7a418f411ca160b Mon Sep 17 00:00:00 2001
From: Frank Lichtenheld <frank@lichtenheld.com>
Date: Mon, 13 Feb 2023 15:42:31 +0100
Subject: [PATCH] vcpkg.json: Allow to use on Linux

- Fix PATCHES to work on Linux
- While here, fix version number

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
(cherry picked from commit fb9bee5ad698a4c1d5a86980c794096a1ed842bb)
---
 deps/vcpkg-ports/asio/portfile.cmake    |  8 +++----
 deps/vcpkg-ports/mbedtls/portfile.cmake | 29 +++++++++++++++++++++++++
 scripts/mingw/build                     |  2 +-
 vcpkg.json                              |  2 +-
 4 files changed, 35 insertions(+), 6 deletions(-)
 create mode 100644 deps/vcpkg-ports/mbedtls/portfile.cmake

diff --git a/deps/vcpkg-ports/asio/portfile.cmake b/deps/vcpkg-ports/asio/portfile.cmake
index 32c48630..9b92e9da 100644
--- a/deps/vcpkg-ports/asio/portfile.cmake
+++ b/deps/vcpkg-ports/asio/portfile.cmake
@@ -7,10 +7,10 @@ vcpkg_from_github(
     SHA512 a5d6e597e5611b7293375965f37c09cb73e27639ebdda6163557fab8bbff2ddbb301080ad86ff7f97e8ed8454da25176385cfc43103447a4a04e35a9c41aec3e
     HEAD_REF master
     PATCHES
-        ..\\..\\asio\\patches\\0001-Added-Apple-NAT64-support-when-both-ASIO_HAS_GETADDR.patch
-        ..\\..\\asio\\patches\\0002-Added-randomize-method-to-asio-ip-tcp-resolver-resul.patch
-        ..\\..\\asio\\patches\\0003-Added-user-code-hook-async_connect_post_open-to-be-c.patch
-        ..\\..\\asio\\patches\\0004-error_code.ipp-Use-English-for-Windows-error-message.patch
+        ../../asio/patches/0001-Added-Apple-NAT64-support-when-both-ASIO_HAS_GETADDR.patch
+        ../../asio/patches/0002-Added-randomize-method-to-asio-ip-tcp-resolver-resul.patch
+        ../../asio/patches/0003-Added-user-code-hook-async_connect_post_open-to-be-c.patch
+        ../../asio/patches/0004-error_code.ipp-Use-English-for-Windows-error-message.patch
 )
 
 # Always use "ASIO_STANDALONE" to avoid boost dependency
diff --git a/deps/vcpkg-ports/mbedtls/portfile.cmake b/deps/vcpkg-ports/mbedtls/portfile.cmake
new file mode 100644
index 00000000..cbed83c4
--- /dev/null
+++ b/deps/vcpkg-ports/mbedtls/portfile.cmake
@@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+
+set(VCPKG_LIBRARY_LINKAGE static)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ARMmbed/mbedtls
+    REF mbedtls-2.7.12
+    SHA512 bfad5588804e52827ecba81ca030fe570c9772f633fbf470d71a781db4366541da69b85ee10941bf500a987c4da825caa049afc2c0e6ec0ecc55d50efd74e5a6
+    HEAD_REF master
+    PATCHES
+        ../../mbedtls/patches/0001-relax-x509-date-format-check.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DENABLE_TESTING=OFF
+        -DENABLE_PROGRAMS=OFF
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mbedtls RENAME copyright)
+
+vcpkg_copy_pdbs()
diff --git a/scripts/mingw/build b/scripts/mingw/build
index 232ae99d..fa798447 100755
--- a/scripts/mingw/build
+++ b/scripts/mingw/build
@@ -48,7 +48,7 @@ download_deps()
     gitref=$(grep -oP '\bREF\s+\S+' "$portfile" | cut -d' ' -f2)
     git clone --single-branch --branch "$gitref" https://github.com/chriskohlhoff/asio
     # apply asio patches
-    for patchfile in $(grep -o patches.* "$portfile" | cut -d '\' -f3); do
+    for patchfile in $(grep -o patches.* "$portfile" | cut -d '/' -f2); do
         echo applying patch $patchfile
         patch -d asio -p1 < "${CORE_DIR}/deps/asio/patches/$patchfile"
     done
diff --git a/vcpkg.json b/vcpkg.json
index dc17a5c6..810ee338 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
     "name": "openvpn3",
-    "version-string": "3.7",
+    "version-string": "3.8",
     "dependencies": [
         "asio",
         "gtest",