forked from pool/glibc
- Fix missing hconf setup in nscd - this meant multi on
in
/etc/host.conf was ignored when nscd was used, breaking e.g. resolving of multi-AF records in /etc/hosts [bnc#572188] - Fix two LD_AUDIT security vulnerabilities: spurious $ORIGIN expansion and missing setuid library check when running as setuid [bnc#646960] OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=42
This commit is contained in:
committed by
Git OBS Bridge
parent
e8fd5cf6b6
commit
c944b8437a
15
glibc.spec
15
glibc.spec
@@ -138,6 +138,9 @@ Patch64: glibc-gai-private4.diff
|
||||
Patch65: glibc-resolv-mdnshint.diff
|
||||
Patch66: glibc-ldconfigr-aux.diff
|
||||
Patch67: glibc-nis-initgroups.diff
|
||||
Patch68: glibc-make-3.82.patch
|
||||
Patch69: glibc-nscd-hconf.diff
|
||||
Patch70: glibc-2.11.3-audit.diff
|
||||
Patch500: ARM_glibc-2.10.1-local-eabi-wchar.diff
|
||||
Patch501: ARM_glibc-2.10.1-local-hwcap-updates.diff
|
||||
Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff
|
||||
@@ -361,6 +364,9 @@ rm nscd/s-stamp
|
||||
%patch65 -p1
|
||||
%patch66 -p1
|
||||
%patch67 -p1
|
||||
%patch68 -p1
|
||||
%patch69 -p1
|
||||
%patch70 -p1
|
||||
%ifarch %arm armv5tel armv7l
|
||||
%patch500
|
||||
%patch501
|
||||
@@ -388,12 +394,12 @@ rm nscd/s-stamp
|
||||
rm -fv sysdeps/powerpc/powerpc32/power4/hp-timing.c sysdeps/powerpc/powerpc32/power4/hp-timing.h
|
||||
find . -name configure | xargs touch
|
||||
|
||||
|
||||
#######################################################################
|
||||
###
|
||||
### BUILD
|
||||
###
|
||||
#######################################################################
|
||||
|
||||
%build
|
||||
if [ -x /bin/uname.bin ]; then
|
||||
/bin/uname.bin -a
|
||||
@@ -555,6 +561,7 @@ $BuildCC -static -Os -g $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgra
|
||||
%endif
|
||||
'-DLIBDIR="/%{_lib}"' '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"'
|
||||
|
||||
|
||||
#######################################################################
|
||||
###
|
||||
### CHECK
|
||||
@@ -577,6 +584,7 @@ $BuildCC -static -Os -g $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glibc_post_upgra
|
||||
%endif
|
||||
make -C cc-base check-abi || echo check-abi failed
|
||||
|
||||
|
||||
#######################################################################
|
||||
###
|
||||
### INSTALL
|
||||
@@ -669,6 +677,7 @@ cp -av bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h
|
||||
ln -sf ../%{_lib}/ld-%{version}.so $RPM_BUILD_ROOT/lib/ld64.so.1
|
||||
%endif
|
||||
|
||||
|
||||
# Miscelanna:
|
||||
|
||||
install -m 0700 glibc_post_upgrade $RPM_BUILD_ROOT%{_sbindir}
|
||||
@@ -689,6 +698,7 @@ cp -p manual/libc/*.html $RPM_BUILD_ROOT/usr/share/doc/glibc
|
||||
|
||||
cd manpages; make install_root=$RPM_BUILD_ROOT install; cd ..
|
||||
|
||||
|
||||
# nscd tools:
|
||||
|
||||
cp nscd/nscd.conf $RPM_BUILD_ROOT/etc
|
||||
@@ -762,6 +772,7 @@ for o in $RPM_BUILD_ROOT/%{_libdir}/crt[1in].o $RPM_BUILD_ROOT/%{_libdir}/lib*_n
|
||||
objcopy -R ".comment.SUSE.OPTs" -R ".note.gnu.build-id" $o
|
||||
done
|
||||
|
||||
|
||||
#######################################################################
|
||||
###
|
||||
### ...
|
||||
@@ -799,6 +810,7 @@ done
|
||||
%insserv_cleanup
|
||||
exit 0
|
||||
|
||||
|
||||
#######################################################################
|
||||
###
|
||||
### FILES
|
||||
@@ -806,7 +818,6 @@ exit 0
|
||||
#######################################################################
|
||||
|
||||
# glibc
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSES
|
||||
|
Reference in New Issue
Block a user