diff --git a/.cvsignore b/.cvsignore
index 1468f54..a2fc35b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-glibc-20050427T1912.tar.bz2
-glibc-fedora-20050427T1912.tar.bz2
+glibc-20050428T0846.tar.bz2
+glibc-fedora-20050428T0846.tar.bz2
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 921619b..925f0d9 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,6 +1,9 @@
---- glibc-20050427T1912/ChangeLog	27 Apr 2005 09:50:36 -0000	1.9338
-+++ glibc-20050427T1912-fedora/ChangeLog	27 Apr 2005 11:40:16 -0000	1.8782.2.95
-@@ -1,3 +1,11 @@
+--- glibc-20050428T0846/ChangeLog	28 Apr 2005 06:27:13 -0000	1.9339
++++ glibc-20050428T0846-fedora/ChangeLog	28 Apr 2005 09:10:04 -0000	1.8782.2.96
+@@ -3,6 +3,14 @@
+ 	* nscd/connections.c (nscd_run): Use time() value in prune_cache
+ 	call, not timeout value, since the latter might be from another clock.
+ 
 +2005-04-27  Jakub Jelinek  <jakub@redhat.com>
 +
 +	* elf/rtld.c (dl_main): Call _dl_init_linuxthreads_paths
@@ -12,7 +15,7 @@
  2005-04-27  Roland McGrath  <roland@redhat.com>
  
  	[BZ #877]
-@@ -613,17 +621,6 @@
+@@ -618,17 +626,6 @@
  
  2005-03-28  Roland McGrath  <roland@redhat.com>
  
@@ -30,7 +33,7 @@
  	* locale/langinfo.h (_NL_LOCALE_NAME): New macro.
  	[__USE_GNU] (NL_LOCALE_NAME): New macro.
  	* locale/nl_langinfo.c: Grok special item value for _NL_LOCALE_NAME,
-@@ -1692,6 +1689,18 @@
+@@ -1697,6 +1694,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -49,8 +52,8 @@
  2005-02-10  Roland McGrath  <roland@redhat.com>
  
  	[BZ #157]
---- glibc-20050427T1912/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20050427T1912-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20050428T0846/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20050428T0846-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -1352,6 +1352,11 @@
  	* sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the
  	end of inline assembler code.
@@ -100,8 +103,8 @@
  	* sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add
  	__extension__ to hexadecimal floating constant notation.
  	* sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL):
---- glibc-20050427T1912/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20050427T1912-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20050428T0846/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20050428T0846-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
 @@ -7729,6 +7729,13 @@
  
  	* Versions.def [ld]: Add GLIBC_2.2.1.
@@ -128,8 +131,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel@lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20050427T1912/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20050427T1912-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20050428T0846/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20050428T0846-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub@redhat.com>
@@ -210,8 +213,8 @@
  2004-08-30  Roland McGrath  <roland@frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20050427T1912/Versions.def	28 Mar 2005 20:42:44 -0000	1.61
-+++ glibc-20050427T1912-fedora/Versions.def	24 Mar 2005 08:18:51 -0000	1.58.2.3
+--- glibc-20050428T0846/Versions.def	28 Mar 2005 20:42:44 -0000	1.61
++++ glibc-20050428T0846-fedora/Versions.def	24 Mar 2005 08:18:51 -0000	1.58.2.3
 @@ -20,7 +20,6 @@ libc {
    GLIBC_2.3.2
    GLIBC_2.3.3
@@ -228,16 +231,16 @@
  }
  libnsl {
    GLIBC_2.0
---- glibc-20050427T1912/version.h	20 Dec 2004 23:37:41 -0000	1.67
-+++ glibc-20050427T1912-fedora/version.h	15 Apr 2005 09:32:42 -0000	1.65.2.4
+--- glibc-20050428T0846/version.h	20 Dec 2004 23:37:41 -0000	1.67
++++ glibc-20050428T0846-fedora/version.h	15 Apr 2005 09:32:42 -0000	1.65.2.4
 @@ -1,4 +1,4 @@
  /* This file just defines the current version number of libc.  */
  
  #define RELEASE "development"
 -#define VERSION "2.3.90"
 +#define VERSION "2.3.5"
---- glibc-20050427T1912/csu/elf-init.c	14 Feb 2005 21:21:36 -0000	1.5
-+++ glibc-20050427T1912-fedora/csu/elf-init.c	3 Mar 2005 13:33:53 -0000	1.3.2.3
+--- glibc-20050428T0846/csu/elf-init.c	14 Feb 2005 21:21:36 -0000	1.5
++++ glibc-20050428T0846-fedora/csu/elf-init.c	3 Mar 2005 13:33:53 -0000	1.3.2.3
 @@ -44,6 +44,24 @@ extern void (*__init_array_start []) (vo
  extern void (*__init_array_end []) (void) attribute_hidden;
  extern void (*__fini_array_start []) (void) attribute_hidden;
@@ -263,8 +266,8 @@
  #endif
  
  /* These function symbols are provided for the .init/.fini section entry
---- glibc-20050427T1912/debug/Versions	1 Mar 2005 00:12:31 -0000	1.6
-+++ glibc-20050427T1912-fedora/debug/Versions	3 Mar 2005 16:52:26 -0000	1.3.4.3
+--- glibc-20050428T0846/debug/Versions	1 Mar 2005 00:12:31 -0000	1.6
++++ glibc-20050428T0846-fedora/debug/Versions	3 Mar 2005 16:52:26 -0000	1.3.4.3
 @@ -18,10 +18,4 @@ libc {
      __printf_chk; __fprintf_chk; __vprintf_chk; __vfprintf_chk;
      __gets_chk;
@@ -276,8 +279,8 @@
 -    __recv_chk; __recvfrom_chk;
 -  }
  }
---- glibc-20050427T1912/debug/fgets_chk.c	21 Feb 2005 22:53:35 -0000	1.1
-+++ glibc-20050427T1912-fedora/debug/fgets_chk.c	3 Mar 2005 16:52:26 -0000	1.1.2.2
+--- glibc-20050428T0846/debug/fgets_chk.c	21 Feb 2005 22:53:35 -0000	1.1
++++ glibc-20050428T0846-fedora/debug/fgets_chk.c	3 Mar 2005 16:52:26 -0000	1.1.2.2
 @@ -30,6 +30,7 @@
  #include <stdio.h>
  #include <sys/param.h>
@@ -291,8 +294,8 @@
    return result;
  }
 +#endif
---- glibc-20050427T1912/debug/fgets_u_chk.c	21 Feb 2005 22:53:35 -0000	1.1
-+++ glibc-20050427T1912-fedora/debug/fgets_u_chk.c	3 Mar 2005 16:52:26 -0000	1.1.2.2
+--- glibc-20050428T0846/debug/fgets_u_chk.c	21 Feb 2005 22:53:35 -0000	1.1
++++ glibc-20050428T0846-fedora/debug/fgets_u_chk.c	3 Mar 2005 16:52:26 -0000	1.1.2.2
 @@ -30,6 +30,7 @@
  #include <stdio.h>
  #include <sys/param.h>
@@ -306,8 +309,8 @@
    return result;
  }
 +#endif
---- glibc-20050427T1912/debug/getcwd_chk.c	1 Mar 2005 00:42:41 -0000	1.2
-+++ glibc-20050427T1912-fedora/debug/getcwd_chk.c	3 Mar 2005 16:52:26 -0000	1.2.2.2
+--- glibc-20050428T0846/debug/getcwd_chk.c	1 Mar 2005 00:42:41 -0000	1.2
++++ glibc-20050428T0846-fedora/debug/getcwd_chk.c	3 Mar 2005 16:52:26 -0000	1.2.2.2
 @@ -20,7 +20,7 @@
  #include <unistd.h>
  #include <sys/param.h>
@@ -322,8 +325,8 @@
    return __getcwd (buf, size);
  }
 +#endif
---- glibc-20050427T1912/debug/getwd_chk.c	21 Feb 2005 22:53:35 -0000	1.1
-+++ glibc-20050427T1912-fedora/debug/getwd_chk.c	3 Mar 2005 16:52:26 -0000	1.1.2.2
+--- glibc-20050428T0846/debug/getwd_chk.c	21 Feb 2005 22:53:35 -0000	1.1
++++ glibc-20050428T0846-fedora/debug/getwd_chk.c	3 Mar 2005 16:52:26 -0000	1.1.2.2
 @@ -20,7 +20,7 @@
  #include <unistd.h>
  #include <sys/param.h>
@@ -338,8 +341,8 @@
  link_warning (getwd,
  	      "the `getwd' function is dangerous and should not be used.")
 +#endif
---- glibc-20050427T1912/debug/pread64_chk.c	19 Mar 2005 00:08:11 -0000	1.4
-+++ glibc-20050427T1912-fedora/debug/pread64_chk.c	19 Mar 2005 20:18:00 -0000	1.3.2.3
+--- glibc-20050428T0846/debug/pread64_chk.c	19 Mar 2005 00:08:11 -0000	1.4
++++ glibc-20050428T0846-fedora/debug/pread64_chk.c	19 Mar 2005 20:18:00 -0000	1.3.2.3
 @@ -19,7 +19,7 @@
  #include <unistd.h>
  #include <sys/param.h>
@@ -354,8 +357,8 @@
    return __pread64 (fd, buf, nbytes, offset);
  }
 +#endif
---- glibc-20050427T1912/debug/pread_chk.c	19 Mar 2005 00:07:31 -0000	1.4
-+++ glibc-20050427T1912-fedora/debug/pread_chk.c	19 Mar 2005 20:18:00 -0000	1.3.2.3
+--- glibc-20050428T0846/debug/pread_chk.c	19 Mar 2005 00:07:31 -0000	1.4
++++ glibc-20050428T0846-fedora/debug/pread_chk.c	19 Mar 2005 20:18:00 -0000	1.3.2.3
 @@ -19,7 +19,7 @@
  #include <unistd.h>
  #include <sys/param.h>
@@ -370,8 +373,8 @@
    return __pread (fd, buf, nbytes, offset);
  }
 +#endif
---- glibc-20050427T1912/debug/read_chk.c	1 Mar 2005 00:35:58 -0000	1.4
-+++ glibc-20050427T1912-fedora/debug/read_chk.c	3 Mar 2005 16:52:26 -0000	1.4.2.2
+--- glibc-20050428T0846/debug/read_chk.c	1 Mar 2005 00:35:58 -0000	1.4
++++ glibc-20050428T0846-fedora/debug/read_chk.c	3 Mar 2005 16:52:26 -0000	1.4.2.2
 @@ -23,7 +23,7 @@
  # include <sysdep.h>
  #endif
@@ -386,8 +389,8 @@
  #endif
  }
 +#endif
---- glibc-20050427T1912/debug/readlink_chk.c	1 Mar 2005 00:41:15 -0000	1.3
-+++ glibc-20050427T1912-fedora/debug/readlink_chk.c	3 Mar 2005 16:52:26 -0000	1.3.2.2
+--- glibc-20050428T0846/debug/readlink_chk.c	1 Mar 2005 00:41:15 -0000	1.3
++++ glibc-20050428T0846-fedora/debug/readlink_chk.c	3 Mar 2005 16:52:26 -0000	1.3.2.2
 @@ -23,7 +23,7 @@
  # include <sysdep.h>
  #endif
@@ -402,8 +405,8 @@
  #endif
  }
 +#endif
---- glibc-20050427T1912/debug/recv_chk.c	6 Mar 2005 21:24:42 -0000	1.2
-+++ glibc-20050427T1912-fedora/debug/recv_chk.c	19 Mar 2005 20:18:00 -0000	1.1.2.3
+--- glibc-20050428T0846/debug/recv_chk.c	6 Mar 2005 21:24:42 -0000	1.2
++++ glibc-20050428T0846-fedora/debug/recv_chk.c	19 Mar 2005 20:18:00 -0000	1.1.2.3
 @@ -19,7 +19,7 @@
  #include <sys/param.h>
  #include <sys/socket.h>
@@ -418,8 +421,8 @@
    return __recv (fd, buf, n, flags);
  }
 +#endif
---- glibc-20050427T1912/debug/recvfrom_chk.c	6 Mar 2005 21:24:16 -0000	1.2
-+++ glibc-20050427T1912-fedora/debug/recvfrom_chk.c	19 Mar 2005 20:18:00 -0000	1.1.2.3
+--- glibc-20050428T0846/debug/recvfrom_chk.c	6 Mar 2005 21:24:16 -0000	1.2
++++ glibc-20050428T0846-fedora/debug/recvfrom_chk.c	19 Mar 2005 20:18:00 -0000	1.1.2.3
 @@ -19,7 +19,7 @@
  #include <sys/param.h>
  #include <sys/socket.h>
@@ -434,8 +437,8 @@
    return __recvfrom (fd, buf, n, flags, addr, addr_len);
  }
 +#endif
---- glibc-20050427T1912/debug/tst-chk1.c	19 Mar 2005 00:09:08 -0000	1.7
-+++ glibc-20050427T1912-fedora/debug/tst-chk1.c	19 Mar 2005 21:04:10 -0000	1.1.2.10
+--- glibc-20050428T0846/debug/tst-chk1.c	19 Mar 2005 00:09:08 -0000	1.7
++++ glibc-20050428T0846-fedora/debug/tst-chk1.c	19 Mar 2005 21:04:10 -0000	1.1.2.10
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -473,8 +476,8 @@
  	  CHK_FAIL_START
  	  if (getwd (getcwdbuf + 2) != getcwdbuf + 2)
  	    FAIL ();
---- glibc-20050427T1912/elf/dl-load.c	26 Apr 2005 04:25:58 -0000	1.268
-+++ glibc-20050427T1912-fedora/elf/dl-load.c	27 Apr 2005 11:40:21 -0000	1.249.2.12
+--- glibc-20050428T0846/elf/dl-load.c	26 Apr 2005 04:25:58 -0000	1.268
++++ glibc-20050428T0846-fedora/elf/dl-load.c	27 Apr 2005 11:40:21 -0000	1.249.2.12
 @@ -644,7 +644,7 @@ _dl_init_paths (const char *llp)
  
    /* First set up the rest of the default search directory entries.  */
@@ -519,8 +522,8 @@
  static void
  __attribute__ ((noreturn, noinline))
  lose (int code, int fd, const char *name, char *realname, struct link_map *l,
---- glibc-20050427T1912/elf/dl-support.c	7 Apr 2005 20:57:04 -0000	1.88
-+++ glibc-20050427T1912-fedora/elf/dl-support.c	15 Apr 2005 09:32:44 -0000	1.84.2.5
+--- glibc-20050428T0846/elf/dl-support.c	7 Apr 2005 20:57:04 -0000	1.88
++++ glibc-20050428T0846-fedora/elf/dl-support.c	15 Apr 2005 09:32:44 -0000	1.84.2.5
 @@ -281,6 +281,11 @@ _dl_non_dynamic_init (void)
    if (_dl_platform != NULL)
      _dl_platformlen = strlen (_dl_platform);
@@ -533,8 +536,8 @@
    /* Scan for a program header telling us the stack is nonexecutable.  */
    if (_dl_phdr != NULL)
      for (uint_fast16_t i = 0; i < _dl_phnum; ++i)
---- glibc-20050427T1912/elf/ldconfig.c	7 Apr 2005 20:56:56 -0000	1.49
-+++ glibc-20050427T1912-fedora/elf/ldconfig.c	15 Apr 2005 09:32:44 -0000	1.47.2.3
+--- glibc-20050428T0846/elf/ldconfig.c	7 Apr 2005 20:56:56 -0000	1.49
++++ glibc-20050428T0846-fedora/elf/ldconfig.c	15 Apr 2005 09:32:44 -0000	1.47.2.3
 @@ -953,17 +953,19 @@ search_dirs (void)
  
  
@@ -616,8 +619,8 @@
      }
  
    search_dirs ();
---- glibc-20050427T1912/elf/rtld.c	7 Apr 2005 20:56:48 -0000	1.351
-+++ glibc-20050427T1912-fedora/elf/rtld.c	27 Apr 2005 11:40:21 -0000	1.330.2.18
+--- glibc-20050428T0846/elf/rtld.c	7 Apr 2005 20:56:48 -0000	1.351
++++ glibc-20050428T0846-fedora/elf/rtld.c	27 Apr 2005 11:40:21 -0000	1.330.2.18
 @@ -1335,6 +1335,59 @@ ld.so does not support TLS, but program 
    ++GL(dl_ns)[LM_ID_BASE]._ns_nloaded;
    ++GL(dl_load_adds);
@@ -736,8 +739,8 @@
    if (__builtin_expect (*first_preload != NULL, 0))
      {
        /* Set up PRELOADS with a vector of the preloaded libraries.  */
---- glibc-20050427T1912/elf/tst-tls10.h	17 Apr 2003 19:19:01 -0000	1.1
-+++ glibc-20050427T1912-fedora/elf/tst-tls10.h	22 Sep 2004 21:20:48 -0000	1.1.2.1
+--- glibc-20050428T0846/elf/tst-tls10.h	17 Apr 2003 19:19:01 -0000	1.1
++++ glibc-20050428T0846-fedora/elf/tst-tls10.h	22 Sep 2004 21:20:48 -0000	1.1.2.1
 @@ -1,8 +1,8 @@
  #include <tls.h>
  #include <stdlib.h>
@@ -749,8 +752,8 @@
  # define USE_TLS__THREAD
  
  struct A
---- glibc-20050427T1912/iconv/iconvconfig.c	3 Mar 2005 08:28:02 -0000	1.23
-+++ glibc-20050427T1912-fedora/iconv/iconvconfig.c	3 Mar 2005 14:03:15 -0000	1.19.2.4
+--- glibc-20050428T0846/iconv/iconvconfig.c	3 Mar 2005 08:28:02 -0000	1.23
++++ glibc-20050428T0846-fedora/iconv/iconvconfig.c	3 Mar 2005 14:03:15 -0000	1.19.2.4
 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed)
                                module name offset
                           (following last entry with step count 0)
@@ -827,8 +830,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20050427T1912/include/features.h	17 Feb 2005 01:10:58 -0000	1.38
-+++ glibc-20050427T1912-fedora/include/features.h	3 Mar 2005 14:03:16 -0000	1.35.2.7
+--- glibc-20050428T0846/include/features.h	17 Feb 2005 01:10:58 -0000	1.38
++++ glibc-20050428T0846-fedora/include/features.h	3 Mar 2005 14:03:16 -0000	1.35.2.7
 @@ -262,7 +262,13 @@
  # define __USE_REENTRANT	1
  #endif
@@ -853,8 +856,8 @@
  
  #define __GLIBC_PREREQ(maj, min) \
  	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
---- glibc-20050427T1912/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20050427T1912-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20050428T0846/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20050428T0846-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
 @@ -58,8 +58,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -864,8 +867,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20050427T1912/libio/stdio.h	7 Jan 2005 19:30:00 -0000	1.81
-+++ glibc-20050427T1912-fedora/libio/stdio.h	8 Feb 2005 10:04:09 -0000	1.78.2.4
+--- glibc-20050428T0846/libio/stdio.h	7 Jan 2005 19:30:00 -0000	1.81
++++ glibc-20050428T0846-fedora/libio/stdio.h	8 Feb 2005 10:04:09 -0000	1.78.2.4
 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
  extern struct _IO_FILE *stdin;		/* Standard input stream.  */
  extern struct _IO_FILE *stdout;		/* Standard output stream.  */
@@ -879,8 +882,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20050427T1912/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20050427T1912-fedora/libio/bits/stdio2.h	19 Mar 2005 20:18:03 -0000	1.1.2.5
+--- glibc-20050428T0846/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20050428T0846-fedora/libio/bits/stdio2.h	19 Mar 2005 20:18:03 -0000	1.1.2.5
 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
  extern int __vprintf_chk (int __flag, __const char *__restrict __format,
  			  _G_va_list __ap);
@@ -951,8 +954,8 @@
    return __fgets_unlocked_alias (__s, __n, __stream);
  }
  #endif
---- glibc-20050427T1912/linuxthreads/ChangeLog	27 Apr 2005 16:56:50 -0000	1.846
-+++ glibc-20050427T1912-fedora/linuxthreads/ChangeLog	27 Apr 2005 19:25:34 -0000	1.817.2.23
+--- glibc-20050428T0846/linuxthreads/ChangeLog	27 Apr 2005 16:56:50 -0000	1.846
++++ glibc-20050428T0846-fedora/linuxthreads/ChangeLog	27 Apr 2005 19:25:34 -0000	1.817.2.23
 @@ -813,6 +813,12 @@
  	(pthread_barrierattr_setpshared): Return EINVAL if pshared
  	is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED.
@@ -1001,8 +1004,8 @@
  	* descr.h (struct _pthread_descr_struct): Provide p_res member
  	even if USE_TLS && HAVE___THREAD.
  	* sysdeps/pthread/res-state.c (__res_state): Return __resp
---- glibc-20050427T1912/linuxthreads/Makefile	7 Feb 2005 19:30:03 -0000	1.98
-+++ glibc-20050427T1912-fedora/linuxthreads/Makefile	8 Feb 2005 10:04:10 -0000	1.94.2.5
+--- glibc-20050428T0846/linuxthreads/Makefile	7 Feb 2005 19:30:03 -0000	1.98
++++ glibc-20050428T0846-fedora/linuxthreads/Makefile	8 Feb 2005 10:04:10 -0000	1.94.2.5
 @@ -245,15 +245,18 @@ $(addprefix $(objpfx), \
    $(filter-out $(tests-static) $(tests-reverse) unload, \
      $(tests) $(test-srcs))): $(objpfx)libpthread.so \
@@ -1024,8 +1027,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  $(addprefix $(objpfx),$(librt-tests)): $(common-objpfx)rt/librt.a
---- glibc-20050427T1912/linuxthreads/cancel.c	22 Feb 2003 00:55:21 -0000	1.23
-+++ glibc-20050427T1912-fedora/linuxthreads/cancel.c	22 Sep 2004 21:20:55 -0000	1.23.2.1
+--- glibc-20050428T0846/linuxthreads/cancel.c	22 Feb 2003 00:55:21 -0000	1.23
++++ glibc-20050428T0846-fedora/linuxthreads/cancel.c	22 Sep 2004 21:20:55 -0000	1.23.2.1
 @@ -230,5 +230,6 @@ void __pthread_perform_cleanup(char *cur
      }
  
@@ -1033,8 +1036,8 @@
 +  THREAD_SETMEM (self, p_cancelstate, PTHREAD_CANCEL_DISABLE);
    __libc_thread_freeres ();
  }
---- glibc-20050427T1912/linuxthreads/lockfile.c	18 Dec 2002 01:16:46 -0000	1.10
-+++ glibc-20050427T1912-fedora/linuxthreads/lockfile.c	22 Sep 2004 21:20:55 -0000	1.10.2.1
+--- glibc-20050428T0846/linuxthreads/lockfile.c	18 Dec 2002 01:16:46 -0000	1.10
++++ glibc-20050428T0846-fedora/linuxthreads/lockfile.c	22 Sep 2004 21:20:55 -0000	1.10.2.1
 @@ -74,7 +74,11 @@ __fresetlockfiles (void)
    __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
  
@@ -1048,8 +1051,8 @@
  
    __pthread_mutexattr_destroy (&attr);
  
---- glibc-20050427T1912/linuxthreads/semaphore.h	17 Apr 2004 23:01:39 -0000	1.13
-+++ glibc-20050427T1912-fedora/linuxthreads/semaphore.h	22 Sep 2004 21:20:55 -0000	1.13.2.1
+--- glibc-20050428T0846/linuxthreads/semaphore.h	17 Apr 2004 23:01:39 -0000	1.13
++++ glibc-20050428T0846-fedora/linuxthreads/semaphore.h	22 Sep 2004 21:20:55 -0000	1.13.2.1
 @@ -21,6 +21,7 @@
  # define __need_timespec
  # include <time.h>
@@ -1058,8 +1061,8 @@
  
  #ifndef _PTHREAD_DESCR_DEFINED
  /* Thread descriptors.  Needed for `sem_t' definition.  */
---- glibc-20050427T1912/linuxthreads/tst-tls1.h	2 Sep 2003 00:29:30 -0000	1.1
-+++ glibc-20050427T1912-fedora/linuxthreads/tst-tls1.h	22 Sep 2004 21:20:55 -0000	1.1.2.1
+--- glibc-20050428T0846/linuxthreads/tst-tls1.h	2 Sep 2003 00:29:30 -0000	1.1
++++ glibc-20050428T0846-fedora/linuxthreads/tst-tls1.h	22 Sep 2004 21:20:55 -0000	1.1.2.1
 @@ -2,7 +2,7 @@
  #include <stdlib.h>
  #include <tls.h>
@@ -1069,8 +1072,8 @@
  
  struct tls_obj
  {
---- glibc-20050427T1912/linuxthreads/sysdeps/alpha/tls.h	9 Jan 2005 20:01:12 -0000	1.6
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/alpha/tls.h	8 Feb 2005 10:04:11 -0000	1.5.2.2
+--- glibc-20050428T0846/linuxthreads/sysdeps/alpha/tls.h	9 Jan 2005 20:01:12 -0000	1.6
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/alpha/tls.h	8 Feb 2005 10:04:11 -0000	1.5.2.2
 @@ -58,54 +58,76 @@ typedef struct
  #  include <sysdep.h>
  
@@ -1160,8 +1163,8 @@
  
  /* Get the thread descriptor definition.  */
  #  include <linuxthreads/descr.h>
---- glibc-20050427T1912/linuxthreads/sysdeps/i386/tls.h	9 Jan 2005 20:01:13 -0000	1.38
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/i386/tls.h	8 Feb 2005 10:04:12 -0000	1.35.2.5
+--- glibc-20050428T0846/linuxthreads/sysdeps/i386/tls.h	9 Jan 2005 20:01:13 -0000	1.38
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/i386/tls.h	8 Feb 2005 10:04:12 -0000	1.35.2.5
 @@ -86,7 +86,14 @@ typedef struct
  #  define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
  
@@ -1178,8 +1181,8 @@
  
  /* Alignment requirements for the TCB.  */
  #  define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
---- glibc-20050427T1912/linuxthreads/sysdeps/ia64/tls.h	9 Jan 2005 20:01:13 -0000	1.10
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/ia64/tls.h	8 Feb 2005 10:04:14 -0000	1.9.2.2
+--- glibc-20050428T0846/linuxthreads/sysdeps/ia64/tls.h	9 Jan 2005 20:01:13 -0000	1.10
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/ia64/tls.h	8 Feb 2005 10:04:14 -0000	1.9.2.2
 @@ -65,7 +65,14 @@ typedef struct
  #  define TLS_TCB_SIZE sizeof (tcbhead_t)
  
@@ -1196,8 +1199,8 @@
  
  /* Alignment requirements for the TCB.  */
  #  define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
---- glibc-20050427T1912/linuxthreads/sysdeps/powerpc/tls.h	9 Jan 2005 20:01:14 -0000	1.9
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/powerpc/tls.h	8 Feb 2005 10:04:14 -0000	1.8.2.2
+--- glibc-20050428T0846/linuxthreads/sysdeps/powerpc/tls.h	9 Jan 2005 20:01:14 -0000	1.9
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/powerpc/tls.h	8 Feb 2005 10:04:14 -0000	1.8.2.2
 @@ -69,11 +69,19 @@ typedef struct
  #  define TLS_TCB_ALIGN		__alignof__ (struct _pthread_descr_struct)
  
@@ -1220,8 +1223,8 @@
     TCB + 0x7000 (per the ABI).  This implies that TCB address is
     TP - 0x7000.  As we define TLS_DTV_AT_TP we can
     assume that the pthread_descr is allocated immediately ahead of the
---- glibc-20050427T1912/linuxthreads/sysdeps/pthread/Makefile	14 Aug 2003 00:14:22 -0000	1.7
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/pthread/Makefile	22 Sep 2004 21:20:56 -0000	1.7.2.1
+--- glibc-20050428T0846/linuxthreads/sysdeps/pthread/Makefile	14 Aug 2003 00:14:22 -0000	1.7
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/pthread/Makefile	22 Sep 2004 21:20:56 -0000	1.7.2.1
 @@ -12,3 +12,15 @@ endif
  ifeq ($(subdir),posix)
  CFLAGS-confstr.c += -DLIBPTHREAD_VERSION="\"$(shell sed 's/\(.*\) by .*/\1/' ../linuxthreads/Banner)\""
@@ -1238,8 +1241,8 @@
 +	@echo '#define NPTL_STRUCT_PTHREAD_SIZE 0' > $@
 +endif
 +endif
---- glibc-20050427T1912/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym	22 Sep 2004 21:20:56 -0000	1.1.2.1
+--- glibc-20050428T0846/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym 1 Jan 1970 00:00:00 -0000
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym	22 Sep 2004 21:20:56 -0000	1.1.2.1
 @@ -0,0 +1,13 @@
 +#ifdef HAVE_TLS_SUPPORT
 +# ifndef HAVE_FORCED_UNWIND
@@ -1254,8 +1257,8 @@
 +#ifdef HAVE_TLS_SUPPORT
 +NPTL_STRUCT_PTHREAD_SIZE	sizeof (struct pthread)
 +#endif
---- glibc-20050427T1912/linuxthreads/sysdeps/s390/tls.h	9 Jan 2005 20:01:14 -0000	1.4
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/s390/tls.h	8 Feb 2005 10:04:15 -0000	1.3.2.2
+--- glibc-20050428T0846/linuxthreads/sysdeps/s390/tls.h	9 Jan 2005 20:01:14 -0000	1.4
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/s390/tls.h	8 Feb 2005 10:04:15 -0000	1.3.2.2
 @@ -77,7 +77,14 @@ typedef struct
  #  define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
  
@@ -1272,8 +1275,8 @@
  
  /* Alignment requirements for the TCB.  */
  #  define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
---- glibc-20050427T1912/linuxthreads/sysdeps/sh/tls.h	9 Jan 2005 20:01:15 -0000	1.10
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/sh/tls.h	8 Feb 2005 10:04:15 -0000	1.9.2.2
+--- glibc-20050428T0846/linuxthreads/sysdeps/sh/tls.h	9 Jan 2005 20:01:15 -0000	1.10
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/sh/tls.h	8 Feb 2005 10:04:15 -0000	1.9.2.2
 @@ -69,7 +69,14 @@ typedef struct
  #  define TLS_TCB_SIZE sizeof (tcbhead_t)
  
@@ -1290,8 +1293,8 @@
  
  /* Alignment requirements for the TCB.  */
  #  define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
---- glibc-20050427T1912/linuxthreads/sysdeps/sparc/tls.h	9 Jan 2005 20:01:15 -0000	1.4
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/sparc/tls.h	8 Feb 2005 10:04:16 -0000	1.3.2.2
+--- glibc-20050428T0846/linuxthreads/sysdeps/sparc/tls.h	9 Jan 2005 20:01:15 -0000	1.4
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/sparc/tls.h	8 Feb 2005 10:04:16 -0000	1.3.2.2
 @@ -69,7 +69,14 @@ typedef struct
  #  define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
  
@@ -1308,8 +1311,8 @@
  
  /* Alignment requirements for the TCB.  */
  #  define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
---- glibc-20050427T1912/linuxthreads/sysdeps/x86_64/tls.h	9 Jan 2005 20:01:15 -0000	1.7
-+++ glibc-20050427T1912-fedora/linuxthreads/sysdeps/x86_64/tls.h	8 Feb 2005 10:04:16 -0000	1.6.2.2
+--- glibc-20050428T0846/linuxthreads/sysdeps/x86_64/tls.h	9 Jan 2005 20:01:15 -0000	1.7
++++ glibc-20050428T0846-fedora/linuxthreads/sysdeps/x86_64/tls.h	8 Feb 2005 10:04:16 -0000	1.6.2.2
 @@ -71,7 +71,14 @@ typedef struct
  #  define TLS_INIT_TCB_ALIGN __alignof__ (tcbhead_t)
  
@@ -1326,8 +1329,8 @@
  
  /* Alignment requirements for the TCB.  */
  #  define TLS_TCB_ALIGN __alignof__ (struct _pthread_descr_struct)
---- glibc-20050427T1912/locale/iso-4217.def	20 Mar 2005 04:14:36 -0000	1.16
-+++ glibc-20050427T1912-fedora/locale/iso-4217.def	24 Mar 2005 08:19:03 -0000	1.15.2.2
+--- glibc-20050428T0846/locale/iso-4217.def	20 Mar 2005 04:14:36 -0000	1.16
++++ glibc-20050428T0846-fedora/locale/iso-4217.def	24 Mar 2005 08:19:03 -0000	1.15.2.2
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -1419,8 +1422,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20050427T1912/locale/programs/3level.h	13 Jun 2003 20:45:38 -0000	1.5
-+++ glibc-20050427T1912-fedora/locale/programs/3level.h	22 Sep 2004 21:20:58 -0000	1.5.2.1
+--- glibc-20050428T0846/locale/programs/3level.h	13 Jun 2003 20:45:38 -0000	1.5
++++ glibc-20050428T0846-fedora/locale/programs/3level.h	22 Sep 2004 21:20:58 -0000	1.5.2.1
 @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
@@ -1464,8 +1467,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20050427T1912/localedata/Makefile	7 Aug 2004 23:38:13 -0000	1.101
-+++ glibc-20050427T1912-fedora/localedata/Makefile	22 Sep 2004 21:20:58 -0000	1.101.2.1
+--- glibc-20050428T0846/localedata/Makefile	7 Aug 2004 23:38:13 -0000	1.101
++++ glibc-20050428T0846-fedora/localedata/Makefile	22 Sep 2004 21:20:58 -0000	1.101.2.1
 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -1474,8 +1477,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20050427T1912/localedata/SUPPORTED	20 Mar 2005 04:16:36 -0000	1.74
-+++ glibc-20050427T1912-fedora/localedata/SUPPORTED	24 Mar 2005 08:19:04 -0000	1.71.2.4
+--- glibc-20050428T0846/localedata/SUPPORTED	20 Mar 2005 04:16:36 -0000	1.74
++++ glibc-20050428T0846-fedora/localedata/SUPPORTED	24 Mar 2005 08:19:04 -0000	1.71.2.4
 @@ -64,6 +64,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -1517,8 +1520,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ/KOI8-T \
---- glibc-20050427T1912/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20050427T1912-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20050428T0846/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20050428T0846-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>"
@@ -1533,8 +1536,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20050427T1912/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20050427T1912-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20050428T0846/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20050428T0846-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
 @@ -112,8 +112,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>"
@@ -1546,8 +1549,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-20050427T1912/localedata/locales/en_US	31 Oct 2004 23:42:26 -0000	1.9
-+++ glibc-20050427T1912-fedora/localedata/locales/en_US	2 Nov 2004 12:25:47 -0000	1.7.2.2
+--- glibc-20050428T0846/localedata/locales/en_US	31 Oct 2004 23:42:26 -0000	1.9
++++ glibc-20050428T0846-fedora/localedata/locales/en_US	2 Nov 2004 12:25:47 -0000	1.7.2.2
 @@ -100,7 +100,6 @@ mon	"<U004A><U0061><U006E><U0075><U0061>
  	"<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/
  	"<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
@@ -1556,8 +1559,8 @@
  % Appropriate date and time representation (%c)
  %	"%a %d %b %Y %r %Z"
  d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072><U0020><U0025><U005A>"
---- glibc-20050427T1912/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20050427T1912-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20050428T0846/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20050428T0846-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -1628,8 +1631,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20050427T1912/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20050427T1912-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20050428T0846/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20050428T0846-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -1657,8 +1660,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20050427T1912/math/Versions	28 Mar 2005 20:42:43 -0000	1.9
-+++ glibc-20050427T1912-fedora/math/Versions	26 Feb 2000 01:04:00 -0000	1.8
+--- glibc-20050428T0846/math/Versions	28 Mar 2005 20:42:43 -0000	1.9
++++ glibc-20050428T0846-fedora/math/Versions	26 Feb 2000 01:04:00 -0000	1.8
 @@ -94,7 +94,7 @@ libm {
    }
    GLIBC_2.1 {
@@ -1680,8 +1683,8 @@
 -    exp2l;
 -  }
  }
---- glibc-20050427T1912/nptl/ChangeLog	27 Apr 2005 16:53:38 -0000	1.776
-+++ glibc-20050427T1912-fedora/nptl/ChangeLog	27 Apr 2005 19:25:34 -0000	1.706.2.43
+--- glibc-20050428T0846/nptl/ChangeLog	27 Apr 2005 16:53:38 -0000	1.776
++++ glibc-20050428T0846-fedora/nptl/ChangeLog	27 Apr 2005 19:25:34 -0000	1.706.2.43
 @@ -620,6 +620,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
@@ -1706,8 +1709,8 @@
  2003-07-25  Jakub Jelinek  <jakub@redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20050427T1912/nptl/Makefile	27 Apr 2005 09:55:18 -0000	1.167
-+++ glibc-20050427T1912-fedora/nptl/Makefile	27 Apr 2005 11:31:25 -0000	1.157.2.10
+--- glibc-20050428T0846/nptl/Makefile	27 Apr 2005 09:55:18 -0000	1.167
++++ glibc-20050428T0846-fedora/nptl/Makefile	27 Apr 2005 11:31:25 -0000	1.157.2.10
 @@ -499,15 +499,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -1730,8 +1733,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20050427T1912/nptl/descr.h	12 Nov 2004 01:24:24 -0000	1.25
-+++ glibc-20050427T1912-fedora/nptl/descr.h	12 Nov 2004 16:56:12 -0000	1.23.2.3
+--- glibc-20050428T0846/nptl/descr.h	12 Nov 2004 01:24:24 -0000	1.25
++++ glibc-20050428T0846-fedora/nptl/descr.h	12 Nov 2004 16:56:12 -0000	1.23.2.3
 @@ -27,9 +27,13 @@
  #include <sys/types.h>
  #include <hp-timing.h>
@@ -1746,8 +1749,8 @@
  #include "../nptl_db/thread_db.h"
  #include <tls.h>
  #ifdef HAVE_FORCED_UNWIND
---- glibc-20050427T1912/nptl/pthread_cond_destroy.c	2 Sep 2004 18:45:37 -0000	1.5
-+++ glibc-20050427T1912-fedora/nptl/pthread_cond_destroy.c	22 Sep 2004 21:21:01 -0000	1.5.2.1
+--- glibc-20050428T0846/nptl/pthread_cond_destroy.c	2 Sep 2004 18:45:37 -0000	1.5
++++ glibc-20050428T0846-fedora/nptl/pthread_cond_destroy.c	22 Sep 2004 21:21:01 -0000	1.5.2.1
 @@ -44,15 +44,35 @@ __pthread_cond_destroy (cond)
       broadcasted, but still are using the pthread_cond_t structure,
       pthread_cond_destroy needs to wait for them.  */
@@ -1789,8 +1792,8 @@
      }
  
    return 0;
---- glibc-20050427T1912/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20050427T1912-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20050428T0846/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20050428T0846-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>
 +
@@ -1798,8 +1801,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20050427T1912/nscd/connections.c	22 Feb 2005 22:52:32 -0000	1.66
-+++ glibc-20050427T1912-fedora/nscd/connections.c	3 Mar 2005 13:34:09 -0000	1.55.2.7
+--- glibc-20050428T0846/nscd/connections.c	28 Apr 2005 06:26:10 -0000	1.67
++++ glibc-20050428T0846-fedora/nscd/connections.c	28 Apr 2005 09:10:12 -0000	1.55.2.8
 @@ -21,6 +21,7 @@
  #include <alloca.h>
  #include <assert.h>
@@ -1816,7 +1819,7 @@
  
  #include "nscd.h"
  #include "dbg_log.h"
-@@ -1472,19 +1474,39 @@ start_threads (void)
+@@ -1471,19 +1473,39 @@ start_threads (void)
    pthread_condattr_t condattr;
    pthread_condattr_init (&condattr);
  
@@ -1863,7 +1866,7 @@
  #endif
  
    pthread_cond_init (&readylist_cond, &condattr);
-@@ -1549,7 +1571,6 @@ start_threads (void)
+@@ -1548,7 +1570,6 @@ start_threads (void)
    main_loop_poll ();
  }
  
@@ -1871,7 +1874,7 @@
  /* Look up the uid, gid, and supplementary groups to run nscd as. When
     this function is called, we are not listening on the nscd socket yet so
     we can just use the ordinary lookup functions without causing a lockup  */
-@@ -1618,3 +1639,18 @@ finish_drop_privileges (void)
+@@ -1617,3 +1638,18 @@ finish_drop_privileges (void)
        exit (1);
      }
  }
@@ -1890,8 +1893,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20050427T1912/nscd/nscd.c	7 Feb 2005 22:51:22 -0000	1.44
-+++ glibc-20050427T1912-fedora/nscd/nscd.c	8 Feb 2005 10:04:34 -0000	1.38.2.5
+--- glibc-20050428T0846/nscd/nscd.c	7 Feb 2005 22:51:22 -0000	1.44
++++ glibc-20050428T0846-fedora/nscd/nscd.c	8 Feb 2005 10:04:34 -0000	1.38.2.5
 @@ -122,9 +122,16 @@ static struct argp argp =
    options, parse_opt, NULL, doc,
  };
@@ -1917,8 +1920,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20050427T1912/nscd/nscd.conf	3 Oct 2004 21:09:23 -0000	1.10
-+++ glibc-20050427T1912-fedora/nscd/nscd.conf	4 Oct 2004 08:56:17 -0000	1.8.2.2
+--- glibc-20050428T0846/nscd/nscd.conf	3 Oct 2004 21:09:23 -0000	1.10
++++ glibc-20050428T0846-fedora/nscd/nscd.conf	4 Oct 2004 08:56:17 -0000	1.8.2.2
 @@ -31,8 +31,8 @@
  #	logfile			/var/log/nscd.log
  #	threads			6
@@ -1930,8 +1933,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20050427T1912/nscd/nscd_conf.c	3 Oct 2004 21:10:35 -0000	1.16
-+++ glibc-20050427T1912-fedora/nscd/nscd_conf.c	4 Oct 2004 08:56:17 -0000	1.14.2.2
+--- glibc-20050428T0846/nscd/nscd_conf.c	3 Oct 2004 21:10:35 -0000	1.16
++++ glibc-20050428T0846-fedora/nscd/nscd_conf.c	4 Oct 2004 08:56:17 -0000	1.14.2.2
 @@ -230,7 +230,10 @@ nscd_parse_file (const char *fname, stru
  		if (strcmp (arg2, "no") == 0)
  		  dbs[cnt].shared = 0;
@@ -1944,8 +1947,8 @@
  		break;
  	      }
  	  if (cnt == lastdb)
---- glibc-20050427T1912/posix/Makefile	14 Apr 2005 21:19:34 -0000	1.184
-+++ glibc-20050427T1912-fedora/posix/Makefile	15 Apr 2005 09:32:51 -0000	1.171.2.12
+--- glibc-20050428T0846/posix/Makefile	14 Apr 2005 21:19:34 -0000	1.184
++++ glibc-20050428T0846-fedora/posix/Makefile	15 Apr 2005 09:32:51 -0000	1.171.2.12
 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re
  	     bug-regex21-mem bug-regex21.mtrace \
  	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@@ -1979,8 +1982,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20050427T1912/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20050427T1912-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20050428T0846/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20050428T0846-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 =
@@ -1997,8 +2000,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20050427T1912/posix/bits/unistd.h	20 Mar 2005 16:48:41 -0000	1.8
-+++ glibc-20050427T1912-fedora/posix/bits/unistd.h	20 Mar 2005 18:12:27 -0000	1.3.2.4
+--- glibc-20050428T0846/posix/bits/unistd.h	20 Mar 2005 16:48:41 -0000	1.8
++++ glibc-20050428T0846-fedora/posix/bits/unistd.h	20 Mar 2005 18:12:27 -0000	1.3.2.4
 @@ -21,25 +21,19 @@
  # error "Never include <bits/unistd.h> directly; use <unistd.h> instead."
  #endif
@@ -2116,8 +2119,8 @@
 -  return __getwd_alias (__buf);
 -}
 -#endif
---- glibc-20050427T1912/socket/bits/socket2.h	19 Mar 2005 00:13:57 -0000	1.5
-+++ glibc-20050427T1912-fedora/socket/bits/socket2.h	19 Mar 2005 20:18:08 -0000	1.2.2.5
+--- glibc-20050428T0846/socket/bits/socket2.h	19 Mar 2005 00:13:57 -0000	1.5
++++ glibc-20050428T0846-fedora/socket/bits/socket2.h	19 Mar 2005 20:18:08 -0000	1.2.2.5
 @@ -21,24 +21,18 @@
  # error "Never include <bits/socket2.h> directly; use <sys/socket.h> instead."
  #endif
@@ -2158,8 +2161,8 @@
 +    __chk_fail ();
    return __recvfrom_alias (__fd, __buf, __n, __flags, __addr, __addr_len);
  }
---- glibc-20050427T1912/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20050427T1912-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20050428T0846/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20050428T0846-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
@@ -2175,8 +2178,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-20050427T1912/sysdeps/generic/w_exp2.c	28 Mar 2005 20:42:42 -0000	1.3
-+++ glibc-20050427T1912-fedora/sysdeps/generic/w_exp2.c	6 Jun 2001 12:40:16 -0000	1.2
+--- glibc-20050428T0846/sysdeps/generic/w_exp2.c	28 Mar 2005 20:42:42 -0000	1.3
++++ glibc-20050428T0846-fedora/sysdeps/generic/w_exp2.c	6 Jun 2001 12:40:16 -0000	1.2
 @@ -31,6 +31,6 @@ __exp2 (double x)		/* wrapper exp2 */
  }
  weak_alias (__exp2, exp2)
@@ -2186,8 +2189,8 @@
 +strong_alias (__exp2, __expl2)
 +weak_alias (__exp2, expl2)
  #endif
---- glibc-20050427T1912/sysdeps/i386/Versions	28 Mar 2005 20:42:43 -0000	1.5
-+++ glibc-20050427T1912-fedora/sysdeps/i386/Versions	29 Apr 2003 22:47:20 -0000	1.4
+--- glibc-20050428T0846/sysdeps/i386/Versions	28 Mar 2005 20:42:43 -0000	1.5
++++ glibc-20050428T0846-fedora/sysdeps/i386/Versions	29 Apr 2003 22:47:20 -0000	1.4
 @@ -20,10 +20,3 @@ libc {
      __strspn_cg; __strspn_g; __strstr_cg; __strstr_g;
    }
@@ -2199,8 +2202,8 @@
 -    exp2l;
 -  }
 -}
---- glibc-20050427T1912/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20050427T1912-fedora/sysdeps/i386/bits/atomic.h	5 Oct 2004 12:09:44 -0000	1.1.2.3
+--- glibc-20050428T0846/sysdeps/i386/bits/atomic.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20050428T0846-fedora/sysdeps/i386/bits/atomic.h	5 Oct 2004 12:09:44 -0000	1.1.2.3
 @@ -0,0 +1,410 @@
 +/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -2612,8 +2615,8 @@
 +
 +
 +#define atomic_delay() asm ("rep; nop")
---- glibc-20050427T1912/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20050427T1912-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20050428T0846/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20050428T0846-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))
@@ -2625,8 +2628,8 @@
  endif
  endif
  
---- glibc-20050427T1912/sysdeps/ia64/Versions	28 Mar 2005 20:42:43 -0000	1.10
-+++ glibc-20050427T1912-fedora/sysdeps/ia64/Versions	3 May 2002 07:10:31 -0000	1.9
+--- glibc-20050428T0846/sysdeps/ia64/Versions	28 Mar 2005 20:42:43 -0000	1.10
++++ glibc-20050428T0846-fedora/sysdeps/ia64/Versions	3 May 2002 07:10:31 -0000	1.9
 @@ -12,10 +12,3 @@ libc {
      __multi3;
    }
@@ -2638,8 +2641,8 @@
 -    exp2l;
 -  }
 -}
---- glibc-20050427T1912/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20050427T1912-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20050428T0846/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20050428T0846-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.  */
@@ -2991,8 +2994,8 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
---- glibc-20050427T1912/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20050427T1912-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20050428T0846/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20050428T0846-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.
@@ -3078,8 +3081,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20050427T1912/sysdeps/m68k/Versions	28 Mar 2005 20:42:42 -0000	1.2
-+++ glibc-20050427T1912-fedora/sysdeps/m68k/Versions	29 Jan 1999 09:06:03 -0000	1.1
+--- glibc-20050428T0846/sysdeps/m68k/Versions	28 Mar 2005 20:42:42 -0000	1.2
++++ glibc-20050428T0846-fedora/sysdeps/m68k/Versions	29 Jan 1999 09:06:03 -0000	1.1
 @@ -4,10 +4,3 @@ libc {
      __divdi3; __moddi3; __udivdi3; __umoddi3;
    }
@@ -3091,8 +3094,8 @@
 -    exp2l;
 -  }
 -}
---- glibc-20050427T1912/sysdeps/mips/mips64/Versions	28 Mar 2005 20:42:43 -0000	1.1
-+++ glibc-20050427T1912-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000
+--- glibc-20050428T0846/sysdeps/mips/mips64/Versions	28 Mar 2005 20:42:43 -0000	1.1
++++ glibc-20050428T0846-fedora/sysdeps/mips/mips64/Versions 1 Jan 1970 00:00:00 -0000
 @@ -1,7 +0,0 @@
 -libm {
 -  GLIBC_2.1 {
@@ -3101,8 +3104,8 @@
 -    exp2l;
 -  }
 -}
---- glibc-20050427T1912/sysdeps/sparc/sparc64/Versions	28 Mar 2005 20:42:42 -0000	1.2
-+++ glibc-20050427T1912-fedora/sysdeps/sparc/sparc64/Versions	19 May 1999 14:21:36 -0000	1.1
+--- glibc-20050428T0846/sysdeps/sparc/sparc64/Versions	28 Mar 2005 20:42:42 -0000	1.2
++++ glibc-20050428T0846-fedora/sysdeps/sparc/sparc64/Versions	19 May 1999 14:21:36 -0000	1.1
 @@ -5,10 +5,3 @@ libc {
      __align_cpy_8; __align_cpy_16;
    }
@@ -3114,8 +3117,8 @@
 -    exp2l;
 -  }
 -}
---- glibc-20050427T1912/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20050427T1912-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20050428T0846/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20050428T0846-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
 @@ -41,7 +41,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -3130,8 +3133,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20050427T1912/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20050427T1912-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20050428T0846/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20050428T0846-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"
@@ -3141,8 +3144,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20050427T1912/sysdeps/unix/sysv/linux/readonly-area.c	18 Oct 2004 04:17:11 -0000	1.1
-+++ glibc-20050427T1912-fedora/sysdeps/unix/sysv/linux/readonly-area.c	20 Oct 2004 11:04:51 -0000	1.1.2.2
+--- glibc-20050428T0846/sysdeps/unix/sysv/linux/readonly-area.c	18 Oct 2004 04:17:11 -0000	1.1
++++ glibc-20050428T0846-fedora/sysdeps/unix/sysv/linux/readonly-area.c	20 Oct 2004 11:04:51 -0000	1.1.2.2
 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t
  
    FILE *fp = fopen ("/proc/self/maps", "rc");
@@ -3155,8 +3158,8 @@
  
    /* We need no locking.  */
    __fsetlocking (fp, FSETLOCKING_BYCALLER);
---- glibc-20050427T1912/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20050427T1912-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20050428T0846/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20050428T0846-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;
@@ -3202,8 +3205,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20050427T1912/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20050427T1912-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20050428T0846/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20050428T0846-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.
@@ -3264,8 +3267,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20050427T1912/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20050427T1912-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20050428T0846/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20050428T0846-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)
@@ -3298,29 +3301,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20050427T1912/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20050427T1912-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20050428T0846/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20050428T0846-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-20050427T1912/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20050427T1912-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20050428T0846/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20050428T0846-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-20050427T1912/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20050427T1912-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20050428T0846/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20050428T0846-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-20050427T1912/sysdeps/x86_64/Versions	28 Mar 2005 20:42:42 -0000	1.3
-+++ glibc-20050427T1912-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000
+--- glibc-20050428T0846/sysdeps/x86_64/Versions	28 Mar 2005 20:42:42 -0000	1.3
++++ glibc-20050428T0846-fedora/sysdeps/x86_64/Versions 1 Jan 1970 00:00:00 -0000
 @@ -1,7 +0,0 @@
 -libm {
 -  GLIBC_2.1 {
diff --git a/glibc.spec b/glibc.spec
index 7223ab7..fcae8fe 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,9 +1,9 @@
-%define glibcdate 20050427T1912
+%define glibcdate 20050428T0846
 %define glibcname glibc
-%define glibcsrcdir glibc-20050427T1912
+%define glibcsrcdir glibc-20050428T0846
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.5
-%define glibcrelease 3
+%define glibcrelease 4
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64
@@ -1346,6 +1346,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Apr 28 2005 Jakub Jelinek <jakub@redhat.com> 2.3.5-4
+- update from CVS
+  - fix nscd cache pruning (#150748)
+
 * Wed Apr 27 2005 Jakub Jelinek <jakub@redhat.com> 2.3.5-3
 - update from CVS
   - fix linuxthreads clocks
diff --git a/sources b/sources
index fd164a6..1074d34 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-cb5a3b42bf61483335e37ec837bb41fa  glibc-20050427T1912.tar.bz2
-7d40f59229e14796c10c60e3317ce915  glibc-fedora-20050427T1912.tar.bz2
+adc721d1d497a35e4a7370999cf3f8f3  glibc-20050428T0846.tar.bz2
+6cb81148d235c03ec384662fc5a9829d  glibc-fedora-20050428T0846.tar.bz2