auto-import glibc-2.3.90-23 on branch devel from glibc-2.3.90-23.src.rpm

2005-12-27 16:48:46 +00:00 · 2005-12-27 16:48:46 +00:00 · 807fd31c2b
parent b287e0ac43
commit 807fd31c2b
4 changed files with 547 additions and 120 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,2 +1,2 @@
-glibc-20051221T0931.tar.bz2
-glibc-fedora-20051221T0931.tar.bz2
+glibc-20051227T1426.tar.bz2
+glibc-fedora-20051227T1426.tar.bz2
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@ -1,6 +1,35 @@
--- glibc-20051221T0931/ChangeLog	21 Dec 2005 08:34:35 -0000	1.9793
-+++ glibc-20051221T0931-fedora/ChangeLog	21 Dec 2005 09:46:54 -0000	1.8782.2.141
-@@ -97,6 +97,26 @@
+--- glibc-20051227T1426/ChangeLog	27 Dec 2005 01:04:06 -0000	1.9813
+++ glibc-20051227T1426-fedora/ChangeLog	27 Dec 2005 16:21:06 -0000	1.8782.2.144
+@@ -1,3 +1,28 @@
+2005-12-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/ldconfig.c (search_dir): Skip prelink temporaries.
+
+2005-12-27  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/sparc/bits/errno.h: Define EOWNERDEAD
+	and ENOTRECOVERABLE if not already defined.
+	* sysdeps/unix/sysv/linux/alpha/bits/errno.h: Likewise.
+
+2005-12-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/alpha/Versions: Add new errlist-compat
+	entry for up to 138 errnos.
+
+2005-12-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* iconv/gconv_trans.c (__gconv_transliterate): Demangle step __fct
+	before calling it.
+
+2005-12-27  David S. Miller  <davem@sunset.davemloft.net>
+
+	* sysdeps/unix/sysv/linux/sparc/Versions: Add new errlist-compat
+	entry for up to 134 errnos.
+
+ 2005-12-26  Ulrich Drepper  <drepper@redhat.com>
+ 
+ 	* Versions.def: Add GLIBC_2.4 for libpthread.
+@@ -254,6 +279,26 @@
 	* sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined,
 	use sysdeps/unix/time.c implementation.
 
@ -27,7 +56,7 @@
 2005-12-19  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #1955]
-@@ -3215,6 +3235,11 @@
+@@ -3372,6 +3417,11 @@
 	R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32,
 	R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros.
 
@ -39,7 +68,7 @@
 2005-10-03  Roland McGrath  <roland@redhat.com>
 
 	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -4209,6 +4234,12 @@
+@@ -4366,6 +4416,12 @@
 	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
 	(__argp_failure): Likewise.
 
@ -52,7 +81,7 @@
 2005-08-08  Ulrich Drepper  <drepper@redhat.com>
 
 	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -4333,6 +4364,17 @@
+@@ -4490,6 +4546,17 @@
 	__syslog_chk.
 	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
 
@ -70,7 +99,7 @@
 2005-07-28  Thomas Schwinge  <schwinge@nic-nac-project.de>
 
 	[BZ #1137]
-@@ -7393,6 +7435,18 @@
+@@ -7550,6 +7617,18 @@
 
 	* scripts/soversions.awk: Fix default version set handling.
 
@ -89,8 +118,8 @@
 2005-02-10  Roland McGrath  <roland@redhat.com>
 
 	[BZ #157]
--- glibc-20051221T0931/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20051221T0931-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20051227T1426/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
+++ glibc-20051227T1426-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.
@ -140,8 +169,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-20051221T0931/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20051221T0931-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20051227T1426/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
+++ glibc-20051227T1426-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.
@ -168,8 +197,8 @@
 2001-01-02  Franz Sirl	<Franz.Sirl-kernel@lauterbach.com>
 
 	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
--- glibc-20051221T0931/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20051221T0931-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20051227T1426/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
+++ glibc-20051227T1426-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>
@ -250,8 +279,8 @@
 2004-08-30  Roland McGrath  <roland@frob.com>
 
 	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
--- glibc-20051221T0931/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20051221T0931-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20051227T1426/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
+++ glibc-20051227T1426-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;
@ -276,8 +305,8 @@
 
 /* These function symbols are provided for the .init/.fini section entry
    points automagically by the linker.  */
--- glibc-20051221T0931/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20051221T0931-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20051227T1426/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
+++ glibc-20051227T1426-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
@@ -17,6 +17,9 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
@ -306,9 +335,29 @@
 # define O 0
 #else
 # define O 1
--- glibc-20051221T0931/elf/ldconfig.c	7 Dec 2005 05:47:27 -0000	1.50
-+++ glibc-20051221T0931-fedora/elf/ldconfig.c	19 Dec 2005 12:11:14 -0000	1.47.2.4
-@@ -951,17 +951,19 @@ search_dirs (void)
+--- glibc-20051227T1426/elf/ldconfig.c	21 Dec 2005 22:16:20 -0000	1.51
+++ glibc-20051227T1426-fedora/elf/ldconfig.c	27 Dec 2005 16:21:07 -0000	1.47.2.6
+@@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr
+ #endif
+ 	      !is_hwcap_platform (direntry->d_name)))
+ 	continue;
+-      len = strlen (entry->path) + strlen (direntry->d_name);
+      len = strlen (direntry->d_name);
+      if (len >= sizeof (".#prelink#") - 1)
+	{
+	  if (strcmp (direntry->d_name + len - sizeof (".#prelink#") + 1,
+		      ".#prelink#") == 0)
+	    continue;
+	  if (len >= sizeof (".#prelink#.XXXXXX") - 1
+	      && memcmp (direntry->d_name + len - sizeof (".#prelink#.XXXXXX")
+			 + 1, ".#prelink#.", sizeof (".#prelink#.") - 1) == 0)
+	    continue;
+	}
+      len += strlen (entry->path);
+       if (len > file_name_len)
+ 	{
+ 	  file_name_len = len + 1;
+@@ -951,17 +962,19 @@ search_dirs (void)
 
 
 static void parse_conf_include (const char *config_file, unsigned int lineno,
@ -330,7 +379,7 @@
 
   if (do_chroot && opt_chroot)
     {
-@@ -1022,7 +1024,14 @@ parse_conf (const char *filename, bool d
+@@ -1022,7 +1035,14 @@ parse_conf (const char *filename, bool d
 	  cp += 8;
 	  while ((dir = strsep (&cp, " \t")) != NULL)
 	    if (dir[0] != '\0')
@ -346,7 +395,7 @@
 	}
       else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5]))
 	{
-@@ -1085,7 +1094,7 @@ parse_conf (const char *filename, bool d
+@@ -1085,7 +1105,7 @@ parse_conf (const char *filename, bool d
    config files to read.  */
 static void
 parse_conf_include (const char *config_file, unsigned int lineno,
@ -355,7 +404,7 @@
 {
   if (opt_chroot && pattern[0] != '/')
     error (EXIT_FAILURE, 0,
-@@ -1115,7 +1124,7 @@ parse_conf_include (const char *config_f
+@@ -1115,7 +1135,7 @@ parse_conf_include (const char *config_f
     {
     case 0:
       for (size_t i = 0; i < gl.gl_pathc; ++i)
@ -364,7 +413,7 @@
       globfree64 (&gl);
       break;
 
-@@ -1155,6 +1164,8 @@ main (int argc, char **argv)
+@@ -1155,6 +1175,8 @@ main (int argc, char **argv)
 {
   int remaining;
 
@ -373,7 +422,7 @@
   /* Parse and process arguments.  */
   argp_parse (&argp, argc, argv, 0, &remaining, NULL);
 
-@@ -1267,12 +1278,14 @@ main (int argc, char **argv)
+@@ -1267,12 +1289,14 @@ main (int argc, char **argv)
 
   if (!opt_only_cline)
     {
@ -389,8 +438,8 @@
     }
 
   search_dirs ();
--- glibc-20051221T0931/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20051221T0931-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20051227T1426/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
+++ glibc-20051227T1426-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;
@ -415,8 +464,41 @@
     {
       puts ("stack guard canaries are not randomized enough");
       puts ("nor equal to the default canary value");
--- glibc-20051221T0931/iconv/iconvconfig.c	7 Dec 2005 05:47:27 -0000	1.24
-+++ glibc-20051221T0931-fedora/iconv/iconvconfig.c	19 Dec 2005 12:11:14 -0000	1.19.2.5
+--- glibc-20051227T1426/iconv/gconv_trans.c	6 Jul 2001 04:54:47 -0000	1.16
+++ glibc-20051227T1426-fedora/iconv/gconv_trans.c	27 Dec 2005 15:42:54 -0000	1.16.4.1
+@@ -54,6 +54,12 @@ __gconv_transliterate (struct __gconv_st
+   winbuf = (const uint32_t *) *inbufp;
+   winbufend = (const uint32_t *) inbufend;
+ 
+  __gconv_fct fct = step->__fct;
+#ifdef PTR_DEMANGLE
+  if (step->__shlib_handle != NULL)
+    PTR_DEMANGLE (fct);
+#endif
+
+   /* If there is no transliteration information in the locale don't do
+      anything and return the error.  */
+   size = _NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_TRANSLIT_TAB_SIZE);
+@@ -119,7 +125,7 @@ __gconv_transliterate (struct __gconv_st
+ 	      /* Try this input text.  */
+ 	      toinptr = (const unsigned char *) &to_tbl[idx2];
+ 	      outptr = *outbufstart;
+-	      res = DL_CALL_FCT (step->__fct,
+	      res = DL_CALL_FCT (fct,
+ 				 (step, step_data, &toinptr,
+ 				  (const unsigned char *) &to_tbl[idx2 + len],
+ 				  &outptr, NULL, 0, 0));
+@@ -204,7 +210,7 @@ __gconv_transliterate (struct __gconv_st
+ 		? __GCONV_EMPTY_INPUT : __GCONV_INCOMPLETE_INPUT);
+ 
+       outptr = *outbufstart;
+-      res = DL_CALL_FCT (step->__fct,
+      res = DL_CALL_FCT (fct,
+ 			 (step, step_data, &toinptr,
+ 			  (const unsigned char *) (default_missing + len),
+ 			  &outptr, NULL, 0, 0));
+--- glibc-20051227T1426/iconv/iconvconfig.c	7 Dec 2005 05:47:27 -0000	1.24
+++ glibc-20051227T1426-fedora/iconv/iconvconfig.c	19 Dec 2005 12:11:14 -0000	1.19.2.5
@@ -1011,6 +1011,34 @@ next_prime (uint32_t seed)
                               module name offset
                          (following last entry with step count 0)
@ -493,8 +575,8 @@
   /* Open the output file.  */
   if (output_file == NULL)
     {
--- glibc-20051221T0931/include/features.h	14 Oct 2005 22:04:45 -0000	1.41
-+++ glibc-20051221T0931-fedora/include/features.h	20 Oct 2005 06:59:51 -0000	1.35.2.10
+--- glibc-20051227T1426/include/features.h	14 Oct 2005 22:04:45 -0000	1.41
+++ glibc-20051227T1426-fedora/include/features.h	20 Oct 2005 06:59:51 -0000	1.35.2.10
@@ -265,7 +265,13 @@
 #endif
 
@ -510,8 +592,8 @@
 # if _FORTIFY_SOURCE > 1
 #  define __USE_FORTIFY_LEVEL 2
 # else
--- glibc-20051221T0931/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20051221T0931-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20051227T1426/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
+++ glibc-20051227T1426-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
@ -521,8 +603,8 @@
 norwegian       nb_NO.ISO-8859-1
 nynorsk		nn_NO.ISO-8859-1
 polish          pl_PL.ISO-8859-2
--- glibc-20051221T0931/libio/stdio.h	11 Nov 2005 18:56:20 -0000	1.83
-+++ glibc-20051221T0931-fedora/libio/stdio.h	15 Nov 2005 08:21:55 -0000	1.78.2.6
+--- glibc-20051227T1426/libio/stdio.h	11 Nov 2005 18:56:20 -0000	1.83
+++ glibc-20051227T1426-fedora/libio/stdio.h	15 Nov 2005 08:21:55 -0000	1.78.2.6
@@ -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.  */
@ -536,8 +618,8 @@
 
 __BEGIN_NAMESPACE_STD
 /* Remove file FILENAME.  */
--- glibc-20051221T0931/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20051221T0931-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20051227T1426/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
+++ glibc-20051227T1426-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
@@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
 extern int __vprintf_chk (int __flag, __const char *__restrict __format,
 			  _G_va_list __ap);
@ -568,8 +650,8 @@
 
 #endif
 
--- glibc-20051221T0931/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20051221T0931-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20051227T1426/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
+++ glibc-20051227T1426-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
@@ -8,6 +8,7 @@
  *
  * !!! The list has to be sorted !!!
@ -661,8 +743,8 @@
 DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
 DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
 DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
--- glibc-20051221T0931/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20051221T0931-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20051227T1426/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
+++ glibc-20051227T1426-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
@@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
 	}
     }
@ -706,8 +788,8 @@
 #endif
 
 #ifndef NO_FINALIZE
--- glibc-20051221T0931/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20051221T0931-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20051227T1426/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
+++ glibc-20051227T1426-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
@@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
 	echo -n '...'; \
 	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@ -716,8 +798,8 @@
 		     -i locales/$$input -c -f charmaps/$$charset \
 		     $(addprefix --prefix=,$(install_root)) $$locale; \
 	echo ' done'; \
--- glibc-20051221T0931/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
-+++ glibc-20051221T0931-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
+--- glibc-20051227T1426/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
+++ glibc-20051227T1426-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
@@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \
 cy_GB/ISO-8859-14 \
 da_DK.UTF-8/UTF-8 \
@ -759,8 +841,8 @@
 ta_IN/UTF-8 \
 te_IN/UTF-8 \
 tg_TJ.UTF-8/UTF-8 \
--- glibc-20051221T0931/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20051221T0931-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20051227T1426/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
+++ glibc-20051227T1426-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>"
@ -775,8 +857,8 @@
 END LC_TIME
 
 LC_MESSAGES
--- glibc-20051221T0931/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20051221T0931-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20051227T1426/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
+++ glibc-20051227T1426-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>"
@ -788,8 +870,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-20051221T0931/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051221T0931-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20051227T1426/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
+++ glibc-20051227T1426-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
@@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@ -860,8 +942,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
--- glibc-20051221T0931/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20051221T0931-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20051227T1426/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
+++ glibc-20051227T1426-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
@@ -1,7 +1,7 @@
 comment_char %
 escape_char /
@ -889,8 +971,8 @@
 revision   "0.2"
 date       "2000-08-02"
 %
--- glibc-20051221T0931/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
-+++ glibc-20051221T0931-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
+--- glibc-20051227T1426/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
+++ glibc-20051227T1426-fedora/malloc/mcheck.c	20 Dec 2005 10:59:21 -0000	1.18.2.1
@@ -24,9 +24,25 @@
 # include <mcheck.h>
 # include <stdint.h>
@ -966,8 +1048,8 @@
 
       old_free_hook = __free_hook;
       __free_hook = freehook;
--- glibc-20051221T0931/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
-+++ glibc-20051221T0931-fedora/malloc/mtrace.c	20 Dec 2005 10:59:21 -0000	1.41.2.1
+--- glibc-20051227T1426/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
+++ glibc-20051227T1426-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)
@ -1023,9 +1105,33 @@
   __memalign_hook = tr_memalignhook;
   __malloc_hook = tr_mallochook;
 
--- glibc-20051221T0931/nptl/ChangeLog	20 Dec 2005 15:25:12 -0000	1.816
-+++ glibc-20051221T0931-fedora/nptl/ChangeLog	20 Dec 2005 18:05:56 -0000	1.706.2.66
-@@ -183,6 +183,15 @@
+--- glibc-20051227T1426/nptl/ChangeLog	27 Dec 2005 01:01:35 -0000	1.824
+++ glibc-20051227T1426-fedora/nptl/ChangeLog	27 Dec 2005 15:42:54 -0000	1.706.2.68
+@@ -1,3 +1,14 @@
+2005-12-27  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h: Add __next
+	and __prev field to pthread_mutex_t.
+	* sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h: Likewise.
+	* sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h: Likewise.
+	* sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h: Add __next field
+	to pthread_mutex_t.
+
+ 2005-12-26  Ulrich Drepper  <drepper@redhat.com>
+ 
+ 	* pthreadP.h: Define PTHREAD_MUTEX_ROBUST_PRIVATE_NP,
+@@ -56,7 +67,7 @@
+ 	* pthread_mutex_trylock.c (__pthread_mutex_trylock): Add break
+ 	missing after last change.
+ 
+-	* version.c: Update cpoyright year.
+	* version.c: Update copyright year.
+ 
+ 2005-12-23  Ulrich Drepper  <drepper@redhat.com>
+ 
+@@ -278,6 +289,15 @@
 	Use __sigfillset.  Document that sigfillset does the right thing wrt
 	to SIGSETXID.
 
@ -1041,7 +1147,7 @@
 2005-07-11  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #1102]
-@@ -919,6 +928,11 @@
+@@ -1014,6 +1034,11 @@
 	Move definition inside libpthread, libc, librt check.  Provide
 	definition for rtld.
 
@ -1053,7 +1159,7 @@
 2004-09-02  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -2993,6 +3007,11 @@
+@@ -3088,6 +3113,11 @@
 
 	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
 
@ -1065,9 +1171,9 @@
 2003-07-25  Jakub Jelinek  <jakub@redhat.com>
 
 	* tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-20051221T0931/nptl/Makefile	16 Oct 2005 09:25:52 -0000	1.171
-+++ glibc-20051221T0931-fedora/nptl/Makefile	20 Oct 2005 06:59:53 -0000	1.157.2.13
-@@ -500,15 +500,19 @@ $(addprefix $(objpfx), \
+--- glibc-20051227T1426/nptl/Makefile	27 Dec 2005 00:53:17 -0000	1.173
+++ glibc-20051227T1426-fedora/nptl/Makefile	27 Dec 2005 14:48:09 -0000	1.157.2.14
+@@ -507,15 +507,19 @@ $(addprefix $(objpfx), \
     $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
 				       $(objpfx)libpthread_nonshared.a
 $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so
@ -1089,8 +1195,8 @@
 else
 $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
 endif
--- glibc-20051221T0931/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20051221T0931-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20051227T1426/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
+++ glibc-20051227T1426-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;
@ -1115,8 +1221,8 @@
     {
       puts ("stack guard canaries are not randomized enough");
       puts ("nor equal to the default canary value");
--- glibc-20051221T0931/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051221T0931-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
+++ glibc-20051227T1426-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>
 +
@ -1124,8 +1230,205 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
--- glibc-20051221T0931/nscd/connections.c	7 Dec 2005 05:47:27 -0000	1.80
-+++ glibc-20051221T0931-fedora/nscd/connections.c	19 Dec 2005 12:11:23 -0000	1.55.2.17
+--- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h	11 Jul 2005 15:48:29 -0000	1.9
+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h	27 Dec 2005 15:42:54 -0000	1.7.2.3
+@@ -45,7 +45,7 @@ typedef union
+ 
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is deliberately not exposed.  */
+-typedef union
+typedef union __pthread_mutex_u
+ {
+   struct
+   {
+@@ -57,6 +57,9 @@ typedef union
+        binary compatibility.  */
+     int __kind;
+     int __spins;
+    union __pthread_mutex_u *__next;
+    union __pthread_mutex_u *__prev;
+#define __PTHREAD_MUTEX_HAVE_PREV	1
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+   long int __align;
+--- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h	28 Sep 2004 10:30:22 -0000	1.14
+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/ia64/bits/pthreadtypes.h	27 Dec 2005 15:42:54 -0000	1.13.2.2
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
+ 
+@@ -45,7 +45,7 @@ typedef union
+ 
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is not exposed on purpose.  */
+-typedef union
+typedef union __pthread_mutex_u
+ {
+   struct
+   {
+@@ -57,6 +57,9 @@ typedef union
+        binary compatibility.  */
+     int __kind;
+     int __spins;
+    union __pthread_mutex_u *__next;
+    union __pthread_mutex_u *__prev;
+#define __PTHREAD_MUTEX_HAVE_PREV	1
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+   long int __align;
+--- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h	28 Sep 2004 10:31:14 -0000	1.15
+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h	27 Dec 2005 15:42:54 -0000	1.14.2.2
+@@ -1,5 +1,5 @@
+ /* Machine-specific pthread type layouts.  PowerPC version.
+-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
+ 
+@@ -60,7 +60,7 @@ typedef union
+ 
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is deliberately not exposed.  */
+-typedef union
+typedef union __pthread_mutex_u
+ {
+   struct
+   {
+@@ -73,10 +73,19 @@ typedef union
+     /* KIND must stay at this position in the structure to maintain
+        binary compatibility.  */
+     int __kind;
+-#if __WORDSIZE != 64
+#if __WORDSIZE == 64
+    int __spins;
+    union __pthread_mutex_u *__next;
+    union __pthread_mutex_u *__prev;
+# define __PTHREAD_MUTEX_HAVE_PREV	1
+#else
+     unsigned int __nusers;
+    union
+    {
+      int __spins;
+      union __pthread_mutex_u *__next;
+    };
+ #endif
+-    int __spins;
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+   long int __align;
+--- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h	28 Sep 2004 10:32:01 -0000	1.14
+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/s390/bits/pthreadtypes.h	27 Dec 2005 15:42:54 -0000	1.13.2.2
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
+ 
+@@ -59,7 +59,7 @@ typedef union
+ 
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is not exposed on purpose.  */
+-typedef union
+typedef union __pthread_mutex_u
+ {
+   struct
+   {
+@@ -72,10 +72,19 @@ typedef union
+     /* KIND must stay at this position in the structure to maintain
+        binary compatibility.  */
+     int __kind;
+-#if __WORDSIZE != 64
+#if __WORDSIZE == 64
+    int __spins;
+    union __pthread_mutex_u *__next;
+    union __pthread_mutex_u *__prev;
+# define __PTHREAD_MUTEX_HAVE_PREV	1
+#else
+     unsigned int __nusers;
+    union
+    {
+      int __spins;
+      union __pthread_mutex_u *__next;
+    };
+ #endif
+-    int __spins;
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+   long int __align;
+--- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h	28 Sep 2004 10:33:06 -0000	1.11
+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/sh/bits/pthreadtypes.h	27 Dec 2005 15:42:54 -0000	1.10.2.2
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
+ 
+@@ -46,7 +46,7 @@ typedef union
+ 
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is not exposed on purpose.  */
+-typedef union
+typedef union __pthread_mutex_u
+ {
+   struct
+   {
+@@ -57,7 +57,11 @@ typedef union
+        binary compatibility.  */
+     int __kind;
+     unsigned int __nusers;
+-    int __spins;
+    union
+    {
+      int __spins;
+      union __pthread_mutex_u *__next;
+    };
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+   long int __align;
+--- glibc-20051227T1426/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h	28 Sep 2004 10:33:54 -0000	1.8
+++ glibc-20051227T1426-fedora/nptl/sysdeps/unix/sysv/linux/sparc/bits/pthreadtypes.h	27 Dec 2005 15:42:54 -0000	1.7.2.2
+@@ -1,5 +1,5 @@
+ /* Machine-specific pthread type layouts.  SPARC version.
+-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
+ 
+@@ -60,7 +60,7 @@ typedef union
+ 
+ /* Data structures for mutex handling.  The structure of the attribute
+    type is deliberately not exposed.  */
+-typedef union
+typedef union __pthread_mutex_u
+ {
+   struct
+   {
+@@ -73,10 +73,19 @@ typedef union
+     /* KIND must stay at this position in the structure to maintain
+        binary compatibility.  */
+     int __kind;
+-#if __WORDSIZE != 64
+#if __WORDSIZE == 64
+    int __spins;
+    union __pthread_mutex_u *__next;
+    union __pthread_mutex_u *__prev;
+# define __PTHREAD_MUTEX_HAVE_PREV	1
+#else
+     unsigned int __nusers;
+    union
+    {
+      int __spins;
+      union __pthread_mutex_u *__next;
+    };
+ #endif
+-    int __spins;
+   } __data;
+   char __size[__SIZEOF_PTHREAD_MUTEX_T];
+   long int __align;
+--- glibc-20051227T1426/nscd/connections.c	7 Dec 2005 05:47:27 -0000	1.80
+++ glibc-20051227T1426-fedora/nscd/connections.c	19 Dec 2005 12:11:23 -0000	1.55.2.17
@@ -1899,3 +1899,18 @@ finish_drop_privileges (void)
       exit (4);
     }
@ -1145,8 +1448,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
--- glibc-20051221T0931/nscd/nscd.c	7 Dec 2005 05:47:27 -0000	1.49
-+++ glibc-20051221T0931-fedora/nscd/nscd.c	19 Dec 2005 12:11:23 -0000	1.38.2.10
+--- glibc-20051227T1426/nscd/nscd.c	7 Dec 2005 05:47:27 -0000	1.49
+++ glibc-20051227T1426-fedora/nscd/nscd.c	19 Dec 2005 12:11:23 -0000	1.38.2.10
@@ -120,6 +120,9 @@ static struct argp argp =
   options, parse_opt, NULL, doc,
 };
@ -1165,8 +1468,8 @@
   signal (SIGPIPE, SIG_IGN);
 
   /* Cleanup files created by a previous 'bind'.  */
--- glibc-20051221T0931/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20051221T0931-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20051227T1426/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
+++ glibc-20051227T1426-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
@@ -32,8 +32,8 @@
 #	logfile			/var/log/nscd.log
 #	threads			6
@ -1178,8 +1481,8 @@
 	debug-level		0
 #	reload-count		5
 	paranoia		no
--- glibc-20051221T0931/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20051221T0931-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20051227T1426/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
+++ glibc-20051227T1426-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
@@ -9,6 +9,7 @@
 #		slow naming services like NIS, NIS+, LDAP, or hesiod.
 # processname: /usr/sbin/nscd
@ -1220,8 +1523,8 @@
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
--- glibc-20051221T0931/nscd/selinux.c	20 Jun 2005 15:44:41 -0000	1.5
-+++ glibc-20051221T0931-fedora/nscd/selinux.c	3 Oct 2005 20:54:46 -0000	1.1.2.5
+--- glibc-20051227T1426/nscd/selinux.c	20 Jun 2005 15:44:41 -0000	1.5
+++ glibc-20051227T1426-fedora/nscd/selinux.c	3 Oct 2005 20:54:46 -0000	1.1.2.5
@@ -127,7 +127,7 @@ audit_init (void)
 {
   audit_fd = audit_open ();
@ -1231,8 +1534,8 @@
 }
 #endif /* HAVE_LIBAUDIT */
 
--- glibc-20051221T0931/posix/Makefile	26 Sep 2005 21:13:27 -0000	1.186
-+++ glibc-20051221T0931-fedora/posix/Makefile	3 Oct 2005 20:44:16 -0000	1.171.2.14
+--- glibc-20051227T1426/posix/Makefile	26 Sep 2005 21:13:27 -0000	1.186
+++ glibc-20051227T1426-fedora/posix/Makefile	3 Oct 2005 20:44:16 -0000	1.171.2.14
@@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re
 	     bug-regex21-mem bug-regex21.mtrace \
 	     tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \
@ -1266,8 +1569,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
--- glibc-20051221T0931/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051221T0931-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20051227T1426/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
+++ glibc-20051227T1426-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 =
@ -1284,8 +1587,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
--- glibc-20051221T0931/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20051221T0931-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20051227T1426/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
+++ glibc-20051227T1426-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
@ -1301,8 +1604,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-20051221T0931/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20051221T0931-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20051227T1426/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
+++ glibc-20051227T1426-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))
@ -1314,8 +1617,8 @@
 endif
 endif
 
--- glibc-20051221T0931/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20051221T0931-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20051227T1426/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
+++ glibc-20051227T1426-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.  */
@ -1667,8 +1970,8 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
--- glibc-20051221T0931/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051221T0931-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20051227T1426/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
+++ glibc-20051227T1426-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.
@ -1754,8 +2057,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
--- glibc-20051221T0931/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20051221T0931-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20051227T1426/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
+++ glibc-20051227T1426-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);
     }
@ -1770,8 +2073,8 @@
   if (result != -1)
     return getpriority (PRIO_PROCESS, 0);
   else
--- glibc-20051221T0931/sysdeps/unix/sysv/linux/dl-osinfo.h	26 Jun 2005 18:14:09 -0000	1.21
-+++ glibc-20051221T0931-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Aug 2005 21:24:28 -0000	1.14.2.7
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/dl-osinfo.h	26 Jun 2005 18:14:09 -0000	1.21
+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Aug 2005 21:24:28 -0000	1.14.2.7
@@ -18,12 +18,15 @@
    02111-1307 USA.  */
 
@ -1820,8 +2123,8 @@
 +  ret ^= stk;
   return ret;
 }
--- glibc-20051221T0931/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20051221T0931-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
+++ glibc-20051227T1426-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"
@ -1831,8 +2134,8 @@
 #define _PATH_WTMP	"/var/log/wtmp"
 
 /* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-20051221T0931/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20051221T0931-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
+++ glibc-20051227T1426-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;
@ -1878,8 +2181,43 @@
 +  return retval;
 }
 libc_hidden_def (tcsetattr)
--- glibc-20051221T0931/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051221T0931-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/alpha/Versions	7 May 2004 01:57:35 -0000	1.12
+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/alpha/Versions	27 Dec 2005 15:42:55 -0000	1.12.2.1
+@@ -73,6 +73,10 @@ libc {
+     #errlist-compat	132
+     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+   }
+  GLIBC_2.4 {
+    #errlist-compat	138
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
+   GLIBC_PRIVATE {
+     __libc_alpha_cache_shape;
+   }
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/alpha/bits/errno.h	28 Aug 2002 23:58:00 -0000	1.1
+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/alpha/bits/errno.h	27 Dec 2005 15:42:55 -0000	1.1.2.1
+@@ -1,5 +1,5 @@
+ /* Error constants.  Linux/Alpha specific version.
+-   Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1998,1999,2002,2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -31,6 +31,12 @@
+ #  define ECANCELED	131
+ # endif
+ 
+/* Support for error codes to support robust mutexes was added later, too.  */
+# ifndef EOWNERDEAD
+#  define EOWNERDEAD		136
+#  define ENOTRECOVERABLE	137
+# endif
+
+ # ifndef __ASSEMBLER__
+ /* Function to get address of global `errno' variable.  */
+ extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
+++ glibc-20051227T1426-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.
@ -1940,8 +2278,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
--- glibc-20051221T0931/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20051221T0931-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
+++ glibc-20051227T1426-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)
@ -1974,24 +2312,69 @@
 +  } while (0)
 +
 #include_next <dl-cache.h>
--- glibc-20051221T0931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051221T0931-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
+++ glibc-20051227T1426-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-20051221T0931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051221T0931-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
+++ glibc-20051227T1426-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-20051221T0931/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20051221T0931-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
+++ glibc-20051227T1426-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-20051227T1426/sysdeps/unix/sysv/linux/sparc/Versions	28 Aug 2002 23:56:02 -0000	1.1
+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/sparc/Versions	27 Dec 2005 15:42:55 -0000	1.1.2.1
+@@ -1,8 +1,7 @@
+ libc {
+   # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+   # When you get an error from errlist-compat.awk, you need to add a new
+-  # version here.  Don't do this blindly, since this means changing the ABI
+-  # for all GNU/Linux configurations.
+  # version here.
+ 
+   GLIBC_2.0 {
+     #errlist-compat	127
+@@ -16,6 +15,10 @@ libc {
+     #errlist-compat	128
+     _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+   }
+  GLIBC_2.4 {
+    #errlist-compat	134
+    _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+  }
+ }
+ librt {
+   GLIBC_2.3 {
+--- glibc-20051227T1426/sysdeps/unix/sysv/linux/sparc/bits/errno.h	28 Aug 2002 23:59:23 -0000	1.1
+++ glibc-20051227T1426-fedora/sysdeps/unix/sysv/linux/sparc/bits/errno.h	27 Dec 2005 15:42:55 -0000	1.1.2.1
+@@ -1,5 +1,5 @@
+ /* Error constants.  Linux/Sparc specific version.
+-   Copyright (C) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1996,1997,1998,1999,2002,2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -31,6 +31,12 @@
+ #  define ECANCELED	127
+ # endif
+ 
+/* Support for error codes to support robust mutexes was added later, too.  */
+# ifndef EOWNERDEAD
+#  define EOWNERDEAD		132
+#  define ENOTRECOVERABLE	133
+# endif
+
+ # ifndef __ASSEMBLER__
+ /* Function to get address of global `errno' variable.  */
+ extern int *__errno_location (void) __THROW __attribute__ ((__const__));
--- a/glibc.spec
+++ b/glibc.spec
@ -1,9 +1,9 @@
-%define glibcdate 20051221T0931
+%define glibcdate 20051227T1426
 %define glibcname glibc
-%define glibcsrcdir glibc-20051221T0931
+%define glibcsrcdir glibc-20051227T1426
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 22
+%define glibcrelease 23
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@ -33,7 +33,6 @@ Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2
 Patch0: %{glibcname}-fedora.patch
 Patch1: %{name}-ppc-assume.patch
 Patch2: %{name}-ia64-lib64.patch
-Patch3: glibc-ldconfig.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@ -241,7 +240,6 @@ package or when debugging this package.
 %patch2 -p1
 %endif
 %endif
-%patch3 -p1

 # Hack till glibc-kernheaders get updated, argh
 mkdir asm
@ -397,7 +395,7 @@ cat > asm/unistd.h <<EOF
 #define __NR_waitid		281
 #endif
 %endif
-%ifarch sparc sparc64
+%ifarch sparc sparcv9 sparc64
 #ifndef __NR_mq_open
 #define __NR_mq_open		273
 #define __NR_mq_unlink		274
@ -425,6 +423,47 @@ cat > asm/unistd.h <<EOF
 %endif
 #endif
 EOF
+cat > asm/errno.h <<EOF
+#ifndef _HACK_ASM_ERRNO_H
+#include_next <asm/errno.h>
+%ifarch alpha
+#ifndef ENOKEY
+#define ENOKEY		132
+#define EKEYEXPIRED	133
+#define EKEYREVOKED	134
+#define EKEYREJECTED	135
+#endif
+#ifndef EOWNERDEAD
+#define EOWNERDEAD	136
+#define ENOTRECOVERABLE	137
+#endif
+%endif
+%ifarch %{ix86} ia64 ppc ppc64 s390 s390x x86_64
+#ifndef ENOKEY
+#define ENOKEY		126
+#define EKEYEXPIRED	127
+#define EKEYREVOKED	128
+#define EKEYREJECTED	129
+#endif
+#ifndef EOWNERDEAD
+#define EOWNERDEAD	130
+#define ENOTRECOVERABLE	131
+#endif
+%endif
+%ifarch sparc sparcv9 sparc64
+#ifndef ENOKEY
+#define ENOKEY		128
+#define EKEYEXPIRED	129
+#define EKEYREVOKED	130
+#define EKEYREJECTED	131
+#endif
+#ifndef EOWNERDEAD
+#define EOWNERDEAD	132
+#define ENOTRECOVERABLE	133
+#endif
+%endif
+#endif
+EOF

 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
@ -1081,11 +1120,16 @@ rm -f *.filelist*
 %endif

 %changelog
+* Tue Dec 27 2005 Jakub Jelinek <jakub@redhat.com> 2.3.90-23
+- update from CVS
+  - robust mutexes
+- fix transliteration segfaults (#176573, #176583)
+- ignore prelink temporaries in ldconfig (#176570)
+
 * Wed Dec 21 2005 Jakub Jelinek <jakub@redhat.com> 2.3.90-22
 - update from CVS
  - minor fts fixes
 - revert broken _Pragma () workaround
- fix ldconfig on bi-arch architectures (#176316)

 * Tue Dec 20 2005 Jakub Jelinek <jakub@redhat.com> 2.3.90-21
 - update from CVS
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-e64ddbee94cf4fce74c3db8bcd2fc991  glibc-20051221T0931.tar.bz2
-59a5ff9060518aac05d1ba52fdbda1ee  glibc-fedora-20051221T0931.tar.bz2
+7bc7ce483f72c2dd8450ee6eb5e8b0f2  glibc-20051227T1426.tar.bz2
+f62b785504dfc263cdc0e3c1dc6bbd7b  glibc-fedora-20051227T1426.tar.bz2