From e66dded96cc8f995272dd47c80adbce35fccdd3c Mon Sep 17 00:00:00 2001
From: Thomas1664 <46387399+Thomas1664@users.noreply.github.com>
Date: Tue, 26 Apr 2022 01:15:56 +0200
Subject: [PATCH] [openvpn3] update to 3.7 (#24360)

* [openvpn3] update to 3.7

* version
---
 ports/openvpn3/portfile.cmake | 23 +++++++++++------------
 ports/openvpn3/vcpkg.json     |  9 +++++++--
 versions/baseline.json        |  4 ++--
 versions/o-/openvpn3.json     |  5 +++++
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/ports/openvpn3/portfile.cmake b/ports/openvpn3/portfile.cmake
index e638f1a42c..3580f8d875 100644
--- a/ports/openvpn3/portfile.cmake
+++ b/ports/openvpn3/portfile.cmake
@@ -3,24 +3,23 @@ set(VCPKG_LIBRARY_LINKAGE static)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenVPN/openvpn3
-    REF release/3.4.1
-    SHA512 2d0a7d2d48047c969ba1cb49b34d51c85dd82ae97296d7c096ead13a8e7cc69fa3908262228e29d93f60b7273814d8ef5a402a5d401cd7f91370868d5d308678
+    REF release/3.7
+    SHA512 de95bd2b1a01179aa81e1612be175540c2486b856f66880372d09966655bbbadd71d874ed49b032566dde2896207bc76298c5cfcf73e86272c04d5aaa977d660
     HEAD_REF master
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
-file(COPY ${SOURCE_PATH}/openvpn DESTINATION ${CURRENT_PACKAGES_DIR}/include/)
-file(COPY ${SOURCE_PATH}/client/ovpncli.hpp DESTINATION ${CURRENT_PACKAGES_DIR}/include/openvpn/)
+file(COPY "${SOURCE_PATH}/openvpn" DESTINATION "${CURRENT_PACKAGES_DIR}/include")
+file(COPY "${SOURCE_PATH}/client/ovpncli.hpp" DESTINATION "${CURRENT_PACKAGES_DIR}/include/openvpn")
 
-file(GLOB_RECURSE HEADERS ${CURRENT_PACKAGES_DIR}/include/openvpn/*)
+file(GLOB_RECURSE HEADERS "${CURRENT_PACKAGES_DIR}/include/openvpn/*")
 foreach(HEADER IN LISTS HEADERS)
     file(READ "${HEADER}" _contents)
     string(REPLACE "defined(USE_ASIO)" "1" _contents "${_contents}")
@@ -31,5 +30,5 @@ foreach(HEADER IN LISTS HEADERS)
 endforeach()
 
 file(INSTALL
-    ${SOURCE_PATH}/COPYRIGHT.AGPLV3
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/openvpn3 RENAME copyright)
+    "${SOURCE_PATH}/COPYRIGHT.AGPLV3"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/openvpn3/vcpkg.json b/ports/openvpn3/vcpkg.json
index ea718ed621..f515b53513 100644
--- a/ports/openvpn3/vcpkg.json
+++ b/ports/openvpn3/vcpkg.json
@@ -1,14 +1,19 @@
 {
   "name": "openvpn3",
-  "version-string": "3.4.1",
-  "port-version": 2,
+  "version": "3.7.0",
   "description": "a C++ class library that implements the functionality of an OpenVPN client, and is protocol-compatible with the OpenVPN 2.x branch.",
+  "homepage": "https://openvpn.net",
+  "license": "AGPL-3.0",
   "dependencies": [
     "asio",
     "mbedtls",
     {
       "name": "tap-windows6",
       "platform": "windows"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
     }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 50e49e77e2..f78ec13c87 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5189,8 +5189,8 @@
       "port-version": 0
     },
     "openvpn3": {
-      "baseline": "3.4.1",
-      "port-version": 2
+      "baseline": "3.7.0",
+      "port-version": 0
     },
     "openvr": {
       "baseline": "1.16.8",
diff --git a/versions/o-/openvpn3.json b/versions/o-/openvpn3.json
index 26f6e68e09..4961868eef 100644
--- a/versions/o-/openvpn3.json
+++ b/versions/o-/openvpn3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "901a710e937496a572cdb5b64d2401c18919ffde",
+      "version": "3.7.0",
+      "port-version": 0
+    },
     {
       "git-tree": "bf20f11ad1fb64e74ebcfda5a3b3c19b8e4770ae",
       "version-string": "3.4.1",