On Fri, Feb 23, 2024 at 02:15:53PM +0000, Stuart Henderson wrote: > On 2024/02/19 22:32, Brad Smith wrote: > > +@bin bin/adig > > Collision in libcares-1.19.1->1.26.0: the following files already exist > /usr/local/bin/adig (ripe.atlas.tools-3.1.0 and libcares-1.26.0) > > I'd prefer to rename or @comment rather than @conflict.
Here is an update to libcares 1.27.0. I disabled the newly introduced tools. ## c-ares version 1.27.0 - Feb 23 2024 This is a security, feature, and bugfix release. Security: * Moderate. CVE-2024-25629. Reading malformatted `/etc/resolv.conf`, `/etc/nsswitch.conf` or the `HOSTALIASES` file could result in a crash. [GHSA-mg26-v6qh-x48q](https://github.com/c-ares/c-ares/security/advisories/GHSA-mg26-v6qh-x48q) Features: * New function `ares_queue_active_queries()` to retrieve number of in-flight queries. [PR #712](https://github.com/c-ares/c-ares/pull/712) * New function `ares_queue_wait_empty()` to wait for the number of in-flight queries to reach zero. [PR #710](https://github.com/c-ares/c-ares/pull/710) * New `ARES_FLAG_NO_DEFLT_SVR` for `ares_init_options()` to return a failure if no DNS servers can be found rather than attempting to use `127.0.0.1`. This also introduces a new ares status code of `ARES_ENOSERVER`. [PR #713](https://github.com/c-ares/c-ares/pull/713) Changes: * EDNS Packet size should be 1232 as per DNS Flag Day. [PR #705](https://github.com/c-ares/c-ares/pull/705) Bugfixes: * Windows DNS suffix search list memory leak. [PR #711](https://github.com/c-ares/c-ares/pull/711) * Fix warning due to ignoring return code of `write()`. [PR #709](https://github.com/c-ares/c-ares/pull/709) * CMake: don't override target output locations if not top-level. [Issue #708](https://github.com/c-ares/c-ares/issues/708) * Fix building c-ares without thread support. [PR #700](https://github.com/c-ares/c-ares/pull/700) Index: Makefile =================================================================== RCS file: /cvs/ports/net/libcares/Makefile,v retrieving revision 1.26 diff -u -p -u -p -r1.26 Makefile --- Makefile 27 Sep 2023 14:18:14 -0000 1.26 +++ Makefile 23 Feb 2024 20:23:24 -0000 @@ -1,12 +1,12 @@ COMMENT= asynchronous resolver library -V= 1.19.1 +V= 1.27.0 DISTNAME= c-ares-${V} PKGNAME= libcares-${V} CATEGORIES= net devel SITES= ${HOMEPAGE}download/ -SHARED_LIBS += cares 3.4 # 8.1.6 +SHARED_LIBS += cares 3.5 # 8.1.6 HOMEPAGE= https://c-ares.haxx.se/ @@ -15,6 +15,12 @@ MAINTAINER= Brad Smith <b...@comstyle.co # MIT PERMIT_PACKAGE= Yes -CONFIGURE_STYLE= gnu +WANTLIB+= pthread + +MODULES= devel/cmake + +CONFIGURE_ARGS+=-DCARES_BUILD_TOOLS=OFF \ + -DCARES_STATIC=ON \ + -DCARES_SYMBOL_HIDING=ON .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/net/libcares/distinfo,v retrieving revision 1.14 diff -u -p -u -p -r1.14 distinfo --- distinfo 24 May 2023 12:42:55 -0000 1.14 +++ distinfo 23 Feb 2024 20:23:24 -0000 @@ -1,2 +1,2 @@ -SHA256 (c-ares-1.19.1.tar.gz) = MhcAOZty7Q4DfQB0xinndB9rLsLdqSlWq+PpZx0+Jo4= -SIZE (c-ares-1.19.1.tar.gz) = 1579100 +SHA256 (c-ares-1.27.0.tar.gz) = CnK+ZpWZVcQ+KvL70DQY6Cor1UZGBOyaYhR+N6zrQgs= +SIZE (c-ares-1.27.0.tar.gz) = 1301440 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/libcares/pkg/PLIST,v retrieving revision 1.13 diff -u -p -u -p -r1.13 PLIST --- pkg/PLIST 11 Mar 2022 19:46:13 -0000 1.13 +++ pkg/PLIST 23 Feb 2024 20:23:24 -0000 @@ -1,17 +1,84 @@ 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 -@static-lib lib/libcares.a -lib/libcares.la +lib/cmake/ +lib/cmake/c-ares/ +lib/cmake/c-ares/c-ares-config-version.cmake +lib/cmake/c-ares/c-ares-config.cmake +lib/cmake/c-ares/c-ares-targets${MODCMAKE_BUILD_SUFFIX} +lib/cmake/c-ares/c-ares-targets.cmake @lib lib/libcares.so.${LIBcares_VERSION} +@static-lib lib/libcares_static.a lib/pkgconfig/libcares.pc @man man/man3/ares_cancel.3 @man man/man3/ares_create_query.3 @man man/man3/ares_destroy.3 @man man/man3/ares_destroy_options.3 +@man man/man3/ares_dns_class_fromstr.3 +@man man/man3/ares_dns_class_t.3 +@man man/man3/ares_dns_class_tostr.3 +@man man/man3/ares_dns_datatype_t.3 +@man man/man3/ares_dns_flags_t.3 +@man man/man3/ares_dns_mapping.3 +@man man/man3/ares_dns_opcode_t.3 +@man man/man3/ares_dns_opcode_tostr.3 +@man man/man3/ares_dns_opt_datatype_t.3 +@man man/man3/ares_dns_opt_get_datatype.3 +@man man/man3/ares_dns_opt_get_name.3 +@man man/man3/ares_dns_parse.3 +@man man/man3/ares_dns_rcode_t.3 +@man man/man3/ares_dns_rcode_tostr.3 +@man man/man3/ares_dns_rec_type_fromstr.3 +@man man/man3/ares_dns_rec_type_t.3 +@man man/man3/ares_dns_record.3 +@man man/man3/ares_dns_record_create.3 +@man man/man3/ares_dns_record_destroy.3 +@man man/man3/ares_dns_record_get_flags.3 +@man man/man3/ares_dns_record_get_id.3 +@man man/man3/ares_dns_record_get_opcode.3 +@man man/man3/ares_dns_record_get_rcode.3 +@man man/man3/ares_dns_record_query_add.3 +@man man/man3/ares_dns_record_query_cnt.3 +@man man/man3/ares_dns_record_query_get.3 +@man man/man3/ares_dns_record_rr_add.3 +@man man/man3/ares_dns_record_rr_cnt.3 +@man man/man3/ares_dns_record_rr_del.3 +@man man/man3/ares_dns_record_rr_get.3 +@man man/man3/ares_dns_rr.3 +@man man/man3/ares_dns_rr_get_addr.3 +@man man/man3/ares_dns_rr_get_addr6.3 +@man man/man3/ares_dns_rr_get_bin.3 +@man man/man3/ares_dns_rr_get_class.3 +@man man/man3/ares_dns_rr_get_keys.3 +@man man/man3/ares_dns_rr_get_name.3 +@man man/man3/ares_dns_rr_get_opt.3 +@man man/man3/ares_dns_rr_get_opt_byid.3 +@man man/man3/ares_dns_rr_get_opt_cnt.3 +@man man/man3/ares_dns_rr_get_str.3 +@man man/man3/ares_dns_rr_get_ttl.3 +@man man/man3/ares_dns_rr_get_type.3 +@man man/man3/ares_dns_rr_get_u16.3 +@man man/man3/ares_dns_rr_get_u32.3 +@man man/man3/ares_dns_rr_get_u8.3 +@man man/man3/ares_dns_rr_key_datatype.3 +@man man/man3/ares_dns_rr_key_t.3 +@man man/man3/ares_dns_rr_key_to_rec_type.3 +@man man/man3/ares_dns_rr_key_tostr.3 +@man man/man3/ares_dns_rr_set_addr.3 +@man man/man3/ares_dns_rr_set_addr6.3 +@man man/man3/ares_dns_rr_set_bin.3 +@man man/man3/ares_dns_rr_set_opt.3 +@man man/man3/ares_dns_rr_set_str.3 +@man man/man3/ares_dns_rr_set_u16.3 +@man man/man3/ares_dns_rr_set_u32.3 +@man man/man3/ares_dns_rr_set_u8.3 +@man man/man3/ares_dns_section_t.3 +@man man/man3/ares_dns_section_tostr.3 +@man man/man3/ares_dns_write.3 @man man/man3/ares_dup.3 @man man/man3/ares_expand_name.3 @man man/man3/ares_expand_string.3 @@ -21,6 +88,7 @@ lib/pkgconfig/libcares.pc @man man/man3/ares_free_string.3 @man man/man3/ares_freeaddrinfo.3 @man man/man3/ares_get_servers.3 +@man man/man3/ares_get_servers_csv.3 @man man/man3/ares_get_servers_ports.3 @man man/man3/ares_getaddrinfo.3 @man man/man3/ares_gethostbyaddr.3 @@ -37,6 +105,7 @@ lib/pkgconfig/libcares.pc @man man/man3/ares_library_init_android.3 @man man/man3/ares_library_initialized.3 @man man/man3/ares_mkquery.3 +@man man/man3/ares_opt_param_t.3 @man man/man3/ares_parse_a_reply.3 @man man/man3/ares_parse_aaaa_reply.3 @man man/man3/ares_parse_caa_reply.3 @@ -50,6 +119,7 @@ lib/pkgconfig/libcares.pc @man man/man3/ares_parse_uri_reply.3 @man man/man3/ares_process.3 @man man/man3/ares_query.3 +@man man/man3/ares_reinit.3 @man man/man3/ares_save_options.3 @man man/man3/ares_search.3 @man man/man3/ares_send.3 @@ -65,5 +135,10 @@ lib/pkgconfig/libcares.pc @man man/man3/ares_set_socket_functions.3 @man man/man3/ares_set_sortlist.3 @man man/man3/ares_strerror.3 +@man man/man3/ares_svcb_param_t.3 +@man man/man3/ares_threadsafety.3 @man man/man3/ares_timeout.3 +@man man/man3/ares_tlsa_match_t.3 +@man man/man3/ares_tlsa_selector_t.3 +@man man/man3/ares_tlsa_usage_t.3 @man man/man3/ares_version.3
