rpms/bind
6
0
Fork 1
Code Issues Pull Requests Releases Activity

Add sysusers named user creation (rhbz#2105415)

Browse Source 
Drop original user creating in favor of sysusers file definition.

(cherry picked from commit 071ec07d27989a8d548834292fa46ca2312b4862)

Related: RHEL-48798
This commit is contained in:
Petr Menšík 2025-01-17 14:51:23 +01:00
parent 491ec650e2
commit efb20ad8e7
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bind.spec
View File

@ -31,8 +31,6 @@
%bcond_without OPENSSL_ENGINE %bcond_without OPENSSL_ENGINE
%endif %endif
%{?!bind_uid: %global bind_uid 25}
%{?!bind_gid: %global bind_gid 25}
%{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
%global bind_dir /var/named %global bind_dir /var/named
%global chroot_prefix %{bind_dir}/chroot %global chroot_prefix %{bind_dir}/chroot
@ -84,7 +82,7 @@ License: MPL-2.0 AND ISC AND MIT AND BSD-3-Clause AND BSD-2-Clause
# Before rebasing bind, ensure bind-dyndb-ldap is ready to be rebuild and use side-tag with it. # Before rebasing bind, ensure bind-dyndb-ldap is ready to be rebuild and use side-tag with it.
# Updating just bind will cause freeipa-dns-server package to be uninstallable. # Updating just bind will cause freeipa-dns-server package to be uninstallable.
Version: 9.18.32 Version: 9.18.32
Release: 1%{?dist} Release: 2%{?dist}
Epoch: 32 Epoch: 32
Url: https://www.isc.org/downloads/bind/ Url: https://www.isc.org/downloads/bind/
# #
@ -114,6 +112,7 @@ Source44: named-chroot-setup.service
Source46: named-setup-rndc.service Source46: named-setup-rndc.service
Source48: setup-named-softhsm.sh Source48: setup-named-softhsm.sh
Source49: named-chroot.files Source49: named-chroot.files
Source50: named.sysusers
# Common patches # Common patches
# FIXME: Is this still required? # FIXME: Is this still required?
@ -123,8 +122,9 @@ Patch16: bind-9.16-redhat_doc.patch
Patch26: bind-9.18-unittest-netmgr-unstable.patch Patch26: bind-9.18-unittest-netmgr-unstable.patch
%{?systemd_ordering} %{?systemd_ordering}
# https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers
%{?sysusers_requires_compat}
Requires: coreutils Requires: coreutils
Requires(pre): shadow-utils
Requires(post): shadow-utils Requires(post): shadow-utils
Requires(post): glibc-common Requires(post): glibc-common
Requires(post): grep Requires(post): grep
@ -573,6 +573,9 @@ install -m 644 %{SOURCE38} ${RPM_BUILD_ROOT}%{_unitdir}
install -m 644 %{SOURCE44} ${RPM_BUILD_ROOT}%{_unitdir} install -m 644 %{SOURCE44} ${RPM_BUILD_ROOT}%{_unitdir}
install -m 644 %{SOURCE46} ${RPM_BUILD_ROOT}%{_unitdir} install -m 644 %{SOURCE46} ${RPM_BUILD_ROOT}%{_unitdir}
mkdir -p ${RPM_BUILD_ROOT}%{_sysusersdir}
install -m 644 %{SOURCE50} ${RPM_BUILD_ROOT}%{_sysusersdir}/named.conf
mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir} mkdir -p ${RPM_BUILD_ROOT}%{_libexecdir}
install -m 755 %{SOURCE41} ${RPM_BUILD_ROOT}%{_libexecdir}/setup-named-chroot.sh install -m 755 %{SOURCE41} ${RPM_BUILD_ROOT}%{_libexecdir}/setup-named-chroot.sh
install -m 755 %{SOURCE42} ${RPM_BUILD_ROOT}%{_libexecdir}/generate-rndc-key.sh install -m 755 %{SOURCE42} ${RPM_BUILD_ROOT}%{_libexecdir}/generate-rndc-key.sh
@ -688,8 +691,7 @@ install -m 644 %{SOURCE43} ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d/named
%pre %pre
if [ "$1" -eq 1 ]; then if [ "$1" -eq 1 ]; then
/usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :; %sysusers_create_compat %{SOURCE50}
/usr/sbin/useradd -u %{bind_uid} -r -N -M -g named -s /sbin/nologin -d /var/named -c Named named >/dev/null 2>&1 || :;
fi; fi;
:; :;
@ -792,6 +794,7 @@ fi;
%{_sysconfdir}/rwtab.d/named %{_sysconfdir}/rwtab.d/named
%{_unitdir}/named.service %{_unitdir}/named.service
%{_unitdir}/named-setup-rndc.service %{_unitdir}/named-setup-rndc.service
%{_sysusersdir}/named.conf
%{_bindir}/named-journalprint %{_bindir}/named-journalprint
%{_bindir}/named-checkconf %{_bindir}/named-checkconf
%{_bindir}/named-rrchecker %{_bindir}/named-rrchecker
@ -977,6 +980,9 @@ fi;
%endif %endif
%changelog %changelog
* Fri Jan 17 2025 Petr Menšík <pemensik@redhat.com> - 32:9.18.32-2
- Add sysusers named user creation (rhbz#2105415)
* Thu Dec 12 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.32-1 * Thu Dec 12 2024 Petr Menšík <pemensik@redhat.com> - 32:9.18.32-1
- Update to 9.18.32 (RHEL-48798) - Update to 9.18.32 (RHEL-48798)
- Remove CHANGES file from package - Remove CHANGES file from package

3
named.sysusers Normal file
View File

@ -0,0 +1,3 @@
#Type Name ID GECOS Home directory Shell
u named 25 "Named" /var/named /sbin/nologin
g named 25