From: Andreas Schwab Date: Fri, 14 May 2010 09:15:22 +0000 (+0200) Subject: Merge remote branch 'origin/release/2.11/master' into fedora/2.11/master X-Git-Tag: fedora/glibc-2.11.1-7~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9691db5366a2990ccebf157c757ae60258b46d6;p=thirdparty%2Fglibc.git Merge remote branch 'origin/release/2.11/master' into fedora/2.11/master --- e9691db5366a2990ccebf157c757ae60258b46d6 diff --cc ChangeLog index 1b4bff098d8,5e6a6b20f89..a296b53690c --- a/ChangeLog +++ b/ChangeLog @@@ -3,19 -151,127 +151,140 @@@ * sysdeps/posix/getaddrinfo.c (gaih_inet): Reset no_data before each action. + 2010-03-25 Andreas Schwab + + * sysdeps/posix/cuserid.c: Fix typo. + + 2010-03-24 Ulrich Drepper + + [BZ #11397] + * sysdeps/posix/cuserid.c (cuserid): Make sure the returned string + is NUL terminated. + Patch by Jonathan Geisler . + + 2010-03-02 Richard Guenther + + * sysdeps/x86_64/dl-machine.h (elf_machine_rela): R_X86_64_PC32 + is sign-extending. + + 2010-02-24 Ulrich Drepper + + [BZ #11319] + * libio/iovdprintf.c (_IO_vdprintf): Explicitly flush stream before + undoing the stream because _IO_FINISH doesn't report failures. + + [BZ #5553] + * malloc/malloc.c (public_vALLOc): Set ar_ptr when trying main_arena. + (public_pVALLOc): Likewise. + Patch by Petr Baudis. + + 2010-02-22 Jim Meyering + + * manual/math.texi (BSD Random): Fix a typo: s/are/is/ + + * manual/charset.texi: Adjust grammar. + + * manual/errno.texi (Error Messages): Fix doubled-words and typos. + * manual/charset.texi (Selecting the Conversion): Likewise. + * manual/getopt.texi (Getopt Long Options): Likewise. + * manual/memory.texi (Resizing the Data Segment): Likewise. + * manual/message.texi (GUI program problems): Likewise. + * manual/resource.texi (CPU Affinity): Likewise. + * manual/stdio.texi (Streams and Threads): Likewise. + * manual/time.texi (High Accuracy Clock): Likewise. + + 2010-02-11 Andreas Krebbel + + * sysdeps/s390/s390-64/utf8-utf16-z9.c: Disable hardware + instructions cu21 and cu24. Add well-formedness checking + parameter and adjust the software implementation. + * sysdeps/s390/s390-64/utf16-utf32-z9.c: Likewise. + + 2010-02-10 Ulrich Drepper + + [BZ #11271] + * io/ftw.c (ftw_startup): Close descriptor for initial directory + after changing back to it. + + 2010-02-09 Ulrich Drepper + + * sysdeps/i386/lshift.S: Fix unwind information. + + 2010-02-03 Ulrich Drepper + + [BZ #11242] + * misc/getusershell.c (initshells): Allocate one more byte in input + buffer so that fgets doesn't loop undefinitely. + + 2010-01-25 Andreas Schwab + + * iconv/iconv_prog.c (write_output): Fix check for open failure. + + 2010-01-22 Ulrich Drepper + + [BZ #11200] + * locale/loadlocale.c (_nl_load_locale): Fix recognition of genuine + mmap resource problem. Patch by Joe Landers . + + 2010-01-22 Jim Meyering + + [BZ #11184] + * posix/regex_internal.c (re_dfa_add_node): Extend the overflow + detection test. Patch by Paul Eggert. + + [BZ #11183] + * posix/regex_internal.c (re_string_realloc_buffers): + Detect and handle internal overflow. Patch by Paul Eggert + + 2010-01-20 Andreas Schwab + + * sysdeps/unix/sysv/linux/s390/s390-32/____longjmp_chk.c + (CHECK_SP): Fix check for alternate stack. + * sysdeps/unix/sysv/linux/s390/s390-64/____longjmp_chk.c + (CHECK_SP): Likewise. + + 2010-01-19 Ulrich Drepper + + [BZ #11194] + * misc/bits/syslog.h (syslog, vsyslog): Remove unnecessary return. + + 2010-01-18 Andreas Schwab + + * elf/dynamic-link.h (elf_get_dynamic_info): Use correct type when + casting d_tag. + + * elf/dynamic-link.h (elf_get_dynamic_info): Ignore negative + dynamic entry types. + + 2010-01-14 Ulrich Drepper + + * bits/confname.h: Make pre-C99-safe. + + 2010-02-05 H.J. Lu + + [BZ #11230] + * sysdeps/ia64/memchr.S: Don't read beyond the last byte + during recovery. + + 2010-03-25 Ryan S. Arnold + + * sysdeps/unix/sysv/linux/getsysstats.c (next_line): Remove + redundant and incorrect else block which overwrites current line + with the partial next line. + +2010-03-09 David S. Miller + + * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handling + of R_SPARC_TLS_LE_* needs to use 32-bit loads and stores, not + 64-bit ones. + +2009-10-27 Aurelien Jarno + + [BZ #10855] + * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory + used later with MMAP_FIXED | MMAP_SHARED to cope with different + alignment restrictions. + 2010-01-14 Ulrich Drepper [BZ #11127] diff --cc elf/ldconfig.c index 4886645dfa6,6e71b098d43..5cae93897ee --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@@ -1355,12 -1355,19 +1366,21 @@@ main (int argc, char **argv add_system_dir (SLIBDIR); if (strcmp (SLIBDIR, LIBDIR)) add_system_dir (LIBDIR); + + add_arch_dirs (config_file); } + 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); + } + if (! opt_ignore_aux_cache) - load_aux_cache (_PATH_LDCONFIG_AUX_CACHE); + load_aux_cache (aux_cache_file); else init_aux_cache ();