Skip to content
Snippets Groups Projects
Commit a94c42df authored by Col-Waltz's avatar Col-Waltz Committed by Alexander Turenko
Browse files

third_party: update libcurl from 8.8.0 to 8.10.1

Updates curl module to the version 8.10.1. The new version brings
several new options, such as:

CURL_USE_RUSTLS - Enables Rustls for SSL/TLS. Added in commit
curl/curl@ed76a23fccc1 ("cmake: add rustls")

CURL_USE_WOLFSSH - Option to use wolfSSH. Added in commit
curl/curl@0d8fdd1c7421 ("cmake: add wolfSSH support")

CURL_USE_GSASL - Option to use libgsasl.
Added in commit curl/curl@66bf995d1cfc
("cmake: add CURL_USE_GSASL option with detection + CI test")

CURL_DISABLE_SHA512_256 - Disables SHA-512/256 hash algorithm.
Added in commit curl/curl@33629949488c
("build: add options to disable SHA-512/256 hash algo")

CURL_USE_LIBUV - Use libuv for event-based tests. Added in commit
curl/curl@f7d5f47059c3 ("cmake: add support for `CURL_USE_LIBUV` option")

Corrected http_client test according to curl commit curl/curl@b7e769dc872d
("vtls: stop offering alpn http/1.1 for http2-prior-knowledge")

Build file missed several options and paths not used in the current build.
List of these options was added into curl-excluded-options.txt for the
convenience of the following bumps.

Closes #10576

https://curl.se/changes.html#8_10_1
https://github.com/curl/curl/releases/tag/curl-8_10_1

NO_DOC=libcurl submodule bump
NO_TEST=libcurl submodule bump

(cherry picked from commit 0919f390802f146852b462215327ef03e2730cfc)

@Totktonada: the http_client test mentioned in the original commit
message doesn't present in the `release/2.11` branch.
parent 3b9952fb
No related branches found
No related tags found
No related merge requests found
## bugfix/build
* Updated libcurl to version 8.10.1 (gh-10576).
......@@ -147,6 +147,9 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_MBEDTLS=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_WOLFSSL=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_LIBRTMP=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_RUSTLS=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_WOLFSSH=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_GSASL=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DHAVE_LIBIDN2=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_LIBIDN2=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_NGTCP2=OFF")
......@@ -155,6 +158,7 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_OPENSSL_QUIC=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_HTTP=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_PROXY=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_SHA512_256=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_IPV6=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_COOKIES=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_EXAMPLES=OFF")
......@@ -199,6 +203,7 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_GSSAPI=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_LIBSSH=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_LIBPSL=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_LIBUV=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_WERROR=OFF")
# CURL_ZSTD adds zstd encoding/decoding support. Tuning libcurl's build to
# catch the symbols may require extra work.
......
RANDOM_FILE
CMAKE_ADDR2LINE
CMAKE_COLOR_MAKEFILE
CMAKE_C_COMPILER_AR
CMAKE_C_COMPILER_RANLIB
CMAKE_C_FLAGS_DEBUG
CMAKE_C_FLAGS_MINSIZEREL
CMAKE_C_FLAGS_RELEASE
CMAKE_C_FLAGS_RELWITHDEBINFO
CMAKE_DLLTOOL
CMAKE_EXE_LINKER_FLAGS
CMAKE_EXE_LINKER_FLAGS_MINSIZEREL
CMAKE_EXE_LINKER_FLAGS_RELEASE
CURL_CA_PATH_SET
CURL_CA_BUNDLE_SET
CMAKE_VERBOSE_MAKEFILE
CMAKE_TAPI
CMAKE_STATIC_LINKER_FLAGS_RELWITHDEBINFO
CMAKE_STATIC_LINKER_FLAGS_RELEASE
CMAKE_STATIC_LINKER_FLAGS_MINSIZEREL
CMAKE_STATIC_LINKER_FLAGS_DEBUG
CMAKE_STATIC_LINKER_FLAGS
CMAKE_SKIP_RPATH
CMAKE_SKIP_INSTALL_RPATH
CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO
CMAKE_SHARED_LINKER_FLAGS_RELEASE
CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL
CMAKE_SHARED_LINKER_FLAGS_DEBUG
CMAKE_SHARED_LINKER_FLAGS
CMAKE_READELF
CMAKE_OBJDUMP
CMAKE_OBJCOPY
CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO
CMAKE_MODULE_LINKER_FLAGS_RELEASE
CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL
CMAKE_MODULE_LINKER_FLAGS_DEBUG
CMAKE_MODULE_LINKER_FLAGS
CMAKE_LDAP_LIB
CMAKE_LDAP_INCLUDE_DIR
CMAKE_LBER_LIB
CMAKE_INSTALL_SYSCONFDIR
CMAKE_INSTALL_SHAREDSTATEDIR
CMAKE_INSTALL_SBINDIR
CMAKE_INSTALL_RUNSTATEDIR
CMAKE_INSTALL_OLDINCLUDEDIR
CMAKE_INSTALL_MANDIR
CMAKE_INSTALL_LOCALSTATEDIR
CMAKE_INSTALL_LOCALEDIR
CMAKE_INSTALL_LIBEXECDIR
CMAKE_INSTALL_INFODIR
CMAKE_INSTALL_DOCDIR
CMAKE_INSTALL_DATAROOTDIR
CMAKE_INSTALL_DATADIR
CMAKE_INSTALL_BINDIR
CMAKE_EXPORT_COMPILE_COMMANDS
Subproject commit 30de937bda0f65d47059d579f8a21e48ad721e28
Subproject commit 7eb8c048470ed2cc14dca75be9c1cdae7ac8498b
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment