Use systemd-sysusers for dhcp user and group (rhbz#2138822)
https://docs.fedoraproject.org/en-US/packaging-guidelines/UsersAndGroups/#_dynamic_allocation
This commit is contained in:
parent
16c600305d
commit
51194ddffd
33
dhcp.spec
33
dhcp.spec
@ -15,7 +15,7 @@
|
|||||||
Summary: Dynamic host configuration protocol software
|
Summary: Dynamic host configuration protocol software
|
||||||
Name: dhcp
|
Name: dhcp
|
||||||
Version: 4.4.3
|
Version: 4.4.3
|
||||||
Release: 4%{?prever:.%prever}%{?patchver:.%patchver}%{?dist}
|
Release: 5%{?prever:.%prever}%{?patchver:.%patchver}%{?dist}
|
||||||
|
|
||||||
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
|
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
|
||||||
# dcantrell maintaining the package) made incorrect use of the epoch and
|
# dcantrell maintaining the package) made incorrect use of the epoch and
|
||||||
@ -34,6 +34,7 @@ Source5: 56dhclient
|
|||||||
Source6: dhcpd.service
|
Source6: dhcpd.service
|
||||||
Source7: dhcpd6.service
|
Source7: dhcpd6.service
|
||||||
Source8: dhcrelay.service
|
Source8: dhcrelay.service
|
||||||
|
Source11: dhcp.sysusers
|
||||||
|
|
||||||
Patch1: 0001-change-bug-url.patch
|
Patch1: 0001-change-bug-url.patch
|
||||||
Patch2: 0002-additional-dhclient-options.patch
|
Patch2: 0002-additional-dhclient-options.patch
|
||||||
@ -85,6 +86,7 @@ BuildRequires: doxygen
|
|||||||
BuildRequires: systemtap-sdt-devel
|
BuildRequires: systemtap-sdt-devel
|
||||||
%global tapsetdir /usr/share/systemtap/tapset
|
%global tapsetdir /usr/share/systemtap/tapset
|
||||||
%endif
|
%endif
|
||||||
|
BuildRequires: systemd-rpm-macros
|
||||||
|
|
||||||
# In _docdir we ship some perl scripts and module from contrib subdirectory.
|
# In _docdir we ship some perl scripts and module from contrib subdirectory.
|
||||||
# Because nothing under _docdir is allowed to "require" anything,
|
# Because nothing under _docdir is allowed to "require" anything,
|
||||||
@ -99,11 +101,9 @@ DHCP (Dynamic Host Configuration Protocol)
|
|||||||
Summary: Provides the ISC DHCP server
|
Summary: Provides the ISC DHCP server
|
||||||
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||||
Obsoletes: %{name}-compat < 12:4.4.2-12.b1
|
Obsoletes: %{name}-compat < 12:4.4.2-12.b1
|
||||||
Requires(pre): shadow-utils
|
|
||||||
Requires(post): coreutils grep sed
|
Requires(post): coreutils grep sed
|
||||||
Requires(post): systemd
|
%{?sysusers_requires_compat}
|
||||||
Requires(preun): systemd
|
%{?systemd_requires}
|
||||||
Requires(postun): systemd
|
|
||||||
|
|
||||||
%description server
|
%description server
|
||||||
DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
|
DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
|
||||||
@ -119,9 +119,7 @@ Summary: Provides the ISC DHCP relay agent
|
|||||||
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
Requires: %{name}-common = %{epoch}:%{version}-%{release}
|
||||||
Obsoletes: %{name}-compat < 12:4.4.2-12.b1
|
Obsoletes: %{name}-compat < 12:4.4.2-12.b1
|
||||||
Requires(post): grep sed
|
Requires(post): grep sed
|
||||||
Requires(post): systemd
|
%{?systemd_requires}
|
||||||
Requires(preun): systemd
|
|
||||||
Requires(postun): systemd
|
|
||||||
|
|
||||||
%description relay
|
%description relay
|
||||||
DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
|
DHCP (Dynamic Host Configuration Protocol) is a protocol which allows
|
||||||
@ -305,6 +303,9 @@ install -m 644 %{SOURCE6} %{buildroot}%{_unitdir}
|
|||||||
install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}
|
install -m 644 %{SOURCE7} %{buildroot}%{_unitdir}
|
||||||
install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}
|
install -m 644 %{SOURCE8} %{buildroot}%{_unitdir}
|
||||||
|
|
||||||
|
# systemd-sysusers
|
||||||
|
install -p -D -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/dhcp.conf
|
||||||
|
|
||||||
# Start empty lease databases
|
# Start empty lease databases
|
||||||
mkdir -p %{buildroot}%{_localstatedir}/lib/dhcpd/
|
mkdir -p %{buildroot}%{_localstatedir}/lib/dhcpd/
|
||||||
touch %{buildroot}%{_localstatedir}/lib/dhcpd/dhcpd.leases
|
touch %{buildroot}%{_localstatedir}/lib/dhcpd/dhcpd.leases
|
||||||
@ -381,17 +382,7 @@ install -D -p -m 0644 contrib/ldap/dhcp.schema %{buildroot}%{_sysconfdir}/openld
|
|||||||
find %{buildroot} -type f -name "*.la" -delete -print
|
find %{buildroot} -type f -name "*.la" -delete -print
|
||||||
|
|
||||||
%pre server
|
%pre server
|
||||||
# /usr/share/doc/setup/uidgid
|
%sysusers_create_compat %{SOURCE11}
|
||||||
%global gid_uid 177
|
|
||||||
getent group dhcpd >/dev/null || groupadd --force --gid %{gid_uid} --system dhcpd
|
|
||||||
if ! getent passwd dhcpd >/dev/null ; then
|
|
||||||
if ! getent passwd %{gid_uid} >/dev/null ; then
|
|
||||||
useradd --system --uid %{gid_uid} --gid dhcpd --home / --shell /sbin/nologin --comment "DHCP server" dhcpd
|
|
||||||
else
|
|
||||||
useradd --system --gid dhcpd --home / --shell /sbin/nologin --comment "DHCP server" dhcpd
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%post server
|
%post server
|
||||||
# Initial installation
|
# Initial installation
|
||||||
@ -475,6 +466,7 @@ done
|
|||||||
%config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
|
%config(noreplace) %{_sysconfdir}/openldap/schema/dhcp.schema
|
||||||
%attr(0644,root,root) %{_unitdir}/dhcpd.service
|
%attr(0644,root,root) %{_unitdir}/dhcpd.service
|
||||||
%attr(0644,root,root) %{_unitdir}/dhcpd6.service
|
%attr(0644,root,root) %{_unitdir}/dhcpd6.service
|
||||||
|
%{_sysusersdir}/dhcp.conf
|
||||||
%{_sbindir}/dhcpd
|
%{_sbindir}/dhcpd
|
||||||
%{_bindir}/omshell
|
%{_bindir}/omshell
|
||||||
%attr(0644,root,root) %{_mandir}/man1/omshell.1.gz
|
%attr(0644,root,root) %{_mandir}/man1/omshell.1.gz
|
||||||
@ -535,6 +527,9 @@ done
|
|||||||
%attr(0644,root,root) %{_mandir}/man8/keama.8.gz
|
%attr(0644,root,root) %{_mandir}/man8/keama.8.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 31 2022 Martin Osvald <mosvald@redhat.com> - 12:4.4.3-5.P1
|
||||||
|
- Use systemd-sysusers for dhcp user and group (rhbz#2138822)
|
||||||
|
|
||||||
* Wed Oct 05 2022 Martin Osvald <mosvald@redhat.com> - 12:4.4.3-4.P1
|
* Wed Oct 05 2022 Martin Osvald <mosvald@redhat.com> - 12:4.4.3-4.P1
|
||||||
- New version 4.4.3-P1 (rhbz#2132240)
|
- New version 4.4.3-P1 (rhbz#2132240)
|
||||||
- Fix for CVE-2022-2928 (rhbz#2132429)
|
- Fix for CVE-2022-2928 (rhbz#2132429)
|
||||||
|
3
dhcp.sysusers
Normal file
3
dhcp.sysusers
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
#Type Name ID GECOS Home directory Shell
|
||||||
|
u dhcpd 177 "DHCP server" / /sbin/nologin
|
||||||
|
g dhcpd 177
|
Loading…
Reference in New Issue
Block a user