deps: reflect c-ares source tree

c-ares refactored their source tree in 1.17.0 which we did not apply in our update to 1.17.1. This commit syncs our source with their new structure for easier maintenance going forward. cares.gyp is updated accordingly. Refs: c-ares/c-ares#349 Refs: #36207
BethGriggs · Aug 3, 2021 · Aug 3, 2021 · Aug 5, 2021 · 551aa34e1d28f2e38eb426ef35cdaac5a296967e
commit 551aa34e1d28f2e38eb426ef35cdaac5a296967e
diff --git a/deps/cares/src/AUTHORS → deps/cares/AUTHORS b/deps/cares/src/AUTHORS → deps/cares/AUTHORS
diff --git a/deps/cares/src/NEWS → deps/cares/NEWS b/deps/cares/src/NEWS → deps/cares/NEWS
diff --git a/deps/cares/src/README.cares → deps/cares/README.cares b/deps/cares/src/README.cares → deps/cares/README.cares
diff --git a/deps/cares/src/README.md → deps/cares/README.md b/deps/cares/src/README.md → deps/cares/README.md
diff --git a/deps/cares/src/README.msvc → deps/cares/README.msvc b/deps/cares/src/README.msvc → deps/cares/README.msvc
diff --git a/deps/cares/src/RELEASE-NOTES → deps/cares/RELEASE-NOTES b/deps/cares/src/RELEASE-NOTES → deps/cares/RELEASE-NOTES
diff --git a/deps/cares/src/TODO → deps/cares/TODO b/deps/cares/src/TODO → deps/cares/TODO
diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp
@@ -30,86 +30,86 @@
     {
       'target_name': 'cares',
       'type': '<(library)',
-      'include_dirs': [ 'include', 'src' ],
+      'include_dirs': [ 'include', 'src/lib' ],
       'direct_dependent_settings': {
-        'include_dirs': [ 'include' ]
+        'include_dirs': [ 'include', 'src/lib' ]
       },
       'sources': [
         'include/ares.h',
+        'include/ares_dns.h',
         'include/ares_rules.h',
         'include/ares_version.h',
-        'include/nameser.h',
-        'src/ares_android.c',
-        'src/ares_cancel.c',
-        'src/ares__close_sockets.c',
-        'src/ares_create_query.c',
-        'src/ares_data.c',
-        'src/ares_data.h',
-        'src/ares_destroy.c',
-        'src/ares_dns.h',
-        'src/ares_expand_name.c',
-        'src/ares_expand_string.c',
-        'src/ares_fds.c',
-        'src/ares_free_hostent.c',
-        'src/ares_free_string.c',
-        'src/ares_freeaddrinfo.c',
-        'src/ares_getenv.h',
-        'src/ares_getaddrinfo.c',
-        'src/ares_gethostbyaddr.c',
-        'src/ares_gethostbyname.c',
-        'src/ares__get_hostent.c',
-        'src/ares_getnameinfo.c',
-        'src/ares_getopt.c',
-        'src/ares_getopt.h',
-        'src/ares_getsock.c',
-        'src/ares_init.c',
-        'src/ares_ipv6.h',
-        'src/ares_library_init.c',
-        'src/ares_library_init.h',
-        'src/ares_llist.c',
-        'src/ares_llist.h',
-        'src/ares_mkquery.c',
-        'src/ares_nowarn.c',
-        'src/ares_nowarn.h',
-        'src/ares_options.c',
-        'src/ares__parse_into_addrinfo.c',
-        'src/ares_parse_aaaa_reply.c',
-        'src/ares_parse_a_reply.c',
-        'src/ares_parse_caa_reply.c',
-        'src/ares_parse_mx_reply.c',
-        'src/ares_parse_naptr_reply.c',
-        'src/ares_parse_ns_reply.c',
-        'src/ares_parse_ptr_reply.c',
-        'src/ares_parse_soa_reply.c',
-        'src/ares_parse_srv_reply.c',
-        'src/ares_parse_txt_reply.c',
-        'src/ares_platform.h',
-        'src/ares_private.h',
-        'src/ares_process.c',
-        'src/ares_query.c',
-        'src/ares__read_line.c',
-        'src/ares__readaddrinfo.c',
-        'src/ares_search.c',
-        'src/ares_send.c',
-        'src/ares_setup.h',
-        'src/ares__sortaddrinfo.c',
-        'src/ares_strcasecmp.c',
-        'src/ares_strcasecmp.h',
-        'src/ares_strdup.c',
-        'src/ares_strdup.h',
-        'src/ares_strerror.c',
-        'src/ares_strsplit.c',
-        'src/ares_timeout.c',
-        'src/ares__timeval.c',
-        'src/ares_version.c',
-        'src/ares_writev.c',
-        'src/ares_writev.h',
-        'src/bitncmp.c',
-        'src/bitncmp.h',
-        'src/inet_net_pton.c',
-        'src/inet_ntop.c',
-        'src/ares_inet_net_pton.h',
-        'src/setup_once.h',
+        'src/lib/ares_android.c',
+        'src/lib/ares_cancel.c',
+        'src/lib/ares__close_sockets.c',
+        'src/lib/ares_create_query.c',
+        'src/lib/ares_data.c',
+        'src/lib/ares_data.h',
+        'src/lib/ares_destroy.c',
+        'src/lib/ares_expand_name.c',
+        'src/lib/ares_expand_string.c',
+        'src/lib/ares_fds.c',
+        'src/lib/ares_free_hostent.c',
+        'src/lib/ares_free_string.c',
+        'src/lib/ares_freeaddrinfo.c',
+        'src/lib/ares_getenv.h',
+        'src/lib/ares_getaddrinfo.c',
+        'src/lib/ares_gethostbyaddr.c',
+        'src/lib/ares_gethostbyname.c',
+        'src/lib/ares__get_hostent.c',
+        'src/lib/ares_getnameinfo.c',
+        'src/lib/ares_getsock.c',
+        'src/lib/ares_init.c',
+        'src/lib/ares_ipv6.h',
+        'src/lib/ares_library_init.c',
+        'src/lib/ares_library_init.h',
+        'src/lib/ares_llist.c',
+        'src/lib/ares_llist.h',
+        'src/lib/ares_mkquery.c',
+        'src/lib/ares_nowarn.c',
+        'src/lib/ares_nowarn.h',
+        'src/lib/ares_options.c',
+        'src/lib/ares__parse_into_addrinfo.c',
+        'src/lib/ares_parse_aaaa_reply.c',
+        'src/lib/ares_parse_a_reply.c',
+        'src/lib/ares_parse_caa_reply.c',
+        'src/lib/ares_parse_mx_reply.c',
+        'src/lib/ares_parse_naptr_reply.c',
+        'src/lib/ares_parse_ns_reply.c',
+        'src/lib/ares_parse_ptr_reply.c',
+        'src/lib/ares_parse_soa_reply.c',
+        'src/lib/ares_parse_srv_reply.c',
+        'src/lib/ares_parse_txt_reply.c',
+        'src/lib/ares_platform.h',
+        'src/lib/ares_private.h',
+        'src/lib/ares_process.c',
+        'src/lib/ares_query.c',
+        'src/lib/ares__read_line.c',
+        'src/lib/ares__readaddrinfo.c',
+        'src/lib/ares_search.c',
+        'src/lib/ares_send.c',
+        'src/lib/ares_setup.h',
+        'src/lib/ares__sortaddrinfo.c',
+        'src/lib/ares_strcasecmp.c',
+        'src/lib/ares_strcasecmp.h',
+        'src/lib/ares_strdup.c',
+        'src/lib/ares_strdup.h',
+        'src/lib/ares_strerror.c',
+        'src/lib/ares_strsplit.c',
+        'src/lib/ares_timeout.c',
+        'src/lib/ares__timeval.c',
+        'src/lib/ares_version.c',
+        'src/lib/ares_writev.c',
+        'src/lib/ares_writev.h',
+        'src/lib/bitncmp.c',
+        'src/lib/bitncmp.h',
+        'src/lib/inet_net_pton.c',
+        'src/lib/inet_ntop.c',
+        'src/lib/ares_inet_net_pton.h',
+        'src/lib/nameser.h',
+        'src/lib/setup_once.h',
+        'src/tools/ares_getopt.c',
+        'src/tools/ares_getopt.h',
       ],
       'conditions': [
         [ 'library=="static_library"', {
@@ -124,11 +124,11 @@
           ],
           'include_dirs': [ 'config/win32' ],
           'sources': [
-            'src/config-win32.h',
-            'src/windows_port.c',
-            'src/ares_getenv.c',
-            'src/ares_iphlpapi.h',
-            'src/ares_platform.c'
+            'src/lib/config-win32.h',
+            'src/lib/windows_port.c',
+            'src/lib/ares_getenv.c',
+            'src/lib/ares_iphlpapi.h',
+            'src/lib/ares_platform.c'
           ],
           'libraries': [
             '-lws2_32.lib',

diff --git a/deps/cares/src/ares_dns.h → deps/cares/include/ares_dns.h b/deps/cares/src/ares_dns.h → deps/cares/include/ares_dns.h
diff --git a/deps/cares/src/ares__close_sockets.c → deps/cares/src/lib/ares__close_sockets.c b/deps/cares/src/ares__close_sockets.c → deps/cares/src/lib/ares__close_sockets.c
diff --git a/deps/cares/src/ares__get_hostent.c → deps/cares/src/lib/ares__get_hostent.c b/deps/cares/src/ares__get_hostent.c → deps/cares/src/lib/ares__get_hostent.c
diff --git a/deps/cares/src/ares__parse_into_addrinfo.c → ...cares/src/lib/ares__parse_into_addrinfo.c b/deps/cares/src/ares__parse_into_addrinfo.c → ...cares/src/lib/ares__parse_into_addrinfo.c
diff --git a/deps/cares/src/ares__read_line.c → deps/cares/src/lib/ares__read_line.c b/deps/cares/src/ares__read_line.c → deps/cares/src/lib/ares__read_line.c
diff --git a/deps/cares/src/ares__readaddrinfo.c → deps/cares/src/lib/ares__readaddrinfo.c b/deps/cares/src/ares__readaddrinfo.c → deps/cares/src/lib/ares__readaddrinfo.c
diff --git a/deps/cares/src/ares__sortaddrinfo.c → deps/cares/src/lib/ares__sortaddrinfo.c b/deps/cares/src/ares__sortaddrinfo.c → deps/cares/src/lib/ares__sortaddrinfo.c
diff --git a/deps/cares/src/ares__timeval.c → deps/cares/src/lib/ares__timeval.c b/deps/cares/src/ares__timeval.c → deps/cares/src/lib/ares__timeval.c
diff --git a/deps/cares/src/ares_android.c → deps/cares/src/lib/ares_android.c b/deps/cares/src/ares_android.c → deps/cares/src/lib/ares_android.c
diff --git a/deps/cares/src/ares_android.h → deps/cares/src/lib/ares_android.h b/deps/cares/src/ares_android.h → deps/cares/src/lib/ares_android.h
diff --git a/deps/cares/src/ares_cancel.c → deps/cares/src/lib/ares_cancel.c b/deps/cares/src/ares_cancel.c → deps/cares/src/lib/ares_cancel.c
diff --git a/deps/cares/src/ares_create_query.c → deps/cares/src/lib/ares_create_query.c b/deps/cares/src/ares_create_query.c → deps/cares/src/lib/ares_create_query.c
diff --git a/deps/cares/src/ares_data.c → deps/cares/src/lib/ares_data.c b/deps/cares/src/ares_data.c → deps/cares/src/lib/ares_data.c
diff --git a/deps/cares/src/ares_data.h → deps/cares/src/lib/ares_data.h b/deps/cares/src/ares_data.h → deps/cares/src/lib/ares_data.h
diff --git a/deps/cares/src/ares_destroy.c → deps/cares/src/lib/ares_destroy.c b/deps/cares/src/ares_destroy.c → deps/cares/src/lib/ares_destroy.c
diff --git a/deps/cares/src/ares_expand_name.c → deps/cares/src/lib/ares_expand_name.c b/deps/cares/src/ares_expand_name.c → deps/cares/src/lib/ares_expand_name.c
diff --git a/deps/cares/src/ares_expand_string.c → deps/cares/src/lib/ares_expand_string.c b/deps/cares/src/ares_expand_string.c → deps/cares/src/lib/ares_expand_string.c
diff --git a/deps/cares/src/ares_fds.c → deps/cares/src/lib/ares_fds.c b/deps/cares/src/ares_fds.c → deps/cares/src/lib/ares_fds.c
diff --git a/deps/cares/src/ares_free_hostent.c → deps/cares/src/lib/ares_free_hostent.c b/deps/cares/src/ares_free_hostent.c → deps/cares/src/lib/ares_free_hostent.c
diff --git a/deps/cares/src/ares_free_string.c → deps/cares/src/lib/ares_free_string.c b/deps/cares/src/ares_free_string.c → deps/cares/src/lib/ares_free_string.c
diff --git a/deps/cares/src/ares_freeaddrinfo.c → deps/cares/src/lib/ares_freeaddrinfo.c b/deps/cares/src/ares_freeaddrinfo.c → deps/cares/src/lib/ares_freeaddrinfo.c
diff --git a/deps/cares/src/ares_getaddrinfo.c → deps/cares/src/lib/ares_getaddrinfo.c b/deps/cares/src/ares_getaddrinfo.c → deps/cares/src/lib/ares_getaddrinfo.c
diff --git a/deps/cares/src/ares_getenv.c → deps/cares/src/lib/ares_getenv.c b/deps/cares/src/ares_getenv.c → deps/cares/src/lib/ares_getenv.c
diff --git a/deps/cares/src/ares_getenv.h → deps/cares/src/lib/ares_getenv.h b/deps/cares/src/ares_getenv.h → deps/cares/src/lib/ares_getenv.h
diff --git a/deps/cares/src/ares_gethostbyaddr.c → deps/cares/src/lib/ares_gethostbyaddr.c b/deps/cares/src/ares_gethostbyaddr.c → deps/cares/src/lib/ares_gethostbyaddr.c
diff --git a/deps/cares/src/ares_gethostbyname.c → deps/cares/src/lib/ares_gethostbyname.c b/deps/cares/src/ares_gethostbyname.c → deps/cares/src/lib/ares_gethostbyname.c
diff --git a/deps/cares/src/ares_getnameinfo.c → deps/cares/src/lib/ares_getnameinfo.c b/deps/cares/src/ares_getnameinfo.c → deps/cares/src/lib/ares_getnameinfo.c
diff --git a/deps/cares/src/ares_getsock.c → deps/cares/src/lib/ares_getsock.c b/deps/cares/src/ares_getsock.c → deps/cares/src/lib/ares_getsock.c
diff --git a/deps/cares/src/ares_inet_net_pton.h → deps/cares/src/lib/ares_inet_net_pton.h b/deps/cares/src/ares_inet_net_pton.h → deps/cares/src/lib/ares_inet_net_pton.h
diff --git a/deps/cares/src/ares_init.c → deps/cares/src/lib/ares_init.c b/deps/cares/src/ares_init.c → deps/cares/src/lib/ares_init.c
diff --git a/deps/cares/src/ares_iphlpapi.h → deps/cares/src/lib/ares_iphlpapi.h b/deps/cares/src/ares_iphlpapi.h → deps/cares/src/lib/ares_iphlpapi.h
diff --git a/deps/cares/src/ares_ipv6.h → deps/cares/src/lib/ares_ipv6.h b/deps/cares/src/ares_ipv6.h → deps/cares/src/lib/ares_ipv6.h
diff --git a/deps/cares/src/ares_library_init.c → deps/cares/src/lib/ares_library_init.c b/deps/cares/src/ares_library_init.c → deps/cares/src/lib/ares_library_init.c
diff --git a/deps/cares/src/ares_library_init.h → deps/cares/src/lib/ares_library_init.h b/deps/cares/src/ares_library_init.h → deps/cares/src/lib/ares_library_init.h
diff --git a/deps/cares/src/ares_llist.c → deps/cares/src/lib/ares_llist.c b/deps/cares/src/ares_llist.c → deps/cares/src/lib/ares_llist.c
diff --git a/deps/cares/src/ares_llist.h → deps/cares/src/lib/ares_llist.h b/deps/cares/src/ares_llist.h → deps/cares/src/lib/ares_llist.h
diff --git a/deps/cares/src/ares_mkquery.c → deps/cares/src/lib/ares_mkquery.c b/deps/cares/src/ares_mkquery.c → deps/cares/src/lib/ares_mkquery.c
diff --git a/deps/cares/src/ares_nowarn.c → deps/cares/src/lib/ares_nowarn.c b/deps/cares/src/ares_nowarn.c → deps/cares/src/lib/ares_nowarn.c
diff --git a/deps/cares/src/ares_nowarn.h → deps/cares/src/lib/ares_nowarn.h b/deps/cares/src/ares_nowarn.h → deps/cares/src/lib/ares_nowarn.h
diff --git a/deps/cares/src/ares_options.c → deps/cares/src/lib/ares_options.c b/deps/cares/src/ares_options.c → deps/cares/src/lib/ares_options.c
diff --git a/deps/cares/src/ares_parse_a_reply.c → deps/cares/src/lib/ares_parse_a_reply.c b/deps/cares/src/ares_parse_a_reply.c → deps/cares/src/lib/ares_parse_a_reply.c
diff --git a/deps/cares/src/ares_parse_aaaa_reply.c → deps/cares/src/lib/ares_parse_aaaa_reply.c b/deps/cares/src/ares_parse_aaaa_reply.c → deps/cares/src/lib/ares_parse_aaaa_reply.c
diff --git a/deps/cares/src/ares_parse_caa_reply.c → deps/cares/src/lib/ares_parse_caa_reply.c b/deps/cares/src/ares_parse_caa_reply.c → deps/cares/src/lib/ares_parse_caa_reply.c
diff --git a/deps/cares/src/ares_parse_mx_reply.c → deps/cares/src/lib/ares_parse_mx_reply.c b/deps/cares/src/ares_parse_mx_reply.c → deps/cares/src/lib/ares_parse_mx_reply.c
diff --git a/deps/cares/src/ares_parse_naptr_reply.c → deps/cares/src/lib/ares_parse_naptr_reply.c b/deps/cares/src/ares_parse_naptr_reply.c → deps/cares/src/lib/ares_parse_naptr_reply.c
diff --git a/deps/cares/src/ares_parse_ns_reply.c → deps/cares/src/lib/ares_parse_ns_reply.c b/deps/cares/src/ares_parse_ns_reply.c → deps/cares/src/lib/ares_parse_ns_reply.c
diff --git a/deps/cares/src/ares_parse_ptr_reply.c → deps/cares/src/lib/ares_parse_ptr_reply.c b/deps/cares/src/ares_parse_ptr_reply.c → deps/cares/src/lib/ares_parse_ptr_reply.c
diff --git a/deps/cares/src/ares_parse_soa_reply.c → deps/cares/src/lib/ares_parse_soa_reply.c b/deps/cares/src/ares_parse_soa_reply.c → deps/cares/src/lib/ares_parse_soa_reply.c
diff --git a/deps/cares/src/ares_parse_srv_reply.c → deps/cares/src/lib/ares_parse_srv_reply.c b/deps/cares/src/ares_parse_srv_reply.c → deps/cares/src/lib/ares_parse_srv_reply.c
diff --git a/deps/cares/src/ares_parse_txt_reply.c → deps/cares/src/lib/ares_parse_txt_reply.c b/deps/cares/src/ares_parse_txt_reply.c → deps/cares/src/lib/ares_parse_txt_reply.c
diff --git a/deps/cares/src/ares_platform.c → deps/cares/src/lib/ares_platform.c b/deps/cares/src/ares_platform.c → deps/cares/src/lib/ares_platform.c
diff --git a/deps/cares/src/ares_platform.h → deps/cares/src/lib/ares_platform.h b/deps/cares/src/ares_platform.h → deps/cares/src/lib/ares_platform.h
diff --git a/deps/cares/src/ares_private.h → deps/cares/src/lib/ares_private.h b/deps/cares/src/ares_private.h → deps/cares/src/lib/ares_private.h
diff --git a/deps/cares/src/ares_process.c → deps/cares/src/lib/ares_process.c b/deps/cares/src/ares_process.c → deps/cares/src/lib/ares_process.c
diff --git a/deps/cares/src/ares_query.c → deps/cares/src/lib/ares_query.c b/deps/cares/src/ares_query.c → deps/cares/src/lib/ares_query.c
diff --git a/deps/cares/src/ares_search.c → deps/cares/src/lib/ares_search.c b/deps/cares/src/ares_search.c → deps/cares/src/lib/ares_search.c
diff --git a/deps/cares/src/ares_send.c → deps/cares/src/lib/ares_send.c b/deps/cares/src/ares_send.c → deps/cares/src/lib/ares_send.c
diff --git a/deps/cares/src/ares_setup.h → deps/cares/src/lib/ares_setup.h b/deps/cares/src/ares_setup.h → deps/cares/src/lib/ares_setup.h
diff --git a/deps/cares/src/ares_strcasecmp.c → deps/cares/src/lib/ares_strcasecmp.c b/deps/cares/src/ares_strcasecmp.c → deps/cares/src/lib/ares_strcasecmp.c
diff --git a/deps/cares/src/ares_strcasecmp.h → deps/cares/src/lib/ares_strcasecmp.h b/deps/cares/src/ares_strcasecmp.h → deps/cares/src/lib/ares_strcasecmp.h
diff --git a/deps/cares/src/ares_strdup.c → deps/cares/src/lib/ares_strdup.c b/deps/cares/src/ares_strdup.c → deps/cares/src/lib/ares_strdup.c
diff --git a/deps/cares/src/ares_strdup.h → deps/cares/src/lib/ares_strdup.h b/deps/cares/src/ares_strdup.h → deps/cares/src/lib/ares_strdup.h
diff --git a/deps/cares/src/ares_strerror.c → deps/cares/src/lib/ares_strerror.c b/deps/cares/src/ares_strerror.c → deps/cares/src/lib/ares_strerror.c
diff --git a/deps/cares/src/ares_strsplit.c → deps/cares/src/lib/ares_strsplit.c b/deps/cares/src/ares_strsplit.c → deps/cares/src/lib/ares_strsplit.c
diff --git a/deps/cares/src/ares_strsplit.h → deps/cares/src/lib/ares_strsplit.h b/deps/cares/src/ares_strsplit.h → deps/cares/src/lib/ares_strsplit.h
diff --git a/deps/cares/src/ares_timeout.c → deps/cares/src/lib/ares_timeout.c b/deps/cares/src/ares_timeout.c → deps/cares/src/lib/ares_timeout.c
diff --git a/deps/cares/src/ares_version.c → deps/cares/src/lib/ares_version.c b/deps/cares/src/ares_version.c → deps/cares/src/lib/ares_version.c
diff --git a/deps/cares/src/ares_writev.c → deps/cares/src/lib/ares_writev.c b/deps/cares/src/ares_writev.c → deps/cares/src/lib/ares_writev.c
diff --git a/deps/cares/src/ares_writev.h → deps/cares/src/lib/ares_writev.h b/deps/cares/src/ares_writev.h → deps/cares/src/lib/ares_writev.h
diff --git a/deps/cares/src/bitncmp.c → deps/cares/src/lib/bitncmp.c b/deps/cares/src/bitncmp.c → deps/cares/src/lib/bitncmp.c
diff --git a/deps/cares/src/bitncmp.h → deps/cares/src/lib/bitncmp.h b/deps/cares/src/bitncmp.h → deps/cares/src/lib/bitncmp.h
diff --git a/deps/cares/src/config-win32.h → deps/cares/src/lib/config-win32.h b/deps/cares/src/config-win32.h → deps/cares/src/lib/config-win32.h
diff --git a/deps/cares/src/inet_net_pton.c → deps/cares/src/lib/inet_net_pton.c b/deps/cares/src/inet_net_pton.c → deps/cares/src/lib/inet_net_pton.c
diff --git a/deps/cares/src/inet_ntop.c → deps/cares/src/lib/inet_ntop.c b/deps/cares/src/inet_ntop.c → deps/cares/src/lib/inet_ntop.c
diff --git a/deps/cares/include/nameser.h → deps/cares/src/lib/nameser.h b/deps/cares/include/nameser.h → deps/cares/src/lib/nameser.h
diff --git a/deps/cares/src/setup_once.h → deps/cares/src/lib/setup_once.h b/deps/cares/src/setup_once.h → deps/cares/src/lib/setup_once.h
diff --git a/deps/cares/src/windows_port.c → deps/cares/src/lib/windows_port.c b/deps/cares/src/windows_port.c → deps/cares/src/lib/windows_port.c
diff --git a/deps/cares/src/ares_getopt.c → deps/cares/src/tools/ares_getopt.c b/deps/cares/src/ares_getopt.c → deps/cares/src/tools/ares_getopt.c
diff --git a/deps/cares/src/ares_getopt.h → deps/cares/src/tools/ares_getopt.h b/deps/cares/src/ares_getopt.h → deps/cares/src/tools/ares_getopt.h