[msquic] update to 2.4.5, Change to openssl3 and remove uwp support. (#41219)

This commit is contained in:
talregev 2024-10-01 00:02:24 +03:00 committed by GitHub
parent 2960d7d80e
commit bbe8dbd566
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 15 additions and 10 deletions

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH QUIC_SOURCE_PATH OUT_SOURCE_PATH QUIC_SOURCE_PATH
REPO microsoft/msquic REPO microsoft/msquic
REF "v${VERSION}" REF "v${VERSION}"
SHA512 87bb96bc77c30a39e419be2592199de8f9fa74179852637d2902c50d555bad24d2a664b888434fbc1df461ece69a52097634a47f0edbb78b0b0eed6e5a94033f SHA512 51afee7e28a7d6ae1b5491edd635e0c88a92a00bacedeaac632a0f19762e9940c9b819a9d33072d3553c004acd4ec0cdf645301f712b408498053de065b2b1cf
HEAD_REF master HEAD_REF master
PATCHES PATCHES
fix-install.patch # Adjust install path of build outputs fix-install.patch # Adjust install path of build outputs
@ -20,13 +20,13 @@ file(REMOVE "${QUIC_SOURCE_PATH}/src/bin/winuser/pgo_x86/msquic.pgd")
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH OPENSSL_SOURCE_PATH OUT_SOURCE_PATH OPENSSL_SOURCE_PATH
REPO quictls/openssl REPO quictls/openssl
REF 612d8e44d687e4b71c4724319d7aa27a733bcbca REF openssl-3.1.7-quic1
SHA512 ff487d882c2b70ed8915a88ecf0a64724435a96187a7bb3bf401f4a2c4dc572a93f7e788040ccbd29da8bc6ac49ee11550c9d56153262c05fae173ac1d242baa SHA512 230f48a4ef20bfd492b512bd53816a7129d70849afc1426e9ce813273c01884d5474552ecaede05231ca354403f25e2325c972c9c7950ae66dae310800bd19e7
HEAD_REF openssl-3.1.5+quic HEAD_REF openssl-3.1.7+quic
) )
file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/openssl") file(REMOVE_RECURSE "${QUIC_SOURCE_PATH}/submodules/openssl3")
file(RENAME "${OPENSSL_SOURCE_PATH}" "${QUIC_SOURCE_PATH}/submodules/openssl") file(RENAME "${OPENSSL_SOURCE_PATH}" "${QUIC_SOURCE_PATH}/submodules/openssl3")
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH XDP_WINDOWS OUT_SOURCE_PATH XDP_WINDOWS
@ -61,7 +61,7 @@ vcpkg_cmake_configure(
SOURCE_PATH "${QUIC_SOURCE_PATH}" SOURCE_PATH "${QUIC_SOURCE_PATH}"
OPTIONS OPTIONS
-DQUIC_SOURCE_LINK=OFF -DQUIC_SOURCE_LINK=OFF
-DQUIC_TLS=openssl -DQUIC_TLS=openssl3
-DQUIC_USE_SYSTEM_LIBCRYPTO=OFF -DQUIC_USE_SYSTEM_LIBCRYPTO=OFF
-DQUIC_BUILD_PERF=OFF -DQUIC_BUILD_PERF=OFF
-DQUIC_BUILD_TEST=OFF -DQUIC_BUILD_TEST=OFF

View File

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

View File

@ -6109,7 +6109,7 @@
"port-version": 4 "port-version": 4
}, },
"msquic": { "msquic": {
"baseline": "2.4.4", "baseline": "2.4.5",
"port-version": 0 "port-version": 0
}, },
"mstch": { "mstch": {

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "a037eeff81951b04f28f6ed7c0988618d801afb0",
"version": "2.4.5",
"port-version": 0
},
{ {
"git-tree": "519570ca834d486ddb5fc0fd43094079ef27b568", "git-tree": "519570ca834d486ddb5fc0fd43094079ef27b568",
"version": "2.4.4", "version": "2.4.4",