From 0bfb8ec19adf2106c505f3e0a97c99b81694524b Mon Sep 17 00:00:00 2001
From: Beth Griggs <bgriggs@redhat.com>
Date: Tue, 10 Aug 2021 10:10:09 +0100
Subject: [PATCH] deps: update c-ares to 1.17.2

Refs: https://github.com/c-ares/c-ares/releases/tag/cares-1_17_2
---
 deps/cares/RELEASE-NOTES                      | 121 +++--
 deps/cares/cares.gyp                          |   2 +-
 deps/cares/include/ares.h                     |   2 +-
 deps/cares/include/ares_version.h             |   4 +-
 .../cares/src/lib/ares__parse_into_addrinfo.c |  16 +-
 deps/cares/src/lib/ares__sortaddrinfo.c       |   4 +
 deps/cares/src/lib/ares_create_query.c        |  17 +-
 deps/cares/src/lib/ares_expand_name.c         | 137 ++++-
 deps/cares/src/lib/ares_expand_string.c       |   7 +-
 deps/cares/src/lib/ares_free_hostent.c        |  10 +-
 deps/cares/src/lib/ares_freeaddrinfo.c        |   2 +
 deps/cares/src/lib/ares_getaddrinfo.c         |  24 +-
 deps/cares/src/lib/ares_gethostbyaddr.c       |  10 +-
 deps/cares/src/lib/ares_gethostbyname.c       |  10 +-
 deps/cares/src/lib/ares_getnameinfo.c         |  10 +-
 deps/cares/src/lib/ares_init.c                |  88 +++-
 deps/cares/src/lib/ares_library_init.c        |   9 +-
 deps/cares/src/lib/ares_library_init.h        |   2 +-
 deps/cares/src/lib/ares_nameser.h             | 482 ++++++++++++++++++
 deps/cares/src/lib/ares_parse_a_reply.c       |  14 +-
 deps/cares/src/lib/ares_parse_aaaa_reply.c    |  14 +-
 deps/cares/src/lib/ares_parse_caa_reply.c     |  14 +-
 deps/cares/src/lib/ares_parse_mx_reply.c      |  10 +-
 deps/cares/src/lib/ares_parse_naptr_reply.c   |  15 +-
 deps/cares/src/lib/ares_parse_ns_reply.c      |  16 +-
 deps/cares/src/lib/ares_parse_ptr_reply.c     |  99 ++--
 deps/cares/src/lib/ares_parse_soa_reply.c     |  24 +-
 deps/cares/src/lib/ares_parse_srv_reply.c     |  15 +-
 deps/cares/src/lib/ares_parse_txt_reply.c     |  10 +-
 deps/cares/src/lib/ares_private.h             |   6 +-
 deps/cares/src/lib/ares_process.c             |  11 +-
 deps/cares/src/lib/ares_query.c               |  10 +-
 deps/cares/src/lib/ares_send.c                |  10 +-
 deps/cares/src/lib/ares_setup.h               |   5 +-
 deps/cares/src/lib/ares_strsplit.c            |   4 +
 deps/cares/src/lib/inet_net_pton.c            |  10 +-
 deps/cares/src/lib/inet_ntop.c                |  10 +-
 deps/cares/src/lib/nameser.h                  | 218 --------
 src/cares_wrap.h                              |  10 +-
 39 files changed, 889 insertions(+), 593 deletions(-)
 create mode 100644 deps/cares/src/lib/ares_nameser.h
 delete mode 100644 deps/cares/src/lib/nameser.h

diff --git a/src/cares_wrap.h b/src/cares_wrap.h
index aee46a935b3a..60f99e65edf3 100644
--- a/src/cares_wrap.h
+++ b/src/cares_wrap.h
@@ -22,15 +22,7 @@
 # include <netdb.h>
 #endif  // __POSIX__
 
-#if defined(__ANDROID__) || \
-    defined(__MINGW32__) || \
-    defined(__OpenBSD__) || \
-    defined(_MSC_VER)
-
-# include <nameser.h>
-#else
-# include <arpa/nameser.h>
-#endif
+# include <ares_nameser.h>
 
 namespace node {
 namespace cares_wrap {
