Skip to content

Commit c688680

Browse files
nodejs-github-botrichardlau
authored andcommitted
deps: update c-ares to 1.26.0
PR-URL: #51582 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]>
1 parent 9498ac8 commit c688680

Some content is hidden

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

75 files changed

+6673
-2912
lines changed

deps/cares/CHANGES

+138-68
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,143 @@
11
Changelog for the c-ares project. Generated with git2changes.pl
22

3+
Version 1.26.0 (25 Jan 2024)
4+
5+
Brad House (25 Jan 2024)
6+
- clusterfuzz: enforce maximum DNS packet size due to long parser time
7+
8+
GitHub (24 Jan 2024)
9+
- [Brad House brought this change]
10+
11+
Release prep for c-ares 1.26.0 (#698)
12+
13+
release prep
14+
15+
Brad House (24 Jan 2024)
16+
- adig: Differentiate between internal and server error
17+
18+
Should not output "Got answer" if there was no answer from the
19+
server, instead should just output the internal error.
20+
21+
Fix By: Gisle Vanem (@gvanem)
22+
23+
GitHub (24 Jan 2024)
24+
- [Brad House brought this change]
25+
26+
Event Subsystem: No longer require integrators to have their own (#696)
27+
28+
This PR implements an event thread to process all events on file descriptors registered by c-ares. Prior to this feature, integrators were required to understand the internals of c-ares and how to monitor file descriptors and timeouts and process events.
29+
30+
Implements OS-specific efficient polling such as epoll(), kqueue(), or IOCP, and falls back to poll() or select() if otherwise unsupported. At this point, it depends on basic threading primitives such as pthreads or windows threads.
31+
32+
If enabled via the ARES_OPT_EVENT_THREAD option passed to ares_init_options(), then socket callbacks cannot be used.
33+
34+
Fixes Bug: #611
35+
Fix By: Brad House (@bradh352)
36+
37+
- [Erik Lax brought this change]
38+
39+
Added flags to are_dns_parse to force RAW packet parsing (#693)
40+
41+
This pull request adds six flags to instruct the parser under various circumstances to skip parsing of the returned RR records so the raw data can be retrieved.
42+
43+
Fixes Bug: #686
44+
Fix By: Erik Lax (@eriklax)
45+
46+
- [Brad House brought this change]
47+
48+
Autotools allow make to override CFLAGS/CPPFLAGS/CXXFLAGS (#695)
49+
50+
The previous build system allowed overwriting of CFLAGS/CPPFLAGS/CXXFLAGS on the make command line. Switch to using AM_CFLAGS/AM_CPPFLAGS/AM_CXXFLAGS when we set our own flags for building which ensures they are kept even when a user tries to override.
51+
52+
Fixes Bug: #694
53+
Fix By: Brad House (@bradh352)
54+
55+
Brad House (16 Jan 2024)
56+
- fix doxygen typo
57+
58+
GitHub (16 Jan 2024)
59+
- [Brad House brought this change]
60+
61+
man ares_fds(3): mark as deprecated and add explanation (#691)
62+
63+
ares_fds(3) is not safe to use, mark as deprecated.
64+
65+
Fixes Issue: #687
66+
Fix By: Brad House (@bradh352)
67+
68+
- [Brad House brought this change]
69+
70+
autotools: fix building for 32bit windows due to stdcall symbol mangling (#689)
71+
72+
Use AC_CHECK_DECL not AC_CHECK_FUNCS, while this doesn't do a linkage test, it just makes sure the headers define it, this is the only thing without a complex workaround on Windows that will do what we need.
73+
74+
See:
75+
76+
https://github.com/msys2/msys2/wiki/Porting/f87a222118b1008ebc166ad237f04edb759c8f4c#calling-conventions-stdcall-and-autotools
77+
78+
and
79+
80+
https://lists.gnu.org/archive/html/autoconf/2013-05/msg00085.html
81+
82+
and for a more complex workaround, we'd need to use AC_LINK_IFELSE like:
83+
84+
https://mailman.videolan.org/pipermail/vlc-devel/2015-March/101802.html
85+
86+
which would require we check each individually and provide function arguments for the test. I don't think that is worthwhile.
87+
88+
Fixes Issue: #688
89+
Fix By: Brad House (@bradh352)
90+
91+
- [Brad House brought this change]
92+
93+
Do not sanity check RR Name vs Question (#685)
94+
95+
It appears as though we should never sanity check the RR name vs the question name as some DNS servers may return results for alias records.
96+
97+
Fixes Bug: #683
98+
Fix By: Brad House (@bradh352)
99+
100+
- [Brad House brought this change]
101+
102+
no reason to include sys/random.h all the time (#684)
103+
104+
External integrations don't need sys/random.h in order to compile, remove the dependency. Try to fix building on legacy MacOS versions.
105+
106+
Fixes Issue: #682
107+
Fix By: Brad House (@bradh352)
108+
109+
- [Gregor Jasny brought this change]
110+
111+
cmake: improve some include related code (#680)
112+
113+
* cmake: avoid warning about non-existing include dir
114+
115+
In the Debian build logs I noticed the following warning:
116+
cc1: warning: /build/c-ares-1.25.0/test/include: No such file or directory [-Wmissing-include-dirs]
117+
118+
This happened because ${CMAKE_INSTALL_INCLUDEDIR} had been added to
119+
caresinternal. I believe it has been copied from the "real" lib
120+
where it's used in the INSTALL_INTERFACE context. But because
121+
caresinternal is never installed we don't need that include here.
122+
123+
* cmake: drop CARES_TOPLEVEL_DIR variable
124+
125+
The CARES_TOPLEVEL_DIR variable is the same as the automatically
126+
created PROJECT_SOURCE_DIR variable. Let's stick to the official
127+
one. Also because it is already used at places where CARES_TOPLEVEL_DIR
128+
is used as well.
129+
130+
Fix By: Gregor Jasny (@gjasny)
131+
132+
Brad House (5 Jan 2024)
133+
- test: fix outdated license headers
134+
135+
- RELEASE-NOTES -> RELEASE-NOTES.md
136+
137+
- update format slightly
138+
139+
- update release notes format
140+
3141
Version 1.25.0 (2 Jan 2024)
4142

5143
GitHub (2 Jan 2024)
@@ -6007,71 +6145,3 @@ Yang Tse (30 Jan 2013)
60076145
Some HP-UX system headers require TRUE defined to 1 and FALSE to 0.
60086146

60096147
- ares_timeout.c: fix compiler warning
6010-
6011-
- ares_create_query.c: IRIX compilation fix
6012-
6013-
- c-ares/nameser.h: add some T_* defines for ns_t_* values
6014-
6015-
Daniel Stenberg (7 Nov 2012)
6016-
- Revert "ares_parse_aaaa_reply: fix memory leak"
6017-
6018-
This reverts commit 50f25d8a4b2d16f4c5e0ef620238688b7a315c7a.
6019-
6020-
- ares_parse_aaaa_reply: fix memory leak
6021-
6022-
an allocated buffer was not freed in the successful case.
6023-
6024-
- [Gisle Vanem brought this change]
6025-
6026-
adig: perror() doesn't work for socket errors on windows
6027-
6028-
... so print the SOCKERRNO instead
6029-
6030-
- get_DNS_AdaptersAddresses: fix IPv6 parsing
6031-
6032-
Use of the wrong define made the function not parse IPv6 addresses
6033-
properly.
6034-
6035-
Bug: http://c-ares.haxx.se/mail/c-ares-archive-2012-06/0028.shtml
6036-
Reported by: Saúl Ibarra Corretgé
6037-
6038-
- version: bumped to 1.10.0
6039-
6040-
Due to the newly added function: ares_create_query()
6041-
6042-
- AUTHORS: synced with 83093ac450
6043-
6044-
Added 21 authors since this document was last updated
6045-
6046-
- ares_create_query.3: mention when this is added
6047-
6048-
- [[email protected] brought this change]
6049-
6050-
Added new feature (rfc2671)
6051-
6052-
- code police: fix indents, < 80 columns, reflowed comments
6053-
6054-
Guenter Knauf (11 Jul 2012)
6055-
- Cleaned up version awk script.
6056-
6057-
Daniel Stenberg (30 Jun 2012)
6058-
- [Gisle Vanem brought this change]
6059-
6060-
read_udp_packets: bail out loop on bad sockets
6061-
6062-
I can see that recvfrom() in ares_process.c many times is called with
6063-
'udp_socket' == ARES_SOCKET_BAD. The code takes care not to call
6064-
recv/recvfrom with ARES_SOCKET_BAD in the outer-loop. So should the
6065-
inner-loop.
6066-
6067-
Yang Tse (29 Jun 2012)
6068-
- cares-compilers.m4: remove -Wstrict-aliasing=3 from clang
6069-
6070-
Currently it is unknown if there is any version of clang that
6071-
actually supports -Wstrict-aliasing. What is known is that there
6072-
are several that don't support it.
6073-
6074-
- cares-compilers.m4: -Wstrict-aliasing=3 for warning enabled gcc and clang builds
6075-
6076-
Daniel Stenberg (18 Jun 2012)
6077-
- version: work towards 1.9.2 (at least)

deps/cares/CMakeLists.txt

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

15-
PROJECT (c-ares LANGUAGES C VERSION "1.25.0" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.26.0" )
1616

1717
# Set this version before release
18-
SET (CARES_VERSION "1.25.0")
18+
SET (CARES_VERSION "1.26.0")
1919

2020
INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are wrong.
2121

@@ -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 "12:1:10")
33+
SET (CARES_LIB_VERSIONINFO "13:0:11")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -186,6 +186,7 @@ CARES_FUNCTION_IN_LIBRARY (clock_gettime rt HAVE_LIBRT)
186186

187187

188188
# Look for necessary includes
189+
CHECK_INCLUDE_FILES (AvailabilityMacros.h HAVE_AVAILABILITYMACROS_H)
189190
CHECK_INCLUDE_FILES (sys/types.h HAVE_SYS_TYPES_H)
190191
CHECK_INCLUDE_FILES (sys/random.h HAVE_SYS_RANDOM_H)
191192
CHECK_INCLUDE_FILES (sys/socket.h HAVE_SYS_SOCKET_H)
@@ -223,8 +224,11 @@ CHECK_INCLUDE_FILES (sys/stat.h HAVE_SYS_STAT_H)
223224
CHECK_INCLUDE_FILES (sys/time.h HAVE_SYS_TIME_H)
224225
CHECK_INCLUDE_FILES (sys/uio.h HAVE_SYS_UIO_H)
225226
CHECK_INCLUDE_FILES (sys/random.h HAVE_SYS_RANDOM_H)
227+
CHECK_INCLUDE_FILES (sys/event.h HAVE_SYS_EVENT_H)
228+
CHECK_INCLUDE_FILES (sys/epoll.h HAVE_SYS_EPOLL_H)
226229
CHECK_INCLUDE_FILES (ifaddrs.h HAVE_IFADDRS_H)
227230
CHECK_INCLUDE_FILES (time.h HAVE_TIME_H)
231+
CHECK_INCLUDE_FILES (poll.h HAVE_POLL_H)
228232
CHECK_INCLUDE_FILES (dlfcn.h HAVE_DLFCN_H)
229233
CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H)
230234
# On OpenBSD, you must include sys/types.h before netinet/tcp.h
@@ -242,8 +246,14 @@ CHECK_INCLUDE_FILES ("winsock2.h;windows.h" HAVE_WINSOCK2_H)
242246
CHECK_INCLUDE_FILES ("winsock2.h;ws2tcpip.h;windows.h" HAVE_WS2TCPIP_H)
243247
CHECK_INCLUDE_FILES ("winsock2.h;iphlpapi.h;windows.h" HAVE_IPHLPAPI_H)
244248
CHECK_INCLUDE_FILES ("winsock2.h;netioapi.h;windows.h" HAVE_NETIOAPI_H)
249+
CHECK_INCLUDE_FILES ("winsock2.h;mswsock.h;windows.h" HAVE_MSWSOCK_H)
245250
CHECK_INCLUDE_FILES ("winsock.h;windows.h" HAVE_WINSOCK_H)
246251
CHECK_INCLUDE_FILES (windows.h HAVE_WINDOWS_H)
252+
CHECK_INCLUDE_FILES ("windows.h;winternl.h" HAVE_WINTERNL_H)
253+
CHECK_INCLUDE_FILES ("windows.h;ntdef.h" HAVE_NTDEF_H)
254+
CHECK_INCLUDE_FILES ("windows.h;ntdef.h;ntstatus.h" HAVE_NTSTATUS_H)
255+
256+
247257
ENDIF ()
248258

249259
# Set system-specific compiler flags
@@ -300,6 +310,7 @@ MACRO (CARES_EXTRAINCLUDE_IFSET var include)
300310
ENDIF ()
301311
ENDMACRO ()
302312

313+
CARES_EXTRAINCLUDE_IFSET (HAVE_AVAILABILITYMACROS_H AvailabilityMacros.h)
303314
CARES_EXTRAINCLUDE_IFSET (HAVE_STDBOOL_H stdbool.h)
304315
CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_TYPES_H sys/types.h)
305316
CARES_EXTRAINCLUDE_IFSET (HAVE_ARPA_INET_H arpa/inet.h)
@@ -322,7 +333,10 @@ CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_TIME_H sys/time.h)
322333
CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_STAT_H sys/stat.h)
323334
CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_UIO_H sys/uio.h)
324335
CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_RANDOM_H sys/random.h)
336+
CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_EVENT_H sys/event.h)
337+
CARES_EXTRAINCLUDE_IFSET (HAVE_SYS_EPOLL_H sys/epoll.h)
325338
CARES_EXTRAINCLUDE_IFSET (HAVE_TIME_H time.h)
339+
CARES_EXTRAINCLUDE_IFSET (HAVE_POLL_H poll.h)
326340
CARES_EXTRAINCLUDE_IFSET (HAVE_FCNTL_H fcntl.h)
327341
CARES_EXTRAINCLUDE_IFSET (HAVE_UNISTD_H unistd.h)
328342
CARES_EXTRAINCLUDE_IFSET (HAVE_WINSOCK2_H winsock2.h)
@@ -429,6 +443,12 @@ CHECK_SYMBOL_EXISTS (writev "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_WRITEV)
429443
CHECK_SYMBOL_EXISTS (arc4random_buf "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_ARC4RANDOM_BUF)
430444
CHECK_SYMBOL_EXISTS (stat "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_STAT)
431445
CHECK_SYMBOL_EXISTS (getifaddrs "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_GETIFADDRS)
446+
CHECK_SYMBOL_EXISTS (poll "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_POLL)
447+
CHECK_SYMBOL_EXISTS (pipe "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_PIPE)
448+
CHECK_SYMBOL_EXISTS (pipe2 "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_PIPE2)
449+
CHECK_SYMBOL_EXISTS (kqueue "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_KQUEUE)
450+
CHECK_SYMBOL_EXISTS (epoll_create1 "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_EPOLL)
451+
432452

433453
# On Android, the system headers may define __system_property_get(), but excluded
434454
# from libc. We need to perform a link test instead of a header/symbol test.
@@ -633,9 +653,6 @@ ENDIF ()
633653
IF (HAVE_SYS_TYPES_H)
634654
SET (CARES_HAVE_SYS_TYPES_H 1)
635655
ENDIF ()
636-
IF (HAVE_SYS_RANDOM_H)
637-
SET (CARES_HAVE_SYS_RANDOM_H 1)
638-
ENDIF()
639656
IF (HAVE_SYS_SOCKET_H)
640657
SET (CARES_HAVE_SYS_SOCKET_H 1)
641658
ENDIF()
@@ -655,10 +672,6 @@ IF (HAVE_ARPA_NAMESER_COMPAT_H)
655672
SET (CARES_HAVE_ARPA_NAMESER_COMPAT_H 1)
656673
ENDIF()
657674

658-
# Record toplevel CMakeLists.txt path
659-
set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
660-
661-
662675
# TRANSFORM_MAKEFILE_INC
663676
#
664677
# This function consumes the "Makefile.inc" autotools file, and converts it into

deps/cares/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ 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 \
29+
EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \
3030
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
3131
maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
3232
CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \

deps/cares/Makefile.in

+3-1
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,8 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
281281
distcleancheck_listfiles = find . -type f -print
282282
ACLOCAL = @ACLOCAL@
283283
AMTAR = @AMTAR@
284+
AM_CFLAGS = @AM_CFLAGS@
285+
AM_CPPFLAGS = @AM_CPPFLAGS@
284286
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
285287
AR = @AR@
286288
AS = @AS@
@@ -438,7 +440,7 @@ MSVCFILES = msvc_ver.inc buildconf.bat
438440

439441
# adig and ahost are just sample programs and thus not mentioned with the
440442
# regular sources and headers
441-
EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES \
443+
EXTRA_DIST = AUTHORS CHANGES README.cares $(man_MANS) RELEASE-NOTES.md \
442444
c-ares-config.cmake.in libcares.pc.cmake libcares.pc.in buildconf get_ver.awk \
443445
maketgz TODO README.msvc $(MSVCFILES) INSTALL.md README.md LICENSE.md \
444446
CMakeLists.txt Makefile.dj Makefile.m32 Makefile.netware Makefile.msvc \

0 commit comments

Comments
 (0)