Accepting request 41362 from Base:System

Copy from Base:System/glibc based on submit request 41362 from user pbaudis

OBS-URL: https://build.opensuse.org/request/show/41362
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=21
This commit is contained in:
OBS User autobuild 2010-06-18 14:25:27 +00:00 committed by Git OBS Bridge
parent 230c58fe1a
commit eebb8cb0be
5 changed files with 57 additions and 5 deletions

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9b0467d31d53dcb8e9920efa51c338e2ef1bb597ab7d2ed14b9a16103ffd2622
size 15670351

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:badb11c8eef452ee7acf9842fb71daf46c96426dd8ce49f71b2c364c6e600082
size 15675556

37
glibc-ldconfigr-aux.diff Normal file
View File

@ -0,0 +1,37 @@
2010-05-31 Petr Baudis <pasky@suse.cz>
* elf/ldconfig.c: Allow aux_cache_file open()ing to fail silently
even in the chroot mode.
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index 6e71b09..6ba8e07 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -1359,14 +1359,9 @@ main (int argc, char **argv)
const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
if (opt_chroot)
- {
- aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
- if (aux_cache_file == NULL)
- error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"),
- _PATH_LDCONFIG_AUX_CACHE);
- }
+ aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
- if (! opt_ignore_aux_cache)
+ if (! opt_ignore_aux_cache && aux_cache_file)
load_aux_cache (aux_cache_file);
else
init_aux_cache ();
@@ -1376,7 +1371,8 @@ main (int argc, char **argv)
if (opt_build_cache)
{
save_cache (cache_file);
- save_aux_cache (aux_cache_file);
+ if (aux_cache_file)
+ save_aux_cache (aux_cache_file);
}
return 0;

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Jun 11 15:41:07 CEST 2010 - pbaudis@suse.cz
- Upgrade to latest release/2.11/master - glibc-2.11.2-21580967038a
- Fix buggy x86 CPU family and model check
- Fix sunrpc error condition handling
- Fix crash on unresolved weak symbol reference
-------------------------------------------------------------------
Tue Jun 1 03:38:28 CEST 2010 - pbaudis@suse.cz
- Fix ldconfig -r failing on aux cache [bnc#609345]
-------------------------------------------------------------------
Thu May 20 02:19:28 CEST 2010 - pbaudis@suse.cz

View File

@ -64,11 +64,11 @@ Obsoletes: glibc-32bit
Provides: rtld(GNU_HASH)
AutoReqProv: on
Version: 2.11.2
Release: 1
Release: 2
Url: http://www.gnu.org/software/libc/libc.html
PreReq: filesystem
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source: glibc-%{version}-f2020c64596a.tar.bz2
Source: glibc-%{version}-21580967038a.tar.bz2
Source2: glibc-ports-2.10.1-2b2b217196.tar.bz2
Source3: noversion.tar.bz2
Source4: manpages.tar.bz2
@ -136,6 +136,7 @@ Patch60: ld-prelink-unique.diff
Patch61: glibc-ppc64-vdso-time.diff
Patch64: glibc-gai-private4.diff
Patch65: glibc-resolv-mdnshint.diff
Patch66: glibc-ldconfigr-aux.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
@ -355,6 +356,7 @@ rm nscd/s-stamp
%patch61 -p1
%patch64
%patch65 -p1
%patch66 -p1
%ifarch %arm armv5tel armv7l
%patch500
%patch501