Skip to content

Commit 0188962

Browse files
richardlaugithub-actions[bot]
authored andcommitted
deps: update c-ares to v1.34.6
1 parent e172be2 commit 0188962

31 files changed

+17387
-15408
lines changed

deps/cares/CMakeLists.txt

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

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -45,15 +45,6 @@ OPTION (CARES_THREADS "Build with thread-safety support"
4545
OPTION (CARES_COVERAGE "Build for code coverage" OFF)
4646
SET (CARES_RANDOM_FILE "/dev/urandom" CACHE STRING "Suitable File / Device Path for entropy, such as /dev/urandom")
4747

48-
49-
# Tests require a C++14 compiler
50-
IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
51-
set(CMAKE_CXX_STANDARD 14)
52-
set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
53-
set(CMAKE_CXX_EXTENSIONS FALSE)
54-
enable_language(CXX)
55-
ENDIF ()
56-
5748
# Tests require static to be enabled on Windows to be able to access otherwise hidden symbols
5849
IF ((CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS) AND (NOT CARES_STATIC) AND WIN32)
5950
SET (CARES_STATIC ON)
@@ -269,7 +260,7 @@ ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
269260
LIST (APPEND SYSFLAGS -D__EXTENSIONS__ -D_REENTRANT -D_XOPEN_SOURCE=600)
270261
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "AIX")
271262
LIST (APPEND SYSFLAGS -D_ALL_SOURCE -D_XOPEN_SOURCE=700 -D_USE_IRS)
272-
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
263+
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD")
273264
# Don't define _XOPEN_SOURCE on FreeBSD, it actually reduces visibility instead of increasing it
274265
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "QNX")
275266
LIST (APPEND SYSFLAGS -D_QNX_SOURCE)
@@ -630,6 +621,7 @@ IF (HAVE_GETADDRINFO)
630621
CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR
631622
CMAKE_SYSTEM_NAME STREQUAL "SunOS" OR
632623
CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR
624+
CMAKE_SYSTEM_NAME STREQUAL "MidnightBSD" OR
633625
CMAKE_SYSTEM_NAME STREQUAL "AIX" OR
634626
WIN32)
635627
SET (HAVE_GETADDRINFO_THREADSAFE 1)

deps/cares/Makefile.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ares_check_user_namespace.m4 \
133133
$(top_srcdir)/m4/ax_code_coverage.m4 \
134134
$(top_srcdir)/m4/ax_compiler_vendor.m4 \
135135
$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
136-
$(top_srcdir)/m4/ax_cxx_compile_stdcxx_14.m4 \
137136
$(top_srcdir)/m4/ax_file_escapes.m4 \
138137
$(top_srcdir)/m4/ax_pthread.m4 \
139138
$(top_srcdir)/m4/ax_require_defined.m4 \
@@ -334,10 +333,13 @@ GCOV = @GCOV@
334333
GENHTML = @GENHTML@
335334
GMOCK112_CFLAGS = @GMOCK112_CFLAGS@
336335
GMOCK112_LIBS = @GMOCK112_LIBS@
336+
GMOCK117_CFLAGS = @GMOCK117_CFLAGS@
337+
GMOCK117_LIBS = @GMOCK117_LIBS@
337338
GMOCK_CFLAGS = @GMOCK_CFLAGS@
338339
GMOCK_LIBS = @GMOCK_LIBS@
339340
GREP = @GREP@
340341
HAVE_CXX14 = @HAVE_CXX14@
342+
HAVE_CXX17 = @HAVE_CXX17@
341343
INSTALL = @INSTALL@
342344
INSTALL_DATA = @INSTALL_DATA@
343345
INSTALL_PROGRAM = @INSTALL_PROGRAM@

deps/cares/RELEASE-NOTES.md

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

33
This is a security release.
44

55
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
6+
* CVE-2025-62408. 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-jq53-42q6-pqr5
88

99
Changes:
10-
* Restore Windows XP support. [PR #958](https://github.com/c-ares/c-ares/pull/958)
10+
* Ignore Windows IDN Search Domains until proper IDN support is added. [PR #1034](https://github.com/c-ares/c-ares/pull/1034)
1111

1212
Bugfixes:
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)
13+
* Event Thread could stall when not notified of new queries on existing
14+
connections that are in a bad state
15+
[PR #1032](https://github.com/c-ares/c-ares/pull/1032)
16+
* fix conversion of invalid service to port number in ares_getaddrinfo()
17+
[PR #1029](https://github.com/c-ares/c-ares/pull/1029)
18+
* fix memory leak in ares_uri
19+
[PR #1012](https://github.com/c-ares/c-ares/pull/1012)
20+
* Ignore ares_event_configchg_init failures
21+
[PR #1009](https://github.com/c-ares/c-ares/pull/1009)
22+
* Use XOR for random seed generation on fallback logic.
23+
[PR #994](https://github.com/c-ares/c-ares/pull/994)
24+
* Fix clang build on windows.
25+
[PR #996](https://github.com/c-ares/c-ares/pull/996)
26+
* Fix IPv6 link-local nameservers in /etc/resolv.conf
27+
[PR #996](https://github.com/c-ares/c-ares/pull/997)
28+
* Fix a few build issues on MidnightBSD.
29+
[PR #983](https://github.com/c-ares/c-ares/pull/983)
2030

2131
Thanks go to these friendly people for their efforts and contributions for this
2232
release:
2333

2434
* Brad House (@bradh352)
25-
* Erik Lax (@eriklax)
26-
* Florian Pfisterer (@FlorianPfisterer)
27-
* Kai Pastor (@dg0yt)
35+
* (@F3lixTheCat)
36+
* Lucas Holt (@laffer1)
37+
* @oargon
38+
* Pavel P (@pps83)
39+
* Sean Harmer (@seanharmer)
40+
* Uwe (@nixblik)
41+
2842

deps/cares/aclocal.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1236,7 +1236,6 @@ m4_include([m4/ax_check_link_flag.m4])
12361236
m4_include([m4/ax_code_coverage.m4])
12371237
m4_include([m4/ax_compiler_vendor.m4])
12381238
m4_include([m4/ax_cxx_compile_stdcxx.m4])
1239-
m4_include([m4/ax_cxx_compile_stdcxx_14.m4])
12401239
m4_include([m4/ax_file_escapes.m4])
12411240
m4_include([m4/ax_pthread.m4])
12421241
m4_include([m4/ax_require_defined.m4])

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 Tue Apr 8 12:12:30 UTC 2025
3+
# from AX_AM_MACROS_STATIC on Mon Dec 8 16:21:41 UTC 2025
44

55

66
# Code coverage

0 commit comments

Comments
 (0)