Hello community,
here is the log from the commit of package dhcp for openSUSE:Factory checked in
at 2020-04-29 20:44:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dhcp (Old)
and /work/SRC/openSUSE:Factory/.dhcp.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dhcp"
Wed Apr 29 20:44:09 2020 rev:118 rq:798663 version:4.3.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/dhcp/dhcp.changes 2020-03-05
23:17:35.889154037 +0100
+++ /work/SRC/openSUSE:Factory/.dhcp.new.2738/dhcp.changes 2020-04-29
20:44:10.823923918 +0200
@@ -1,0 +2,5 @@
+Wed Apr 15 06:32:20 UTC 2020 - Thorsten Kukuk <ku...@suse.com>
+
+- Use sysusers.d instead of shadow
+
+-------------------------------------------------------------------
New:
----
dhcp-user.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dhcp.spec ++++++
--- /var/tmp/diff_new_pack.COZUnV/_old 2020-04-29 20:44:11.983926942 +0200
+++ /var/tmp/diff_new_pack.COZUnV/_new 2020-04-29 20:44:11.991926963 +0200
@@ -54,6 +54,7 @@
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 tho...@suse.de not ...
@@ -92,6 +93,10 @@
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: 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/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 @@
%{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 @@
%{_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
++++++ dhcp-user.conf ++++++
# Type Name ID GECOS [HOME]
u dhcpd - "DHCP server daemon" /var/lib/dhcp
