From b1f781be295efd556e42def75bd42922887b9939 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Nov 03 2006 17:08:57 +0000 Subject: auto-import glibc-2.5.90-4 on branch devel from glibc-2.5.90-4.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 4cf66c6..19ab90a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20061029T2155.tar.bz2 -glibc-fedora-20061029T2155.tar.bz2 +glibc-20061103T1610.tar.bz2 +glibc-fedora-20061103T1610.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 15efea5..c90f376 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,15 @@ ---- glibc-20061029T2155/ChangeLog 29 Oct 2006 21:50:49 -0000 1.10399 -+++ glibc-20061029T2155-fedora/ChangeLog 29 Oct 2006 22:03:20 -0000 1.8782.2.217 -@@ -652,6 +652,17 @@ +--- glibc-20061103T1610/ChangeLog 2 Nov 2006 18:35:22 -0000 1.10403 ++++ glibc-20061103T1610-fedora/ChangeLog 3 Nov 2006 16:38:21 -0000 1.8782.2.219 +@@ -1,3 +1,8 @@ ++2006-11-02 Jakub Jelinek ++ ++ * malloc/memusage.c (dest): Reset not_me back to false after printing ++ statistics. ++ + 2006-11-02 Ulrich Drepper + + * configure.in: Work around ld --help change and avoid -z relro +@@ -668,6 +673,17 @@ * sysdeps/ieee754/ldbl-128ibm/s_lroundl.c: Rewritten. 2006-09-14 Jakub Jelinek @@ -18,8 +27,8 @@ Steven Munroe * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 4 new cap ---- glibc-20061029T2155/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20061029T2155-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20061103T1610/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20061103T1610-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. @@ -69,8 +78,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-20061029T2155/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20061029T2155-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20061103T1610/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20061103T1610-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. @@ -97,8 +106,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20061029T2155/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20061029T2155-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20061103T1610/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20061103T1610-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -179,8 +188,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20061029T2155/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20061029T2155-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20061103T1610/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20061103T1610-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 @@ -171,6 +171,11 @@ [BZ #2611] * stdio-common/renameat.c (renameat): Fix typo. @@ -352,8 +361,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20061029T2155/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20061029T2155-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20061103T1610/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20061103T1610-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; @@ -378,8 +387,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20061029T2155/debug/tst-chk1.c 24 Apr 2006 17:00:18 -0000 1.15 -+++ glibc-20061029T2155-fedora/debug/tst-chk1.c 24 Apr 2006 20:31:49 -0000 1.1.2.16 +--- glibc-20061103T1610/debug/tst-chk1.c 24 Apr 2006 17:00:18 -0000 1.15 ++++ glibc-20061103T1610-fedora/debug/tst-chk1.c 24 Apr 2006 20:31:49 -0000 1.1.2.16 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -408,8 +417,8 @@ # define O 0 #else # define O 1 ---- glibc-20061029T2155/elf/ldconfig.c 27 Oct 2006 23:11:42 -0000 1.55 -+++ glibc-20061029T2155-fedora/elf/ldconfig.c 29 Oct 2006 22:03:21 -0000 1.47.2.10 +--- glibc-20061103T1610/elf/ldconfig.c 27 Oct 2006 23:11:42 -0000 1.55 ++++ glibc-20061103T1610-fedora/elf/ldconfig.c 29 Oct 2006 22:03:21 -0000 1.47.2.10 @@ -964,17 +964,19 @@ search_dirs (void) @@ -491,8 +500,8 @@ } search_dirs (); ---- glibc-20061029T2155/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20061029T2155-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20061103T1610/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20061103T1610-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; @@ -517,8 +526,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20061029T2155/iconv/iconvconfig.c 21 Sep 2006 03:57:30 -0000 1.26 -+++ glibc-20061029T2155-fedora/iconv/iconvconfig.c 23 Sep 2006 10:14:23 -0000 1.19.2.7 +--- glibc-20061103T1610/iconv/iconvconfig.c 21 Sep 2006 03:57:30 -0000 1.26 ++++ glibc-20061103T1610-fedora/iconv/iconvconfig.c 23 Sep 2006 10:14:23 -0000 1.19.2.7 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -595,8 +604,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20061029T2155/include/features.h 6 Oct 2006 15:38:14 -0000 1.44 -+++ glibc-20061029T2155-fedora/include/features.h 25 Oct 2006 19:13:35 -0000 1.35.2.13 +--- glibc-20061103T1610/include/features.h 6 Oct 2006 15:38:14 -0000 1.44 ++++ glibc-20061103T1610-fedora/include/features.h 25 Oct 2006 19:13:35 -0000 1.35.2.13 @@ -275,7 +275,13 @@ #endif @@ -612,16 +621,16 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20061029T2155/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20061029T2155-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20061103T1610/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20061103T1610-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20061029T2155/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20061029T2155-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20061103T1610/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20061103T1610-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20061029T2155/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20061029T2155-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20061103T1610/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20061103T1610-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 @@ -631,8 +640,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20061029T2155/libio/stdio.h 13 Oct 2006 19:50:36 -0000 1.88 -+++ glibc-20061029T2155-fedora/libio/stdio.h 25 Oct 2006 19:13:35 -0000 1.78.2.10 +--- glibc-20061103T1610/libio/stdio.h 13 Oct 2006 19:50:36 -0000 1.88 ++++ glibc-20061103T1610-fedora/libio/stdio.h 25 Oct 2006 19:13:35 -0000 1.78.2.10 @@ -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. */ @@ -646,8 +655,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20061029T2155/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20061029T2155-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20061103T1610/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20061103T1610-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); @@ -678,8 +687,8 @@ #endif ---- glibc-20061029T2155/locale/iso-4217.def 26 Apr 2006 07:14:53 -0000 1.19 -+++ glibc-20061029T2155-fedora/locale/iso-4217.def 26 Apr 2006 20:18:17 -0000 1.15.2.4 +--- glibc-20061103T1610/locale/iso-4217.def 26 Apr 2006 07:14:53 -0000 1.19 ++++ glibc-20061103T1610-fedora/locale/iso-4217.def 26 Apr 2006 20:18:17 -0000 1.15.2.4 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -771,8 +780,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20061029T2155/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20061029T2155-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20061103T1610/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20061103T1610-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, } } @@ -816,8 +825,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20061029T2155/localedata/Makefile 26 Apr 2006 05:14:03 -0000 1.103 -+++ glibc-20061029T2155-fedora/localedata/Makefile 26 Apr 2006 20:18:17 -0000 1.101.2.3 +--- glibc-20061103T1610/localedata/Makefile 26 Apr 2006 05:14:03 -0000 1.103 ++++ glibc-20061103T1610-fedora/localedata/Makefile 26 Apr 2006 20:18:17 -0000 1.101.2.3 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -826,8 +835,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20061029T2155/localedata/SUPPORTED 29 Sep 2006 18:29:11 -0000 1.97 -+++ glibc-20061029T2155-fedora/localedata/SUPPORTED 29 Sep 2006 20:49:04 -0000 1.71.2.14 +--- glibc-20061103T1610/localedata/SUPPORTED 3 Nov 2006 04:24:47 -0000 1.98 ++++ glibc-20061103T1610-fedora/localedata/SUPPORTED 3 Nov 2006 16:25:26 -0000 1.71.2.15 @@ -77,6 +77,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -852,7 +861,7 @@ en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ en_ZW.UTF-8/UTF-8 \ -@@ -276,6 +279,8 @@ nl_NL/ISO-8859-1 \ +@@ -277,6 +280,8 @@ nl_NL/ISO-8859-1 \ nl_NL@euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ @@ -861,7 +870,7 @@ nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ -@@ -328,6 +333,7 @@ sv_FI/ISO-8859-1 \ +@@ -329,6 +334,7 @@ sv_FI/ISO-8859-1 \ sv_FI@euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -869,8 +878,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20061029T2155/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20061029T2155-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20061103T1610/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20061103T1610-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -885,8 +894,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20061029T2155/localedata/locales/en_GB 1 Oct 2006 16:18:33 -0000 1.14 -+++ glibc-20061029T2155-fedora/localedata/locales/en_GB 2 Oct 2006 19:02:41 -0000 1.10.2.4 +--- glibc-20061103T1610/localedata/locales/en_GB 1 Oct 2006 16:18:33 -0000 1.14 ++++ glibc-20061103T1610-fedora/localedata/locales/en_GB 2 Oct 2006 19:02:41 -0000 1.10.2.4 @@ -116,8 +116,8 @@ mon "" d_fmt "" @@ -898,8 +907,8 @@ date_fmt "/ / " ---- glibc-20061029T2155/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20061029T2155-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20061103T1610/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20061103T1610-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -970,8 +979,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20061029T2155/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20061029T2155-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20061103T1610/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20061103T1610-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -999,8 +1008,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20061029T2155/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20061029T2155-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20061103T1610/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20061103T1610-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -1076,8 +1085,21 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20061029T2155/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20061029T2155-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20061103T1610/malloc/memusage.c 11 Oct 2006 08:59:28 -0000 1.15 ++++ glibc-20061103T1610-fedora/malloc/memusage.c 3 Nov 2006 16:38:22 -0000 1.11.2.5 +@@ -887,4 +887,10 @@ dest (void) + fputc ('=', stderr); + fputs ("\e[0;0m\n", stderr); + } ++ ++ /* Any following malloc/free etc. calls should generate statistics again, ++ because otherwise freeing something that has been malloced before ++ this destructor (including struct header in front of it) wouldn't ++ be properly freed. */ ++ not_me = false; + } +--- glibc-20061103T1610/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20061103T1610-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 @@ -40,6 +40,18 @@ # include # define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l) @@ -1133,17 +1155,28 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20061029T2155/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20061029T2155-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20061103T1610/manual/libc.texinfo 12 Nov 2003 00:37:03 -0000 1.94 ++++ glibc-20061103T1610-fedora/manual/libc.texinfo 3 Nov 2006 16:31:21 -0000 1.94.2.1 +@@ -5,7 +5,7 @@ + @setchapternewpage odd + + @comment Tell install-info what to do. +-@dircategory GNU libraries ++@dircategory Libraries + @direntry + * Libc: (libc). C library. + @end direntry +--- glibc-20061103T1610/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20061103T1610-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-20061029T2155/nptl/ChangeLog 29 Oct 2006 21:49:34 -0000 1.936 -+++ glibc-20061029T2155-fedora/nptl/ChangeLog 29 Oct 2006 22:03:22 -0000 1.706.2.110 -@@ -1299,6 +1299,15 @@ +--- glibc-20061103T1610/nptl/ChangeLog 30 Oct 2006 00:41:07 -0000 1.937 ++++ glibc-20061103T1610-fedora/nptl/ChangeLog 3 Nov 2006 16:25:27 -0000 1.706.2.111 +@@ -1304,6 +1304,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1159,7 +1192,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -2035,6 +2044,11 @@ +@@ -2040,6 +2049,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1171,7 +1204,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -4109,6 +4123,11 @@ +@@ -4114,6 +4128,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1183,8 +1216,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20061029T2155/nptl/Makefile 8 Sep 2006 10:40:49 -0000 1.188 -+++ glibc-20061029T2155-fedora/nptl/Makefile 10 Sep 2006 18:59:02 -0000 1.157.2.28 +--- glibc-20061103T1610/nptl/Makefile 8 Sep 2006 10:40:49 -0000 1.188 ++++ glibc-20061103T1610-fedora/nptl/Makefile 10 Sep 2006 18:59:02 -0000 1.157.2.28 @@ -524,15 +524,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1207,8 +1240,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20061029T2155/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20061029T2155-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20061103T1610/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20061103T1610-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; @@ -1233,8 +1266,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20061029T2155/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20061029T2155-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20061103T1610/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20061103T1610-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 + @@ -1242,8 +1275,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20061029T2155/nscd/connections.c 21 Sep 2006 03:57:30 -0000 1.91 -+++ glibc-20061029T2155-fedora/nscd/connections.c 23 Sep 2006 10:14:24 -0000 1.55.2.26 +--- glibc-20061103T1610/nscd/connections.c 21 Sep 2006 03:57:30 -0000 1.91 ++++ glibc-20061103T1610-fedora/nscd/connections.c 23 Sep 2006 10:14:24 -0000 1.55.2.26 @@ -1914,3 +1914,21 @@ finish_drop_privileges (void) install_real_capabilities (new_caps); #endif @@ -1266,8 +1299,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX, -1); +} + ---- glibc-20061029T2155/nscd/nscd.c 6 Oct 2006 15:24:36 -0000 1.54 -+++ glibc-20061029T2155-fedora/nscd/nscd.c 25 Oct 2006 19:13:41 -0000 1.38.2.14 +--- glibc-20061103T1610/nscd/nscd.c 6 Oct 2006 15:24:36 -0000 1.54 ++++ glibc-20061103T1610-fedora/nscd/nscd.c 25 Oct 2006 19:13:41 -0000 1.38.2.14 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1286,8 +1319,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20061029T2155/nscd/nscd.conf 27 Apr 2006 14:46:36 -0000 1.13 -+++ glibc-20061029T2155-fedora/nscd/nscd.conf 27 Apr 2006 21:29:54 -0000 1.8.2.5 +--- glibc-20061103T1610/nscd/nscd.conf 27 Apr 2006 14:46:36 -0000 1.13 ++++ glibc-20061103T1610-fedora/nscd/nscd.conf 27 Apr 2006 21:29:54 -0000 1.8.2.5 @@ -33,8 +33,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1299,8 +1332,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20061029T2155/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20061029T2155-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20061103T1610/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20061103T1610-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 @@ -1341,8 +1374,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20061029T2155/posix/Makefile 7 Sep 2006 13:50:05 -0000 1.193 -+++ glibc-20061029T2155-fedora/posix/Makefile 7 Sep 2006 10:42:04 -0000 1.171.2.21 +--- glibc-20061103T1610/posix/Makefile 7 Sep 2006 13:50:05 -0000 1.193 ++++ glibc-20061103T1610-fedora/posix/Makefile 7 Sep 2006 10:42:04 -0000 1.171.2.21 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1376,8 +1409,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20061029T2155/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20061029T2155-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20061103T1610/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20061103T1610-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 @@ -0,0 +1,15 @@ +#include +const char *START_OF_STRINGS = @@ -1394,8 +1427,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20061029T2155/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20061029T2155-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20061103T1610/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20061103T1610-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 @@ -1411,8 +1444,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-20061029T2155/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20 -+++ glibc-20061029T2155-fedora/sysdeps/i386/Makefile 30 Jun 2006 09:16:34 -0000 1.16.2.4 +--- glibc-20061103T1610/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20 ++++ glibc-20061103T1610-fedora/sysdeps/i386/Makefile 30 Jun 2006 09:16:34 -0000 1.16.2.4 @@ -64,4 +64,12 @@ endif ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) @@ -1426,8 +1459,8 @@ +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS +CFLAGS-.oS += -mno-tls-direct-seg-refs endif ---- glibc-20061029T2155/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20061029T2155-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20061103T1610/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20061103T1610-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)) @@ -1439,8 +1472,8 @@ endif endif ---- glibc-20061029T2155/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20061029T2155-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20061103T1610/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20061103T1610-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. */ @@ -1792,8 +1825,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20061029T2155/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20061029T2155-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20061103T1610/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20061103T1610-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. @@ -1879,8 +1912,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20061029T2155/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 -+++ glibc-20061029T2155-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 +--- glibc-20061103T1610/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 ++++ glibc-20061103T1610-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1895,8 +1928,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-20061029T2155/sysdeps/unix/sysv/linux/dl-osinfo.h 1 Aug 2006 06:55:27 -0000 1.23 -+++ glibc-20061029T2155-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 2 Aug 2006 16:57:42 -0000 1.14.2.9 +--- glibc-20061103T1610/sysdeps/unix/sysv/linux/dl-osinfo.h 1 Aug 2006 06:55:27 -0000 1.23 ++++ glibc-20061103T1610-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 2 Aug 2006 16:57:42 -0000 1.14.2.9 @@ -18,11 +18,14 @@ 02111-1307 USA. */ @@ -1944,8 +1977,8 @@ + ret ^= stk; return ret; } ---- glibc-20061029T2155/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20061029T2155-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20061103T1610/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20061103T1610-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1988,8 +2021,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20061029T2155/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20061029T2155-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20061103T1610/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20061103T1610-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" @@ -1999,8 +2032,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20061029T2155/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20061029T2155-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20061103T1610/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20061103T1610-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; @@ -2046,8 +2079,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20061029T2155/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20061029T2155-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20061103T1610/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20061103T1610-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. @@ -2108,8 +2141,8 @@ + } while (0) + +#include_next ---- glibc-20061029T2155/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20061029T2155-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20061103T1610/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20061103T1610-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) @@ -2142,81 +2175,24 @@ + } while (0) + #include_next ---- glibc-20061029T2155/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20061029T2155-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20061103T1610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20061103T1610-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 +#else +#include +#endif ---- glibc-20061029T2155/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20061029T2155-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20061103T1610/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20061103T1610-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 +#else +#include +#endif ---- glibc-20061029T2155/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20061029T2155-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20061103T1610/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20061103T1610-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"_ ---- libc/configure.in 28 Oct 2006 06:40:16 -0000 1.463 -+++ libc/configure.in 29 Oct 2006 22:47:02 -0000 1.466 -@@ -1444,9 +1444,16 @@ EOF - if AC_TRY_COMMAND([${CC-cc} -Wl,--verbose 2>&1|grep DATA_SEGMENT_RELRO_END 1>&AS_MESSAGE_LOG_FD]) - then - libc_cv_z_relro=yes -+ else -+changequote(,)dnl -+ case "$base_machine" in -+ i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*) ;; -+ *) libc_cv_z_relro="not required" ;; -+ esac -+changequote([,])dnl - fi - fi]) -- if test $libc_cv_z_relro != yes; then -+ if test "$libc_cv_z_relro" = no; then - AC_MSG_ERROR(linker with -z relro support required) - fi - ---- libc/configure 28 Oct 2006 06:41:30 -0000 1.453 -+++ libc/configure 29 Oct 2006 22:48:13 -0000 1.456 -@@ -5650,12 +5650,17 @@ else - (exit $ac_status); }; } - then - libc_cv_z_relro=yes -+ else -+ case "$base_machine" in -+ i[34567]86 | x86_64 | powerpc* | s390* | sparc* | alpha*) ;; -+ *) libc_cv_z_relro="not required" ;; -+ esac - fi - fi - fi - echo "$as_me:$LINENO: result: $libc_cv_z_relro" >&5 - echo "${ECHO_T}$libc_cv_z_relro" >&6 -- if test $libc_cv_z_relro != yes; then -+ if test "$libc_cv_z_relro" = no; then - { { echo "$as_me:$LINENO: error: linker with -z relro support required" >&5 - echo "$as_me: error: linker with -z relro support required" >&2;} - { (exit 1); exit 1; }; } ---- libc/nptl/sysdeps/ia64/pthread_spin_unlock.c 2003-03-18 04:42:45.000000000 +0100 -+++ libc/nptl/sysdeps/ia64/pthread_spin_unlock.c 2006-10-30 00:31:16.000000000 +0100 -@@ -1,4 +1,4 @@ --/* Copyright (C) 2003 Free Software Foundation, Inc. -+/* Copyright (C) 2003, 2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jakub Jelinek , 2003. - -@@ -23,6 +23,6 @@ - int - pthread_spin_unlock (pthread_spinlock_t *lock) - { -- __sync_lock_release_si ((int *) lock); -+ __sync_lock_release ((int *) lock); - return 0; - } diff --git a/glibc.spec b/glibc.spec index c25a0dc..b10ccb9 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20061029T2155 +%define glibcdate 20061103T1610 %define glibcname glibc -%define glibcsrcdir glibc-20061029T2155 +%define glibcsrcdir glibc-20061103T1610 %define glibc_release_tarballs 0 %define glibcversion 2.5.90 -%define glibcrelease 3 +%define glibcrelease 4 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} @@ -909,6 +909,7 @@ librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` %ifarch %{rtkaioarches} rm -f $RPM_BUILD_ROOT{,%{_prefix}}/%{_lib}/librtkaio.so* +rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/librt.so.* mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio mv $RPM_BUILD_ROOT/%{_lib}/librtkaio-*.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/ rm -f $RPM_BUILD_ROOT/%{_lib}/$librtso @@ -1533,6 +1534,13 @@ rm -f *.filelist* %endif %changelog +* Fri Nov 3 2006 Jakub Jelinek 2.5.90-4 +- fix atexit backwards compatibility (#213388) +- add mai_IN locale (#213415) +- remove bogus %{_libdir}/librt.so.1 symlink (#213555) +- fix memusage (#213656) +- change libc.info category (#209493) + * Sun Oct 29 2006 Jakub Jelinek 2.5.90-3 - fix suid/sgid binaries on i?86/x86_64 (#212723) diff --git a/sources b/sources index 29ad6cf..cf4dbec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5a0061abe57e887ceedc418fbce82b52 glibc-20061029T2155.tar.bz2 -f2bae5d8c19c5f61d2aefbdc5fdd7546 glibc-fedora-20061029T2155.tar.bz2 +1703532984542ced2f2861566f6e1253 glibc-20061103T1610.tar.bz2 +0e5b20f6d2921e54dcf1e43a7b6514b9 glibc-fedora-20061103T1610.tar.bz2