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,33 +1,35 @@ 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/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= cmake compiler:c++11-lang pathfix USE_LDCONFIG= yes CONFLICTS= py*-ripe.atlas.tools CMAKE_ARGS= -DCMAKE_INSTALL_MANDIR:PATH=${MANPREFIX}/man 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 post-patch: @${REINPLACE_CMD} -e 's|ares-test-live.cc||g' \ ${PATCH_WRKSRC}/test/Makefile.inc .include 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 @@ -1,146 +1,147 @@ bin/adig bin/ahost include/ares.h include/ares_build.h include/ares_dns.h include/ares_dns_record.h include/ares_nameser.h include/ares_rules.h include/ares_version.h lib/cmake/c-ares/c-ares-config-version.cmake lib/cmake/c-ares/c-ares-config.cmake 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 man/man3/ares_cancel.3.gz man/man3/ares_create_query.3.gz man/man3/ares_destroy.3.gz man/man3/ares_destroy_options.3.gz man/man3/ares_dns_class_fromstr.3.gz man/man3/ares_dns_class_t.3.gz man/man3/ares_dns_class_tostr.3.gz man/man3/ares_dns_datatype_t.3.gz man/man3/ares_dns_flags_t.3.gz man/man3/ares_dns_mapping.3.gz man/man3/ares_dns_opcode_t.3.gz man/man3/ares_dns_opcode_tostr.3.gz man/man3/ares_dns_opt_datatype_t.3.gz man/man3/ares_dns_opt_get_datatype.3.gz man/man3/ares_dns_opt_get_name.3.gz man/man3/ares_dns_parse.3.gz man/man3/ares_dns_rcode_t.3.gz man/man3/ares_dns_rcode_tostr.3.gz man/man3/ares_dns_rec_type_fromstr.3.gz man/man3/ares_dns_rec_type_t.3.gz man/man3/ares_dns_record.3.gz man/man3/ares_dns_record_create.3.gz man/man3/ares_dns_record_destroy.3.gz man/man3/ares_dns_record_get_flags.3.gz man/man3/ares_dns_record_get_id.3.gz man/man3/ares_dns_record_get_opcode.3.gz man/man3/ares_dns_record_get_rcode.3.gz man/man3/ares_dns_record_query_add.3.gz man/man3/ares_dns_record_query_cnt.3.gz man/man3/ares_dns_record_query_get.3.gz man/man3/ares_dns_record_rr_add.3.gz man/man3/ares_dns_record_rr_cnt.3.gz man/man3/ares_dns_record_rr_del.3.gz man/man3/ares_dns_record_rr_get.3.gz man/man3/ares_dns_rr.3.gz man/man3/ares_dns_rr_get_addr.3.gz man/man3/ares_dns_rr_get_addr6.3.gz man/man3/ares_dns_rr_get_bin.3.gz man/man3/ares_dns_rr_get_class.3.gz man/man3/ares_dns_rr_get_keys.3.gz man/man3/ares_dns_rr_get_name.3.gz man/man3/ares_dns_rr_get_opt.3.gz man/man3/ares_dns_rr_get_opt_byid.3.gz man/man3/ares_dns_rr_get_opt_cnt.3.gz man/man3/ares_dns_rr_get_str.3.gz man/man3/ares_dns_rr_get_ttl.3.gz man/man3/ares_dns_rr_get_type.3.gz man/man3/ares_dns_rr_get_u16.3.gz man/man3/ares_dns_rr_get_u32.3.gz man/man3/ares_dns_rr_get_u8.3.gz man/man3/ares_dns_rr_key_datatype.3.gz man/man3/ares_dns_rr_key_t.3.gz man/man3/ares_dns_rr_key_to_rec_type.3.gz man/man3/ares_dns_rr_key_tostr.3.gz man/man3/ares_dns_rr_set_addr.3.gz man/man3/ares_dns_rr_set_addr6.3.gz man/man3/ares_dns_rr_set_bin.3.gz man/man3/ares_dns_rr_set_opt.3.gz man/man3/ares_dns_rr_set_str.3.gz man/man3/ares_dns_rr_set_u16.3.gz man/man3/ares_dns_rr_set_u32.3.gz man/man3/ares_dns_rr_set_u8.3.gz man/man3/ares_dns_section_t.3.gz man/man3/ares_dns_section_tostr.3.gz man/man3/ares_dns_write.3.gz man/man3/ares_dup.3.gz man/man3/ares_expand_name.3.gz man/man3/ares_expand_string.3.gz man/man3/ares_fds.3.gz man/man3/ares_free_data.3.gz 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 man/man3/ares_gethostbyname.3.gz man/man3/ares_gethostbyname_file.3.gz man/man3/ares_getnameinfo.3.gz man/man3/ares_getsock.3.gz man/man3/ares_inet_ntop.3.gz man/man3/ares_inet_pton.3.gz man/man3/ares_init.3.gz man/man3/ares_init_options.3.gz man/man3/ares_library_cleanup.3.gz man/man3/ares_library_init.3.gz man/man3/ares_library_init_android.3.gz man/man3/ares_library_initialized.3.gz man/man3/ares_mkquery.3.gz man/man3/ares_opt_param_t.3.gz man/man3/ares_parse_a_reply.3.gz man/man3/ares_parse_aaaa_reply.3.gz man/man3/ares_parse_caa_reply.3.gz man/man3/ares_parse_mx_reply.3.gz man/man3/ares_parse_naptr_reply.3.gz man/man3/ares_parse_ns_reply.3.gz man/man3/ares_parse_ptr_reply.3.gz man/man3/ares_parse_soa_reply.3.gz man/man3/ares_parse_srv_reply.3.gz man/man3/ares_parse_txt_reply.3.gz man/man3/ares_parse_uri_reply.3.gz man/man3/ares_process.3.gz man/man3/ares_query.3.gz man/man3/ares_reinit.3.gz man/man3/ares_save_options.3.gz man/man3/ares_search.3.gz man/man3/ares_send.3.gz man/man3/ares_set_local_dev.3.gz man/man3/ares_set_local_ip4.3.gz man/man3/ares_set_local_ip6.3.gz man/man3/ares_set_servers.3.gz man/man3/ares_set_servers_csv.3.gz man/man3/ares_set_servers_ports.3.gz man/man3/ares_set_servers_ports_csv.3.gz man/man3/ares_set_socket_callback.3.gz man/man3/ares_set_socket_configure_callback.3.gz 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 man/man3/ares_tlsa_usage_t.3.gz man/man3/ares_version.3.gz