Meta/curl: Update to 8.15.0

This includes the patch for issue 17917, so we can remove our custom
patch :^)
This commit is contained in:
Luke Wilde 2025-07-21 13:34:01 +01:00 committed by Jelle Raaijmakers
parent 4319e6b80e
commit 0faf96fa1b
5 changed files with 7 additions and 35 deletions

View File

@ -1,14 +0,0 @@
diff --git a/lib/altsvc.c b/lib/altsvc.c
index 602ef61de..0c443268e 100644
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -487,8 +487,7 @@ CURLcode Curl_altsvc_parse(struct Curl_easy *data,
DEBUGASSERT(asi);
/* initial check for "clear" */
- if(!curlx_str_until(&p, &alpn, MAX_ALTSVC_LINE, ';') &&
- !curlx_str_single(&p, ';')) {
+ if(!curlx_str_cspn(&p, &alpn, ";\n\r")) {
curlx_str_trimblanks(&alpn);
/* "clear" is a magic keyword */
if(curlx_str_casecompare(&alpn, "clear")) {

View File

@ -10,7 +10,7 @@ index 86add74..be7b193 100644
+ list(APPEND CURL_LIBS ${CARES_LINK_LIBRARIES})
list(APPEND CURL_LIBDIRS ${CARES_LIBRARY_DIRS})
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${CARES_PC_REQUIRES})
link_directories(${CARES_LIBRARY_DIRS})
include_directories(SYSTEM ${CARES_INCLUDE_DIRS})
@@ -789,7 +789,7 @@ if(CURL_USE_MBEDTLS)
find_package(MbedTLS REQUIRED)
set(_ssl_enabled ON)
@ -133,7 +133,7 @@ index 86add74..be7b193 100644
set(HAVE_GSSAPI ${GSS_FOUND})
if(GSS_FOUND)
- list(APPEND CURL_LIBS ${GSS_LIBRARIES})
+ list(APPEND CURL_LIBS ${_GSS_LINK_LIBRARIES})
+ list(APPEND CURL_LIBS ${_gss_LINK_LIBRARIES})
list(APPEND CURL_LIBDIRS ${GSS_LIBRARY_DIRS})
list(APPEND LIBCURL_PC_REQUIRES_PRIVATE ${GSS_PC_REQUIRES})
include_directories(SYSTEM ${GSS_INCLUDE_DIRS})

View File

@ -4,12 +4,11 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO curl/curl
REF ${curl_version}
SHA512 c7dfb38fe317243b4b556c5f851042c8bd48ad8a062df73b75077df24328801c34b4e336bc1b76683e678e82cbc48b95571357f49a2385b5e4f93daadc428a0c
SHA512 d4a560e225d0110133f44ed57cf5394c1710530c5fec395d02baafaac9ea2186dd543047ae27fd7542894b8744070760516ae611602105b1b40605abbf84e684
HEAD_REF master
PATCHES
dependencies.patch
pkgconfig-curl-config.patch
curl-issue-17917.patch # FIXME: This is an upstream patch that can be removed when it lands in a stable version. See: https://github.com/curl/curl/issues/17917
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@ -25,7 +24,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
sspi CURL_WINDOWS_SSPI
brotli CURL_BROTLI
schannel CURL_USE_SCHANNEL
sectransp CURL_USE_SECTRANSP
idn2 USE_LIBIDN2
winidn USE_WIN32_IDN
zstd CURL_ZSTD
@ -137,7 +135,7 @@ string(REGEX REPLACE "#i.*" "" krb5_c "${krb5_c}")
set(krb5_copyright "${CURRENT_BUILDTREES_DIR}/krb5.c Notice")
file(WRITE "${krb5_copyright}" "${krb5_c}")
file(READ "${SOURCE_PATH}/lib/inet_ntop.c" inet_ntop_c)
file(READ "${SOURCE_PATH}/lib/curlx/inet_ntop.c" inet_ntop_c)
string(REGEX REPLACE "#i.*" "" inet_ntop_c "${inet_ntop_c}")
set(inet_ntop_copyright "${CURRENT_BUILDTREES_DIR}/inet_ntop.c and inet_pton.c Notice")
file(WRITE "${inet_ntop_copyright}" "${inet_ntop_c}")

View File

@ -1,6 +1,6 @@
{
"name": "curl",
"version": "8.14.1",
"version": "8.15.0",
"description": "A library for transferring data with URLs",
"homepage": "https://curl.se/",
"license": "curl AND ISC AND BSD-3-Clause",
@ -177,10 +177,6 @@
}
]
},
"sectransp": {
"description": "SSL support (sectransp)",
"supports": "osx | ios"
},
"ssh": {
"description": "SSH support via libssh2",
"dependencies": [
@ -204,14 +200,6 @@
"ssl": {
"description": "Default SSL backend",
"dependencies": [
{
"name": "curl",
"default-features": false,
"features": [
"sectransp"
],
"platform": "osx | ios"
},
{
"name": "curl",
"default-features": false,
@ -226,7 +214,7 @@
"features": [
"openssl"
],
"platform": "(uwp | !windows) & !(osx | ios) & !mingw"
"platform": "(uwp | !windows) & !mingw"
}
]
},

View File

@ -179,7 +179,7 @@
},
{
"name": "curl",
"version": "8.14.1#0"
"version": "8.15.0#0"
},
{
"name": "dirent",