external: Update c-ares to version 1.17.2

4 files changed, 124 insertions, 93 deletions

diff --git a/etc/import/TARGETS.cares b/etc/import/TARGETS.cares
index d361a780..91d4271d 100644
--- a/etc/import/TARGETS.cares
+++ b/etc/import/TARGETS.cares
@@ -1,6 +1,6 @@
 { "ares":
   { "type": "export"
-  , "target": "ares_lib"
+  , "target": ["src/lib", "ares_lib"]
   , "flexible_config":
     [ "OS"
     , "ARCH"
@@ -15,91 +15,4 @@
     , "BUILD_POSITION_INDEPENDENT"
     ]
   }
-, "ares_lib":
-  { "type": ["@", "rules", "CC", "library"]
-  , "name": ["libcares"]
-  , "pure C": ["YES"]
-  , "private-defines":
-    ["_GNU_SOURCE", "_HAS_EXCEPTIONS=0", "HAVE_CONFIG_H", "CARES_STATICLIB"]
-  , "srcs":
-    [ "ares__close_sockets.c"
-    , "ares__get_hostent.c"
-    , "ares__read_line.c"
-    , "ares__timeval.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"
-    ]
-  , "hdrs":
-    [ "ares.h"
-    , ["@", "grpc", "third_party", "ares_build_h"]
-    , ["@", "grpc", "third_party", "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"
-    ]
-  }
 }
diff --git a/etc/import/include/TARGETS.cares b/etc/import/include/TARGETS.cares
new file mode 100644
index 00000000..d93c2929
--- /dev/null
+++ b/etc/import/include/TARGETS.cares
@@ -0,0 +1,5 @@
+{ "ares_include_headers":
+  { "type": ["@", "rules", "data", "staged"]
+  , "srcs": ["ares.h", "ares_dns.h", "ares_rules.h", "ares_version.h"]
+  }
+}
diff --git a/etc/import/src/lib/TARGETS.cares b/etc/import/src/lib/TARGETS.cares
new file mode 100644
index 00000000..94431fd1
--- /dev/null
+++ b/etc/import/src/lib/TARGETS.cares
@@ -0,0 +1,113 @@
+{ "ares_lib":
+  { "type": ["@", "rules", "CC", "library"]
+  , "arguments_config": ["OS"]
+  , "name": ["libcares"]
+  , "pure C": ["YES"]
+  , "private-defines":
+    { "type": "++"
+    , "$1":
+      [ ["HAVE_CONFIG_H", "CARES_STATICLIB"]
+      , { "type": "case"
+        , "expr": {"type": "var", "name": "OS"}
+        , "case":
+          { "darwin": ["_DARWIN_C_SOURCE"]
+          , "linux":
+            ["_GNU_SOURCE", "_POSIX_C_SOURCE=199309L", "_XOPEN_SOURCE=600"]
+          , "sunos": ["__EXTENSIONS__", "_REENTRANT", "_XOPEN_SOURCE=600"]
+          , "aix": ["_ALL_SOURCE", "_XOPEN_SOURCE=600", "_USE_IRS"]
+          , "windows":
+            [ "WIN32_LEAN_AND_MEAN"
+            , "_CRT_SECURE_NO_DEPRECATE"
+            , "_CRT_NONSTDC_NO_DEPRECATE"
+            , "_WIN32_WINNT=0x0600"
+            ]
+          }
+        }
+      ]
+    }
+  , "srcs":
+    [ "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_freeaddrinfo.c"
+    , "ares_free_hostent.c"
+    , "ares_free_string.c"
+    , "ares_getaddrinfo.c"
+    , "ares_getenv.c"
+    , "ares_gethostbyaddr.c"
+    , "ares_gethostbyname.c"
+    , "ares_getnameinfo.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_aaaa_reply.c"
+    , "ares_parse_a_reply.c"
+    , "ares_parse_caa_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_strerror.c"
+    , "ares_strsplit.c"
+    , "ares_timeout.c"
+    , "ares_version.c"
+    , "ares_writev.c"
+    , "ares__close_sockets.c"
+    , "ares__get_hostent.c"
+    , "ares__parse_into_addrinfo.c"
+    , "ares__readaddrinfo.c"
+    , "ares__read_line.c"
+    , "ares__sortaddrinfo.c"
+    , "ares__timeval.c"
+    , "bitncmp.c"
+    , "inet_net_pton.c"
+    , "inet_ntop.c"
+    , "windows_port.c"
+    ]
+  , "hdrs":
+    [ ["@", "grpc", "third_party", "ares_build_h"]
+    , ["@", "grpc", "third_party", "ares_config_h"]
+    , ["include", "ares_include_headers"]
+    , "ares_android.h"
+    , "ares_data.h"
+    , "ares_getenv.h"
+    , "ares_inet_net_pton.h"
+    , "ares_iphlpapi.h"
+    , "ares_ipv6.h"
+    , "ares_library_init.h"
+    , "ares_llist.h"
+    , "ares_nameser.h"
+    , "ares_nowarn.h"
+    , "ares_platform.h"
+    , "ares_private.h"
+    , "ares_setup.h"
+    , "ares_strcasecmp.h"
+    , "ares_strdup.h"
+    , "ares_strsplit.h"
+    , "ares_writev.h"
+    , "bitncmp.h"
+    , "config-dos.h"
+    , "config-win32.h"
+    , "setup_once.h"
+    ]
+  }
+}
diff --git a/etc/repos.json b/etc/repos.json
index f2ed4c19..62edeb62 100644
--- a/etc/repos.json
+++ b/etc/repos.json
@@ -319,11 +319,11 @@
   , "com_github_cares_cares":
     { "repository":
       { "type": "archive"
-      , "content": "229bb6835455e73a550e4dc44f8ddac22dc34aa7"
-      , "fetch": "https://github.com/c-ares/c-ares/archive/e982924acee7f7313b4baa4ee5ec000c5e373c30.tar.gz"
-      , "sha256": "e8c2751ddc70fed9dc6f999acd92e232d5846f009ee1674f8aee81f19b2b915a"
-      , "sha512": "c213e2a15e5e8adfc3036d66537d4c9ca6b5685b1d0e7a57fe1abe44eebb99d5e0cb42f6a9259fd8ca75d1a4833dbc1009e2025e633b871b902b02f172fcc9bd"
-      , "subdir": "c-ares-e982924acee7f7313b4baa4ee5ec000c5e373c30"
+      , "content": "998c90eda4410f965ca086ce59811e2cf16c8d6b"
+      , "fetch": "https://github.com/c-ares/c-ares/archive/refs/tags/cares-1_17_2.tar.gz"
+      , "sha256": "444b7dbf33cb6e8a764d069e3485cbaaa28386d60eace6988275c3cb9534d300"
+      , "sha512": "1111f1e7eeb0e5d9e70d1a7c8566145d0a5e6e71b020f3fcaa02ecdf1931553ddeff83fdc152a1f9c5a780078e8afe3670164b631df56eecd2b638210cc59bb3"
+      , "subdir": "c-ares-cares-1_17_2"
       }
     , "target_root": "import targets"
     , "target_file_name": "TARGETS.cares"