Skip to content

[pull] develop from NLnetLabs:develop #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Jun 10, 2026
Merged

[pull] develop from NLnetLabs:develop #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71663e2
Skip 21-match-response-with-query.tpkg on MacOS
wtoorop Jun 10, 2026
3c50fd5
Skip 21-match-response-with-query.tpkg on MacOS
wtoorop Jun 10, 2026
06466f0
ldns-1.9.2 security release
wtoorop Jun 10, 2026
5c4591e
Merge tag '1.9.2' into develop
wtoorop Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@
* The -O option to calculate (and sign) only the ZONEMD an input
zone with ldns-signzone
* Fix to parse SVCB and HTTPS svcparam ech=0.


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'
Expand Down
7 changes: 4 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]),[[email protected]],[libdns])
AC_CONFIG_SRCDIR([packet.c])
# needed to build correct soname
Expand Down Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions test/test_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ then
fi

is_freebsd=$(uname -s 2>&1 | grep -i -c 'freebsd')
is_macos=$(uname -s 2>&1 | grep -i -c 'darwin')
test_tool_avail "dig"

echo start the test at "$(date)" in "$(pwd)"
Expand All @@ -33,6 +34,11 @@ if [[ "$is_freebsd" -eq 0 ]]; then
$TPKG -a ../.. fake 02-lint.tpkg
fi

# Test needs to bind to 127.0.0.2 which doesn't work on MacOS
if [[ "$is_macos" -ne 0 ]]; then
$TPKG -a ../.. fake 21-match-response-with-query.tpkg
fi

$TPKG -a ../.. fake 07-compile-examples.tpkg
$TPKG -a ../.. fake 16-compile-builddir.tpkg
$TPKG -a ../.. fake 30-load-pyldns.tpkg
Expand Down
Loading