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

- Disable nscd support (bsc#1235247)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=728
This commit is contained in:
Andreas Schwab 2025-01-21 12:21:17 +00:00 committed by Git OBS Bridge
parent d4ecb2ad0f
commit b8816f2fbf
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glibc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jan 20 13:33:58 UTC 2025 - Andreas Schwab <schwab@suse.de>
- Disable nscd support (bsc#1235247)
-------------------------------------------------------------------
Tue Jan 7 10:28:36 UTC 2025 - Andreas Schwab <schwab@suse.de>

27
glibc.spec
View File

@ -57,6 +57,12 @@
%bcond_with usrmerged
%endif
%if 0%{?suse_version} >= 1600
%bcond_with nscd
%else
%bcond_without nscd
%endif
%if 0%{?gcc_version} < 13
%define with_gcc 13
%endif
@ -206,6 +212,9 @@ Obsoletes: ngpt < 2.2.2
Obsoletes: ngpt-devel < 2.2.2
Provides: ngpt = 2.2.2
Provides: ngpt-devel = 2.2.2
%if %{without nscd}
Obsoletes: nscd <= %{version}
%endif
Conflicts: kernel < %{enablekernel}
%if %{with usrmerged}
# make sure we have post-usrmerge filesystem package
@ -725,8 +734,12 @@ profile="--disable-profile"
%if %{with livepatching}
--enable-userspace-livepatch \
%endif
--disable-crypt || \
{
--disable-crypt \
%if %{without nscd}
--disable-build-nscd \
--disable-nscd \
%endif
|| {
rc=$?;
echo "------- BEGIN config.log ------";
%{__cat} config.log;
@ -751,8 +764,10 @@ cd ..
make %{?_smp_mflags} %{?make_output_sync} -C cc-base html
%endif
%if %{with nscd}
# sysusers.d
%sysusers_generate_pre %{SOURCE22} nscd nscd.conf
%endif
%check
%if %{build_testsuite}
@ -954,6 +969,7 @@ cp -p cc-base/manual/libc/*.html %{buildroot}%{_datadir}/doc/glibc
cd manpages; make install_root=%{buildroot} install; cd ..
%if %{with nscd}
# nscd tools:
%ifnarch i686
@ -963,6 +979,7 @@ ln -sf %{rootsbindir}/service %{buildroot}%{_sbindir}/rcnscd
mkdir -p %{buildroot}/run/nscd
mkdir -p %{buildroot}/var/lib/nscd
%endif
%endif
#
# Create ld.so.conf
@ -991,6 +1008,7 @@ chmod 644 %{buildroot}%{_bindir}/ldd
rm -f %{buildroot}%{rootsbindir}/sln
%if %{with nscd}
%ifnarch i686
mkdir -p %{buildroot}/usr/lib/tmpfiles.d/
install -m 644 %{SOURCE20} %{buildroot}/usr/lib/tmpfiles.d/
@ -999,6 +1017,7 @@ 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}
# Provide compatibility link
@ -1025,8 +1044,10 @@ rm -rf %{buildroot}%{_libdir}/audit
# Remove files from glibc-{extra,info,i18ndata}, nscd
rm -rf %{buildroot}%{_infodir} %{buildroot}%{_prefix}/share/i18n
rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile
%if %{with nscd}
rm -f %{buildroot}%{_sbindir}/nscd
%endif
%endif
%ifnarch i686
# /var/lib/misc is incompatible with transactional updates (bsc#1138726)
@ -1403,6 +1424,7 @@ exit 0
%defattr(-,root,root)
%{_prefix}/share/i18n
%if %{with nscd}
%files -n nscd
%defattr(-,root,root)
%config(noreplace) /etc/nscd.conf
@ -1423,6 +1445,7 @@ exit 0
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/services
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/lib/nscd/netgroup
%endif
%endif
%if %{build_profile}
%files profile