From 9298e1cb90bb3b09b1ebbc9d8a868ef3598e2224e7653f753f929c9b2594fa09 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Tue, 28 Apr 2020 12:18:44 +0000
Subject: [PATCH] Accepting request 794048 from home:kukuk:container

- Use sysusers.d instead of shadow

OBS-URL: https://build.opensuse.org/request/show/794048
OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=208
---
 dhcp-user.conf |  2 ++
 dhcp.changes   |  5 +++++
 dhcp.spec      | 23 ++++++++++++++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 dhcp-user.conf

diff --git a/dhcp-user.conf b/dhcp-user.conf
new file mode 100644
index 0000000..68c53a3
--- /dev/null
+++ b/dhcp-user.conf
@@ -0,0 +1,2 @@
+# Type Name ID GECOS [HOME]
+u dhcpd - "DHCP server daemon" /var/lib/dhcp
diff --git a/dhcp.changes b/dhcp.changes
index 0e49a90..c504b16 100644
--- a/dhcp.changes
+++ b/dhcp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Apr 15 06:32:20 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
+
+- Use sysusers.d instead of shadow
+
 -------------------------------------------------------------------
 Mon Mar  2 17:26:39 UTC 2020 - Reinhard Max <max@suse.com>
 
diff --git a/dhcp.spec b/dhcp.spec
index 716a249..8068818 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -54,6 +54,7 @@ Source43:       DDNS-howto.txt
 Source44:       contrib.tar.gz
 Source45:       examples.tar.gz
 Source46:       slp.reg.d.dhcp.reg
+Source47:       dhcp-user.conf
 Patch1:         0001-dhcp-4.1.1-default-paths.patch
 # paranoia patch is included now, but not the
 # additional patch by thomas@suse.de not ...
@@ -92,6 +93,10 @@ BuildRequires:  automake
 BuildRequires:  dos2unix
 BuildRequires:  libtool
 BuildRequires:  openldap2-devel
+%if 0%{?suse_version} >= 1330
+BuildRequires:  sysuser-shadow
+BuildRequires:  sysuser-tools
+%endif
 
 %package server
 Summary:        ISC DHCP Server
@@ -106,10 +111,12 @@ Requires:       dhcp = %{version}
 Requires:       net-tools
 %endif
 Requires(post): %fillup_prereq
-Requires(pre):  shadow
 %systemd_ordering
 %if 0%{?suse_version} >= 1330
 Requires(pre):  group(nogroup)
+%sysusers_requires
+%else
+Requires(pre):  shadow
 %endif
 
 %package client
@@ -262,6 +269,9 @@ cat bind/build.log
 cat bind/install.log
 : building dhcp sources
 make %{?_smp_mflags}
+%if 0%{?suse_version} >= 1330
+%sysusers_generate_pre %{SOURCE47} dhcp-server
+%endif
 
 %check
 # check example config, see if it runs
@@ -387,9 +397,17 @@ mv %{buildroot}%{_includedir}/{dhcpctl,isc-dhcp,omapip} \
    %{buildroot}%{_includedir}/dhcp/
 mv %{buildroot}%{_libdir}/lib*.* \
    %{buildroot}%{_libdir}/dhcp/
+%if 0%{?suse_version} >= 1330
+mkdir -p %{buildroot}%{_sysusersdir}
+install -m 644 %{SOURCE47} %{buildroot}%{_sysusersdir}/
+%endif
 
+%if 0%{?suse_version} >= 1330
+%pre server -f dhcp-server.pre
+%else
 %pre server
 getent passwd dhcpd >/dev/null || useradd -r -g nogroup -s /bin/false -c "DHCP server daemon" -d %{_localstatedir}/lib/dhcp dhcpd
+%endif
 %service_add_pre dhcpd.service
 %service_add_pre dhcpd6.service
 
@@ -465,6 +483,9 @@ test -e %{_localstatedir}/lib/dhcp6/dhclient6.leases || \
 %{_sbindir}/rcdhcpd6
 %{_unitdir}/dhcpd.service
 %{_unitdir}/dhcpd6.service
+%if 0%{?suse_version} >= 1330
+%{_sysusersdir}/dhcp-user.conf
+%endif
 %dir %{_libexecdir}/initscripts/legacy-actions/dhcpd
 %{_libexecdir}/initscripts/legacy-actions/dhcpd/*
 %dir %{_libexecdir}/initscripts/legacy-actions/dhcpd6