From 3ddca50846c9a38be4a45f812770e025e39e6f4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Fri, 12 Dec 2025 16:52:32 +0100
Subject: [PATCH] Create /var/named directories for bind-chroot

Fixes bind-chroot in Image Mode.

Resolves: RHEL-132054
---
 bind-chroot.tmpfiles.d | 31 +++++++++++++++++++++++++++++++
 bind9.18.spec          |  8 +++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 bind-chroot.tmpfiles.d

diff --git a/bind-chroot.tmpfiles.d b/bind-chroot.tmpfiles.d
new file mode 100644
index 0000000..002bf1b
--- /dev/null
+++ b/bind-chroot.tmpfiles.d
@@ -0,0 +1,31 @@
+# vim: ft=conf:
+# TODO: these definitions are in different form in rpm spec %files chroot section
+# find a way to have it defined only once
+#defattr(0664,root,named,-)
+c /var/named/chroot/dev/null    0664 root named 1:3
+c /var/named/chroot/dev/random  0664 root named 1:8
+c /var/named/chroot/dev/urandom 0664 root named 1:9
+c /var/named/chroot/dev/zero    0664 root named 1:5
+#defattr(0640,root,named,0750)
+d /var/named/chroot             0750 root named -
+d /var/named/chroot/dev         0750 root named -
+d /var/named/chroot/etc         0750 root named -
+d /var/named/chroot/etc/named   0750 root named -
+d /var/named/chroot/etc/pki/dnssec-keys 0750 root named -
+d /var/named/chroot/etc/crypto-policies/back-ends 0750 root named -
+d /var/named/chroot/var         0750 root named -
+d /var/named/chroot/run         0750 root named -
+#defattr(-,root,root,-)
+d /var/named/chroot/usr             - root root -
+d /var/named/chroot/lib64/bind      - root root -
+d /var/named/chroot/usr/share/GeoIP - root root -
+d /var/named/chroot/usr/share/named - root root -
+d /var/named/chroot/proc            - root root -
+#defattr(0660,root,named,01770)
+d /var/named/chroot/var/named   01770 root named -
+#defattr(0660,named,named,0770)
+d /var/named/chroot/var/tmp      0770 named named -
+d /var/named/chroot/var/log      0770 named named -
+#defattr(-,named,named,-)
+d /var/named/chroot/run/named       - named named -
+d /var/named/chroot/var/run         - named named -
diff --git a/bind9.18.spec b/bind9.18.spec
index 42e0da6..1db3e2c 100644
--- a/bind9.18.spec
+++ b/bind9.18.spec
@@ -77,7 +77,7 @@ License:  MPL-2.0 AND ISC AND MIT AND BSD-3-Clause AND BSD-2-Clause
 # ./lib/isc/tm.c BSD-2-clause and/or MPL-2.0
 # ./lib/isccfg/parser.c BSD-2-clause and/or MPL-2.0
 Version:  9.18.29
-Release:  8%{?dist}
+Release:  9%{?dist}
 Epoch:    32
 Url:      https://www.isc.org/downloads/bind/
 #
@@ -107,6 +107,7 @@ Source44: named-chroot-setup.service
 Source46: named-setup-rndc.service
 Source48: setup-named-softhsm.sh
 Source49: named-chroot.files
+Source51: bind-chroot.tmpfiles.d
 
 # Common patches
 # FIXME: Is this still required?
@@ -700,6 +701,7 @@ done
 
 mkdir -p ${RPM_BUILD_ROOT}%{_tmpfilesdir}
 install -p -m 644 %{SOURCE35} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/named.conf
+install -p -m 644 %{SOURCE51} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}-chroot.conf
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d
 install -p -m 644 %{SOURCE43} ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d/named
@@ -935,6 +937,7 @@ fi;
 %{_unitdir}/named-chroot.service
 %{_unitdir}/named-chroot-setup.service
 %{_libexecdir}/setup-named-chroot.sh
+%{_tmpfilesdir}/%{name}-chroot.conf
 %defattr(0664,root,named,-)
 %ghost %dev(c,1,3) %verify(not mtime) %{chroot_prefix}/dev/null
 %ghost %dev(c,1,8) %verify(not mtime) %{chroot_prefix}/dev/random
@@ -1000,6 +1003,9 @@ fi;
 %endif
 
 %changelog
+* Fri Dec 12 2025 Petr Menšík <pemensik@redhat.com> - 32:9.18.29-9
+- Create /var/named directories for bind-chroot (RHEL-132053)
+
 * Fri Oct 03 2025 Petr Menšík <pemensik@redhat.com> - 32:9.18.29-8
 - Copy named.* files from /usr/share/named into var/named