dns/c-ares: Update to 1.24.0

Changelog: https://c-ares.org/changelog.html#1_24_0

PR:		275813
Reviewed by:	zi (maintainer)
Sponsored by:	Blinkinblox

5 files changed, 11 insertions, 51 deletions

diff --git a/dns/c-ares/Makefile b/dns/c-ares/Makefile
index 3b04524eb9bc..fb3593946e28 100644
--- a/dns/c-ares/Makefile
+++ b/dns/c-ares/Makefile
@@ -1,9 +1,12 @@
 PORTNAME=	c-ares
-DISTVERSION=	1.23.0
+DISTVERSION=	1.24.0
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/cares-${DISTVERSION:S/./_/g}/ \
 		https://c-ares.org/download/
 
+PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
+PATCHFILES=	7dd384a99cc385e408e64c3e0af4e0e2136ed034.patch:-p1
+
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Asynchronous DNS resolver library
 WWW=		https://c-ares.haxx.se/
@@ -22,7 +25,6 @@ OPTIONS_DEFINE=		TEST
 
 TEST_BUILD_DEPENDS=	googletest>0:devel/googletest
 TEST_USES=		compiler:c++14-lang localbase:ldflags
-TEST_USE_CXXSTD=	c++14
 TEST_TEST_TARGET=	test
 TEST_CMAKE_BOOL=	CARES_BUILD_TESTS
 
diff --git a/dns/c-ares/distinfo b/dns/c-ares/distinfo
index 6bcf80b25fce..03492bb44345 100644
--- a/dns/c-ares/distinfo
+++ b/dns/c-ares/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1701376544
-SHA256 (c-ares-1.23.0.tar.gz) = cb614ecf78b477d35963ebffcf486fc9d55cc3d3216f00700e71b7d4868f79f5
-SIZE (c-ares-1.23.0.tar.gz) = 1681336
+TIMESTAMP = 1702828727
+SHA256 (c-ares-1.24.0.tar.gz) = c517de6d5ac9cd55a9b72c1541c3e25b84588421817b5f092850ac09a8df5103
+SIZE (c-ares-1.24.0.tar.gz) = 1368749
+SHA256 (7dd384a99cc385e408e64c3e0af4e0e2136ed034.patch) = 0e8b2aa7c199998977a8b1bc4acf40416acea55c9d16d7186a4022c8fab2c694
+SIZE (7dd384a99cc385e408e64c3e0af4e0e2136ed034.patch) = 3279
diff --git a/dns/c-ares/files/patch-CMakeLists.txt b/dns/c-ares/files/patch-CMakeLists.txt
deleted file mode 100644
index bba6ffb5a9e0..000000000000
--- a/dns/c-ares/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2023-11-30 20:53:51 UTC
-+++ CMakeLists.txt
-@@ -47,7 +47,7 @@ IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
- 
- # Tests require a C++ compiler
- IF (CARES_BUILD_TESTS OR CARES_BUILD_CONTAINER_TESTS)
--	set(CMAKE_CXX_STANDARD 11)
-+	set(CMAKE_CXX_STANDARD 14)
- 	set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
- 	set(CMAKE_CXX_EXTENSIONS FALSE)
- 	enable_language(CXX)
diff --git a/dns/c-ares/files/patch-test_CMakeLists.txt b/dns/c-ares/files/patch-test_CMakeLists.txt
deleted file mode 100644
index 3c9d77aa3ac4..000000000000
--- a/dns/c-ares/files/patch-test_CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
---- test/CMakeLists.txt.orig	2023-11-30 20:29:02 UTC
-+++ test/CMakeLists.txt
-@@ -27,14 +27,14 @@ ENDIF ()
- ENDIF ()
- 
- # Google Test and Mock
--set(GMOCK_DIR gmock-1.11.0)
--add_library(gmock STATIC
--  ${GMOCK_DIR}/gmock-gtest-all.cc
--  ${GMOCK_DIR}/gmock/gmock.h
--  ${GMOCK_DIR}/gtest/gtest.h
--)
--target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})
--target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})
-+#set(GMOCK_DIR gmock-1.11.0)
-+#add_library(gmock STATIC
-+#  ${GMOCK_DIR}/gmock-gtest-all.cc
-+#  ${GMOCK_DIR}/gmock/gmock.h
-+#  ${GMOCK_DIR}/gtest/gtest.h
-+#)
-+#target_include_directories(gmock PUBLIC SYSTEM ${GMOCK_DIR})
-+#target_link_libraries(gmock PRIVATE ${CMAKE_THREAD_LIBS_INIT})
- # test targets
- 
- transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
-@@ -44,7 +44,7 @@ target_include_directories(arestest PRIVATE ${CMAKE_CU
- 
- add_executable(arestest ${TESTSOURCES} ${TESTHEADERS})
- target_include_directories(arestest PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
--target_link_libraries(arestest PRIVATE caresinternal gmock)
-+target_link_libraries(arestest PRIVATE caresinternal gtest gmock)
- 
- IF (CARES_BUILD_CONTAINER_TESTS)
-   target_compile_definitions(arestest PRIVATE HAVE_USER_NAMESPACE HAVE_UTS_NAMESPACE)
diff --git a/dns/c-ares/pkg-plist b/dns/c-ares/pkg-plist
index 6244f2e3ed1e..2168aae2d093 100644
--- a/dns/c-ares/pkg-plist
+++ b/dns/c-ares/pkg-plist
@@ -13,7 +13,7 @@ lib/cmake/c-ares/c-ares-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/c-ares/c-ares-targets.cmake
 lib/libcares.so
 lib/libcares.so.2
-lib/libcares.so.2.9.0
+lib/libcares.so.2.10.0
 libdata/pkgconfig/libcares.pc
 man/man1/adig.1.gz
 man/man1/ahost.1.gz
@@ -91,6 +91,7 @@ man/man3/ares_free_hostent.3.gz
 man/man3/ares_free_string.3.gz
 man/man3/ares_freeaddrinfo.3.gz
 man/man3/ares_get_servers.3.gz
+man/man3/ares_get_servers_csv.3.gz
 man/man3/ares_get_servers_ports.3.gz
 man/man3/ares_getaddrinfo.3.gz
 man/man3/ares_gethostbyaddr.3.gz