2.11.90-3

2009-11-30 14:16:32 +00:00 · 2009-11-30 14:16:32 +00:00 · 29fd49d204
commit 29fd49d204
parent edc9c2bed7
5 changed files with 131 additions and 163 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,2 +1,2 @@
-glibc-2.11-44-g49c7f27-fedora.tar.bz2
-glibc-2.11-44-g49c7f27.tar.bz2
+glibc-2.11-55-gb55ec98-fedora.tar.bz2
+glibc-2.11-55-gb55ec98.tar.bz2
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@ -1,6 +1,6 @@
--- glibc-2.11-44-g49c7f27/ChangeLog
-+++ glibc-2.11.90-1/ChangeLog
-@@ -1186,6 +1186,11 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
+--- glibc-2.11-55-gb55ec98/ChangeLog
+++ glibc-2.11.90-2/ChangeLog
+@@ -1222,6 +1222,11 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
 	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
 	the unique symbol hash table should not be const.
 
@ -12,7 +12,7 @@
 2009-07-21  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove
-@@ -1451,6 +1456,11 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
+@@ -1487,6 +1492,11 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
 	out common code into new function get_common_indeces. Determine
 	extended family and model for Intel processors.
 
@ -24,7 +24,7 @@
 2009-06-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* resolv/resolv.h: Define RES_SNGLKUPREOP.
-@@ -10144,6 +10154,10 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
+@@ -10180,6 +10190,10 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
 	[BZ #4368]
 	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
 
@ -35,7 +35,7 @@
 2007-04-16  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #4364]
-@@ -11401,6 +11415,15 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
+@@ -11437,6 +11451,15 @@ d2009-10-30  Ulrich Drepper  <drepper@redhat.com>
 	separators also if no non-zero digits found.
 	* stdlib/Makefile (tests): Add tst-strtod3.
 
@ -51,8 +51,8 @@
 2006-12-09  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #3632]
--- glibc-2.11-44-g49c7f27/ChangeLog.15
-+++ glibc-2.11.90-1/ChangeLog.15
+--- glibc-2.11-55-gb55ec98/ChangeLog.15
+++ glibc-2.11.90-2/ChangeLog.15
@@ -477,6 +477,14 @@
 
 2004-11-26  Jakub Jelinek  <jakub@redhat.com>
@ -118,8 +118,8 @@
 2004-08-30  Roland McGrath  <roland@frob.com>
 
 	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
--- glibc-2.11-44-g49c7f27/ChangeLog.16
-+++ glibc-2.11.90-1/ChangeLog.16
+--- glibc-2.11-55-gb55ec98/ChangeLog.16
+++ glibc-2.11.90-2/ChangeLog.16
@@ -2042,6 +2042,9 @@
 	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
 	followed by __THROW.
@ -173,8 +173,8 @@
 2005-07-28  Thomas Schwinge  <schwinge@nic-nac-project.de>
 
 	[BZ #1137]
--- glibc-2.11-44-g49c7f27/Makeconfig
-+++ glibc-2.11.90-1/Makeconfig
+--- glibc-2.11-55-gb55ec98/Makeconfig
+++ glibc-2.11.90-2/Makeconfig
@@ -780,12 +780,12 @@ endif
 # The assembler can generate debug information too.
 ifndef ASFLAGS
@ -191,8 +191,8 @@
 
 ifndef BUILD_CC
 BUILD_CC = $(CC)
--- glibc-2.11-44-g49c7f27/csu/Makefile
-+++ glibc-2.11.90-1/csu/Makefile
+--- glibc-2.11-55-gb55ec98/csu/Makefile
+++ glibc-2.11.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 $@
@ -203,8 +203,8 @@
 
 vpath initfini.c $(sysdirs)
 
--- glibc-2.11-44-g49c7f27/csu/elf-init.c
-+++ glibc-2.11.90-1/csu/elf-init.c
+--- glibc-2.11-55-gb55ec98/csu/elf-init.c
+++ glibc-2.11.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;
@ -229,8 +229,8 @@
 
 /* These function symbols are provided for the .init/.fini section entry
    points automagically by the linker.  */
--- glibc-2.11-44-g49c7f27/debug/tst-chk1.c
-+++ glibc-2.11.90-1/debug/tst-chk1.c
+--- glibc-2.11-55-gb55ec98/debug/tst-chk1.c
+++ glibc-2.11.90-2/debug/tst-chk1.c
@@ -17,6 +17,9 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
@ -259,8 +259,8 @@
 #  define O 0
 # else
 #  define O 1
--- glibc-2.11-44-g49c7f27/elf/ldconfig.c
-+++ glibc-2.11.90-1/elf/ldconfig.c
+--- glibc-2.11-55-gb55ec98/elf/ldconfig.c
+++ glibc-2.11.90-2/elf/ldconfig.c
@@ -1020,17 +1020,19 @@ search_dirs (void)
 
 
@ -342,8 +342,8 @@
     }
 
   if (! opt_ignore_aux_cache)
--- glibc-2.11-44-g49c7f27/elf/tst-stackguard1.c
-+++ glibc-2.11.90-1/elf/tst-stackguard1.c
+--- glibc-2.11-55-gb55ec98/elf/tst-stackguard1.c
+++ glibc-2.11.90-2/elf/tst-stackguard1.c
@@ -160,17 +160,21 @@ do_test (void)
      the 16 runs, something is very wrong.  */
   int ndifferences = 0;
@ -368,16 +368,16 @@
     {
       puts ("stack guard canaries are not randomized enough");
       puts ("nor equal to the default canary value");
--- glibc-2.11-44-g49c7f27/include/bits/stdlib-ldbl.h
-+++ glibc-2.11.90-1/include/bits/stdlib-ldbl.h
+--- glibc-2.11-55-gb55ec98/include/bits/stdlib-ldbl.h
+++ glibc-2.11.90-2/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
--- glibc-2.11-44-g49c7f27/include/bits/wchar-ldbl.h
-+++ glibc-2.11.90-1/include/bits/wchar-ldbl.h
+--- glibc-2.11-55-gb55ec98/include/bits/wchar-ldbl.h
+++ glibc-2.11.90-2/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
--- glibc-2.11-44-g49c7f27/include/features.h
-+++ glibc-2.11.90-1/include/features.h
+--- glibc-2.11-55-gb55ec98/include/features.h
+++ glibc-2.11.90-2/include/features.h
@@ -299,8 +299,13 @@
 #endif
 
@ -394,8 +394,8 @@
 #  define __USE_FORTIFY_LEVEL 2
 # else
 #  define __USE_FORTIFY_LEVEL 1
--- glibc-2.11-44-g49c7f27/intl/locale.alias
-+++ glibc-2.11.90-1/intl/locale.alias
+--- glibc-2.11-55-gb55ec98/intl/locale.alias
+++ glibc-2.11.90-2/intl/locale.alias
@@ -57,8 +57,6 @@ korean		ko_KR.eucKR
 korean.euc 	ko_KR.eucKR
 ko_KR		ko_KR.eucKR
@ -405,8 +405,8 @@
 norwegian       nb_NO.ISO-8859-1
 nynorsk		nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2
--- glibc-2.11-44-g49c7f27/libio/stdio.h
-+++ glibc-2.11.90-1/libio/stdio.h
+--- glibc-2.11-55-gb55ec98/libio/stdio.h
+++ glibc-2.11.90-2/libio/stdio.h
@@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
 extern struct _IO_FILE *stdin;		/* Standard input stream.  */
 extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@ -420,8 +420,8 @@
 
 __BEGIN_NAMESPACE_STD
 /* Remove file FILENAME.  */
--- glibc-2.11-44-g49c7f27/locale/iso-4217.def
-+++ glibc-2.11.90-1/locale/iso-4217.def
+--- glibc-2.11-55-gb55ec98/locale/iso-4217.def
+++ glibc-2.11.90-2/locale/iso-4217.def
@@ -8,6 +8,7 @@
  *
  * !!! The list has to be sorted !!!
@ -513,8 +513,8 @@
 DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
 DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
 DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
--- glibc-2.11-44-g49c7f27/locale/programs/locarchive.c
-+++ glibc-2.11.90-1/locale/programs/locarchive.c
+--- glibc-2.11-55-gb55ec98/locale/programs/locarchive.c
+++ glibc-2.11.90-2/locale/programs/locarchive.c
@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
 /* forward decls for below */
 static uint32_t add_locale (struct locarhandle *ah, const char *name,
@ -546,8 +546,8 @@
 add_alias (struct locarhandle *ah, const char *alias, bool replace,
 	   const char *oldname, uint32_t *locrec_offset_p)
 {
--- glibc-2.11-44-g49c7f27/localedata/Makefile
-+++ glibc-2.11.90-1/localedata/Makefile
+--- glibc-2.11-55-gb55ec98/localedata/Makefile
+++ glibc-2.11.90-2/localedata/Makefile
@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
 	echo -n '...'; \
 	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@ -556,8 +556,8 @@
 		     -i locales/$$input -c -f charmaps/$$charset \
 		     $(addprefix --prefix=,$(install_root)) $$locale; \
 	echo ' done'; \
--- glibc-2.11-44-g49c7f27/localedata/SUPPORTED
-+++ glibc-2.11.90-1/localedata/SUPPORTED
+--- glibc-2.11-55-gb55ec98/localedata/SUPPORTED
+++ glibc-2.11.90-2/localedata/SUPPORTED
@@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
 cy_GB/ISO-8859-14 \
 da_DK.UTF-8/UTF-8 \
@ -599,8 +599,8 @@
 ta_IN/UTF-8 \
 te_IN/UTF-8 \
 tg_TJ.UTF-8/UTF-8 \
--- glibc-2.11-44-g49c7f27/localedata/locales/cy_GB
-+++ glibc-2.11.90-1/localedata/locales/cy_GB
+--- glibc-2.11-55-gb55ec98/localedata/locales/cy_GB
+++ glibc-2.11.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>"
@ -615,8 +615,8 @@
 END LC_TIME
 
 LC_MESSAGES
--- glibc-2.11-44-g49c7f27/localedata/locales/en_GB
-+++ glibc-2.11.90-1/localedata/locales/en_GB
+--- glibc-2.11-55-gb55ec98/localedata/locales/en_GB
+++ glibc-2.11.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>"
@ -628,8 +628,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.11-44-g49c7f27/localedata/locales/no_NO
-+++ glibc-2.11.90-1/localedata/locales/no_NO
+--- glibc-2.11-55-gb55ec98/localedata/locales/no_NO
+++ glibc-2.11.90-2/localedata/locales/no_NO
@@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@ -700,8 +700,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
--- glibc-2.11-44-g49c7f27/localedata/locales/zh_TW
-+++ glibc-2.11.90-1/localedata/locales/zh_TW
+--- glibc-2.11-55-gb55ec98/localedata/locales/zh_TW
+++ glibc-2.11.90-2/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
 comment_char %
 escape_char /
@ -729,8 +729,8 @@
 revision   "0.2"
 date       "2000-08-02"
 %
--- glibc-2.11-44-g49c7f27/malloc/mcheck.c
-+++ glibc-2.11.90-1/malloc/mcheck.c
+--- glibc-2.11-55-gb55ec98/malloc/mcheck.c
+++ glibc-2.11.90-2/malloc/mcheck.c
@@ -24,9 +24,25 @@
 # include <mcheck.h>
 # include <stdint.h>
@ -806,8 +806,8 @@
 
       old_free_hook = __free_hook;
       __free_hook = freehook;
--- glibc-2.11-44-g49c7f27/manual/libc.texinfo
-+++ glibc-2.11.90-1/manual/libc.texinfo
+--- glibc-2.11-55-gb55ec98/manual/libc.texinfo
+++ glibc-2.11.90-2/manual/libc.texinfo
@@ -5,7 +5,7 @@
 @c setchapternewpage odd
 
@ -817,8 +817,8 @@
 @direntry
 * Libc: (libc).                 C library.
 @end direntry
--- glibc-2.11-44-g49c7f27/misc/sys/cdefs.h
-+++ glibc-2.11.90-1/misc/sys/cdefs.h
+--- glibc-2.11-55-gb55ec98/misc/sys/cdefs.h
+++ glibc-2.11.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)
@ -862,17 +862,17 @@
 # define __va_arg_pack() __builtin_va_arg_pack ()
 # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
 #endif
--- glibc-2.11-44-g49c7f27/nis/nss
-+++ glibc-2.11.90-1/nis/nss
+--- glibc-2.11-55-gb55ec98/nis/nss
+++ glibc-2.11.90-2/nis/nss
@@ -25,4 +25,4 @@
 #  memory with every getXXent() call.  Otherwise each getXXent() call
 #  might result into a network communication with the server to get
 #  the next entry.
 -#SETENT_BATCH_READ=TRUE
 +SETENT_BATCH_READ=TRUE
--- glibc-2.11-44-g49c7f27/nptl/ChangeLog
-+++ glibc-2.11.90-1/nptl/ChangeLog
-@@ -3761,6 +3761,15 @@
+--- glibc-2.11-55-gb55ec98/nptl/ChangeLog
+++ glibc-2.11.90-2/nptl/ChangeLog
+@@ -3771,6 +3771,15 @@
 	Use __sigfillset.  Document that sigfillset does the right thing wrt
 	to SIGSETXID.
 
@ -888,7 +888,7 @@
 2005-07-11  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #1102]
-@@ -4497,6 +4506,11 @@
+@@ -4507,6 +4516,11 @@
 	Move definition inside libpthread, libc, librt check.  Provide
 	definition for rtld.
 
@ -900,7 +900,7 @@
 2004-09-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6571,6 +6585,11 @@
+@@ -6581,6 +6595,11 @@
 
 	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
 
@ -912,8 +912,8 @@
 2003-07-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-2.11-44-g49c7f27/nptl/Makefile
-+++ glibc-2.11.90-1/nptl/Makefile
+--- glibc-2.11-55-gb55ec98/nptl/Makefile
+++ glibc-2.11.90-2/nptl/Makefile
@@ -339,7 +339,8 @@ endif
 extra-objs += $(crti-objs) $(crtn-objs)
 omit-deps += crti crtn
@ -946,8 +946,8 @@
 else
 $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
 endif
--- glibc-2.11-44-g49c7f27/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.11.90-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.11-55-gb55ec98/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.11.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
@ -956,8 +956,8 @@
 +#define _XOPEN_STREAMS	-1
 +
 #endif /* bits/posix_opt.h */
--- glibc-2.11-44-g49c7f27/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.11.90-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.11-55-gb55ec98/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.11.90-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h
@@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@ -965,8 +965,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
--- glibc-2.11-44-g49c7f27/nptl/tst-stackguard1.c
-+++ glibc-2.11.90-1/nptl/tst-stackguard1.c
+--- glibc-2.11-55-gb55ec98/nptl/tst-stackguard1.c
+++ glibc-2.11.90-2/nptl/tst-stackguard1.c
@@ -190,17 +190,21 @@ do_test (void)
      the 16 runs, something is very wrong.  */
   int ndifferences = 0;
@ -991,8 +991,8 @@
     {
       puts ("stack guard canaries are not randomized enough");
       puts ("nor equal to the default canary value");
--- glibc-2.11-44-g49c7f27/nscd/nscd.conf
-+++ glibc-2.11.90-1/nscd/nscd.conf
+--- glibc-2.11-55-gb55ec98/nscd/nscd.conf
+++ glibc-2.11.90-2/nscd/nscd.conf
@@ -33,7 +33,7 @@
 #	logfile			/var/log/nscd.log
 #	threads			4
@ -1002,8 +1002,8 @@
 #	stat-user		somebody
 	debug-level		0
 #	reload-count		5
--- glibc-2.11-44-g49c7f27/nscd/nscd.init
-+++ glibc-2.11.90-1/nscd/nscd.init
+--- glibc-2.11-55-gb55ec98/nscd/nscd.init
+++ glibc-2.11.90-2/nscd/nscd.init
@@ -9,6 +9,7 @@
 #		slow naming services like NIS, NIS+, LDAP, or hesiod.
 # processname: /usr/sbin/nscd
@ -1075,8 +1075,8 @@
 	;;
     *)
 	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- glibc-2.11-44-g49c7f27/posix/Makefile
-+++ glibc-2.11.90-1/posix/Makefile
+--- glibc-2.11-55-gb55ec98/posix/Makefile
+++ glibc-2.11.90-2/posix/Makefile
@@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
 	  mv -f $@/$$spec.new $@/$$spec; \
 	done < $(objpfx)getconf.speclist
@ -1097,8 +1097,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 	mv -f $@.new $@
--- glibc-2.11-44-g49c7f27/posix/getconf.speclist.h
-+++ glibc-2.11.90-1/posix/getconf.speclist.h
+--- glibc-2.11-55-gb55ec98/posix/getconf.speclist.h
+++ glibc-2.11.90-2/posix/getconf.speclist.h
@@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@ -1139,8 +1139,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
--- glibc-2.11-44-g49c7f27/streams/Makefile
-+++ glibc-2.11.90-1/streams/Makefile
+--- glibc-2.11-55-gb55ec98/streams/Makefile
+++ glibc-2.11.90-2/streams/Makefile
@@ -21,7 +21,7 @@
 #
 subdir	:= streams
@ -1150,8 +1150,8 @@
 routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
 
 include ../Rules
--- glibc-2.11-44-g49c7f27/sysdeps/generic/dl-cache.h
-+++ glibc-2.11.90-1/sysdeps/generic/dl-cache.h
+--- glibc-2.11-55-gb55ec98/sysdeps/generic/dl-cache.h
+++ glibc-2.11.90-2/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@
 # define add_system_dir(dir) add_dir (dir)
 #endif
@ -1167,8 +1167,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.11-44-g49c7f27/sysdeps/i386/Makefile
-+++ glibc-2.11.90-1/sysdeps/i386/Makefile
+--- glibc-2.11-55-gb55ec98/sysdeps/i386/Makefile
+++ glibc-2.11.90-2/sysdeps/i386/Makefile
@@ -2,6 +2,8 @@
 # Every i386 port in use uses gas syntax (I think).
 asm-CPPFLAGS += -DGAS_SYNTAX
@ -1193,8 +1193,8 @@
 endif
 
 ifeq ($(subdir),elf)
--- glibc-2.11-44-g49c7f27/sysdeps/ia64/Makefile
-+++ glibc-2.11.90-1/sysdeps/ia64/Makefile
+--- glibc-2.11-55-gb55ec98/sysdeps/ia64/Makefile
+++ glibc-2.11.90-2/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
 
 ifeq (yes,$(build-shared))
@ -1206,8 +1206,8 @@
 endif
 endif
 
--- glibc-2.11-44-g49c7f27/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.11.90-1/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.11-55-gb55ec98/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.11.90-2/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@ -1559,8 +1559,8 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
--- glibc-2.11-44-g49c7f27/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.11.90-1/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.11-55-gb55ec98/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.11.90-2/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@ -1646,8 +1646,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
--- glibc-2.11-44-g49c7f27/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.11.90-1/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.11-55-gb55ec98/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.11.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
@ -1656,8 +1656,8 @@
 endif
 
 ifeq ($(subdir),elf)
--- glibc-2.11-44-g49c7f27/sysdeps/unix/nice.c
-+++ glibc-2.11.90-1/sysdeps/unix/nice.c
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/nice.c
+++ glibc-2.11.90-2/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr)
 	__set_errno (save);
     }
@ -1672,8 +1672,8 @@
   if (result == -1)
     {
       if (errno == EACCES)
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@
 #include <unistd.h>
 #include <sys/socket.h>
@ -1689,8 +1689,8 @@
 
 #ifndef IFA_F_HOMEADDRESS
 # define IFA_F_HOMEADDRESS 0
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.11.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.  */
@ -1738,8 +1738,8 @@
     }
   else
 #endif
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
 {
   int result;
@ -1782,28 +1782,8 @@
     {
       size_t filelen = strlen (file);
       if (__builtin_expect (filelen == 0, 0))
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/i386/clone.S
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/i386/clone.S
-@@ -120,9 +120,6 @@ L(pseudo_end):
- 	ret
- 
- L(thread_start):
-	cfi_startproc;
-	/* Clearing frame pointer is insufficient, use CFI.  */
-	cfi_undefined (eip);
- 	/* Note: %esi is zero.  */
- 	movl	%esi,%ebp	/* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@ L(nomoregetpid):
- 	jmp	L(haspid)
- 	.previous
- #endif
-	cfi_endproc;
- 
- 	cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.11.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.
@ -1864,8 +1844,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.11.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)
@ -1898,29 +1878,29 @@
 +  } while (0)
 +
 #include_next <dl-cache.h>
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.11.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.11-44-g49c7f27/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.11.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.11-44-g49c7f27/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.11.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.11-44-g49c7f27/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@
 
 #include <kernel-features.h>
@ -1946,8 +1926,8 @@
 
 struct netlink_res
 {
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/paths.h
@@ -62,7 +62,7 @@
 #define	_PATH_TTY	"/dev/tty"
 #define	_PATH_UNIX	"/boot/vmlinux"
@ -1957,8 +1937,8 @@
 #define _PATH_WTMP	"/var/log/wtmp"
 
 /* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.11-55-gb55ec98/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.11.90-2/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
 {
   struct __kernel_termios k_termios;
@ -2004,28 +1984,8 @@
 +  return retval;
 }
 libc_hidden_def (tcsetattr)
--- glibc-2.11-44-g49c7f27/sysdeps/unix/sysv/linux/x86_64/clone.S
-+++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/x86_64/clone.S
-@@ -89,9 +89,6 @@ L(pseudo_end):
- 	ret
- 
- L(thread_start):
-	cfi_startproc;
-	/* Clearing frame pointer is insufficient, use CFI.  */
-	cfi_undefined (rip);
- 	/* Clear the frame pointer.  The ABI suggests this be done, to mark
- 	   the outermost frame obviously.  */
- 	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@ L(thread_start):
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	call	HIDDEN_JUMPTARGET (_exit)
-	cfi_endproc;
- 
- 	cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
--- glibc-2.11-44-g49c7f27/timezone/zic.c
-+++ glibc-2.11.90-1/timezone/zic.c
+--- glibc-2.11-55-gb55ec98/timezone/zic.c
+++ glibc-2.11.90-2/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int			zonecount;
 		if (stdrp != NULL && stdrp->r_hiyear == 2037)
 			return;
--- a/glibc.spec
+++ b/glibc.spec
@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.11-44-g49c7f27
+%define glibcsrcdir glibc-2.11-55-gb55ec98
 %define glibcversion 2.11.90
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
@ -24,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 2
+Release: 3
 # 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
@ -1033,6 +1033,13 @@ rm -f *.filelist*
 %endif

 %changelog
+* Mon Nov 30 2009 Andreas Schwab <schwab@redhat.com> - 2.11.90-3
+- Update from master.
+  - Fix infloop in __pthread_disable_asynccancel on x86_64 (#537690).
+  - Prevent unintended file desriptor leak in grantpt (#530558).
+  - Fix startup to security-relevant statically linked binaries (#528631).
+- Re-install CFI in x86/x86_64 clone (#491542).
+
 * Tue Nov 24 2009 Andreas Schwab <schwab@redhat.com> - 2.11.90-2
 - Update from master.
  - Define week, first_weekday, and first_workday for en_DK locale (#525126).
--- a/import.log
+++ b/import.log
@ -34,3 +34,4 @@ glibc-2_10_90-23:HEAD:glibc-2.10.90-23.src.rpm:1253528881
 glibc-2_10_90-24:HEAD:glibc-2.10.90-24.src.rpm:1254140947
 glibc-2_11_90-1:HEAD:glibc-2.11.90-1.src.rpm:1258048159
 glibc-2_11_90-2:HEAD:glibc-2.11.90-2.src.rpm:1259077749
+glibc-2_11_90-3:HEAD:glibc-2.11.90-3.src.rpm:1259590502
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-5e39f649a302de54783cb17ae26dbc6e  glibc-2.11-44-g49c7f27-fedora.tar.bz2
-9a5fba87ba34ff4bf5853307b6ac4659  glibc-2.11-44-g49c7f27.tar.bz2
+dd7994030ce90df1033fc396fdb475c8  glibc-2.11-55-gb55ec98-fedora.tar.bz2
+f25608ae96e0b7f5d22ce30ebee2bd61  glibc-2.11-55-gb55ec98.tar.bz2