Skip to content

Commit 073c231

Browse files
nodejs-github-bottargos
nodejs-github-bot
authored and
targos
committed
deps: update c-ares to v1.31.0
PR-URL: #53554 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 608cc05 commit 073c231

File tree

98 files changed

+1157
-1120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1157
-1120
lines changed

‎deps/cares/CHANGES

-7
This file was deleted.

‎deps/cares/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles)
1212
INCLUDE (CheckStructHasMember)
1313
INCLUDE (CheckLibraryExists)
1414

15-
PROJECT (c-ares LANGUAGES C VERSION "1.30.0" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.31.0" )
1616

1717
# Set this version before release
1818
SET (CARES_VERSION "${PROJECT_VERSION}")
@@ -30,7 +30,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
3030
# For example, a version of 4:0:2 would generate output such as:
3131
# libname.so -> libname.so.2
3232
# libname.so.2 -> libname.so.2.2.0
33-
SET (CARES_LIB_VERSIONINFO "17:0:15")
33+
SET (CARES_LIB_VERSIONINFO "18:0:16")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)

‎deps/cares/INSTALL.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
** This file is adapted from libcurl and not yet fully rewritten for c-ares! **
2-
31
```
42
___ __ _ _ __ ___ ___
53
/ __| ___ / _` | '__/ _ \/ __|

‎deps/cares/Makefile.Watcom

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RD = rmdir /q /s 2>NUL
4242
CP = copy
4343

4444
CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm -aa &
45-
-wcd=201 -bt=nt -d+ -dWIN32 -dCARES_BUILDING_LIBRARY &
45+
-wcd=201 -bt=nt -d+ -dCARES_BUILDING_LIBRARY &
4646
-dNTDDI_VERSION=0x06020000 -I. -I.\include -I.\src\lib $(SYS_INCL)
4747

4848
LFLAGS = option quiet, map, caseexact, eliminate

‎deps/cares/Makefile.am

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat
2626

2727
# adig and ahost are just sample programs and thus not mentioned with the
2828
# regular sources and headers
29-
EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \
30-
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
31-
maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
29+
EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md \
30+
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \
31+
README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
3232
CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
33-
Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
33+
Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \
3434
cmake/EnableWarnings.cmake
3535

3636
CLEANFILES = $(PDFPAGES) $(HTMLPAGES)

‎deps/cares/Makefile.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/libcares.pc.in \
230230
$(top_srcdir)/config/compile $(top_srcdir)/config/config.guess \
231231
$(top_srcdir)/config/config.sub \
232232
$(top_srcdir)/config/install-sh $(top_srcdir)/config/ltmain.sh \
233-
$(top_srcdir)/config/missing AUTHORS INSTALL.md NEWS README.md \
234-
TODO config/compile config/config.guess config/config.sub \
233+
$(top_srcdir)/config/missing AUTHORS INSTALL.md README.md \
234+
config/compile config/config.guess config/config.sub \
235235
config/install-sh config/ltmain.sh config/missing
236236
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
237237
distdir = $(PACKAGE)-$(VERSION)
@@ -439,11 +439,11 @@ MSVCFILES = msvc_ver.inc buildconf.bat
439439

440440
# adig and ahost are just sample programs and thus not mentioned with the
441441
# regular sources and headers
442-
EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \
443-
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
444-
maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
442+
EXTRA_DIST = AUTHORS $(man_MANS) RELEASE-NOTES.md \
443+
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf \
444+
README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
445445
CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \
446-
Makefile.Watcom AUTHORS CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md TODO \
446+
Makefile.Watcom CONTRIBUTING.md SECURITY.md DEVELOPER-NOTES.md \
447447
cmake/EnableWarnings.cmake
448448

449449
CLEANFILES = $(PDFPAGES) $(HTMLPAGES)

‎deps/cares/Makefile.msvc

+9-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,9 @@ RTLIBD = /MTd
7171
# otherwise Winsock tcp/ip stack will be used as default.
7272
# --------------------------------------------------------
7373

74+
!IFNDEF USE_WATT32
7475
USE_WATT32 = 0
76+
!ENDIF
7577

7678
# --------------------------------------------------------
7779
# Detect compiler version.
@@ -176,11 +178,14 @@ PROG3_OBJDIR = $(PROG3_OUTDIR)\obj
176178
# -------------------------------------
177179

178180
!IF "$(USE_WATT32)" == "1"
179-
CFLAGS = /UWIN32 /DWATT32 /I$(WATT_ROOT)\inc
180-
EX_LIBS_REL = $(WATT_ROOT)\lib\wattcpvc_imp.lib
181-
EX_LIBS_DBG = $(WATT_ROOT)\lib\wattcpvc_imp_d.lib
181+
CFLAGS = /D_WIN32_WINNT=0x0602 /DWATT32 /I$(WATT_ROOT)\inc
182+
! IFNDEF PLATFORM
183+
PLATFORM = x86
184+
! ENDIF
185+
EX_LIBS_REL = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp.lib advapi32.lib
186+
EX_LIBS_DBG = $(WATT_ROOT)\lib\$(PLATFORM)\wattcpvc_imp_d.lib advapi32.lib
182187
!ELSE
183-
CFLAGS = /DWIN32 /D_WIN32_WINNT=0x0602
188+
CFLAGS = /D_WIN32_WINNT=0x0602
184189
EX_LIBS_REL = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
185190
EX_LIBS_DBG = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
186191
!ENDIF

‎deps/cares/NEWS

-21
This file was deleted.

‎deps/cares/README.cares

-15
This file was deleted.

‎deps/cares/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Build Status](https://api.cirrus-ci.com/github/c-ares/c-ares.svg?branch=main)](https://cirrus-ci.com/github/c-ares/c-ares)
44
[![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)
5-
[![Coverage Status](https://coveralls.io/repos/github/c-ares/c-ares/badge.svg)](https://coveralls.io/github/c-ares/c-ares)
5+
[![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)
66
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/291/badge)](https://bestpractices.coreinfrastructure.org/projects/291)
77
[![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)
88
[![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.
3939

4040
The full source code and revision history is available in our
4141
[GitHub repository](https://github.com/c-ares/c-ares). Our signed releases
42-
are available in the ['c-ares' release archives](https://c-ares.org/download/).
42+
are available in the [release archives](https://c-ares.org/download/).
4343

4444

4545
See the [INSTALL.md](INSTALL.md) file for build information.

‎deps/cares/RELEASE-NOTES.md

+9-18
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,24 @@
1-
## c-ares version 1.30.0 - June 7 2024
1+
## c-ares version 1.31.0 - June 18 2024
22

33
This is a maintenance and bugfix release.
44

5-
Features:
6-
7-
* Basic support for SIG RR record (RFC 2931 / RFC 2535) [PR #773](https://github.com/c-ares/c-ares/pull/773)
8-
95
Changes:
106

11-
* Validation that DNS strings can only consist of printable ascii characters
12-
otherwise will trigger a parse failure.
13-
[75de16c](https://github.com/c-ares/c-ares/commit/75de16c) and
14-
[40fb125](https://github.com/c-ares/c-ares/commit/40fb125)
15-
* Windows: use `GetTickCount64()` for a monotonic timer that does not wrap. [1dff8f6](https://github.com/c-ares/c-ares/commit/1dff8f6)
7+
* Enable Query Cache by default. [PR #786](https://github.com/c-ares/c-ares/pull/786)
168

179
Bugfixes:
1810

19-
* QueryCache: Fix issue where purging on server changes wasn't working. [a6c8fe6](https://github.com/c-ares/c-ares/commit/a6c8fe6)
20-
* Windows: Fix Y2K38 issue by creating our own `ares_timeval_t` datatype. [PR #772](https://github.com/c-ares/c-ares/pull/772)
21-
* Fix packaging issue affecting MacOS due to a missing header. [55afad6](https://github.com/c-ares/c-ares/commit/55afad6)
22-
* MacOS: Fix UBSAN warnings that are likely meaningless due to alignment issues
23-
in new MacOS config reader.
24-
* Android: arm 32bit build failure due to missing symbol. [d1722e6](https://github.com/c-ares/c-ares/commit/d1722e6)
11+
* Enhance Windows DNS configuration change detection to also detect manual DNS
12+
configuration changes. [PR #785](https://github.com/c-ares/c-ares/issues/785)
13+
* Various legacy MacOS Build fixes. [Issue #782](https://github.com/c-ares/c-ares/issues/782)
14+
* Ndots value of zero in resolv.conf was not being honored. [852a60a](https://github.com/c-ares/c-ares/commit/852a60a)
15+
* Watt-32 build support had been broken for some time. [PR #781](https://github.com/c-ares/c-ares/pull/781)
16+
* Distribute `ares_dns_rec_type_tostr` manpage. [PR #778](https://github.com/c-ares/c-ares/pull/778)
2517

2618
Thanks go to these friendly people for their efforts and contributions for this
2719
release:
2820

2921
* Brad House (@bradh352)
30-
* Daniel Stenberg (@bagder)
31-
22+
* Gregor Jasny (@gjasny)
3223

3324

‎deps/cares/TODO

-4
This file was deleted.

‎deps/cares/aminclude_static.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
# aminclude_static.am generated automatically by Autoconf
3-
# from AX_AM_MACROS_STATIC on Fri Jun 7 06:50:45 EDT 2024
3+
# from AX_AM_MACROS_STATIC on Tue Jun 18 05:51:32 EDT 2024
44

55

66
# Code coverage

‎deps/cares/configure

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.72 for c-ares 1.30.0.
3+
# Generated by GNU Autoconf 2.72 for c-ares 1.31.0.
44
#
55
# Report bugs to <c-ares mailing list: http://lists.haxx.se/listinfo/c-ares>.
66
#
@@ -614,8 +614,8 @@ MAKEFLAGS=
614614
# Identity of this package.
615615
PACKAGE_NAME='c-ares'
616616
PACKAGE_TARNAME='c-ares'
617-
PACKAGE_VERSION='1.30.0'
618-
PACKAGE_STRING='c-ares 1.30.0'
617+
PACKAGE_VERSION='1.31.0'
618+
PACKAGE_STRING='c-ares 1.31.0'
619619
PACKAGE_BUGREPORT='c-ares mailing list: http://lists.haxx.se/listinfo/c-ares'
620620
PACKAGE_URL=''
621621

@@ -1415,7 +1415,7 @@ if test "$ac_init_help" = "long"; then
14151415
# Omit some internal or obsolete options to make the list less imposing.
14161416
# This message is too long to be a string in the A/UX 3.1 sh.
14171417
cat <<_ACEOF
1418-
'configure' configures c-ares 1.30.0 to adapt to many kinds of systems.
1418+
'configure' configures c-ares 1.31.0 to adapt to many kinds of systems.
14191419

14201420
Usage: $0 [OPTION]... [VAR=VALUE]...
14211421

@@ -1486,7 +1486,7 @@ fi
14861486

14871487
if test -n "$ac_init_help"; then
14881488
case $ac_init_help in
1489-
short | recursive ) echo "Configuration of c-ares 1.30.0:";;
1489+
short | recursive ) echo "Configuration of c-ares 1.31.0:";;
14901490
esac
14911491
cat <<\_ACEOF
14921492

@@ -1623,7 +1623,7 @@ fi
16231623
test -n "$ac_init_help" && exit $ac_status
16241624
if $ac_init_version; then
16251625
cat <<\_ACEOF
1626-
c-ares configure 1.30.0
1626+
c-ares configure 1.31.0
16271627
generated by GNU Autoconf 2.72
16281628

16291629
Copyright (C) 2023 Free Software Foundation, Inc.
@@ -2267,7 +2267,7 @@ cat >config.log <<_ACEOF
22672267
This file contains any messages produced by compilers while
22682268
running configure, to aid debugging if configure makes a mistake.
22692269

2270-
It was created by c-ares $as_me 1.30.0, which was
2270+
It was created by c-ares $as_me 1.31.0, which was
22712271
generated by GNU Autoconf 2.72. Invocation command line was
22722272

22732273
$ $0$ac_configure_args_raw
@@ -3259,7 +3259,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
32593259

32603260

32613261

3262-
CARES_VERSION_INFO="17:0:15"
3262+
CARES_VERSION_INFO="18:0:16"
32633263

32643264

32653265

@@ -5999,7 +5999,7 @@ fi
59995999

60006000
# Define the identity of the package.
60016001
PACKAGE='c-ares'
6002-
VERSION='1.30.0'
6002+
VERSION='1.31.0'
60036003

60046004

60056005
printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -26370,7 +26370,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
2637026370
# report actual input values of CONFIG_FILES etc. instead of their
2637126371
# values after options handling.
2637226372
ac_log="
26373-
This file was extended by c-ares $as_me 1.30.0, which was
26373+
This file was extended by c-ares $as_me 1.31.0, which was
2637426374
generated by GNU Autoconf 2.72. Invocation command line was
2637526375

2637626376
CONFIG_FILES = $CONFIG_FILES
@@ -26438,7 +26438,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
2643826438
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2643926439
ac_cs_config='$ac_cs_config_escaped'
2644026440
ac_cs_version="\\
26441-
c-ares config.status 1.30.0
26441+
c-ares config.status 1.31.0
2644226442
configured by $0, generated by GNU Autoconf 2.72,
2644326443
with options \\"\$ac_cs_config\\"
2644426444

‎deps/cares/configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ dnl Copyright (C) The c-ares project and its contributors
22
dnl SPDX-License-Identifier: MIT
33
AC_PREREQ([2.69])
44

5-
AC_INIT([c-ares], [1.30.0],
5+
AC_INIT([c-ares], [1.31.0],
66
[c-ares mailing list: http://lists.haxx.se/listinfo/c-ares])
77

8-
CARES_VERSION_INFO="17:0:15"
8+
CARES_VERSION_INFO="18:0:16"
99
dnl This flag accepts an argument of the form current[:revision[:age]]. So,
1010
dnl passing -version-info 3:12:1 sets current to 3, revision to 12, and age to
1111
dnl 1.

‎deps/cares/docs/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -375,6 +375,7 @@ MANPAGES = ares_cancel.3 \
375375
ares_dns_record_rr_get.3 \
376376
ares_dns_record_rr_get_const.3 \
377377
ares_dns_rec_type_fromstr.3 \
378+
ares_dns_rec_type_tostr.3 \
378379
ares_dns_rec_type_t.3 \
379380
ares_dns_rr.3 \
380381
ares_dns_rr_get_addr.3 \

‎deps/cares/docs/Makefile.inc

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ MANPAGES = ares_cancel.3 \
3737
ares_dns_record_rr_get.3 \
3838
ares_dns_record_rr_get_const.3 \
3939
ares_dns_rec_type_fromstr.3 \
40+
ares_dns_rec_type_tostr.3 \
4041
ares_dns_rec_type_t.3 \
4142
ares_dns_rr.3 \
4243
ares_dns_rr_get_addr.3 \

‎deps/cares/docs/ares_dns_rec_type_tostr.3

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.\"
2+
.\" Copyright (C) Daniel Stenberg
3+
.\" SPDX-License-Identifier: MIT
4+
.so man3/ares_dns_mapping.3

‎deps/cares/docs/ares_init_options.3

+9-7
Original file line numberDiff line numberDiff line change
@@ -291,13 +291,15 @@ or less will be considered unlimited, and is the default.
291291
.B ARES_OPT_QUERY_CACHE
292292
.B unsigned int \fIqcache_max_ttl\fP;
293293
.br
294-
Enable the built-in query cache. Will cache queries based on the returned TTL
295-
in the DNS message. Only fully successful and NXDOMAIN query results will be
296-
cached. Fill in the \fIqcache_max_ttl\fP with the maximum number of seconds
297-
a query result may be cached which will override a larger TTL in the response
298-
message. This must be a non-zero value otherwise the cache will be disabled.
299-
Choose a reasonable value for your application such as 300 (5 minutes) or
300-
3600 (1 hour).
294+
As of c-ares 1.31.0, the query cache is enabled by default with a TTL of 1hr.
295+
To disable the query cache, specify this option with a TTL of 0. The query
296+
cache is based on the returned TTL in the DNS message. Only fully successful
297+
and NXDOMAIN query results will be cached. Fill in the \fIqcache_max_ttl\fP
298+
with the maximum number of seconds a query result may be cached which will
299+
override a larger TTL in the response message. This must be a non-zero value
300+
otherwise the cache will be disabled. Choose a reasonable value for your
301+
application such as 300 (5 minutes) or 3600 (1 hour). The query cache is
302+
automatically flushed if a server configuration change is made.
301303
.br
302304
.TP 18
303305
.B ARES_OPT_EVENT_THREAD

0 commit comments

Comments
 (0)