3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[curl] Update to 7.86.0 (#27778)

Browse Source 
* [curl] Update to 7.86.0

* [azure-core-cpp] Add missing Ws2_32.lib.

Filed upstream as https://github.com/Azure/azure-sdk-for-cpp/pull/4127

* [aws-sdk-cpp] Lock the selected curl features.

Co-authored-by: FrankXie <v-frankxie@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Lova Widmark 2022-11-21 18:13:49 +01:00 committed by GitHub
parent 927b997977
commit b224213946
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 82 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ports/aws-sdk-cpp/lock-curl-http-and-tls-settings.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/aws-cpp-sdk-core/CMakeLists.txt b/aws-cpp-sdk-core/CMakeLists.txt
index c44546b0e..b66888362 100644
--- a/aws-cpp-sdk-core/CMakeLists.txt
+++ b/aws-cpp-sdk-core/CMakeLists.txt
@@ -113,13 +113,8 @@ if(ENABLE_CURL_CLIENT)
int main() {
CURL* handle = curl_easy_init();
return curl_easy_setopt(handle, CURLOPT_PROXY_SSLCERT, \"client.pem\"); }")
- if (CMAKE_CROSSCOMPILING)
- check_c_source_compiles("${CHECK_CURL_HAS_H2}" CURL_HAS_H2)
- check_c_source_compiles("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY)
- else()
- check_c_source_runs("${CHECK_CURL_HAS_H2}" CURL_HAS_H2)
- check_c_source_runs("${CHECK_CURL_HAS_TLS_PROXY}" CURL_HAS_TLS_PROXY)
- endif()
+ set(CURL_HAS_H2 OFF)
+ set(CURL_HAS_TLS_PROXY ON)
elseif(ENABLE_WINDOWS_CLIENT)
# NOTE: HTTP/2 is not supported when using IXML_HTTP_REQUEST_2
if(USE_IXML_HTTP_REQUEST_2)

3
ports/aws-sdk-cpp/portfile.cmake
View File

@ -9,6 +9,7 @@ vcpkg_from_github(
patch-relocatable-rpath.patch
fix-aws-root.patch
fix-openssl3.patch
lock-curl-http-and-tls-settings.patch
)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
@ -49,7 +50,7 @@ vcpkg_cmake_install()
foreach(TARGET IN LISTS BUILD_ONLY)
vcpkg_cmake_config_fixup(PACKAGE_NAME "aws-cpp-sdk-${TARGET}" CONFIG_PATH "lib/cmake/aws-cpp-sdk-${TARGET}" DO_NOT_DELETE_PARENT_CONFIG_PATH)
endforeach()
endforeach()
vcpkg_cmake_config_fixup(PACKAGE_NAME "AWSSDK" CONFIG_PATH "lib/cmake/AWSSDK")
vcpkg_copy_pdbs()

6
ports/aws-sdk-cpp/vcpkg.json
View File

@ -2,7 +2,7 @@
"$note": "Automatically generated by generateFeatures.ps1",
"name": "aws-sdk-cpp",
"version": "1.9.220",
"port-version": 1,
"port-version": 2,
"description": "AWS SDK for C++",
"homepage": "https://github.com/aws/aws-sdk-cpp",
"supports": "!(windows & arm) & !uwp",
@ -10,6 +10,10 @@
"aws-crt-cpp",
{
"name": "curl",
"default-features": false,
"features": [
"ssl"
],
"platform": "!uwp & !windows"
},
{

14
ports/azure-core-cpp/add-ws232.patch Normal file
View File

@ -0,0 +1,14 @@
diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
index c536948..c94441b 100644
--- a/sdk/core/azure-core/CMakeLists.txt
+++ b/sdk/core/azure-core/CMakeLists.txt
@@ -170,6 +170,9 @@ endif()
if(BUILD_TRANSPORT_CURL)
target_link_libraries(azure-core PUBLIC CURL::libcurl)
+ if(WIN32)
+ target_link_libraries(azure-core PRIVATE Ws2_32)
+ endif()
endif()
if(BUILD_TRANSPORT_WINHTTP)
target_link_libraries(azure-core PRIVATE winhttp)

2
ports/azure-core-cpp/portfile.cmake
View File

@ -3,6 +3,8 @@ vcpkg_from_github(
REPO Azure/azure-sdk-for-cpp
REF azure-core_1.7.2
SHA512 f24d02bf34f8be665e08a9a2799498f78daf6103a0ac5c10d79dc6b7b4461dac8ea2f91088e11bc90d0c74b59a59dc1e6361ad053718fb6da6a0691a9ac314a6
PATCHES
add-ws232.patch # https://github.com/Azure/azure-sdk-for-cpp/pull/4127
)
vcpkg_check_features(

1
ports/azure-core-cpp/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "azure-core-cpp",
"version-semver": "1.7.2",
"port-version": 1,
"description": [
"Microsoft Azure Core SDK for C++",
"This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."

24
ports/curl/0002_fix_uwp.patch
View File

@ -1,15 +1,15 @@
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 62b7b33..8a4bd71 100644
index 8cea346c3..967312905 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -115,6 +115,10 @@ if(CURL_HAS_LTO)
INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE)
endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
+endif()
+
if(WIN32)
if(BUILD_SHARED_LIBS)
set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_USRDLL")
@@ -118,6 +118,10 @@ if(CURL_HAS_LTO)
INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO TRUE)
endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set_property(TARGET ${LIB_NAME} APPEND PROPERTY COMPILE_DEFINITIONS "_WINSOCK_DEPRECATED_NO_WARNINGS")
+endif()
+
if(WIN32)
if(BUILD_SHARED_LIBS)
if(MSVC)

13
ports/curl/0021-normaliz.patch
View File

@ -1,13 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d209be..9f6de81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -638,7 +638,7 @@ endif()
if(WIN32)
option(USE_WIN32_IDN "Use WinIDN for IDN support" OFF)
if(USE_WIN32_IDN)
- list(APPEND CURL_LIBS "Normaliz")
+ list(APPEND CURL_LIBS "normaliz")
set(WANT_IDN_PROTOTYPES ON)
endif()
endif()

6
ports/curl/portfile.cmake
View File

@ -1,15 +1,14 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF curl-7_84_0
SHA512 2a000c052c14ee9e6bed243e92699517889554bc0dc03e9f28d398ecf14b405c336f1303e6ed15ed30e88d5d00fefecdc189e83def3f0a5431f63e3be1c55c35
REF curl-7_86_0
SHA512 74fa76d58b09ae15c953f77918172e23657efd8ed9d16e3a741525a4f350e6bd9691e0b0935aac11e3060cebff043dc4a17c3dde625a19ca7399c173ea4160c9
HEAD_REF master
PATCHES
0002_fix_uwp.patch
0005_remove_imp_suffix.patch
0012-fix-dependency-idn2.patch
0020-fix-pc-file.patch
0021-normaliz.patch # for mingw on case-sensitive file system
0022-deduplicate-libs.patch
mbedtls-ws2_32.patch
export-components.patch
@ -49,6 +48,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
idn2 USE_LIBIDN2
winidn USE_WIN32_IDN
winldap USE_WIN32_LDAP
websockets ENABLE_WEBSOCKETS
INVERTED_FEATURES
non-http HTTP_ONLY
winldap CURL_DISABLE_LDAP # Only WinLDAP support ATM

6
ports/curl/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "curl",
"version": "7.84.0",
"port-version": 2,
"version": "7.86.0",
"description": "A library for transferring data with URLs",
"homepage": "https://curl.se/",
"license": null,
@ -158,6 +157,9 @@
"tool": {
"description": "Builds curl executable"
},
"websockets": {
"description": "WebSocket support (experimental)"
},
"winidn": {
"description": "WinIDN support"
},

5
versions/a-/aws-sdk-cpp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8303c2804c010e352168fda9a38e7256c30d170d",
"version": "1.9.220",
"port-version": 2
},
{
"git-tree": "c7d142ac1a2667f6ba9650cab2505a71ffaddbd3",
"version": "1.9.220",

5
versions/a-/azure-core-cpp.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b9e5836104380238317ab53761a49a01fdb308fe",
"version-semver": "1.7.2",
"port-version": 1
},
{
"git-tree": "5c0aaa2cef20a29b4e141758ed3fcce954449d1b",
"version-semver": "1.7.2",

8
versions/baseline.json
View File

@ -334,7 +334,7 @@
},
"aws-sdk-cpp": {
"baseline": "1.9.220",
"port-version": 1
"port-version": 2
},
"azmq": {
"baseline": "1.0.3",
@ -346,7 +346,7 @@
},
"azure-core-cpp": {
"baseline": "1.7.2",
"port-version": 0
"port-version": 1
},
"azure-core-tracing-opentelemetry-cpp": {
"baseline": "1.0.0-beta.3",
@ -1801,8 +1801,8 @@
"port-version": 8
},
"curl": {
"baseline": "7.84.0",
"port-version": 2
"baseline": "7.86.0",
"port-version": 0
},
"curlpp": {
"baseline": "2018-06-15",

5
versions/c-/curl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ac2042be9746b4b193f99398f32bed8057f5d267",
"version": "7.86.0",
"port-version": 0
},
{
"git-tree": "588fa4742c417db9d7c0f89e652b618296388d1e",
"version": "7.84.0",