[glibc/f15] 2.14-2

Andreas Schwab schwab at fedoraproject.org
Fri Jun 3 12:30:47 UTC 2011 

commit 7f8f336ccdfb320b66e174b44ae736917cfab0d6
Author: Andreas Schwab <schwab at redhat.com>
Date:   Fri Jun 3 14:29:51 2011 +0200

    2.14-2

 glibc-fedora.patch |  377 ++++++++++++++++++++++++++++++----------------------
 glibc.spec         |    6 +-
 sources            |    2 +-
 3 files changed, 226 insertions(+), 159 deletions(-)
---
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 0a92db0..ff7de11 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,5 +1,5 @@
 --- glibc-2.14/ChangeLog
-+++ glibc-2.14-1/ChangeLog
++++ glibc-2.14-2/ChangeLog
 @@ -1,3 +1,8 @@
 +2011-05-31  Andreas Schwab  <schwab at redhat.com>
 +
@@ -9,7 +9,19 @@
  2011-05-31  Ulrich Drepper  <drepper at gmail.com>
  
  	* version.h (RELEASE): Bump for 2.14 release.
-@@ -400,6 +405,13 @@
+@@ -10,11 +15,6 @@
+ 	* po/Makefile (po-sed-cmd): Add ksh to extensions.
+ 	(libc.pot): Work around missing support for .ksh extension in xgettext.
+ 
+-	[BZ #12684]
+-	* resolv/res_send.c (__libc_res_nsend): Only go to the next name server
+-	if both request failed.
+-	(send_dg): In case of server errors clear resplen or *resplen2.
+-
+ 	[BZ #12454]
+ 	* elf/dl-deps.c (_dl_map_object_deps): Run initializer sorting only
+ 	when there are multiple maps.
+@@ -400,6 +400,13 @@
  	* libio/Makefile (tests): Add bug-fclose1.
  	* libio/bug-fclose1.c: New file.
  
@@ -23,7 +35,7 @@
  2011-05-12  Ulrich Drepper  <drepper at gmail.com>
  
  	[BZ #12511]
-@@ -921,6 +933,31 @@
+@@ -921,6 +928,31 @@
  	* sysdeps/unix/sysv/linux/Versions [GLIBC_2.14] (clock_adjtime):
  	Export.
  
@@ -55,7 +67,7 @@
  2011-03-22  Ulrich Drepper  <drepper at gmail.com>
  
  	* sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Increment
-@@ -981,6 +1018,16 @@
+@@ -981,6 +1013,16 @@
  	$LDFLAGS and -nostdlib -nostartfiles to linking step.  Change main
  	to _start.
  
@@ -72,7 +84,7 @@
  2011-03-06  Ulrich Drepper  <drepper at gmail.com>
  
  	* elf/dl-load.c (_dl_map_object): If we are looking for the first
-@@ -1035,12 +1082,6 @@
+@@ -1035,12 +1077,6 @@
  	* elf/noload.c: Include <memcheck.h>.
  	(main): Call mtrace.  Close all opened handles.
  
@@ -85,7 +97,7 @@
  2011-02-22  Samuel Thibault  <samuel.thibault at ens-lyon.org>
  
  	Fix __if_freereq crash: Unlike the generic version which uses free,
-@@ -1197,6 +1238,12 @@
+@@ -1197,6 +1233,12 @@
  	* shadow/sgetspent.c: Check return value of __sgetspent_r instead
  	of errno.
  
@@ -98,7 +110,7 @@
  2011-01-19  Ulrich Drepper  <drepper at gmail.com>
  
  	[BZ #11724]
-@@ -1884,6 +1931,29 @@
+@@ -1884,6 +1926,29 @@
  	* sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS):
  	Mask out sign-bit copies when constructing f_fsid.
  
@@ -128,7 +140,7 @@
  2010-09-24  Petr Baudis <pasky at suse.cz>
  
  	* debug/stack_chk_fail_local.c: Add missing licence exception.
-@@ -2676,6 +2746,32 @@
+@@ -2676,6 +2741,32 @@
  	call returning > 0 value.
  	* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
  
@@ -161,7 +173,7 @@
  2010-06-07  Andreas Schwab  <schwab at redhat.com>
  
  	* dlfcn/Makefile: Remove explicit dependencies on libc.so and
-@@ -2728,6 +2824,24 @@
+@@ -2728,6 +2819,24 @@
  	* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
  	* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
  
@@ -187,7 +199,7 @@
  
  	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
 --- glibc-2.14/ChangeLog.15
-+++ glibc-2.14-1/ChangeLog.15
++++ glibc-2.14-2/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -254,7 +266,7 @@
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
 --- glibc-2.14/ChangeLog.16
-+++ glibc-2.14-1/ChangeLog.16
++++ glibc-2.14-2/ChangeLog.16
 @@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
@@ -278,7 +290,7 @@
  
  	* libio/genops.c: Include <stdbool.h>.
 --- glibc-2.14/ChangeLog.17
-+++ glibc-2.14-1/ChangeLog.17
++++ glibc-2.14-2/ChangeLog.17
 @@ -256,6 +256,12 @@
  
  	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
@@ -358,7 +370,7 @@
  
  	[BZ #3632]
 --- glibc-2.14/Makeconfig
-+++ glibc-2.14-1/Makeconfig
++++ glibc-2.14-2/Makeconfig
 @@ -791,12 +791,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -376,11 +388,15 @@
  ifndef BUILD_CC
  BUILD_CC = $(CC)
 --- glibc-2.14/NEWS
-+++ glibc-2.14-1/NEWS
-@@ -20,16 +20,6 @@ Version 2.14
-   12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
-   12795, 12811, 12813, 12814
- 
++++ glibc-2.14-2/NEWS
+@@ -16,19 +16,9 @@ Version 2.14
+   12393, 12420, 12432, 12445, 12449, 12453, 12454, 12460, 12469, 12489,
+   12509, 12510, 12511, 12518, 12527, 12541, 12545, 12551, 12582, 12583,
+   12587, 12597, 12601, 12611, 12625, 12626, 12631, 12650, 12653, 12655,
+-  12660, 12671, 12681, 12684, 12685, 12711, 12713, 12714, 12717, 12723,
+-  12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
+-  12795, 12811, 12813, 12814
+-
 -* The RPC implementation in libc is obsoleted.  Old programs keep working
 -  but new programs cannot be linked with the routines in libc anymore.
 -  Programs in need of RPC functionality must be linked against TI-RPC.
@@ -390,12 +406,14 @@
 -  programs using RPC functions without referencing the TI-RPC library and the
 -  removal of the RPC headers from the glibc headers.
 -  Implemented by Ulrich Drepper.
--
++  12660, 12671, 12681, 12685, 12711, 12713, 12714, 12717, 12723, 12724,
++  12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792, 12795,
++  12811, 12813, 12814
+ 
  * New Linux interfaces: clock_adjtime, name_to_handle_at, open_by_handle_at,
    syncfs, setns, sendmmsg
- 
 --- glibc-2.14/config.h.in
-+++ glibc-2.14-1/config.h.in
++++ glibc-2.14-2/config.h.in
 @@ -204,6 +204,9 @@
  /* Define if `.ctors' and `.dtors' sections shouldn't be used.  */
  #undef	NO_CTORS_DTORS_SECTIONS
@@ -407,7 +425,7 @@
   */
  
 --- glibc-2.14/configure
-+++ glibc-2.14-1/configure
++++ glibc-2.14-2/configure
 @@ -784,6 +784,7 @@ enable_all_warnings
  enable_multi_arch
  enable_experimental_malloc
@@ -477,7 +495,7 @@
  # 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/configure.in
-+++ glibc-2.14-1/configure.in
++++ glibc-2.14-2/configure.in
 @@ -316,6 +316,29 @@ else
  fi
  AC_SUBST(libc_cv_nss_crypt)
@@ -509,7 +527,7 @@
  # 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/csu/Makefile
-+++ glibc-2.14-1/csu/Makefile
++++ glibc-2.14-2/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -521,7 +539,7 @@
  vpath initfini.c $(sysdirs)
  
 --- glibc-2.14/csu/elf-init.c
-+++ glibc-2.14-1/csu/elf-init.c
++++ glibc-2.14-2/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;
@@ -547,7 +565,7 @@
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
 --- glibc-2.14/debug/tst-chk1.c
-+++ glibc-2.14-1/debug/tst-chk1.c
++++ glibc-2.14-2/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -577,7 +595,7 @@
  # else
  #  define O 1
 --- glibc-2.14/elf/Makefile
-+++ glibc-2.14-1/elf/Makefile
++++ glibc-2.14-2/elf/Makefile
 @@ -90,6 +90,7 @@ distribute	:= rtld-Rules \
  		   unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
  		   unload6mod1.c unload6mod2.c unload6mod3.c \
@@ -642,7 +660,7 @@
  $(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/elf/dl-close.c
-+++ glibc-2.14-1/elf/dl-close.c
++++ glibc-2.14-2/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)
@@ -678,7 +696,7 @@
  	  /* 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/elf/dl-deps.c
-+++ glibc-2.14-1/elf/dl-deps.c
++++ glibc-2.14-2/elf/dl-deps.c
 @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
  		  nneeded * sizeof needed[0]);
  	  atomic_write_barrier ();
@@ -718,7 +736,7 @@
 +		      NULL, errstring);
  }
 --- glibc-2.14/elf/dl-init.c
-+++ glibc-2.14-1/elf/dl-init.c
++++ glibc-2.14-2/elf/dl-init.c
 @@ -24,11 +24,9 @@
  /* Type of the initializer.  */
  typedef void (*init_t) (int, char **, char **);
@@ -742,7 +760,7 @@
  }
  INTDEF (_dl_init)
 --- glibc-2.14/elf/dl-libc.c
-+++ glibc-2.14-1/elf/dl-libc.c
++++ glibc-2.14-2/elf/dl-libc.c
 @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
  
    for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
@@ -770,7 +788,7 @@
  
        if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
 --- glibc-2.14/elf/dl-load.c
-+++ glibc-2.14-1/elf/dl-load.c
++++ glibc-2.14-2/elf/dl-load.c
 @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len)
  
  
@@ -851,7 +869,7 @@
  	  else
  	    /* No DST we recognize.  */
 --- glibc-2.14/elf/dl-support.c
-+++ glibc-2.14-1/elf/dl-support.c
++++ glibc-2.14-2/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;
@@ -864,7 +882,7 @@
  /* Random data provided by the kernel.  */
  void *_dl_random;
 --- glibc-2.14/elf/ldconfig.c
-+++ glibc-2.14-1/elf/ldconfig.c
++++ glibc-2.14-2/elf/ldconfig.c
 @@ -1034,17 +1034,19 @@ search_dirs (void)
  
  
@@ -947,7 +965,7 @@
  
    const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
 --- glibc-2.14/elf/ldd.bash.in
-+++ glibc-2.14-1/elf/ldd.bash.in
++++ glibc-2.14-2/elf/ldd.bash.in
 @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
        fi
      done
@@ -977,7 +995,7 @@
        ;;
      *)
 --- glibc-2.14/elf/rtld-Rules
-+++ glibc-2.14-1/elf/rtld-Rules
++++ glibc-2.14-2/elf/rtld-Rules
 @@ -1,7 +1,7 @@
  # Subroutine makefile for compiling libc modules linked into dynamic linker.
  
@@ -996,7 +1014,7 @@
  
  endif
 --- glibc-2.14/elf/rtld.c
-+++ glibc-2.14-1/elf/rtld.c
++++ glibc-2.14-2/elf/rtld.c
 @@ -107,7 +107,6 @@ static struct audit_list
    struct audit_list *next;
  } *audit_list;
@@ -1041,7 +1059,7 @@
      {
        /* There was an explicit ref to the dynamic linker as a shared lib.
 --- glibc-2.14/elf/unload8.c
-+++ glibc-2.14-1/elf/unload8.c
++++ glibc-2.14-2/elf/unload8.c
 @@ -0,0 +1,33 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@@ -1077,7 +1095,7 @@
 +  return 0;
 +}
 --- glibc-2.14/elf/unload8mod1.c
-+++ glibc-2.14-1/elf/unload8mod1.c
++++ glibc-2.14-2/elf/unload8mod1.c
 @@ -0,0 +1,7 @@
 +extern void mod2 (void);
 +
@@ -1087,11 +1105,11 @@
 +  mod2 ();
 +}
 --- glibc-2.14/elf/unload8mod1x.c
-+++ glibc-2.14-1/elf/unload8mod1x.c
++++ glibc-2.14-2/elf/unload8mod1x.c
 @@ -0,0 +1 @@
 +int mod1x;
 --- glibc-2.14/elf/unload8mod2.c
-+++ glibc-2.14-1/elf/unload8mod2.c
++++ glibc-2.14-2/elf/unload8mod2.c
 @@ -0,0 +1,7 @@
 +extern void mod3 (void);
 +
@@ -1101,7 +1119,7 @@
 +  mod3 ();
 +}
 --- glibc-2.14/elf/unload8mod3.c
-+++ glibc-2.14-1/elf/unload8mod3.c
++++ glibc-2.14-2/elf/unload8mod3.c
 @@ -0,0 +1,27 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@@ -1131,7 +1149,7 @@
 +  atexit (mod3_fini);
 +}
 --- glibc-2.14/extra-lib.mk
-+++ glibc-2.14-1/extra-lib.mk
++++ glibc-2.14-2/extra-lib.mk
 @@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left))
  include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
  endif
@@ -1139,15 +1157,15 @@
 -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/include/bits/stdlib-ldbl.h
-+++ glibc-2.14-1/include/bits/stdlib-ldbl.h
++++ glibc-2.14-2/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
 --- glibc-2.14/include/bits/wchar-ldbl.h
-+++ glibc-2.14-1/include/bits/wchar-ldbl.h
++++ glibc-2.14-2/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
 --- glibc-2.14/include/features.h
-+++ glibc-2.14-1/include/features.h
++++ glibc-2.14-2/include/features.h
 @@ -310,8 +310,13 @@
  #endif
  
@@ -1165,7 +1183,7 @@
  # else
  #  define __USE_FORTIFY_LEVEL 1
 --- glibc-2.14/include/libc-symbols.h
-+++ glibc-2.14-1/include/libc-symbols.h
++++ glibc-2.14-2/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)
@@ -1176,7 +1194,7 @@
  # define libc_hidden_data_def(name) hidden_data_def (name)
  # define libc_hidden_data_weak(name) hidden_data_weak (name)
 --- glibc-2.14/include/link.h
-+++ glibc-2.14-1/include/link.h
++++ glibc-2.14-2/include/link.h
 @@ -1,6 +1,6 @@
  /* Data structure for communication from the run-time dynamic linker for
     loaded ELF shared objects.
@@ -1206,7 +1224,7 @@
      /* List of the dependencies introduced through symbol binding.  */
      struct link_map_reldeps
 --- glibc-2.14/include/stap-probe.h
-+++ glibc-2.14-1/include/stap-probe.h
++++ glibc-2.14-2/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.
@@ -1349,7 +1367,7 @@
 +
 +#endif	/* stap-probe.h */
 --- glibc-2.14/include/sys/resource.h
-+++ glibc-2.14-1/include/sys/resource.h
++++ glibc-2.14-2/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,
@@ -1357,7 +1375,7 @@
 +libc_hidden_proto (__getrlimit)
  #endif
 --- glibc-2.14/inet/Makefile
-+++ glibc-2.14-1/inet/Makefile
++++ glibc-2.14-2/inet/Makefile
 @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
  
  include ../Rules
@@ -1368,7 +1386,7 @@
  
  CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
 --- glibc-2.14/intl/locale.alias
-+++ glibc-2.14-1/intl/locale.alias
++++ glibc-2.14-2/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -1379,7 +1397,7 @@
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
 --- glibc-2.14/libio/stdio.h
-+++ glibc-2.14-1/libio/stdio.h
++++ glibc-2.14-2/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.  */
@@ -1394,7 +1412,7 @@
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
 --- glibc-2.14/locale/iso-4217.def
-+++ glibc-2.14-1/locale/iso-4217.def
++++ glibc-2.14-2/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -1487,7 +1505,7 @@
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
 --- glibc-2.14/locale/programs/locarchive.c
-+++ glibc-2.14-1/locale/programs/locarchive.c
++++ glibc-2.14-2/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;
@@ -1547,7 +1565,7 @@
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
 --- glibc-2.14/localedata/Makefile
-+++ glibc-2.14-1/localedata/Makefile
++++ glibc-2.14-2/localedata/Makefile
 @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -1557,7 +1575,7 @@
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
 --- glibc-2.14/localedata/SUPPORTED
-+++ glibc-2.14-1/localedata/SUPPORTED
++++ glibc-2.14-2/localedata/SUPPORTED
 @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -1600,7 +1618,7 @@
  sw_TZ/UTF-8 \
  ta_IN/UTF-8 \
 --- glibc-2.14/localedata/locales/cy_GB
-+++ glibc-2.14-1/localedata/locales/cy_GB
++++ glibc-2.14-2/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>"
@@ -1616,7 +1634,7 @@
  
  LC_MESSAGES
 --- glibc-2.14/localedata/locales/en_GB
-+++ glibc-2.14-1/localedata/locales/en_GB
++++ glibc-2.14-2/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>"
@@ -1629,7 +1647,7 @@
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
 --- glibc-2.14/localedata/locales/no_NO
-+++ glibc-2.14-1/localedata/locales/no_NO
++++ glibc-2.14-2/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -1701,7 +1719,7 @@
 +copy "nb_NO"
 +END LC_ADDRESS
 --- glibc-2.14/localedata/locales/zh_TW
-+++ glibc-2.14-1/localedata/locales/zh_TW
++++ glibc-2.14-2/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -1730,7 +1748,7 @@
  date       "2000-08-02"
  %
 --- glibc-2.14/login/programs/pt_chown.c
-+++ glibc-2.14-1/login/programs/pt_chown.c
++++ glibc-2.14-2/login/programs/pt_chown.c
 @@ -29,6 +29,7 @@
  #include <string.h>
  #include <sys/stat.h>
@@ -1773,7 +1791,7 @@
    return EXIT_SUCCESS;
  }
 --- glibc-2.14/malloc/mcheck.c
-+++ glibc-2.14-1/malloc/mcheck.c
++++ glibc-2.14-2/malloc/mcheck.c
 @@ -25,10 +25,26 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1851,7 +1869,7 @@
        old_free_hook = __free_hook;
        __free_hook = freehook;
 --- glibc-2.14/manual/libc.texinfo
-+++ glibc-2.14-1/manual/libc.texinfo
++++ glibc-2.14-2/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -1862,7 +1880,7 @@
  * Libc: (libc).                 C library.
  @end direntry
 --- glibc-2.14/misc/sys/cdefs.h
-+++ glibc-2.14-1/misc/sys/cdefs.h
++++ glibc-2.14-2/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)
@@ -1907,7 +1925,7 @@
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
 --- glibc-2.14/nis/Makefile
-+++ glibc-2.14-1/nis/Makefile
++++ glibc-2.14-2/nis/Makefile
 @@ -23,9 +23,9 @@ subdir	:= nis
  
  aux			:= nis_hash
@@ -1930,7 +1948,7 @@
  $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
  $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
 --- glibc-2.14/nis/nss
-+++ glibc-2.14-1/nis/nss
++++ glibc-2.14-2/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
@@ -1941,7 +1959,7 @@
  # ADJUNCT_AS_SHADOW
  #  If set to TRUE, the passwd routines in the NIS NSS module will not
 --- glibc-2.14/nptl/ChangeLog
-+++ glibc-2.14-1/nptl/ChangeLog
++++ glibc-2.14-2/nptl/ChangeLog
 @@ -10,6 +10,51 @@
  	clearing memory.
  	Patch partly by Robert Rex <robert.rex at exasol.com>.
@@ -2019,7 +2037,7 @@
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
 --- glibc-2.14/nptl/DESIGN-systemtap-probes.txt
-+++ glibc-2.14-1/nptl/DESIGN-systemtap-probes.txt
++++ glibc-2.14-2/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.
@@ -2111,7 +2129,7 @@
 +cond_broadcast - probe for pthread_cond_broadcast
 +               arg1 = condition
 --- glibc-2.14/nptl/Makefile
-+++ glibc-2.14-1/nptl/Makefile
++++ glibc-2.14-2/nptl/Makefile
 @@ -342,7 +342,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -2145,7 +2163,7 @@
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
 --- glibc-2.14/nptl/Versions
-+++ glibc-2.14-1/nptl/Versions
++++ glibc-2.14-2/nptl/Versions
 @@ -30,6 +30,7 @@ libc {
      __libc_alloca_cutoff;
      # Internal libc interface to libpthread
@@ -2155,7 +2173,7 @@
  }
  
 --- glibc-2.14/nptl/allocatestack.c
-+++ glibc-2.14-1/nptl/allocatestack.c
++++ glibc-2.14-2/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.  */
@@ -2175,7 +2193,7 @@
    while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
  					       ch | SETXID_BITMASK, ch));
 --- glibc-2.14/nptl/nptl-init.c
-+++ glibc-2.14-1/nptl/nptl-init.c
++++ glibc-2.14-2/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.  */
@@ -2186,7 +2204,7 @@
      /* The system limit is not usable.  Use an architecture-specific
         default.  */
 --- glibc-2.14/nptl/pthread_cond_broadcast.c
-+++ glibc-2.14-1/nptl/pthread_cond_broadcast.c
++++ glibc-2.14-2/nptl/pthread_cond_broadcast.c
 @@ -23,6 +23,7 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2205,7 +2223,7 @@
  		? LLL_SHARED : LLL_PRIVATE;
    /* Make sure we are alone.  */
 --- glibc-2.14/nptl/pthread_cond_destroy.c
-+++ glibc-2.14-1/nptl/pthread_cond_destroy.c
++++ glibc-2.14-2/nptl/pthread_cond_destroy.c
 @@ -20,6 +20,7 @@
  #include <errno.h>
  #include <shlib-compat.h>
@@ -2224,7 +2242,7 @@
    lll_lock (cond->__data.__lock, pshared);
  
 --- glibc-2.14/nptl/pthread_cond_init.c
-+++ glibc-2.14-1/nptl/pthread_cond_init.c
++++ glibc-2.14-2/nptl/pthread_cond_init.c
 @@ -20,6 +20,7 @@
  
  #include <shlib-compat.h>
@@ -2243,7 +2261,7 @@
  }
  versioned_symbol (libpthread, __pthread_cond_init,
 --- glibc-2.14/nptl/pthread_cond_signal.c
-+++ glibc-2.14-1/nptl/pthread_cond_signal.c
++++ glibc-2.14-2/nptl/pthread_cond_signal.c
 @@ -26,6 +26,7 @@
  
  #include <shlib-compat.h>
@@ -2262,7 +2280,7 @@
    lll_lock (cond->__data.__lock, pshared);
  
 --- glibc-2.14/nptl/pthread_cond_wait.c
-+++ glibc-2.14-1/nptl/pthread_cond_wait.c
++++ glibc-2.14-2/nptl/pthread_cond_wait.c
 @@ -25,6 +25,7 @@
  #include <pthreadP.h>
  
@@ -2281,7 +2299,7 @@
    lll_lock (cond->__data.__lock, pshared);
  
 --- glibc-2.14/nptl/pthread_create.c
-+++ glibc-2.14-1/nptl/pthread_create.c
++++ glibc-2.14-2/nptl/pthread_create.c
 @@ -31,6 +31,8 @@
  
  #include <shlib-compat.h>
@@ -2310,7 +2328,7 @@
    return create_thread (pd, iattr, STACK_VARIABLES_ARGS);
  }
 --- glibc-2.14/nptl/pthread_join.c
-+++ glibc-2.14-1/nptl/pthread_join.c
++++ glibc-2.14-2/nptl/pthread_join.c
 @@ -23,6 +23,8 @@
  #include <atomic.h>
  #include "pthreadP.h"
@@ -2338,7 +2356,7 @@
    return result;
  }
 --- glibc-2.14/nptl/pthread_mutex_destroy.c
-+++ glibc-2.14-1/nptl/pthread_mutex_destroy.c
++++ glibc-2.14-2/nptl/pthread_mutex_destroy.c
 @@ -20,11 +20,15 @@
  #include <errno.h>
  #include "pthreadP.h"
@@ -2356,7 +2374,7 @@
        && mutex->__data.__nusers != 0)
      return EBUSY;
 --- glibc-2.14/nptl/pthread_mutex_init.c
-+++ glibc-2.14-1/nptl/pthread_mutex_init.c
++++ glibc-2.14-2/nptl/pthread_mutex_init.c
 @@ -24,6 +24,8 @@
  #include <kernel-features.h>
  #include "pthreadP.h"
@@ -2376,7 +2394,7 @@
  }
  strong_alias (__pthread_mutex_init, pthread_mutex_init)
 --- glibc-2.14/nptl/pthread_mutex_lock.c
-+++ glibc-2.14-1/nptl/pthread_mutex_lock.c
++++ glibc-2.14-2/nptl/pthread_mutex_lock.c
 @@ -24,6 +24,7 @@
  #include <not-cancel.h>
  #include "pthreadP.h"
@@ -2414,7 +2432,7 @@
  }
  #ifndef __pthread_mutex_lock
 --- glibc-2.14/nptl/pthread_mutex_timedlock.c
-+++ glibc-2.14-1/nptl/pthread_mutex_timedlock.c
++++ glibc-2.14-2/nptl/pthread_mutex_timedlock.c
 @@ -24,6 +24,8 @@
  #include <lowlevellock.h>
  #include <not-cancel.h>
@@ -2470,7 +2488,7 @@
  
   out:
 --- glibc-2.14/nptl/pthread_mutex_unlock.c
-+++ glibc-2.14-1/nptl/pthread_mutex_unlock.c
++++ glibc-2.14-2/nptl/pthread_mutex_unlock.c
 @@ -22,6 +22,7 @@
  #include <stdlib.h>
  #include "pthreadP.h"
@@ -2508,7 +2526,7 @@
  }
  
 --- glibc-2.14/nptl/pthread_rwlock_destroy.c
-+++ glibc-2.14-1/nptl/pthread_rwlock_destroy.c
++++ glibc-2.14-2/nptl/pthread_rwlock_destroy.c
 @@ -18,12 +18,15 @@
     02111-1307 USA.  */
  
@@ -2526,7 +2544,7 @@
    return 0;
  }
 --- glibc-2.14/nptl/pthread_rwlock_rdlock.c
-+++ glibc-2.14-1/nptl/pthread_rwlock_rdlock.c
++++ glibc-2.14-2/nptl/pthread_rwlock_rdlock.c
 @@ -22,6 +22,7 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2554,7 +2572,7 @@
  	  break;
  	}
 --- glibc-2.14/nptl/pthread_rwlock_unlock.c
-+++ glibc-2.14-1/nptl/pthread_rwlock_unlock.c
++++ glibc-2.14-2/nptl/pthread_rwlock_unlock.c
 @@ -22,11 +22,14 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2571,7 +2589,7 @@
    if (rwlock->__data.__writer)
      rwlock->__data.__writer = 0;
 --- glibc-2.14/nptl/pthread_rwlock_wrlock.c
-+++ glibc-2.14-1/nptl/pthread_rwlock_wrlock.c
++++ glibc-2.14-2/nptl/pthread_rwlock_wrlock.c
 @@ -22,6 +22,7 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2599,7 +2617,7 @@
  	}
  
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.14-2/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
@@ -2609,7 +2627,7 @@
 +
  #endif /* bits/posix_opt.h */
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/Versions
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/Versions
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/Versions
 @@ -0,0 +1,6 @@
 +libc {
 +  GLIBC_PRIVATE {
@@ -2618,7 +2636,7 @@
 +  }
 +}
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
 @@ -22,6 +22,8 @@
  #include <kernel-features.h>
  #include <lowlevellock.h>
@@ -2639,7 +2657,7 @@
  
  2:	movl	%edx, %eax
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
 @@ -24,6 +24,7 @@
  #include <kernel-features.h>
  #include <pthread-pi-defines.h>
@@ -2658,7 +2676,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
 @@ -24,7 +24,7 @@
  #include <kernel-features.h>
  #include <pthread-pi-defines.h>
@@ -2678,7 +2696,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
 @@ -24,7 +24,7 @@
  #include <pthread-errnos.h>
  #include <pthread-pi-defines.h>
@@ -2698,7 +2716,7 @@
  	movl	$EINVAL, %eax
  	jae	18f
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
 @@ -25,6 +25,7 @@
  #include <pthread-errnos.h>
  #include <pthread-pi-defines.h>
@@ -2717,7 +2735,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
 @@ -23,6 +23,7 @@
  #include <pthread-errnos.h>
  #include <kernel-features.h>
@@ -2736,7 +2754,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
 @@ -23,6 +23,7 @@
  #include <pthread-errnos.h>
  #include <kernel-features.h>
@@ -2755,7 +2773,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
 @@ -20,6 +20,8 @@
  #ifndef _LOWLEVELLOCK_H
  #define _LOWLEVELLOCK_H	1
@@ -2774,7 +2792,7 @@
  		      LLL_ENTER_KERNEL					      \
  		      LLL_EBX_LOAD					      \
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/i386/smp.h
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/i386/smp.h
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/i386/smp.h
 @@ -37,7 +37,7 @@ is_smp_system (void)
    char *cp;
  
@@ -2785,7 +2803,7 @@
    else
      {
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -2794,7 +2812,7 @@
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
 @@ -22,6 +22,8 @@
  #include <kernel-features.h>
  #include <lowlevellock.h>
@@ -2825,7 +2843,7 @@
  
  2:	movl	%edx, %eax
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
 @@ -20,6 +20,8 @@
  #ifndef _LOWLEVELLOCK_H
  #define _LOWLEVELLOCK_H	1
@@ -2844,7 +2862,7 @@
  		      : "=a" (__ignore)					      \
  		      : "0" (SYS_futex), "D" (futex),			      \
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
 @@ -25,7 +25,7 @@
  #include <kernel-features.h>
  #include <pthread-pi-defines.h>
@@ -2864,7 +2882,7 @@
  	movl	$1, %esi
  	xorl	%eax, %eax
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
 @@ -24,6 +24,7 @@
  #include <pthread-pi-defines.h>
  #include <kernel-features.h>
@@ -2883,7 +2901,7 @@
  	movq	%rdi, %r8
  	movl	$1, %esi
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
 @@ -23,6 +23,7 @@
  #include <lowlevelcond.h>
  #include <pthread-pi-defines.h>
@@ -2902,7 +2920,7 @@
  	movl	$EINVAL, %eax
  	jae	48f
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
 @@ -23,6 +23,7 @@
  #include <lowlevelcond.h>
  #include <tcb-offsets.h>
@@ -2921,7 +2939,7 @@
  
  		/* Prepare structure passed to cancellation handler.  */
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
 @@ -22,7 +22,7 @@
  #include <lowlevelrwlock.h>
  #include <pthread-errnos.h>
@@ -2942,7 +2960,7 @@
  
  	/* Get the lock.  */
 --- glibc-2.14/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
-+++ glibc-2.14-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
++++ glibc-2.14-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
 @@ -22,7 +22,7 @@
  #include <lowlevelrwlock.h>
  #include <pthread-errnos.h>
@@ -2963,7 +2981,7 @@
  
  	/* Get the lock.  */
 --- glibc-2.14/nscd/nscd.conf
-+++ glibc-2.14-1/nscd/nscd.conf
++++ glibc-2.14-2/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -2974,7 +2992,7 @@
  	debug-level		0
  #	reload-count		5
 --- glibc-2.14/nscd/nscd.init
-+++ glibc-2.14-1/nscd/nscd.init
++++ glibc-2.14-2/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -3052,7 +3070,7 @@
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
 --- glibc-2.14/nscd/nscd_getserv_r.c
-+++ glibc-2.14-1/nscd/nscd_getserv_r.c
++++ glibc-2.14-2/nscd/nscd_getserv_r.c
 @@ -124,6 +124,7 @@ nscd_getserv_r (const char *crit, size_t critlen, const char *proto,
  	  s_name = (char *) (&found->data[0].servdata + 1);
  	  serv_resp = found->data[0].servdata;
@@ -3098,7 +3116,7 @@
  
    if (!alloca_aliases_len)
 --- glibc-2.14/nss/Makefile
-+++ glibc-2.14-1/nss/Makefile
++++ glibc-2.14-2/nss/Makefile
 @@ -75,6 +75,7 @@ endif
  
  include ../Rules
@@ -3108,7 +3126,7 @@
  ifeq (yes,$(build-static-nss))
  $(objpfx)getent: $(objpfx)libnss_files.a
 --- glibc-2.14/nss/nss_files/files-XXX.c
-+++ glibc-2.14-1/nss/nss_files/files-XXX.c
++++ glibc-2.14-2/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
@@ -3126,7 +3144,7 @@
  
    if (buflen < sizeof *data + 2)
 --- glibc-2.14/posix/Makefile
-+++ glibc-2.14-1/posix/Makefile
++++ glibc-2.14-2/posix/Makefile
 @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -3148,7 +3166,7 @@
 +	  > $@.new
  	mv -f $@.new $@
 --- glibc-2.14/posix/gai.conf
-+++ glibc-2.14-1/posix/gai.conf
++++ glibc-2.14-2/posix/gai.conf
 @@ -41,7 +41,7 @@
  #
  # precedence  <mask>   <value>
@@ -3174,7 +3192,7 @@
 +#
 +#    This is what the Red Hat setting currently uses.
 --- glibc-2.14/posix/getconf.speclist.h
-+++ glibc-2.14-1/posix/getconf.speclist.h
++++ glibc-2.14-2/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -3216,7 +3234,7 @@
 +#endif
 +"";
 --- glibc-2.14/posix/regcomp.c
-+++ glibc-2.14-1/posix/regcomp.c
++++ glibc-2.14-2/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.
@@ -3349,7 +3367,7 @@
  	      /* No valid character, treat it as a normal
  		 character.  */
 --- glibc-2.14/resolv/Makefile
-+++ glibc-2.14-1/resolv/Makefile
++++ glibc-2.14-2/resolv/Makefile
 @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
  	    -Dgetnetbyaddr=res_getnetbyaddr
  
@@ -3358,8 +3376,53 @@
  
  # The BIND code elicits some harmless warnings.
  +cflags += -Wno-strict-prototypes -Wno-write-strings
+--- glibc-2.14/resolv/res_send.c
++++ glibc-2.14-2/resolv/res_send.c
+@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ 				    ns, ansp, ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0)
+ 				goto next_ns;
+ 		} else {
+ 			/* Use datagrams. */
+@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ 				    ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0)
+ 				goto next_ns;
+ 			if (v_circuit)
+ 			  // XXX Check whether both requests failed or
+@@ -1275,14 +1275,10 @@ send_dg(res_state statp,
+ 				(*thisresplenp > *thisanssizp)
+ 				? *thisanssizp : *thisresplenp);
+ 
+-			if (recvresp1 || (buf2 != NULL && recvresp2)) {
+-			  *resplen2 = 0;
++			if (recvresp1 || (buf2 != NULL && recvresp2))
+ 			  return resplen;
+-			}
+ 			if (buf2 != NULL)
+ 			  {
+-			    /* No data from the first reply.  */
+-			    resplen = 0;
+ 			    /* We are waiting for a possible second reply.  */
+ 			    if (hp->id == anhp->id)
+ 			      recvresp1 = 1;
+@@ -1348,7 +1344,7 @@ send_dg(res_state statp,
+ 		goto err_out;
+ 	}
+ 	else {
+-		/* poll should not have returned > 0 in this case.  */
++	  	/* poll should not have returned > 0 in this case.  */
+ 		abort ();
+ 	}
+ }
 --- glibc-2.14/resource/getrlimit.c
-+++ glibc-2.14-1/resource/getrlimit.c
++++ glibc-2.14-2/resource/getrlimit.c
 @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
    __set_errno (ENOSYS);
    return -1;
@@ -3369,7 +3432,7 @@
  
  stub_warning (getrlimit)
 --- glibc-2.14/scripts/check-local-headers.sh
-+++ glibc-2.14-1/scripts/check-local-headers.sh
++++ glibc-2.14-2/scripts/check-local-headers.sh
 @@ -31,6 +31,8 @@ fgrep -v "$includedir/asm" |
  fgrep -v "$includedir/linux" |
  fgrep -v "$includedir/selinux" |
@@ -3380,7 +3443,7 @@
  fgrep -v "$includedir/nss3"; then
    # If we found a match something is wrong.
 --- glibc-2.14/stdio-common/vfprintf.c
-+++ glibc-2.14-1/stdio-common/vfprintf.c
++++ glibc-2.14-2/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'))				      \
  	  {								      \
@@ -3427,7 +3490,7 @@
  	      len = strlen (string);					      \
  	  }								      \
 --- glibc-2.14/streams/Makefile
-+++ glibc-2.14-1/streams/Makefile
++++ glibc-2.14-2/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -3438,7 +3501,7 @@
  
  include ../Rules
 --- glibc-2.14/sunrpc/Makefile
-+++ glibc-2.14-1/sunrpc/Makefile
++++ glibc-2.14-2/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) \
@@ -3460,7 +3523,7 @@
  $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
  $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
 --- glibc-2.14/sysdeps/generic/dl-cache.h
-+++ glibc-2.14-1/sysdeps/generic/dl-cache.h
++++ glibc-2.14-2/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -3477,7 +3540,7 @@
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
 --- glibc-2.14/sysdeps/i386/Makefile
-+++ glibc-2.14-1/sysdeps/i386/Makefile
++++ glibc-2.14-2/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -3503,7 +3566,7 @@
  
  ifeq ($(subdir),elf)
 --- glibc-2.14/sysdeps/i386/__longjmp.S
-+++ glibc-2.14-1/sysdeps/i386/__longjmp.S
++++ glibc-2.14-2/sysdeps/i386/__longjmp.S
 @@ -1,5 +1,5 @@
  /* longjmp for i386.
 -   Copyright (C) 1995-1998,2000,2002,2005,2006,2009
@@ -3551,7 +3614,7 @@
  	/* Jump to saved PC.  */
       	jmp *%edx
 --- glibc-2.14/sysdeps/i386/bsd-_setjmp.S
-+++ glibc-2.14-1/sysdeps/i386/bsd-_setjmp.S
++++ glibc-2.14-2/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.
@@ -3577,7 +3640,7 @@
  	PTR_MANGLE (%ecx)
  #endif
 --- glibc-2.14/sysdeps/i386/bsd-setjmp.S
-+++ glibc-2.14-1/sysdeps/i386/bsd-setjmp.S
++++ glibc-2.14-2/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.
@@ -3603,7 +3666,7 @@
  	PTR_MANGLE (%ecx)
  #endif
 --- glibc-2.14/sysdeps/i386/i686/Makefile
-+++ glibc-2.14-1/sysdeps/i386/i686/Makefile
++++ glibc-2.14-2/sysdeps/i386/i686/Makefile
 @@ -9,19 +9,3 @@ stack-align-test-flags += -msse
  ifeq ($(subdir),string)
  sysdep_routines += cacheinfo
@@ -3625,7 +3688,7 @@
 -ASFLAGS-.oS += -Wa,-mtune=i686
 -endif
 --- glibc-2.14/sysdeps/i386/i686/multiarch/strspn.S
-+++ glibc-2.14-1/sysdeps/i386/i686/multiarch/strspn.S
++++ glibc-2.14-2/sysdeps/i386/i686/multiarch/strspn.S
 @@ -76,8 +76,8 @@ END(strspn)
  # define ENTRY(name) \
  	.type __strspn_ia32, @function; \
@@ -3638,7 +3701,7 @@
  # undef END
  # define END(name) \
 --- glibc-2.14/sysdeps/i386/setjmp.S
-+++ glibc-2.14-1/sysdeps/i386/setjmp.S
++++ glibc-2.14-2/sysdeps/i386/setjmp.S
 @@ -1,5 +1,5 @@
  /* setjmp for i386.
 -   Copyright (C) 1995,1996,1997,2000,2001,2005,2006
@@ -3663,7 +3726,7 @@
  	PTR_MANGLE (%ecx)
  #endif
 --- glibc-2.14/sysdeps/ia64/Makefile
-+++ glibc-2.14-1/sysdeps/ia64/Makefile
++++ glibc-2.14-2/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -3676,7 +3739,7 @@
  endif
  
 --- glibc-2.14/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.14-1/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.14-2/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -4029,7 +4092,7 @@
 -
 -#endif
 --- glibc-2.14/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.14-1/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.14-2/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -4116,7 +4179,7 @@
 +
 +#endif
 --- glibc-2.14/sysdeps/mach/hurd/getrlimit.c
-+++ glibc-2.14-1/sysdeps/mach/hurd/getrlimit.c
++++ glibc-2.14-2/sysdeps/mach/hurd/getrlimit.c
 @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
  
    return 0;
@@ -4124,7 +4187,7 @@
 +libc_hidden_def (__getrlimit)
  weak_alias (__getrlimit, getrlimit)
 --- glibc-2.14/sysdeps/posix/getaddrinfo.c
-+++ glibc-2.14-1/sysdeps/posix/getaddrinfo.c
++++ glibc-2.14-2/sysdeps/posix/getaddrinfo.c
 @@ -1335,10 +1335,12 @@ static const struct scopeentry
      /* Link-local addresses: scope 2.  */
      { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
@@ -4139,7 +4202,7 @@
      { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
    };
 --- glibc-2.14/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.14-1/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.14-2/sysdeps/powerpc/powerpc64/Makefile
 @@ -33,6 +33,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -4149,7 +4212,7 @@
  
  ifeq ($(subdir),elf)
 --- glibc-2.14/sysdeps/powerpc/powerpc64/elf/Makefile
-+++ glibc-2.14-1/sysdeps/powerpc/powerpc64/elf/Makefile
++++ glibc-2.14-2/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)
@@ -4157,7 +4220,7 @@
 +
 +CFLAGS-gmon-start.c = -fno-strict-aliasing
 --- glibc-2.14/sysdeps/unix/nice.c
-+++ glibc-2.14-1/sysdeps/unix/nice.c
++++ glibc-2.14-2/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -4173,7 +4236,7 @@
      {
        if (errno == EACCES)
 --- glibc-2.14/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -4190,7 +4253,7 @@
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
 --- glibc-2.14/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -4234,7 +4297,7 @@
        size_t filelen = strlen (file);
        if (__builtin_expect (filelen == 0, 0))
 --- glibc-2.14/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/getpagesize.c
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/getpagesize.c
 @@ -28,7 +28,7 @@
  int
  __getpagesize ()
@@ -4245,7 +4308,7 @@
    return GLRO(dl_pagesize);
  #else
 --- glibc-2.14/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
++++ glibc-2.14-2/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
@@ -4280,7 +4343,7 @@
  	jmp	*%edx
  END (____longjmp_chk)
 --- glibc-2.14/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.14-2/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.
@@ -4342,7 +4405,7 @@
 +
 +#include_next <dl-cache.h>
 --- glibc-2.14/sysdeps/unix/sysv/linux/i386/getrlimit.c
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/i386/getrlimit.c
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/i386/getrlimit.c
 @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
  }
  
@@ -4350,7 +4413,7 @@
 +libc_hidden_weak (__getrlimit)
  versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
 --- glibc-2.14/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -4384,7 +4447,7 @@
 +
  #include_next <dl-cache.h>
 --- glibc-2.14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
@@ -4392,7 +4455,7 @@
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
 --- glibc-2.14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.14-2/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>
@@ -4400,12 +4463,12 @@
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
 --- glibc-2.14/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.14-2/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/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -4432,7 +4495,7 @@
  struct netlink_res
  {
 --- glibc-2.14/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -4443,7 +4506,7 @@
  
  /* Provide trailing slash, since mostly used for building pathnames. */
 --- glibc-2.14/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -4490,7 +4553,7 @@
  }
  libc_hidden_def (tcsetattr)
 --- glibc-2.14/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
-+++ glibc-2.14-1/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
++++ glibc-2.14-2/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
 @@ -19,6 +19,7 @@
  #include <sysdep.h>
  #include <jmpbuf-offsets.h>
@@ -4518,7 +4581,7 @@
  	jmpq	*%rdx
  END (____longjmp_chk)
 --- glibc-2.14/sysdeps/x86_64/__longjmp.S
-+++ glibc-2.14-1/sysdeps/x86_64/__longjmp.S
++++ glibc-2.14-2/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.
@@ -4549,7 +4612,7 @@
  	jmpq *%rdx
  END (__longjmp)
 --- glibc-2.14/sysdeps/x86_64/setjmp.S
-+++ glibc-2.14-1/sysdeps/x86_64/setjmp.S
++++ glibc-2.14-2/sysdeps/x86_64/setjmp.S
 @@ -1,5 +1,5 @@
  /* setjmp for x86-64.
 -   Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
@@ -4574,7 +4637,7 @@
  	PTR_MANGLE (%rax)
  #endif
 --- glibc-2.14/timezone/zic.c
-+++ glibc-2.14-1/timezone/zic.c
++++ glibc-2.14-2/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 a6e40e3..b8fc8a5 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -27,7 +27,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 1
+Release: 2
 # 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,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Jun  3 2011 Andreas Schwab <schwab at redhat.com> - 2.14-2
+- Revert "Handle DNS server failures in case of AF_UNSPEC lookups
+  correctly" (#710279)
+
 * Tue May 31 2011 Andreas Schwab <schwab at redhat.com> - 2.14-1
 - Update to 2.14 release
   - Handle DNS server failures in case of AF_UNSPEC lookups correctly
diff --git a/sources b/sources
index fb8c90e..a45db89 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-40b3d9996a29cf014c951be6203e0ca9  glibc-2.14-fedora.tar.xz
+13604bf93e96992ee8c14d76f7a04901  glibc-2.14-fedora.tar.xz
 8f5f6b09f98d17c630819b4845e31e65  glibc-2.14.tar.xz
 a300a99da8850731058a6221b5c56368  glibc-ports-2.13-35-g8969f4d.tar.xz

More information about the scm-commits mailing list