Merge pull request #62201 from rtg0795/r2.14

learning-to-play · web-flow · commit de7074473a54 · 2023-10-23T18:24:01.000-07:00
Update curl from 8.2.1 to 8.4.0
diff --git a/tensorflow/workspace2.bzl b/tensorflow/workspace2.bzl
@@ -513,10 +513,10 @@ def _tf_repositories():
     tf_http_archive(
         name = "curl",
         build_file = "//third_party:curl.BUILD",
-        sha256 = "f98bdb06c0f52bdd19e63c4a77b5eb19b243bcbbd0f5b002b9f3cba7295a3a42",
-        strip_prefix = "curl-8.2.1",
+        sha256 = "816e41809c043ff285e8c0f06a75a1fa250211bbfb2dc0a037eeef39f1a9e427",
+        strip_prefix = "curl-8.4.0",
         system_build_file = "//third_party/systemlibs:curl.BUILD",
-        urls = tf_mirror_urls("https://curl.haxx.se/download/curl-8.2.1.tar.gz"),
+        urls = tf_mirror_urls("https://curl.se/download/curl-8.4.0.tar.gz"),
     )
 
     # WARNING: make sure ncteisen@ and vpai@ are cc-ed on any CL to change the below rule
diff --git a/third_party/curl.BUILD b/third_party/curl.BUILD
@@ -93,8 +93,6 @@ cc_library(
         "lib/curl_hmac.h",
         "lib/curl_krb5.h",
         "lib/curl_ldap.h",
-        "lib/curl_log.c",
-        "lib/curl_log.h",
         "lib/curl_md4.h",
         "lib/curl_md5.h",
         "lib/curl_memory.h",
@@ -122,6 +120,8 @@ cc_library(
         "lib/curl_sspi.h",
         "lib/curl_threads.c",
         "lib/curl_threads.h",
+        "lib/curl_trc.c",
+        "lib/curl_trc.h",
         "lib/curlx.h",
         "lib/dict.c",
         "lib/dict.h",
@@ -327,8 +327,6 @@ cc_library(
         "lib/vssh/wolfssh.c",
         "lib/vtls/bearssl.c",
         "lib/vtls/bearssl.h",
-        "lib/vtls/gskit.c",
-        "lib/vtls/gskit.h",
         "lib/vtls/gtls.c",
         "lib/vtls/gtls.h",
         "lib/vtls/hostcheck.c",
@@ -339,8 +337,6 @@ cc_library(
         "lib/vtls/mbedtls.h",
         "lib/vtls/mbedtls_threadlock.c",
         "lib/vtls/mbedtls_threadlock.h",
-        "lib/vtls/nss.c",
-        "lib/vtls/nssg.h",
         "lib/vtls/openssl.c",
         "lib/vtls/openssl.h",
         "lib/vtls/rustls.c",
