Skip to content

Commit 3c4da5b

Browse files
laramielcopybara-github
laramiel
authored and
copybara-github
committed
Update curl to 8.13.0
PiperOrigin-RevId: 752601272 Change-Id: I2fb9533a719a01461a54acf479d5b4dc631615ae
1 parent 4fdf107 commit 3c4da5b

File tree

3 files changed

+40
-32
lines changed

3 files changed

+40
-32
lines changed

‎third_party/curl/curl.BUILD.bazel‎

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ LOCAL_DEFINES = (
4242
"HAVE_CONFIG_H",
4343
"HAVE_LIBZ",
4444
"HAVE_ZLIB_H",
45+
"HAVE_ZSTD_H",
4546
"HAVE_BROTLI",
4647
"ENABLE_IPV6",
4748
# "USE_ARES", # TODO: Enable c-ares; after debugging broken test.
@@ -141,6 +142,7 @@ cc_library(
141142
defines = ["CURL_STATICLIB"],
142143
implementation_deps = [
143144
"@zlib//:zlib",
145+
"@zstd//:zstdlib",
144146
"@brotli//:brotlidec",
145147
# "@c-ares//:ares",
146148
"@org_nghttp2//:nghttp2",
@@ -204,20 +206,39 @@ write_file(
204206
"# include <openssl/opensslv.h>",
205207
"# if defined(OPENSSL_IS_BORINGSSL)",
206208
"# define HAVE_BORINGSSL 1",
209+
"# define HAVE_OPENSSL_CRYPTO_H 1",
210+
"# define HAVE_OPENSSL_ERR_H 1",
211+
"# define HAVE_OPENSSL_PEM_H 1",
212+
"# define HAVE_OPENSSL_PKCS12_H 1",
213+
"# define HAVE_OPENSSL_RSA_H 1",
214+
"# define HAVE_OPENSSL_SRP 1",
215+
"# define HAVE_OPENSSL_SSL_H 1",
216+
"# define HAVE_OPENSSL_X509_H 1",
207217
"# endif",
208218
"#endif",
209219
"",
220+
"#define CURL_DISABLE_AWS 1",
210221
"#define CURL_DISABLE_DICT 1",
211222
"#define CURL_DISABLE_FILE 1",
212223
"#define CURL_DISABLE_GOPHER 1",
213224
"#define CURL_DISABLE_IMAP 1",
225+
"#define CURL_DISABLE_IPFS 1",
226+
"#define CURL_DISABLE_KERBEROS 1",
214227
"#define CURL_DISABLE_LDAP 1",
215228
"#define CURL_DISABLE_LDAPS 1",
229+
"#define CURL_DISABLE_MQTT 1",
230+
"#define CURL_DISABLE_NETRC 1",
231+
"#define CURL_DISABLE_NETRC 1",
232+
"#define CURL_DISABLE_NTLM 1",
216233
"#define CURL_DISABLE_POP3 1",
234+
"#define CURL_DISABLE_PROGRESS_METER 1",
235+
"#define CURL_DISABLE_RTSP 1",
217236
"#define CURL_DISABLE_SMB 1",
218237
"#define CURL_DISABLE_SMTP 1",
219238
"#define CURL_DISABLE_TELNET 1",
220239
"#define CURL_DISABLE_TFTP 1",
240+
"#define CURL_DISABLE_WEBSOCKETS 1",
241+
"",
221242
"#define USE_NGHTTP2 1",
222243
"",
223244
"#if defined(_WIN32)",
@@ -226,16 +247,16 @@ write_file(
226247
"# define CURL_DISABLE_CRYPTO_AUTH 1",
227248
"# define CURL_PULL_WS2TCPIP_H 1",
228249
"# define CURL_PULL_WS2TCPIP_H 1",
250+
"# define WANT_IDN_PROTOTYPES 1",
229251
"# define USE_WINDOWS_SSPI 1",
230252
"# define USE_WIN32_IDN 1",
231253
"# define USE_SCHANNEL 1",
232-
"# define WANT_IDN_PROTOTYPES 1",
233254
"#elif defined(__APPLE__)",
234255
"# define HAVE_FSETXATTR_6 1",
235256
"# define HAVE_SETMODE 1",
236257
"# define HAVE_SYS_FILIO_H 1",
237258
"# define HAVE_SYS_SOCKIO_H 1",
238-
'# define OS "x86_64-apple-darwin15.5.0"',
259+
'# define CURL_OS "x86_64-apple-darwin15.5.0"',
239260
"# define USE_SECTRANSP 1",
240261
"#else",
241262
'/* # undef CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" */',
@@ -253,18 +274,14 @@ write_file(
253274
"# define HAVE_LIBSSL 1",
254275
"# define HAVE_MALLOC_H 1",
255276
"# define HAVE_MSG_NOSIGNAL 1",
256-
"# define HAVE_OPENSSL_CRYPTO_H 1",
257-
"# define HAVE_OPENSSL_ERR_H 1",
258-
"# define HAVE_OPENSSL_PEM_H 1",
259-
"# define HAVE_OPENSSL_PKCS12_H 1",
260-
"# define HAVE_OPENSSL_RSA_H 1",
261-
"# define HAVE_OPENSSL_SSL_H 1",
262-
"# define HAVE_OPENSSL_X509_H 1",
277+
"# define HAVE_LINUX_TCP_H 1",
263278
"# define HAVE_RAND_EGD 1",
264279
"# define HAVE_RAND_STATUS 1",
265280
"# define HAVE_SSL_GET_SHUTDOWN 1",
281+
"# define HAVE_SYS_EVENTFD_H 1",
282+
"# define HAVE_SCHED_YIELD 1",
266283
"# define HAVE_TERMIOS_H 1",
267-
'# define OS "x86_64-pc-linux-gnu"',
284+
'# define CURL_OS "x86_64-pc-linux-gnu"',
268285
'# define RANDOM_FILE "/dev/urandom"',
269286
"# define USE_OPENSSL 1",
270287
"#endif",
@@ -279,6 +296,7 @@ write_file(
279296
"# define GETNAMEINFO_TYPE_ARG46 socklen_t",
280297
"# define GETNAMEINFO_TYPE_ARG7 int",
281298
"# define HAVE_ALARM 1",
299+
"# define HAVE_ATOMIC_H 1",
282300
"# define HAVE_ALLOCA_H 1",
283301
"# define HAVE_ARPA_INET_H 1",
284302
"# define HAVE_ARPA_TFTP_H 1",
@@ -366,6 +384,8 @@ write_file(
366384
"# define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1",
367385
"# define HAVE_SOCKET 1",
368386
"# define HAVE_SOCKETPAIR 1",
387+
"# define HAVE_SNPRINTF 1",
388+
"# define HAVE_STDATOMIC_H 1",
369389
"# define HAVE_STDBOOL_H 1",
370390
"# define HAVE_STDINT_H 1",
371391
"# define HAVE_STDIO_H 1",
@@ -404,6 +424,8 @@ write_file(
404424
"# define HAVE_WRITABLE_ARGV 1",
405425
"# define HAVE_WRITEV 1",
406426
"# define HAVE_ZLIB_H 1",
427+
"# define HAVE_ZSTD 1",
428+
"# define HAVE_ZSTD_H 1",
407429
'# define LT_OBJDIR ".libs/"',
408430
'# define PACKAGE "curl"',
409431
'# define PACKAGE_BUGREPORT "a suitable curl mailing list: https://curl.haxx.se/mail/"',
@@ -433,6 +455,7 @@ write_file(
433455
"# define SIZEOF_LONG 8",
434456
"# define SIZEOF_OFF_T 8",
435457
"# define SIZEOF_CURL_OFF_T 8",
458+
"# define SIZEOF_CURL_SOCKET_T 4",
436459
"# define SIZEOF_SHORT 2",
437460
"# define SIZEOF_SIZE_T 8",
438461
"# define SIZEOF_TIME_T 8",

‎third_party/curl/patches/13210.diff‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎third_party/curl/workspace.bzl‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ def repo():
2121
maybe(
2222
third_party_http_archive,
2323
name = "curl",
24-
strip_prefix = "curl-8.10.1",
25-
urls = [
26-
"https://storage.googleapis.com/tensorstore-bazel-mirror/curl.se/download/curl-8.10.1.tar.gz",
27-
"https://curl.se/download/curl-8.10.1.tar.gz",
28-
],
2924
doc_name = "curl",
30-
doc_version = "8.10.1",
25+
doc_version = "8.13.0",
3126
doc_homepage = "https://curl.se/",
32-
sha256 = "d15ebab765d793e2e96db090f0e172d127859d78ca6f6391d7eafecfd894bbc0",
27+
strip_prefix = "curl-8.13.0",
28+
urls = [
29+
"https://storage.googleapis.com/tensorstore-bazel-mirror/curl.se/download/curl-8.13.0.tar.gz",
30+
"https://curl.se/download/curl-8.13.0.tar.gz",
31+
],
32+
sha256 = "c261a4db579b289a7501565497658bbd52d3138fdbaccf1490fa918129ab45bc",
3333
build_file = Label("//third_party:curl/curl.BUILD.bazel"),
3434
system_build_file = Label("//third_party:curl/system.BUILD.bazel"),
3535
cmake_name = "CURL",

0 commit comments

Comments
 (0)