Skip to content

Commit 239588b

Browse files
nodejs-github-bottargos
authored andcommittedOct 2, 2024
deps: update c-ares to v1.33.0
PR-URL: #54198 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com>
1 parent 59a3952 commit 239588b

File tree

120 files changed

+4919
-2705
lines changed

Some content is hidden

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

120 files changed

+4919
-2705
lines changed
 

‎deps/cares/CMakeLists.txt

+32-3
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.32.3" )
15+
PROJECT (c-ares LANGUAGES C VERSION "1.33.0" )
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 "19:3:17")
33+
SET (CARES_LIB_VERSIONINFO "20:0:18")
3434

3535

3636
OPTION (CARES_STATIC "Build as a static library" OFF)
@@ -42,6 +42,7 @@ OPTION (CARES_BUILD_CONTAINER_TESTS "Build and run container tests (implies CARE
4242
OPTION (CARES_BUILD_TOOLS "Build tools" ON)
4343
OPTION (CARES_SYMBOL_HIDING "Hide private symbols in shared libraries" OFF)
4444
OPTION (CARES_THREADS "Build with thread-safety support" ON)
45+
OPTION (CARES_COVERAGE "Build for code coverage" OFF)
4546
SET (CARES_RANDOM_FILE "/dev/urandom" CACHE STRING "Suitable File / Device Path for entropy, such as /dev/urandom")
4647

4748

@@ -265,7 +266,7 @@ IF (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
265266
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "Linux")
266267
LIST (APPEND SYSFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700)
267268
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "SunOS")
268-
LIST (APPEND SYSFLAGS -D__EXTENSIONS__ -D_REENTRANT -D_XOPEN_SOURCE=700)
269+
LIST (APPEND SYSFLAGS -D__EXTENSIONS__ -D_REENTRANT -D_XOPEN_SOURCE=600)
269270
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "AIX")
270271
LIST (APPEND SYSFLAGS -D_ALL_SOURCE -D_XOPEN_SOURCE=700 -D_USE_IRS)
271272
ELSEIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
@@ -409,6 +410,7 @@ CHECK_STRUCT_HAS_MEMBER("struct sockaddr_in6" sin6_scope_id "${CMAKE_EXTRA_INCLU
409410
CHECK_SYMBOL_EXISTS (closesocket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CLOSESOCKET)
410411
CHECK_SYMBOL_EXISTS (CloseSocket "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CLOSESOCKET_CAMEL)
411412
CHECK_SYMBOL_EXISTS (connect "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONNECT)
413+
CHECK_SYMBOL_EXISTS (connectx "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONNECTX)
412414
CHECK_SYMBOL_EXISTS (fcntl "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_FCNTL)
413415
CHECK_SYMBOL_EXISTS (freeaddrinfo "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_FREEADDRINFO)
414416
CHECK_SYMBOL_EXISTS (getaddrinfo "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_GETADDRINFO)
@@ -423,6 +425,10 @@ CHECK_SYMBOL_EXISTS (if_indextoname "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_IF_INDE
423425
CHECK_SYMBOL_EXISTS (if_nametoindex "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_IF_NAMETOINDEX)
424426
CHECK_SYMBOL_EXISTS (ConvertInterfaceIndexToLuid "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONVERTINTERFACEINDEXTOLUID)
425427
CHECK_SYMBOL_EXISTS (ConvertInterfaceLuidToNameA "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_CONVERTINTERFACELUIDTONAMEA)
428+
CHECK_SYMBOL_EXISTS (NotifyIpInterfaceChange "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_NOTIFYIPINTERFACECHANGE)
429+
CHECK_SYMBOL_EXISTS (RegisterWaitForSingleObject "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_REGISTERWAITFORSINGLEOBJECT)
430+
431+
426432
CHECK_SYMBOL_EXISTS (inet_net_pton "${CMAKE_EXTRA_INCLUDE_FILES}" HAVE_INET_NET_PTON)
427433
IF (NOT WIN32)
428434
# Disabled on Windows, because these functions are only really supported on Windows
@@ -682,6 +688,27 @@ IF (HAVE_ARPA_NAMESER_COMPAT_H)
682688
SET (CARES_HAVE_ARPA_NAMESER_COMPAT_H 1)
683689
ENDIF()
684690

691+
692+
# Coverage
693+
IF (CARES_COVERAGE)
694+
# set compiler flags
695+
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ftest-coverage -fprofile-arcs")
696+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftest-coverage -fprofile-arcs")
697+
698+
# find required tools
699+
FIND_PROGRAM(LCOV lcov REQUIRED)
700+
FIND_PROGRAM(GENHTML genhtml REQUIRED)
701+
702+
# add coverage target
703+
ADD_CUSTOM_TARGET(coverage
704+
# gather data
705+
COMMAND ${LCOV} --directory . --capture --output-file coverage.info
706+
# generate report
707+
COMMAND ${GENHTML} --demangle-cpp -o coverage coverage.info
708+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
709+
)
710+
ENDIF()
711+
685712
# TRANSFORM_MAKEFILE_INC
686713
#
687714
# This function consumes the "Makefile.inc" autotools file, and converts it into
@@ -729,6 +756,8 @@ IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
729756
ENDIF ()
730757

731758

759+
760+
732761
# Export targets
733762
IF (CARES_INSTALL)
734763
SET (CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")

‎deps/cares/LICENSE.md

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# c-ares license
2-
31
MIT License
42

53
Copyright (c) 1998 Massachusetts Institute of Technology

0 commit comments

Comments
 (0)
Please sign in to comment.