Skip to content

Commit 678d82b

Browse files
nodejs-github-botRafaelGSS
nodejs-github-bot
authored and
RafaelGSS
committed
deps: update c-ares to v1.34.5
PR-URL: #57792 Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent d50b8a8 commit 678d82b

Some content is hidden

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

49 files changed

+848
-446
lines changed

‎deps/cares/CMakeLists.txt

Lines changed: 12 additions & 10 deletions
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.34.4" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.34.5" )
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 "21:3:19")
33+
SET (CARES_LIB_VERSIONINFO "21:4:19")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -274,12 +274,14 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
274274
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "QNX")
275275
LIST (APPEND SYSFLAGS -D_QNX_SOURCE)
276276
ELSEIF (WIN32)
277-
LIST (APPEND SYSFLAGS -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_WIN32_WINNT=0x0602)
277+
LIST (APPEND SYSFLAGS -DWIN32_LEAN_AND_MEAN -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE)
278+
IF (NOT CMAKE_C_FLAGS MATCHES ".*-D_WIN32_WINNT=.*")
279+
LIST (APPEND SYSFLAGS -D_WIN32_WINNT=0x0602)
280+
ENDIF ()
278281
ENDIF ()
279282
ADD_DEFINITIONS(${SYSFLAGS})
280283

281284

282-
283285
# Tell C-Ares about libraries to depend on
284286
IF (HAVE_LIBRESOLV)
285287
LIST (APPEND CARES_DEPENDENT_LIBS resolv)
@@ -426,6 +428,7 @@ CHECK_SYMBOL_EXISTS (getservbyname_r "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_GETSERV
426428
CHECK_SYMBOL_EXISTS (gettimeofday "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_GETTIMEOFDAY)
427429
CHECK_SYMBOL_EXISTS (if_indextoname "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_IF_INDEXTONAME)
428430
CHECK_SYMBOL_EXISTS (if_nametoindex "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_IF_NAMETOINDEX)
431+
CHECK_SYMBOL_EXISTS (GetBestRoute2 "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_GETBESTROUTE2)
429432
CHECK_SYMBOL_EXISTS (ConvertInterfaceIndexToLuid "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONVERTINTERFACEINDEXTOLUID)
430433
CHECK_SYMBOL_EXISTS (ConvertInterfaceLuidToNameA "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONVERTINTERFACELUIDTONAMEA)
431434
CHECK_SYMBOL_EXISTS (NotifyIpInterfaceChange "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_NOTIFYIPINTERFACECHANGE)
@@ -503,11 +506,7 @@ IF (CARES_THREADS)
503506
CARES_EXTRAINCLUDE_IFSET (HAVE_PTHREAD_H pthread.h)
504507
CARES_EXTRAINCLUDE_IFSET (HAVE_PTHREAD_NP_H pthread_np.h)
505508
CHECK_SYMBOL_EXISTS (pthread_init "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_PTHREAD_INIT)
506-
# Make sure libcares.pc.cmake knows about thread libraries on static builds
507-
# The variable set by FIND_PACKAGE(Threads) has a -l prefix on it, we need
508-
# to strip that first since CARES_DEPENDENT_LIBS doesn't expect that.
509-
STRING (REPLACE "-l" "" CARES_THREAD_LIBRARY "${CMAKE_THREAD_LIBS_INIT}")
510-
LIST (APPEND CARES_DEPENDENT_LIBS ${CARES_THREAD_LIBRARY})
509+
LIST (APPEND CARES_DEPENDENT_LIBS ${CMAKE_THREAD_LIBS_INIT})
511510
ELSE ()
512511
MESSAGE (WARNING "Threading support not found, disabling...")
513512
SET (CARES_THREADS OFF)
@@ -777,7 +776,10 @@ IF (CARES_INSTALL)
777776

778777
# pkgconfig support for static builds
779778
FOREACH (LIB ${CARES_DEPENDENT_LIBS})
780-
SET (CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS} -l${LIB}")
779+
IF (NOT LIB MATCHES "^-")
780+
SET (LIB "-l${LIB}")
781+
ENDIF ()
782+
SET (CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS} ${LIB}")
781783
ENDFOREACH ()
782784

783785
CONFIGURE_FILE("libcares.pc.cmake" "libcares.pc" @ONLY)

‎deps/cares/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,7 @@ EGREP = @EGREP@
329329
ETAGS = @ETAGS@
330330
EXEEXT = @EXEEXT@
331331
FGREP = @FGREP@
332+
FILECMD = @FILECMD@
332333
GCOV = @GCOV@
333334
GENHTML = @GENHTML@
334335
GMOCK112_CFLAGS = @GMOCK112_CFLAGS@

‎deps/cares/Makefile.m32

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ RANLIB = $(CROSSPREFIX)ranlib
1919
#RM = rm -f
2020
CP = cp -afv
2121

22-
CFLAGS = $(CARES_CFLAG_EXTRAS) -O2 -Wall -I./include -I./src/lib -I./src/lib/include -D_WIN32_WINNT=0x0602
22+
WIN32_WINNT ?= 0x0602
23+
24+
CFLAGS = $(CARES_CFLAG_EXTRAS) -O2 -Wall -I./include -I./src/lib -I./src/lib/include -D_WIN32_WINNT=$(WIN32_WINNT)
2325
CFLAGS += -DCARES_STATICLIB
2426
LDFLAGS = $(CARES_LDFLAG_EXTRAS) -s
2527
LIBS = -lws2_32 -liphlpapi

‎deps/cares/RELEASE-NOTES.md

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
1-
## c-ares version 1.34.4 - December 14 2024
1+
## c-ares version 1.34.5 - April 8 2025
22

3-
This is a bugfix release.
3+
This is a security release.
4+
5+
Security:
6+
* CVE-2025-31498. A use-after-free bug has been uncovered in read_answers() that
7+
was introduced in v1.32.3. Please see https://github.com/c-ares/c-ares/security/advisories/GHSA-6hxc-62jh-p29v
48

59
Changes:
6-
* QNX Port: Port to QNX 8, add primary config reading support, add CI build. [PR #934](https://github.com/c-ares/c-ares/pull/934), [PR #937](https://github.com/c-ares/c-ares/pull/937), [PR #938](https://github.com/c-ares/c-ares/pull/938)
10+
* Restore Windows XP support. [PR #958](https://github.com/c-ares/c-ares/pull/958)
711

812
Bugfixes:
9-
* Empty TXT records were not being preserved. [PR #922](https://github.com/c-ares/c-ares/pull/922)
10-
* docs: update deprecation notices for `ares_create_query()` and `ares_mkquery()`. [PR #910](https://github.com/c-ares/c-ares/pull/910)
11-
* license: some files weren't properly updated. [PR #920](https://github.com/c-ares/c-ares/pull/920)
12-
* Fix bind local device regression from 1.34.0. [PR #929](https://github.com/c-ares/c-ares/pull/929), [PR #931](https://github.com/c-ares/c-ares/pull/931), [PR #935](https://github.com/c-ares/c-ares/pull/935)
13-
* CMake: set policy version to prevent deprecation warnings. [PR #932](https://github.com/c-ares/c-ares/pull/932)
14-
* CMake: shared and static library names should be the same on unix platforms like autotools uses. [PR #933](https://github.com/c-ares/c-ares/pull/933)
15-
* Update to latest autoconf archive macros for enhanced system compatibility. [PR #936](https://github.com/c-ares/c-ares/pull/936)
13+
* A missing mutex initialization would make busy polling for configuration
14+
changes (platforms other than Windows, Linux, MacOS) eat too much CPU
15+
[PR #974](https://github.com/c-ares/c-ares/pull/974)
16+
* Pkgconfig may be generated wrong for static builds in relation to `-pthread`
17+
[PR #965](https://github.com/c-ares/c-ares/pull/965)
18+
* Localhost resolution can fail if only one address family is in `/etc/hosts`
19+
[PR #947](https://github.com/c-ares/c-ares/pull/947)
1620

1721
Thanks go to these friendly people for their efforts and contributions for this
1822
release:
1923

2024
* Brad House (@bradh352)
21-
* Daniel Stenberg (@bagder)
22-
* Gregor Jasny (@gjasny)
23-
* @marcovsz
24-
* Nikolaos Chatzikonstantinou (@createyourpersonalaccount)
25-
* @vlasovsoft1979
25+
* Erik Lax (@eriklax)
26+
* Florian Pfisterer (@FlorianPfisterer)
27+
* Kai Pastor (@dg0yt)
28+

‎deps/cares/aminclude_static.am

Lines changed: 1 addition & 1 deletion
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 Sat Dec 14 15:15:44 UTC 2024
3+
# from AX_AM_MACROS_STATIC on Tue Apr 8 12:12:30 UTC 2025
44

55

66
# Code coverage

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy