Merge branch 'nodejs:main' into main

nodejs · Aug 27, 2024 · a688801 · a688801
2 parents bcb414d + c00ea01
commit a688801
Show file tree

Hide file tree

Showing 48 changed files with 818 additions and 524 deletions.
diff --git a/deps/cares/CMakeLists.txt b/deps/cares/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles)
 INCLUDE (CheckStructHasMember)
 INCLUDE (CheckLibraryExists)
 
-PROJECT (c-ares LANGUAGES C VERSION "1.33.0" )
+PROJECT (c-ares LANGUAGES C VERSION "1.33.1" )
 
 # Set this version before release
 SET (CARES_VERSION "${PROJECT_VERSION}")
@@ -30,7 +30,7 @@ INCLUDE (GNUInstallDirs) # include this *AFTER* PROJECT(), otherwise paths are w
 # For example, a version of 4:0:2 would generate output such as:
 #    libname.so   -> libname.so.2
 #    libname.so.2 -> libname.so.2.2.0
-SET (CARES_LIB_VERSIONINFO "20:0:18")
+SET (CARES_LIB_VERSIONINFO "20:1:18")
 
 
 OPTION (CARES_STATIC        "Build as a static library"                                             OFF)
@@ -772,12 +772,11 @@ IF (CARES_INSTALL)
 	INSTALL (EXPORT ${PROJECT_NAME}-targets COMPONENT Devel DESTINATION ${CMAKECONFIG_INSTALL_DIR} NAMESPACE ${PROJECT_NAME}::)
 	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})
 
-	# pkgconfig support
-	IF (NOT CARES_SHARED)
-		FOREACH (LIB ${CARES_DEPENDENT_LIBS})
-			SET (CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS} -l${LIB}")
-		ENDFOREACH ()
-	ENDIF ()
+	# pkgconfig support for static builds
+	FOREACH (LIB ${CARES_DEPENDENT_LIBS})
+		SET (CARES_PRIVATE_LIBS "${CARES_PRIVATE_LIBS} -l${LIB}")
+	ENDFOREACH ()
+
 	CONFIGURE_FILE("libcares.pc.cmake" "libcares.pc" @ONLY)
 	INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
 ENDIF ()

diff --git a/deps/cares/Makefile.in b/deps/cares/Makefile.in
@@ -328,6 +328,8 @@ FGREP = @FGREP@
 FILECMD = @FILECMD@
 GCOV = @GCOV@
 GENHTML = @GENHTML@
+GMOCK112_CFLAGS = @GMOCK112_CFLAGS@
+GMOCK112_LIBS = @GMOCK112_LIBS@
 GMOCK_CFLAGS = @GMOCK_CFLAGS@
 GMOCK_LIBS = @GMOCK_LIBS@
 GREP = @GREP@

diff --git a/deps/cares/RELEASE-NOTES.md b/deps/cares/RELEASE-NOTES.md
@@ -1,3 +1,35 @@
+## c-ares version 1.33.1 - August 23 2024
+
+This is a bugfix release.
+
+Bugfixes:
+* Work around systemd-resolved quirk that returns unexpected codes for single
+  label names.  Also adds test cases to validate the work around works and
+  will continue to work in future releases.
+  [PR #863](https://github.com/c-ares/c-ares/pull/863),
+  See Also https://github.com/systemd/systemd/issues/34101
+* Fix sysconfig ndots default value, also adds containerized test case to
+  prevent future regressions.
+  [PR #862](https://github.com/c-ares/c-ares/pull/862)
+* Fix blank DNS name returning error code rather than valid record for
+  commands like: `adig -t SOA .`.  Also adds test case to prevent future
+  regressions.
+  [9e574af](https://github.com/c-ares/c-ares/commit/9e574af)
+* Fix calculation of query times > 1s.
+  [2b2eae7](https://github.com/c-ares/c-ares/commit/2b2eae7)
+* Fix building on old Linux releases that don't have `TCP_FASTOPEN_CONNECT`.
+  [b7a89b9](https://github.com/c-ares/c-ares/commit/b7a89b9)
+* Fix minor Android build warnings.
+  [PR #848](https://github.com/c-ares/c-ares/pull/848)
+
+Thanks go to these friendly people for their efforts and contributions for this
+release:
+* Brad House (@bradh352)
+* Erik Lax (@eriklax)
+* Hans-Christian Egtvedt (@egtvedt)
+* Mikael Lindemann (@mikaellindemann)
+* Nodar Chkuaselidze (@nodech)
+
 ## c-ares version 1.33.0 - August 2 2024
 
 This is a feature and bugfix release.

diff --git a/deps/cares/aminclude_static.am b/deps/cares/aminclude_static.am
@@ -1,6 +1,6 @@
 
 # aminclude_static.am generated automatically by Autoconf
-# from AX_AM_MACROS_STATIC on Fri Aug  2 08:48:39 EDT 2024
+# from AX_AM_MACROS_STATIC on Fri Aug 23 09:37:25 EDT 2024
 
 
 # Code coverage