The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a878e7b4985f0c178b9d49a6cd80c2eade9b77e3
commit a878e7b4985f0c178b9d49a6cd80c2eade9b77e3 Author: Dag-Erling Smørgrav <[email protected]> AuthorDate: 2026-06-19 07:24:23 +0000 Commit: Dag-Erling Smørgrav <[email protected]> CommitDate: 2026-06-24 17:25:00 +0000 ldns: Update to 1.9.1 Merge commit '026e5b88eb0cde54d9fc22b9a1ebc79ea0f67aec' (cherry picked from commit 4593470d16714d83ac06a3ccc319f998a02ced07) --- contrib/ldns/Changelog | 4 ++++ contrib/ldns/config.guess | 17 +++++++++++------ contrib/ldns/config.sub | 11 ++++++----- contrib/ldns/configure | 28 +++++++++++++++------------- contrib/ldns/configure.ac | 10 ++++++---- contrib/ldns/ldns/config.h | 4 ++-- contrib/ldns/ldns/util.h | 4 ++-- 7 files changed, 46 insertions(+), 32 deletions(-) diff --git a/contrib/ldns/Changelog b/contrib/ldns/Changelog index 74e2631af72d..cd056f0c089d 100644 --- a/contrib/ldns/Changelog +++ b/contrib/ldns/Changelog @@ -1,3 +1,7 @@ +1.9.1 2026-06-10 + * Bugfix: Insufficient verification that responses belong to a + query (CVE-2026-10846). Thanks Pablo Ruiz from 'codecome.ai' + 1.9.0 2025-12-04 * PR #246: Make ldns_calc_keytag() available for CDNSKEY RR Thanks tgreenx and pnax diff --git a/contrib/ldns/config.guess b/contrib/ldns/config.guess index a9d01fde4617..c7f4c3294a63 100755 --- a/contrib/ldns/config.guess +++ b/contrib/ldns/config.guess @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2025 Free Software Foundation, Inc. +# Copyright 1992-2026 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2025-07-10' +timestamp='2026-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -60,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2025 Free Software Foundation, Inc. +Copyright 1992-2026 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -150,7 +150,7 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case $UNAME_SYSTEM in -Linux|GNU|GNU/*) +Ironclad|Linux|GNU|GNU/*) LIBC=unknown set_cc_for_build @@ -167,6 +167,8 @@ Linux|GNU|GNU/*) LIBC=gnu #elif defined(__LLVM_LIBC__) LIBC=llvm + #elif defined(__mlibc__) + LIBC=mlibc #else #include <stdarg.h> /* First heuristic to detect musl libc. */ @@ -1186,6 +1188,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; + sw_64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; @@ -1598,10 +1603,10 @@ EOF GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE ;; x86_64:[Ii]ronclad:*:*|i?86:[Ii]ronclad:*:*) - GUESS=$UNAME_MACHINE-pc-ironclad-mlibc + GUESS=$UNAME_MACHINE-pc-ironclad-$LIBC ;; *:[Ii]ronclad:*:*) - GUESS=$UNAME_MACHINE-unknown-ironclad-mlibc + GUESS=$UNAME_MACHINE-unknown-ironclad-$LIBC ;; esac diff --git a/contrib/ldns/config.sub b/contrib/ldns/config.sub index 3d35cde174de..404aa0824443 100755 --- a/contrib/ldns/config.sub +++ b/contrib/ldns/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2025 Free Software Foundation, Inc. +# Copyright 1992-2026 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268,SC2162 # see below for rationale -timestamp='2025-07-10' +timestamp='2026-05-17' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ Report bugs and patches to <[email protected]>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2025 Free Software Foundation, Inc. +Copyright 1992-2026 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1432,6 +1432,7 @@ case $cpu-$vendor in | sparcv9v \ | spu \ | sv1 \ + | sw_64 \ | sx* \ | tahoe \ | thumbv7* \ @@ -1525,7 +1526,7 @@ EOF ;; ironclad*) kernel=ironclad - os=`echo "$basic_os" | sed -e 's|ironclad|mlibc|'` + os=`echo "$basic_os" | sed -e 's|ironclad|gnu|'` ;; linux*) kernel=linux @@ -2220,7 +2221,7 @@ case $kernel-$os-$obj in ;; uclinux-uclibc*- | uclinux-gnu*- ) ;; - ironclad-mlibc*-) + ironclad-gnu*- | ironclad-mlibc*- ) ;; managarm-mlibc*- | managarm-kernel*- ) ;; diff --git a/contrib/ldns/configure b/contrib/ldns/configure index b731de6c2933..7671ed9d2671 100755 --- a/contrib/ldns/configure +++ b/contrib/ldns/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for ldns 1.9.0. +# Generated by GNU Autoconf 2.71 for ldns 1.9.1. # # Report bugs to <[email protected]>. # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ldns' PACKAGE_TARNAME='libdns' -PACKAGE_VERSION='1.9.0' -PACKAGE_STRING='ldns 1.9.0' +PACKAGE_VERSION='1.9.1' +PACKAGE_STRING='ldns 1.9.1' PACKAGE_BUGREPORT='[email protected]' PACKAGE_URL='' @@ -1417,7 +1417,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ldns 1.9.0 to adapt to many kinds of systems. +\`configure' configures ldns 1.9.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ldns 1.9.0:";; + short | recursive ) echo "Configuration of ldns 1.9.1:";; esac cat <<\_ACEOF @@ -1644,7 +1644,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ldns configure 1.9.0 +ldns configure 1.9.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2263,7 +2263,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ldns $as_me 1.9.0, which was +It was created by ldns $as_me 1.9.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3029,7 +3029,7 @@ LDNS_VERSION_MAJOR=1 LDNS_VERSION_MINOR=9 -LDNS_VERSION_MICRO=0 +LDNS_VERSION_MICRO=1 # Library version @@ -3050,10 +3050,12 @@ LDNS_VERSION_MICRO=0 # ldns-1.8.1 had libversion 5:0:2 # ldns-1.8.1 had libversion 6:0:3 # ldns-1.8.2 had libversion 7:0:4 -# ldns-1.8.3 has libversion 8:0:5 -# ldns-1.9.0 will have libversion 9:0:6 (new behaviour for dnssec_rrs_add_rr) +# ldns-1.8.3 had libversion 8:0:5 +# ldns-1.8.4 had libversion 9:0:6 +# ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) +# ldns-1.9.1 will have libversion 11:0:0 # -VERSION_INFO=9:0:6 +VERSION_INFO=11:0:0 @@ -20525,7 +20527,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ldns $as_me 1.9.0, which was +This file was extended by ldns $as_me 1.9.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20593,7 +20595,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -ldns config.status 1.9.0 +ldns config.status 1.9.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/contrib/ldns/configure.ac b/contrib/ldns/configure.ac index 91938e4a3430..a820720d615e 100644 --- a/contrib/ldns/configure.ac +++ b/contrib/ldns/configure.ac @@ -6,7 +6,7 @@ sinclude(acx_nlnetlabs.m4) # must be numbers. ac_defun because of later processing. m4_define([VERSION_MAJOR],[1]) m4_define([VERSION_MINOR],[9]) -m4_define([VERSION_MICRO],[0]) +m4_define([VERSION_MICRO],[1]) AC_INIT([ldns],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[[email protected]],[libdns]) AC_CONFIG_SRCDIR([packet.c]) # needed to build correct soname @@ -32,10 +32,12 @@ AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO]) # ldns-1.8.1 had libversion 5:0:2 # ldns-1.8.1 had libversion 6:0:3 # ldns-1.8.2 had libversion 7:0:4 -# ldns-1.8.3 has libversion 8:0:5 -# ldns-1.9.0 will have libversion 9:0:6 (new behaviour for dnssec_rrs_add_rr) +# ldns-1.8.3 had libversion 8:0:5 +# ldns-1.8.4 had libversion 9:0:6 +# ldns-1.9.0 had libversion 9:0:6 (though it should have had 10:0:0) +# ldns-1.9.1 will have libversion 11:0:0 # -AC_SUBST(VERSION_INFO, [9:0:6]) +AC_SUBST(VERSION_INFO, [11:0:0]) AC_USE_SYSTEM_EXTENSIONS if test "$ac_cv_header_minix_config_h" = "yes"; then diff --git a/contrib/ldns/ldns/config.h b/contrib/ldns/ldns/config.h index c8a1a4291a57..c3398290bef9 100644 --- a/contrib/ldns/ldns/config.h +++ b/contrib/ldns/ldns/config.h @@ -378,7 +378,7 @@ #define PACKAGE_NAME "ldns" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "ldns 1.9.0" +#define PACKAGE_STRING "ldns 1.9.1" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "libdns" @@ -387,7 +387,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.9.0" +#define PACKAGE_VERSION "1.9.1" /* Define this to enable RR type AMTRELAY. */ #define RRTYPE_AMTRELAY /**/ diff --git a/contrib/ldns/ldns/util.h b/contrib/ldns/ldns/util.h index aaa34a072fda..898089dfa6e3 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.9.0" -#define LDNS_REVISION ((1<<16)|(9<<8)|(0)) +#define LDNS_VERSION "1.9.1" +#define LDNS_REVISION ((1<<16)|(9<<8)|(1)) /** * splint static inline workaround
