Skip to content

Commit

Permalink
unbound: Vendor import 1.21.1
Browse files Browse the repository at this point in the history
Release notes at
	https://nlnetlabs.nl/news/2024/Oct/03/unbound-1.21.1-released/

Security:       CVE-2024-8508

Merge commit '9b8db746ac608ff7cdad3c9ac7ac395319e4ea0f'

(cherry picked from commit 5a5c227)
  • Loading branch information
cschuber committed Oct 10, 2024
1 parent c66f901 commit d10c9c1
Show file tree
Hide file tree
Showing 18 changed files with 1,590 additions and 1,121 deletions.
292 changes: 162 additions & 130 deletions contrib/unbound/aclocal.m4

Large diffs are not rendered by default.

416 changes: 279 additions & 137 deletions contrib/unbound/configure

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions contrib/unbound/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ sinclude(dnscrypt/dnscrypt.m4)
# must be numbers. ac_defun because of later processing
m4_define([VERSION_MAJOR],[1])
m4_define([VERSION_MINOR],[21])
m4_define([VERSION_MICRO],[0])
m4_define([VERSION_MICRO],[1])
AC_INIT([unbound],m4_defn([VERSION_MAJOR]).m4_defn([VERSION_MINOR]).m4_defn([VERSION_MICRO]),[[email protected] or https://github.com/NLnetLabs/unbound/issues],[unbound])
AC_SUBST(UNBOUND_VERSION_MAJOR, [VERSION_MAJOR])
AC_SUBST(UNBOUND_VERSION_MINOR, [VERSION_MINOR])
AC_SUBST(UNBOUND_VERSION_MICRO, [VERSION_MICRO])

LIBUNBOUND_CURRENT=9
LIBUNBOUND_REVISION=28
LIBUNBOUND_REVISION=29
LIBUNBOUND_AGE=1
# 1.0.0 had 0:12:0
# 1.0.1 had 0:13:0
Expand Down Expand Up @@ -114,6 +114,7 @@ LIBUNBOUND_AGE=1
# 1.19.3 had 9:26:1
# 1.20.0 had 9:27:1
# 1.21.0 had 9:28:1
# 1.21.1 had 9:29:1

# Current -- the number of the binary API that we're implementing
# Revision -- which iteration of the implementation of the binary
Expand Down
2 changes: 1 addition & 1 deletion contrib/unbound/doc/README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
README for Unbound 1.21.0
README for Unbound 1.21.1
Copyright 2007 NLnet Labs
http://unbound.net

Expand Down
2 changes: 1 addition & 1 deletion contrib/unbound/doc/example.conf.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# Example configuration file.
#
# See unbound.conf(5) man page, version 1.21.0.
# See unbound.conf(5) man page, version 1.21.1.
#
# this is a comment.

Expand Down
4 changes: 2 additions & 2 deletions contrib/unbound/doc/libunbound.3.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "libunbound" "3" "Aug 15, 2024" "NLnet Labs" "unbound 1.21.0"
.TH "libunbound" "3" "Oct 3, 2024" "NLnet Labs" "unbound 1.21.1"
.\"
.\" libunbound.3 -- unbound library functions manual
.\"
Expand Down Expand Up @@ -44,7 +44,7 @@
.B ub_ctx_zone_remove,
.B ub_ctx_data_add,
.B ub_ctx_data_remove
\- Unbound DNS validating resolver 1.21.0 functions.
\- Unbound DNS validating resolver 1.21.1 functions.
.SH "SYNOPSIS"
.B #include <unbound.h>
.LP
Expand Down
2 changes: 1 addition & 1 deletion contrib/unbound/doc/unbound-anchor.8.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "unbound-anchor" "8" "Aug 15, 2024" "NLnet Labs" "unbound 1.21.0"
.TH "unbound-anchor" "8" "Oct 3, 2024" "NLnet Labs" "unbound 1.21.1"
.\"
.\" unbound-anchor.8 -- unbound anchor maintenance utility manual
.\"
Expand Down
2 changes: 1 addition & 1 deletion contrib/unbound/doc/unbound-checkconf.8.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "unbound-checkconf" "8" "Aug 15, 2024" "NLnet Labs" "unbound 1.21.0"
.TH "unbound-checkconf" "8" "Oct 3, 2024" "NLnet Labs" "unbound 1.21.1"
.\"
.\" unbound-checkconf.8 -- unbound configuration checker manual
.\"
Expand Down
2 changes: 1 addition & 1 deletion contrib/unbound/doc/unbound-control.8.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "unbound-control" "8" "Aug 15, 2024" "NLnet Labs" "unbound 1.21.0"
.TH "unbound-control" "8" "Oct 3, 2024" "NLnet Labs" "unbound 1.21.1"
.\"
.\" unbound-control.8 -- unbound remote control manual
.\"
Expand Down
2 changes: 1 addition & 1 deletion contrib/unbound/doc/unbound-host.1.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "unbound\-host" "1" "Aug 15, 2024" "NLnet Labs" "unbound 1.21.0"
.TH "unbound\-host" "1" "Oct 3, 2024" "NLnet Labs" "unbound 1.21.1"
.\"
.\" unbound-host.1 -- unbound DNS lookup utility
.\"
Expand Down
4 changes: 2 additions & 2 deletions contrib/unbound/doc/unbound.8.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "unbound" "8" "Aug 15, 2024" "NLnet Labs" "unbound 1.21.0"
.TH "unbound" "8" "Oct 3, 2024" "NLnet Labs" "unbound 1.21.1"
.\"
.\" unbound.8 -- unbound manual
.\"
Expand All @@ -9,7 +9,7 @@
.\"
.SH "NAME"
.B unbound
\- Unbound DNS validating resolver 1.21.0.
\- Unbound DNS validating resolver 1.21.1.
.SH "SYNOPSIS"
.B unbound
.RB [ \-h ]
Expand Down
2 changes: 1 addition & 1 deletion contrib/unbound/doc/unbound.conf.5.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH "unbound.conf" "5" "Aug 15, 2024" "NLnet Labs" "unbound 1.21.0"
.TH "unbound.conf" "5" "Oct 3, 2024" "NLnet Labs" "unbound 1.21.1"
.\"
.\" unbound.conf.5 -- unbound.conf manual
.\"
Expand Down
Loading

0 comments on commit d10c9c1

Please sign in to comment.