diff --git a/.cvsignore b/.cvsignore
index 8e9b511..8c31b6b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-glibc-20080408T0706.tar.bz2
-glibc-fedora-20080408T0706.tar.bz2
+glibc-20080410T1907.tar.bz2
+glibc-fedora-20080410T1907.tar.bz2
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index b5e5234..ba20f61 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,6 +1,6 @@
---- glibc-20080408T0706/ChangeLog	8 Apr 2008 00:05:15 -0000	1.11129
-+++ glibc-20080408T0706-fedora/ChangeLog	8 Apr 2008 07:59:45 -0000	1.8782.2.294
-@@ -4173,6 +4173,13 @@
+--- glibc-20080410T1907/ChangeLog	10 Apr 2008 18:56:10 -0000	1.11147
++++ glibc-20080410T1907-fedora/ChangeLog	10 Apr 2008 19:21:03 -0000	1.8782.2.295
+@@ -4283,6 +4283,13 @@
  	* include/sys/cdefs.h: Redefine __nonnull so that test for
  	incorrect parameters in the libc code itself are not omitted.
  
@@ -14,7 +14,7 @@
  2007-05-09  Jakub Jelinek  <jakub@redhat.com>
  
  	* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -4468,6 +4475,10 @@
+@@ -4578,6 +4585,10 @@
  	[BZ #4368]
  	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
  
@@ -25,7 +25,7 @@
  2007-04-16  Ulrich Drepper  <drepper@redhat.com>
  
  	[BZ #4364]
-@@ -5725,6 +5736,15 @@
+@@ -5835,6 +5846,15 @@
  	separators also if no non-zero digits found.
  	* stdlib/Makefile (tests): Add tst-strtod3.
  
@@ -41,8 +41,8 @@
  2006-12-09  Ulrich Drepper  <drepper@redhat.com>
  
  	[BZ #3632]
---- glibc-20080408T0706/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20080408T0706-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
+--- glibc-20080410T1907/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20080410T1907-fedora/ChangeLog.15	19 Dec 2006 19:05:40 -0000	1.1.6.3
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub@redhat.com>
@@ -108,8 +108,8 @@
  2004-08-30  Roland McGrath  <roland@frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20080408T0706/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
-+++ glibc-20080408T0706-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
+--- glibc-20080410T1907/ChangeLog.16	4 May 2006 16:05:24 -0000	1.1
++++ glibc-20080410T1907-fedora/ChangeLog.16	5 May 2006 06:11:52 -0000	1.1.2.1
 @@ -171,6 +171,11 @@
  	[BZ #2611]
  	* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
  2005-02-10  Roland McGrath  <roland@redhat.com>
  
  	[BZ #157]
---- glibc-20080408T0706/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
-+++ glibc-20080408T0706-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
+--- glibc-20080410T1907/csu/Makefile	1 Mar 2006 10:35:47 -0000	1.79
++++ glibc-20080410T1907-fedora/csu/Makefile	30 Nov 2006 17:07:37 -0000	1.74.2.6
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-20080408T0706/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20080408T0706-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20080410T1907/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20080410T1907-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
 @@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20080408T0706/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
-+++ glibc-20080408T0706-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
+--- glibc-20080410T1907/debug/tst-chk1.c	5 Mar 2008 06:51:37 -0000	1.19
++++ glibc-20080410T1907-fedora/debug/tst-chk1.c	5 Mar 2008 09:37:40 -0000	1.1.2.19
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,8 +349,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-20080408T0706/elf/ldconfig.c	19 Mar 2008 06:43:31 -0000	1.63
-+++ glibc-20080408T0706-fedora/elf/ldconfig.c	26 Mar 2008 11:22:14 -0000	1.47.2.18
+--- glibc-20080410T1907/elf/ldconfig.c	19 Mar 2008 06:43:31 -0000	1.63
++++ glibc-20080410T1907-fedora/elf/ldconfig.c	26 Mar 2008 11:22:14 -0000	1.47.2.18
 @@ -1000,17 +1000,19 @@ search_dirs (void)
  
  
@@ -432,8 +432,8 @@
      }
  
    if (! opt_ignore_aux_cache)
---- glibc-20080408T0706/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20080408T0706-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20080410T1907/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20080410T1907-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -458,8 +458,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20080408T0706/include/features.h	17 Oct 2007 20:26:55 -0000	1.49
-+++ glibc-20080408T0706-fedora/include/features.h	17 Oct 2007 20:33:39 -0000	1.35.2.19
+--- glibc-20080410T1907/include/features.h	17 Oct 2007 20:26:55 -0000	1.49
++++ glibc-20080410T1907-fedora/include/features.h	17 Oct 2007 20:33:39 -0000	1.35.2.19
 @@ -282,8 +282,13 @@
  #endif
  
@@ -476,16 +476,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-20080408T0706/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20080408T0706-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20080410T1907/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20080410T1907-fedora/include/bits/stdlib-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20080408T0706/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20080408T0706-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
+--- glibc-20080410T1907/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20080410T1907-fedora/include/bits/wchar-ldbl.h	1 Feb 2006 09:30:43 -0000	1.1.2.1
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20080408T0706/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
-+++ glibc-20080408T0706-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
+--- glibc-20080410T1907/intl/locale.alias	28 Oct 2007 01:39:54 -0000	1.24
++++ glibc-20080410T1907-fedora/intl/locale.alias	12 Dec 2007 18:13:23 -0000	1.23.2.2
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -495,8 +495,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20080408T0706/libio/stdio.h	8 Jan 2008 01:18:40 -0000	1.92
-+++ glibc-20080408T0706-fedora/libio/stdio.h	11 Jan 2008 07:45:13 -0000	1.78.2.13
+--- glibc-20080410T1907/libio/stdio.h	8 Jan 2008 01:18:40 -0000	1.92
++++ glibc-20080410T1907-fedora/libio/stdio.h	11 Jan 2008 07:45:13 -0000	1.78.2.13
 @@ -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.  */
@@ -510,8 +510,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20080408T0706/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
-+++ glibc-20080408T0706-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
+--- glibc-20080410T1907/locale/iso-4217.def	17 Feb 2007 07:46:20 -0000	1.20
++++ glibc-20080410T1907-fedora/locale/iso-4217.def	21 Feb 2007 11:15:50 -0000	1.15.2.5
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -603,8 +603,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20080408T0706/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
-+++ glibc-20080408T0706-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
+--- glibc-20080410T1907/locale/programs/locarchive.c	16 Jul 2007 00:54:59 -0000	1.25
++++ glibc-20080410T1907-fedora/locale/programs/locarchive.c	31 Jul 2007 17:45:53 -0000	1.21.2.4
 @@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
  /* forward decls for below */
  static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -636,9 +636,16 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-20080408T0706/localedata/ChangeLog	8 Apr 2008 00:40:35 -0000	1.693
-+++ glibc-20080408T0706-fedora/localedata/ChangeLog	8 Apr 2008 07:59:47 -0000	1.494.2.64
-@@ -4,9 +4,6 @@
+--- glibc-20080410T1907/localedata/ChangeLog	9 Apr 2008 18:16:26 -0000	1.694
++++ glibc-20080410T1907-fedora/localedata/ChangeLog	8 Apr 2008 07:59:47 -0000	1.494.2.64
+@@ -1,16 +1,9 @@
+-2008-04-09  Ulrich Drepper  <drepper@redhat.com>
+-
+-	* tst-langinfo.sh: Adjust for latest fr_FR locale changes.
+-
+ 2008-04-07  Ulrich Drepper  <drepper@redhat.com>
+ 
+ 	[BZ #6021]
  	* locales/es_ES: Fix p_cs_precedes and n_cs_precedes.
  	Use common collation definition.
  
@@ -648,8 +655,8 @@
  	[BZ #6004]
  	* locales/iso14651_t1_common: Fix first weight for U+1E60, U+1E62,
  	U+1E64, U+1E66, and U+1E68.
---- glibc-20080408T0706/localedata/Makefile	30 Mar 2008 23:40:06 -0000	1.108
-+++ glibc-20080408T0706-fedora/localedata/Makefile	8 Apr 2008 07:59:47 -0000	1.101.2.8
+--- glibc-20080410T1907/localedata/Makefile	30 Mar 2008 23:40:06 -0000	1.108
++++ glibc-20080410T1907-fedora/localedata/Makefile	8 Apr 2008 07:59:47 -0000	1.101.2.8
 @@ -224,6 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -658,8 +665,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20080408T0706/localedata/SUPPORTED	4 Mar 2008 22:10:33 -0000	1.109
-+++ glibc-20080408T0706-fedora/localedata/SUPPORTED	5 Mar 2008 09:37:42 -0000	1.71.2.21
+--- glibc-20080410T1907/localedata/SUPPORTED	4 Mar 2008 22:10:33 -0000	1.109
++++ glibc-20080410T1907-fedora/localedata/SUPPORTED	5 Mar 2008 09:37:42 -0000	1.71.2.21
 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -701,8 +708,78 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20080408T0706/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20080408T0706-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20080410T1907/localedata/tst-langinfo.sh	9 Apr 2008 18:16:14 -0000	1.7
++++ glibc-20080410T1907-fedora/localedata/tst-langinfo.sh	10 Oct 2007 21:00:45 -0000	1.5.2.1
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ # Test nl_langinfo.
+-# Copyright (C) 2000, 2001, 2003, 2007, 2008 Free Software Foundation, Inc.
++# Copyright (C) 2000, 2001, 2003, 2007 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ #
+ 
+@@ -245,13 +245,13 @@ de_DE.UTF-8          RADIXCHAR   ,
+ de_DE.UTF-8          THOUSEP     .
+ de_DE.UTF-8          YESEXPR     ^[jJyY].*
+ de_DE.UTF-8          NOEXPR      ^[nN].*
+-fr_FR.ISO-8859-1     ABDAY_1     dim.
+-fr_FR.ISO-8859-1     ABDAY_2     lun.
+-fr_FR.ISO-8859-1     ABDAY_3     mar.
+-fr_FR.ISO-8859-1     ABDAY_4     mer.
+-fr_FR.ISO-8859-1     ABDAY_5     jeu.
+-fr_FR.ISO-8859-1     ABDAY_6     ven.
+-fr_FR.ISO-8859-1     ABDAY_7     sam.
++fr_FR.ISO-8859-1     ABDAY_1     dim
++fr_FR.ISO-8859-1     ABDAY_2     lun
++fr_FR.ISO-8859-1     ABDAY_3     mar
++fr_FR.ISO-8859-1     ABDAY_4     mer
++fr_FR.ISO-8859-1     ABDAY_5     jeu
++fr_FR.ISO-8859-1     ABDAY_6     ven
++fr_FR.ISO-8859-1     ABDAY_7     sam
+ fr_FR.ISO-8859-1     DAY_1       dimanche
+ fr_FR.ISO-8859-1     DAY_2       lundi
+ fr_FR.ISO-8859-1     DAY_3       mardi
+@@ -259,18 +259,18 @@ fr_FR.ISO-8859-1     DAY_4       mercred
+ fr_FR.ISO-8859-1     DAY_5       jeudi
+ fr_FR.ISO-8859-1     DAY_6       vendredi
+ fr_FR.ISO-8859-1     DAY_7       samedi
+-fr_FR.ISO-8859-1     ABMON_1     janv.
+-fr_FR.ISO-8859-1     ABMON_2     févr.
+-fr_FR.ISO-8859-1     ABMON_3     mars
+-fr_FR.ISO-8859-1     ABMON_4     avril
++fr_FR.ISO-8859-1     ABMON_1     jan
++fr_FR.ISO-8859-1     ABMON_2     fév
++fr_FR.ISO-8859-1     ABMON_3     mar
++fr_FR.ISO-8859-1     ABMON_4     avr
+ fr_FR.ISO-8859-1     ABMON_5     mai
+-fr_FR.ISO-8859-1     ABMON_6     juin
+-fr_FR.ISO-8859-1     ABMON_7     juil.
+-fr_FR.ISO-8859-1     ABMON_8     août
+-fr_FR.ISO-8859-1     ABMON_9     sept.
+-fr_FR.ISO-8859-1     ABMON_10    oct.
+-fr_FR.ISO-8859-1     ABMON_11    nov.
+-fr_FR.ISO-8859-1     ABMON_12    déc.
++fr_FR.ISO-8859-1     ABMON_6     jun
++fr_FR.ISO-8859-1     ABMON_7     jui
++fr_FR.ISO-8859-1     ABMON_8     aoû
++fr_FR.ISO-8859-1     ABMON_9     sep
++fr_FR.ISO-8859-1     ABMON_10    oct
++fr_FR.ISO-8859-1     ABMON_11    nov
++fr_FR.ISO-8859-1     ABMON_12    déc
+ fr_FR.ISO-8859-1     MON_1       janvier
+ fr_FR.ISO-8859-1     MON_2       février
+ fr_FR.ISO-8859-1     MON_3       mars
+@@ -284,7 +284,7 @@ fr_FR.ISO-8859-1     MON_10      octobre
+ fr_FR.ISO-8859-1     MON_11      novembre
+ fr_FR.ISO-8859-1     MON_12      décembre
+ fr_FR.ISO-8859-1     D_T_FMT     "%a %d %b %Y %T %Z"
+-fr_FR.ISO-8859-1     D_FMT       "%d/%m/%Y"
++fr_FR.ISO-8859-1     D_FMT       "%d.%m.%Y"
+ fr_FR.ISO-8859-1     T_FMT       "%T"
+ fr_FR.ISO-8859-1     RADIXCHAR   ,
+ fr_FR.ISO-8859-1     THOUSEP     " "
+--- glibc-20080410T1907/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20080410T1907-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061
  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>"
@@ -717,8 +794,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20080408T0706/localedata/locales/en_GB	30 Sep 2007 18:24:20 -0000	1.15
-+++ glibc-20080408T0706-fedora/localedata/locales/en_GB	3 Oct 2007 19:32:28 -0000	1.10.2.5
+--- glibc-20080410T1907/localedata/locales/en_GB	30 Sep 2007 18:24:20 -0000	1.15
++++ glibc-20080410T1907-fedora/localedata/locales/en_GB	3 Oct 2007 19:32:28 -0000	1.10.2.5
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075
  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>"
@@ -730,8 +807,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-20080408T0706/localedata/locales/fr_FR	8 Apr 2008 00:17:54 -0000	1.15
-+++ glibc-20080408T0706-fedora/localedata/locales/fr_FR	10 Oct 2007 21:00:45 -0000	1.10.2.3
+--- glibc-20080410T1907/localedata/locales/fr_FR	8 Apr 2008 00:17:54 -0000	1.15
++++ glibc-20080410T1907-fedora/localedata/locales/fr_FR	10 Oct 2007 21:00:45 -0000	1.10.2.3
 @@ -3,35 +3,33 @@ escape_char  /
  %
  % French Language Locale for France
@@ -845,8 +922,8 @@
  t_fmt   "<U0025><U0054>"
  am_pm   "";""
  t_fmt_ampm ""
---- glibc-20080408T0706/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20080408T0706-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20080410T1907/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20080410T1907-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -917,8 +994,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20080408T0706/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20080408T0706-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20080410T1907/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20080410T1907-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -946,8 +1023,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20080408T0706/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
-+++ glibc-20080408T0706-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
+--- glibc-20080410T1907/malloc/mcheck.c	19 May 2007 04:27:20 -0000	1.20
++++ glibc-20080410T1907-fedora/malloc/mcheck.c	21 May 2007 20:01:08 -0000	1.18.2.2
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1023,8 +1100,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-20080408T0706/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
-+++ glibc-20080408T0706-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20080410T1907/malloc/mtrace.c	25 Jan 2007 00:43:38 -0000	1.43
++++ glibc-20080410T1907-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
 @@ -40,6 +40,18 @@
  # include <libio/iolibio.h>
  # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -1080,8 +1157,8 @@
    __memalign_hook = tr_memalignhook;
    __malloc_hook = tr_mallochook;
  
---- glibc-20080408T0706/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
-+++ glibc-20080408T0706-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
+--- glibc-20080410T1907/manual/libc.texinfo	31 Jan 2008 01:43:04 -0000	1.98
++++ glibc-20080410T1907-fedora/manual/libc.texinfo	31 Jan 2008 08:43:19 -0000	1.94.2.4
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -1091,8 +1168,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-20080408T0706/misc/sys/cdefs.h	3 Oct 2007 18:27:02 -0000	1.73
-+++ glibc-20080408T0706-fedora/misc/sys/cdefs.h	3 Oct 2007 19:32:28 -0000	1.58.2.10
+--- glibc-20080410T1907/misc/sys/cdefs.h	3 Oct 2007 18:27:02 -0000	1.73
++++ glibc-20080410T1907-fedora/misc/sys/cdefs.h	3 Oct 2007 19:32:28 -0000	1.58.2.10
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -1136,17 +1213,17 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-20080408T0706/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
-+++ glibc-20080408T0706-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
+--- glibc-20080410T1907/nis/nss	28 Apr 2006 21:02:23 -0000	1.3
++++ glibc-20080410T1907-fedora/nis/nss	1 May 2006 08:02:53 -0000	1.2.2.2
 @@ -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-20080408T0706/nptl/ChangeLog	8 Apr 2008 06:36:47 -0000	1.1061
-+++ glibc-20080408T0706-fedora/nptl/ChangeLog	8 Apr 2008 07:59:49 -0000	1.706.2.152
-@@ -3143,6 +3143,15 @@
+--- glibc-20080410T1907/nptl/ChangeLog	9 Apr 2008 17:59:06 -0000	1.1062
++++ glibc-20080410T1907-fedora/nptl/ChangeLog	10 Apr 2008 19:21:05 -0000	1.706.2.153
+@@ -3148,6 +3148,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1162,7 +1239,7 @@
  2005-07-11  Jakub Jelinek  <jakub@redhat.com>
  
  	[BZ #1102]
-@@ -3879,6 +3888,11 @@
+@@ -3884,6 +3893,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1174,7 +1251,7 @@
  2004-09-02  Ulrich Drepper  <drepper@redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -5953,6 +5967,11 @@
+@@ -5958,6 +5972,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1186,8 +1263,8 @@
  2003-07-25  Jakub Jelinek  <jakub@redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20080408T0706/nptl/Makefile	1 Feb 2008 00:01:18 -0000	1.193
-+++ glibc-20080408T0706-fedora/nptl/Makefile	1 Feb 2008 10:19:38 -0000	1.157.2.35
+--- glibc-20080410T1907/nptl/Makefile	1 Feb 2008 00:01:18 -0000	1.193
++++ glibc-20080410T1907-fedora/nptl/Makefile	1 Feb 2008 10:19:38 -0000	1.157.2.35
 @@ -339,7 +339,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1220,8 +1297,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20080408T0706/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20080408T0706-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20080410T1907/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20080410T1907-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1246,8 +1323,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20080408T0706/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20080408T0706-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20080410T1907/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20080410T1907-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1255,8 +1332,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20080408T0706/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	8 Mar 2008 01:57:04 -0000	1.16
-+++ glibc-20080408T0706-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	14 Mar 2008 22:36:45 -0000	1.8.2.9
+--- glibc-20080410T1907/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	8 Mar 2008 01:57:04 -0000	1.16
++++ glibc-20080410T1907-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h	14 Mar 2008 22:36:45 -0000	1.8.2.9
 @@ -181,4 +181,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1265,8 +1342,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* posix_opt.h */
---- glibc-20080408T0706/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
-+++ glibc-20080408T0706-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
+--- glibc-20080410T1907/nscd/nscd.conf	6 Nov 2007 00:50:48 -0000	1.16
++++ glibc-20080410T1907-fedora/nscd/nscd.conf	12 Dec 2007 18:13:28 -0000	1.8.2.7
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1276,8 +1353,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-20080408T0706/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
-+++ glibc-20080408T0706-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
+--- glibc-20080410T1907/nscd/nscd.init	1 Dec 2006 20:12:45 -0000	1.10
++++ glibc-20080410T1907-fedora/nscd/nscd.init	12 Dec 2007 18:13:28 -0000	1.6.2.6
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1334,8 +1411,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20080408T0706/posix/Makefile	20 Nov 2007 00:41:16 -0000	1.203
-+++ glibc-20080408T0706-fedora/posix/Makefile	12 Dec 2007 18:13:30 -0000	1.171.2.27
+--- glibc-20080410T1907/posix/Makefile	20 Nov 2007 00:41:16 -0000	1.203
++++ glibc-20080410T1907-fedora/posix/Makefile	12 Dec 2007 18:13:30 -0000	1.171.2.27
 @@ -301,11 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1352,8 +1429,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-20080408T0706/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20080408T0706-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20080410T1907/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20080410T1907-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
 @@ -0,0 +1,15 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1370,8 +1447,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20080408T0706/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
-+++ glibc-20080408T0706-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
+--- glibc-20080410T1907/streams/Makefile	23 Oct 2002 23:48:41 -0000	1.4
++++ glibc-20080410T1907-fedora/streams/Makefile	14 Mar 2008 22:36:46 -0000	1.4.2.1
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1381,8 +1458,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-20080408T0706/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20080408T0706-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20080410T1907/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20080410T1907-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1398,8 +1475,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-20080408T0706/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
-+++ glibc-20080408T0706-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
+--- glibc-20080410T1907/sysdeps/i386/Makefile	6 Mar 2005 00:18:16 -0000	1.20
++++ glibc-20080410T1907-fedora/sysdeps/i386/Makefile	30 Jun 2006 09:16:34 -0000	1.16.2.4
 @@ -64,4 +64,12 @@ endif
  
  ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1413,8 +1490,8 @@
 +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
 +CFLAGS-.oS += -mno-tls-direct-seg-refs
  endif
---- glibc-20080408T0706/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20080408T0706-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20080410T1907/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20080410T1907-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1426,8 +1503,8 @@
  endif
  endif
  
---- glibc-20080408T0706/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20080408T0706-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20080410T1907/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20080410T1907-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -1779,8 +1856,8 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
---- glibc-20080408T0706/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20080408T0706-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20080410T1907/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20080410T1907-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1866,8 +1943,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20080408T0706/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
-+++ glibc-20080408T0706-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
+--- glibc-20080410T1907/sysdeps/powerpc/powerpc64/Makefile	2 Feb 2006 08:23:44 -0000	1.8
++++ glibc-20080410T1907-fedora/sysdeps/powerpc/powerpc64/Makefile	30 Nov 2006 17:07:38 -0000	1.4.2.5
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -1876,8 +1953,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-20080408T0706/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
-+++ glibc-20080408T0706-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
+--- glibc-20080410T1907/sysdeps/unix/nice.c	15 Aug 2006 05:24:45 -0000	1.7
++++ glibc-20080410T1907-fedora/sysdeps/unix/nice.c	15 Aug 2006 05:53:50 -0000	1.6.2.2
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -1892,8 +1969,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 00:24:52 -0000	1.15
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/check_pf.c	3 Jan 2008 20:20:42 -0000	1.3.2.11
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -1909,8 +1986,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/configure	28 Oct 2006 06:42:16 -0000	1.93
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/configure	12 Dec 2007 23:01:37 -0000	1.88.2.4
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/configure	28 Oct 2006 06:42:16 -0000	1.93
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/configure	12 Dec 2007 23:01:37 -0000	1.88.2.4
 @@ -22,23 +22,170 @@ if test -n "$sysheaders"; then
  fi
  
@@ -2148,8 +2225,8 @@
    fi
  fi
  
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Mar 2008 07:33:46 -0000	1.27
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	14 Mar 2008 17:22:27 -0000	1.14.2.13
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Mar 2008 07:33:46 -0000	1.27
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	14 Mar 2008 17:22:27 -0000	1.14.2.13
 @@ -17,9 +17,12 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -2195,8 +2272,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 05:26:34 -0000	1.6
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/futimesat.c	3 Feb 2006 09:43:55 -0000	1.1.2.7
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -2239,8 +2316,8 @@
      {
        size_t filelen = strlen (file);
        static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/netlinkaccess.h	8 Jan 2006 08:21:15 -0000	1.3
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h	10 Dec 2006 10:51:12 -0000	1.1.2.3
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2266,8 +2343,8 @@
  
  struct netlink_res
  {
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2277,8 +2354,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
@@ -2324,8 +2401,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/i386/clone.S	14 Dec 2006 09:06:34 -0000	1.22.2.6
 @@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
@@ -2344,8 +2421,8 @@
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2406,8 +2483,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2440,29 +2517,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-20080408T0706/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
 @@ -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-20080408T0706/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
 @@ -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-20080408T0706/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ glibc-20080408T0706-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
+--- glibc-20080410T1907/sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
++++ glibc-20080410T1907-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S	14 Dec 2006 09:06:34 -0000	1.4.2.4
 @@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
@@ -2481,20 +2558,3 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
---- libc/locale/programs/ld-collate.c	19 Mar 2008 06:43:32 -0000	1.127
-+++ libc/locale/programs/ld-collate.c	8 Apr 2008 15:03:46 -0000	1.128
-@@ -3195,6 +3195,14 @@ error while adding equivalent collating 
- 	  break;
- 
- 	case tok_script:
-+	  /* Ignore the rest of the line if we don't need the input of
-+	     this line.  */
-+	  if (ignore_content)
-+	    {
-+	      lr_ignore_rest (ldfile, 0);
-+	      break;
-+	    }
-+
- 	  /* We get told about the scripts we know.  */
- 	  arg = lr_token (ldfile, charmap, result, repertoire, verbose);
- 	  if (arg->tok != tok_bsymbol)
diff --git a/glibc.spec b/glibc.spec
index aad2122..6f93072 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcdate 20080408T0706
+%define glibcdate 20080410T1907
 %define glibcname glibc
-%define glibcsrcdir glibc-20080408T0706
+%define glibcsrcdir glibc-20080410T1907
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.7.90
-Release: 14
+Release: 15
 # 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
@@ -285,8 +285,8 @@ GCC="gcc -m64"
 GXX="g++ -m64"
 %endif
 
-#BuildFlags="$BuildFlags -DNDEBUG=1 -fasynchronous-unwind-tables"
-BuildFlags="$BuildFlags -fasynchronous-unwind-tables"
+BuildFlags="$BuildFlags -DNDEBUG=1 -fasynchronous-unwind-tables"
+#BuildFlags="$BuildFlags -fasynchronous-unwind-tables"
 EnableKernel="--enable-kernel=%{enablekernel}"
 echo "$GCC" > Gcc
 AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkaio\|powerpc-cpu\)\( \|$\)!!g;s! \+$!!;s! !,!g;s!^!,!;/^,\*$/d'`
@@ -980,6 +980,14 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Apr 10 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-15
+- update to trunk
+  - misc fixes (BZ#4314, BZ#4407, BZ#5209, BZ#5436, BZ#5768, BZ#5998,
+    BZ#6024)
+- restart sshd in %post when upstart is used - it doesn't have
+  /dev/initctl (#441763)
+- disable assert checking again
+
 * Tue Apr  8 2008 Jakub Jelinek <jakub@redhat.com> 2.7.90-14
 - update to trunk
   - misc fixes (BZ#5443, BZ#5475, BZ#5478, BZ#5939, BZ#5979, BZ#5995,
diff --git a/sources b/sources
index 2938960..d2a6794 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-dcf32b9050d804f3a639ada9f0345c7d  glibc-20080408T0706.tar.bz2
-86c023a9cda256b569eab12843abd668  glibc-fedora-20080408T0706.tar.bz2
+082137b5a0706b63400f2c5a05908668  glibc-20080410T1907.tar.bz2
+1947504457acdbd670324296724f7487  glibc-fedora-20080410T1907.tar.bz2