Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade c-ares to 1.17.2 #28671

Merged
merged 12 commits into from
Jan 25, 2022
Merged

Upgrade c-ares to 1.17.2 #28671

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2bcce7b
update deps
apolcyn Jan 25, 2022
a592dae
update .gitmoculdes
apolcyn Jan 25, 2022
21b3e3b
update files
apolcyn Jan 25, 2022
8983009
regen projects
apolcyn Jan 25, 2022
a3e4c32
bazel build works
apolcyn Jan 25, 2022
bc9a90b
update and regen
apolcyn Jan 25, 2022
02223f5
update and regen
apolcyn Jan 25, 2022
ab1800c
fix header finding
apolcyn Jan 25, 2022
d88e9ca
fix python include
apolcyn Jan 25, 2022
21cfa96
fix python
apolcyn Jan 25, 2022
4793474
add missing sources
apolcyn Jan 25, 2022
65498f0
regen
apolcyn Jan 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update files
  • Loading branch information
@apolcyn
apolcyn committed Jan 25, 2022
commit 21b3e3bb6d1da05e5686f0420cd637fa8dd78fc7
151 changes: 77 additions & 74 deletions src/c-ares/gen_build_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ def config_platform(x):
def ares_build(x):
if os.path.isfile('src/cares/cares/ares_build.h'):
return 'src/cares/cares/ares_build.h'
if not os.path.isfile('third_party/cares/cares/ares_build.h'):
if not os.path.isfile('third_party/cares/cares/include/ares_build.h'):
gen_ares_build(x)
return 'third_party/cares/cares/ares_build.h'
return 'third_party/cares/cares/include/ares_build.h'

out['libs'] = [{
'name':
Expand All @@ -61,81 +61,84 @@ def ares_build(x):
'secure':
False,
'src': [
"third_party/cares/cares/ares__close_sockets.c",
"third_party/cares/cares/ares__get_hostent.c",
"third_party/cares/cares/ares__read_line.c",
"third_party/cares/cares/ares__timeval.c",
"third_party/cares/cares/ares_cancel.c",
"third_party/cares/cares/ares_create_query.c",
"third_party/cares/cares/ares_data.c",
"third_party/cares/cares/ares_destroy.c",
"third_party/cares/cares/ares_expand_name.c",
"third_party/cares/cares/ares_expand_string.c",
"third_party/cares/cares/ares_fds.c",
"third_party/cares/cares/ares_free_hostent.c",
"third_party/cares/cares/ares_free_string.c",
"third_party/cares/cares/ares_getenv.c",
"third_party/cares/cares/ares_gethostbyaddr.c",
"third_party/cares/cares/ares_gethostbyname.c",
"third_party/cares/cares/ares_getnameinfo.c",
"third_party/cares/cares/ares_getopt.c",
"third_party/cares/cares/ares_getsock.c",
"third_party/cares/cares/ares_init.c",
"third_party/cares/cares/ares_library_init.c",
"third_party/cares/cares/ares_llist.c",
"third_party/cares/cares/ares_mkquery.c",
"third_party/cares/cares/ares_nowarn.c",
"third_party/cares/cares/ares_options.c",
"third_party/cares/cares/ares_parse_a_reply.c",
"third_party/cares/cares/ares_parse_aaaa_reply.c",
"third_party/cares/cares/ares_parse_mx_reply.c",
"third_party/cares/cares/ares_parse_naptr_reply.c",
"third_party/cares/cares/ares_parse_ns_reply.c",
"third_party/cares/cares/ares_parse_ptr_reply.c",
"third_party/cares/cares/ares_parse_soa_reply.c",
"third_party/cares/cares/ares_parse_srv_reply.c",
"third_party/cares/cares/ares_parse_txt_reply.c",
"third_party/cares/cares/ares_platform.c",
"third_party/cares/cares/ares_process.c",
"third_party/cares/cares/ares_query.c",
"third_party/cares/cares/ares_search.c",
"third_party/cares/cares/ares_send.c",
"third_party/cares/cares/ares_strcasecmp.c",
"third_party/cares/cares/ares_strdup.c",
"third_party/cares/cares/ares_strerror.c",
"third_party/cares/cares/ares_strsplit.c",
"third_party/cares/cares/ares_timeout.c",
"third_party/cares/cares/ares_version.c",
"third_party/cares/cares/ares_writev.c",
"third_party/cares/cares/bitncmp.c",
"third_party/cares/cares/inet_net_pton.c",
"third_party/cares/cares/inet_ntop.c",
"third_party/cares/cares/windows_port.c",
"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__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_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_parse_soa_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_caa_reply.c",
"third_party/cares/cares/src/lib/ares__close_sockets.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/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_version.c",
"third_party/cares/cares/src/lib/ares_getenv.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__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",
],
'headers': [
"third_party/cares/cares/ares.h",
"third_party/cares/cares/ares_data.h",
"third_party/cares/cares/ares_dns.h",
"third_party/cares/cares/ares_getenv.h",
"third_party/cares/cares/ares_getopt.h",
"third_party/cares/cares/ares_inet_net_pton.h",
"third_party/cares/cares/ares_iphlpapi.h",
"third_party/cares/cares/ares_ipv6.h",
"third_party/cares/cares/ares_library_init.h",
"third_party/cares/cares/ares_llist.h",
"third_party/cares/cares/ares_nowarn.h",
"third_party/cares/cares/ares_platform.h",
"third_party/cares/cares/ares_private.h",
"third_party/cares/cares/ares_rules.h",
"third_party/cares/cares/ares_setup.h",
"third_party/cares/cares/ares_strcasecmp.h",
"third_party/cares/cares/ares_strdup.h",
"third_party/cares/cares/ares_strsplit.h",
"third_party/cares/cares/ares_version.h",
"third_party/cares/cares/bitncmp.h",
"third_party/cares/cares/config-win32.h",
"third_party/cares/cares/setup_once.h",
"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/src/lib/ares_strsplit.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_inet_net_pton.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_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",
Expand Down
157 changes: 81 additions & 76 deletions third_party/cares/cares.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,86 +121,91 @@ copy_file(
cc_library(
name = "ares",
srcs = [
"ares__close_sockets.c",
"ares__get_hostent.c",
"ares__read_line.c",
"ares__timeval.c",
"ares_android.c",
"ares_cancel.c",
"ares_create_query.c",
"ares_data.c",
"ares_destroy.c",
"ares_expand_name.c",
"ares_expand_string.c",
"ares_fds.c",
"ares_free_hostent.c",
"ares_free_string.c",
"ares_getenv.c",
"ares_gethostbyaddr.c",
"ares_gethostbyname.c",
"ares_getnameinfo.c",
"ares_getopt.c",
"ares_getsock.c",
"ares_init.c",
"ares_library_init.c",
"ares_llist.c",
"ares_mkquery.c",
"ares_nowarn.c",
"ares_options.c",
"ares_parse_a_reply.c",
"ares_parse_aaaa_reply.c",
"ares_parse_mx_reply.c",
"ares_parse_naptr_reply.c",
"ares_parse_ns_reply.c",
"ares_parse_ptr_reply.c",
"ares_parse_soa_reply.c",
"ares_parse_srv_reply.c",
"ares_parse_txt_reply.c",
"ares_platform.c",
"ares_process.c",
"ares_query.c",
"ares_search.c",
"ares_send.c",
"ares_strcasecmp.c",
"ares_strdup.c",
"ares_strsplit.c",
"ares_strerror.c",
"ares_timeout.c",
"ares_version.c",
"ares_writev.c",
"bitncmp.c",
"inet_net_pton.c",
"inet_ntop.c",
"windows_port.c",
"src/lib/ares_init.c",
"src/lib/ares_expand_string.c",
"src/lib/ares_strcasecmp.c",
"src/lib/ares_destroy.c",
"src/lib/ares_free_string.c",
"src/lib/ares__timeval.c",
"src/lib/ares_library_init.c",
"src/lib/ares_getsock.c",
"src/lib/ares_process.c",
"src/lib/ares_create_query.c",
"src/lib/ares_fds.c",
"src/lib/ares_gethostbyname.c",
"src/lib/ares_mkquery.c",
"src/lib/ares_freeaddrinfo.c",
"src/lib/ares_strdup.c",
"src/lib/ares_timeout.c",
"src/lib/ares_getnameinfo.c",
"src/lib/ares_parse_soa_reply.c",
"src/lib/ares_parse_naptr_reply.c",
"src/lib/ares_parse_a_reply.c",
"src/lib/ares_send.c",
"src/lib/ares_nowarn.c",
"src/lib/ares__sortaddrinfo.c",
"src/lib/ares_android.c",
"src/lib/ares_strerror.c",
"src/lib/ares_parse_caa_reply.c",
"src/lib/ares__close_sockets.c",
"src/lib/ares_llist.c",
"src/lib/ares_parse_aaaa_reply.c",
"src/lib/ares_getaddrinfo.c",
"src/lib/ares_parse_ns_reply.c",
"src/lib/windows_port.c",
"src/lib/bitncmp.c",
"src/lib/ares_strsplit.c",
"src/lib/ares_data.c",
"src/lib/ares_free_hostent.c",
"src/lib/ares_platform.c",
"src/lib/ares_parse_txt_reply.c",
"src/lib/ares__parse_into_addrinfo.c",
"src/lib/ares_gethostbyaddr.c",
"src/lib/ares_parse_srv_reply.c",
"src/lib/ares_version.c",
"src/lib/ares_getenv.c",
"src/lib/ares_search.c",
"src/lib/ares_parse_mx_reply.c",
"src/lib/ares__get_hostent.c",
"src/lib/ares__readaddrinfo.c",
"src/lib/ares_parse_ptr_reply.c",
"src/lib/ares__read_line.c",
"src/lib/ares_query.c",
"src/lib/ares_options.c",
"src/lib/inet_net_pton.c",
"src/lib/ares_expand_name.c",
"src/lib/inet_ntop.c",
"src/lib/ares_cancel.c",
"src/lib/ares_writev.c",
],
hdrs = [
"ares.h",
"ares_android.h",
"ares_build.h",
"ares_config.h",
"ares_data.h",
"ares_dns.h",
"ares_getenv.h",
"ares_getopt.h",
"ares_inet_net_pton.h",
"ares_iphlpapi.h",
"ares_ipv6.h",
"ares_library_init.h",
"ares_llist.h",
"ares_nowarn.h",
"ares_platform.h",
"ares_private.h",
"ares_rules.h",
"ares_setup.h",
"ares_strcasecmp.h",
"ares_strdup.h",
"ares_strsplit.h",
"ares_version.h",
"ares_writev.h",
"bitncmp.h",
"config-win32.h",
"nameser.h",
"setup_once.h",
"include/ares_version.h",
"include/ares.h",
"include/ares_rules.h",
"include/ares_dns.h",
"src/lib/ares_data.h",
"src/lib/ares_strsplit.h",
"src/lib/bitncmp.h",
"src/lib/ares_iphlpapi.h",
"src/lib/ares_inet_net_pton.h",
"src/lib/ares_getenv.h",
"src/lib/ares_platform.h",
"src/lib/ares_writev.h",
"src/lib/ares_private.h",
"src/lib/ares_setup.h",
"src/lib/config-win32.h",
"src/lib/ares_strcasecmp.h",
"src/lib/setup_once.h",
"src/lib/ares_ipv6.h",
"src/lib/ares_library_init.h",
"src/lib/ares_nameser.h",
"src/lib/ares_strdup.h",
"src/lib/config-dos.h",
"src/lib/ares_llist.h",
"src/lib/ares_nowarn.h",
"src/lib/ares_android.h",
],
copts = [
"-D_GNU_SOURCE",
Expand Down