git: 28a0ff93bf97 - main - dns/c-ares: Update to 1.23.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Daniel Engberg <diizzy_at_FreeBSD.org>
Date: Sun, 03 Dec 2023 07:34:54 UTC
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=28a0ff93bf97192898d928052deb85ebf6bdbd7c

commit 28a0ff93bf97192898d928052deb85ebf6bdbd7c
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-12-02 18:08:36 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2023-12-03 07:33:40 +0000

    dns/c-ares: Update to 1.23.0
    
    Changelog: https://c-ares.org/changelog.html#1_23_0
    
    PR:             275204
    Reviewed by:    zi (maintainer)
    Sponsored by:   Blinkinblox
---
 dns/c-ares/Makefile                        |  5 +++--
 dns/c-ares/distinfo                        |  6 +++---
 dns/c-ares/files/patch-CMakeLists.txt      | 11 +++++++++++
 dns/c-ares/files/patch-test_CMakeLists.txt | 30 ++++++++++++------------------
 dns/c-ares/pkg-plist                       |  3 ++-
 5 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/dns/c-ares/Makefile b/dns/c-ares/Makefile
index 1feaf95c0d57..3b04524eb9bc 100644
--- a/dns/c-ares/Makefile
+++ b/dns/c-ares/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	c-ares
-DISTVERSION=	1.22.0
+DISTVERSION=	1.23.0
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/cares-${DISTVERSION:S/./_/g}/ \
 		https://c-ares.org/download/
@@ -20,8 +20,9 @@ CMAKE_ARGS=		-DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man
 
 OPTIONS_DEFINE=		TEST
 
-TEST_USES=		compiler:c++14-lang localbase:ldflags
 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 b18321d0647b..6bcf80b25fce 100644
--- a/dns/c-ares/distinfo
+++ b/dns/c-ares/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1700165043
-SHA256 (c-ares-1.22.0.tar.gz) = ad2e205088083317147c9f9eab5f24b82c3d50927c381a7c963deeb1182dbc21
-SIZE (c-ares-1.22.0.tar.gz) = 1662808
+TIMESTAMP = 1701376544
+SHA256 (c-ares-1.23.0.tar.gz) = cb614ecf78b477d35963ebffcf486fc9d55cc3d3216f00700e71b7d4868f79f5
+SIZE (c-ares-1.23.0.tar.gz) = 1681336
diff --git a/dns/c-ares/files/patch-CMakeLists.txt b/dns/c-ares/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..bba6ffb5a9e0
--- /dev/null
+++ b/dns/c-ares/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- 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
index fe592e36ff0b..3c9d77aa3ac4 100644
--- a/dns/c-ares/files/patch-test_CMakeLists.txt
+++ b/dns/c-ares/files/patch-test_CMakeLists.txt
@@ -1,12 +1,6 @@
---- test/CMakeLists.txt.orig	2023-05-22 11:33:56 UTC
+--- test/CMakeLists.txt.orig	2023-11-30 20:29:02 UTC
 +++ test/CMakeLists.txt
-@@ -1,4 +1,4 @@
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 14)
- set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
- set(CMAKE_CXX_EXTENSIONS FALSE)
- 
-@@ -25,14 +25,14 @@ ELSE ()
+@@ -27,14 +27,14 @@ ENDIF ()
  ENDIF ()
  
  # Google Test and Mock
@@ -18,18 +12,18 @@
 -)
 -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})
- 
++#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
  
-@@ -43,7 +43,7 @@ configure_file(${CARES_TOPLEVEL_DIR}/src/lib/ares_conf
+ 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})
diff --git a/dns/c-ares/pkg-plist b/dns/c-ares/pkg-plist
index c94b65aeae7a..6244f2e3ed1e 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.8.0
+lib/libcares.so.2.9.0
 libdata/pkgconfig/libcares.pc
 man/man1/adig.1.gz
 man/man1/ahost.1.gz
@@ -138,6 +138,7 @@ man/man3/ares_set_socket_functions.3.gz
 man/man3/ares_set_sortlist.3.gz
 man/man3/ares_strerror.3.gz
 man/man3/ares_svcb_param_t.3.gz
+man/man3/ares_threadsafety.3.gz
 man/man3/ares_timeout.3.gz
 man/man3/ares_tlsa_match_t.3.gz
 man/man3/ares_tlsa_selector_t.3.gz