[curl,vcpkg-ci-curl] Update to curl 8.9.1, Add gnutls feature, Add test gnutls for curl (#40102)

This commit is contained in:
talregev 2024-08-01 19:58:42 +03:00 committed by GitHub
parent 682f633501
commit eff777a963
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 58 additions and 3 deletions

20
ports/curl/gnutls.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 580cc4357..735a9e234 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -540,11 +540,12 @@ if(CURL_USE_WOLFSSL)
endif()
if(CURL_USE_GNUTLS)
- find_package(GnuTLS REQUIRED)
- find_package(nettle REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(GNUTLS "gnutls")
+ pkg_check_modules(NETTLE "nettle")
set(SSL_ENABLED ON)
set(USE_GNUTLS ON)
- list(APPEND CURL_LIBS ${GNUTLS_LIBRARIES} ${NETTLE_LIBRARIES})
+ list(APPEND CURL_LIBS ${GNUTLS_LINK_LIBRARIES} ${NETTLE_LINK_LIBRARIES})
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE "gnutls" "nettle")
include_directories(${GNUTLS_INCLUDE_DIRS} ${NETTLE_INCLUDE_DIRS})

View File

@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF "${curl_version}"
SHA512 9f7e92292bde501334ee415335404da7c40e033443c34464ed48af5bab7d1fd594859278eac695bec77ee6d58c0629162a7a9876a38a5abd404faa1c43f2b14e
SHA512 f5c425c3fbd7bfda13137e8e9bc969ed7dc94c5bfcf0681a2358ab7d3b5d10402781a93385255a80c402c9824aeb97d70213b412f2d208dee4abdba5bbed2ca4
HEAD_REF master
PATCHES
0005_remove_imp_suffix.patch
@ -13,6 +13,7 @@ vcpkg_from_github(
export-components.patch
dependencies.patch
cmake-config.patch
gnutls.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -36,12 +37,21 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
psl CURL_USE_LIBPSL
gssapi CURL_USE_GSSAPI
gsasl CURL_USE_GSASL
gnutls CURL_USE_GNUTLS
INVERTED_FEATURES
ldap CURL_DISABLE_LDAP
ldap CURL_DISABLE_LDAPS
non-http HTTP_ONLY
)
# Add warning on build failuer when using wolfssl and openssl features togther.
if("openssl" IN_LIST FEATURES AND "wolfssl" IN_LIST FEATURES)
message(WARNING "Adding OpenSSL and WolfSSL simultaneously will result in a build failure. \
Please remove one of these features from your build process.\
If you are using OpenSSL version 1.1, you may disregard this warning."
)
endif()
set(OPTIONS "")
if("sectransp" IN_LIST FEATURES)

View File

@ -1,6 +1,6 @@
{
"name": "curl",
"version": "8.9.0",
"version": "8.9.1",
"description": "A library for transferring data with URLs",
"homepage": "https://curl.se/",
"license": "curl AND ISC AND BSD-3-Clause",
@ -32,6 +32,19 @@
"c-ares"
]
},
"gnutls": {
"description": "SSL support (gnutls)",
"dependencies": [
{
"name": "libgnutls",
"platform": "!windows | mingw"
},
{
"name": "shiftmedia-libgnutls",
"platform": "windows & !mingw"
}
]
},
"gsasl": {
"description": "GSASL support (libgsasl)",
"dependencies": [

View File

@ -49,6 +49,13 @@
"tool"
],
"platform": "!android & !uwp"
},
{
"name": "curl",
"features": [
"gnutls"
],
"platform": "!arm & !xbox"
}
]
}

View File

@ -2105,7 +2105,7 @@
"port-version": 8
},
"curl": {
"baseline": "8.9.0",
"baseline": "8.9.1",
"port-version": 0
},
"curlpp": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f243fde8de72db4bb1d25a29e758d5b8973551e4",
"version": "8.9.1",
"port-version": 0
},
{
"git-tree": "58954b5f6ad96e9c390d6ae282b8a04c46a65ad3",
"version": "8.9.0",