import UBI bind-9.16.23-18.el9_4.1

SOURCES/bind-9.16-CVE-2023-6516-test.patch

@@ -0,0 +1,52 @@
+From e91ab7758bed0cf3dcf8ed745f91063d7ec4011c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
+Date: Thu, 4 Jan 2024 13:39:27 +0100
+Subject: [PATCH] Fix map offsets in the "masterformat" system test
+
+The "masterformat" system test attempts to check named-checkzone
+behavior when it is fed corrupt map-format zone files.  However, despite
+the RBTDB and RBT structures having evolved over the years, the offsets
+at which a valid map-format zone file is malformed by the "masterformat"
+test have not been updated accordingly, causing the relevant checks to
+introduce a different type of corruption than they were originally meant
+to cause:
+
+  - the "bad node header" check originally mangled the 'type' member of
+    the rdatasetheader_t structure for cname.example.nil,
+
+  - the "bad node data" check originally mangled the 'serial' and
+    'rdh_ttl' members of the rdatasetheader_t structure for
+    aaaa.example.nil.
+
+Update the offsets at which the map-format zone file is malformed at by
+the "masterformat" system test so that the relevant checks fulfill their
+original purpose again.
+---
+ bin/tests/system/masterformat/tests.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh
+index 364a0d2..bb4e6ec 100755
+--- a/bin/tests/system/masterformat/tests.sh
++++ b/bin/tests/system/masterformat/tests.sh
+@@ -295,7 +295,7 @@ status=$((status+ret))
+ echo_i "checking corrupt map files fail to load (bad node header) ($n)"
+ ret=0
+ cp map.5 badmap
+-stomp badmap 2754 2 99
++stomp badmap 3706 2 99
+ $CHECKZONE -D -f map -F text -o text.5 example.nil badmap > /dev/null
+ [ $? = 1 ] || ret=1
+ n=$((n+1))
+@@ -305,7 +305,7 @@ status=$((status+ret))
+ echo_i "checking corrupt map files fail to load (bad node data) ($n)"
+ ret=0
+ cp map.5 badmap
+-stomp badmap 2897 5 127
++stomp badmap 3137 5 127
+ $CHECKZONE -D -f map -F text -o text.5 example.nil badmap > /dev/null
+ [ $? = 1 ] || ret=1
+ n=$((n+1))
+-- 
+2.44.0
+

SOURCES/bind-9.16-update-b.root-servers.net.patch

@@ -0,0 +1,53 @@
+From c532af966a7328f0e518273bc1f6051bb9d9e995 Mon Sep 17 00:00:00 2001
+From: Mark Andrews <marka@isc.org>
+Date: Thu, 12 Oct 2023 10:19:38 +1100
+Subject: [PATCH] Update b.root-servers.net IP addresses
+
+This covers both root hints and the default primaries for the root
+zone mirror.  The official change date is Nov 27, 2023.
+
+(cherry picked from commit 2ca2f7e9852a3d6e93f065c01ea4679f723688f7)
+---
+ bin/named/config.c | 4 ++--
+ lib/dns/rootns.c   | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bin/named/config.c b/bin/named/config.c
+index 8c6f90c..c37015f 100644
+--- a/bin/named/config.c
++++ b/bin/named/config.c
+@@ -292,14 +292,14 @@ view \"_bind\" chaos {\n\
+ 			    "# END MANAGED KEYS\n\
+ \n\
+ primaries " DEFAULT_IANA_ROOT_ZONE_PRIMARIES " {\n\
+-	2001:500:200::b;	# b.root-servers.net\n\
++	2801:1b8:10::b;		# b.root-servers.net\n\
+ 	2001:500:2::c;		# c.root-servers.net\n\
+ 	2001:500:2f::f;		# f.root-servers.net\n\
+ 	2001:500:12::d0d;	# g.root-servers.net\n\
+ 	2001:7fd::1;		# k.root-servers.net\n\
+ 	2620:0:2830:202::132;	# xfr.cjr.dns.icann.org\n\
+ 	2620:0:2d0:202::132;	# xfr.lax.dns.icann.org\n\
+-	199.9.14.201;		# b.root-servers.net\n\
++	170.247.170.2;		# b.root-servers.net\n\
+ 	192.33.4.12;		# c.root-servers.net\n\
+ 	192.5.5.241;		# f.root-servers.net\n\
+ 	192.112.36.4;		# g.root-servers.net\n\
+diff --git a/lib/dns/rootns.c b/lib/dns/rootns.c
+index 885c2fb..b06d247 100644
+--- a/lib/dns/rootns.c
++++ b/lib/dns/rootns.c
+@@ -52,8 +52,8 @@ static char root_ns[] =
+ 	".                       518400  IN      NS      M.ROOT-SERVERS.NET.\n"
+ 	"A.ROOT-SERVERS.NET.     3600000 IN      A       198.41.0.4\n"
+ 	"A.ROOT-SERVERS.NET.     3600000 IN      AAAA    2001:503:BA3E::2:30\n"
+-	"B.ROOT-SERVERS.NET.     3600000 IN      A       199.9.14.201\n"
+-	"B.ROOT-SERVERS.NET.     3600000 IN      AAAA    2001:500:200::b\n"
++	"B.ROOT-SERVERS.NET.     3600000 IN      A       170.247.170.2\n"
++	"B.ROOT-SERVERS.NET.     3600000 IN      AAAA    2801:1b8:10::b\n"
+ 	"C.ROOT-SERVERS.NET.     3600000 IN      A       192.33.4.12\n"
+ 	"C.ROOT-SERVERS.NET.     3600000 IN      AAAA    2001:500:2::c\n"
+ 	"D.ROOT-SERVERS.NET.     3600000 IN      A       199.7.91.13\n"
+-- 
+2.43.0
+

SOURCES/named.root

@@ -1,13 +1,13 @@
 
-; <<>> DiG 9.11.3-RedHat-9.11.3-3.fc27 <<>> +bufsize=1200 +norec @a.root-servers.net
+; <<>> DiG 9.18.20 <<>> -4 +tcp +norec +nostats @d.root-servers.net
-; (2 servers found)
+; (1 server found)
 ;; global options: +cmd
 ;; Got answer:
-;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 46900
+;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 47286
 ;; flags: qr aa; QUERY: 1, ANSWER: 13, AUTHORITY: 0, ADDITIONAL: 27
 
 ;; OPT PSEUDOSECTION:
-; EDNS: version: 0, flags:; udp: 1472
+; EDNS: version: 0, flags:; udp: 1450
 ;; QUESTION SECTION:
 ;.				IN	NS
 
@@ -28,7 +28,7 @@
 
 ;; ADDITIONAL SECTION:
 a.root-servers.net.	518400	IN	A	198.41.0.4
-b.root-servers.net.	518400	IN	A	199.9.14.201
+b.root-servers.net.	518400	IN	A	170.247.170.2
 c.root-servers.net.	518400	IN	A	192.33.4.12
 d.root-servers.net.	518400	IN	A	199.7.91.13
 e.root-servers.net.	518400	IN	A	192.203.230.10
@@ -41,7 +41,7 @@ k.root-servers.net.	518400	IN	A	193.0.14.129
 l.root-servers.net.	518400	IN	A	199.7.83.42
 m.root-servers.net.	518400	IN	A	202.12.27.33
 a.root-servers.net.	518400	IN	AAAA	2001:503:ba3e::2:30
-b.root-servers.net.	518400	IN	AAAA	2001:500:200::b
+b.root-servers.net.	518400	IN	AAAA	2801:1b8:10::b
 c.root-servers.net.	518400	IN	AAAA	2001:500:2::c
 d.root-servers.net.	518400	IN	AAAA	2001:500:2d::d
 e.root-servers.net.	518400	IN	AAAA	2001:500:a8::e
@@ -54,8 +54,3 @@ k.root-servers.net.	518400	IN	AAAA	2001:7fd::1
 l.root-servers.net.	518400	IN	AAAA	2001:500:9f::42
 m.root-servers.net.	518400	IN	AAAA	2001:dc3::35
 
-;; Query time: 24 msec
-;; SERVER: 198.41.0.4#53(198.41.0.4)
-;; WHEN: Thu Apr 05 15:57:34 CEST 2018
-;; MSG SIZE  rcvd: 811
-

SPECS/bind.spec

@@ -51,7 +51,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  MPLv2.0
 Version:  9.16.23
-Release:  14%{?dist}.4
+Release:  18%{?dist}.1
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -133,6 +133,8 @@ Patch190: bind-9.16-CVE-2023-2911-2.patch
 # https://gitlab.isc.org/isc-projects/bind9/commit/c003c5bc3c68f3e513654b6689e1f60280d14844
 Patch191: bind-9.16-CVE-2023-2911-3.patch
 Patch192: bind-9.16-CVE-2023-3341.patch
+# https://gitlab.isc.org/isc-projects/bind9/commit/8924adca613ca9daea63786563cce6fdbd742c56
+Patch193: bind-9.16-update-b.root-servers.net.patch
 Patch194: bind-9.16-CVE-2023-4408.patch
 Patch195: bind-9.16-CVE-2023-5517.patch
 Patch196: bind-9.16-CVE-2023-5679.patch
@@ -148,6 +150,8 @@ Patch201: bind-9.16-system-test-cds.patch
 Patch202: bind-9.16-isc-mempool-attach.patch
 # Downstream only change, complements patch 198
 Patch203: bind-9.16-isc_hp-CVE-2023-50387.patch
+# https://gitlab.isc.org/isc-projects/bind9/commit/1237d73cd1120b146ee699bbae7b2fe837cf2f98
+Patch204: bind-9.16-CVE-2023-6516-test.patch
 
 %{?systemd_ordering}
 Requires:       coreutils
@@ -469,6 +473,7 @@ in HTML and PDF format.
 %patch190 -p1 -b .CVE-2023-2911-2
 %patch191 -p1 -b .CVE-2023-2911-3
 %patch192 -p1 -b .CVE-2023-3341
+%patch193 -p1 -b .b.root-servers.net
 %patch194 -p1 -b .CVE-2023-4408
 %patch195 -p1 -b .CVE-2023-5517
 %patch196 -p1 -b .CVE-2023-5679
@@ -479,6 +484,7 @@ in HTML and PDF format.
 %patch201 -p1 -b .test-variant-def
 %patch202 -p1 -b .mempool-attach
 %patch203 -p1 -b .isc_hp-CVE-2023-50387
+%patch204 -p1 -b .CVE-2023-6516-test
 
 %if %{with PKCS11}
 %patch135 -p1 -b .config-pkcs11
@@ -1207,17 +1213,17 @@ fi;
 %endif
 
 %changelog
-* Tue Mar 12 2024 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-14.4
+* Mon Mar 25 2024 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-18.1
 - Rebuild with correct z-stream tag again
 
-* Wed Feb 28 2024 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-14.3
+* Mon Mar 25 2024 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-18
-- Rebuild together with bind-dyndb-ldap to adjust ABI changes
+- Prevent crashing at masterformat system test (CVE-2023-6516)
 
-* Mon Feb 19 2024 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-14.2
+* Mon Feb 19 2024 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-17
 - Import tests for large DNS messages fix
 - Add downstream change complementing CVE-2023-50387
 
-* Mon Feb 12 2024 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-14.1
+* Mon Feb 12 2024 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-16
 - Prevent increased CPU load on large DNS messages (CVE-2023-4408)
 - Prevent assertion failure when nxdomain-redirect is used with
  RFC 1918 reverse zones (CVE-2023-5517)
@@ -1227,6 +1233,9 @@ fi;
 - Prevent increased CPU consumption in DNSSEC validator (CVE-2023-50387
   CVE-2023-50868)
 
+* Thu Dec 07 2023 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-15
+- Update addresses of b.root-servers.net (RHEL-18188)
+
 * Wed Sep 20 2023 Petr Menšík <pemensik@redhat.com> - 32:9.16.23-14
 - Limit the amount of recursion possible in control channel (CVE-2023-3341)