From nobody Fri May 22 18:13:35 2026 X-Original-To: dev-commits-src-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 4gMYLY0kTrz6fN4t for ; Fri, 22 May 2026 18:13:41 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gMYLY0CPKz3DZR for ; Fri, 22 May 2026 18:13:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1779473621; 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=2xvacCR18bZLSEWH7JyVIVLBNCS8rYfU36pM2dZWDhA=; b=xBBwn6yPy4F3uf45iS6yH9WX0jKVxtn+jhjTHXa+9JBhRCtxg5riZCTpw/L2v23XaOupwJ 4EGcdnaFX9EO1UtZvpmsDyE3fDYS0WYQbe2xNgsm19fwWSxfSYDFzm5EIIlDuRfVl1weEA w4J10EdrUA4pF9FvebBJhd8I1rrcMxgbh0eIOs+XgPW8YEOK1L7EkD2n0JIQORyjgSb84+ BU4qhk1GAHWbXaUfvBf4tfsrZ93nWIMYG3Lvp0PhG8xK+Sju6+xDjuTDiOiJt3xdI/N5RW cR/yDwpoHrHO3RO6ykAmb5eVqe8S4QQJzBifJXRySDmUOhxvSuL/OdLOOKarIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1779473621; a=rsa-sha256; cv=none; b=QO3pXy87zB/mECgZNWvEZK2XGK/vZDfZCAiC+TzKA86QEFs+lQAr1fU48wxOZRZr8kbDIv BUsm3KBzLPtLyDXST+AP7TumD1OOtLyn44G3nP8mat5hTaQZplySK9cujvTQAHtECBhNhg kcw2YHPCGETCLECKx1Retj8y+m/tlwsu0jl/NbROWxQNCQ4/PXIm/hFiuQvkFbCIRxaJQ3 kAKN6BZBYWMx1qnIEwQq4EZriLEpU8aMvgGsHp+RL4wpSsQKwNNbu/HfDyt1gPGed1mhmV btWjkaExbcXSZE+LlMy4NCeDsN1BNyh4g4T8pR20aseZb10g2rDlVs2G2vmuKw== 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=1779473621; 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=2xvacCR18bZLSEWH7JyVIVLBNCS8rYfU36pM2dZWDhA=; b=KBJdriGjgTWMGJ6WSlTMMxSMvoZh1a3dYSiM4DEyp0cp3rOT4K0ADDBOcktbZLuphDkXbn x9LUgBDvExwsfHU6l+QZZpTPkrh+E3wW1JSws11Aea8ygqSjuT9liOTmSiduDEE4E1WwLv 275hENb39yx7BLUo2rtthv5bWZgYKjNsOMg8v1mGcdBnwbRe5zJtuI5i8EqLfYxkD6YhAM P8+afFdp5k4bp3YVdDrB317gSvYm5GDE7BkDOVqoWcXw4qh7uFhkfLdDcC7nL3kpuMUODu mwszhJR3WkCQa7DBD1Bu7AoG6lCVLKspzBRIdblOrrbvoCmZ3ekj65lgg1v9qw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gMYLX6gFmzXhh for ; Fri, 22 May 2026 18:13:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b790 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 22 May 2026 18:13:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: 70739f3499b0 - main - ldns: Regenerate configuration after update List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70739f3499b03cfff6bdd985db0d81cde76be15a Auto-Submitted: auto-generated Date: Fri, 22 May 2026 18:13:35 +0000 Message-Id: <6a109ccf.3b790.4b7573c8@gitrepo.freebsd.org> The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=70739f3499b03cfff6bdd985db0d81cde76be15a commit 70739f3499b03cfff6bdd985db0d81cde76be15a Author: Dag-Erling Smørgrav AuthorDate: 2026-05-22 18:12:26 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-05-22 18:12:26 +0000 ldns: Regenerate configuration after update MFC after: 1 week Fixes: d44c9549ef31 ("ldns: Update to 1.8.4") Fixes: 9ed998a81bab ("ldns: Update to 1.9.0") --- contrib/ldns/ldns/config.h | 47 +++++++++++++++++++++++++++++++++++++--------- contrib/ldns/ldns/net.h | 3 +-- contrib/ldns/ldns/util.h | 26 +++++++++++++++++++++++-- 3 files changed, 63 insertions(+), 13 deletions(-) diff --git a/contrib/ldns/ldns/config.h b/contrib/ldns/ldns/config.h index 0fe9f2c3dbce..c8a1a4291a57 100644 --- a/contrib/ldns/ldns/config.h +++ b/contrib/ldns/ldns/config.h @@ -7,6 +7,9 @@ /* Define to 1 if you have the header file. */ #define HAVE_ARPA_INET_H 1 +/* Define to 1 if you have the `asctime_r' function. */ +#define HAVE_ASCTIME_R 1 + /* Whether the C compiler accepts the "format" attribute */ #define HAVE_ATTR_FORMAT 1 @@ -53,6 +56,14 @@ you don't. */ #define HAVE_DECL_EVP_PKEY_BASE_ID 1 +/* Define to 1 if you have the declaration of `inet_ntop', and to 0 if you + don't. */ +#define HAVE_DECL_INET_NTOP 1 + +/* Define to 1 if you have the declaration of `inet_pton', and to 0 if you + don't. */ +#define HAVE_DECL_INET_PTON 1 + /* Define to 1 if you have the declaration of `NID_ED25519', and to 0 if you don't. */ #define HAVE_DECL_NID_ED25519 1 @@ -297,6 +308,9 @@ /* Define if you have SWIG libraries and header files. */ /* #undef HAVE_SWIG */ +/* Define to 1 if you have the `symlink' function. */ +#define HAVE_SYMLINK 1 + /* Define to 1 if you have the header file. */ #define HAVE_SYS_MOUNT_H 1 @@ -358,13 +372,13 @@ #define LT_OBJDIR ".libs/" /* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "libdns@nlnetlabs.nl" +#define PACKAGE_BUGREPORT "dns-team@nlnetlabs.nl" /* Define to the full name of this package. */ #define PACKAGE_NAME "ldns" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ldns 1.8.3" +#define PACKAGE_STRING "ldns 1.9.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libdns" @@ -373,23 +387,35 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.8.3" +#define PACKAGE_VERSION "1.9.0" /* Define this to enable RR type AMTRELAY. */ -/* #undef RRTYPE_AMTRELAY */ +#define RRTYPE_AMTRELAY /**/ /* Define this to enable RR type AVC. */ /* #undef RRTYPE_AVC */ +/* Define this to enable RR types CLA and IPN. */ +/* #undef RRTYPE_CLA_IPN */ + /* Define this to enable RR type DOA. */ /* #undef RRTYPE_DOA */ +/* Define this to enable RR type DSYNC. */ +#define RRTYPE_DSYNC /**/ + +/* Define this to enable RR types HHIT and BRID. */ +/* #undef RRTYPE_HHIT_BRID */ + /* Define this to enable RR type NINFO. */ /* #undef RRTYPE_NINFO */ /* Define this to enable RR type OPENPGPKEY. */ #define RRTYPE_OPENPGPKEY /**/ +/* Define this to enable RR type RESINFO. */ +#define RRTYPE_RESINFO /**/ + /* Define this to enable RR type RKEY. */ /* #undef RRTYPE_RKEY */ @@ -665,7 +691,7 @@ #ifdef HAVE_WINSOCK2_H #define FD_SET_T (u_int) #else -#define FD_SET_T +#define FD_SET_T #endif @@ -718,6 +744,9 @@ time_t timegm (struct tm *tm); #ifndef HAVE_GMTIME_R struct tm *gmtime_r(const time_t *timep, struct tm *result); #endif +#ifndef HAVE_ASCTIME_R +char *asctime_r(const struct tm *tm, char *buf); +#endif #ifndef HAVE_LOCALTIME_R struct tm *localtime_r(const time_t *timep, struct tm *result); #endif @@ -732,10 +761,10 @@ int isascii(int c); int snprintf (char *str, size_t count, const char *fmt, ...); int vsnprintf (char *str, size_t count, const char *fmt, va_list arg); #endif /* HAVE_SNPRINTF */ -#ifndef HAVE_INET_PTON +#if !defined(HAVE_INET_PTON) && !HAVE_DECL_INET_PTON int inet_pton(int af, const char* src, void* dst); #endif /* HAVE_INET_PTON */ -#ifndef HAVE_INET_NTOP +#if !defined(HAVE_INET_NTOP) && !HAVE_DECL_INET_NTOP const char *inet_ntop(int af, const void *src, char *dst, size_t size); #endif #ifndef HAVE_INET_ATON @@ -749,11 +778,11 @@ size_t strlcpy(char *dst, const char *src, size_t siz); #endif #ifdef USE_WINSOCK -#define SOCK_INVALID INVALID_SOCKET +#define SOCK_INVALID ((INT_PTR)INVALID_SOCKET) #define close_socket(_s) do { if (_s != SOCK_INVALID) {closesocket(_s); _s = -1;} } while(0) #else #define SOCK_INVALID -1 -#define close_socket(_s) do { if (_s != SOCK_INVALID) {close(_s); _s = -1;} } while(0) +#define close_socket(_s) do { if (_s != SOCK_INVALID) {close(_s >= -1 ? _s : -1); _s = -1;} } while(0) #endif #ifdef __cplusplus diff --git a/contrib/ldns/ldns/net.h b/contrib/ldns/ldns/net.h index 0fbf1544d5e9..b9fb2ca3b04a 100644 --- a/contrib/ldns/ldns/net.h +++ b/contrib/ldns/ldns/net.h @@ -91,13 +91,12 @@ int ldns_tcp_bgsend(ldns_buffer *qbin, const struct sockaddr_storage *to, sockle /** * Sends a buffer to an ip using tcp and return the response as a ldns_pkt - * \param[in] qbin the ldns_buffer to be send + * \param[out] result packet with the answer * \param[in] qbin the ldns_buffer to be send * \param[in] to the ip addr to send to * \param[in] tolen length of the ip addr * \param[in] timeout the timeout value for the network * \param[out] answersize size of the packet - * \param[out] result packet with the answer * \return status */ ldns_status ldns_tcp_send(uint8_t **result, ldns_buffer *qbin, const struct sockaddr_storage *to, socklen_t tolen, struct timeval timeout, size_t *answersize); diff --git a/contrib/ldns/ldns/util.h b/contrib/ldns/ldns/util.h index 1d8fa8836a33..aaa34a072fda 100644 --- a/contrib/ldns/ldns/util.h +++ b/contrib/ldns/ldns/util.h @@ -27,8 +27,8 @@ extern "C" { #define dprintf(X,Y) fprintf(stderr, (X), (Y)) /* #define dprintf(X, Y) */ -#define LDNS_VERSION "1.8.3" -#define LDNS_REVISION ((1<<16)|(8<<8)|(3)) +#define LDNS_VERSION "1.9.0" +#define LDNS_REVISION ((1<<16)|(9<<8)|(0)) /** * splint static inline workaround @@ -72,8 +72,10 @@ ldns_read_uint16(const void *src) #ifdef ALLOW_UNALIGNED_ACCESSES return ntohs(*(const uint16_t *) src); #else +# ifndef __clang_analyzer__ const uint8_t *p = (const uint8_t *) src; return ((uint16_t) p[0] << 8) | (uint16_t) p[1]; +# endif #endif } @@ -91,6 +93,26 @@ ldns_read_uint32(const void *src) #endif } +INLINE uint64_t +ldns_read_uint64(const void *src) +{ +#ifdef ALLOW_UNALIGNED_ACCESSES + const uint32_t *p = (const uint32_t *) src; + return ( ((uint64_t) ntohl(src[0]) << 32) + | (uint64_t) ntohl(src[1])); +#else + const uint8_t *p = (const uint8_t *) src; + return ( ((uint64_t) p[0] << 56) + | ((uint64_t) p[1] << 48) + | ((uint64_t) p[2] << 40) + | ((uint64_t) p[3] << 32) + | ((uint64_t) p[4] << 24) + | ((uint64_t) p[5] << 16) + | ((uint64_t) p[6] << 8) + | (uint64_t) p[7]); +#endif +} + /* * Copy data allowing for unaligned accesses in network byte order * (big endian).