git: c31042a7a944 - stable/15 - ldns: Update to 1.9.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dag-Erling Smørgrav <des_at_FreeBSD.org>
Date: Wed, 24 Jun 2026 17:25:35 UTC
The branch stable/15 has been updated by des:

URL: https://cgit.FreeBSD.org/src/commit/?id=c31042a7a944fb7a39404fa9f1b68b2befaa919c

commit c31042a7a944fb7a39404fa9f1b68b2befaa919c
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-06-19 07:26:20 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-06-24 17:23:33 +0000

    ldns: Update to 1.9.2
    
    Merge commit '3750aed65c1f5a610b44d29c92236ca119b62780'
    
    (cherry picked from commit 63442ceae5ed31ad45e401f5fe0010b824bc2b38)
---
 contrib/ldns/Changelog     |  4 ++++
 contrib/ldns/configure     | 25 +++++++++++++------------
 contrib/ldns/configure.ac  |  7 ++++---
 contrib/ldns/ldns/config.h |  4 ++--
 contrib/ldns/ldns/util.h   |  4 ++--
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/contrib/ldns/Changelog b/contrib/ldns/Changelog
index cd056f0c089d..5f6b2193cdb9 100644
--- a/contrib/ldns/Changelog
+++ b/contrib/ldns/Changelog
@@ -1,3 +1,7 @@
+1.9.2	2026-06-10
+	* Fix to set VERSION_INFO to create .so.3 instead of .so.11 which will
+	  be reserved for a future 1.10.0 release
+
 1.9.1	2026-06-10
 	* Bugfix: Insufficient verification that responses belong to a
 	  query (CVE-2026-10846). Thanks Pablo Ruiz from 'codecome.ai'
diff --git a/contrib/ldns/configure b/contrib/ldns/configure
index 7671ed9d2671..0667649dca8f 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.1.
+# Generated by GNU Autoconf 2.71 for ldns 1.9.2.
 #
 # Report bugs to <dns-team@nlnetlabs.nl>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ldns'
 PACKAGE_TARNAME='libdns'
-PACKAGE_VERSION='1.9.1'
-PACKAGE_STRING='ldns 1.9.1'
+PACKAGE_VERSION='1.9.2'
+PACKAGE_STRING='ldns 1.9.2'
 PACKAGE_BUGREPORT='dns-team@nlnetlabs.nl'
 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.1 to adapt to many kinds of systems.
+\`configure' configures ldns 1.9.2 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.1:";;
+     short | recursive ) echo "Configuration of ldns 1.9.2:";;
    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.1
+ldns configure 1.9.2
 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.1, which was
+It was created by ldns $as_me 1.9.2, 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=1
+LDNS_VERSION_MICRO=2
 
 
 # Library version
@@ -3053,9 +3053,10 @@ LDNS_VERSION_MICRO=1
 # 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
+# ldns-1.9.1 had libversion 11:0:0 (but should have had 10:0:7 with 11:0:0 reserved for the ldns-1.10.0 release)
+# ldns-1.9.2 has libversion 12:0:9
 #
-VERSION_INFO=11:0:0
+VERSION_INFO=12:0:9
 
 
 
@@ -20527,7 +20528,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.1, which was
+This file was extended by ldns $as_me 1.9.2, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20595,7 +20596,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.1
+ldns config.status 1.9.2
 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 a820720d615e..eaf605e0a1ec 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],[1])
+m4_define([VERSION_MICRO],[2])
 AC_INIT([ldns],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[dns-team@nlnetlabs.nl],[libdns])
 AC_CONFIG_SRCDIR([packet.c])
 # needed to build correct soname
@@ -35,9 +35,10 @@ AC_SUBST(LDNS_VERSION_MICRO, [VERSION_MICRO])
 # 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
+# ldns-1.9.1 had libversion 11:0:0 (but should have had 10:0:7 with 11:0:0 reserved for the ldns-1.10.0 release)
+# ldns-1.9.2 has libversion 12:0:9
 #
-AC_SUBST(VERSION_INFO, [11:0:0])
+AC_SUBST(VERSION_INFO, [12:0:9])
 
 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 c3398290bef9..ce506d4e1ec0 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.1"
+#define PACKAGE_STRING "ldns 1.9.2"
 
 /* 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.1"
+#define PACKAGE_VERSION "1.9.2"
 
 /* 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 898089dfa6e3..8726d5bf1f1a 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.1"
-#define LDNS_REVISION ((1<<16)|(9<<8)|(1))
+#define LDNS_VERSION "1.9.2"
+#define LDNS_REVISION ((1<<16)|(9<<8)|(2))
 
 /**
  * splint static inline workaround