rpms/glibc/devel .cvsignore, 1.122, 1.123 glibc-fedora.patch, 1.113, 1.114 glibc.spec, 1.187, 1.188 sources, 1.144, 1.145 glibc-_Pragma-hack.patch, 1.3, NONE glibc-mtrace-recursion.patch, 1.1, NONE glibc-setjmp-mangling.patch, 1.9, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Dec 20 11:34:36 UTC 2005


Author: jakub

Update of /cvs/dist/rpms/glibc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26220/devel

Modified Files:
	.cvsignore glibc-fedora.patch glibc.spec sources 
Removed Files:
	glibc-_Pragma-hack.patch glibc-mtrace-recursion.patch 
	glibc-setjmp-mangling.patch 
Log Message:
auto-import glibc-2.3.90-20 on branch devel from glibc-2.3.90-20.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- .cvsignore	19 Dec 2005 13:06:57 -0000	1.122
+++ .cvsignore	20 Dec 2005 11:34:33 -0000	1.123
@@ -1,2 +1,2 @@
-glibc-20051219T1003.tar.bz2
-glibc-fedora-20051219T1003.tar.bz2
+glibc-20051220T1028.tar.bz2
+glibc-fedora-20051220T1028.tar.bz2

glibc-fedora.patch:
 ChangeLog                                      |   62 ++++
 ChangeLog.11                                   |   21 +
 ChangeLog.12                                   |   12 
 ChangeLog.15                                   |   45 +++
 csu/elf-init.c                                 |   17 +
 debug/tst-chk1.c                               |    7 
 elf/ldconfig.c                                 |   25 +
 elf/tst-stackguard1.c                          |    8 
 iconv/iconvconfig.c                            |   55 ++-
 include/features.h                             |    8 
 include/libc-symbols.h                         |    4 
 intl/locale.alias                              |    2 
 libio/bits/stdio2.h                            |   19 +
 libio/stdio.h                                  |    2 
 locale/iso-4217.def                            |   13 
 locale/programs/3level.h                       |   36 ++
 locale/setlocale.c                             |    2 
 locale/uselocale.c                             |    2 
 localedata/Makefile                            |    1 
 localedata/SUPPORTED                           |    6 
 localedata/locales/cy_GB                       |    7 
 localedata/locales/en_GB                       |    4 
 localedata/locales/no_NO                       |   69 ++++
 localedata/locales/zh_TW                       |    6 
 malloc/mcheck.c                                |   30 +-
 malloc/mtrace.c                                |   20 +
 nptl/ChangeLog                                 |   19 +
 nptl/Makefile                                  |    8 
 nptl/sysdeps/unix/sysv/linux/kernel-features.h |    6 
 nptl/tst-stackguard1.c                         |    8 
 nscd/connections.c                             |   15 +
 nscd/nscd.c                                    |    4 
 nscd/nscd.conf                                 |    4 
 nscd/nscd.init                                 |   19 -
 nscd/selinux.c                                 |    2 
 posix/Makefile                                 |   19 -
 posix/getconf.speclist.h                       |   15 +
 sysdeps/generic/dl-cache.h                     |    8 
 sysdeps/ia64/Makefile                          |    4 
 sysdeps/ia64/ia64libgcc.S                      |  350 -------------------------
 sysdeps/ia64/libgcc-compat.c                   |   84 ++++++
 sysdeps/unix/nice.c                            |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h            |   29 ++
 sysdeps/unix/sysv/linux/i386/dl-cache.h        |   59 ++++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h        |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c     |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h     |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed   |    2 
 sysdeps/unix/sysv/linux/paths.h                |    2 
 sysdeps/unix/sysv/linux/tcsetattr.c            |   32 ++
 50 files changed, 765 insertions(+), 451 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- glibc-fedora.patch	19 Dec 2005 13:06:57 -0000	1.113
+++ glibc-fedora.patch	20 Dec 2005 11:34:33 -0000	1.114
@@ -1,6 +1,38 @@
---- glibc-20051219T1003/ChangeLog	19 Dec 2005 07:26:29 -0000	1.9768
-+++ glibc-20051219T1003-fedora/ChangeLog	19 Dec 2005 12:11:11 -0000	1.8782.2.135
-@@ -3040,6 +3040,11 @@
+--- glibc-20051220T1028/ChangeLog	20 Dec 2005 07:57:16 -0000	1.9772
++++ glibc-20051220T1028-fedora/ChangeLog	20 Dec 2005 10:59:21 -0000	1.8782.2.138
+@@ -1,3 +1,31 @@
++2005-12-20  Jakub Jelinek  <jakub at redhat.com>
++
++	* malloc/mtrace.c (__libc_malloc, __libc_free, __libc_realloc,
++	__libc_memalign): Add prototypes and libc_hidden_proto resp.
++	defines for !_LIBC.
++	(tr_freehook): Call __libc_free instead of free.
++	(tr_mallochook): Call __libc_malloc instead of malloc.
++	(tr_reallochook): Call __libc_realloc instead of realloc.
++	(tr_memalignhook): Call __libc_memalign instead of memalign.
++	* malloc/mcheck.c: Include stdlib.h.
++	(__libc_malloc, __libc_free, __libc_realloc,
++	__libc_memalign): Add prototypes and libc_hidden_proto resp.
++	defines for !_LIBC.
++	(freehook): Call __libc_free instead of free.
++	(mallochook): Call __libc_malloc instead of malloc.
++	(reallochook): Call __libc_realloc instead of realloc.
++	(memalignhook): Call __libc_memalign instead of memalign.
++	(mcheck): Call __libc_malloc and __libc_free instead of
++	malloc and free.
++
++	Workaround for http://gcc.gnu.org/PR25240
++	* include/libc-symbols.h (weak_extern): Define using weak attribute.
++	(_weak_extern): Remove.
++	(weak_tls_extern): Define.
++	* locale/uselocale.c (DEFINE_CATEGORY): Use weak_tls_extern for
++	_nl_current_##category.
++	* locale/setlocale.c (DEFINE_CATEGORY): Likewise.
++
+ 2005-12-19  Ulrich Drepper  <drepper at redhat.com>
+ 
+ 	[BZ #1955]
+@@ -3116,6 +3144,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.
  
@@ -12,7 +44,7 @@
  2005-10-03  Roland McGrath  <roland at redhat.com>
  
  	* sysdeps/powerpc/nofpu: Directory removed, saved in ports repository.
-@@ -4034,6 +4039,12 @@
+@@ -4110,6 +4143,12 @@
  	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
  	(__argp_failure): Likewise.
  
@@ -25,7 +57,7 @@
  2005-08-08  Ulrich Drepper  <drepper at redhat.com>
  
  	* nscd/cache.c (cache_add): Commit hash table and header to disk.
-@@ -4158,6 +4169,17 @@
+@@ -4234,6 +4273,17 @@
  	__syslog_chk.
  	* misc/Versions: Export __syslog_chk and __vsyslog_chk.
  
@@ -43,7 +75,7 @@
  2005-07-28  Thomas Schwinge  <schwinge at nic-nac-project.de>
  
  	[BZ #1137]
-@@ -7218,6 +7240,18 @@
+@@ -7294,6 +7344,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -62,8 +94,8 @@
  2005-02-10  Roland McGrath  <roland at redhat.com>
  
  	[BZ #157]
---- glibc-20051219T1003/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
-+++ glibc-20051219T1003-fedora/ChangeLog.11	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20051220T1028/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1
++++ glibc-20051220T1028-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.
@@ -113,8 +145,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-20051219T1003/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
-+++ glibc-20051219T1003-fedora/ChangeLog.12	22 Sep 2004 21:20:47 -0000	1.1.4.1
+--- glibc-20051220T1028/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1
++++ glibc-20051220T1028-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.
@@ -141,8 +173,8 @@
  2001-01-02  Franz Sirl	<Franz.Sirl-kernel at lauterbach.com>
  
  	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.
---- glibc-20051219T1003/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
-+++ glibc-20051219T1003-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
+--- glibc-20051220T1028/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1
++++ glibc-20051220T1028-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub at redhat.com>
@@ -223,8 +255,8 @@
  2004-08-30  Roland McGrath  <roland at frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20051219T1003/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
-+++ glibc-20051219T1003-fedora/csu/elf-init.c	15 Nov 2005 09:54:10 -0000	1.3.2.6
+--- glibc-20051220T1028/csu/elf-init.c	5 Nov 2005 17:41:38 -0000	1.8
++++ glibc-20051220T1028-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;
@@ -249,8 +281,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-20051219T1003/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
-+++ glibc-20051219T1003-fedora/debug/tst-chk1.c	24 Aug 2005 07:23:26 -0000	1.1.2.15
+--- glibc-20051220T1028/debug/tst-chk1.c	22 Aug 2005 15:12:34 -0000	1.14
++++ glibc-20051220T1028-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.  */
@@ -279,8 +311,8 @@
  # define O 0
  #else
  # define O 1
---- glibc-20051219T1003/elf/ldconfig.c	7 Dec 2005 05:47:27 -0000	1.50
-+++ glibc-20051219T1003-fedora/elf/ldconfig.c	19 Dec 2005 12:11:14 -0000	1.47.2.4
+--- glibc-20051220T1028/elf/ldconfig.c	7 Dec 2005 05:47:27 -0000	1.50
++++ glibc-20051220T1028-fedora/elf/ldconfig.c	19 Dec 2005 12:11:14 -0000	1.47.2.4
 @@ -951,17 +951,19 @@ search_dirs (void)
  
  
@@ -362,8 +394,8 @@
      }
  
    search_dirs ();
---- glibc-20051219T1003/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
-+++ glibc-20051219T1003-fedora/elf/tst-stackguard1.c	8 Aug 2005 21:24:27 -0000	1.1.2.3
+--- glibc-20051220T1028/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1
++++ glibc-20051220T1028-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;
@@ -388,8 +420,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20051219T1003/iconv/iconvconfig.c	7 Dec 2005 05:47:27 -0000	1.24
-+++ glibc-20051219T1003-fedora/iconv/iconvconfig.c	19 Dec 2005 12:11:14 -0000	1.19.2.5
+--- glibc-20051220T1028/iconv/iconvconfig.c	7 Dec 2005 05:47:27 -0000	1.24
++++ glibc-20051220T1028-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)
@@ -466,8 +498,8 @@
    /* Open the output file.  */
    if (output_file == NULL)
      {
---- glibc-20051219T1003/include/features.h	14 Oct 2005 22:04:45 -0000	1.41
-+++ glibc-20051219T1003-fedora/include/features.h	20 Oct 2005 06:59:51 -0000	1.35.2.10
+--- glibc-20051220T1028/include/features.h	14 Oct 2005 22:04:45 -0000	1.41
++++ glibc-20051220T1028-fedora/include/features.h	20 Oct 2005 06:59:51 -0000	1.35.2.10
 @@ -265,7 +265,13 @@
  #endif
  
@@ -483,8 +515,21 @@
  # if _FORTIFY_SOURCE > 1
  #  define __USE_FORTIFY_LEVEL 2
  # else
---- glibc-20051219T1003/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
-+++ glibc-20051219T1003-fedora/intl/locale.alias	22 Sep 2004 21:20:53 -0000	1.23.2.1
+--- glibc-20051220T1028/include/libc-symbols.h	6 Nov 2005 02:05:18 -0000	1.73
++++ glibc-20051220T1028-fedora/include/libc-symbols.h	20 Dec 2005 10:55:59 -0000	1.64.2.8
+@@ -114,8 +114,8 @@
+   extern __typeof (name) aliasname __attribute__ ((weak, alias (#name)));
+ 
+ /* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined).  */
+-#  define weak_extern(symbol) _weak_extern (weak symbol)
+-#  define _weak_extern(expr) _Pragma (#expr)
++#  define weak_extern(symbol) extern __typeof (symbol) symbol __attribute__ ((weak));
++#  define weak_tls_extern(symbol) extern __thread __typeof (symbol) symbol __attribute__ ((weak));
+ 
+ # else
+ 
+--- glibc-20051220T1028/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23
++++ glibc-20051220T1028-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
@@ -494,8 +539,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-20051219T1003/libio/stdio.h	11 Nov 2005 18:56:20 -0000	1.83
-+++ glibc-20051219T1003-fedora/libio/stdio.h	15 Nov 2005 08:21:55 -0000	1.78.2.6
+--- glibc-20051220T1028/libio/stdio.h	11 Nov 2005 18:56:20 -0000	1.83
++++ glibc-20051220T1028-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.  */
@@ -509,8 +554,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-20051219T1003/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
-+++ glibc-20051219T1003-fedora/libio/bits/stdio2.h	27 Jun 2005 13:04:16 -0000	1.1.2.6
+--- glibc-20051220T1028/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4
++++ glibc-20051220T1028-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);
@@ -541,8 +586,8 @@
  
  #endif
  
---- glibc-20051219T1003/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
-+++ glibc-20051219T1003-fedora/locale/iso-4217.def	3 Oct 2005 20:44:15 -0000	1.15.2.3
+--- glibc-20051220T1028/locale/iso-4217.def	23 Sep 2005 19:07:54 -0000	1.18
++++ glibc-20051220T1028-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 !!!
@@ -634,8 +679,30 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-20051219T1003/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
-+++ glibc-20051219T1003-fedora/locale/programs/3level.h	19 Dec 2005 12:11:15 -0000	1.5.2.2
+--- glibc-20051220T1028/locale/setlocale.c	23 Mar 2005 03:01:50 -0000	1.67
++++ glibc-20051220T1028-fedora/locale/setlocale.c	20 Dec 2005 10:55:59 -0000	1.66.2.2
+@@ -39,7 +39,7 @@
+ # define DEFINE_CATEGORY(category, category_name, items, a) \
+     extern char _nl_current_##category##_used; \
+     weak_extern (_nl_current_##category##_used) \
+-    weak_extern (_nl_current_##category)
++    weak_tls_extern (_nl_current_##category)
+ # include "categories.def"
+ # undef	DEFINE_CATEGORY
+ 
+--- glibc-20051220T1028/locale/uselocale.c	14 Mar 2004 20:40:48 -0000	1.5
++++ glibc-20051220T1028-fedora/locale/uselocale.c	20 Dec 2005 10:55:59 -0000	1.5.2.1
+@@ -54,7 +54,7 @@ __uselocale (locale_t newloc)
+       {									      \
+ 	extern char _nl_current_##category##_used;			      \
+ 	weak_extern (_nl_current_##category##_used)			      \
+-	weak_extern (_nl_current_##category)				      \
++	weak_tls_extern (_nl_current_##category)				      \
+ 	if (&_nl_current_##category##_used != 0)			      \
+ 	  _nl_current_##category = &locobj->__locales[category];	      \
+       }
+--- glibc-20051220T1028/locale/programs/3level.h	7 Dec 2005 05:47:27 -0000	1.6
++++ glibc-20051220T1028-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,
  	}
      }
@@ -679,8 +746,8 @@
  #endif
  
  #ifndef NO_FINALIZE
---- glibc-20051219T1003/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
-+++ glibc-20051219T1003-fedora/localedata/Makefile	3 Oct 2005 20:44:15 -0000	1.101.2.2
+--- glibc-20051220T1028/localedata/Makefile	25 Sep 2005 17:01:12 -0000	1.102
++++ glibc-20051220T1028-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/'`; \
@@ -689,8 +756,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-20051219T1003/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
-+++ glibc-20051219T1003-fedora/localedata/SUPPORTED	15 Nov 2005 08:21:56 -0000	1.71.2.8
+--- glibc-20051220T1028/localedata/SUPPORTED	5 Nov 2005 16:25:49 -0000	1.87
++++ glibc-20051220T1028-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 \
@@ -732,8 +799,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-20051219T1003/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
-+++ glibc-20051219T1003-fedora/localedata/locales/cy_GB	29 Sep 2004 08:48:23 -0000	1.3.2.2
+--- glibc-20051220T1028/localedata/locales/cy_GB	28 Sep 2004 04:37:33 -0000	1.4
++++ glibc-20051220T1028-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>"
@@ -748,8 +815,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-20051219T1003/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
-+++ glibc-20051219T1003-fedora/localedata/locales/en_GB	2 Nov 2004 12:25:47 -0000	1.10.2.2
+--- glibc-20051220T1028/localedata/locales/en_GB	31 Oct 2004 23:42:26 -0000	1.12
++++ glibc-20051220T1028-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>"
@@ -761,8 +828,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-20051219T1003/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051219T1003-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
+--- glibc-20051220T1028/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20051220T1028-fedora/localedata/locales/no_NO	22 Sep 2004 21:21:01 -0000	1.11.2.1
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -833,8 +900,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-20051219T1003/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
-+++ glibc-20051219T1003-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
+--- glibc-20051220T1028/localedata/locales/zh_TW	31 Oct 2004 23:42:28 -0000	1.7
++++ glibc-20051220T1028-fedora/localedata/locales/zh_TW	2 Nov 2004 12:25:57 -0000	1.5.2.2
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -862,9 +929,143 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-20051219T1003/nptl/ChangeLog	18 Dec 2005 06:58:22 -0000	1.814
-+++ glibc-20051219T1003-fedora/nptl/ChangeLog	19 Dec 2005 12:11:22 -0000	1.706.2.64
-@@ -160,6 +160,15 @@
+--- glibc-20051220T1028/malloc/mcheck.c	8 Sep 2004 20:36:02 -0000	1.18
++++ glibc-20051220T1028-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>
+ # include <stdio.h>
++# include <stdlib.h>
+ # include <libintl.h>
+ #endif
+ 
++#ifdef _LIBC
++extern __typeof (malloc) __libc_malloc;
++extern __typeof (free) __libc_free;
++extern __typeof (realloc) __libc_realloc;
++libc_hidden_proto (__libc_malloc)
++libc_hidden_proto (__libc_realloc)
++libc_hidden_proto (__libc_free)
++libc_hidden_proto (__libc_memalign)
++#else
++# define __libc_malloc(sz) malloc (sz)
++# define __libc_free(ptr) free (ptr)
++# define __libc_realloc(ptr, sz) realloc (ptr, sz)
++# define __libc_memalign(al, sz) memalign (al, sz)
++#endif
++
+ /* Old hook values.  */
+ static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t);
+ static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t);
+@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t cal
+   if (old_free_hook != NULL)
+     (*old_free_hook) (ptr, caller);
+   else
+-    free (ptr);
++    __libc_free (ptr);
+   __free_hook = freehook;
+ }
+ 
+@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const 
+     hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1,
+ 					     caller);
+   else
+-    hdr = (struct hdr *) malloc (sizeof (struct hdr) + size + 1);
++    hdr = (struct hdr *) __libc_malloc (sizeof (struct hdr) + size + 1);
+   __malloc_hook = mallochook;
+   if (hdr == NULL)
+     return NULL;
+@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment,
+   if (old_memalign_hook != NULL)
+     block = (*old_memalign_hook) (alignment, slop + size + 1, caller);
+   else
+-    block = memalign (alignment, slop + size + 1);
++    block = __libc_memalign (alignment, slop + size + 1);
+   __memalign_hook = memalignhook;
+   if (block == NULL)
+     return NULL;
+@@ -294,8 +310,8 @@ reallochook (__ptr_t ptr, __malloc_size_
+ 					      sizeof (struct hdr) + size + 1,
+ 					      caller);
+   else
+-    hdr = (struct hdr *) realloc ((__ptr_t) hdr,
+-				  sizeof (struct hdr) + size + 1);
++    hdr = (struct hdr *) __libc_realloc ((__ptr_t) hdr,
++					 sizeof (struct hdr) + size + 1);
+   __free_hook = freehook;
+   __malloc_hook = mallochook;
+   __memalign_hook = memalignhook;
+@@ -355,8 +371,8 @@ mcheck (func)
+   if (__malloc_initialized <= 0 && !mcheck_used)
+     {
+       /* We call malloc() once here to ensure it is initialized.  */
+-      void *p = malloc (0);
+-      free (p);
++      void *p = __libc_malloc (0);
++      __libc_free (p);
+ 
+       old_free_hook = __free_hook;
+       __free_hook = freehook;
+--- glibc-20051220T1028/malloc/mtrace.c	14 Sep 2004 04:24:46 -0000	1.41
++++ glibc-20051220T1028-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)
+ # define fwrite(buf, size, count, fp) _IO_fwrite (buf, size, count, fp)
++extern __typeof (malloc) __libc_malloc;
++extern __typeof (free) __libc_free;
++extern __typeof (realloc) __libc_realloc;
++libc_hidden_proto (__libc_malloc)
++libc_hidden_proto (__libc_realloc)
++libc_hidden_proto (__libc_free)
++libc_hidden_proto (__libc_memalign)
++#else
++# define __libc_malloc(sz) malloc (sz)
++# define __libc_free(ptr) free (ptr)
++# define __libc_realloc(ptr, sz) realloc (ptr, sz)
++# define __libc_memalign(al, sz) memalign (al, sz)
+ #endif
+ 
+ #ifndef attribute_hidden
+@@ -154,7 +166,7 @@ tr_freehook (ptr, caller)
+   if (tr_old_free_hook != NULL)
+     (*tr_old_free_hook) (ptr, caller);
+   else
+-    free (ptr);
++    __libc_free (ptr);
+   __free_hook = tr_freehook;
+   __libc_lock_unlock (lock);
+ }
+@@ -173,7 +185,7 @@ tr_mallochook (size, caller)
+   if (tr_old_malloc_hook != NULL)
+     hdr = (__ptr_t) (*tr_old_malloc_hook) (size, caller);
+   else
+-    hdr = (__ptr_t) malloc (size);
++    hdr = (__ptr_t) __libc_malloc (size);
+   __malloc_hook = tr_mallochook;
+ 
+   tr_where (caller);
+@@ -209,7 +221,7 @@ tr_reallochook (ptr, size, caller)
+   if (tr_old_realloc_hook != NULL)
+     hdr = (__ptr_t) (*tr_old_realloc_hook) (ptr, size, caller);
+   else
+-    hdr = (__ptr_t) realloc (ptr, size);
++    hdr = (__ptr_t) __libc_realloc (ptr, size);
+   __free_hook = tr_freehook;
+   __malloc_hook = tr_mallochook;
+   __realloc_hook = tr_reallochook;
+@@ -251,7 +263,7 @@ tr_memalignhook (alignment, size, caller
+   if (tr_old_memalign_hook != NULL)
+     hdr = (__ptr_t) (*tr_old_memalign_hook) (alignment, size, caller);
+   else
+-    hdr = (__ptr_t) memalign (alignment, size);
++    hdr = (__ptr_t) __libc_memalign (alignment, size);
+   __memalign_hook = tr_memalignhook;
+   __malloc_hook = tr_mallochook;
+ 
+--- glibc-20051220T1028/nptl/ChangeLog	20 Dec 2005 06:47:40 -0000	1.815
++++ glibc-20051220T1028-fedora/nptl/ChangeLog	20 Dec 2005 10:50:49 -0000	1.706.2.65
+@@ -176,6 +176,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -880,7 +1081,7 @@
  2005-07-11  Jakub Jelinek  <jakub at redhat.com>
  
  	[BZ #1102]
-@@ -896,6 +905,11 @@
+@@ -912,6 +921,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -892,7 +1093,7 @@
  2004-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -2970,6 +2984,11 @@
+@@ -2986,6 +3000,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -904,8 +1105,8 @@
  2003-07-25  Jakub Jelinek  <jakub at redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20051219T1003/nptl/Makefile	16 Oct 2005 09:25:52 -0000	1.171
-+++ glibc-20051219T1003-fedora/nptl/Makefile	20 Oct 2005 06:59:53 -0000	1.157.2.13
+--- glibc-20051220T1028/nptl/Makefile	16 Oct 2005 09:25:52 -0000	1.171
++++ glibc-20051220T1028-fedora/nptl/Makefile	20 Oct 2005 06:59:53 -0000	1.157.2.13
 @@ -500,15 +500,19 @@ $(addprefix $(objpfx), \
      $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \
  				       $(objpfx)libpthread_nonshared.a
@@ -928,8 +1129,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-20051219T1003/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
-+++ glibc-20051219T1003-fedora/nptl/tst-stackguard1.c	8 Aug 2005 21:24:28 -0000	1.1.2.3
+--- glibc-20051220T1028/nptl/tst-stackguard1.c	26 Jun 2005 17:44:14 -0000	1.1
++++ glibc-20051220T1028-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;
@@ -954,8 +1155,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-20051219T1003/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051219T1003-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h	22 Sep 2004 21:21:02 -0000	1.1.2.1
+--- glibc-20051220T1028/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20051220T1028-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>
 +
@@ -963,8 +1164,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-20051219T1003/nscd/connections.c	7 Dec 2005 05:47:27 -0000	1.80
-+++ glibc-20051219T1003-fedora/nscd/connections.c	19 Dec 2005 12:11:23 -0000	1.55.2.17
+--- glibc-20051220T1028/nscd/connections.c	7 Dec 2005 05:47:27 -0000	1.80
++++ glibc-20051220T1028-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);
      }
@@ -984,8 +1185,8 @@
 +    prune_cache (&dbs[hstdb], LONG_MAX);
 +}
 +
---- glibc-20051219T1003/nscd/nscd.c	7 Dec 2005 05:47:27 -0000	1.49
-+++ glibc-20051219T1003-fedora/nscd/nscd.c	19 Dec 2005 12:11:23 -0000	1.38.2.10
+--- glibc-20051220T1028/nscd/nscd.c	7 Dec 2005 05:47:27 -0000	1.49
++++ glibc-20051220T1028-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,
  };
@@ -1004,8 +1205,8 @@
    signal (SIGPIPE, SIG_IGN);
  
    /* Cleanup files created by a previous 'bind'.  */
---- glibc-20051219T1003/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
-+++ glibc-20051219T1003-fedora/nscd/nscd.conf	24 Aug 2005 07:23:30 -0000	1.8.2.3
+--- glibc-20051220T1028/nscd/nscd.conf	23 Aug 2005 23:17:32 -0000	1.11
++++ glibc-20051220T1028-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
@@ -1017,8 +1218,8 @@
  	debug-level		0
  #	reload-count		5
  	paranoia		no
---- glibc-20051219T1003/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
-+++ glibc-20051219T1003-fedora/nscd/nscd.init	12 Sep 2005 12:53:20 -0000	1.6.2.4
+--- glibc-20051220T1028/nscd/nscd.init	20 Jun 2005 15:47:52 -0000	1.9
++++ glibc-20051220T1028-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
@@ -1059,8 +1260,8 @@
      RETVAL=$?
      echo
      [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20051219T1003/nscd/selinux.c	20 Jun 2005 15:44:41 -0000	1.5
-+++ glibc-20051219T1003-fedora/nscd/selinux.c	3 Oct 2005 20:54:46 -0000	1.1.2.5
+--- glibc-20051220T1028/nscd/selinux.c	20 Jun 2005 15:44:41 -0000	1.5
++++ glibc-20051220T1028-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 ();
@@ -1070,8 +1271,8 @@
  }
  #endif /* HAVE_LIBAUDIT */
  
---- glibc-20051219T1003/posix/Makefile	26 Sep 2005 21:13:27 -0000	1.186
-+++ glibc-20051219T1003-fedora/posix/Makefile	3 Oct 2005 20:44:16 -0000	1.171.2.14
+--- glibc-20051220T1028/posix/Makefile	26 Sep 2005 21:13:27 -0000	1.186
++++ glibc-20051220T1028-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 \
@@ -1105,8 +1306,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
 +	mv -f $@.new $@
---- glibc-20051219T1003/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051219T1003-fedora/posix/getconf.speclist.h	13 Dec 2004 23:32:37 -0000	1.1.2.2
+--- glibc-20051220T1028/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20051220T1028-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 =
@@ -1123,8 +1324,8 @@
 +"POSIX_V6_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-20051219T1003/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
-+++ glibc-20051219T1003-fedora/sysdeps/generic/dl-cache.h	22 Sep 2004 21:21:07 -0000	1.13.2.1
+--- glibc-20051220T1028/sysdeps/generic/dl-cache.h	25 Jun 2003 08:01:22 -0000	1.13
++++ glibc-20051220T1028-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
@@ -1140,8 +1341,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-20051219T1003/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
-+++ glibc-20051219T1003-fedora/sysdeps/ia64/Makefile	22 Sep 2004 21:21:07 -0000	1.10.2.1
+--- glibc-20051220T1028/sysdeps/ia64/Makefile	16 Aug 2004 06:46:14 -0000	1.10
++++ glibc-20051220T1028-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))
@@ -1153,8 +1354,8 @@
  endif
  endif
  
---- glibc-20051219T1003/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
-+++ glibc-20051219T1003-fedora/sysdeps/ia64/ia64libgcc.S	22 Sep 2004 21:21:07 -0000	1.2.2.1
+--- glibc-20051220T1028/sysdeps/ia64/ia64libgcc.S	11 May 2002 05:12:35 -0000	1.2
++++ glibc-20051220T1028-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.  */
@@ -1506,8 +1707,8 @@
 -	.symver	___multi3, __multi3 at GLIBC_2.2
 -
 -#endif
---- glibc-20051219T1003/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051219T1003-fedora/sysdeps/ia64/libgcc-compat.c	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20051220T1028/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20051220T1028-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.
@@ -1593,8 +1794,8 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-20051219T1003/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
-+++ glibc-20051219T1003-fedora/sysdeps/unix/nice.c	22 Sep 2004 21:21:08 -0000	1.6.2.1
+--- glibc-20051220T1028/sysdeps/unix/nice.c	28 Sep 2002 19:13:13 -0000	1.6
++++ glibc-20051220T1028-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);
      }
@@ -1609,8 +1810,8 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
---- glibc-20051219T1003/sysdeps/unix/sysv/linux/dl-osinfo.h	26 Jun 2005 18:14:09 -0000	1.21
-+++ glibc-20051219T1003-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	8 Aug 2005 21:24:28 -0000	1.14.2.7
+--- glibc-20051220T1028/sysdeps/unix/sysv/linux/dl-osinfo.h	26 Jun 2005 18:14:09 -0000	1.21
++++ glibc-20051220T1028-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.  */
  
@@ -1659,8 +1860,8 @@
 +  ret ^= stk;
    return ret;
  }
---- glibc-20051219T1003/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
-+++ glibc-20051219T1003-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
+--- glibc-20051220T1028/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
++++ glibc-20051220T1028-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"
@@ -1670,8 +1871,8 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20051219T1003/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
-+++ glibc-20051219T1003-fedora/sysdeps/unix/sysv/linux/tcsetattr.c	22 Sep 2004 21:21:08 -0000	1.16.2.1
+--- glibc-20051220T1028/sysdeps/unix/sysv/linux/tcsetattr.c	10 Sep 2003 19:16:07 -0000	1.16
++++ glibc-20051220T1028-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;
@@ -1717,8 +1918,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-20051219T1003/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051219T1003-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h	22 Sep 2004 21:21:08 -0000	1.1.2.1
+--- glibc-20051220T1028/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20051220T1028-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.
@@ -1779,8 +1980,8 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-20051219T1003/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
-+++ glibc-20051219T1003-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h	22 Sep 2004 21:21:09 -0000	1.2.4.1
+--- glibc-20051220T1028/sysdeps/unix/sysv/linux/ia64/dl-cache.h	6 Jul 2001 04:56:17 -0000	1.2
++++ glibc-20051220T1028-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)
@@ -1813,24 +2014,24 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-20051219T1003/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051219T1003-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20051220T1028/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20051220T1028-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-20051219T1003/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20051219T1003-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h	22 Sep 2004 21:21:09 -0000	1.1.2.1
+--- glibc-20051220T1028/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20051220T1028-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-20051219T1003/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
-+++ glibc-20051219T1003-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	22 Sep 2004 21:21:09 -0000	1.2.2.1
+--- glibc-20051220T1028/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed	17 Jan 2002 06:49:28 -0000	1.2
++++ glibc-20051220T1028-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"_


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -r1.187 -r1.188
--- glibc.spec	19 Dec 2005 18:16:27 -0000	1.187
+++ glibc.spec	20 Dec 2005 11:34:33 -0000	1.188
@@ -1,9 +1,9 @@
-%define glibcdate 20051219T1003
+%define glibcdate 20051220T1028
 %define glibcname glibc
-%define glibcsrcdir glibc-20051219T1003
+%define glibcsrcdir glibc-20051220T1028
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.90
-%define glibcrelease 19
+%define glibcrelease 20
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -33,9 +33,6 @@
 Patch0: %{glibcname}-fedora.patch
 Patch1: %{name}-ppc-assume.patch
 Patch2: %{name}-ia64-lib64.patch
-Patch3: glibc-_Pragma-hack.patch
-Patch4: glibc-setjmp-mangling.patch
-Patch5: glibc-mtrace-recursion.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
@@ -243,9 +240,6 @@
 %patch2 -p1
 %endif
 %endif
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir asm
@@ -876,8 +870,8 @@
 done
 
 echo Sorting source file lists. Might take a while...
-xargs -0 -n 1 echo < $sf | LC_ALL=C grep -v '/<internal>$\|\.gperf$' | LC_ALL=C sort -u > $sf.sorted
-xargs -0 -n 1 echo < $csf | LC_ALL=C grep -v '/<internal>$\|\.gperf$' | LC_ALL=C sort -u > $csf.sorted
+xargs -0 -n 1 echo < $sf | LC_ALL=C grep -v '/<internal>$' | LC_ALL=C sort -u > $sf.sorted
+xargs -0 -n 1 echo < $csf | LC_ALL=C grep -v '/<internal>$' | LC_ALL=C sort -u > $csf.sorted
 mkdir -p $RPM_BUILD_ROOT/usr/src/debug
 cat $sf.sorted $csf.sorted \
   | (cd $RPM_BUILD_DIR; LC_ALL=C sort -u | cpio -pdm ${RPM_BUILD_ROOT}/usr/src/debug)
@@ -1085,6 +1079,12 @@
 %endif
 
 %changelog
+* Tue Dec 20 2005 Jakub Jelinek <jakub at redhat.com> 2.3.90-20
+- update from CVS
+  - time ((void *) 1) should segfault, not return -EFAULT (#174856, BZ#1952)
+  - fix errlist generation
+- update ulps for GCC 4.1
+
 * Mon Dec 19 2005 Jakub Jelinek <jakub at redhat.com> 2.3.90-19
 - update from CVS
   - sysdeps/generic reorg


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- sources	19 Dec 2005 13:06:57 -0000	1.144
+++ sources	20 Dec 2005 11:34:34 -0000	1.145
@@ -1,2 +1,2 @@
-5c4296bcdd5aec829651ed3997d2eadd  glibc-20051219T1003.tar.bz2
-29470bf176acdf597e841399df5a41f6  glibc-fedora-20051219T1003.tar.bz2
+047d4567a34ef1cef41da8867e0a0645  glibc-20051220T1028.tar.bz2
+2de80ce7902c78c28ea0810591539025  glibc-fedora-20051220T1028.tar.bz2


--- glibc-_Pragma-hack.patch DELETED ---


--- glibc-mtrace-recursion.patch DELETED ---


--- glibc-setjmp-mangling.patch DELETED ---




More information about the fedora-cvs-commits mailing list