Skip to content

Commit

Permalink
[workspace] Upgrade curl_internal to latest release 8.11.0 (#22256)
Browse files Browse the repository at this point in the history
Co-Authored-By: Jeremy Nimmer <[email protected]>
  • Loading branch information
nicolecheetham and jwnimmer-tri authored Dec 9, 2024
1 parent f996225 commit 0fe2f65
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
18 changes: 12 additions & 6 deletions tools/workspace/curl_internal/cmakedefines.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ CMAKE_DEFINES = [
"CURL_DISABLE_HSTS",
"CURL_DISABLE_HTTP_AUTH",
"CURL_DISABLE_IMAP",
"CURL_DISABLE_IPFS",
"CURL_DISABLE_KERBEROS_AUTH",
"CURL_DISABLE_LDAP",
"CURL_DISABLE_LDAPS",
Expand All @@ -82,6 +83,8 @@ CMAKE_DEFINES = [
"CURL_DISABLE_SMTP",
"CURL_DISABLE_TELNET",
"CURL_DISABLE_TFTP",
"CURL_DISABLE_WEBSOCKETS",
"CURL_OS=\"\"",
"HAVE_ALARM",
"HAVE_ARPA_INET_H",
"HAVE_ATOMIC",
Expand Down Expand Up @@ -126,7 +129,7 @@ CMAKE_DEFINES = [
"HAVE_NETINET_UDP_H",
"HAVE_NET_IF_H",
"HAVE_PIPE",
"HAVE_POLL_FINE",
"HAVE_POLL",
"HAVE_POLL_H",
"HAVE_POSIX_STRERROR_R",
"HAVE_PWD_H",
Expand Down Expand Up @@ -171,7 +174,6 @@ CMAKE_DEFINES = [
"HAVE_UTIME",
"HAVE_UTIME_H",
"HAVE_WRITABLE_ARGV",
"OS=\"\"",
"STDC_HEADERS",
"USE_IPV6",
] + [
Expand All @@ -197,7 +199,9 @@ CMAKE_UNDEFINES = [
"CURL_CA_BUNDLE",
"CURL_CA_FALLBACK",
"CURL_CA_PATH",
"CURL_CA_SEARCH_SAFE",
"CURL_DEFAULT_SSL_BACKEND",
"CURL_DISABLE_CA_SEARCH",
"CURL_DISABLE_HTTP",
"CURL_DISABLE_LIBCURL_OPTION",
"CURL_DISABLE_MIME",
Expand All @@ -210,6 +214,7 @@ CMAKE_UNDEFINES = [
"HAVE_BROTLI",
"HAVE_BUILTIN_AVAILABLE",
"HAVE_CLOSESOCKET",
"HAVE_CLOSESOCKET_CAMEL",
"HAVE_DIRENT_H",
"HAVE_GETHOSTBYNAME_R_3",
"HAVE_GETHOSTBYNAME_R_5",
Expand All @@ -219,7 +224,6 @@ CMAKE_UNDEFINES = [
"HAVE_GSSAPI",
"HAVE_GSSAPI_GSSAPI_GENERIC_H",
"HAVE_GSSAPI_GSSAPI_H",
"HAVE_GSSAPI_GSSAPI_KRB5_H",
"HAVE_GSSGNU",
"HAVE_IDN2_H",
"HAVE_IOCTLSOCKET",
Expand All @@ -228,19 +232,21 @@ CMAKE_UNDEFINES = [
"HAVE_IOCTLSOCKET_FIONBIO",
"HAVE_IO_H",
"HAVE_LBER_H",
"HAVE_LDAP_H",
"HAVE_LDAP_SSL",
"HAVE_LDAP_SSL_H",
"HAVE_LDAP_URL_PARSE",
"HAVE_LIBIDN2",
"HAVE_LINUX_TCP_H",
"HAVE_MACH_ABSOLUTE_TIME",
"HAVE_NETINET_IN6_H",
"HAVE_OLD_GSSMIT",
"HAVE_OPENDIR",
"HAVE_OPENSSL_SRP",
"HAVE_PROTO_BSDSOCKET_H",
"HAVE_PTHREAD_H",
"HAVE_QUICHE_CONN_SET_QLOG_FD",
"HAVE_SA_FAMILY_T",
"HAVE_SENDMMSG",
"HAVE_SETSOCKOPT_SO_NONBLOCK",
"HAVE_SSL_SET0_WBIO",
"HAVE_STRCMPI",
Expand All @@ -250,11 +256,12 @@ CMAKE_UNDEFINES = [
"HAVE_TERMIO_H",
"HAVE_UTIMES",
"HAVE_UV_H",
"HAVE_WOLFSSL_BIO",
"HAVE_WOLFSSL_DES_ECB_ENCRYPT",
"HAVE_WOLFSSL_FULL_BIO",
"HAVE_ZSTD",
"HAVE__FSEEKI64",
"NEED_LBER_H",
"HAVE__SETMODE",
"NEED_MALLOC_H",
"NEED_REENTRANT",
"PACKAGE",
Expand Down Expand Up @@ -291,7 +298,6 @@ CMAKE_UNDEFINES = [
"USE_THREADS_WIN32",
"USE_TLS_SRP",
"USE_UNIX_SOCKETS",
"USE_WEBSOCKETS",
"USE_WIN32_CRYPTO",
"USE_WIN32_IDN",
"USE_WIN32_LARGE_FILES",
Expand Down
1 change: 1 addition & 0 deletions tools/workspace/curl_internal/package.BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ _SRCS = [
"lib/strdup.c",
"lib/strerror.c",
"lib/strtoofft.c",
"lib/timediff.c",
"lib/timeval.c",
"lib/transfer.c",
"lib/url.c",
Expand Down
4 changes: 2 additions & 2 deletions tools/workspace/curl_internal/repository.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ def curl_internal_repository(
In case of a cmake_configure_file build error when upgrading curl,
update cmakedefines.bzl to match the new upstream definitions.
""",
commit = "curl-8_10_1",
sha256 = "5aaf131294f734756325dd99d849518c9a5060fc702517ab3064c76257dc700c", # noqa
commit = "curl-8_11_0",
sha256 = "5a231145114589491fc52da118f9c7ef8abee885d1cb1ced99c7290e9a352f07", # noqa
build_file = ":package.BUILD.bazel",
mirrors = mirrors,
)

0 comments on commit 0fe2f65

Please sign in to comment.