Change to openssl3 remove uwp support

microsoft · Sep 27, 2024 · 7474686 · 7474686
1 parent 76d1537
commit 7474686
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/ports/msquic/portfile.cmake b/ports/msquic/portfile.cmake
@@ -20,13 +20,13 @@ file(REMOVE "${QUIC_SOURCE_PATH}/src/bin/winuser/pgo_x86/msquic.pgd")
 vcpkg_from_github(
     OUT_SOURCE_PATH OPENSSL_SOURCE_PATH
     REPO quictls/openssl
-    REF 612d8e44d687e4b71c4724319d7aa27a733bcbca
-    SHA512 ff487d882c2b70ed8915a88ecf0a64724435a96187a7bb3bf401f4a2c4dc572a93f7e788040ccbd29da8bc6ac49ee11550c9d56153262c05fae173ac1d242baa
-    HEAD_REF openssl-3.1.5+quic
+    REF openssl-3.1.7-quic1
+    SHA512 230f48a4ef20bfd492b512bd53816a7129d70849afc1426e9ce813273c01884d5474552ecaede05231ca354403f25e2325c972c9c7950ae66dae310800bd19e7
+    HEAD_REF openssl-3.1.7+quic
 )
 
-file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/openssl")
-file(RENAME "${OPENSSL_SOURCE_PATH}" "${QUIC_SOURCE_PATH}/submodules/openssl")
+file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/openssl3")
+file(RENAME "${OPENSSL_SOURCE_PATH}" "${QUIC_SOURCE_PATH}/submodules/openssl3")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH XDP_WINDOWS
@@ -61,7 +61,7 @@ vcpkg_cmake_configure(
     SOURCE_PATH "${QUIC_SOURCE_PATH}"
     OPTIONS
         -DQUIC_SOURCE_LINK=OFF
-        -DQUIC_TLS=openssl
+        -DQUIC_TLS=openssl3
         -DQUIC_USE_SYSTEM_LIBCRYPTO=OFF
         -DQUIC_BUILD_PERF=OFF
         -DQUIC_BUILD_TEST=OFF

diff --git a/ports/msquic/vcpkg.json b/ports/msquic/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "msquic",
   "version": "2.4.4",
+  "port-version": 1,
   "description": "Cross-platform, C implementation of the IETF QUIC protocol",
   "homepage": "https://github.com/microsoft/msquic",
   "license": "MIT",
-  "supports": "!(static & staticcrt)",
+  "supports": "!((static & staticcrt) | uwp)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6106,7 +6106,7 @@
     },
     "msquic": {
       "baseline": "2.4.4",
-      "port-version": 0
+      "port-version": 1
     },
     "mstch": {
       "baseline": "1.0.2",

diff --git a/versions/m-/msquic.json b/versions/m-/msquic.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "64311bb44cc0999a5aa1dadcf961a9237b4232d8",
+      "version": "2.4.4",
+      "port-version": 1
+    },
     {
       "git-tree": "519570ca834d486ddb5fc0fd43094079ef27b568",
       "version": "2.4.4",