Skip to content

Commit 8b28222

Browse files
nodejs-github-botaduh95
authored andcommitted
deps: update c-ares to v1.34.1
PR-URL: #55369 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent a9473bb commit 8b28222

File tree

154 files changed

+12736
-17952
lines changed

Some content is hidden

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

154 files changed

+12736
-17952
lines changed

deps/cares/CMakeLists.txt

+8-9
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.33.1" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.34.1" )
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 "20:1:18")
33+
SET (CARES_LIB_VERSIONINFO "21:1:19")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -406,7 +406,7 @@ ENDIF ()
406406

407407
CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_scope_id "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID LANGUAGE C)
408408

409-
409+
CHECK_SYMBOL_EXISTS (memmem "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_MEMMEM)
410410
CHECK_SYMBOL_EXISTS (closesocket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CLOSESOCKET)
411411
CHECK_SYMBOL_EXISTS (CloseSocket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CLOSESOCKET_CAMEL)
412412
CHECK_SYMBOL_EXISTS (connect "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONNECT)
@@ -443,6 +443,7 @@ CHECK_SYMBOL_EXISTS (IoctlSocket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_IOCTLSO
443443
CHECK_SYMBOL_EXISTS (recv "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_RECV)
444444
CHECK_SYMBOL_EXISTS (recvfrom "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_RECVFROM)
445445
CHECK_SYMBOL_EXISTS (send "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_SEND)
446+
CHECK_SYMBOL_EXISTS (sendto "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_SENDTO)
446447
CHECK_SYMBOL_EXISTS (setsockopt "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_SETSOCKOPT)
447448
CHECK_SYMBOL_EXISTS (socket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_SOCKET)
448449
CHECK_SYMBOL_EXISTS (strcasecmp "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_STRCASECMP)
@@ -500,7 +501,10 @@ IF (CARES_THREADS)
500501
CARES_EXTRAINCLUDE_IFSET (HAVE_PTHREAD_NP_H pthread_np.h)
501502
CHECK_SYMBOL_EXISTS (pthread_init "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_PTHREAD_INIT)
502503
# Make sure libcares.pc.cmake knows about thread libraries on static builds
503-
LIST (APPEND CARES_DEPENDENT_LIBS ${CMAKE_THREAD_LIBS_INIT})
504+
# The variable set by FIND_PACKAGE(Threads) has a -l prefix on it, we need
505+
# to strip that first since CARES_DEPENDENT_LIBS doesn't expect that.
506+
STRING (REPLACE "-l" "" CARES_THREAD_LIBRARY "${CMAKE_THREAD_LIBS_INIT}")
507+
LIST (APPEND CARES_DEPENDENT_LIBS ${CARES_THREAD_LIBRARY})
504508
ELSE ()
505509
MESSAGE (WARNING "Threading support not found, disabling...")
506510
SET (CARES_THREADS OFF)
@@ -688,7 +692,6 @@ IF (HAVE_ARPA_NAMESER_COMPAT_H)
688692
SET (CARES_HAVE_ARPA_NAMESER_COMPAT_H 1)
689693
ENDIF()
690694

691-
692695
# Coverage
693696
IF (CARES_COVERAGE)
694697
# set compiler flags
@@ -755,9 +758,6 @@ IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
755758
ADD_SUBDIRECTORY (test)
756759
ENDIF ()
757760

758-
759-
760-
761761
# Export targets
762762
IF (CARES_INSTALL)
763763
SET (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
@@ -781,7 +781,6 @@ IF (CARES_INSTALL)
781781
INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
782782
ENDIF ()
783783

784-
785784
# Legacy chain-building variables (provided for compatibility with old code).
786785
# Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares).
787786
SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND")

deps/cares/Makefile.Watcom

+3-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ CP = copy
4343

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

4849
LFLAGS = option quiet, map, caseexact, eliminate
4950

@@ -124,7 +125,7 @@ $(LIBNAME).lib: $(OBJS_STAT) $(LIB_ARG)
124125
$(OBJ_BASE)\tools\ares_getopt.obj:
125126
$(CC) $(CFLAGS) -DCARES_STATICLIB .\src\tools\ares_getopt.c -fo=$^@
126127

127-
adig.exe: $(OBJ_BASE)\tools\ares_getopt.obj $(LIBNAME).lib
128+
adig.exe: $(LIBNAME).lib
128129
$(CC) $(CFLAGS) src\tools\adig.c -fo=$(OBJ_BASE)\tools\adig.obj
129130
$(LD) name $^@ system nt $(LFLAGS) file { $(OBJ_BASE)\tools\adig.obj $[@ } library $]@, ws2_32.lib, iphlpapi.lib
130131

deps/cares/Makefile.dj

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ VPATH = src/lib src/tools
2323
WATT32_ROOT = $(realpath $(WATT_ROOT))
2424
WATT32_LIB = $(WATT32_ROOT)/lib/libwatt.a
2525

26-
CFLAGS = -g -O2 -I./include -I./src/lib \
26+
CFLAGS = -g -O2 -I./include -I./src/lib -I./src/lib/include \
2727
-I$(WATT32_ROOT)/inc \
2828
-Wall \
2929
-Wextra \

deps/cares/Makefile.m32

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RANLIB = $(CROSSPREFIX)ranlib
1919
#RM = rm -f
2020
CP = cp -afv
2121

22-
CFLAGS = $(CARES_CFLAG_EXTRAS) -O2 -Wall -I./include -I./src/lib -D_WIN32_WINNT=0x0602
22+
CFLAGS = $(CARES_CFLAG_EXTRAS) -O2 -Wall -I./include -I./src/lib -I./src/lib/include -D_WIN32_WINNT=0x0602
2323
CFLAGS += -DCARES_STATICLIB
2424
LDFLAGS = $(CARES_LDFLAG_EXTRAS) -s
2525
LIBS = -lws2_32 -liphlpapi

deps/cares/Makefile.msvc

+1-10
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ EX_LIBS_DBG = ws2_32.lib advapi32.lib kernel32.lib iphlpapi.lib
192192

193193
CC_CMD_REL = cl.exe /nologo $(RTLIB) /DNDEBUG /O2
194194
CC_CMD_DBG = cl.exe /nologo $(RTLIBD) /D_DEBUG /Od /Zi /RTCsu
195-
CC_CFLAGS = $(CFLAGS) /D_REENTRANT /I.\src\lib /I.\include /W3 /EHsc /FD
195+
CC_CFLAGS = $(CFLAGS) /D_REENTRANT /I.\src\lib /I.\include /I.\src\lib\include /W3 /EHsc /FD
196196

197197
RC_CMD_REL = rc.exe /l 0x409 /d "NDEBUG"
198198
RC_CMD_DBG = rc.exe /l 0x409 /d "_DEBUG"
@@ -344,15 +344,6 @@ PROG3_OBJS = $(PROG3_OBJS) $(PROG3_OBJDIR)\ahost.obj
344344
{$(SRCDIR)\src\tools}.c{$(PROG3_OBJDIR)}.obj:
345345
$(CC_CMD) $(CC_CFLAGS) $(SPROG_CFLAGS) /Fo$@ /Fd$(PROG3_OBJDIR)\ /c $<
346346

347-
# Hack Alert! we reference ../lib/str files in the Makefile.inc for tools as they
348-
# share some files with the library itself. We need to hack around that here.
349-
350-
{$(SRCDIR)\src\lib\str}.c{$(PROG2_OBJDIR)\..\lib\str}.obj:
351-
$(CC_CMD) $(CC_CFLAGS) $(SPROG_CFLAGS) /Fo$(PROG2_OBJDIR)\str\$(@F) /Fd$(PROG2_OBJDIR)\str\ /c $<
352-
353-
{$(SRCDIR)\src\lib\str}.c{$(PROG3_OBJDIR)\..\lib\str}.obj:
354-
$(CC_CMD) $(CC_CFLAGS) $(SPROG_CFLAGS) /Fo$(PROG3_OBJDIR)\str\$(@F) /Fd$(PROG3_OBJDIR)\str\ /c $<
355-
356347
# ------------------------------------------------------------- #
357348
# ------------------------------------------------------------- #
358349
# Default target when no CFG library type has been specified, #

deps/cares/README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ to sign releases):
8282

8383
```bash
8484
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2 # Daniel Stenberg
85-
gpg --keyserver hkps://keys.openpgp.org --recv-keys DA7D64E4C82C6294CB73A20E22E3D13B5411B7CA # Brad House
85+
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys DA7D64E4C82C6294CB73A20E22E3D13B5411B7CA # Brad House
8686
```
8787

8888
### Verifying signatures
@@ -109,8 +109,11 @@ gpg: binary signature, digest algorithm SHA512, key algorithm rsa2048
109109
```
110110

111111
## Features
112+
113+
See [Features](FEATURES.md)
114+
112115
### Supported RFCs and Proposals
113-
- [RFC1035](https://datatracker.ietf.org/doc/html/rfc7873).
116+
- [RFC1035](https://datatracker.ietf.org/doc/html/rfc1035).
114117
Initial/Base DNS RFC
115118
- [RFC2671](https://datatracker.ietf.org/doc/html/rfc2671),
116119
[RFC6891](https://datatracker.ietf.org/doc/html/rfc6891).
@@ -151,3 +154,5 @@ gpg: binary signature, digest algorithm SHA512, key algorithm rsa2048
151154
IPv6 address sorting as used by `ares_getaddrinfo()`.
152155
- [RFC7413](https://datatracker.ietf.org/doc/html/rfc7413).
153156
TCP FastOpen (TFO) for 0-RTT TCP Connection Resumption.
157+
- [RFC3986](https://datatracker.ietf.org/doc/html/rfc3986).
158+
Uniform Resource Identifier (URI). Used for server configuration.

deps/cares/RELEASE-NOTES.md

+42-47
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,60 @@
1-
## c-ares version 1.33.1 - August 23 2024
1+
## c-ares version 1.34.1 - Octover 9 2024
22

3-
This is a bugfix release.
3+
This release fixes a packaging issue.
44

5-
Bugfixes:
6-
* Work around systemd-resolved quirk that returns unexpected codes for single
7-
label names. Also adds test cases to validate the work around works and
8-
will continue to work in future releases.
9-
[PR #863](https://github.com/c-ares/c-ares/pull/863),
10-
See Also https://github.com/systemd/systemd/issues/34101
11-
* Fix sysconfig ndots default value, also adds containerized test case to
12-
prevent future regressions.
13-
[PR #862](https://github.com/c-ares/c-ares/pull/862)
14-
* Fix blank DNS name returning error code rather than valid record for
15-
commands like: `adig -t SOA .`. Also adds test case to prevent future
16-
regressions.
17-
[9e574af](https://github.com/c-ares/c-ares/commit/9e574af)
18-
* Fix calculation of query times > 1s.
19-
[2b2eae7](https://github.com/c-ares/c-ares/commit/2b2eae7)
20-
* Fix building on old Linux releases that don't have `TCP_FASTOPEN_CONNECT`.
21-
[b7a89b9](https://github.com/c-ares/c-ares/commit/b7a89b9)
22-
* Fix minor Android build warnings.
23-
[PR #848](https://github.com/c-ares/c-ares/pull/848)
24-
25-
Thanks go to these friendly people for their efforts and contributions for this
26-
release:
27-
* Brad House (@bradh352)
28-
* Erik Lax (@eriklax)
29-
* Hans-Christian Egtvedt (@egtvedt)
30-
* Mikael Lindemann (@mikaellindemann)
31-
* Nodar Chkuaselidze (@nodech)
325

33-
## c-ares version 1.33.0 - August 2 2024
6+
## c-ares version 1.34.0 - October 9 2024
347

358
This is a feature and bugfix release.
369

3710
Features:
38-
* Add DNS cookie support (RFC7873 + RFC9018) to help prevent off-path cache
39-
poisoning attacks. [PR #833](https://github.com/c-ares/c-ares/pull/833)
40-
* Implement TCP FastOpen (TFO) RFC7413, which will make TCP reconnects 0-RTT
41-
on supported systems. [PR #840](https://github.com/c-ares/c-ares/pull/840)
11+
* adig: read arguments from adigrc.
12+
[PR #856](https://github.com/c-ares/c-ares/pull/856)
13+
* Add new pending write callback optimization via `ares_set_pending_write_cb`.
14+
[PR #857](https://github.com/c-ares/c-ares/pull/857)
15+
* New function `ares_process_fds()`.
16+
[PR #875](https://github.com/c-ares/c-ares/pull/875)
17+
* Failed servers should be probed rather than redirecting queries which could
18+
cause unexpected latency.
19+
[PR #877](https://github.com/c-ares/c-ares/pull/877)
20+
* adig: rework command line arguments to mimic dig from bind.
21+
[PR #890](https://github.com/c-ares/c-ares/pull/890)
22+
* Add new method for overriding network functions
23+
`ares_set_socket_function_ex()` to properly support all new functionality.
24+
[PR #894](https://github.com/c-ares/c-ares/pull/894)
25+
* Fix regression with custom socket callbacks due to DNS cookie support.
26+
[PR #895](https://github.com/c-ares/c-ares/pull/895)
27+
* ares_socket: set IP_BIND_ADDRESS_NO_PORT on ares_set_local_ip* tcp sockets
28+
[PR #887](https://github.com/c-ares/c-ares/pull/887)
29+
* URI parser/writer for ares_set_servers_csv()/ares_get_servers_csv().
30+
[PR #882](https://github.com/c-ares/c-ares/pull/882)
4231

4332
Changes:
44-
* Reorganize source tree. [PR #822](https://github.com/c-ares/c-ares/pull/822)
45-
* Refactoring of connection handling to prevent code duplication.
46-
[PR #839](https://github.com/c-ares/c-ares/pull/839)
47-
* New dynamic array data structure to prevent simple logic flaws in array
48-
handling in various code paths.
49-
[PR #841](https://github.com/c-ares/c-ares/pull/841)
33+
* Connection handling modularization.
34+
[PR #857](https://github.com/c-ares/c-ares/pull/857),
35+
[PR #876](https://github.com/c-ares/c-ares/pull/876)
36+
* Expose library/utility functions to tools.
37+
[PR #860](https://github.com/c-ares/c-ares/pull/860)
38+
* Remove `ares__` prefix, just use `ares_` for internal functions.
39+
[PR #872](https://github.com/c-ares/c-ares/pull/872)
40+
5041

5142
Bugfixes:
52-
* `ares_destroy()` race condition during shutdown due to missing lock.
53-
[PR #831](https://github.com/c-ares/c-ares/pull/831)
54-
* Android: Preserve thread name after attaching it to JVM.
55-
[PR #838](https://github.com/c-ares/c-ares/pull/838)
56-
* Windows UWP (Store) support fix.
57-
[PR #845](https://github.com/c-ares/c-ares/pull/845)
43+
* fix: potential WIN32_LEAN_AND_MEAN redefinition.
44+
[PR #869](https://github.com/c-ares/c-ares/pull/869)
45+
* Fix googletest v1.15 compatibility.
46+
[PR #874](https://github.com/c-ares/c-ares/pull/874)
47+
* Fix pkgconfig thread dependencies.
48+
[PR #884](https://github.com/c-ares/c-ares/pull/884)
5849

5950

6051
Thanks go to these friendly people for their efforts and contributions for this
6152
release:
6253

6354
* Brad House (@bradh352)
64-
* Yauheni Khnykin (@Hsilgos)
55+
* Cristian Rodríguez (@crrodriguez)
56+
* Georg (@tacerus)
57+
* @lifenjoiner
58+
* Shelley Vohr (@codebytere)
59+
* 前进,前进,进 (@leleliu008)
6560

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 Aug 23 09:37:25 EDT 2024
3+
# from AX_AM_MACROS_STATIC on Wed Oct 9 20:58:25 EDT 2024
44

55

66
# Code coverage

0 commit comments

Comments
 (0)