Skip to content

Commit e75bde9

Browse files
Lu TengLuFinch
Lu Teng
and
LuFinch
committed
[Security] Update c-ares to 1.91.1 (#131)
Co-authored-by: Lu, Fengqing <[email protected]>
1 parent a673c95 commit e75bde9

File tree

1 file changed

+218
-0
lines changed

1 file changed

+218
-0
lines changed

‎third_party/openxla.patch

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3498,3 +3498,221 @@ index dc15118bb..89ab74d54 100644
34983498
}
34993499

35003500
TF_RETURN_IF_ERROR(GetKernel(loader_spec, kernel_base.get()));
3501+
diff --git a/third_party/tsl/third_party/grpc/c_ares.patch b/third_party/tsl/third_party/grpc/c_ares.patch
3502+
new file mode 100644
3503+
index 000000000..752965f93
3504+
--- /dev/null
3505+
+++ b/third_party/tsl/third_party/grpc/c_ares.patch
3506+
@@ -0,0 +1,200 @@
3507+
+diff --git a/bazel/grpc_deps.bzl b/bazel/grpc_deps.bzl
3508+
+index c2f2f43820..72de3cea94 100644
3509+
+--- a/bazel/grpc_deps.bzl
3510+
++++ b/bazel/grpc_deps.bzl
3511+
+@@ -182,9 +182,9 @@ def grpc_deps():
3512+
+ http_archive(
3513+
+ name = "com_github_cares_cares",
3514+
+ build_file = "@com_github_grpc_grpc//third_party:cares/cares.BUILD",
3515+
+- sha256 = "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a",
3516+
+- strip_prefix = "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30",
3517+
+- url = "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz",
3518+
++ sha256 = "321700399b72ed0e037d0074c629e7741f6b2ec2dda92956abe3e9671d3e268e",
3519+
++ strip_prefix = "c-ares-1.19.1",
3520+
++ url = "https://github.com/c-ares/c-ares/releases/download/cares-1_19_1/c-ares-1.19.1.tar.gz",
3521+
+ )
3522+
+
3523+
+ if "com_google_absl" not in native.existing_rules():
3524+
+diff --git a/third_party/cares/cares.BUILD b/third_party/cares/cares.BUILD
3525+
+index 203712b182..2561b1a4bc 100644
3526+
+--- a/third_party/cares/cares.BUILD
3527+
++++ b/third_party/cares/cares.BUILD
3528+
+@@ -109,84 +109,95 @@ genrule(
3529+
+ cc_library(
3530+
+ name = "ares",
3531+
+ srcs = [
3532+
+- "ares__close_sockets.c",
3533+
+- "ares__get_hostent.c",
3534+
+- "ares__read_line.c",
3535+
+- "ares__timeval.c",
3536+
+- "ares_cancel.c",
3537+
+- "ares_create_query.c",
3538+
+- "ares_data.c",
3539+
+- "ares_destroy.c",
3540+
+- "ares_expand_name.c",
3541+
+- "ares_expand_string.c",
3542+
+- "ares_fds.c",
3543+
+- "ares_free_hostent.c",
3544+
+- "ares_free_string.c",
3545+
+- "ares_getenv.c",
3546+
+- "ares_gethostbyaddr.c",
3547+
+- "ares_gethostbyname.c",
3548+
+- "ares_getnameinfo.c",
3549+
+- "ares_getopt.c",
3550+
+- "ares_getsock.c",
3551+
+- "ares_init.c",
3552+
+- "ares_library_init.c",
3553+
+- "ares_llist.c",
3554+
+- "ares_mkquery.c",
3555+
+- "ares_nowarn.c",
3556+
+- "ares_options.c",
3557+
+- "ares_parse_a_reply.c",
3558+
+- "ares_parse_aaaa_reply.c",
3559+
+- "ares_parse_mx_reply.c",
3560+
+- "ares_parse_naptr_reply.c",
3561+
+- "ares_parse_ns_reply.c",
3562+
+- "ares_parse_ptr_reply.c",
3563+
+- "ares_parse_soa_reply.c",
3564+
+- "ares_parse_srv_reply.c",
3565+
+- "ares_parse_txt_reply.c",
3566+
+- "ares_platform.c",
3567+
+- "ares_process.c",
3568+
+- "ares_query.c",
3569+
+- "ares_search.c",
3570+
+- "ares_send.c",
3571+
+- "ares_strcasecmp.c",
3572+
+- "ares_strdup.c",
3573+
+- "ares_strsplit.c",
3574+
+- "ares_strerror.c",
3575+
+- "ares_timeout.c",
3576+
+- "ares_version.c",
3577+
+- "ares_writev.c",
3578+
+- "bitncmp.c",
3579+
+- "inet_net_pton.c",
3580+
+- "inet_ntop.c",
3581+
+- "windows_port.c",
3582+
++ "src/lib/ares__read_line.c",
3583+
++ "src/lib/ares__get_hostent.c",
3584+
++ "src/lib/ares__close_sockets.c",
3585+
++ "src/lib/ares__timeval.c",
3586+
++ "src/lib/ares_gethostbyaddr.c",
3587+
++ "src/lib/ares_getenv.c",
3588+
++ "src/lib/ares_free_string.c",
3589+
++ "src/lib/ares_free_hostent.c",
3590+
++ "src/lib/ares_fds.c",
3591+
++ "src/lib/ares_expand_string.c",
3592+
++ "src/lib/ares_create_query.c",
3593+
++ "src/lib/ares_cancel.c",
3594+
++ "src/lib/ares_android.c",
3595+
++ "src/lib/ares_parse_txt_reply.c",
3596+
++ "src/lib/ares_parse_srv_reply.c",
3597+
++ "src/lib/ares_parse_soa_reply.c",
3598+
++ "src/lib/ares_parse_ptr_reply.c",
3599+
++ "src/lib/ares_parse_ns_reply.c",
3600+
++ "src/lib/ares_parse_naptr_reply.c",
3601+
++ "src/lib/ares_parse_mx_reply.c",
3602+
++ "src/lib/ares_parse_caa_reply.c",
3603+
++ "src/lib/ares_options.c",
3604+
++ "src/lib/ares_nowarn.c",
3605+
++ "src/lib/ares_mkquery.c",
3606+
++ "src/lib/ares_llist.c",
3607+
++ "src/lib/ares_getsock.c",
3608+
++ "src/lib/ares_getnameinfo.c",
3609+
++ "src/lib/bitncmp.c",
3610+
++ "src/lib/ares_writev.c",
3611+
++ "src/lib/ares_version.c",
3612+
++ "src/lib/ares_timeout.c",
3613+
++ "src/lib/ares_strerror.c",
3614+
++ "src/lib/ares_strcasecmp.c",
3615+
++ "src/lib/ares_search.c",
3616+
++ "src/lib/ares_platform.c",
3617+
++ "src/lib/windows_port.c",
3618+
++ "src/lib/inet_ntop.c",
3619+
++ "src/lib/ares__sortaddrinfo.c",
3620+
++ "src/lib/ares__readaddrinfo.c",
3621+
++ "src/lib/ares_parse_uri_reply.c",
3622+
++ "src/lib/ares__parse_into_addrinfo.c",
3623+
++ "src/lib/ares_parse_a_reply.c",
3624+
++ "src/lib/ares_parse_aaaa_reply.c",
3625+
++ "src/lib/ares_library_init.c",
3626+
++ "src/lib/ares_init.c",
3627+
++ "src/lib/ares_gethostbyname.c",
3628+
++ "src/lib/ares_getaddrinfo.c",
3629+
++ "src/lib/ares_freeaddrinfo.c",
3630+
++ "src/lib/ares_expand_name.c",
3631+
++ "src/lib/ares_destroy.c",
3632+
++ "src/lib/ares_data.c",
3633+
++ "src/lib/ares__addrinfo_localhost.c",
3634+
++ "src/lib/ares__addrinfo2hostent.c",
3635+
++ "src/lib/inet_net_pton.c",
3636+
++ "src/lib/ares_strsplit.c",
3637+
++ "src/lib/ares_strdup.c",
3638+
++ "src/lib/ares_send.c",
3639+
++ "src/lib/ares_rand.c",
3640+
++ "src/lib/ares_query.c",
3641+
++ "src/lib/ares_process.c",
3642+
+ ],
3643+
+ hdrs = [
3644+
+- "ares.h",
3645+
+ "ares_build.h",
3646+
+ "ares_config.h",
3647+
+- "ares_data.h",
3648+
+- "ares_dns.h",
3649+
+- "ares_getenv.h",
3650+
+- "ares_getopt.h",
3651+
+- "ares_inet_net_pton.h",
3652+
+- "ares_iphlpapi.h",
3653+
+- "ares_ipv6.h",
3654+
+- "ares_library_init.h",
3655+
+- "ares_llist.h",
3656+
+- "ares_nowarn.h",
3657+
+- "ares_platform.h",
3658+
+- "ares_private.h",
3659+
+- "ares_rules.h",
3660+
+- "ares_setup.h",
3661+
+- "ares_strcasecmp.h",
3662+
+- "ares_strdup.h",
3663+
+- "ares_strsplit.h",
3664+
+- "ares_version.h",
3665+
+- "ares_writev.h",
3666+
+- "bitncmp.h",
3667+
+- "config-win32.h",
3668+
+- "nameser.h",
3669+
+- "setup_once.h",
3670+
++ "include/ares_version.h",
3671+
++ "include/ares.h",
3672+
++ "include/ares_rules.h",
3673+
++ "include/ares_dns.h",
3674+
++ "include/ares_nameser.h",
3675+
++ "src/tools/ares_getopt.h",
3676+
++ "src/lib/ares_strsplit.h",
3677+
++ "src/lib/ares_android.h",
3678+
++ "src/lib/ares_private.h",
3679+
++ "src/lib/ares_llist.h",
3680+
++ "src/lib/ares_platform.h",
3681+
++ "src/lib/ares_ipv6.h",
3682+
++ "src/lib/config-dos.h",
3683+
++ "src/lib/bitncmp.h",
3684+
++ "src/lib/ares_strcasecmp.h",
3685+
++ "src/lib/setup_once.h",
3686+
++ "src/lib/ares_inet_net_pton.h",
3687+
++ "src/lib/ares_data.h",
3688+
++ "src/lib/ares_getenv.h",
3689+
++ "src/lib/config-win32.h",
3690+
++ "src/lib/ares_strdup.h",
3691+
++ "src/lib/ares_iphlpapi.h",
3692+
++ "src/lib/ares_setup.h",
3693+
++ "src/lib/ares_writev.h",
3694+
++ "src/lib/ares_nowarn.h",
3695+
+ ],
3696+
+ copts = [
3697+
+ "-D_GNU_SOURCE",
3698+
+@@ -202,7 +213,7 @@ cc_library(
3699+
+ "//conditions:default": [],
3700+
+ }),
3701+
+ defines = ["CARES_STATICLIB"],
3702+
+- includes = ["."],
3703+
++ includes = ["include", "."],
3704+
+ linkopts = select({
3705+
+ ":windows": ["-defaultlib:ws2_32.lib"],
3706+
+ "//conditions:default": [],
3707+
diff --git a/third_party/tsl/workspace2.bzl b/third_party/tsl/workspace2.bzl
3708+
index 1343f9e0f..839e84bdd 100644
3709+
--- a/third_party/tsl/workspace2.bzl
3710+
+++ b/third_party/tsl/workspace2.bzl
3711+
@@ -370,6 +370,7 @@ def _tf_repositories():
3712+
patch_file = [
3713+
"//third_party/grpc:generate_cc_env_fix.patch",
3714+
"//third_party/grpc:register_go_toolchain.patch",
3715+
+ "//third_party/grpc:c_ares.patch",
3716+
],
3717+
system_link_files = {
3718+
"//third_party/systemlibs:BUILD": "bazel/BUILD",

0 commit comments

Comments
 (0)