From 08541d983ef0bb6b641fc698e2a5064212d472e1 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@fedoraproject.org>
Date: May 31 2010 15:10:22 +0000
Subject: 2.12.90-2


---

diff --git a/.cvsignore b/.cvsignore
index 42efde5..1c42d0c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-glibc-2.12-17-g4828935-fedora.tar.bz2
-glibc-2.12-17-g4828935.tar.bz2
+glibc-2.12-27-geb5ad2e-fedora.tar.bz2
+glibc-2.12-27-geb5ad2e.tar.bz2
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 3364227..15c694c 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,5 +1,21 @@
---- glibc-2.12-17-g4828935/ChangeLog.15
-+++ glibc-2.12.90-1/ChangeLog.15
+--- glibc-2.12-27-geb5ad2e/ChangeLog
++++ glibc-2.12.90-2/ChangeLog
+@@ -2,6 +2,13 @@
+ 
+ 	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
+ 
++2010-05-27  Andreas Schwab  <schwab@redhat.com>
++
++	* elf/Makefile ($(objpfx)tst-tls10): Depend on
++	$(objpfx)tst-tlsmod7.so.
++	($(objpfx)tst-tls11): Depend on $(objpfx)tst-tlsmod9.so.
++	($(objpfx)tst-tls12): Depend on $(objpfx)tst-tlsmod11.so.
++
+ 2010-05-26  H.J. Lu  <hongjiu.lu@intel.com>
+ 
+ 	[BZ #11640]
+--- glibc-2.12-27-geb5ad2e/ChangeLog.15
++++ glibc-2.12.90-2/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub@redhat.com>
@@ -65,8 +81,8 @@
  2004-08-30  Roland McGrath  <roland@frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.12-17-g4828935/ChangeLog.16
-+++ glibc-2.12.90-1/ChangeLog.16
+--- glibc-2.12-27-geb5ad2e/ChangeLog.16
++++ glibc-2.12.90-2/ChangeLog.16
 @@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
@@ -120,8 +136,8 @@
  2005-07-28  Thomas Schwinge  <schwinge@nic-nac-project.de>
  
  	[BZ #1137]
---- glibc-2.12-17-g4828935/ChangeLog.17
-+++ glibc-2.12.90-1/ChangeLog.17
+--- glibc-2.12-27-geb5ad2e/ChangeLog.17
++++ glibc-2.12.90-2/ChangeLog.17
 @@ -256,6 +256,12 @@
  
  	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
@@ -206,8 +222,8 @@
  2006-12-09  Ulrich Drepper  <drepper@redhat.com>
  
  	[BZ #3632]
---- glibc-2.12-17-g4828935/Makeconfig
-+++ glibc-2.12.90-1/Makeconfig
+--- glibc-2.12-27-geb5ad2e/Makeconfig
++++ glibc-2.12.90-2/Makeconfig
 @@ -789,12 +789,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -224,8 +240,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.12-17-g4828935/csu/Makefile
-+++ glibc-2.12.90-1/csu/Makefile
+--- glibc-2.12-27-geb5ad2e/csu/Makefile
++++ glibc-2.12.90-2/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -236,8 +252,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.12-17-g4828935/csu/elf-init.c
-+++ glibc-2.12.90-1/csu/elf-init.c
+--- glibc-2.12-27-geb5ad2e/csu/elf-init.c
++++ glibc-2.12.90-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;
@@ -262,8 +278,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.12-17-g4828935/debug/tst-chk1.c
-+++ glibc-2.12.90-1/debug/tst-chk1.c
+--- glibc-2.12-27-geb5ad2e/debug/tst-chk1.c
++++ glibc-2.12.90-2/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -292,8 +308,33 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.12-17-g4828935/elf/ldconfig.c
-+++ glibc-2.12.90-1/elf/ldconfig.c
+--- glibc-2.12-27-geb5ad2e/elf/Makefile
++++ glibc-2.12.90-2/elf/Makefile
+@@ -129,6 +129,7 @@ include ../Makeconfig
+ ifeq ($(unwind-find-fde),yes)
+ routines += unwind-dw2-fde-glibc
+ shared-only-routines += unwind-dw2-fde-glibc
++CFLAGS-unwind-dw2-fde-glibc.c = -fno-strict-aliasing
+ endif
+ 
+ before-compile  = $(objpfx)trusted-dirs.h
+@@ -759,11 +760,11 @@ $(objpfx)tst-tls8.out: $(objpfx)tst-tlsmod3.so $(objpfx)tst-tlsmod4.so
+ $(objpfx)tst-tls9: $(libdl)
+ $(objpfx)tst-tls9.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
+ 
+-$(objpfx)tst-tls10: $(objpfx)tst-tlsmod8.so
++$(objpfx)tst-tls10: $(objpfx)tst-tlsmod8.so $(objpfx)tst-tlsmod7.so
+ 
+-$(objpfx)tst-tls11: $(objpfx)tst-tlsmod10.so
++$(objpfx)tst-tls11: $(objpfx)tst-tlsmod10.so $(objpfx)tst-tlsmod9.so
+ 
+-$(objpfx)tst-tls12: $(objpfx)tst-tlsmod12.so
++$(objpfx)tst-tls12: $(objpfx)tst-tlsmod12.so $(objpfx)tst-tlsmod11.so
+ 
+ $(objpfx)tst-tls13: $(libdl)
+ $(objpfx)tst-tls13.out: $(objpfx)tst-tlsmod13a.so
+--- glibc-2.12-27-geb5ad2e/elf/ldconfig.c
++++ glibc-2.12.90-2/elf/ldconfig.c
 @@ -1031,17 +1031,19 @@ search_dirs (void)
  
  
@@ -375,8 +416,8 @@
      }
  
    const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
---- glibc-2.12-17-g4828935/elf/tst-stackguard1.c
-+++ glibc-2.12.90-1/elf/tst-stackguard1.c
+--- glibc-2.12-27-geb5ad2e/elf/tst-stackguard1.c
++++ glibc-2.12.90-2/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -401,16 +442,16 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.12-17-g4828935/include/bits/stdlib-ldbl.h
-+++ glibc-2.12.90-1/include/bits/stdlib-ldbl.h
+--- glibc-2.12-27-geb5ad2e/include/bits/stdlib-ldbl.h
++++ glibc-2.12.90-2/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.12-17-g4828935/include/bits/wchar-ldbl.h
-+++ glibc-2.12.90-1/include/bits/wchar-ldbl.h
+--- glibc-2.12-27-geb5ad2e/include/bits/wchar-ldbl.h
++++ glibc-2.12.90-2/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.12-17-g4828935/include/features.h
-+++ glibc-2.12.90-1/include/features.h
+--- glibc-2.12-27-geb5ad2e/include/features.h
++++ glibc-2.12.90-2/include/features.h
 @@ -308,8 +308,13 @@
  #endif
  
@@ -427,8 +468,19 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.12-17-g4828935/intl/locale.alias
-+++ glibc-2.12.90-1/intl/locale.alias
+--- glibc-2.12-27-geb5ad2e/inet/Makefile
++++ glibc-2.12.90-2/inet/Makefile
+@@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
+ 
+ include ../Rules
+ 
++CFLAGS-tst-inet6_rth.c = -fno-strict-aliasing
++
+ ifeq ($(have-thread-library),yes)
+ 
+ CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
+--- glibc-2.12-27-geb5ad2e/intl/locale.alias
++++ glibc-2.12.90-2/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -438,8 +490,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.12-17-g4828935/libio/stdio.h
-+++ glibc-2.12.90-1/libio/stdio.h
+--- glibc-2.12-27-geb5ad2e/libio/stdio.h
++++ glibc-2.12.90-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.  */
@@ -453,8 +505,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.12-17-g4828935/locale/iso-4217.def
-+++ glibc-2.12.90-1/locale/iso-4217.def
+--- glibc-2.12-27-geb5ad2e/locale/iso-4217.def
++++ glibc-2.12.90-2/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -546,8 +598,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.12-17-g4828935/locale/programs/locarchive.c
-+++ glibc-2.12.90-1/locale/programs/locarchive.c
+--- glibc-2.12-27-geb5ad2e/locale/programs/locarchive.c
++++ glibc-2.12.90-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;
@@ -606,8 +658,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.12-17-g4828935/localedata/Makefile
-+++ glibc-2.12.90-1/localedata/Makefile
+--- glibc-2.12-27-geb5ad2e/localedata/Makefile
++++ glibc-2.12.90-2/localedata/Makefile
 @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -616,8 +668,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.12-17-g4828935/localedata/SUPPORTED
-+++ glibc-2.12.90-1/localedata/SUPPORTED
+--- glibc-2.12-27-geb5ad2e/localedata/SUPPORTED
++++ glibc-2.12.90-2/localedata/SUPPORTED
 @@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -659,8 +711,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.12-17-g4828935/localedata/locales/cy_GB
-+++ glibc-2.12.90-1/localedata/locales/cy_GB
+--- glibc-2.12-27-geb5ad2e/localedata/locales/cy_GB
++++ glibc-2.12.90-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>"
@@ -675,8 +727,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.12-17-g4828935/localedata/locales/en_GB
-+++ glibc-2.12.90-1/localedata/locales/en_GB
+--- glibc-2.12-27-geb5ad2e/localedata/locales/en_GB
++++ glibc-2.12.90-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>"
@@ -688,8 +740,8 @@
  date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
  <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
  <U0025><U005A><U0020><U0025><U0059>"
---- glibc-2.12-17-g4828935/localedata/locales/no_NO
-+++ glibc-2.12.90-1/localedata/locales/no_NO
+--- glibc-2.12-27-geb5ad2e/localedata/locales/no_NO
++++ glibc-2.12.90-2/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -760,8 +812,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.12-17-g4828935/localedata/locales/zh_TW
-+++ glibc-2.12.90-1/localedata/locales/zh_TW
+--- glibc-2.12-27-geb5ad2e/localedata/locales/zh_TW
++++ glibc-2.12.90-2/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -789,8 +841,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.12-17-g4828935/malloc/mcheck.c
-+++ glibc-2.12.90-1/malloc/mcheck.c
+--- glibc-2.12-27-geb5ad2e/malloc/mcheck.c
++++ glibc-2.12.90-2/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -866,8 +918,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.12-17-g4828935/manual/libc.texinfo
-+++ glibc-2.12.90-1/manual/libc.texinfo
+--- glibc-2.12-27-geb5ad2e/manual/libc.texinfo
++++ glibc-2.12.90-2/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -877,8 +929,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.12-17-g4828935/misc/sys/cdefs.h
-+++ glibc-2.12.90-1/misc/sys/cdefs.h
+--- glibc-2.12-27-geb5ad2e/misc/sys/cdefs.h
++++ glibc-2.12.90-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)
@@ -922,8 +974,19 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.12-17-g4828935/nis/nss
-+++ glibc-2.12.90-1/nis/nss
+--- glibc-2.12-27-geb5ad2e/nis/Makefile
++++ glibc-2.12.90-2/nis/Makefile
+@@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
+ 
+ include ../Rules
+ 
++CFLAGS-nis_findserv.c = -fno-strict-aliasing
++CFLAGS-ypclnt.c = -fno-strict-aliasing
+ 
+ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
+ $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
+--- glibc-2.12-27-geb5ad2e/nis/nss
++++ glibc-2.12.90-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
@@ -933,9 +996,18 @@
  #
  # ADJUNCT_AS_SHADOW
  #  If set to TRUE, the passwd routines in the NIS NSS module will not
---- glibc-2.12-17-g4828935/nptl/ChangeLog
-+++ glibc-2.12.90-1/nptl/ChangeLog
-@@ -3884,6 +3884,15 @@
+--- glibc-2.12-27-geb5ad2e/nptl/ChangeLog
++++ glibc-2.12.90-2/nptl/ChangeLog
+@@ -1,3 +1,8 @@
++2010-05-27  Andreas Schwab  <schwab@redhat.com>
++
++	* Makefile ($(objpfx)tst-_res1): Depend on
++	$(objpfx)tst-_res1mod1.so.
++
+ 2010-04-09  Ulrich Drepper  <drepper@redhat.com>
+ 
+ 	[BZ #11390]
+@@ -3884,6 +3889,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -951,7 +1023,7 @@
  2005-07-11  Jakub Jelinek  <jakub@redhat.com>
  
  	[BZ #1102]
-@@ -4620,6 +4629,11 @@
+@@ -4620,6 +4634,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -963,7 +1035,7 @@
  2004-09-02  Ulrich Drepper  <drepper@redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6694,6 +6708,11 @@
+@@ -6694,6 +6713,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -975,8 +1047,8 @@
  2003-07-25  Jakub Jelinek  <jakub@redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.12-17-g4828935/nptl/Makefile
-+++ glibc-2.12.90-1/nptl/Makefile
+--- glibc-2.12-27-geb5ad2e/nptl/Makefile
++++ glibc-2.12.90-2/nptl/Makefile
 @@ -341,7 +341,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -987,6 +1059,15 @@
  endif
  
  CFLAGS-flockfile.c = -D_IO_MTSAFE_IO
+@@ -491,7 +492,7 @@ $(objpfx)tst-rwlock14: $(common-objpfx)rt/librt.so
+ $(objpfx)tst-_res1mod2.so: $(objpfx)tst-_res1mod1.so
+ LDFLAGS-tst-_res1mod1.so = -Wl,-soname,tst-_res1mod1.so
+ LDFLAGS-tst-_res1mod2.so = -Wl,-soname,tst-_res1mod2.so
+-$(objpfx)tst-_res1: $(objpfx)tst-_res1mod2.so $(shared-thread-library)
++$(objpfx)tst-_res1: $(objpfx)tst-_res1mod2.so $(objpfx)tst-_res1mod1.so $(shared-thread-library)
+ else
+ $(objpfx)tst-cond11: $(common-objpfx)rt/librt.a
+ $(objpfx)tst-cond19: $(common-objpfx)rt/librt.a
 @@ -527,15 +528,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1009,8 +1090,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.12-17-g4828935/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.12.90-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.12-27-geb5ad2e/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.12.90-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
@@ -1019,8 +1100,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.12-17-g4828935/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.12.90-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.12-27-geb5ad2e/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.12.90-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1028,8 +1109,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.12-17-g4828935/nptl/tst-stackguard1.c
-+++ glibc-2.12.90-1/nptl/tst-stackguard1.c
+--- glibc-2.12-27-geb5ad2e/nptl/tst-stackguard1.c
++++ glibc-2.12.90-2/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1054,8 +1135,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.12-17-g4828935/nscd/nscd.conf
-+++ glibc-2.12.90-1/nscd/nscd.conf
+--- glibc-2.12-27-geb5ad2e/nscd/nscd.conf
++++ glibc-2.12.90-2/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1065,8 +1146,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.12-17-g4828935/nscd/nscd.init
-+++ glibc-2.12.90-1/nscd/nscd.init
+--- glibc-2.12-27-geb5ad2e/nscd/nscd.init
++++ glibc-2.12.90-2/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1143,8 +1224,18 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.12-17-g4828935/posix/Makefile
-+++ glibc-2.12.90-1/posix/Makefile
+--- glibc-2.12-27-geb5ad2e/nss/Makefile
++++ glibc-2.12.90-2/nss/Makefile
+@@ -74,6 +74,7 @@ endif
+ 
+ include ../Rules
+ 
++CFLAGS-files-hosts.c = -fno-strict-aliasing
+ 
+ ifeq (yes,$(build-static-nss))
+ $(objpfx)getent: $(objpfx)libnss_files.a
+--- glibc-2.12-27-geb5ad2e/posix/Makefile
++++ glibc-2.12.90-2/posix/Makefile
 @@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1165,8 +1256,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.12-17-g4828935/posix/gai.conf
-+++ glibc-2.12.90-1/posix/gai.conf
+--- glibc-2.12-27-geb5ad2e/posix/gai.conf
++++ glibc-2.12.90-2/posix/gai.conf
 @@ -41,7 +41,7 @@
  #
  # precedence  <mask>   <value>
@@ -1191,8 +1282,8 @@
  #scopev4 ::ffff:0.0.0.0/96       14
 +#
 +#    This is what the Red Hat setting currently uses.
---- glibc-2.12-17-g4828935/posix/getconf.speclist.h
-+++ glibc-2.12.90-1/posix/getconf.speclist.h
+--- glibc-2.12-27-geb5ad2e/posix/getconf.speclist.h
++++ glibc-2.12.90-2/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1233,8 +1324,18 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.12-17-g4828935/streams/Makefile
-+++ glibc-2.12.90-1/streams/Makefile
+--- glibc-2.12-27-geb5ad2e/resolv/Makefile
++++ glibc-2.12.90-2/resolv/Makefile
+@@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
+ 	    -Dgetnetbyaddr=res_getnetbyaddr
+ 
+ CFLAGS-res_hconf.c = -fexceptions
++CFLAGS-res_send.c = -fno-strict-aliasing
+ 
+ # The BIND code elicits some harmless warnings.
+ +cflags += -Wno-strict-prototypes -Wno-write-strings
+--- glibc-2.12-27-geb5ad2e/streams/Makefile
++++ glibc-2.12.90-2/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1244,8 +1345,21 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.12-17-g4828935/sysdeps/generic/dl-cache.h
-+++ glibc-2.12.90-1/sysdeps/generic/dl-cache.h
+--- glibc-2.12-27-geb5ad2e/sunrpc/Makefile
++++ glibc-2.12.90-2/sunrpc/Makefile
+@@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions
+ 
+ CPPFLAGS += -D_RPC_THREAD_SAFE_
+ 
++CFLAGS-clnt_tcp.c = -fno-strict-aliasing
++CFLAGS-clnt_udp.c = -fno-strict-aliasing
++CFLAGS-clnt_unix.c = -fno-strict-aliasing
++
+ include ../Rules
+ 
+ $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
+--- glibc-2.12-27-geb5ad2e/sysdeps/generic/dl-cache.h
++++ glibc-2.12.90-2/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1261,8 +1375,8 @@
  #define CACHEMAGIC "ld.so-1.7.0"
  
  /* libc5 and glibc 2.0/2.1 use the same format.  For glibc 2.2 another
---- glibc-2.12-17-g4828935/sysdeps/i386/Makefile
-+++ glibc-2.12.90-1/sysdeps/i386/Makefile
+--- glibc-2.12-27-geb5ad2e/sysdeps/i386/Makefile
++++ glibc-2.12.90-2/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1287,8 +1401,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.12-17-g4828935/sysdeps/ia64/Makefile
-+++ glibc-2.12.90-1/sysdeps/ia64/Makefile
+--- glibc-2.12-27-geb5ad2e/sysdeps/ia64/Makefile
++++ glibc-2.12.90-2/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1300,8 +1414,8 @@
  endif
  endif
  
---- glibc-2.12-17-g4828935/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.12.90-1/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.12-27-geb5ad2e/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.12.90-2/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1653,8 +1767,8 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
---- glibc-2.12-17-g4828935/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.12.90-1/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.12-27-geb5ad2e/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.12.90-2/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1740,8 +1854,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.12-17-g4828935/sysdeps/posix/getaddrinfo.c
-+++ glibc-2.12.90-1/sysdeps/posix/getaddrinfo.c
+--- glibc-2.12-27-geb5ad2e/sysdeps/posix/getaddrinfo.c
++++ glibc-2.12.90-2/sysdeps/posix/getaddrinfo.c
 @@ -1099,10 +1099,12 @@ static const struct scopeentry
      /* Link-local addresses: scope 2.  */
      { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
@@ -1755,8 +1869,8 @@
      /* Default: scope 14.  */
      { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
    };
---- glibc-2.12-17-g4828935/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.12.90-1/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.12-27-geb5ad2e/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.12.90-2/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1765,8 +1879,16 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.12-17-g4828935/sysdeps/unix/nice.c
-+++ glibc-2.12.90-1/sysdeps/unix/nice.c
+--- glibc-2.12-27-geb5ad2e/sysdeps/powerpc/powerpc64/elf/Makefile
++++ glibc-2.12.90-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)
+ CFLAGS-rtld-strnlen.os = $(no-special-regs)
++
++CFLAGS-gmon-start.c = -fno-strict-aliasing
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/nice.c
++++ glibc-2.12.90-2/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1781,8 +1903,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.12.90-2/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1798,8 +1920,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.12.90-2/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -1847,8 +1969,8 @@
      }
    else
  #endif
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.12.90-2/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -1891,8 +2013,8 @@
      {
        size_t filelen = strlen (file);
        if (__builtin_expect (filelen == 0, 0))
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.12.90-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.
@@ -1953,8 +2075,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.12.90-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -1987,29 +2109,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.12.90-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.12.90-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>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.12.90-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.12-17-g4828935/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.12.90-2/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2035,8 +2157,8 @@
  
  struct netlink_res
  {
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.12.90-2/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2046,13 +2168,13 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
++++ glibc-2.12.90-2/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
 @@ -1 +1 @@
 -#include "../../fxstat.c"
 +#include "../../i386/fxstat.c"
---- glibc-2.12-17-g4828935/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.12.90-1/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.12-27-geb5ad2e/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.12.90-2/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2098,8 +2220,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.12-17-g4828935/timezone/zic.c
-+++ glibc-2.12.90-1/timezone/zic.c
+--- glibc-2.12-27-geb5ad2e/timezone/zic.c
++++ glibc-2.12.90-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 291ac5c..9d64d2c 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.12-17-g4828935
+%define glibcsrcdir glibc-2.12-27-geb5ad2e
 %define glibcversion 2.12.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@@ -23,7 +23,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
@@ -897,8 +897,10 @@ fi
 %postun utils -p /sbin/ldconfig
 
 %pre -n nscd
-/usr/sbin/useradd -M -o -r -d / -s /sbin/nologin \
-  -c "NSCD Daemon" -u 28 nscd > /dev/null 2>&1 || :
+getent group nscd >/dev/null || /usr/sbin/groupadd -g 28 -r nscd
+getent passwd nscd >/dev/null ||
+  /usr/sbin/useradd -M -o -r -d / -s /sbin/nologin \
+		    -c "NSCD Daemon" -u 28 -g nscd nscd
 
 %post -n nscd
 /sbin/chkconfig --add nscd
@@ -1029,6 +1031,17 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon May 31 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-2
+- Update from master
+  - Small fix to POWER7 32-bit memcpy
+  - Correct x86 CPU family and model check (BZ#11640, #596554)
+  - Fix iov size in SH register_dump
+  - Don't crash on unresolved weak symbol reference
+  - Implement recvmmsg also as socketcall
+  - sunrpc: Fix spurious fall-through
+  - Make <sys/timex.h> compatible with C++ (#593762)
+- Fix users and groups creation in nscd %%post script
+
 * Wed May 19 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-1
 - Update from master
   - POWER7 optimized memset
diff --git a/import.log b/import.log
index 0e2061b..707da51 100644
--- a/import.log
+++ b/import.log
@@ -45,3 +45,4 @@ glibc-2_11_90-10:HEAD:glibc-2.11.90-10.src.rpm:1264006094
 glibc-2_11_90-11:HEAD:glibc-2.11.90-11.src.rpm:1265032871
 glibc-2_11_90-12:HEAD:glibc-2.11.90-12.src.rpm:1265642830
 glibc-2_12_90-1:HEAD:glibc-2.12.90-1.src.rpm:1274269675
+glibc-2_12_90-2:HEAD:glibc-2.12.90-2.src.rpm:1275317456
diff --git a/sources b/sources
index dda797a..f9ebf8b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f253e7c3971c64f69f847ba203e16bc5  glibc-2.12-17-g4828935-fedora.tar.bz2
-b3a762c0889e3204d8d39ed4e88eb23d  glibc-2.12-17-g4828935.tar.bz2
+1e47c64f450482708464b2479652ca3d  glibc-2.12-27-geb5ad2e-fedora.tar.bz2
+f81c82bb9b991e9fb3ac407e164d7720  glibc-2.12-27-geb5ad2e.tar.bz2