From 7585bb6be972fdd81bb50dcca88c013fba7f1372 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@redhat.com>
Date: Fri, 28 Oct 2011 14:48:42 +0200
Subject: [PATCH] 2.14.1-2

---
 .gitignore         |   2 +-
 glibc-fedora.patch | 278 ++++++++++++++++++++++-----------------------
 glibc.spec         |  51 +++++++--
 sources            |   4 +-
 4 files changed, 186 insertions(+), 149 deletions(-)

diff --git a/.gitignore b/.gitignore
index 849e539..70882e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/glibc-ports-2.14-2-g8eafc36.tar.xz
 /glibc-2.14.1-fedora.tar.xz
 /glibc-2.14.1.tar.xz
+/glibc-ports-2.14.1-1-g3eb1dbf.tar.xz
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 6867419..ac1e0a5 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,5 +1,5 @@
 --- glibc-2.14.1/ChangeLog
-+++ glibc-2.14.1-1/ChangeLog
++++ glibc-2.14.1-2/ChangeLog
 @@ -200,6 +200,14 @@
  	* malloc/memusage.sh: Fix quoting in message.
  	* debug/xtrace.sh: Likewise.
@@ -200,7 +200,7 @@
  
  	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
 --- glibc-2.14.1/ChangeLog.15
-+++ glibc-2.14.1-1/ChangeLog.15
++++ glibc-2.14.1-2/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub@redhat.com>
@@ -267,7 +267,7 @@
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
 --- glibc-2.14.1/ChangeLog.16
-+++ glibc-2.14.1-1/ChangeLog.16
++++ glibc-2.14.1-2/ChangeLog.16
 @@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
@@ -291,7 +291,7 @@
  
  	* libio/genops.c: Include <stdbool.h>.
 --- glibc-2.14.1/ChangeLog.17
-+++ glibc-2.14.1-1/ChangeLog.17
++++ glibc-2.14.1-2/ChangeLog.17
 @@ -256,6 +256,12 @@
  
  	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
@@ -371,7 +371,7 @@
  
  	[BZ #3632]
 --- glibc-2.14.1/Makeconfig
-+++ glibc-2.14.1-1/Makeconfig
++++ glibc-2.14.1-2/Makeconfig
 @@ -791,12 +791,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -389,7 +389,7 @@
  ifndef BUILD_CC
  BUILD_CC = $(CC)
 --- glibc-2.14.1/NEWS
-+++ glibc-2.14.1-1/NEWS
++++ glibc-2.14.1-2/NEWS
 @@ -27,16 +27,6 @@ Version 2.14
    12724, 12734, 12738, 12746, 12766, 12775, 12777, 12782, 12788, 12792,
    12795, 12811, 12813, 12814, 12841
@@ -408,7 +408,7 @@
    syncfs, setns, sendmmsg
  
 --- glibc-2.14.1/config.h.in
-+++ glibc-2.14.1-1/config.h.in
++++ glibc-2.14.1-2/config.h.in
 @@ -204,6 +204,9 @@
  /* Define if `.ctors' and `.dtors' sections shouldn't be used.  */
  #undef	NO_CTORS_DTORS_SECTIONS
@@ -420,7 +420,7 @@
   */
  
 --- glibc-2.14.1/configure
-+++ glibc-2.14.1-1/configure
++++ glibc-2.14.1-2/configure
 @@ -784,6 +784,7 @@ enable_all_warnings
  enable_multi_arch
  enable_experimental_malloc
@@ -490,7 +490,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.1/configure.in
-+++ glibc-2.14.1-1/configure.in
++++ glibc-2.14.1-2/configure.in
 @@ -316,6 +316,29 @@ else
  fi
  AC_SUBST(libc_cv_nss_crypt)
@@ -522,7 +522,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.1/csu/Makefile
-+++ glibc-2.14.1-1/csu/Makefile
++++ glibc-2.14.1-2/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -534,7 +534,7 @@
  vpath initfini.c $(sysdirs)
  
 --- glibc-2.14.1/csu/elf-init.c
-+++ glibc-2.14.1-1/csu/elf-init.c
++++ glibc-2.14.1-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;
@@ -560,7 +560,7 @@
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
 --- glibc-2.14.1/debug/tst-chk1.c
-+++ glibc-2.14.1-1/debug/tst-chk1.c
++++ glibc-2.14.1-2/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -590,7 +590,7 @@
  # else
  #  define O 1
 --- glibc-2.14.1/elf/Makefile
-+++ glibc-2.14.1-1/elf/Makefile
++++ glibc-2.14.1-2/elf/Makefile
 @@ -135,6 +135,7 @@ include ../Makeconfig
  ifeq ($(unwind-find-fde),yes)
  routines += unwind-dw2-fde-glibc
@@ -610,7 +610,7 @@
  test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(strip $(modules-names))))
  generated += $(addsuffix .so,$(strip $(modules-names)))
 --- glibc-2.14.1/elf/dl-close.c
-+++ glibc-2.14.1-1/elf/dl-close.c
++++ glibc-2.14.1-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)
@@ -632,7 +632,7 @@
        /* There are still references to this object.  Do nothing more.  */
        if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
 --- glibc-2.14.1/elf/dl-deps.c
-+++ glibc-2.14.1-1/elf/dl-deps.c
++++ glibc-2.14.1-2/elf/dl-deps.c
 @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
  		  nneeded * sizeof needed[0]);
  	  atomic_write_barrier ();
@@ -659,7 +659,7 @@
    if (errno_reason)
      _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
 --- glibc-2.14.1/elf/dl-init.c
-+++ glibc-2.14.1-1/elf/dl-init.c
++++ glibc-2.14.1-2/elf/dl-init.c
 @@ -24,11 +24,9 @@
  /* Type of the initializer.  */
  typedef void (*init_t) (int, char **, char **);
@@ -683,7 +683,7 @@
  }
  INTDEF (_dl_init)
 --- glibc-2.14.1/elf/dl-libc.c
-+++ glibc-2.14.1-1/elf/dl-libc.c
++++ glibc-2.14.1-2/elf/dl-libc.c
 @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
  
    for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
@@ -711,7 +711,7 @@
  
        if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
 --- glibc-2.14.1/elf/dl-load.c
-+++ glibc-2.14.1-1/elf/dl-load.c
++++ glibc-2.14.1-2/elf/dl-load.c
 @@ -250,8 +250,7 @@ is_trusted_path_normalize (const char *path, size_t len)
  
  
@@ -792,7 +792,7 @@
  	  else
  	    /* No DST we recognize.  */
 --- glibc-2.14.1/elf/dl-support.c
-+++ glibc-2.14.1-1/elf/dl-support.c
++++ glibc-2.14.1-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;
@@ -805,7 +805,7 @@
  /* Random data provided by the kernel.  */
  void *_dl_random;
 --- glibc-2.14.1/elf/ldconfig.c
-+++ glibc-2.14.1-1/elf/ldconfig.c
++++ glibc-2.14.1-2/elf/ldconfig.c
 @@ -1034,17 +1034,19 @@ search_dirs (void)
  
  
@@ -888,7 +888,7 @@
  
    const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
 --- glibc-2.14.1/elf/ldd.bash.in
-+++ glibc-2.14.1-1/elf/ldd.bash.in
++++ glibc-2.14.1-2/elf/ldd.bash.in
 @@ -167,18 +167,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
        fi
      done
@@ -918,7 +918,7 @@
        ;;
      *)
 --- glibc-2.14.1/elf/rtld-Rules
-+++ glibc-2.14.1-1/elf/rtld-Rules
++++ glibc-2.14.1-2/elf/rtld-Rules
 @@ -1,7 +1,7 @@
  # Subroutine makefile for compiling libc modules linked into dynamic linker.
  
@@ -937,7 +937,7 @@
  
  endif
 --- glibc-2.14.1/elf/rtld.c
-+++ glibc-2.14.1-1/elf/rtld.c
++++ glibc-2.14.1-2/elf/rtld.c
 @@ -107,7 +107,6 @@ static struct audit_list
    struct audit_list *next;
  } *audit_list;
@@ -982,7 +982,7 @@
      {
        /* There was an explicit ref to the dynamic linker as a shared lib.
 --- glibc-2.14.1/extra-lib.mk
-+++ glibc-2.14.1-1/extra-lib.mk
++++ glibc-2.14.1-2/extra-lib.mk
 @@ -101,4 +101,4 @@ ifneq (,$(cpp-srcs-left))
  include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
  endif
@@ -990,15 +990,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.1/include/bits/stdlib-ldbl.h
-+++ glibc-2.14.1-1/include/bits/stdlib-ldbl.h
++++ glibc-2.14.1-2/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
 --- glibc-2.14.1/include/bits/wchar-ldbl.h
-+++ glibc-2.14.1-1/include/bits/wchar-ldbl.h
++++ glibc-2.14.1-2/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
 --- glibc-2.14.1/include/features.h
-+++ glibc-2.14.1-1/include/features.h
++++ glibc-2.14.1-2/include/features.h
 @@ -310,8 +310,13 @@
  #endif
  
@@ -1016,7 +1016,7 @@
  # else
  #  define __USE_FORTIFY_LEVEL 1
 --- glibc-2.14.1/include/libc-symbols.h
-+++ glibc-2.14.1-1/include/libc-symbols.h
++++ glibc-2.14.1-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)
@@ -1027,7 +1027,7 @@
  # define libc_hidden_data_def(name) hidden_data_def (name)
  # define libc_hidden_data_weak(name) hidden_data_weak (name)
 --- glibc-2.14.1/include/link.h
-+++ glibc-2.14.1-1/include/link.h
++++ glibc-2.14.1-2/include/link.h
 @@ -1,6 +1,6 @@
  /* Data structure for communication from the run-time dynamic linker for
     loaded ELF shared objects.
@@ -1057,7 +1057,7 @@
      /* List of the dependencies introduced through symbol binding.  */
      struct link_map_reldeps
 --- glibc-2.14.1/include/stap-probe.h
-+++ glibc-2.14.1-1/include/stap-probe.h
++++ glibc-2.14.1-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.
@@ -1200,7 +1200,7 @@
 +
 +#endif	/* stap-probe.h */
 --- glibc-2.14.1/include/sys/resource.h
-+++ glibc-2.14.1-1/include/sys/resource.h
++++ glibc-2.14.1-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,
@@ -1208,7 +1208,7 @@
 +libc_hidden_proto (__getrlimit)
  #endif
 --- glibc-2.14.1/inet/Makefile
-+++ glibc-2.14.1-1/inet/Makefile
++++ glibc-2.14.1-2/inet/Makefile
 @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
  
  include ../Rules
@@ -1219,7 +1219,7 @@
  
  CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
 --- glibc-2.14.1/intl/locale.alias
-+++ glibc-2.14.1-1/intl/locale.alias
++++ glibc-2.14.1-2/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -1230,7 +1230,7 @@
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
 --- glibc-2.14.1/libio/stdio.h
-+++ glibc-2.14.1-1/libio/stdio.h
++++ glibc-2.14.1-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.  */
@@ -1245,7 +1245,7 @@
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
 --- glibc-2.14.1/locale/iso-4217.def
-+++ glibc-2.14.1-1/locale/iso-4217.def
++++ glibc-2.14.1-2/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -1338,7 +1338,7 @@
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
 --- glibc-2.14.1/locale/programs/locarchive.c
-+++ glibc-2.14.1-1/locale/programs/locarchive.c
++++ glibc-2.14.1-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;
@@ -1398,7 +1398,7 @@
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
 --- glibc-2.14.1/localedata/ChangeLog
-+++ glibc-2.14.1-1/localedata/ChangeLog
++++ glibc-2.14.1-2/localedata/ChangeLog
 @@ -1,3 +1,11 @@
 +2011-06-28  Andreas Schwab  <schwab@redhat.com>
 +
@@ -1412,7 +1412,7 @@
  
  	[BZ #12788]
 --- glibc-2.14.1/localedata/Makefile
-+++ glibc-2.14.1-1/localedata/Makefile
++++ glibc-2.14.1-2/localedata/Makefile
 @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -1422,7 +1422,7 @@
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
 --- glibc-2.14.1/localedata/SUPPORTED
-+++ glibc-2.14.1-1/localedata/SUPPORTED
++++ glibc-2.14.1-2/localedata/SUPPORTED
 @@ -86,6 +86,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -1465,7 +1465,7 @@
  sw_TZ/UTF-8 \
  ta_IN/UTF-8 \
 --- glibc-2.14.1/localedata/locales/cy_GB
-+++ glibc-2.14.1-1/localedata/locales/cy_GB
++++ glibc-2.14.1-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>"
@@ -1481,7 +1481,7 @@
  
  LC_MESSAGES
 --- glibc-2.14.1/localedata/locales/en_GB
-+++ glibc-2.14.1-1/localedata/locales/en_GB
++++ glibc-2.14.1-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>"
@@ -1494,7 +1494,7 @@
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
 --- glibc-2.14.1/localedata/locales/no_NO
-+++ glibc-2.14.1-1/localedata/locales/no_NO
++++ glibc-2.14.1-2/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -1566,7 +1566,7 @@
 +copy "nb_NO"
 +END LC_ADDRESS
 --- glibc-2.14.1/localedata/locales/zh_TW
-+++ glibc-2.14.1-1/localedata/locales/zh_TW
++++ glibc-2.14.1-2/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -1595,7 +1595,7 @@
  date       "2000-08-02"
  %
 --- glibc-2.14.1/login/programs/pt_chown.c
-+++ glibc-2.14.1-1/login/programs/pt_chown.c
++++ glibc-2.14.1-2/login/programs/pt_chown.c
 @@ -29,6 +29,7 @@
  #include <string.h>
  #include <sys/stat.h>
@@ -1638,7 +1638,7 @@
    return EXIT_SUCCESS;
  }
 --- glibc-2.14.1/malloc/mcheck.c
-+++ glibc-2.14.1-1/malloc/mcheck.c
++++ glibc-2.14.1-2/malloc/mcheck.c
 @@ -25,10 +25,26 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1716,7 +1716,7 @@
        old_free_hook = __free_hook;
        __free_hook = freehook;
 --- glibc-2.14.1/manual/libc.texinfo
-+++ glibc-2.14.1-1/manual/libc.texinfo
++++ glibc-2.14.1-2/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -1727,7 +1727,7 @@
  * Libc: (libc).                 C library.
  @end direntry
 --- glibc-2.14.1/misc/sys/cdefs.h
-+++ glibc-2.14.1-1/misc/sys/cdefs.h
++++ glibc-2.14.1-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)
@@ -1772,7 +1772,7 @@
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
 --- glibc-2.14.1/nis/Makefile
-+++ glibc-2.14.1-1/nis/Makefile
++++ glibc-2.14.1-2/nis/Makefile
 @@ -23,9 +23,9 @@ subdir	:= nis
  
  aux			:= nis_hash
@@ -1795,7 +1795,7 @@
  $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
  $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
 --- glibc-2.14.1/nis/nss
-+++ glibc-2.14.1-1/nis/nss
++++ glibc-2.14.1-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
@@ -1806,7 +1806,7 @@
  # ADJUNCT_AS_SHADOW
  #  If set to TRUE, the passwd routines in the NIS NSS module will not
 --- glibc-2.14.1/nptl/ChangeLog
-+++ glibc-2.14.1-1/nptl/ChangeLog
++++ glibc-2.14.1-2/nptl/ChangeLog
 @@ -45,6 +45,51 @@
  	clearing memory.
  	Patch partly by Robert Rex <robert.rex@exasol.com>.
@@ -1884,7 +1884,7 @@
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
 --- glibc-2.14.1/nptl/DESIGN-systemtap-probes.txt
-+++ glibc-2.14.1-1/nptl/DESIGN-systemtap-probes.txt
++++ glibc-2.14.1-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.
@@ -1976,7 +1976,7 @@
 +cond_broadcast - probe for pthread_cond_broadcast
 +               arg1 = condition
 --- glibc-2.14.1/nptl/Makefile
-+++ glibc-2.14.1-1/nptl/Makefile
++++ glibc-2.14.1-2/nptl/Makefile
 @@ -342,7 +342,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -2010,7 +2010,7 @@
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
 --- glibc-2.14.1/nptl/Versions
-+++ glibc-2.14.1-1/nptl/Versions
++++ glibc-2.14.1-2/nptl/Versions
 @@ -30,6 +30,7 @@ libc {
      __libc_alloca_cutoff;
      # Internal libc interface to libpthread
@@ -2020,7 +2020,7 @@
  }
  
 --- glibc-2.14.1/nptl/nptl-init.c
-+++ glibc-2.14.1-1/nptl/nptl-init.c
++++ glibc-2.14.1-2/nptl/nptl-init.c
 @@ -415,7 +415,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.  */
@@ -2031,7 +2031,7 @@
      /* The system limit is not usable.  Use an architecture-specific
         default.  */
 --- glibc-2.14.1/nptl/pthread_cond_broadcast.c
-+++ glibc-2.14.1-1/nptl/pthread_cond_broadcast.c
++++ glibc-2.14.1-2/nptl/pthread_cond_broadcast.c
 @@ -23,6 +23,7 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2050,7 +2050,7 @@
  		? LLL_SHARED : LLL_PRIVATE;
    /* Make sure we are alone.  */
 --- glibc-2.14.1/nptl/pthread_cond_destroy.c
-+++ glibc-2.14.1-1/nptl/pthread_cond_destroy.c
++++ glibc-2.14.1-2/nptl/pthread_cond_destroy.c
 @@ -20,6 +20,7 @@
  #include <errno.h>
  #include <shlib-compat.h>
@@ -2069,7 +2069,7 @@
    lll_lock (cond->__data.__lock, pshared);
  
 --- glibc-2.14.1/nptl/pthread_cond_init.c
-+++ glibc-2.14.1-1/nptl/pthread_cond_init.c
++++ glibc-2.14.1-2/nptl/pthread_cond_init.c
 @@ -20,6 +20,7 @@
  
  #include <shlib-compat.h>
@@ -2088,7 +2088,7 @@
  }
  versioned_symbol (libpthread, __pthread_cond_init,
 --- glibc-2.14.1/nptl/pthread_cond_signal.c
-+++ glibc-2.14.1-1/nptl/pthread_cond_signal.c
++++ glibc-2.14.1-2/nptl/pthread_cond_signal.c
 @@ -26,6 +26,7 @@
  
  #include <shlib-compat.h>
@@ -2107,7 +2107,7 @@
    lll_lock (cond->__data.__lock, pshared);
  
 --- glibc-2.14.1/nptl/pthread_cond_wait.c
-+++ glibc-2.14.1-1/nptl/pthread_cond_wait.c
++++ glibc-2.14.1-2/nptl/pthread_cond_wait.c
 @@ -25,6 +25,7 @@
  #include <pthreadP.h>
  
@@ -2126,7 +2126,7 @@
    lll_lock (cond->__data.__lock, pshared);
  
 --- glibc-2.14.1/nptl/pthread_create.c
-+++ glibc-2.14.1-1/nptl/pthread_create.c
++++ glibc-2.14.1-2/nptl/pthread_create.c
 @@ -31,6 +31,8 @@
  
  #include <shlib-compat.h>
@@ -2155,7 +2155,7 @@
    return create_thread (pd, iattr, STACK_VARIABLES_ARGS);
  }
 --- glibc-2.14.1/nptl/pthread_join.c
-+++ glibc-2.14.1-1/nptl/pthread_join.c
++++ glibc-2.14.1-2/nptl/pthread_join.c
 @@ -23,6 +23,8 @@
  #include <atomic.h>
  #include "pthreadP.h"
@@ -2183,7 +2183,7 @@
    return result;
  }
 --- glibc-2.14.1/nptl/pthread_mutex_destroy.c
-+++ glibc-2.14.1-1/nptl/pthread_mutex_destroy.c
++++ glibc-2.14.1-2/nptl/pthread_mutex_destroy.c
 @@ -20,11 +20,15 @@
  #include <errno.h>
  #include "pthreadP.h"
@@ -2201,7 +2201,7 @@
        && mutex->__data.__nusers != 0)
      return EBUSY;
 --- glibc-2.14.1/nptl/pthread_mutex_init.c
-+++ glibc-2.14.1-1/nptl/pthread_mutex_init.c
++++ glibc-2.14.1-2/nptl/pthread_mutex_init.c
 @@ -24,6 +24,8 @@
  #include <kernel-features.h>
  #include "pthreadP.h"
@@ -2221,7 +2221,7 @@
  }
  strong_alias (__pthread_mutex_init, pthread_mutex_init)
 --- glibc-2.14.1/nptl/pthread_mutex_lock.c
-+++ glibc-2.14.1-1/nptl/pthread_mutex_lock.c
++++ glibc-2.14.1-2/nptl/pthread_mutex_lock.c
 @@ -24,6 +24,7 @@
  #include <not-cancel.h>
  #include "pthreadP.h"
@@ -2259,7 +2259,7 @@
  }
  #ifndef __pthread_mutex_lock
 --- glibc-2.14.1/nptl/pthread_mutex_timedlock.c
-+++ glibc-2.14.1-1/nptl/pthread_mutex_timedlock.c
++++ glibc-2.14.1-2/nptl/pthread_mutex_timedlock.c
 @@ -24,6 +24,8 @@
  #include <lowlevellock.h>
  #include <not-cancel.h>
@@ -2315,7 +2315,7 @@
  
   out:
 --- glibc-2.14.1/nptl/pthread_mutex_unlock.c
-+++ glibc-2.14.1-1/nptl/pthread_mutex_unlock.c
++++ glibc-2.14.1-2/nptl/pthread_mutex_unlock.c
 @@ -22,6 +22,7 @@
  #include <stdlib.h>
  #include "pthreadP.h"
@@ -2353,7 +2353,7 @@
  }
  
 --- glibc-2.14.1/nptl/pthread_rwlock_destroy.c
-+++ glibc-2.14.1-1/nptl/pthread_rwlock_destroy.c
++++ glibc-2.14.1-2/nptl/pthread_rwlock_destroy.c
 @@ -18,12 +18,15 @@
     02111-1307 USA.  */
  
@@ -2371,7 +2371,7 @@
    return 0;
  }
 --- glibc-2.14.1/nptl/pthread_rwlock_rdlock.c
-+++ glibc-2.14.1-1/nptl/pthread_rwlock_rdlock.c
++++ glibc-2.14.1-2/nptl/pthread_rwlock_rdlock.c
 @@ -22,6 +22,7 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2399,7 +2399,7 @@
  	  break;
  	}
 --- glibc-2.14.1/nptl/pthread_rwlock_unlock.c
-+++ glibc-2.14.1-1/nptl/pthread_rwlock_unlock.c
++++ glibc-2.14.1-2/nptl/pthread_rwlock_unlock.c
 @@ -22,11 +22,14 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2416,7 +2416,7 @@
    if (rwlock->__data.__writer)
      rwlock->__data.__writer = 0;
 --- glibc-2.14.1/nptl/pthread_rwlock_wrlock.c
-+++ glibc-2.14.1-1/nptl/pthread_rwlock_wrlock.c
++++ glibc-2.14.1-2/nptl/pthread_rwlock_wrlock.c
 @@ -22,6 +22,7 @@
  #include <lowlevellock.h>
  #include <pthread.h>
@@ -2444,7 +2444,7 @@
  	}
  
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.14.1-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
@@ -2454,7 +2454,7 @@
 +
  #endif /* bits/posix_opt.h */
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/Versions
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/Versions
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/Versions
 @@ -0,0 +1,6 @@
 +libc {
 +  GLIBC_PRIVATE {
@@ -2463,7 +2463,7 @@
 +  }
 +}
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
 @@ -22,6 +22,8 @@
  #include <kernel-features.h>
  #include <lowlevellock.h>
@@ -2484,7 +2484,7 @@
  
  2:	movl	%edx, %eax
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S
++++ glibc-2.14.1-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>
@@ -2503,7 +2503,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_signal.S
++++ glibc-2.14.1-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>
@@ -2523,7 +2523,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
++++ glibc-2.14.1-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>
@@ -2543,7 +2543,7 @@
  	movl	$EINVAL, %eax
  	jae	18f
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
++++ glibc-2.14.1-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>
@@ -2562,7 +2562,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_rdlock.S
 @@ -23,6 +23,7 @@
  #include <pthread-errnos.h>
  #include <kernel-features.h>
@@ -2581,7 +2581,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_rwlock_wrlock.S
 @@ -23,6 +23,7 @@
  #include <pthread-errnos.h>
  #include <kernel-features.h>
@@ -2600,7 +2600,7 @@
  	movl	$1, %edx
  	xorl	%eax, %eax
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
 @@ -20,6 +20,8 @@
  #ifndef _LOWLEVELLOCK_H
  #define _LOWLEVELLOCK_H	1
@@ -2619,7 +2619,7 @@
  		      LLL_ENTER_KERNEL					      \
  		      LLL_EBX_LOAD					      \
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/i386/smp.h
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/i386/smp.h
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/i386/smp.h
 @@ -37,7 +37,7 @@ is_smp_system (void)
    char *cp;
  
@@ -2630,7 +2630,7 @@
    else
      {
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -2639,7 +2639,7 @@
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S
 @@ -22,6 +22,8 @@
  #include <kernel-features.h>
  #include <lowlevellock.h>
@@ -2670,7 +2670,7 @@
  
  2:	movl	%edx, %eax
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h
 @@ -20,6 +20,8 @@
  #ifndef _LOWLEVELLOCK_H
  #define _LOWLEVELLOCK_H	1
@@ -2689,7 +2689,7 @@
  		      : "=a" (__ignore)					      \
  		      : "0" (SYS_futex), "D" (futex),			      \
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S
++++ glibc-2.14.1-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>
@@ -2709,7 +2709,7 @@
  	movl	$1, %esi
  	xorl	%eax, %eax
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S
++++ glibc-2.14.1-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>
@@ -2728,7 +2728,7 @@
  	movq	%rdi, %r8
  	movl	$1, %esi
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S
 @@ -23,6 +23,7 @@
  #include <lowlevelcond.h>
  #include <pthread-pi-defines.h>
@@ -2747,7 +2747,7 @@
  	movl	$EINVAL, %eax
  	jae	48f
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
 @@ -23,6 +23,7 @@
  #include <lowlevelcond.h>
  #include <tcb-offsets.h>
@@ -2766,7 +2766,7 @@
  
  		/* Prepare structure passed to cancellation handler.  */
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_rdlock.S
 @@ -22,7 +22,7 @@
  #include <lowlevelrwlock.h>
  #include <pthread-errnos.h>
@@ -2787,7 +2787,7 @@
  
  	/* Get the lock.  */
 --- glibc-2.14.1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
-+++ glibc-2.14.1-1/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
++++ glibc-2.14.1-2/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_wrlock.S
 @@ -22,7 +22,7 @@
  #include <lowlevelrwlock.h>
  #include <pthread-errnos.h>
@@ -2808,7 +2808,7 @@
  
  	/* Get the lock.  */
 --- glibc-2.14.1/nscd/nscd.conf
-+++ glibc-2.14.1-1/nscd/nscd.conf
++++ glibc-2.14.1-2/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -2819,7 +2819,7 @@
  	debug-level		0
  #	reload-count		5
 --- glibc-2.14.1/nscd/nscd.init
-+++ glibc-2.14.1-1/nscd/nscd.init
++++ glibc-2.14.1-2/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -2897,7 +2897,7 @@
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
 --- glibc-2.14.1/nss/Makefile
-+++ glibc-2.14.1-1/nss/Makefile
++++ glibc-2.14.1-2/nss/Makefile
 @@ -75,6 +75,7 @@ endif
  
  include ../Rules
@@ -2907,7 +2907,7 @@
  ifeq (yes,$(build-static-nss))
  $(objpfx)getent: $(objpfx)libnss_files.a
 --- glibc-2.14.1/nss/nss_files/files-XXX.c
-+++ glibc-2.14.1-1/nss/nss_files/files-XXX.c
++++ glibc-2.14.1-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
@@ -2925,7 +2925,7 @@
  
    if (buflen < sizeof *data + 2)
 --- glibc-2.14.1/posix/Makefile
-+++ glibc-2.14.1-1/posix/Makefile
++++ glibc-2.14.1-2/posix/Makefile
 @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -2947,7 +2947,7 @@
 +	  > $@.new
  	mv -f $@.new $@
 --- glibc-2.14.1/posix/gai.conf
-+++ glibc-2.14.1-1/posix/gai.conf
++++ glibc-2.14.1-2/posix/gai.conf
 @@ -41,7 +41,7 @@
  #
  # precedence  <mask>   <value>
@@ -2973,7 +2973,7 @@
 +#
 +#    This is what the Red Hat setting currently uses.
 --- glibc-2.14.1/posix/getconf.speclist.h
-+++ glibc-2.14.1-1/posix/getconf.speclist.h
++++ glibc-2.14.1-2/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -3015,7 +3015,7 @@
 +#endif
 +"";
 --- glibc-2.14.1/posix/regcomp.c
-+++ glibc-2.14.1-1/posix/regcomp.c
++++ glibc-2.14.1-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.
@@ -3148,7 +3148,7 @@
  	      /* No valid character, treat it as a normal
  		 character.  */
 --- glibc-2.14.1/resolv/Makefile
-+++ glibc-2.14.1-1/resolv/Makefile
++++ glibc-2.14.1-2/resolv/Makefile
 @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
  	    -Dgetnetbyaddr=res_getnetbyaddr
  
@@ -3158,7 +3158,7 @@
  # The BIND code elicits some harmless warnings.
  +cflags += -Wno-strict-prototypes -Wno-write-strings
 --- glibc-2.14.1/resource/getrlimit.c
-+++ glibc-2.14.1-1/resource/getrlimit.c
++++ glibc-2.14.1-2/resource/getrlimit.c
 @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
    __set_errno (ENOSYS);
    return -1;
@@ -3168,7 +3168,7 @@
  
  stub_warning (getrlimit)
 --- glibc-2.14.1/scripts/check-local-headers.sh
-+++ glibc-2.14.1-1/scripts/check-local-headers.sh
++++ glibc-2.14.1-2/scripts/check-local-headers.sh
 @@ -31,6 +31,8 @@ fgrep -v "$includedir/asm" |
  fgrep -v "$includedir/linux" |
  fgrep -v "$includedir/selinux" |
@@ -3179,7 +3179,7 @@
  fgrep -v "$includedir/nss3"; then
    # If we found a match something is wrong.
 --- glibc-2.14.1/stdio-common/vfprintf.c
-+++ glibc-2.14.1-1/stdio-common/vfprintf.c
++++ glibc-2.14.1-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'))				      \
  	  {								      \
@@ -3226,7 +3226,7 @@
  	      len = strlen (string);					      \
  	  }								      \
 --- glibc-2.14.1/streams/Makefile
-+++ glibc-2.14.1-1/streams/Makefile
++++ glibc-2.14.1-2/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -3237,7 +3237,7 @@
  
  include ../Rules
 --- glibc-2.14.1/sunrpc/Makefile
-+++ glibc-2.14.1-1/sunrpc/Makefile
++++ glibc-2.14.1-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) \
@@ -3259,7 +3259,7 @@
  $(objpfx)tst-xdrmem: $(common-objpfx)linkobj/libc.so
  $(objpfx)tst-xdrmem2: $(common-objpfx)linkobj/libc.so
 --- glibc-2.14.1/sysdeps/generic/dl-cache.h
-+++ glibc-2.14.1-1/sysdeps/generic/dl-cache.h
++++ glibc-2.14.1-2/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -3276,7 +3276,7 @@
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
 --- glibc-2.14.1/sysdeps/i386/Makefile
-+++ glibc-2.14.1-1/sysdeps/i386/Makefile
++++ glibc-2.14.1-2/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -3302,7 +3302,7 @@
  
  ifeq ($(subdir),elf)
 --- glibc-2.14.1/sysdeps/i386/__longjmp.S
-+++ glibc-2.14.1-1/sysdeps/i386/__longjmp.S
++++ glibc-2.14.1-2/sysdeps/i386/__longjmp.S
 @@ -1,5 +1,5 @@
  /* longjmp for i386.
 -   Copyright (C) 1995-1998,2000,2002,2005,2006,2009
@@ -3350,7 +3350,7 @@
  	/* Jump to saved PC.  */
       	jmp *%edx
 --- glibc-2.14.1/sysdeps/i386/bsd-_setjmp.S
-+++ glibc-2.14.1-1/sysdeps/i386/bsd-_setjmp.S
++++ glibc-2.14.1-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.
@@ -3376,7 +3376,7 @@
  	PTR_MANGLE (%ecx)
  #endif
 --- glibc-2.14.1/sysdeps/i386/bsd-setjmp.S
-+++ glibc-2.14.1-1/sysdeps/i386/bsd-setjmp.S
++++ glibc-2.14.1-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.
@@ -3402,7 +3402,7 @@
  	PTR_MANGLE (%ecx)
  #endif
 --- glibc-2.14.1/sysdeps/i386/i686/Makefile
-+++ glibc-2.14.1-1/sysdeps/i386/i686/Makefile
++++ glibc-2.14.1-2/sysdeps/i386/i686/Makefile
 @@ -9,19 +9,3 @@ stack-align-test-flags += -msse
  ifeq ($(subdir),string)
  sysdep_routines += cacheinfo
@@ -3424,7 +3424,7 @@
 -ASFLAGS-.oS += -Wa,-mtune=i686
 -endif
 --- glibc-2.14.1/sysdeps/i386/setjmp.S
-+++ glibc-2.14.1-1/sysdeps/i386/setjmp.S
++++ glibc-2.14.1-2/sysdeps/i386/setjmp.S
 @@ -1,5 +1,5 @@
  /* setjmp for i386.
 -   Copyright (C) 1995,1996,1997,2000,2001,2005,2006
@@ -3449,7 +3449,7 @@
  	PTR_MANGLE (%ecx)
  #endif
 --- glibc-2.14.1/sysdeps/ia64/Makefile
-+++ glibc-2.14.1-1/sysdeps/ia64/Makefile
++++ glibc-2.14.1-2/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -3462,7 +3462,7 @@
  endif
  
 --- glibc-2.14.1/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.14.1-1/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.14.1-2/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -3815,7 +3815,7 @@
 -
 -#endif
 --- glibc-2.14.1/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.14.1-1/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.14.1-2/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -3902,7 +3902,7 @@
 +
 +#endif
 --- glibc-2.14.1/sysdeps/mach/hurd/getrlimit.c
-+++ glibc-2.14.1-1/sysdeps/mach/hurd/getrlimit.c
++++ glibc-2.14.1-2/sysdeps/mach/hurd/getrlimit.c
 @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
  
    return 0;
@@ -3910,7 +3910,7 @@
 +libc_hidden_def (__getrlimit)
  weak_alias (__getrlimit, getrlimit)
 --- glibc-2.14.1/sysdeps/posix/getaddrinfo.c
-+++ glibc-2.14.1-1/sysdeps/posix/getaddrinfo.c
++++ glibc-2.14.1-2/sysdeps/posix/getaddrinfo.c
 @@ -565,8 +565,8 @@ gaih_inet (const char *name, const struct gaih_service *service,
  
  	  /* If we do not have to look for IPv6 addresses, use
@@ -4036,7 +4036,7 @@
      { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
    };
 --- glibc-2.14.1/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.14.1-1/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.14.1-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
@@ -4046,7 +4046,7 @@
  
  ifeq ($(subdir),elf)
 --- glibc-2.14.1/sysdeps/powerpc/powerpc64/elf/Makefile
-+++ glibc-2.14.1-1/sysdeps/powerpc/powerpc64/elf/Makefile
++++ glibc-2.14.1-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)
@@ -4054,7 +4054,7 @@
 +
 +CFLAGS-gmon-start.c = -fno-strict-aliasing
 --- glibc-2.14.1/sysdeps/s390/s390-64/utf16-utf32-z9.c
-+++ glibc-2.14.1-1/sysdeps/s390/s390-64/utf16-utf32-z9.c
++++ glibc-2.14.1-2/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;							\
@@ -4068,7 +4068,7 @@
  		  "   ipm    %2        \n"			        \
  		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
 --- glibc-2.14.1/sysdeps/s390/s390-64/utf8-utf16-z9.c
-+++ glibc-2.14.1-1/sysdeps/s390/s390-64/utf8-utf16-z9.c
++++ glibc-2.14.1-2/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;							\
@@ -4082,7 +4082,7 @@
  		  "   ipm    %2        \n"			        \
  		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
 --- glibc-2.14.1/sysdeps/s390/s390-64/utf8-utf32-z9.c
-+++ glibc-2.14.1-1/sysdeps/s390/s390-64/utf8-utf32-z9.c
++++ glibc-2.14.1-2/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;							\
@@ -4096,7 +4096,7 @@
  		  "   ipm    %2        \n"				\
  		  : "+a" (pOutput), "+a" (pInput), "+d" (cc),		\
 --- glibc-2.14.1/sysdeps/unix/nice.c
-+++ glibc-2.14.1-1/sysdeps/unix/nice.c
++++ glibc-2.14.1-2/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -4112,7 +4112,7 @@
      {
        if (errno == EACCES)
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -4129,7 +4129,7 @@
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -4173,7 +4173,7 @@
        size_t filelen = strlen (file);
        if (__builtin_expect (filelen == 0, 0))
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/getpagesize.c
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/getpagesize.c
 @@ -28,7 +28,7 @@
  int
  __getpagesize ()
@@ -4184,7 +4184,7 @@
    return GLRO(dl_pagesize);
  #else
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/i386/____longjmp_chk.S
++++ glibc-2.14.1-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
@@ -4219,7 +4219,7 @@
  	jmp	*%edx
  END (____longjmp_chk)
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.14.1-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.
@@ -4281,7 +4281,7 @@
 +
 +#include_next <dl-cache.h>
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/i386/getrlimit.c
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/i386/getrlimit.c
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/i386/getrlimit.c
 @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
  }
  
@@ -4289,7 +4289,7 @@
 +libc_hidden_weak (__getrlimit)
  versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -4323,7 +4323,7 @@
 +
  #include_next <dl-cache.h>
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
@@ -4331,7 +4331,7 @@
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.14.1-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>
@@ -4339,12 +4339,12 @@
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.14.1-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.1/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -4371,7 +4371,7 @@
  struct netlink_res
  {
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -4382,7 +4382,7 @@
  
  /* Provide trailing slash, since mostly used for building pathnames. */
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -4429,7 +4429,7 @@
  }
  libc_hidden_def (tcsetattr)
 --- glibc-2.14.1/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
-+++ glibc-2.14.1-1/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
++++ glibc-2.14.1-2/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
 @@ -19,6 +19,7 @@
  #include <sysdep.h>
  #include <jmpbuf-offsets.h>
@@ -4457,7 +4457,7 @@
  	jmpq	*%rdx
  END (____longjmp_chk)
 --- glibc-2.14.1/sysdeps/x86_64/__longjmp.S
-+++ glibc-2.14.1-1/sysdeps/x86_64/__longjmp.S
++++ glibc-2.14.1-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.
@@ -4488,7 +4488,7 @@
  	jmpq *%rdx
  END (__longjmp)
 --- glibc-2.14.1/sysdeps/x86_64/setjmp.S
-+++ glibc-2.14.1-1/sysdeps/x86_64/setjmp.S
++++ glibc-2.14.1-2/sysdeps/x86_64/setjmp.S
 @@ -1,5 +1,5 @@
  /* setjmp for x86-64.
 -   Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc.
@@ -4513,7 +4513,7 @@
  	PTR_MANGLE (%rax)
  #endif
 --- glibc-2.14.1/timezone/zic.c
-+++ glibc-2.14.1-1/timezone/zic.c
++++ glibc-2.14.1-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 c891946..7c35f87 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
 %define glibcsrcdir glibc-2.14.1
 %define glibcversion 2.14.1
-%define glibcportsdir glibc-ports-2.14-2-g8eafc36
+%define glibcportsdir glibc-ports-2.14.1-1-g3eb1dbf
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
 %define auxarches athlon alphaev6
@@ -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
@@ -661,7 +661,6 @@ sed -i -e '\|/%{_lib}/%{nosegneg_subdir}|d' rpm.filelist
 %endif
 
 echo '%{_prefix}/sbin/build-locale-archive' >> common.filelist
-echo '%{_prefix}/sbin/tzdata-update' >> common.filelist
 echo '%{_prefix}/sbin/nscd' > nscd.filelist
 
 cat > utils.filelist <<EOF
@@ -693,9 +692,6 @@ $GCC -Os -g -static -o build-locale-archive build-locale-archive.c \
   -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \
   -L../build-%{target}
 install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive
-$GCC -Os -g -static -o tzdata-update tzdata-update.c \
-  -L../build-%{target}
-install -m 700 tzdata-update $RPM_BUILD_ROOT/usr/sbin/tzdata-update
 cd ..
 
 # the last bit: more documentation
@@ -886,7 +882,44 @@ end
 
 %post common -p /usr/sbin/build-locale-archive
 
-%triggerin common -p /usr/sbin/tzdata-update -- tzdata
+%triggerin common -p <lua> -- tzdata
+function update (filename, new_data)
+  local fd = io.open(filename)
+  if not fd then return end
+  local data = fd:read("*a")
+  fd:close()
+  if not data then return end
+  -- Don't update the file unnecessarily.
+  if data == new_data then return end
+  local tempfilename = filename .. ".tzupdate"
+  fd = io.open(tempfilename, "w")
+  if not fd then return end
+  fd:write(new_data)
+  fd:close()
+  posix.chmod(tempfilename, 0644)
+  if not os.rename(tempfilename, filename) then
+    os.remove(tempfilename)
+  end
+end
+fd = io.open("/etc/sysconfig/clock")
+if not fd then return end
+zonename = nil
+for l in fd:lines() do
+  zone = string.match(l, "^[ \t]*ZONE[ \t]*=[ \t]*\"?([^ \t\n\"]*)");
+  if zone then
+    zonename = "/usr/share/zoneinfo/" .. zone
+    break
+  end
+end
+fd:close()
+if not zonename then return end
+fd = io.open(zonename)
+if not fd then return end
+data = fd:read("*a")
+fd:close()
+if not data then return end
+update("/etc/localtime", data)
+update("/var/spool/postfix/etc/localtime", data)
 
 %post devel
 /sbin/install-info %{_infodir}/libc.info.gz %{_infodir}/dir > /dev/null 2>&1 || :
@@ -1042,6 +1075,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Oct 28 2011 Andreas Schwab <schwab@redhat.com> - 2.14.1-2
+- Convert tzdata-update to lua (#743034)
+- Mark __clone as .cantunwind (#749556)
+
 * Fri Oct  7 2011 Andreas Schwab <schwab@redhat.com> - 2.14.1-1
 - Update to 2.14.1 release
   - Correctly reparse group line after enlarging the buffer (#739360)
diff --git a/sources b/sources
index 3915d8b..89de160 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-f0f9784a7bcd8be5558e741349602611  glibc-2.14.1-fedora.tar.xz
+24ae773557f07deaa9ffc4610ef11f03  glibc-2.14.1-fedora.tar.xz
 55501b8d037a4f1d330312b30fd6d4bc  glibc-2.14.1.tar.xz
-1d3a184c682ddc9234d98310307c4273  glibc-ports-2.14-2-g8eafc36.tar.xz
+efa23a37cfa579a85eaef59550c1922c  glibc-ports-2.14.1-1-g3eb1dbf.tar.xz