pool/glibc
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1038649 from Base:System

Browse Source 
- nscd: Convert to systemd-sysusers (forwarded request 1038504 from gmbr3)

OBS-URL: https://build.opensuse.org/request/show/1038649
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=270
This commit is contained in:
Dominique Leuenberger 2022-11-30 13:58:47 +00:00 committed by Git OBS Bridge
commit 243ad30c00
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glibc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 10 17:06:18 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
- nscd: Convert to systemd-sysusers
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 26 14:07:48 UTC 2022 - Andreas Schwab <schwab@suse.de> Wed Oct 26 14:07:48 UTC 2022 - Andreas Schwab <schwab@suse.de>

16
glibc.spec
View File

@ -161,6 +161,7 @@ Source10: baselibs.conf
# For systemd # For systemd
Source20: nscd.conf Source20: nscd.conf
Source21: nscd.service Source21: nscd.service
Source22: nscd.sysusers
%if %{build_main} %if %{build_main}
# ngpt was used in 8.1 and SLES8 # ngpt was used in 8.1 and SLES8
@ -200,7 +201,7 @@ BuildRequires: libcap-devel
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: makeinfo BuildRequires: makeinfo
BuildRequires: python3-base BuildRequires: python3-base
BuildRequires: shadow BuildRequires: sysuser-tools
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: systemtap-headers BuildRequires: systemtap-headers
BuildRequires: xz BuildRequires: xz
@ -418,7 +419,7 @@ Group: System/Daemons
Provides: glibc:/usr/sbin/nscd Provides: glibc:/usr/sbin/nscd
Requires: glibc = %{version} Requires: glibc = %{version}
Obsoletes: unscd <= 0.48 Obsoletes: unscd <= 0.48
Requires(pre): shadow %{?sysusers_requires}
%{?systemd_requires} %{?systemd_requires}
%description -n nscd %description -n nscd
@ -736,6 +737,9 @@ cd ..
make %{?_smp_mflags} %{?make_output_sync} -C cc-base html make %{?_smp_mflags} %{?make_output_sync} -C cc-base html
%endif %endif
# sysusers.d
%sysusers_generate_pre %{SOURCE22} nscd nscd.conf
%check %check
%if %{build_testsuite} %if %{build_testsuite}
# The testsuite will fail if asneeded is used # The testsuite will fail if asneeded is used
@ -978,6 +982,8 @@ mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/ install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/
mkdir -p %{buildroot}/usr/lib/systemd/system mkdir -p %{buildroot}/usr/lib/systemd/system
install -m 644 %{SOURCE21} %{buildroot}/usr/lib/systemd/system install -m 644 %{SOURCE21} %{buildroot}/usr/lib/systemd/system
mkdir -p %{buildroot}/usr/lib/sysusers.d/
install -m 644 %{SOURCE22} %{buildroot}/usr/lib/sysusers.d/nscd.conf
%endif %endif
%if 0%{?rtld_oldname:1} %if 0%{?rtld_oldname:1}
@ -1166,9 +1172,7 @@ end
%preun info %preun info
%install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
%pre -n nscd %pre -n nscd -f nscd.pre
getent group nscd >/dev/null || %{_sbindir}/groupadd -r nscd
getent passwd nscd >/dev/null || %{_sbindir}/useradd -r -g nscd -c "User for nscd" -s %{rootsbindir}/nologin -d /run/nscd nscd
%service_add_pre nscd.service %service_add_pre nscd.service
%preun -n nscd %preun -n nscd
@ -1354,6 +1358,8 @@ exit 0
/usr/lib/systemd/system/nscd.service /usr/lib/systemd/system/nscd.service
%dir /usr/lib/tmpfiles.d %dir /usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/nscd.conf /usr/lib/tmpfiles.d/nscd.conf
%dir /usr/lib/sysusers.d
/usr/lib/sysusers.d/nscd.conf
%dir %attr(0755,root,root) %ghost /run/nscd %dir %attr(0755,root,root) %ghost /run/nscd
%attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/nscd.pid %attr(0644,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/nscd.pid
%attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/socket %attr(0666,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /run/nscd/socket

2
nscd.sysusers Normal file
View File

@ -0,0 +1,2 @@
#Type Name ID GECOS Home directory Shell
u nscd - "User for nscd" /run/nscd -