Merging debian version 1:9.16.48-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 81 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index ea2596e..9ac06c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+bind9 (1:9.16.48-1) bullseye-security; urgency=high
+
+  * New upstream version 9.16.48
+   - CVE-2023-4408: Parsing large DNS messages may cause excessive CPU
+     load
+   - CVE-2023-5517: Querying RFC 1918 reverse zones may cause an assertion
+     failure when "nxdomain-redirect" is enabled
+   - CVE-2023-5679: Enabling both DNS64 and serve-stale may cause an
+     assertion failure during recursive resolution
+   - CVE-2023-6516: Specific recursive query patterns may lead to an
+     out-of-memory condition
+   - CVE-2023-50387: KeyTrap - Extreme CPU consumption in DNSSEC validator
+   - CVE-2023-50868: Preparing an NSEC3 closest encloser proof can exhaust
+     CPU resources
+  * Update patches from debian/9.16 branch
+   - Disable treat-warnings-as-errors in sphinx-build
+   - Remove the reference to OPTIONS.md - it breaks build on Debian
+     stretch
+
+ -- Ondřej Surý <ondrej@debian.org>  Mon, 12 Feb 2024 17:25:59 +0100
+
 bind9 (1:9.16.44-1~deb11u1progress6u1) fuchur; urgency=high
 
   * Initial reupload to fuchur.
diff --git a/debian/patches/0003-Remove-the-reference-to-OPTIONS.md-it-breaks-build-o.patch b/debian/patches/0003-Remove-the-reference-to-OPTIONS.md-it-breaks-build-o.patch
new file mode 100644
index 0000000..9cd5b13
--- /dev/null
+++ b/debian/patches/0003-Remove-the-reference-to-OPTIONS.md-it-breaks-build-o.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@debian.org>
+Date: Wed, 16 Mar 2022 20:28:46 +0100
+Subject: Remove the reference to OPTIONS.md - it breaks build on Debian
+ stretch
+
+---
+ doc/arm/build.rst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/arm/build.rst b/doc/arm/build.rst
+index 7c266c9..1a5f000 100644
+--- a/doc/arm/build.rst
++++ b/doc/arm/build.rst
+@@ -39,7 +39,7 @@ before running ``configure``. The most significant ones are:
+ | ``STD_CDEFINES``   | Any additional preprocessor symbols you want    |
+ |                    | defined. Defaults to empty string. For a list   |
+ |                    | of possible settings, see the file              |
+-|                    | `OPTIONS <OPTIONS.md>`__.                       |
++|                    | OPTIONS.md.                                     |
+ +--------------------+-------------------------------------------------+
+ | ``LDFLAGS``        | The linker flags. Defaults to an empty string.  |
+ +--------------------+-------------------------------------------------+
diff --git a/debian/patches/0004-Disable-treat-warnings-as-errors-in-sphinx-build.patch b/debian/patches/0004-Disable-treat-warnings-as-errors-in-sphinx-build.patch
new file mode 100644
index 0000000..3bf68b8
--- /dev/null
+++ b/debian/patches/0004-Disable-treat-warnings-as-errors-in-sphinx-build.patch
@@ -0,0 +1,36 @@
+From: =?utf-8?b?T25kxZllaiBTdXLDvQ==?= <ondrej@debian.org>
+Date: Wed, 18 May 2022 17:17:57 +0200
+Subject: Disable treat-warnings-as-errors in sphinx-build
+
+---
+ doc/arm/Makefile.in | 1 -
+ doc/man/Makefile.in | 2 --
+ 2 files changed, 3 deletions(-)
+
+diff --git a/doc/arm/Makefile.in b/doc/arm/Makefile.in
+index ce365e3..806f577 100644
+--- a/doc/arm/Makefile.in
++++ b/doc/arm/Makefile.in
+@@ -29,7 +29,6 @@ SPHINXBUILD = @SPHINX_BUILD@
+ SPHINXBUILDDIR = ${builddir}/_build
+ 
+ common_SPHINXOPTS =	\
+-	-W		\
+ 	-a		\
+ 	-v		\
+ 	-c "${abs_srcdir}"
+diff --git a/doc/man/Makefile.in b/doc/man/Makefile.in
+index 75794f7..7148293 100644
+--- a/doc/man/Makefile.in
++++ b/doc/man/Makefile.in
+@@ -158,10 +158,8 @@ BIND9_VERSIONSTRING=@BIND9_VERSIONSTRING@
+ # You can set these variables from the command line.
+ SPHINXBUILD = @SPHINX_BUILD@
+ SPHINXBUILDDIR = ${builddir}/_build
+-SPHINX_W = -W
+ 
+ common_SPHINXOPTS =		\
+-	$(SPHINX_W)		\
+ 	-a			\
+ 	-v			\
+ 	-c "${abs_srcdir}"
diff --git a/debian/patches/series b/debian/patches/series
index 12673d3..f17013e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Add_--install-layout=deb_to_setup.py_call.patch
 0002-python-fix-for-dist-packages.patch
-0003-Disable-sphinx-build-strict-mode.patch
+0003-Remove-the-reference-to-OPTIONS.md-it-breaks-build-o.patch
+0004-Disable-treat-warnings-as-errors-in-sphinx-build.patch