Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at Tue Jul 5 10:02:20 CEST 2011.
-------- --- glibc/glibc.changes 2011-06-30 13:28:06.000000000 +0200 +++ /mounts/work_src_done/STABLE/glibc/glibc.changes 2011-07-04 13:53:44.000000000 +0200 @@ -1,0 +2,24 @@ +Mon Jul 4 10:00:46 UTC 2011 - [email protected] + +- Further cleanup of ld.so.conf to remove duplicate directories + and allow override of system directories (bnc#671725) +- Fix futex bug (added patch glibc-fix-rwlock-stack-imbalance.patch + from sourceware bug #12403). + +------------------------------------------------------------------- +Fri Jul 1 16:09:14 UTC 2011 - [email protected] + +- Remove glibc-2.10.99-ia64-include.diff, it's not needed anymore. +- Disable obsolete patches glibc-fnmatch-multibyte.diff, + glibc-2.10-nscd-nostack.diff, glibc-2.3.1.localedef.diff +- Add glibc-2.13-localedef.patch to fix alignment problem. +- Adjust glibc-version.diff, FLOATING_STACKS variable is obsolete. + +------------------------------------------------------------------- +Thu Jun 30 12:17:33 UTC 2011 - [email protected] + +- Remove old ARM patches as it's unclear why those are needed and arm + support is anyhow broken according to comments here and in spec + files. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ARM_glibc-2.10.1-local-eabi-wchar.diff ARM_glibc-2.10.1-local-hwcap-updates.diff ARM_glibc-2.10.1-local-lowlevellock.diff ARM_glibc-2.10.1-local-no-hwcap.diff glibc-2.10.99-ia64-include.diff minmem New: ---- glibc-2.13-localedef.patch glibc-fix-rwlock-stack-imbalance.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.lPNXJI/_old 2011-07-05 09:30:53.000000000 +0200 +++ /var/tmp/diff_new_pack.lPNXJI/_new 2011-07-05 09:30:53.000000000 +0200 @@ -77,7 +77,7 @@ Obsoletes: glibc-32bit %endif Version: 2.13 -Release: 19 +Release: 21 Url: http://www.gnu.org/software/libc/libc.html Source: glibc-%{version}-996cf2ef0727.tar.bz2 Source2: http://ftp.gnu.org/gnu/glibc/glibc-ports-2.13.tar.bz2 @@ -111,7 +111,7 @@ Patch4: glibc-2.3.locales.diff.bz2 # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch5: crypt_blowfish-1.0-suse.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-OPENSUSE add some extra information to version output - [email protected] Patch7: glibc-version.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch8: glibc-2.4.90-revert-only-euro.diff @@ -135,9 +135,9 @@ Patch22: glibc-2.4.90-nscd.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch23: glibc-2.3.3-nscd-db-path.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-UPSTREAM - handle zero negative timeout, committed for glibc 2.15 Patch24: glibc-2.3.5-nscd-zeronegtimeout.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-OPENSUSE prefer -lang rpm packages Patch25: glibc-2.3.90-langpackdir.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch27: glibc-2.6-configure.diff @@ -153,19 +153,17 @@ Patch33: glibc-compiled-binaries.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch36: glibc-no-unwind-tables.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-OPENSUSE bnc#387202 Patch37: glibc-2.10-nscd-nostack.diff # PATCH-FEATURE-SLE increase cpusetsize to 4096, needs to be kept for compatibility [email protected] Patch38: glibc-cpusetsize.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch39: glibc-2.10.99-ia64-include.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch40: libm-x86-64-exceptions.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch41: glibc-uio-cell.diff # PATCH-FIX-SLE -- Do not assume statfs64 exists for ia64's ia32 layer bnc#534828 Patch42: glibc-statfs64-ia64.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-UPSTREAM -- add missing includes [email protected] Patch43: missing-include-build-fix.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch44: glibc-ppc64-vdso-time.diff @@ -181,7 +179,7 @@ Patch49: glibc-fini-unwind.diff # PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch50: glibc-gconvcache-s390.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines +# PATCH-FIX-UPSTREAM - Fix alloca argument bso#12445 [email protected] Patch51: glibc-vfprintf-positional.diff # PATCH-FIX-OPENSUSE bnc#657627 Patch52: glibc-elf-localscope.diff @@ -203,14 +201,10 @@ Patch61: glibc-2.15-getsysstats-speedup.patch # PATCH-FIX-UPSTREAM Fix gcc 4.6 warnings [email protected] Patch62: glibc-2.13-warnings.fix -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch500: ARM_glibc-2.10.1-local-eabi-wchar.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch501: ARM_glibc-2.10.1-local-hwcap-updates.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff -# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch503: ARM_glibc-2.10.1-local-no-hwcap.diff +# PATCH-FIX-OPENSUSE Fix localedef locale-archive creation bso#10855 [email protected] +Patch63: glibc-2.13-localedef.patch +# PATCH-FIX-UPSTREAM Fix futex bug bso#12403 [email protected] +Patch64: glibc-fix-rwlock-stack-imbalance.patch %description The GNU C Library provides the most important standard libraries used @@ -367,8 +361,8 @@ %prep %ifarch %arm armv5tel armv7l # add glibc-ports for arm -# this is CURRENTLY BROKEN; ARM-interested contributors need to provide -# new tested glibc-ports source +# this is CURRENTLY BROKEN (as of 2009-11-13); ARM-interested +# contributors need to provide new tested glibc-ports source %setup -n glibc-%{version} -q -a 2 -a 3 -a 4 %else # any other leave out ports @@ -377,13 +371,15 @@ %patch0 # libNoVersion part is only active on ix86 %patch1 -%patch2 -p1 +# Disabled +# %patch2 -p1 %patch3 %patch4 %patch5 %patch7 %patch8 -%patch11 +# Disabled +#%patch11 %patch12 %patch13 -E # We have s_sincos.c in patch13, remove duplicate @@ -409,9 +405,9 @@ %patch31 %patch33 %patch36 -%patch37 +# Disable for now +#%patch37 %patch38 -%patch39 %patch40 %patch41 -p1 %if 0%{?sles_version} @@ -439,12 +435,9 @@ %patch60 -p1 %patch61 -p1 %patch62 -p1 -%ifarch %arm armv5tel armv7l -%patch500 -%patch501 -%patch502 -%patch503 -%endif +%patch63 -p1 +%patch64 -p1 + # # Inconsistency detected by ld.so: dl-close.c: 719: _dl_close: Assertion `map->l_init_called' failed! # @@ -792,23 +785,14 @@ # Create ld.so.conf # cat > %{buildroot}/etc/ld.so.conf <<EOF -/usr/%{_lib}/Xaw3d %ifarch s390x sparc64 x86_64 ppc64 ppc -/usr/lib/Xaw3d +/usr/local/lib64 %endif -/usr/local/%{_lib} -%ifarch s390x sparc64 x86_64 ppc64 ppc /usr/local/lib -%endif -/%{_lib} -%ifarch s390x sparc64 x86_64 ppc64 ppc -/lib -%endif -/usr/%{_lib} -%ifarch s390x sparc64 x86_64 ppc64 ppc -/usr/lib -%endif include /etc/ld.so.conf.d/*.conf +# /lib64, /lib, /usr/lib64 and /usr/lib gets added +# automatically by ldconfig after parsing this file. +# So, they do not need to be listed. EOF # Add ldconfig cache directory for directory ownership mkdir -p %{buildroot}/var/cache/ldconfig ++++++ check-build.sh ++++++ --- /var/tmp/diff_new_pack.lPNXJI/_old 2011-07-05 09:30:53.000000000 +0200 +++ /var/tmp/diff_new_pack.lPNXJI/_new 2011-07-05 09:30:53.000000000 +0200 @@ -1,12 +1,10 @@ #!/bin/bash -# Copyright (c) 2003, 2004 SuSE Linux AG, Germany. All rights reserved. +# Copyright (c) 2003, 2004, 2011 SUSE Linux Products GmbH, Germany. All rights reserved. # # Authors: Thorsten Kukuk <[email protected]> # -# this script use the following variable(s): -# -# - $BUILD_BASENAME -# + + if [ `nice` -gt '9' ] ; then echo "Don't modify nice for building glibc!" @@ -15,8 +13,8 @@ # get kernel version OFS="$IFS" ; IFS=".-" ; version=(`uname -r`) ; IFS="$OIFS" -if test ${version[0]} -lt 2 -o ${version[1]} -lt 6 -o ${version[2]} -lt 32 ; then - echo "FATAL: kernel too old, need kernel >= 2.6.32 for this package" 1>&2 +if test ${version[0]} -lt 2 -o ${version[1]} -lt 6 -o ${version[2]} -lt 16 ; then + echo "FATAL: kernel too old, need kernel >= 2.6.16 for this package" 1>&2 exit 1 fi ++++++ glibc-2.13-localedef.patch ++++++ >From http://sourceware.org/bugzilla/show_bug.cgi?id=10855 2009-10-27 Aurelien Jarno <[email protected]> * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory used later with MMAP_FIXED | MMAP_SHARED to cope with different alignment restrictions. --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -134,7 +134,7 @@ size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; if (total < reserved - && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON, + && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON, -1, 0)) != MAP_FAILED)) xflags = MAP_FIXED; else @@ -397,7 +397,7 @@ size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; if (total < reserved - && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON, + && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON, -1, 0)) != MAP_FAILED)) xflags = MAP_FIXED; else @@ -615,7 +615,7 @@ int xflags = 0; void *p; if (st.st_size < reserved - && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON, + && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON, -1, 0)) != MAP_FAILED)) xflags = MAP_FIXED; else ++++++ glibc-2.2-sunrpc.diff ++++++ --- /var/tmp/diff_new_pack.lPNXJI/_old 2011-07-05 09:30:53.000000000 +0200 +++ /var/tmp/diff_new_pack.lPNXJI/_new 2011-07-05 09:30:53.000000000 +0200 @@ -1,3 +1,8 @@ +The following patch was not accepted upstream, see: +http://sourceware.org/bugzilla/show_bug.cgi?id=5379 + +It needs rework. + Index: sunrpc/clnt_udp.c =================================================================== --- sunrpc/clnt_udp.c.orig ++++++ glibc-2.3.1.localedef.diff ++++++ --- /var/tmp/diff_new_pack.lPNXJI/_old 2011-07-05 09:30:53.000000000 +0200 +++ /var/tmp/diff_new_pack.lPNXJI/_new 2011-07-05 09:30:53.000000000 +0200 @@ -1,3 +1,6 @@ +Check: +http://sourceware.org/bugzilla/show_bug.cgi?id=10855 + ------------------------------------------------------------------- Mon Oct 21 17:20:04 CEST 2002 - [email protected] ++++++ glibc-2.3.5-nscd-zeronegtimeout.diff ++++++ --- /var/tmp/diff_new_pack.lPNXJI/_old 2011-07-05 09:30:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lPNXJI/_new 2011-07-05 09:30:54.000000000 +0200 @@ -1,3 +1,15 @@ +Send to libc-alpha on 2011-07-01, will be part of glibc 2.15. + +commit id: 445b4a53ea9d6c457c5f4ac1538102d8be0a5d89 + +2011-07-01 Thorsten Kukuk <[email protected]> + + * nscd/pwdcache.c (cache_addpw): Handle zero negtimeout. + * nscd/initgrcache.c (addinitgroupsX): Likewise. + * nscd/hstcache.c (cache_addhst): Likewise. + * nscd/grpcache.c (cache_addgr): Likewise. + * nscd/aicache.c (addhstaiX): Likewise. + Index: nscd/aicache.c =================================================================== --- nscd/aicache.c.orig ++++++ glibc-fix-rwlock-stack-imbalance.patch ++++++ diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S index f5d055c..8f3c68c 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S @@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock: cfi_restore(%r12) retq -#ifdef __ASSUME_PRIVATE_FUTEX +#ifdef __ASSUME_FUTEX_CLOCK_REALTIME cfi_adjust_cfa_offset(16) cfi_rel_offset(%r12, 8) cfi_rel_offset(%r13, 0) diff --git a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S index 6ed8b49..9aaaeba 100644 --- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S +++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S @@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock: 7: movq %rdx, %rax -#ifndef __ASSUME_PRIVATE_FUTEX +#ifndef __ASSUME_FUTEX_CLOCK_REALTIME addq $16, %rsp cfi_adjust_cfa_offset(-16) popq %r14 @@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock: cfi_restore(%r12) retq -#ifdef __ASSUME_PRIVATE_FUTEX +#ifdef __ASSUME_FUTEX_CLOCK_REALTIME cfi_adjust_cfa_offset(16) cfi_rel_offset(%r12, 8) cfi_rel_offset(%r13, 0) ++++++ glibc-nscd-hconf.diff ++++++ --- /var/tmp/diff_new_pack.lPNXJI/_old 2011-07-05 09:30:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lPNXJI/_new 2011-07-05 09:30:54.000000000 +0200 @@ -1,3 +1,6 @@ +See: +http://sourceware.org/bugzilla/show_bug.cgi?id=11928 + diff --git a/nscd/aicache.c b/nscd/aicache.c index 3cb2208..2e92929 100644 --- a/nscd/aicache.c ++++++ glibc-version.diff ++++++ --- /var/tmp/diff_new_pack.lPNXJI/_old 2011-07-05 09:30:54.000000000 +0200 +++ /var/tmp/diff_new_pack.lPNXJI/_new 2011-07-05 09:30:54.000000000 +0200 @@ -2,7 +2,7 @@ =================================================================== --- csu/version.c.orig +++ csu/version.c -@@ -25,19 +25,23 @@ static const char __libc_release[] = REL +@@ -25,19 +25,20 @@ static const char __libc_release[] = REL static const char __libc_version[] = VERSION; static const char banner[] = @@ -21,9 +21,6 @@ #ifdef GLIBC_OLDEST_ABI "The oldest ABI supported: " GLIBC_OLDEST_ABI ".\n" #endif -+#ifdef FLOATING_STACKS -+"pthread library is compiled with floating stack support enabled.\n" -+#endif "For bug reporting instructions, please see:\n\ <http://www.gnu.org/software/libc/bugs.html>.\n"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
