Skip to content

Commit

Permalink
[c-ares] Backport "[c-ares] Upgrade c-ares dependency to 1.19.1 (#33392…
Browse files Browse the repository at this point in the history 
…)" to v1.56.x (#33411)

Backports #33392
  • Loading branch information
@apolcyn
apolcyn committed Jun 12, 2023
1 parent d9d47b5 commit d5bafa4
Show file tree
Hide file tree
Showing 9 changed files with 194 additions and 174 deletions.
96 changes: 50 additions & 46 deletions Makefile
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions bazel/grpc_deps.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,11 @@ def grpc_deps():
http_archive(
name = "com_github_cares_cares",
build_file = "@com_github_grpc_grpc//third_party:cares/cares.BUILD",
sha256 = "ec76c5e79db59762776bece58b69507d095856c37b81fd35bfb0958e74b61d93",
strip_prefix = "c-ares-6654436a307a5a686b008c1d4c93b0085da6e6d8",
sha256 = "bf26e5b25e259911914a85ae847b6d723488adb5af4f8bdeb9d0871a318476e3",
strip_prefix = "c-ares-6360e96b5cf8e5980c887ce58ef727e53d77243a",
urls = [
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz",
"https://github.com/c-ares/c-ares/archive/6654436a307a5a686b008c1d4c93b0085da6e6d8.tar.gz",
"https://storage.googleapis.com/grpc-bazel-mirror/github.com/c-ares/c-ares/archive/6360e96b5cf8e5980c887ce58ef727e53d77243a.tar.gz",
"https://github.com/c-ares/c-ares/archive/6360e96b5cf8e5980c887ce58ef727e53d77243a.tar.gz",
],
)

Expand Down
8 changes: 6 additions & 2 deletions grpc.gemspec
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 64 additions & 60 deletions src/c-ares/gen_build_yaml.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,94 +61,98 @@ def ares_build(x):
'secure':
False,
'src': [
"third_party/cares/cares/src/lib/ares_init.c",
"third_party/cares/cares/src/lib/ares_expand_string.c",
"third_party/cares/cares/src/lib/ares_strcasecmp.c",
"third_party/cares/cares/src/lib/ares_destroy.c",
"third_party/cares/cares/src/lib/ares_free_string.c",
"third_party/cares/cares/src/lib/ares__read_line.c",
"third_party/cares/cares/src/lib/ares__get_hostent.c",
"third_party/cares/cares/src/lib/ares__close_sockets.c",
"third_party/cares/cares/src/lib/ares__timeval.c",
"third_party/cares/cares/src/lib/ares_library_init.c",
"third_party/cares/cares/src/lib/ares_getsock.c",
"third_party/cares/cares/src/lib/ares_process.c",
"third_party/cares/cares/src/lib/ares_create_query.c",
"third_party/cares/cares/src/lib/ares_gethostbyaddr.c",
"third_party/cares/cares/src/lib/ares_getenv.c",
"third_party/cares/cares/src/lib/ares_free_string.c",
"third_party/cares/cares/src/lib/ares_free_hostent.c",
"third_party/cares/cares/src/lib/ares_fds.c",
"third_party/cares/cares/src/lib/ares_gethostbyname.c",
"third_party/cares/cares/src/lib/ares_mkquery.c",
"third_party/cares/cares/src/lib/ares_freeaddrinfo.c",
"third_party/cares/cares/src/lib/ares_strdup.c",
"third_party/cares/cares/src/lib/ares_timeout.c",
"third_party/cares/cares/src/lib/ares_getnameinfo.c",
"third_party/cares/cares/src/lib/ares_expand_string.c",
"third_party/cares/cares/src/lib/ares_create_query.c",
"third_party/cares/cares/src/lib/ares_cancel.c",
"third_party/cares/cares/src/lib/ares_android.c",
"third_party/cares/cares/src/lib/ares_parse_txt_reply.c",
"third_party/cares/cares/src/lib/ares_parse_srv_reply.c",
"third_party/cares/cares/src/lib/ares_parse_soa_reply.c",
"third_party/cares/cares/src/lib/ares_parse_ptr_reply.c",
"third_party/cares/cares/src/lib/ares_parse_ns_reply.c",
"third_party/cares/cares/src/lib/ares_parse_naptr_reply.c",
"third_party/cares/cares/src/lib/ares_parse_a_reply.c",
"third_party/cares/cares/src/lib/ares_send.c",
"third_party/cares/cares/src/lib/ares_nowarn.c",
"third_party/cares/cares/src/lib/ares__sortaddrinfo.c",
"third_party/cares/cares/src/lib/ares_android.c",
"third_party/cares/cares/src/lib/ares_strerror.c",
"third_party/cares/cares/src/lib/ares_parse_mx_reply.c",
"third_party/cares/cares/src/lib/ares_parse_caa_reply.c",
"third_party/cares/cares/src/lib/ares__close_sockets.c",
"third_party/cares/cares/src/lib/ares_options.c",
"third_party/cares/cares/src/lib/ares_nowarn.c",
"third_party/cares/cares/src/lib/ares_mkquery.c",
"third_party/cares/cares/src/lib/ares_llist.c",
"third_party/cares/cares/src/lib/ares_parse_aaaa_reply.c",
"third_party/cares/cares/src/lib/ares_getaddrinfo.c",
"third_party/cares/cares/src/lib/ares_parse_ns_reply.c",
"third_party/cares/cares/src/lib/windows_port.c",
"third_party/cares/cares/src/lib/ares_getsock.c",
"third_party/cares/cares/src/lib/ares_getnameinfo.c",
"third_party/cares/cares/src/lib/bitncmp.c",
"third_party/cares/cares/src/lib/ares_strsplit.c",
"third_party/cares/cares/src/lib/ares_data.c",
"third_party/cares/cares/src/lib/ares_free_hostent.c",
"third_party/cares/cares/src/lib/ares_platform.c",
"third_party/cares/cares/src/lib/ares_parse_txt_reply.c",
"third_party/cares/cares/src/lib/ares__parse_into_addrinfo.c",
"third_party/cares/cares/src/lib/ares_gethostbyaddr.c",
"third_party/cares/cares/src/lib/ares_parse_srv_reply.c",
"third_party/cares/cares/src/lib/ares_writev.c",
"third_party/cares/cares/src/lib/ares_version.c",
"third_party/cares/cares/src/lib/ares_getenv.c",
"third_party/cares/cares/src/lib/ares_timeout.c",
"third_party/cares/cares/src/lib/ares_strerror.c",
"third_party/cares/cares/src/lib/ares_strcasecmp.c",
"third_party/cares/cares/src/lib/ares_search.c",
"third_party/cares/cares/src/lib/ares_parse_mx_reply.c",
"third_party/cares/cares/src/lib/ares__get_hostent.c",
"third_party/cares/cares/src/lib/ares_platform.c",
"third_party/cares/cares/src/lib/windows_port.c",
"third_party/cares/cares/src/lib/inet_ntop.c",
"third_party/cares/cares/src/lib/ares__sortaddrinfo.c",
"third_party/cares/cares/src/lib/ares__readaddrinfo.c",
"third_party/cares/cares/src/lib/ares_parse_ptr_reply.c",
"third_party/cares/cares/src/lib/ares__read_line.c",
"third_party/cares/cares/src/lib/ares_query.c",
"third_party/cares/cares/src/lib/ares_options.c",
"third_party/cares/cares/src/lib/inet_net_pton.c",
"third_party/cares/cares/src/lib/ares_parse_uri_reply.c",
"third_party/cares/cares/src/lib/ares__parse_into_addrinfo.c",
"third_party/cares/cares/src/lib/ares_parse_a_reply.c",
"third_party/cares/cares/src/lib/ares_parse_aaaa_reply.c",
"third_party/cares/cares/src/lib/ares_library_init.c",
"third_party/cares/cares/src/lib/ares_init.c",
"third_party/cares/cares/src/lib/ares_gethostbyname.c",
"third_party/cares/cares/src/lib/ares_getaddrinfo.c",
"third_party/cares/cares/src/lib/ares_freeaddrinfo.c",
"third_party/cares/cares/src/lib/ares_expand_name.c",
"third_party/cares/cares/src/lib/inet_ntop.c",
"third_party/cares/cares/src/lib/ares_cancel.c",
"third_party/cares/cares/src/lib/ares_writev.c",
"third_party/cares/cares/src/lib/ares_destroy.c",
"third_party/cares/cares/src/lib/ares_data.c",
"third_party/cares/cares/src/lib/ares__addrinfo_localhost.c",
"third_party/cares/cares/src/lib/ares__addrinfo2hostent.c",
"third_party/cares/cares/src/lib/inet_net_pton.c",
"third_party/cares/cares/src/lib/ares_strsplit.c",
"third_party/cares/cares/src/lib/ares_strdup.c",
"third_party/cares/cares/src/lib/ares_send.c",
"third_party/cares/cares/src/lib/ares_rand.c",
"third_party/cares/cares/src/lib/ares_query.c",
"third_party/cares/cares/src/lib/ares_process.c",
],
'headers': [
"third_party/cares/ares_build.h",
"third_party/cares/cares/include/ares_version.h",
"third_party/cares/cares/include/ares.h",
"third_party/cares/cares/include/ares_rules.h",
"third_party/cares/cares/include/ares_dns.h",
"third_party/cares/cares/src/lib/ares_data.h",
"third_party/cares/cares/include/ares_nameser.h",
"third_party/cares/cares/src/tools/ares_getopt.h",
"third_party/cares/cares/src/lib/ares_strsplit.h",
"third_party/cares/cares/src/lib/ares_android.h",
"third_party/cares/cares/src/lib/ares_private.h",
"third_party/cares/cares/src/lib/ares_llist.h",
"third_party/cares/cares/src/lib/ares_platform.h",
"third_party/cares/cares/src/lib/ares_ipv6.h",
"third_party/cares/cares/src/lib/config-dos.h",
"third_party/cares/cares/src/lib/bitncmp.h",
"third_party/cares/cares/src/lib/ares_iphlpapi.h",
"third_party/cares/cares/src/lib/ares_strcasecmp.h",
"third_party/cares/cares/src/lib/setup_once.h",
"third_party/cares/cares/src/lib/ares_inet_net_pton.h",
"third_party/cares/cares/src/lib/ares_data.h",
"third_party/cares/cares/src/lib/ares_getenv.h",
"third_party/cares/cares/src/lib/ares_platform.h",
"third_party/cares/cares/src/lib/ares_writev.h",
"third_party/cares/cares/src/lib/ares_private.h",
"third_party/cares/cares/src/lib/ares_setup.h",
"third_party/cares/cares/src/lib/config-win32.h",
"third_party/cares/cares/src/lib/ares_strcasecmp.h",
"third_party/cares/cares/src/lib/setup_once.h",
"third_party/cares/cares/src/lib/ares_ipv6.h",
"third_party/cares/cares/src/lib/ares_library_init.h",
"third_party/cares/cares/src/lib/ares_nameser.h",
"third_party/cares/cares/src/lib/ares_strdup.h",
"third_party/cares/cares/src/lib/config-dos.h",
"third_party/cares/cares/src/lib/ares_llist.h",
"third_party/cares/cares/src/lib/ares_iphlpapi.h",
"third_party/cares/cares/src/lib/ares_setup.h",
"third_party/cares/cares/src/lib/ares_writev.h",
"third_party/cares/cares/src/lib/ares_nowarn.h",
"third_party/cares/cares/src/lib/ares_android.h",
"third_party/cares/config_darwin/ares_config.h",
"third_party/cares/config_freebsd/ares_config.h",
"third_party/cares/config_linux/ares_config.h",
"third_party/cares/config_openbsd/ares_config.h"
"third_party/cares/config_openbsd/ares_config.h",
],
}]
except:
Expand Down

0 comments on commit d5bafa4

Please sign in to comment.