From dbca114c6442ff3b5eb4531b8ed7e874ed17e503 Mon Sep 17 00:00:00 2001
From: AlmaLinux RelEng Bot <eabdullin@almalinux.org>
Date: Mon, 30 Mar 2026 11:19:50 -0400
Subject: [PATCH] import CS dhcp-4.4.2-20.b1.el9

---
 SOURCES/{dhcp.sysusers => systemd-sysusers.conf} |  0
 SOURCES/systemd-tmpfiles.conf                    |  1 +
 SPECS/dhcp.spec                                  | 13 ++++++++++---
 3 files changed, 11 insertions(+), 3 deletions(-)
 rename SOURCES/{dhcp.sysusers => systemd-sysusers.conf} (100%)
 create mode 100644 SOURCES/systemd-tmpfiles.conf

diff --git a/SOURCES/dhcp.sysusers b/SOURCES/systemd-sysusers.conf
similarity index 100%
rename from SOURCES/dhcp.sysusers
rename to SOURCES/systemd-sysusers.conf
diff --git a/SOURCES/systemd-tmpfiles.conf b/SOURCES/systemd-tmpfiles.conf
new file mode 100644
index 0000000..14fae32
--- /dev/null
+++ b/SOURCES/systemd-tmpfiles.conf
@@ -0,0 +1 @@
+d /var/lib/dhcpd 0755 dhcpd dhcpd -
diff --git a/SPECS/dhcp.spec b/SPECS/dhcp.spec
index 1a63ec3..52fc273 100644
--- a/SPECS/dhcp.spec
+++ b/SPECS/dhcp.spec
@@ -15,7 +15,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.4.2
-Release:  19.b1%{?dist}
+Release:  20.b1%{?dist}
 
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
@@ -32,7 +32,8 @@ Source5:  56dhclient
 Source6:  dhcpd.service
 Source7:  dhcpd6.service
 Source8:  dhcrelay.service
-Source9:  dhcp.sysusers
+Source9:  systemd-sysusers.conf
+Source10: systemd-tmpfiles.conf
 
 Patch1: 0001-change-bug-url.patch
 Patch2: 0002-additional-dhclient-options.patch
@@ -289,8 +290,9 @@ install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}
 install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}
 
-# systemd-sysusers
+# Install systemd sysusers and tmpfiles configs
 install -p -D -m 0644 %{SOURCE9} %{buildroot}%{_sysusersdir}/dhcp.conf
+install -p -D -m 0644 %{SOURCE10} %{buildroot}%{_tmpfilesdir}/dhcp.conf
 
 # Start empty lease databases
 mkdir -p %{buildroot}%{_localstatedir}/lib/dhcpd/
@@ -453,6 +455,7 @@ done
 %attr(0644,root,root)   %{_unitdir}/dhcpd.service
 %attr(0644,root,root)   %{_unitdir}/dhcpd6.service
 %{_sysusersdir}/dhcp.conf
+%{_tmpfilesdir}/dhcp.conf
 %{_sbindir}/dhcpd
 %{_bindir}/omshell
 %attr(0644,root,root) %{_mandir}/man1/omshell.1.gz
@@ -509,6 +512,10 @@ done
 %endif
 
 %changelog
+* Wed Jan 07 2026 Martin Osvald <mosvald@redhat.com> - 12:4.4.2-20.b1
+- Create /var/lib/dhcpd through systemd-tmpfiles
+  Resolves: RHEL-134207
+
 * Wed Apr 12 2023 Martin Osvald <mosvald@redhat.com> - 12:4.4.2-19.b1
 - Do not drop bounding set twice (#2184965)