Index: branches/2021Q1/dns/c-ares/Makefile =================================================================== --- branches/2021Q1/dns/c-ares/Makefile (revision 568037) +++ branches/2021Q1/dns/c-ares/Makefile (revision 568038) @@ -1,44 +1,44 @@ # Created by: roam@FreeBSD.org # $FreeBSD$ PORTNAME= c-ares -PORTVERSION= 1.16.1 +PORTVERSION= 1.17.1 CATEGORIES= dns MASTER_SITES= https://c-ares.haxx.se/download/ \ ZI MAINTAINER= zi@FreeBSD.org COMMENT= Asynchronous DNS resolver library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-werror INSTALL_TARGET= install-strip SSP_UNSAFE= Refuses -l in LDFLAGS USES= libtool pathfix compiler:c++11-lang gmake USE_LDCONFIG= yes PROGRAMS= acountry adig ahost OPTIONS_DEFINE= CONFIG_INFO DEBUG HIDE_SYMBOLS OPTIMIZED_CFLAGS OPTIONS_DEFAULT= CONFIG_INFO HIDE_SYMBOLS CONFIG_INFO_DESC= Add the ares_config_info patch HIDE_SYMBOLS_DESC= Hide internal library symbols OPTIMIZED_CFLAGS_DESC= Build with compiler optimizations CONFLICTS= ares-1.* MAKE_JOBS_UNSAFE= yes CONFIG_INFO_EXTRA_PATCHES= ${FILESDIR}/ares-config-info.patch DEBUG_CONFIGURE_ENABLE= debug HIDE_SYMBOLS_CONFIGURE_ENABLE= symbol-hiding OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimize post-install: - ${INSTALL_PROGRAM} ${PROGRAMS:S@^@${WRKSRC}/.libs/@} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${PROGRAMS:S@^@${WRKSRC}/src/tools/.libs/@} ${STAGEDIR}${PREFIX}/bin/ .include Index: branches/2021Q1/dns/c-ares/distinfo =================================================================== --- branches/2021Q1/dns/c-ares/distinfo (revision 568037) +++ branches/2021Q1/dns/c-ares/distinfo (revision 568038) @@ -1,3 +1,3 @@ -TIMESTAMP = 1591288198 -SHA256 (c-ares-1.16.1.tar.gz) = d08312d0ecc3bd48eee0a4cc0d2137c9f194e0a28de2028928c0f6cae85f86ce -SIZE (c-ares-1.16.1.tar.gz) = 1374637 +TIMESTAMP = 1610054381 +SHA256 (c-ares-1.17.1.tar.gz) = d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40 +SIZE (c-ares-1.17.1.tar.gz) = 1518701 Index: branches/2021Q1/dns/c-ares/files/ares-config-info.patch =================================================================== --- branches/2021Q1/dns/c-ares/files/ares-config-info.patch (revision 568037) +++ branches/2021Q1/dns/c-ares/files/ares-config-info.patch (revision 568038) @@ -1,73 +1,73 @@ Description: Add the ares_get_config() routine used by Unreal IRCd. Originally taken from the Unreal IRCd distribution, later modified by me to properly support IPv6 nameserver addresses since c-ares-1.7.1. Origin: the Unreal IRCd distribution Author: Peter Pentchev Forwarded: no Last-Update: 2010-12-19 ---- ares.h.orig -+++ ares.h +--- include/ares.h.orig ++++ include/ares.h @@ -260,6 +260,14 @@ int nsort; }; +/** Public available config (readonly) interface for ares_get_config(). */ +struct ares_config_info { + int timeout; + int tries; + int numservers; + char **servers; +}; + struct hostent; struct timeval; struct sockaddr; @@ -530,6 +538,8 @@ CARES_EXTERN int ares_get_servers(ares_channel channel, struct ares_addr_node **servers); +CARES_EXTERN int ares_get_config(struct ares_config_info *d, ares_channel c); + #ifdef __cplusplus } #endif ---- ares_init.c.orig 2013-02-17 11:44:02.000000000 -0500 -+++ ares_init.c 2013-05-15 13:43:31.000000000 -0400 +--- src/lib/ares_init.c.orig 2013-02-17 11:44:02.000000000 -0500 ++++ src/lib/ares_init.c 2013-05-15 13:43:31.000000000 -0400 @@ -1875,6 +1875,36 @@ } #endif /* !WIN32 & !WATT32 & !ANDROID & !__ANDROID__ */ +int ares_get_config(struct ares_config_info *d, ares_channel c) +{ + int i; + const char *p; + char tmp[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")]; + + memset(d, 0, sizeof(struct ares_config_info)); + + d->timeout = c->timeout; + d->tries = c->tries; + d->numservers = c->nservers; + d->servers = calloc(sizeof(char *), c->nservers); + for (i = 0; i < c->nservers; i++) + { + if (c->servers[i].addr.family == AF_INET) + p = ares_inet_ntop(c->servers[i].addr.family, + (const char *)&c->servers[i].addr.addrV4, + tmp, sizeof(tmp)); + else if (c->servers[i].addr.family == AF_INET6) + p = ares_inet_ntop(c->servers[i].addr.family, + (const char *)&c->servers[i].addr.addrV6, + tmp, sizeof(tmp)); + else + p = NULL; + d->servers[i] = p ? strdup(p) : NULL; + } + + return ARES_SUCCESS; +} + /* initialize an rc4 key. If possible a cryptographically secure random key is generated using a suitable function (for example win32's RtlGenRandom as described in Index: branches/2021Q1/dns/c-ares/pkg-plist =================================================================== --- branches/2021Q1/dns/c-ares/pkg-plist (revision 568037) +++ branches/2021Q1/dns/c-ares/pkg-plist (revision 568038) @@ -1,70 +1,71 @@ bin/acountry bin/adig bin/ahost include/ares.h include/ares_build.h include/ares_dns.h include/ares_rules.h include/ares_version.h lib/libcares.a lib/libcares.so lib/libcares.so.2 -lib/libcares.so.2.4.0 +lib/libcares.so.2.4.2 libdata/pkgconfig/libcares.pc 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_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_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_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_process.3.gz man/man3/ares_query.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_timeout.3.gz man/man3/ares_version.3.gz Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 568037) +++ branches/2021Q1 (revision 568038) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r563965