deps: update c-ares to v1.31.0

PR-URL: #53554 Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · Jun 25, 2024 · a0cb507 · a0cb507
1 parent eb54c54
commit a0cb507
Show file tree

Hide file tree

Showing 98 changed files with 1,157 additions and 1,120 deletions.
diff --git a/deps/cares/CHANGES b/deps/cares/CHANGES
diff --git a/deps/cares/CMakeLists.txt b/deps/cares/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles)
 INCLUDE (CheckStructHasMember)
 INCLUDE (CheckLibraryExists)
 
-PROJECT (c-ares LANGUAGES C VERSION "1.30.0" )
+PROJECT (c-ares LANGUAGES C VERSION "1.31.0" )
 
 # Set this version before release
 SET (CARES_VERSION "${PROJECT_VERSION}")
@@ -30,7 +30,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
 # For example, a version of 4:0:2 would generate output such as:
 #    libname.so   -> libname.so.2
 #    libname.so.2 -> libname.so.2.2.0
-SET (CARES_LIB_VERSIONINFO "17:0:15")
+SET (CARES_LIB_VERSIONINFO "18:0:16")
 
 
 OPTION (CARES_STATIC        "Build as a static library"                                             OFF)

diff --git a/deps/cares/INSTALL.md b/deps/cares/INSTALL.md
@@ -1,5 +1,3 @@
-** This file is adapted from libcurl and not yet fully rewritten for c-ares! **
-
 ```
                           ___       __ _ _ __ ___  ___
                          / __| ___ / _` | '__/ _ \/ __|

diff --git a/deps/cares/Makefile.Watcom b/deps/cares/Makefile.Watcom
@@ -42,7 +42,7 @@ RD = rmdir /q /s 2>NUL
 CP = copy
 
 CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -aa   &
-         -wcd=201 -bt=nt -d+ -dWIN32 -dCARES_BUILDING_LIBRARY &
+         -wcd=201 -bt=nt -d+ -dCARES_BUILDING_LIBRARY &
          -dNTDDI_VERSION=0x06020000 -I. -I.\include -I.\src\lib $(SYS_INCL)
 
 LFLAGS = option quiet, map, caseexact, eliminate

diff --git a/deps/cares/Makefile.am b/deps/cares/Makefile.am
@@ -26,11 +26,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat
 
 # adig and ahost are just sample programs and thus not mentioned with the
 # regular sources and headers
-EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md	\
- c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
- maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
+EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md	\
+ c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \
+ README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
  CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
- Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
+ Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \
  cmake/EnableWarnings.cmake
 
 CLEANFILES = $(PDFPAGES) $(HTMLPAGES)

diff --git a/deps/cares/Makefile.in b/deps/cares/Makefile.in
@@ -230,8 +230,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libcares.pc.in \
 	$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
 	$(top_srcdir)/config/config.sub \
 	$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
-	$(top_srcdir)/config/missing AUTHORS INSTALL.md NEWS README.md \
-	TODO config/compile config/config.guess config/config.sub \
+	$(top_srcdir)/config/missing AUTHORS INSTALL.md README.md \
+	config/compile config/config.guess config/config.sub \
 	config/install-sh config/ltmain.sh config/missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -439,11 +439,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat
 
 # adig and ahost are just sample programs and thus not mentioned with the
 # regular sources and headers
-EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md	\
- c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
- maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
+EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md	\
+ c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \
+ README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
  CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
- Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
+ Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \
  cmake/EnableWarnings.cmake
 
 CLEANFILES = $(PDFPAGES) $(HTMLPAGES)

diff --git a/deps/cares/Makefile.msvc b/deps/cares/Makefile.msvc
@@ -71,7 +71,9 @@ RTLIBD = /MTd
 # otherwise Winsock tcp/ip stack will be used as default.
 # --------------------------------------------------------
 
+!IFNDEF USE_WATT32
 USE_WATT32 = 0
+!ENDIF
 
 # --------------------------------------------------------
 # Detect compiler version.
@@ -176,11 +178,14 @@ PROG3_OBJDIR = $(PROG3_OUTDIR)\obj
 # -------------------------------------
 
 !IF "$(USE_WATT32)" == "1"
-CFLAGS  = /UWIN32 /DWATT32 /I$(WATT_ROOT)\inc
-EX_LIBS_REL = $(WATT_ROOT)\lib\wattcpvc_imp.lib
-EX_LIBS_DBG = $(WATT_ROOT)\lib\wattcpvc_imp_d.lib
+CFLAGS  = /D_WIN32_WINNT=0x0602 /DWATT32 /I$(WATT_ROOT)\inc
+!  IFNDEF PLATFORM
+PLATFORM = x86
+!  ENDIF
+EX_LIBS_REL = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp.lib advapi32.lib
+EX_LIBS_DBG = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp_d.lib advapi32.lib
 !ELSE
-CFLAGS  = /DWIN32 /D_WIN32_WINNT=0x0602
+CFLAGS  = /D_WIN32_WINNT=0x0602
 EX_LIBS_REL = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
 EX_LIBS_DBG = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
 !ENDIF

diff --git a/deps/cares/NEWS b/deps/cares/NEWS
diff --git a/deps/cares/README.cares b/deps/cares/README.cares
diff --git a/deps/cares/README.md b/deps/cares/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://api.cirrus-ci.com/github/c-ares/c-ares.svg?branch=main)](https://cirrus-ci.com/github/c-ares/c-ares)
 [![Windows Build Status](https://ci.appveyor.com/api/projects/status/aevgc5914tm72pvs/branch/main?svg=true)](https://ci.appveyor.com/project/c-ares/c-ares/branch/main)
-[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg)](https://coveralls.io/github/c-ares/c-ares)
+[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg?branch=main)](https://coveralls.io/github/c-ares/c-ares?branch=main)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/291/badge)](https://bestpractices.coreinfrastructure.org/projects/291)
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/c-ares.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:c-ares)
 [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=c-ares_c-ares&metric=bugs)](https://sonarcloud.io/summary/new_code?id=c-ares_c-ares)
@@ -39,7 +39,7 @@ best practices in regards to C coding standards.
 
 The full source code and revision history is available in our
 [GitHub  repository](https://github.com/c-ares/c-ares).  Our signed releases
-are available in the ['c-ares' release archives](https://c-ares.org/download/).
+are available in the [release archives](https://c-ares.org/download/).
 
 
 See the [INSTALL.md](INSTALL.md) file for build information.

diff --git a/deps/cares/RELEASE-NOTES.md b/deps/cares/RELEASE-NOTES.md
@@ -1,33 +1,24 @@
-## c-ares version 1.30.0 - June 7 2024
+## c-ares version 1.31.0 - June 18 2024
 
 This is a maintenance and bugfix release.
 
-Features:
-
-* Basic support for SIG RR record (RFC 2931 / RFC 2535) [PR #773](https://github.com/c-ares/c-ares/pull/773)
-
 Changes:
 
-* Validation that DNS strings can only consist of printable ascii characters
-  otherwise will trigger a parse failure.
-  [75de16c](https://github.com/c-ares/c-ares/commit/75de16c) and
-  [40fb125](https://github.com/c-ares/c-ares/commit/40fb125)
-* Windows: use `GetTickCount64()` for a monotonic timer that does not wrap. [1dff8f6](https://github.com/c-ares/c-ares/commit/1dff8f6)
+* Enable Query Cache by default. [PR #786](https://github.com/c-ares/c-ares/pull/786)
 
 Bugfixes:
 
-* QueryCache: Fix issue where purging on server changes wasn't working. [a6c8fe6](https://github.com/c-ares/c-ares/commit/a6c8fe6)
-* Windows: Fix Y2K38 issue by creating our own `ares_timeval_t` datatype. [PR #772](https://github.com/c-ares/c-ares/pull/772)
-* Fix packaging issue affecting MacOS due to a missing header. [55afad6](https://github.com/c-ares/c-ares/commit/55afad6)
-* MacOS: Fix UBSAN warnings that are likely meaningless due to alignment issues
-  in new MacOS config reader.
-* Android: arm 32bit build failure due to missing symbol. [d1722e6](https://github.com/c-ares/c-ares/commit/d1722e6)
+* Enhance Windows DNS configuration change detection to also detect manual DNS
+  configuration changes. [PR #785](https://github.com/c-ares/c-ares/issues/785)
+* Various legacy MacOS Build fixes. [Issue #782](https://github.com/c-ares/c-ares/issues/782)
+* Ndots value of zero in resolv.conf was not being honored. [852a60a](https://github.com/c-ares/c-ares/commit/852a60a)
+* Watt-32 build support had been broken for some time. [PR #781](https://github.com/c-ares/c-ares/pull/781)
+* Distribute `ares_dns_rec_type_tostr` manpage. [PR #778](https://github.com/c-ares/c-ares/pull/778)
 
 Thanks go to these friendly people for their efforts and contributions for this
 release:
 
 * Brad House (@bradh352)
-* Daniel Stenberg (@bagder)
-
+* Gregor Jasny (@gjasny)
 
 
diff --git a/deps/cares/TODO b/deps/cares/TODO
diff --git a/deps/cares/aminclude_static.am b/deps/cares/aminclude_static.am
@@ -1,6 +1,6 @@
 
 # aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Fri Jun  7 06:50:45 EDT 2024
+# from AX_AM_MACROS_STATIC on Tue Jun 18 05:51:32 EDT 2024
 
 
 # Code coverage

diff --git a/deps/cares/configure b/deps/cares/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for c-ares 1.30.0.
+# Generated by GNU Autoconf 2.72 for c-ares 1.31.0.
 #
 # Report bugs to <c-ares mailing list: http://lists.haxx.se/listinfo/c-ares>.
 #
@@ -614,8 +614,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='c-ares'
 PACKAGE_TARNAME='c-ares'
-PACKAGE_VERSION='1.30.0'
-PACKAGE_STRING='c-ares 1.30.0'
+PACKAGE_VERSION='1.31.0'
+PACKAGE_STRING='c-ares 1.31.0'
 PACKAGE_BUGREPORT='c-ares mailing list: http://lists.haxx.se/listinfo/c-ares'
 PACKAGE_URL=''
 
@@ -1415,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures c-ares 1.30.0 to adapt to many kinds of systems.
+'configure' configures c-ares 1.31.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1486,7 +1486,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of c-ares 1.30.0:";;
+     short | recursive ) echo "Configuration of c-ares 1.31.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1623,7 +1623,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-c-ares configure 1.30.0
+c-ares configure 1.31.0
 generated by GNU Autoconf 2.72
 
 Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2267,7 +2267,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by c-ares $as_me 1.30.0, which was
+It was created by c-ares $as_me 1.31.0, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -3259,7 +3259,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-CARES_VERSION_INFO="17:0:15"
+CARES_VERSION_INFO="18:0:16"
 
 
 
@@ -5999,7 +5999,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='c-ares'
- VERSION='1.30.0'
+ VERSION='1.31.0'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -26370,7 +26370,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by c-ares $as_me 1.30.0, which was
+This file was extended by c-ares $as_me 1.31.0, which was
 generated by GNU Autoconf 2.72.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -26438,7 +26438,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-c-ares config.status 1.30.0
+c-ares config.status 1.31.0
 configured by $0, generated by GNU Autoconf 2.72,
   with options \\"\$ac_cs_config\\"
 

diff --git a/deps/cares/configure.ac b/deps/cares/configure.ac
@@ -2,10 +2,10 @@ dnl Copyright (C) The c-ares project and its contributors
 dnl SPDX-License-Identifier: MIT
 AC_PREREQ([2.69])
 
-AC_INIT([c-ares], [1.30.0],
+AC_INIT([c-ares], [1.31.0],
   [c-ares mailing list: http://lists.haxx.se/listinfo/c-ares])
 
-CARES_VERSION_INFO="17:0:15"
+CARES_VERSION_INFO="18:0:16"
 dnl This flag accepts an argument of the form current[:revision[:age]]. So,
 dnl passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
 dnl 1.

diff --git a/deps/cares/docs/Makefile.in b/deps/cares/docs/Makefile.in
@@ -375,6 +375,7 @@ MANPAGES = ares_cancel.3		\
   ares_dns_record_rr_get.3		\
   ares_dns_record_rr_get_const.3	\
   ares_dns_rec_type_fromstr.3		\
+  ares_dns_rec_type_tostr.3		\
   ares_dns_rec_type_t.3			\
   ares_dns_rr.3				\
   ares_dns_rr_get_addr.3		\

diff --git a/deps/cares/docs/Makefile.inc b/deps/cares/docs/Makefile.inc
@@ -37,6 +37,7 @@ MANPAGES = ares_cancel.3		\
   ares_dns_record_rr_get.3		\
   ares_dns_record_rr_get_const.3	\
   ares_dns_rec_type_fromstr.3		\
+  ares_dns_rec_type_tostr.3		\
   ares_dns_rec_type_t.3			\
   ares_dns_rr.3				\
   ares_dns_rr_get_addr.3		\

diff --git a/deps/cares/docs/ares_dns_rec_type_tostr.3 b/deps/cares/docs/ares_dns_rec_type_tostr.3
@@ -0,0 +1,4 @@
+.\"
+.\" Copyright (C) Daniel Stenberg
+.\" SPDX-License-Identifier: MIT
+.so man3/ares_dns_mapping.3
diff --git a/deps/cares/docs/ares_init_options.3 b/deps/cares/docs/ares_init_options.3
@@ -291,13 +291,15 @@ or less will be considered unlimited, and is the default.
 .B ARES_OPT_QUERY_CACHE
 .B unsigned int \fIqcache_max_ttl\fP;
 .br
-Enable the built-in query cache.  Will cache queries based on the returned TTL
-in the DNS message.  Only fully successful and NXDOMAIN query results will be
-cached.  Fill in the \fIqcache_max_ttl\fP with the maximum number of seconds
-a query result may be cached which will override a larger TTL in the response
-message. This must be a non-zero value otherwise the cache will be disabled.
-Choose a reasonable value for your application such as 300 (5 minutes) or
-3600 (1 hour).
+As of c-ares 1.31.0, the query cache is enabled by default with a TTL of 1hr.
+To disable the query cache, specify this option with a TTL of 0.  The query
+cache is based on the returned TTL in the DNS message.  Only fully successful
+and NXDOMAIN query results will be cached.  Fill in the \fIqcache_max_ttl\fP
+with the maximum number of seconds a query result may be cached which will
+override a larger TTL in the response message. This must be a non-zero value
+otherwise the cache will be disabled. Choose a reasonable value for your
+application such as 300 (5 minutes) or 3600 (1 hour).  The query cache is
+automatically flushed if a server configuration change is made.
 .br
 .TP 18
 .B ARES_OPT_EVENT_THREAD