From nobody Sun Dec 03 07:34:54 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SjdqM1wFZz52Pjk; Sun, 3 Dec 2023 07:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SjdqM1S6Fz3HfL; Sun, 3 Dec 2023 07:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701588895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M/8TMsBcJiTCpKV7imQ6lKM+GzXIBKfseunmKVepzZE=; b=OELeaWUqckTKsLuL+187bscRES+EXxqUXzwDO+u7uOkeqsLyxczS5GKeNvx5yX5c/m1rQA gMMs/HoEgV0h3fvaklWDX9pmbR0NECWSFuNECTU7GxgFLbR5FqfYJQMdCAuLxSZBxhHCq0 xsk4h4kRu7j95v7MOkRFkmqOU5Lq4iR70o9wDX5VQlGjwbPuIU+W6JX0TXWwIEk5aIQY4k Br3txkdJqMrAAeoeKesdE0qGYCOMuNaWjhfviZxgvvXOfe9d9n0D6k0W7eumdlEYfpaOHl jHFHRu0MOo072EQhXUKIzD660WHFS8JkKsk/g/90VaP+jRJch9iSOwEqfVWUXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701588895; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M/8TMsBcJiTCpKV7imQ6lKM+GzXIBKfseunmKVepzZE=; b=WEFjk9rwS+wUTnFAATKjf2g3RI2R3CwoOWbBobLjI3sG6dhF/H5cx22KMts2eMy+AbHiXN eUosxApuHCcsrFIyrb3nhFWtA4OOAYV5Go/pK8s9mK922wtcVSVz16hWIdx9H/oV0Qfrs8 exBW6TEE6z/mSL9Od4Od6FUGdGtrDv3h844X3KC0zSVUvptM/tDSQAsysu0RwgohV1/JGb QOpYp2z1HF9XnmzKdAxMUDJPoBO7zteQ3UGJLPkhoH/yqAPADfVKtHX3Po8mHj5/oKDXxm w7q4x+vSEs/lOZV+Oqw672HP43EOvj6HY47y/sdZS6q+KfheO7/7eLvrXyjF9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701588895; a=rsa-sha256; cv=none; b=kYs30OeqkF28PXM1R4GLExvwSPsobAJw5mBIcS0BW4dkiKl3gUpb0k3vHTqBcpm/oAmMtD dg7wOpMsrl0XfUrdP6XUXpd2xlUyCSO+glrIDCGPNIen7tohHbaJmIrVBahC4+HEIqgSkb brL3aJDNdfNK9vVrnJW4wikkThOhhY0dZJVXeJFICZI/zRO4ATLQmlo3ZZDn8Tv/+wyU5t eM8kH8nCe1AdnsC6smt/YEIkflqPsHIQfWEr+sBWgNnARlE5CmTA32bKi4s8teC/vSvAzM 3WjNsuzpKvYL2gfANUYyMwUYvtrMyKsYQD8CrGN1aCmbA087IWE+Kl0jArGQkg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SjdqM0YStzqlX; Sun, 3 Dec 2023 07:34:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B37Ys8e002492; Sun, 3 Dec 2023 07:34:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B37YsX7002489; Sun, 3 Dec 2023 07:34:54 GMT (envelope-from git) Date: Sun, 3 Dec 2023 07:34:54 GMT Message-Id: <202312030734.3B37YsX7002489@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 28a0ff93bf97 - main - dns/c-ares: Update to 1.23.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28a0ff93bf97192898d928052deb85ebf6bdbd7c Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=28a0ff93bf97192898d928052deb85ebf6bdbd7c commit 28a0ff93bf97192898d928052deb85ebf6bdbd7c Author: Daniel Engberg AuthorDate: 2023-12-02 18:08:36 +0000 Commit: Daniel Engberg 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