unbound: Update to 1.24.2

Merge commit 'ec5b94f552d7cb2a9d456c67e9941bcf5e3698bf'

This is purely cosmetic as we already had the functional changes.

MFC after:	1 week

contrib/unbound/config.h.in

@@ -173,11 +173,11 @@
    0 if you don't. */
 #undef HAVE_DECL_SSL_CTX_SET_ECDH_AUTO
 
-/* Define to 1 if you have the declaration of `SSL_CTX_set_tmp_ecdh', and to 0
+/* Define to 1 if you have the declaration of 'SSL_CTX_set_tmp_ecdh', and to 0
    if you don't. */
 #undef HAVE_DECL_SSL_CTX_SET_TMP_ECDH
 
-/* Define to 1 if you have the declaration of `strlcat', and to 0 if you
+/* Define to 1 if you have the declaration of 'strlcat', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRLCAT
 
@@ -481,10 +481,10 @@
    'ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */
 #undef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL
 
-/* Define to 1 if you have the `ngtcp2_crypto_quictls_init' function. */
+/* Define to 1 if you have the 'ngtcp2_crypto_quictls_init' function. */
 #undef HAVE_NGTCP2_CRYPTO_QUICTLS_INIT
 
-/* Define to 1 if the system has the type `ngtcp2_encryption_level'. */
+/* Define to 1 if the system has the type 'ngtcp2_encryption_level'. */
 #undef HAVE_NGTCP2_ENCRYPTION_LEVEL
 
 /* Define to 1 if you have the <ngtcp2/ngtcp2_crypto_openssl.h> header file.
@@ -655,7 +655,7 @@
    function. */
 #undef HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB
 
-/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */
+/* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */
 #undef HAVE_SSL_GET0_ALPN_SELECTED
 
 /* Define to 1 if you have the 'SSL_get0_peername' function. */

contrib/unbound/configure.ac

@@ -12,7 +12,7 @@ sinclude(dnscrypt/dnscrypt.m4)
 # must be numbers. ac_defun because of later processing
 m4_define([VERSION_MAJOR],[1])
 m4_define([VERSION_MINOR],[24])
-m4_define([VERSION_MICRO],[1])
+m4_define([VERSION_MICRO],[2])
 AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[unbound-bugs@nlnetlabs.nl or https://github.com/NLnetLabs/unbound/issues],[unbound])
 AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR])
 AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
@@ -121,6 +121,7 @@ LIBUNBOUND_AGE=1
 # 1.23.1 had 9:32:1
 # 1.24.0 had 9:33:1
 # 1.24.1 had 9:34:1
+# 1.24.2 had 9:35:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary

contrib/unbound/doc/README

@@ -1,4 +1,4 @@
-README for Unbound 1.24.1
+README for Unbound 1.24.2
 Copyright 2007 NLnet Labs
 http://unbound.net
 

contrib/unbound/doc/example.conf

@@ -1,7 +1,7 @@
 #
 # Example configuration file.
 #
-# See unbound.conf(5) man page, version 1.24.1.
+# See unbound.conf(5) man page, version 1.24.2.
 #
 # this is a comment.
 

contrib/unbound/doc/example.conf.in

@@ -1,7 +1,7 @@
 #
 # Example configuration file.
 #
-# See unbound.conf(5) man page, version 1.24.1.
+# See unbound.conf(5) man page, version 1.24.2.
 #
 # this is a comment.
 

contrib/unbound/doc/libunbound.3

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "LIBUNBOUND" "3" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "LIBUNBOUND" "3" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-libunbound \- Unbound DNS validating resolver 1.24.1 functions.
+libunbound \- Unbound DNS validating resolver 1.24.2 functions.
 .SH SYNOPSIS
 .sp
 \fB#include <unbound.h>\fP

contrib/unbound/doc/libunbound.3.in

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "LIBUNBOUND" "3" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "LIBUNBOUND" "3" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-libunbound \- Unbound DNS validating resolver 1.24.1 functions.
+libunbound \- Unbound DNS validating resolver 1.24.2 functions.
 .SH SYNOPSIS
 .sp
 \fB#include <unbound.h>\fP

contrib/unbound/doc/unbound-anchor.8

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND-ANCHOR" "8" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND-ANCHOR" "8" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound-anchor \- Unbound 1.24.1 anchor utility.
+unbound-anchor \- Unbound 1.24.2 anchor utility.
 .SH SYNOPSIS
 .sp
 \fBunbound\-anchor\fP [\fBopts\fP]

contrib/unbound/doc/unbound-anchor.8.in

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND-ANCHOR" "8" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND-ANCHOR" "8" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound-anchor \- Unbound 1.24.1 anchor utility.
+unbound-anchor \- Unbound 1.24.2 anchor utility.
 .SH SYNOPSIS
 .sp
 \fBunbound\-anchor\fP [\fBopts\fP]

contrib/unbound/doc/unbound-checkconf.8

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND-CHECKCONF" "8" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND-CHECKCONF" "8" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound-checkconf \- Check Unbound 1.24.1 configuration file for errors.
+unbound-checkconf \- Check Unbound 1.24.2 configuration file for errors.
 .SH SYNOPSIS
 .sp
 \fBunbound\-checkconf\fP [\fB\-hf\fP] [\fB\-o option\fP] [cfgfile]

contrib/unbound/doc/unbound-checkconf.8.in

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND-CHECKCONF" "8" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND-CHECKCONF" "8" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound-checkconf \- Check Unbound 1.24.1 configuration file for errors.
+unbound-checkconf \- Check Unbound 1.24.2 configuration file for errors.
 .SH SYNOPSIS
 .sp
 \fBunbound\-checkconf\fP [\fB\-hf\fP] [\fB\-o option\fP] [cfgfile]

contrib/unbound/doc/unbound-control.8

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND-CONTROL" "8" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND-CONTROL" "8" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound-control \- Unbound 1.24.1 remote server control utility.
+unbound-control \- Unbound 1.24.2 remote server control utility.
 .SH SYNOPSIS
 .sp
 \fBunbound\-control\fP [\fB\-hq\fP] [\fB\-c cfgfile\fP] [\fB\-s server\fP] command

contrib/unbound/doc/unbound-control.8.in

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND-CONTROL" "8" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND-CONTROL" "8" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound-control \- Unbound 1.24.1 remote server control utility.
+unbound-control \- Unbound 1.24.2 remote server control utility.
 .SH SYNOPSIS
 .sp
 \fBunbound\-control\fP [\fB\-hq\fP] [\fB\-c cfgfile\fP] [\fB\-s server\fP] command

contrib/unbound/doc/unbound-host.1

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND-HOST" "1" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND-HOST" "1" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound-host \- Unbound 1.24.1 DNS lookup utility.
+unbound-host \- Unbound 1.24.2 DNS lookup utility.
 .SH SYNOPSIS
 .sp
 \fBunbound\-host\fP [\fB\-C configfile\fP] [\fB\-vdhr46D\fP] [\fB\-c class\fP]

contrib/unbound/doc/unbound-host.1.in

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND-HOST" "1" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND-HOST" "1" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound-host \- Unbound 1.24.1 DNS lookup utility.
+unbound-host \- Unbound 1.24.2 DNS lookup utility.
 .SH SYNOPSIS
 .sp
 \fBunbound\-host\fP [\fB\-C configfile\fP] [\fB\-vdhr46D\fP] [\fB\-c class\fP]

contrib/unbound/doc/unbound.8

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND" "8" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND" "8" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound \- Unbound DNS validating resolver 1.24.1.
+unbound \- Unbound DNS validating resolver 1.24.2.
 .SH SYNOPSIS
 .sp
 \fBunbound\fP [\fB\-hdpv\fP] [\fB\-c <cfgfile>\fP]

contrib/unbound/doc/unbound.8.in

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND" "8" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND" "8" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound \- Unbound DNS validating resolver 1.24.1.
+unbound \- Unbound DNS validating resolver 1.24.2.
 .SH SYNOPSIS
 .sp
 \fBunbound\fP [\fB\-hdpv\fP] [\fB\-c <cfgfile>\fP]

contrib/unbound/doc/unbound.conf.5

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND.CONF" "5" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND.CONF" "5" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound.conf \- Unbound 1.24.1 configuration file.
+unbound.conf \- Unbound 1.24.2 configuration file.
 .SH SYNOPSIS
 .sp
 \fBunbound.conf\fP

contrib/unbound/doc/unbound.conf.5.in

@@ -27,9 +27,9 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "UNBOUND.CONF" "5" "Oct 22, 2025" "1.24.1" "Unbound"
+.TH "UNBOUND.CONF" "5" "Nov 26, 2025" "1.24.2" "Unbound"
 .SH NAME
-unbound.conf \- Unbound 1.24.1 configuration file.
+unbound.conf \- Unbound 1.24.2 configuration file.
 .SH SYNOPSIS
 .sp
 \fBunbound.conf\fP

lib/libunbound/config.h

@@ -174,11 +174,11 @@
    0 if you don't. */
 #define HAVE_DECL_SSL_CTX_SET_ECDH_AUTO 1
 
-/* Define to 1 if you have the declaration of `SSL_CTX_set_tmp_ecdh', and to 0
+/* Define to 1 if you have the declaration of 'SSL_CTX_set_tmp_ecdh', and to 0
    if you don't. */
 #define HAVE_DECL_SSL_CTX_SET_TMP_ECDH 1
 
-/* Define to 1 if you have the declaration of `strlcat', and to 0 if you
+/* Define to 1 if you have the declaration of 'strlcat', and to 0 if you
    don't. */
 /* #undef HAVE_DECL_STRLCAT */
 
@@ -482,10 +482,10 @@
    'ngtcp2_crypto_quictls_from_ossl_encryption_level' function. */
 /* #undef HAVE_NGTCP2_CRYPTO_QUICTLS_FROM_OSSL_ENCRYPTION_LEVEL */
 
-/* Define to 1 if you have the `ngtcp2_crypto_quictls_init' function. */
+/* Define to 1 if you have the 'ngtcp2_crypto_quictls_init' function. */
 /* #undef HAVE_NGTCP2_CRYPTO_QUICTLS_INIT */
 
-/* Define to 1 if the system has the type `ngtcp2_encryption_level'. */
+/* Define to 1 if the system has the type 'ngtcp2_encryption_level'. */
 /* #undef HAVE_NGTCP2_ENCRYPTION_LEVEL */
 
 /* Define to 1 if you have the <ngtcp2/ngtcp2_crypto_openssl.h> header file.
@@ -656,7 +656,7 @@
    function. */
 #define HAVE_SSL_CTX_SET_TLSEXT_TICKET_KEY_EVP_CB 1
 
-/* Define to 1 if you have the `SSL_get0_alpn_selected' function. */
+/* Define to 1 if you have the 'SSL_get0_alpn_selected' function. */
 #define HAVE_SSL_GET0_ALPN_SELECTED 1
 
 /* Define to 1 if you have the 'SSL_get0_peername' function. */
@@ -891,7 +891,7 @@
 #define PACKAGE_NAME "unbound"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "unbound 1.24.1"
+#define PACKAGE_STRING "unbound 1.24.2"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "unbound"
@@ -900,7 +900,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.24.1"
+#define PACKAGE_VERSION "1.24.2"
 
 /* default pidfile location */
 #define PIDFILE "/var/unbound/unbound.pid"
@@ -923,7 +923,7 @@
 #define ROOT_CERT_FILE "/var/unbound/icannbundle.pem"
 
 /* version number for resource files */
-#define RSRC_PACKAGE_VERSION 1,24,1,0
+#define RSRC_PACKAGE_VERSION 1,24,2,0
 
 /* Directory to chdir to */
 #define RUN_DIR "/var/unbound"