From nobody Thu Dec 21 03:20:27 2023 X-Original-To: dev-commits-ports-main@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 4SwbKR5cZ1z54CVt; Thu, 21 Dec 2023 03:20:27 +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 4SwbKR4y2rz4Sdj; Thu, 21 Dec 2023 03:20:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703128827; 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=Vb4QytlkTTThHMkN7bK90hgYlmnMobovW3Dr4gur+MI=; b=O69xZlVm89xj4R79SGCRZSucfiDaKahJCAy7Z/7Hhh2lGqQTB+V7uKygCwRnpBrPkv5VSw 4Gb7j5Unf8TjJoKTk4oPI5WQUf7to3Vua4QF/ytifr/LsJYXOu+nVepw/A4ddd2p8Xs4GY xViaATJNYKe6tBWZdMofAx20o6RbHqKkhAdXiSd8c2pyunxCheNVJoXXzYlPv9xcYTa+kL iKGKPiIBB06DbevlzBVdX+bfu4QKM40fRc/2cgqXvEcQyLeXwZ0lpOJINqhH3mGLkV5iL/ sfQp/j5Vv/3tGhFTG+AoquQXuGqAIahd9GbiH6jk+mFT19SEXs/T30AieabNbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703128827; a=rsa-sha256; cv=none; b=LFqvO8A7rkFY7ElztwM21YPCx5OnDK6YkEjOXv9FWF/0uv2g6uGGJ+xp40gxkzT7DB3NtU tyrdm3gefyo2jtxeNZr4spJKIGP+H4zOGn948sbcNN2edYWa+RA/MnCDWGOjCsy2dYISuI tsZcooyJmupQ8ozYq0gVOP8FjOIYXYRUu4dARa/KWtuTzzkUskpdtHX/o51HWLpkZPBDI+ vRixdqZCGzgtuanP7GUgDueFJVwKta3msUSjKb0tcq8XeXh1og6y28DJqIEFY+wwAU2XEi i/N6CS8ZEghU2Mme9cU2ZgO1/IpYTgT4Fa6qqw5nwewErxJqRrDi5yPKhgSh3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703128827; 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=Vb4QytlkTTThHMkN7bK90hgYlmnMobovW3Dr4gur+MI=; b=M0+lD/mUqU93xSutXzIBQk32QA4ed/q1mGJgPgWDB6VvgFdoSCSYAE5+6r5XzFndFxTkT9 qvKpsBNU0TNibNyrgR15w3Y3p8OWVUnAMLql7+jcj8rAnOMfzt1QFkELbs071kYHDhaGUy QAKc317GEfjfHX8wFXuzxABYa+i2BJ1yFUZNyPS9c/I/Bdzh+0nS/OcfFGP0lYbe82LyE/ BUTEwwZHYApill6DSmcoOBcjgT0Xo6yn72VOQY7lc33E40/F5S0aTbiQghMx35lZwZdsaZ 8g/89n6ik/mZUEd7f1y+Wfi1W2Oe0YSzswHsWHGi+N6dfCYi3rmouxxdOThmlg== 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 4SwbKR4341z1qV; Thu, 21 Dec 2023 03:20:27 +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 3BL3KRaQ031774; Thu, 21 Dec 2023 03:20:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BL3KRDr031771; Thu, 21 Dec 2023 03:20:27 GMT (envelope-from git) Date: Thu, 21 Dec 2023 03:20:27 GMT Message-Id: <202312210320.3BL3KRDr031771@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: 184139bd4d6b - main - dns/c-ares: Update to 1.24.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 184139bd4d6b21fcca60c372fc2970ca92b513be Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=184139bd4d6b21fcca60c372fc2970ca92b513be commit 184139bd4d6b21fcca60c372fc2970ca92b513be Author: Daniel Engberg AuthorDate: 2023-12-21 03:17:52 +0000 Commit: Daniel Engberg CommitDate: 2023-12-21 03:18:40 +0000 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 --- dns/c-ares/Makefile | 6 ++++-- dns/c-ares/distinfo | 8 ++++--- dns/c-ares/files/patch-CMakeLists.txt | 11 ---------- dns/c-ares/files/patch-test_CMakeLists.txt | 34 ------------------------------ dns/c-ares/pkg-plist | 3 ++- 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