Skip to content
Snippets Groups Projects
Commit 83ddadb4 authored by Sergey Bronnikov's avatar Sergey Bronnikov Committed by Kirill Yukhin
Browse files

third_party: update libcurl from 7.87.0 to 8.3.0

The patch updates curl module to the version 8.3.0 [1] and updates a
CMake module for building curl library.

Changes in CMake module:

- Option `CURL_STATICLIB` is gone and replaced with `BUILD_STATIC_LIBS`.
- Option `CURL_USE_GNUTLS` was added and disabled by default.
- NSS library support was removed and option `CURL_USE_NSS` has been
  removed as well.
- Option `CMAKE_UNITY_BUILD` was added and disabled by default.
- Option `CURL_DISABLE_FORM_API` was added and disabled by default. It is
  in fact depends on `CURL_DISABLE_MIME`, but anyway disabled explicitly.

Changelog: https://curl.se/changes.html#8_3_0

1. https://github.com/curl/curl/releases/tag/curl-8_3_0

NO_DOC=libcurl submodule bump
NO_TEST=libcurl submodule bump

Fixes #9086

(cherry picked from commit 979b4adb)
parent 36026980
No related branches found
No related tags found
No related merge requests found
## feature/build
* Updated libcurl to version 8.3.0.
## bugfix/http
* Fixed a streaming connection stuck if etcd is stopped
unexpectedly (gh-9086).
......@@ -28,7 +28,7 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_C_FLAGS=${LIBCURL_CFLAGS}")
# Switch on the static build.
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_STATICLIB=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_STATIC_LIBS=ON")
# Switch off the shared build.
list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_SHARED_LIBS=OFF")
......@@ -128,9 +128,9 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DBUILD_CURL_EXE=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_BROTLI=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_GNUTLS=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_GNUTLS=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_MBEDTLS=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_WOLFSSL=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_USE_NSS=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_LIBRTMP=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DHAVE_LIBIDN2=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_LIBIDN2=ON")
......@@ -162,6 +162,7 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_HTTP_AUTH=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_LIBCURL_OPTION=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_MIME=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_FORM_API=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_NETRC=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_NTLM=ON")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG=OFF")
......@@ -188,6 +189,7 @@ macro(curl_build)
list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_DEBUG=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DUSE_MSH3=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DENABLE_WEBSOCKETS=OFF")
list(APPEND LIBCURL_CMAKE_FLAGS "-DCMAKE_UNITY_BUILD=OFF")
# We need PIC at least to enable build for Fedora on
# ARM64 CPU. Without it configuration with Fedora
......
Subproject commit c12fb3ddaf48e709a7a4deaa55ec485e4df163ee
Subproject commit 6fa1d817e5b1a00d7d0c8168091877476b499317
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