[glibc/f15] 2.14-4

Andreas Schwab schwab at fedoraproject.org
Tue Jun 28 15:04:02 UTC 2011


commit d1bf7db949826332c8bc0fd0f1543de83a3ebd9b
Author: Andreas Schwab <schwab at redhat.com>
Date:   Tue Jun 28 17:01:03 2011 +0200

    2.14-4

 .gitignore         |    4 +-
 glibc-fedora.patch |  794 ++++++++++++++++++++++++++++------------------------
 glibc.spec         |   10 +-
 sources            |    4 +-
 4 files changed, 445 insertions(+), 367 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e945919..3911cd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/glibc-2.14-12-g5babac1-fedora.tar.xz
-/glibc-2.14-12-g5babac1.tar.xz
 /glibc-ports-2.14.tar.xz
+/glibc-2.14-15-g9614794-fedora.tar.xz
+/glibc-2.14-15-g9614794.tar.xz
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index e37df0c..ce564b0 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,20 +1,29 @@
---- glibc-2.14-12-g5babac1/ChangeLog
-+++ glibc-2.14-3/ChangeLog
-@@ -1,3 +1,13 @@
-+2011-06-21  Andreas Schwab  <schwab at redhat.com>
+--- glibc-2.14-15-g9614794/ChangeLog
++++ glibc-2.14-4/ChangeLog
+@@ -1,3 +1,11 @@
++2011-06-28  Andreas Schwab  <schwab at redhat.com>
 +
-+	* iconvdata/gb18030.c: Regenerate tables.
++	* iconvdata/gb18030.c: Update tables.
++	(BODY for FROM_LOOP): Handle non-BMP characters specially.
 +
-+2011-06-16  Andreas Schwab  <schwab at redhat.com>
++	* sysdeps/posix/getaddrinfo.c (gaih_inet): Don't use gethostbyaddr
++	to determine canonical name.
 +
-+	[BZ #12885]
-+	* sysdeps/posix/getaddrinfo.c (gaih_inet): Filter results from
-+	gethostbyname4_r according to request flags.
+ 2011-06-27  Andreas Schwab  <schwab at redhat.com>
+ 
+ 	* iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP
+@@ -13,6 +21,10 @@
+ 	* sysdeps/posix/getaddrinfo.c (gaih_inet): When looking up only IPv6
+ 	addresses using gethostbyname4_r ignore IPv4 addresses.
+ 
++2011-06-21  Andreas Schwab  <schwab at redhat.com>
++
++	* iconvdata/gb18030.c: Regenerate tables.
 +
  2011-06-15  Ulrich Drepper  <drepper at gmail.com>
  
  	* resolv/res_send.c (__libc_res_nsend): Fix typos in last patch.  We
-@@ -475,6 +485,13 @@
+@@ -490,6 +502,13 @@
  	* libio/Makefile (tests): Add bug-fclose1.
  	* libio/bug-fclose1.c: New file.
  
@@ -28,7 +37,7 @@
  2011-05-12  Ulrich Drepper  <drepper at gmail.com>
  
  	[BZ #12511]
-@@ -752,13 +769,6 @@
+@@ -767,13 +786,6 @@
  	* stdlib/bug-getcontext.c: New file.
  	* stdlib/Makefile: Add rules to build and run bug-getcontext.
  
@@ -42,7 +51,7 @@
  2011-04-11  Andreas Krebbel  <Andreas.Krebbel at de.ibm.com>
  
  	* sysdeps/s390/s390-32/elf/start.S (_start): Skip extra zeroes
-@@ -996,6 +1006,31 @@
+@@ -1011,6 +1023,31 @@
  	* sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime):
  	Export.
  
@@ -74,7 +83,7 @@
  2011-03-22  Ulrich Drepper  <drepper at gmail.com>
  
  	* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment
-@@ -1056,6 +1091,16 @@
+@@ -1071,6 +1108,16 @@
  	$LDFLAGS and -nostdlib -nostartfiles to linking step.  Change main
  	to _start.
  
@@ -91,7 +100,7 @@
  2011-03-06  Ulrich Drepper  <drepper at gmail.com>
  
  	* elf/dl-load.c (_dl_map_object): If we are looking for the first
-@@ -1110,12 +1155,6 @@
+@@ -1125,12 +1172,6 @@
  	* elf/noload.c: Include <memcheck.h>.
  	(main): Call mtrace.  Close all opened handles.
  
@@ -104,7 +113,7 @@
  2011-02-22  Samuel Thibault  <samuel.thibault at ens-lyon.org>
  
  	Fix __if_freereq crash: Unlike the generic version which uses free,
-@@ -1272,6 +1311,12 @@
+@@ -1287,6 +1328,12 @@
  	* shadow/sgetspent.c: Check return value of __sgetspent_r instead
  	of errno.
  
@@ -117,7 +126,7 @@
  2011-01-19  Ulrich Drepper  <drepper at gmail.com>
  
  	[BZ #11724]
-@@ -1959,6 +2004,29 @@
+@@ -1974,6 +2021,29 @@
  	* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
  	Mask out sign-bit copies when constructing f_fsid.
  
@@ -147,7 +156,7 @@
  2010-09-24  Petr Baudis <pasky at suse.cz>
  
  	* debug/stack_chk_fail_local.c: Add missing licence exception.
-@@ -2751,6 +2819,32 @@
+@@ -2766,6 +2836,32 @@
  	call returning > 0 value.
  	* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
  
@@ -180,7 +189,7 @@
  2010-06-07  Andreas Schwab  <schwab at redhat.com>
  
  	* dlfcn/Makefile: Remove explicit dependencies on libc.so and
-@@ -2803,6 +2897,24 @@
+@@ -2818,6 +2914,24 @@
  	* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
  	* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
  
@@ -205,8 +214,8 @@
  2010-05-28  Luis Machado  <luisgpm at br.ibm.com>
  
  	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
---- glibc-2.14-12-g5babac1/ChangeLog.15
-+++ glibc-2.14-3/ChangeLog.15
+--- glibc-2.14-15-g9614794/ChangeLog.15
++++ glibc-2.14-4/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -272,8 +281,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.14-12-g5babac1/ChangeLog.16
-+++ glibc-2.14-3/ChangeLog.16
+--- glibc-2.14-15-g9614794/ChangeLog.16
++++ glibc-2.14-4/ChangeLog.16
 @@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
@@ -296,8 +305,8 @@
  2006-01-19  Thomas Schwinge  <tschwinge at gnu.org>
  
  	* libio/genops.c: Include <stdbool.h>.
---- glibc-2.14-12-g5babac1/ChangeLog.17
-+++ glibc-2.14-3/ChangeLog.17
+--- glibc-2.14-15-g9614794/ChangeLog.17
++++ glibc-2.14-4/ChangeLog.17
 @@ -256,6 +256,12 @@
  
  	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
@@ -376,8 +385,8 @@
  2006-12-09  Ulrich Drepper  <drepper at redhat.com>
  
  	[BZ #3632]
---- glibc-2.14-12-g5babac1/Makeconfig
-+++ glibc-2.14-3/Makeconfig
+--- glibc-2.14-15-g9614794/Makeconfig
++++ glibc-2.14-4/Makeconfig
 @@ -791,12 +791,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -394,8 +403,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.14-12-g5babac1/NEWS
-+++ glibc-2.14-3/NEWS
+--- glibc-2.14-15-g9614794/NEWS
++++ glibc-2.14-4/NEWS
 @@ -20,16 +20,6 @@ Version 2.14
    12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
    12795, 12811, 12813, 12814, 12841
@@ -413,8 +422,8 @@
  * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
    syncfs, setns, sendmmsg
  
---- glibc-2.14-12-g5babac1/config.h.in
-+++ glibc-2.14-3/config.h.in
+--- glibc-2.14-15-g9614794/config.h.in
++++ glibc-2.14-4/config.h.in
 @@ -204,6 +204,9 @@
  /* Define if `.ctors' and `.dtors' sections shouldn't be used.  */
  #undef	NO_CTORS_DTORS_SECTIONS
@@ -425,8 +434,8 @@
  /*
   */
  
---- glibc-2.14-12-g5babac1/configure
-+++ glibc-2.14-3/configure
+--- glibc-2.14-15-g9614794/configure
++++ glibc-2.14-4/configure
 @@ -784,6 +784,7 @@ enable_all_warnings
  enable_multi_arch
  enable_experimental_malloc
@@ -495,8 +504,8 @@
  # The way shlib-versions is used to generate soversions.mk uses a
  # fairly simplistic model for name recognition that can't distinguish
  # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
---- glibc-2.14-12-g5babac1/configure.in
-+++ glibc-2.14-3/configure.in
+--- glibc-2.14-15-g9614794/configure.in
++++ glibc-2.14-4/configure.in
 @@ -316,6 +316,29 @@ else
  fi
  AC_SUBST(libc_cv_nss_crypt)
@@ -527,8 +536,8 @@
  # The way shlib-versions is used to generate soversions.mk uses a
  # fairly simplistic model for name recognition that can't distinguish
  # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
---- glibc-2.14-12-g5babac1/csu/Makefile
-+++ glibc-2.14-3/csu/Makefile
+--- glibc-2.14-15-g9614794/csu/Makefile
++++ glibc-2.14-4/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -539,8 +548,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.14-12-g5babac1/csu/elf-init.c
-+++ glibc-2.14-3/csu/elf-init.c
+--- glibc-2.14-15-g9614794/csu/elf-init.c
++++ glibc-2.14-4/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -565,8 +574,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.14-12-g5babac1/debug/tst-chk1.c
-+++ glibc-2.14-3/debug/tst-chk1.c
+--- glibc-2.14-15-g9614794/debug/tst-chk1.c
++++ glibc-2.14-4/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -595,8 +604,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.14-12-g5babac1/elf/Makefile
-+++ glibc-2.14-3/elf/Makefile
+--- glibc-2.14-15-g9614794/elf/Makefile
++++ glibc-2.14-4/elf/Makefile
 @@ -90,6 +90,7 @@ distribute	:= rtld-Rules \
  		   unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
  		   unload6mod1.c unload6mod2.c unload6mod3.c \
@@ -660,8 +669,8 @@
  ifdef libdl
  $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
  $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
---- glibc-2.14-12-g5babac1/elf/dl-close.c
-+++ glibc-2.14-3/elf/dl-close.c
+--- glibc-2.14-15-g9614794/elf/dl-close.c
++++ glibc-2.14-4/elf/dl-close.c
 @@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
    if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
        || dl_close_state != not_pending)
@@ -696,8 +705,8 @@
  
  	  /* The loader is gone, so mark the object as not having one.
  	     Note: l_idx != IDX_STILL_USED -> object will be removed.  */
---- glibc-2.14-12-g5babac1/elf/dl-deps.c
-+++ glibc-2.14-3/elf/dl-deps.c
+--- glibc-2.14-15-g9614794/elf/dl-deps.c
++++ glibc-2.14-4/elf/dl-deps.c
 @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
  		  nneeded * sizeof needed[0]);
  	  atomic_write_barrier ();
@@ -736,8 +745,8 @@
 +    _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
 +		      NULL, errstring);
  }
---- glibc-2.14-12-g5babac1/elf/dl-init.c
-+++ glibc-2.14-3/elf/dl-init.c
+--- glibc-2.14-15-g9614794/elf/dl-init.c
++++ glibc-2.14-4/elf/dl-init.c
 @@ -24,11 +24,9 @@
  /* Type of the initializer.  */
  typedef void (*init_t) (int, char **, char **);
@@ -760,8 +769,8 @@
 -#endif
  }
  INTDEF (_dl_init)
---- glibc-2.14-12-g5babac1/elf/dl-libc.c
-+++ glibc-2.14-3/elf/dl-libc.c
+--- glibc-2.14-15-g9614794/elf/dl-libc.c
++++ glibc-2.14-4/elf/dl-libc.c
 @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
  
    for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
@@ -788,8 +797,8 @@
  	}
  
        if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
---- glibc-2.14-12-g5babac1/elf/dl-load.c
-+++ glibc-2.14-3/elf/dl-load.c
+--- glibc-2.14-15-g9614794/elf/dl-load.c
++++ glibc-2.14-4/elf/dl-load.c
 @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len)
  
  
@@ -869,8 +878,8 @@
  	    }
  	  else
  	    /* No DST we recognize.  */
---- glibc-2.14-12-g5babac1/elf/dl-support.c
-+++ glibc-2.14-3/elf/dl-support.c
+--- glibc-2.14-15-g9614794/elf/dl-support.c
++++ glibc-2.14-4/elf/dl-support.c
 @@ -81,10 +81,8 @@ unsigned long long _dl_load_adds;
     create a fake scope containing nothing.  */
  struct r_scope_elem _dl_initial_searchlist;
@@ -882,8 +891,8 @@
  
  /* Random data provided by the kernel.  */
  void *_dl_random;
---- glibc-2.14-12-g5babac1/elf/ldconfig.c
-+++ glibc-2.14-3/elf/ldconfig.c
+--- glibc-2.14-15-g9614794/elf/ldconfig.c
++++ glibc-2.14-4/elf/ldconfig.c
 @@ -1034,17 +1034,19 @@ search_dirs (void)
  
  
@@ -965,8 +974,8 @@
      }
  
    const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
---- glibc-2.14-12-g5babac1/elf/ldd.bash.in
-+++ glibc-2.14-3/elf/ldd.bash.in
+--- glibc-2.14-15-g9614794/elf/ldd.bash.in
++++ glibc-2.14-4/elf/ldd.bash.in
 @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
        fi
      done
@@ -995,8 +1004,8 @@
        try_trace "$RTLD" "$file" || result=1
        ;;
      *)
---- glibc-2.14-12-g5babac1/elf/rtld-Rules
-+++ glibc-2.14-3/elf/rtld-Rules
+--- glibc-2.14-15-g9614794/elf/rtld-Rules
++++ glibc-2.14-4/elf/rtld-Rules
 @@ -1,7 +1,7 @@
  # Subroutine makefile for compiling libc modules linked into dynamic linker.
  
@@ -1014,8 +1023,8 @@
 +rtld-CPPFLAGS := -DNOT_IN_libc=1 -DIS_IN_rtld=1 -DIN_LIB=rtld
  
  endif
---- glibc-2.14-12-g5babac1/elf/rtld.c
-+++ glibc-2.14-3/elf/rtld.c
+--- glibc-2.14-15-g9614794/elf/rtld.c
++++ glibc-2.14-4/elf/rtld.c
 @@ -107,7 +107,6 @@ static struct audit_list
    struct audit_list *next;
  } *audit_list;
@@ -1059,8 +1068,8 @@
    if (! prelinked && rtld_multiple_ref)
      {
        /* There was an explicit ref to the dynamic linker as a shared lib.
---- glibc-2.14-12-g5babac1/elf/unload8.c
-+++ glibc-2.14-3/elf/unload8.c
+--- glibc-2.14-15-g9614794/elf/unload8.c
++++ glibc-2.14-4/elf/unload8.c
 @@ -0,0 +1,33 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@@ -1095,8 +1104,8 @@
 +
 +  return 0;
 +}
---- glibc-2.14-12-g5babac1/elf/unload8mod1.c
-+++ glibc-2.14-3/elf/unload8mod1.c
+--- glibc-2.14-15-g9614794/elf/unload8mod1.c
++++ glibc-2.14-4/elf/unload8mod1.c
 @@ -0,0 +1,7 @@
 +extern void mod2 (void);
 +
@@ -1105,12 +1114,12 @@
 +{
 +  mod2 ();
 +}
---- glibc-2.14-12-g5babac1/elf/unload8mod1x.c
-+++ glibc-2.14-3/elf/unload8mod1x.c
+--- glibc-2.14-15-g9614794/elf/unload8mod1x.c
++++ glibc-2.14-4/elf/unload8mod1x.c
 @@ -0,0 +1 @@
 +int mod1x;
---- glibc-2.14-12-g5babac1/elf/unload8mod2.c
-+++ glibc-2.14-3/elf/unload8mod2.c
+--- glibc-2.14-15-g9614794/elf/unload8mod2.c
++++ glibc-2.14-4/elf/unload8mod2.c
 @@ -0,0 +1,7 @@
 +extern void mod3 (void);
 +
@@ -1119,8 +1128,8 @@
 +{
 +  mod3 ();
 +}
---- glibc-2.14-12-g5babac1/elf/unload8mod3.c
-+++ glibc-2.14-3/elf/unload8mod3.c
+--- glibc-2.14-15-g9614794/elf/unload8mod3.c
++++ glibc-2.14-4/elf/unload8mod3.c
 @@ -0,0 +1,27 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@@ -1149,24 +1158,24 @@
 +
 +  atexit (mod3_fini);
 +}
---- glibc-2.14-12-g5babac1/extra-lib.mk
-+++ glibc-2.14-3/extra-lib.mk
+--- glibc-2.14-15-g9614794/extra-lib.mk
++++ glibc-2.14-4/extra-lib.mk
 @@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left))
  include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
  endif
  
 -CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1
 +CPPFLAGS-$(lib) := -DNOT_IN_libc=1 -DIS_IN_$(lib)=1 -DIN_LIB=$(lib)
---- glibc-2.14-12-g5babac1/include/bits/stdlib-ldbl.h
-+++ glibc-2.14-3/include/bits/stdlib-ldbl.h
+--- glibc-2.14-15-g9614794/include/bits/stdlib-ldbl.h
++++ glibc-2.14-4/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.14-12-g5babac1/include/bits/wchar-ldbl.h
-+++ glibc-2.14-3/include/bits/wchar-ldbl.h
+--- glibc-2.14-15-g9614794/include/bits/wchar-ldbl.h
++++ glibc-2.14-4/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.14-12-g5babac1/include/features.h
-+++ glibc-2.14-3/include/features.h
+--- glibc-2.14-15-g9614794/include/features.h
++++ glibc-2.14-4/include/features.h
 @@ -310,8 +310,13 @@
  #endif
  
@@ -1183,8 +1192,8 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.14-12-g5babac1/include/libc-symbols.h
-+++ glibc-2.14-3/include/libc-symbols.h
+--- glibc-2.14-15-g9614794/include/libc-symbols.h
++++ glibc-2.14-4/include/libc-symbols.h
 @@ -635,7 +635,7 @@ for linking")
  # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
  # define libc_hidden_def(name) hidden_def (name)
@@ -1194,8 +1203,8 @@
  # define libc_hidden_ver(local, name) hidden_ver (local, name)
  # define libc_hidden_data_def(name) hidden_data_def (name)
  # define libc_hidden_data_weak(name) hidden_data_weak (name)
---- glibc-2.14-12-g5babac1/include/link.h
-+++ glibc-2.14-3/include/link.h
+--- glibc-2.14-15-g9614794/include/link.h
++++ glibc-2.14-4/include/link.h
 @@ -1,6 +1,6 @@
  /* Data structure for communication from the run-time dynamic linker for
     loaded ELF shared objects.
@@ -1224,8 +1233,8 @@
  
      /* List of the dependencies introduced through symbol binding.  */
      struct link_map_reldeps
---- glibc-2.14-12-g5babac1/include/stap-probe.h
-+++ glibc-2.14-3/include/stap-probe.h
+--- glibc-2.14-15-g9614794/include/stap-probe.h
++++ glibc-2.14-4/include/stap-probe.h
 @@ -0,0 +1,140 @@
 +/* Macros for defining Systemtap <sys/sdt.h> static probe points.
 +   Copyright (C) 2011 Free Software Foundation, Inc.
@@ -1367,16 +1376,16 @@
 +#endif	/* USE_STAP_PROBE.  */
 +
 +#endif	/* stap-probe.h */
---- glibc-2.14-12-g5babac1/include/sys/resource.h
-+++ glibc-2.14-3/include/sys/resource.h
+--- glibc-2.14-15-g9614794/include/sys/resource.h
++++ glibc-2.14-4/include/sys/resource.h
 @@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
  
  extern int __setrlimit (enum __rlimit_resource __resource,
  			const struct rlimit *__rlimits);
 +libc_hidden_proto (__getrlimit)
  #endif
---- glibc-2.14-12-g5babac1/inet/Makefile
-+++ glibc-2.14-3/inet/Makefile
+--- glibc-2.14-15-g9614794/inet/Makefile
++++ glibc-2.14-4/inet/Makefile
 @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
  
  include ../Rules
@@ -1386,8 +1395,8 @@
  ifeq ($(have-thread-library),yes)
  
  CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
---- glibc-2.14-12-g5babac1/intl/locale.alias
-+++ glibc-2.14-3/intl/locale.alias
+--- glibc-2.14-15-g9614794/intl/locale.alias
++++ glibc-2.14-4/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -1397,8 +1406,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.14-12-g5babac1/libio/stdio.h
-+++ glibc-2.14-3/libio/stdio.h
+--- glibc-2.14-15-g9614794/libio/stdio.h
++++ glibc-2.14-4/libio/stdio.h
 @@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -1412,8 +1421,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.14-12-g5babac1/locale/iso-4217.def
-+++ glibc-2.14-3/locale/iso-4217.def
+--- glibc-2.14-15-g9614794/locale/iso-4217.def
++++ glibc-2.14-4/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -1505,8 +1514,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.14-12-g5babac1/locale/programs/locarchive.c
-+++ glibc-2.14-3/locale/programs/locarchive.c
+--- glibc-2.14-15-g9614794/locale/programs/locarchive.c
++++ glibc-2.14-4/locale/programs/locarchive.c
 @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah)
    size_t reserved = RESERVE_MMAP_SIZE;
    int xflags = 0;
@@ -1565,9 +1574,13 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.14-12-g5babac1/localedata/ChangeLog
-+++ glibc-2.14-3/localedata/ChangeLog
-@@ -1,3 +1,7 @@
+--- glibc-2.14-15-g9614794/localedata/ChangeLog
++++ glibc-2.14-4/localedata/ChangeLog
+@@ -1,3 +1,11 @@
++2011-06-28  Andreas Schwab  <schwab at redhat.com>
++
++	* charmaps/GB18030: Correct some entries.
++
 +2011-06-21  Andreas Schwab  <schwab at redhat.com>
 +
 +	* charmaps/GB18030: Readd lost characters.
@@ -1575,8 +1588,8 @@
  2011-05-21  Ulrich Drepper  <drepper at gmail.com>
  
  	[BZ #12788]
---- glibc-2.14-12-g5babac1/localedata/Makefile
-+++ glibc-2.14-3/localedata/Makefile
+--- glibc-2.14-15-g9614794/localedata/Makefile
++++ glibc-2.14-4/localedata/Makefile
 @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -1585,8 +1598,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.14-12-g5babac1/localedata/SUPPORTED
-+++ glibc-2.14-3/localedata/SUPPORTED
+--- glibc-2.14-15-g9614794/localedata/SUPPORTED
++++ glibc-2.14-4/localedata/SUPPORTED
 @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -1628,8 +1641,8 @@
  sw_KE/UTF-8 \
  sw_TZ/UTF-8 \
  ta_IN/UTF-8 \
---- glibc-2.14-12-g5babac1/localedata/locales/cy_GB
-+++ glibc-2.14-3/localedata/locales/cy_GB
+--- glibc-2.14-15-g9614794/localedata/locales/cy_GB
++++ glibc-2.14-4/localedata/locales/cy_GB
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@@ -1644,8 +1657,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.14-12-g5babac1/localedata/locales/en_GB
-+++ glibc-2.14-3/localedata/locales/en_GB
+--- glibc-2.14-15-g9614794/localedata/locales/en_GB
++++ glibc-2.14-4/localedata/locales/en_GB
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
  d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@@ -1657,8 +1670,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.14-12-g5babac1/localedata/locales/no_NO
-+++ glibc-2.14-3/localedata/locales/no_NO
+--- glibc-2.14-15-g9614794/localedata/locales/no_NO
++++ glibc-2.14-4/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -1729,8 +1742,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.14-12-g5babac1/localedata/locales/zh_TW
-+++ glibc-2.14-3/localedata/locales/zh_TW
+--- glibc-2.14-15-g9614794/localedata/locales/zh_TW
++++ glibc-2.14-4/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -1758,8 +1771,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.14-12-g5babac1/login/programs/pt_chown.c
-+++ glibc-2.14-3/login/programs/pt_chown.c
+--- glibc-2.14-15-g9614794/login/programs/pt_chown.c
++++ glibc-2.14-4/login/programs/pt_chown.c
 @@ -29,6 +29,7 @@
  #include <string.h>
  #include <sys/stat.h>
@@ -1801,8 +1814,8 @@
 -
    return EXIT_SUCCESS;
  }
---- glibc-2.14-12-g5babac1/malloc/mcheck.c
-+++ glibc-2.14-3/malloc/mcheck.c
+--- glibc-2.14-15-g9614794/malloc/mcheck.c
++++ glibc-2.14-4/malloc/mcheck.c
 @@ -25,10 +25,26 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1879,8 +1892,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.14-12-g5babac1/manual/libc.texinfo
-+++ glibc-2.14-3/manual/libc.texinfo
+--- glibc-2.14-15-g9614794/manual/libc.texinfo
++++ glibc-2.14-4/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -1890,8 +1903,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.14-12-g5babac1/misc/sys/cdefs.h
-+++ glibc-2.14-3/misc/sys/cdefs.h
+--- glibc-2.14-15-g9614794/misc/sys/cdefs.h
++++ glibc-2.14-4/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -1935,8 +1948,8 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.14-12-g5babac1/nis/Makefile
-+++ glibc-2.14-3/nis/Makefile
+--- glibc-2.14-15-g9614794/nis/Makefile
++++ glibc-2.14-4/nis/Makefile
 @@ -23,9 +23,9 @@ subdir	:= nis
  
  aux			:= nis_hash
@@ -1958,8 +1971,8 @@
  
  $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
  $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
---- glibc-2.14-12-g5babac1/nis/nss
-+++ glibc-2.14-3/nis/nss
+--- glibc-2.14-15-g9614794/nis/nss
++++ glibc-2.14-4/nis/nss
 @@ -25,7 +25,7 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
@@ -1969,8 +1982,8 @@
  #
  # ADJUNCT_AS_SHADOW
  #  If set to TRUE, the passwd routines in the NIS NSS module will not
---- glibc-2.14-12-g5babac1/nptl/ChangeLog
-+++ glibc-2.14-3/nptl/ChangeLog
+--- glibc-2.14-15-g9614794/nptl/ChangeLog
++++ glibc-2.14-4/nptl/ChangeLog
 @@ -14,6 +14,51 @@
  	clearing memory.
  	Patch partly by Robert Rex <robert.rex at exasol.com>.
@@ -2047,8 +2060,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.14-12-g5babac1/nptl/DESIGN-systemtap-probes.txt
-+++ glibc-2.14-3/nptl/DESIGN-systemtap-probes.txt
+--- glibc-2.14-15-g9614794/nptl/DESIGN-systemtap-probes.txt
++++ glibc-2.14-4/nptl/DESIGN-systemtap-probes.txt
 @@ -0,0 +1,89 @@
 +Systemtap is a dynamic tracing/instrumenting tool available on Linux. Probes
 +that are not fired at run time have close to zero overhead.
@@ -2139,8 +2152,8 @@
 +            arg1 = condition
 +cond_broadcast - probe for pthread_cond_broadcast
 +               arg1 = condition
---- glibc-2.14-12-g5babac1/nptl/Makefile
-+++ glibc-2.14-3/nptl/Makefile
+--- glibc-2.14-15-g9614794/nptl/Makefile
++++ glibc-2.14-4/nptl/Makefile
 @@ -342,7 +342,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -2173,8 +2186,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.14-12-g5babac1/nptl/Versions
-+++ glibc-2.14-3/nptl/Versions
+--- glibc-2.14-15-g9614794/nptl/Versions
++++ glibc-2.14-4/nptl/Versions
 @@ -30,6 +30,7 @@ libc {
      __libc_alloca_cutoff;
      # Internal libc interface to libpthread
@@ -2183,8 +2196,8 @@
    }
  }
  
---- glibc-2.14-12-g5babac1/nptl/allocatestack.c
-+++ glibc-2.14-3/nptl/allocatestack.c
+--- glibc-2.14-15-g9614794/nptl/allocatestack.c
++++ glibc-2.14-4/nptl/allocatestack.c
 @@ -999,7 +999,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t)
  
        /* If the thread is exiting right now, ignore it.  */
@@ -2203,8 +2216,8 @@
      }
    while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
  					       ch | SETXID_BITMASK, ch));
---- glibc-2.14-12-g5babac1/nptl/nptl-init.c
-+++ glibc-2.14-3/nptl/nptl-init.c
+--- glibc-2.14-15-g9614794/nptl/nptl-init.c
++++ glibc-2.14-4/nptl/nptl-init.c
 @@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void)
    /* Determine the default allowed stack size.  This is the size used
       in case the user does not specify one.  */
@@ -2214,8 +2227,8 @@
        || limit.rlim_cur == RLIM_INFINITY)
      /* The system limit is not usable.  Use an architecture-specific
         default.  */
---- glibc-2.14-12-g5babac1/nptl/pthread_cond_broadcast.c
-+++ glibc-2.14-3/nptl/pthread_cond_broadcast.c
+--- glibc-2.14-15-g9614794/nptl/pthread_cond_broadcast.c
++++ glibc-2.14-4/nptl/pthread_cond_broadcast.c
 @@ -23,6 +23,7 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2233,8 +2246,8 @@
    int pshared = (cond->__data.__mutex == (void *) ~0l)
  		? LLL_SHARED : LLL_PRIVATE;
    /* Make sure we are alone.  */
---- glibc-2.14-12-g5babac1/nptl/pthread_cond_destroy.c
-+++ glibc-2.14-3/nptl/pthread_cond_destroy.c
+--- glibc-2.14-15-g9614794/nptl/pthread_cond_destroy.c
++++ glibc-2.14-4/nptl/pthread_cond_destroy.c
 @@ -20,6 +20,7 @@
  #include <errno.h>
  #include <shlib-compat.h>
@@ -2252,8 +2265,8 @@
    /* Make sure we are alone.  */
    lll_lock (cond->__data.__lock, pshared);
  
---- glibc-2.14-12-g5babac1/nptl/pthread_cond_init.c
-+++ glibc-2.14-3/nptl/pthread_cond_init.c
+--- glibc-2.14-15-g9614794/nptl/pthread_cond_init.c
++++ glibc-2.14-4/nptl/pthread_cond_init.c
 @@ -20,6 +20,7 @@
  
  #include <shlib-compat.h>
@@ -2271,8 +2284,8 @@
    return 0;
  }
  versioned_symbol (libpthread, __pthread_cond_init,
---- glibc-2.14-12-g5babac1/nptl/pthread_cond_signal.c
-+++ glibc-2.14-3/nptl/pthread_cond_signal.c
+--- glibc-2.14-15-g9614794/nptl/pthread_cond_signal.c
++++ glibc-2.14-4/nptl/pthread_cond_signal.c
 @@ -26,6 +26,7 @@
  
  #include <shlib-compat.h>
@@ -2290,8 +2303,8 @@
    /* Make sure we are alone.  */
    lll_lock (cond->__data.__lock, pshared);
  
---- glibc-2.14-12-g5babac1/nptl/pthread_cond_wait.c
-+++ glibc-2.14-3/nptl/pthread_cond_wait.c
+--- glibc-2.14-15-g9614794/nptl/pthread_cond_wait.c
++++ glibc-2.14-4/nptl/pthread_cond_wait.c
 @@ -25,6 +25,7 @@
  #include <pthreadP.h>
  
@@ -2309,8 +2322,8 @@
    /* Make sure we are alone.  */
    lll_lock (cond->__data.__lock, pshared);
  
---- glibc-2.14-12-g5babac1/nptl/pthread_create.c
-+++ glibc-2.14-3/nptl/pthread_create.c
+--- glibc-2.14-15-g9614794/nptl/pthread_create.c
++++ glibc-2.14-4/nptl/pthread_create.c
 @@ -31,6 +31,8 @@
  
  #include <shlib-compat.h>
@@ -2338,8 +2351,8 @@
    /* Start the thread.  */
    return create_thread (pd, iattr, STACK_VARIABLES_ARGS);
  }
---- glibc-2.14-12-g5babac1/nptl/pthread_join.c
-+++ glibc-2.14-3/nptl/pthread_join.c
+--- glibc-2.14-15-g9614794/nptl/pthread_join.c
++++ glibc-2.14-4/nptl/pthread_join.c
 @@ -23,6 +23,8 @@
  #include <atomic.h>
  #include "pthreadP.h"
@@ -2366,8 +2379,8 @@
 +
    return result;
  }
---- glibc-2.14-12-g5babac1/nptl/pthread_mutex_destroy.c
-+++ glibc-2.14-3/nptl/pthread_mutex_destroy.c
+--- glibc-2.14-15-g9614794/nptl/pthread_mutex_destroy.c
++++ glibc-2.14-4/nptl/pthread_mutex_destroy.c
 @@ -20,11 +20,15 @@
  #include <errno.h>
  #include "pthreadP.h"
@@ -2384,8 +2397,8 @@
    if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0
        && mutex->__data.__nusers != 0)
      return EBUSY;
---- glibc-2.14-12-g5babac1/nptl/pthread_mutex_init.c
-+++ glibc-2.14-3/nptl/pthread_mutex_init.c
+--- glibc-2.14-15-g9614794/nptl/pthread_mutex_init.c
++++ glibc-2.14-4/nptl/pthread_mutex_init.c
 @@ -24,6 +24,8 @@
  #include <kernel-features.h>
  #include "pthreadP.h"
@@ -2404,8 +2417,8 @@
    return 0;
  }
  strong_alias (__pthread_mutex_init, pthread_mutex_init)
---- glibc-2.14-12-g5babac1/nptl/pthread_mutex_lock.c
-+++ glibc-2.14-3/nptl/pthread_mutex_lock.c
+--- glibc-2.14-15-g9614794/nptl/pthread_mutex_lock.c
++++ glibc-2.14-4/nptl/pthread_mutex_lock.c
 @@ -24,6 +24,7 @@
  #include <not-cancel.h>
  #include "pthreadP.h"
@@ -2442,8 +2455,8 @@
    return 0;
  }
  #ifndef __pthread_mutex_lock
---- glibc-2.14-12-g5babac1/nptl/pthread_mutex_timedlock.c
-+++ glibc-2.14-3/nptl/pthread_mutex_timedlock.c
+--- glibc-2.14-15-g9614794/nptl/pthread_mutex_timedlock.c
++++ glibc-2.14-4/nptl/pthread_mutex_timedlock.c
 @@ -24,6 +24,8 @@
  #include <lowlevellock.h>
  #include <not-cancel.h>
@@ -2498,8 +2511,8 @@
      }
  
   out:
---- glibc-2.14-12-g5babac1/nptl/pthread_mutex_unlock.c
-+++ glibc-2.14-3/nptl/pthread_mutex_unlock.c
+--- glibc-2.14-15-g9614794/nptl/pthread_mutex_unlock.c
++++ glibc-2.14-4/nptl/pthread_mutex_unlock.c
 @@ -22,6 +22,7 @@
  #include <stdlib.h>
  #include "pthreadP.h"
@@ -2536,8 +2549,8 @@
    return 0;
  }
  
---- glibc-2.14-12-g5babac1/nptl/pthread_rwlock_destroy.c
-+++ glibc-2.14-3/nptl/pthread_rwlock_destroy.c
+--- glibc-2.14-15-g9614794/nptl/pthread_rwlock_destroy.c
++++ glibc-2.14-4/nptl/pthread_rwlock_destroy.c
 @@ -18,12 +18,15 @@
     02111-1307 USA.  */
  
@@ -2554,8 +2567,8 @@
    /* Nothing to be done.  For now.  */
    return 0;
  }
---- glibc-2.14-12-g5babac1/nptl/pthread_rwlock_rdlock.c
-+++ glibc-2.14-3/nptl/pthread_rwlock_rdlock.c
+--- glibc-2.14-15-g9614794/nptl/pthread_rwlock_rdlock.c
++++ glibc-2.14-4/nptl/pthread_rwlock_rdlock.c
 @@ -22,6 +22,7 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2582,8 +2595,8 @@
  
  	  break;
  	}
---- glibc-2.14-12-g5babac1/nptl/pthread_rwlock_unlock.c
-+++ glibc-2.14-3/nptl/pthread_rwlock_unlock.c
+--- glibc-2.14-15-g9614794/nptl/pthread_rwlock_unlock.c
++++ glibc-2.14-4/nptl/pthread_rwlock_unlock.c
 @@ -22,11 +22,14 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2599,8 +2612,8 @@
    lll_lock (rwlock->__data.__lock, rwlock->__data.__shared);
    if (rwlock->__data.__writer)
      rwlock->__data.__writer = 0;
---- glibc-2.14-12-g5babac1/nptl/pthread_rwlock_wrlock.c
-+++ glibc-2.14-3/nptl/pthread_rwlock_wrlock.c
+--- glibc-2.14-15-g9614794/nptl/pthread_rwlock_wrlock.c
++++ glibc-2.14-4/nptl/pthread_rwlock_wrlock.c
 @@ -22,6 +22,7 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2627,8 +2640,8 @@
  	  break;
  	}
  
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -2637,8 +2650,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/Versions
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/Versions
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/Versions
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/Versions
 @@ -0,0 +1,6 @@
 +libc {
 +  GLIBC_PRIVATE {
@@ -2646,8 +2659,8 @@
 +    __uname;
 +  }
 +}
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
 @@ -22,6 +22,8 @@
  #include <kernel-features.h>
  #include <lowlevellock.h>
@@ -2667,8 +2680,8 @@
  	ENTER_KERNEL
  
  2:	movl	%edx, %eax
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
 @@ -24,6 +24,7 @@
  #include <kernel-features.h>
  #include <pthread-pi-defines.h>
@@ -2686,8 +2699,8 @@
  	/* Get internal lock.  */
  	movl	$1, %edx
  	xorl	%eax, %eax
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
 @@ -24,7 +24,7 @@
  #include <kernel-features.h>
  #include <pthread-pi-defines.h>
@@ -2706,8 +2719,8 @@
  	/* Get internal lock.  */
  	movl	$1, %edx
  	xorl	%eax, %eax
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
 @@ -24,7 +24,7 @@
  #include <pthread-errnos.h>
  #include <pthread-pi-defines.h>
@@ -2726,8 +2739,8 @@
  	cmpl	$1000000000, 4(%ebp)
  	movl	$EINVAL, %eax
  	jae	18f
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
 @@ -25,6 +25,7 @@
  #include <pthread-errnos.h>
  #include <pthread-pi-defines.h>
@@ -2745,8 +2758,8 @@
  	/* Get internal lock.  */
  	movl	$1, %edx
  	xorl	%eax, %eax
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
 @@ -23,6 +23,7 @@
  #include <pthread-errnos.h>
  #include <kernel-features.h>
@@ -2764,8 +2777,8 @@
  	/* Get the lock.  */
  	movl	$1, %edx
  	xorl	%eax, %eax
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
 @@ -23,6 +23,7 @@
  #include <pthread-errnos.h>
  #include <kernel-features.h>
@@ -2783,8 +2796,8 @@
  	/* Get the lock.  */
  	movl	$1, %edx
  	xorl	%eax, %eax
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
 @@ -20,6 +20,8 @@
  #ifndef _LOWLEVELLOCK_H
  #define _LOWLEVELLOCK_H	1
@@ -2802,8 +2815,8 @@
      __asm __volatile (LLL_EBX_LOAD					      \
  		      LLL_ENTER_KERNEL					      \
  		      LLL_EBX_LOAD					      \
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/i386/smp.h
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/i386/smp.h
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/i386/smp.h
 @@ -37,7 +37,7 @@ is_smp_system (void)
    char *cp;
  
@@ -2813,8 +2826,8 @@
      cp = u.uts.version;
    else
      {
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -2822,8 +2835,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
 @@ -22,6 +22,8 @@
  #include <kernel-features.h>
  #include <lowlevellock.h>
@@ -2853,8 +2866,8 @@
  	syscall
  
  2:	movl	%edx, %eax
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
 @@ -20,6 +20,8 @@
  #ifndef _LOWLEVELLOCK_H
  #define _LOWLEVELLOCK_H	1
@@ -2872,8 +2885,8 @@
      __asm __volatile ("syscall"						      \
  		      : "=a" (__ignore)					      \
  		      : "0" (SYS_futex), "D" (futex),			      \
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
 @@ -25,7 +25,7 @@
  #include <kernel-features.h>
  #include <pthread-pi-defines.h>
@@ -2892,8 +2905,8 @@
  	/* Get internal lock.  */
  	movl	$1, %esi
  	xorl	%eax, %eax
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
 @@ -24,6 +24,7 @@
  #include <pthread-pi-defines.h>
  #include <kernel-features.h>
@@ -2911,8 +2924,8 @@
  	/* Get internal lock.  */
  	movq	%rdi, %r8
  	movl	$1, %esi
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
 @@ -23,6 +23,7 @@
  #include <lowlevelcond.h>
  #include <pthread-pi-defines.h>
@@ -2930,8 +2943,8 @@
  	cmpq	$1000000000, 8(%rdx)
  	movl	$EINVAL, %eax
  	jae	48f
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
 @@ -23,6 +23,7 @@
  #include <lowlevelcond.h>
  #include <tcb-offsets.h>
@@ -2949,8 +2962,8 @@
  	cmpq	$-1, dep_mutex(%rdi)
  
  		/* Prepare structure passed to cancellation handler.  */
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
 @@ -22,7 +22,7 @@
  #include <lowlevelrwlock.h>
  #include <pthread-errnos.h>
@@ -2970,8 +2983,8 @@
  	xorq	%r10, %r10
  
  	/* Get the lock.  */
---- glibc-2.14-12-g5babac1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
-+++ glibc-2.14-3/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
+--- glibc-2.14-15-g9614794/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
++++ glibc-2.14-4/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
 @@ -22,7 +22,7 @@
  #include <lowlevelrwlock.h>
  #include <pthread-errnos.h>
@@ -2991,8 +3004,8 @@
  	xorq	%r10, %r10
  
  	/* Get the lock.  */
---- glibc-2.14-12-g5babac1/nscd/nscd.conf
-+++ glibc-2.14-3/nscd/nscd.conf
+--- glibc-2.14-15-g9614794/nscd/nscd.conf
++++ glibc-2.14-4/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -3002,8 +3015,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.14-12-g5babac1/nscd/nscd.init
-+++ glibc-2.14-3/nscd/nscd.init
+--- glibc-2.14-15-g9614794/nscd/nscd.init
++++ glibc-2.14-4/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -3080,8 +3093,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.14-12-g5babac1/nss/Makefile
-+++ glibc-2.14-3/nss/Makefile
+--- glibc-2.14-15-g9614794/nss/Makefile
++++ glibc-2.14-4/nss/Makefile
 @@ -75,6 +75,7 @@ endif
  
  include ../Rules
@@ -3090,8 +3103,8 @@
  
  ifeq (yes,$(build-static-nss))
  $(objpfx)getent: $(objpfx)libnss_files.a
---- glibc-2.14-12-g5babac1/nss/nss_files/files-XXX.c
-+++ glibc-2.14-3/nss/nss_files/files-XXX.c
+--- glibc-2.14-15-g9614794/nss/nss_files/files-XXX.c
++++ glibc-2.14-4/nss/nss_files/files-XXX.c
 @@ -1,5 +1,5 @@
  /* Common code for file-based databases in nss_files module.
 -   Copyright (C) 1996-1999,2001,2002,2004,2007,2008
@@ -3108,8 +3121,8 @@
    int parse_result;
  
    if (buflen < sizeof *data + 2)
---- glibc-2.14-12-g5babac1/posix/Makefile
-+++ glibc-2.14-3/posix/Makefile
+--- glibc-2.14-15-g9614794/posix/Makefile
++++ glibc-2.14-4/posix/Makefile
 @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -3130,8 +3143,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.14-12-g5babac1/posix/gai.conf
-+++ glibc-2.14-3/posix/gai.conf
+--- glibc-2.14-15-g9614794/posix/gai.conf
++++ glibc-2.14-4/posix/gai.conf
 @@ -41,7 +41,7 @@
  #
  # precedence  <mask>   <value>
@@ -3156,8 +3169,8 @@
  #scopev4 ::ffff:0.0.0.0/96       14
 +#
 +#    This is what the Red Hat setting currently uses.
---- glibc-2.14-12-g5babac1/posix/getconf.speclist.h
-+++ glibc-2.14-3/posix/getconf.speclist.h
+--- glibc-2.14-15-g9614794/posix/getconf.speclist.h
++++ glibc-2.14-4/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -3198,8 +3211,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.14-12-g5babac1/posix/regcomp.c
-+++ glibc-2.14-3/posix/regcomp.c
+--- glibc-2.14-15-g9614794/posix/regcomp.c
++++ glibc-2.14-4/posix/regcomp.c
 @@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
  
    /* Local function for parse_bracket_exp used in _LIBC environement.
@@ -3331,8 +3344,8 @@
  	    {
  	      /* No valid character, treat it as a normal
  		 character.  */
---- glibc-2.14-12-g5babac1/resolv/Makefile
-+++ glibc-2.14-3/resolv/Makefile
+--- glibc-2.14-15-g9614794/resolv/Makefile
++++ glibc-2.14-4/resolv/Makefile
 @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
  	    -Dgetnetbyaddr=res_getnetbyaddr
  
@@ -3341,8 +3354,8 @@
  
  # The BIND code elicits some harmless warnings.
  +cflags += -Wno-strict-prototypes -Wno-write-strings
---- glibc-2.14-12-g5babac1/resource/getrlimit.c
-+++ glibc-2.14-3/resource/getrlimit.c
+--- glibc-2.14-15-g9614794/resource/getrlimit.c
++++ glibc-2.14-4/resource/getrlimit.c
 @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
    __set_errno (ENOSYS);
    return -1;
@@ -3351,8 +3364,8 @@
  weak_alias (__getrlimit, getrlimit)
  
  stub_warning (getrlimit)
---- glibc-2.14-12-g5babac1/scripts/check-local-headers.sh
-+++ glibc-2.14-3/scripts/check-local-headers.sh
+--- glibc-2.14-15-g9614794/scripts/check-local-headers.sh
++++ glibc-2.14-4/scripts/check-local-headers.sh
 @@ -31,6 +31,8 @@ fgrep -v "$includedir/asm" |
  fgrep -v "$includedir/linux" |
  fgrep -v "$includedir/selinux" |
@@ -3362,8 +3375,8 @@
  fgrep -v "$includedir/gd" |
  fgrep -v "$includedir/nss3"; then
    # If we found a match something is wrong.
---- glibc-2.14-12-g5babac1/stdio-common/vfprintf.c
-+++ glibc-2.14-3/stdio-common/vfprintf.c
+--- glibc-2.14-15-g9614794/stdio-common/vfprintf.c
++++ glibc-2.14-4/stdio-common/vfprintf.c
 @@ -1161,41 +1161,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap)
  	else if (!is_long && spec != L_('S'))				      \
  	  {								      \
@@ -3409,8 +3422,8 @@
  	    else							      \
  	      len = strlen (string);					      \
  	  }								      \
---- glibc-2.14-12-g5babac1/streams/Makefile
-+++ glibc-2.14-3/streams/Makefile
+--- glibc-2.14-15-g9614794/streams/Makefile
++++ glibc-2.14-4/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -3420,8 +3433,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.14-12-g5babac1/sunrpc/Makefile
-+++ glibc-2.14-3/sunrpc/Makefile
+--- glibc-2.14-15-g9614794/sunrpc/Makefile
++++ glibc-2.14-4/sunrpc/Makefile
 @@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
  				    des_crypt.h)
  headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
@@ -3442,8 +3455,8 @@
  $(objpfx)tst-getmyaddr: $(common-objpfx)linkobj/libc.so
  $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
  $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
---- glibc-2.14-12-g5babac1/sysdeps/generic/dl-cache.h
-+++ glibc-2.14-3/sysdeps/generic/dl-cache.h
+--- glibc-2.14-15-g9614794/sysdeps/generic/dl-cache.h
++++ glibc-2.14-4/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -3459,8 +3472,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.14-12-g5babac1/sysdeps/i386/Makefile
-+++ glibc-2.14-3/sysdeps/i386/Makefile
+--- glibc-2.14-15-g9614794/sysdeps/i386/Makefile
++++ glibc-2.14-4/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -3485,8 +3498,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.14-12-g5babac1/sysdeps/i386/__longjmp.S
-+++ glibc-2.14-3/sysdeps/i386/__longjmp.S
+--- glibc-2.14-15-g9614794/sysdeps/i386/__longjmp.S
++++ glibc-2.14-4/sysdeps/i386/__longjmp.S
 @@ -1,5 +1,5 @@
  /* longjmp for i386.
 -   Copyright (C) 1995-1998,2000,2002,2005,2006,2009
@@ -3533,8 +3546,8 @@
  #endif
  	/* Jump to saved PC.  */
       	jmp *%edx
---- glibc-2.14-12-g5babac1/sysdeps/i386/bsd-_setjmp.S
-+++ glibc-2.14-3/sysdeps/i386/bsd-_setjmp.S
+--- glibc-2.14-15-g9614794/sysdeps/i386/bsd-_setjmp.S
++++ glibc-2.14-4/sysdeps/i386/bsd-_setjmp.S
 @@ -1,5 +1,6 @@
  /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'.  i386 version.
 -   Copyright (C) 1994-1997,2000-2002,2005, 2006 Free Software Foundation, Inc.
@@ -3559,8 +3572,8 @@
  #ifdef PTR_MANGLE
  	PTR_MANGLE (%ecx)
  #endif
---- glibc-2.14-12-g5babac1/sysdeps/i386/bsd-setjmp.S
-+++ glibc-2.14-3/sysdeps/i386/bsd-setjmp.S
+--- glibc-2.14-15-g9614794/sysdeps/i386/bsd-setjmp.S
++++ glibc-2.14-4/sysdeps/i386/bsd-setjmp.S
 @@ -1,5 +1,6 @@
  /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'.  i386 version.
 -   Copyright (C) 1994-1997,2000,2001,2005, 2006 Free Software Foundation, Inc.
@@ -3585,8 +3598,8 @@
  #ifdef PTR_MANGLE
  	PTR_MANGLE (%ecx)
  #endif
---- glibc-2.14-12-g5babac1/sysdeps/i386/i686/Makefile
-+++ glibc-2.14-3/sysdeps/i386/i686/Makefile
+--- glibc-2.14-15-g9614794/sysdeps/i386/i686/Makefile
++++ glibc-2.14-4/sysdeps/i386/i686/Makefile
 @@ -9,19 +9,3 @@ stack-align-test-flags += -msse
  ifeq ($(subdir),string)
  sysdep_routines += cacheinfo
@@ -3607,8 +3620,8 @@
 -ASFLAGS-.ob += -Wa,-mtune=i686
 -ASFLAGS-.oS += -Wa,-mtune=i686
 -endif
---- glibc-2.14-12-g5babac1/sysdeps/i386/i686/multiarch/strspn.S
-+++ glibc-2.14-3/sysdeps/i386/i686/multiarch/strspn.S
+--- glibc-2.14-15-g9614794/sysdeps/i386/i686/multiarch/strspn.S
++++ glibc-2.14-4/sysdeps/i386/i686/multiarch/strspn.S
 @@ -76,8 +76,8 @@ END(strspn)
  # define ENTRY(name) \
  	.type __strspn_ia32, @function; \
@@ -3620,8 +3633,8 @@
  	CALL_MCOUNT
  # undef END
  # define END(name) \
---- glibc-2.14-12-g5babac1/sysdeps/i386/setjmp.S
-+++ glibc-2.14-3/sysdeps/i386/setjmp.S
+--- glibc-2.14-15-g9614794/sysdeps/i386/setjmp.S
++++ glibc-2.14-4/sysdeps/i386/setjmp.S
 @@ -1,5 +1,5 @@
  /* setjmp for i386.
 -   Copyright (C) 1995,1996,1997,2000,2001,2005,2006
@@ -3645,8 +3658,8 @@
  #ifdef PTR_MANGLE
  	PTR_MANGLE (%ecx)
  #endif
---- glibc-2.14-12-g5babac1/sysdeps/ia64/Makefile
-+++ glibc-2.14-3/sysdeps/ia64/Makefile
+--- glibc-2.14-15-g9614794/sysdeps/ia64/Makefile
++++ glibc-2.14-4/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -3658,8 +3671,8 @@
  endif
  endif
  
---- glibc-2.14-12-g5babac1/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.14-3/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.14-15-g9614794/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.14-4/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -4011,8 +4024,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-2.14-12-g5babac1/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.14-3/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.14-15-g9614794/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.14-4/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -4098,69 +4111,128 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.14-12-g5babac1/sysdeps/mach/hurd/getrlimit.c
-+++ glibc-2.14-3/sysdeps/mach/hurd/getrlimit.c
+--- glibc-2.14-15-g9614794/sysdeps/mach/hurd/getrlimit.c
++++ glibc-2.14-4/sysdeps/mach/hurd/getrlimit.c
 @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
  
    return 0;
  }
 +libc_hidden_def (__getrlimit)
  weak_alias (__getrlimit, getrlimit)
---- glibc-2.14-12-g5babac1/sysdeps/posix/getaddrinfo.c
-+++ glibc-2.14-3/sysdeps/posix/getaddrinfo.c
-@@ -881,16 +881,48 @@ gaih_inet (const char *name, const struct gaih_service *service,
- 			}
- 		    }
- 
--		  no_inet6_data = no_data;
+--- glibc-2.14-15-g9614794/sysdeps/posix/getaddrinfo.c
++++ glibc-2.14-4/sysdeps/posix/getaddrinfo.c
+@@ -562,8 +562,8 @@ gaih_inet (const char *name, const struct gaih_service *service,
+ 
+ 	  /* If we do not have to look for IPv6 addresses, use
+ 	     the simple, old functions, which do not support
+-	     IPv6 scope ids. */
+-	  if (req->ai_family == AF_INET)
++	     IPv6 scope ids, nor retrieving the canonical name.  */
++	  if (req->ai_family == AF_INET && (req->ai_flags & AI_CANONNAME) == 0)
+ 	    {
+ 	      int family = req->ai_family;
+ 	      size_t tmpbuflen = 512;
+@@ -1108,68 +1108,10 @@ gaih_inet (const char *name, const struct gaih_service *service,
+ 	/* Only the first entry gets the canonical name.  */
+ 	if (at2 == at && (req->ai_flags & AI_CANONNAME) != 0)
+ 	  {
+-	    char *tmpbuf2 = NULL;
+-	    bool malloc_tmpbuf2 = false;
 -
- 		  if (status == NSS_STATUS_SUCCESS)
- 		    {
- 		      if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL)
- 			canon = (*pat)->name;
- 
- 		      while (*pat != NULL)
--			pat = &((*pat)->next);
-+			{
-+			  if ((*pat)->family == AF_INET
-+			      && req->ai_family == AF_INET6
-+			      && (req->ai_flags & AI_V4MAPPED) != 0)
-+			    {
-+			      uint32_t *pataddr = (*pat)->addr;
-+			      (*pat)->family = AF_INET6;
-+			      pataddr[3] = pataddr[0];
-+			      pataddr[2] = htonl (0xffff);
-+			      pataddr[1] = 0;
-+			      pataddr[0] = 0;
-+			      pat = &(*pat)->next;
-+			    }
-+			  else if ((req->ai_family == AF_UNSPEC
-+				    || (*pat)->family == req->ai_family))
-+			    {
-+			      if ((*pat)->family == AF_INET6)
-+				got_ipv6 = true;
-+			      pat = &(*pat)->next;
-+			    }
-+			  else if (*pat == at)
-+			    {
-+			      if ((*pat)->next != NULL)
-+				memcpy (*pat, (*pat)->next, sizeof (**pat));
-+			      else
-+				{
-+				  no_data = 1;
-+				  break;
-+				}
-+			    }
-+			  else
-+			    *pat = (*pat)->next;
-+			}
- 		    }
-+
-+		  no_inet6_data = no_data;
- 		}
- 	      else
- 		{
-@@ -1335,10 +1367,12 @@ static const struct scopeentry
+ 	    if (canon == NULL)
+-	      {
+-		struct hostent *h = NULL;
+-		int herrno;
+-		struct hostent th;
+-		size_t tmpbuf2len = 512;
+-
+-		do
+-		  {
+-		    if (__libc_use_alloca (alloca_used + 2 * tmpbuf2len))
+-		      tmpbuf2 = extend_alloca_account (tmpbuf2, tmpbuf2len,
+-						       tmpbuf2len * 2,
+-						       alloca_used);
+-		    else
+-		      {
+-			char *newp = realloc (malloc_tmpbuf2 ? tmpbuf2 : NULL,
+-					      2 * tmpbuf2len);
+-			if (newp == NULL)
+-			  {
+-			    if (malloc_tmpbuf2)
+-			      free (tmpbuf2);
+-			    result = -EAI_MEMORY;
+-			    goto free_and_return;
+-			  }
+-
+-			tmpbuf2 = newp;
+-			tmpbuf2len = 2 * tmpbuf2len;
+-			malloc_tmpbuf2 = true;
+-		      }
+-
+-		    rc = __gethostbyaddr_r (at2->addr,
+-					    ((at2->family == AF_INET6)
+-					     ? sizeof (struct in6_addr)
+-					     : sizeof (struct in_addr)),
+-					    at2->family, &th, tmpbuf2,
+-					    tmpbuf2len, &h, &herrno);
+-		  }
+-		while (rc == ERANGE && herrno == NETDB_INTERNAL);
+-
+-		if (rc != 0 && herrno == NETDB_INTERNAL)
+-		  {
+-		    if (malloc_tmpbuf2)
+-		      free (tmpbuf2);
+-
+-		    __set_h_errno (herrno);
+-		    result = -EAI_SYSTEM;
+-		    goto free_and_return;
+-		  }
+-
+-		if (h != NULL)
+-		  canon = h->h_name;
+-		else
+-		  {
+-		    assert (orig_name != NULL);
+-		    /* If the canonical name cannot be determined, use
+-		       the passed in string.  */
+-		    canon = orig_name;
+-		  }
+-	      }
++	      /* If the canonical name cannot be determined, use
++		 the passed in string.  */
++	      canon = orig_name;
+ 
+ #ifdef HAVE_LIBIDN
+ 	    if (req->ai_flags & AI_CANONIDN)
+@@ -1184,9 +1126,6 @@ gaih_inet (const char *name, const struct gaih_service *service,
+ 		int rc = __idna_to_unicode_lzlz (canon, &out, idn_flags);
+ 		if (rc != IDNA_SUCCESS)
+ 		  {
+-		    if (malloc_tmpbuf2)
+-		      free (tmpbuf2);
+-
+ 		    if (rc == IDNA_MALLOC_ERROR)
+ 		      result = -EAI_MEMORY;
+ 		    else if (rc == IDNA_DLOPEN_ERROR)
+@@ -1216,17 +1155,11 @@ gaih_inet (const char *name, const struct gaih_service *service,
+ 		    canon = strdup (canon);
+ 		    if (canon == NULL)
+ 		      {
+-			if (malloc_tmpbuf2)
+-			  free (tmpbuf2);
+-
+ 			result = -EAI_MEMORY;
+ 			goto free_and_return;
+ 		      }
+ 		  }
+ 	      }
+-
+-	    if (malloc_tmpbuf2)
+-	      free (tmpbuf2);
+ 	  }
+ 
+ 	family = at2->family;
+@@ -1363,10 +1296,12 @@ static const struct scopeentry
      /* Link-local addresses: scope 2.  */
      { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
      { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 },
@@ -4173,8 +4245,8 @@
      /* Default: scope 14.  */
      { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
    };
---- glibc-2.14-12-g5babac1/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.14-3/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.14-15-g9614794/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.14-4/sysdeps/powerpc/powerpc64/Makefile
 @@ -33,6 +33,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -4183,16 +4255,16 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.14-12-g5babac1/sysdeps/powerpc/powerpc64/elf/Makefile
-+++ glibc-2.14-3/sysdeps/powerpc/powerpc64/elf/Makefile
+--- glibc-2.14-15-g9614794/sysdeps/powerpc/powerpc64/elf/Makefile
++++ glibc-2.14-4/sysdeps/powerpc/powerpc64/elf/Makefile
 @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs)
  CFLAGS-rtld-memmove.os = $(no-special-regs)
  CFLAGS-rtld-memchr.os = $(no-special-regs)
  CFLAGS-rtld-strnlen.os = $(no-special-regs)
 +
 +CFLAGS-gmon-start.c = -fno-strict-aliasing
---- glibc-2.14-12-g5babac1/sysdeps/s390/s390-64/utf16-utf32-z9.c
-+++ glibc-2.14-3/sysdeps/s390/s390-64/utf16-utf32-z9.c
+--- glibc-2.14-15-g9614794/sysdeps/s390/s390-64/utf16-utf32-z9.c
++++ glibc-2.14-4/sysdeps/s390/s390-64/utf16-utf32-z9.c
 @@ -169,10 +169,7 @@ gconv_end (struct __gconv_step *data)
      register unsigned long long outlen asm("11") = outend - outptr;	\
      uint64_t cc = 0;							\
@@ -4205,8 +4277,8 @@
                    "   jo     0b        \n\t"				\
  		  "   ipm    %2        \n"			        \
  		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
---- glibc-2.14-12-g5babac1/sysdeps/s390/s390-64/utf8-utf16-z9.c
-+++ glibc-2.14-3/sysdeps/s390/s390-64/utf8-utf16-z9.c
+--- glibc-2.14-15-g9614794/sysdeps/s390/s390-64/utf8-utf16-z9.c
++++ glibc-2.14-4/sysdeps/s390/s390-64/utf8-utf16-z9.c
 @@ -151,10 +151,7 @@ gconv_end (struct __gconv_step *data)
      register unsigned long long outlen asm("11") = outend - outptr;	\
      uint64_t cc = 0;							\
@@ -4219,8 +4291,8 @@
                    "   jo     0b        \n\t"				\
  		  "   ipm    %2        \n"			        \
  		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
---- glibc-2.14-12-g5babac1/sysdeps/s390/s390-64/utf8-utf32-z9.c
-+++ glibc-2.14-3/sysdeps/s390/s390-64/utf8-utf32-z9.c
+--- glibc-2.14-15-g9614794/sysdeps/s390/s390-64/utf8-utf32-z9.c
++++ glibc-2.14-4/sysdeps/s390/s390-64/utf8-utf32-z9.c
 @@ -155,10 +155,7 @@ gconv_end (struct __gconv_step *data)
      register unsigned long long outlen asm("11") = outend - outptr;	\
      uint64_t cc = 0;							\
@@ -4233,8 +4305,8 @@
                    "   jo     0b        \n\t"				\
  		  "   ipm    %2        \n"				\
  		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
---- glibc-2.14-12-g5babac1/sysdeps/unix/nice.c
-+++ glibc-2.14-3/sysdeps/unix/nice.c
+--- glibc-2.14-15-g9614794/sysdeps/unix/nice.c
++++ glibc-2.14-4/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -4249,8 +4321,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -4266,8 +4338,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -4310,8 +4382,8 @@
      {
        size_t filelen = strlen (file);
        if (__builtin_expect (filelen == 0, 0))
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/getpagesize.c
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/getpagesize.c
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/getpagesize.c
 @@ -28,7 +28,7 @@
  int
  __getpagesize ()
@@ -4321,8 +4393,8 @@
    assert (GLRO(dl_pagesize) != 0);
    return GLRO(dl_pagesize);
  #else
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
 @@ -1,4 +1,5 @@
 -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc.
 +/* Copyright (C) 2001,2004,2005,2006,2009,2011
@@ -4356,8 +4428,8 @@
 +	LIBC_PROBE (longjmp_target, 3, 4@%ecx, -4@%eax, 4@%edx)
  	jmp	*%edx
  END (____longjmp_chk)
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -4418,16 +4490,16 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/i386/getrlimit.c
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/i386/getrlimit.c
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/i386/getrlimit.c
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/i386/getrlimit.c
 @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
  }
  
  weak_alias (__new_getrlimit, __getrlimit);
 +libc_hidden_weak (__getrlimit)
  versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -4460,29 +4532,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -1 +1 @@
 -s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 \2\3"_
 +s_^\(RTLDLIST=\)\([^ 	]*\)-ia64\(\.so\.[0-9.]*\)[ 	]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -4508,8 +4580,8 @@
  
  struct netlink_res
  {
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -4519,8 +4591,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -4566,8 +4638,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.14-12-g5babac1/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
-+++ glibc-2.14-3/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
+--- glibc-2.14-15-g9614794/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
++++ glibc-2.14-4/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
 @@ -19,6 +19,7 @@
  #include <sysdep.h>
  #include <jmpbuf-offsets.h>
@@ -4594,8 +4666,8 @@
 +	LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx)
  	jmpq	*%rdx
  END (____longjmp_chk)
---- glibc-2.14-12-g5babac1/sysdeps/x86_64/__longjmp.S
-+++ glibc-2.14-3/sysdeps/x86_64/__longjmp.S
+--- glibc-2.14-15-g9614794/sysdeps/x86_64/__longjmp.S
++++ glibc-2.14-4/sysdeps/x86_64/__longjmp.S
 @@ -1,4 +1,4 @@
 -/* Copyright (C) 2001,2004,2005,2006,2009 Free Software Foundation, Inc.
 +/* Copyright (C) 2001,2004,2005,2006,2009,2011 Free Software Foundation, Inc.
@@ -4625,8 +4697,8 @@
 +	LIBC_PROBE (longjmp_target, 3, 8@%rdi, -4@%eax, 8@%rdx)
  	jmpq *%rdx
  END (__longjmp)
---- glibc-2.14-12-g5babac1/sysdeps/x86_64/setjmp.S
-+++ glibc-2.14-3/sysdeps/x86_64/setjmp.S
+--- glibc-2.14-15-g9614794/sysdeps/x86_64/setjmp.S
++++ glibc-2.14-4/sysdeps/x86_64/setjmp.S
 @@ -1,5 +1,5 @@
  /* setjmp for x86-64.
 -   Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
@@ -4650,8 +4722,8 @@
  #ifdef PTR_MANGLE
  	PTR_MANGLE (%rax)
  #endif
---- glibc-2.14-12-g5babac1/timezone/zic.c
-+++ glibc-2.14-3/timezone/zic.c
+--- glibc-2.14-15-g9614794/timezone/zic.c
++++ glibc-2.14-4/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;
diff --git a/glibc.spec b/glibc.spec
index 106ab65..d4c15f5 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.14-12-g5babac1
+%define glibcsrcdir glibc-2.14-15-g9614794
 %define glibcversion 2.14
 %define glibcportsdir glibc-ports-2.14
 ### glibc.spec.in follows:
@@ -27,7 +27,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 3
+Release: 4
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1051,6 +1051,12 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Jun 28 2011 Andreas Schwab <schwab at redhat.com> - 2.14-4
+- Update from 2.14 branch
+  - Fix crash in GB18030 encoder (#712901)
+- Fix more bugs in GB18030 charmap
+- Don't use gethostbyaddr to determine canonical name
+
 * Mon Jun 21 2011 Andreas Schwab <schwab at redhat.com> - 2.14-3
 - Update from 2.14 branch
   - Fix typo in recent resolver change which causes segvs (#710279)
diff --git a/sources b/sources
index 203da2e..cfdf549 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-4f1cbb5c58b8ca754714c65763d54068  glibc-2.14-12-g5babac1-fedora.tar.xz
-96a48cb0acb030c77e224c7748684652  glibc-2.14-12-g5babac1.tar.xz
+af85a1921f8062fed1005a1a000c146f  glibc-2.14-15-g9614794-fedora.tar.xz
+dd6e7ae7a2251c25c2ce1fa81957bf98  glibc-2.14-15-g9614794.tar.xz
 05c85905b43021a81318c3aa81718019  glibc-ports-2.14.tar.xz


More information about the scm-commits mailing list