Skip to content

Commit 7f8edce

Browse files
nodejs-github-bottargos
nodejs-github-bot
authored and
targos
committed
deps: update c-ares to v1.33.1
PR-URL: #54549 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Marco Ippolito <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]>
1 parent d6b9cc3 commit 7f8edce

28 files changed

Lines changed: 495 additions & 311 deletions

‎deps/cares/CMakeLists.txt‎

Lines changed: 7 additions & 8 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.33.0" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.33.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:0:18")
33+
SET (CARES_LIB_VERSIONINFO "20:1:18")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -772,12 +772,11 @@ IF (CARES_INSTALL)
772772
INSTALL (EXPORT ${PROJECT_NAME}-targets COMPONENT Devel DESTINATION ${CMAKECONFIG_INSTALL_DIR} NAMESPACE ${PROJECT_NAME}::)
773773
INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake" COMPONENT Devel DESTINATION ${CMAKECONFIG_INSTALL_DIR})
774774

775-
# pkgconfig support
776-
IF (NOT CARES_SHARED)
777-
FOREACH (LIB ${CARES_DEPENDENT_LIBS})
778-
SET (CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS} -l${LIB}")
779-
ENDFOREACH ()
780-
ENDIF ()
775+
# pkgconfig support for static builds
776+
FOREACH (LIB ${CARES_DEPENDENT_LIBS})
777+
SET (CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS} -l${LIB}")
778+
ENDFOREACH ()
779+
781780
CONFIGURE_FILE("libcares.pc.cmake" "libcares.pc" @ONLY)
782781
INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
783782
ENDIF ()

‎deps/cares/Makefile.in‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,8 @@ FGREP = @FGREP@
328328
FILECMD = @FILECMD@
329329
GCOV = @GCOV@
330330
GENHTML = @GENHTML@
331+
GMOCK112_CFLAGS = @GMOCK112_CFLAGS@
332+
GMOCK112_LIBS = @GMOCK112_LIBS@
331333
GMOCK_CFLAGS = @GMOCK_CFLAGS@
332334
GMOCK_LIBS = @GMOCK_LIBS@
333335
GREP = @GREP@

‎deps/cares/RELEASE-NOTES.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
## c-ares version 1.33.1 - August 23 2024
2+
3+
This is a bugfix release.
4+
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)
32+
133
## c-ares version 1.33.0 - August 2 2024
234

335
This is a feature and bugfix release.

‎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 Fri Aug 2 08:48:39 EDT 2024
3+
# from AX_AM_MACROS_STATIC on Fri Aug 23 09:37:25 EDT 2024
44

55

66
# Code coverage

0 commit comments

Comments
 (0)