From b4d0018f1a2c2dc15eebfff88c9e09a9fe3b0912 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Thu, 11 May 2006 15:53:04 +0000 Subject: [PATCH] auto-import glibc-2.4.90-7 on branch devel from glibc-2.4.90-7.src.rpm --- .cvsignore | 4 +- glibc-fedora.patch | 230 ++++++++++++++++++++++----------------------- glibc.spec | 11 ++- sources | 4 +- 4 files changed, 127 insertions(+), 122 deletions(-) diff --git a/.cvsignore b/.cvsignore index ab86e8a..60ee3f3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20060505T1443.tar.bz2 -glibc-fedora-20060505T1443.tar.bz2 +glibc-20060511T1325.tar.bz2 +glibc-fedora-20060511T1325.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 1163663..0a7a762 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,5 +1,5 @@ ---- glibc-20060505T1443/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060505T1443-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060511T1325/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060511T1325-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. @@ -49,8 +49,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-20060505T1443/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060505T1443-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060511T1325/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060511T1325-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. @@ -77,8 +77,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060505T1443/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060505T1443-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060511T1325/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060511T1325-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -159,8 +159,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060505T1443/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20060505T1443-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20060511T1325/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20060511T1325-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. @@ -332,8 +332,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060505T1443/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060505T1443-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060511T1325/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060511T1325-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; @@ -358,8 +358,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060505T1443/debug/tst-chk1.c 24 Apr 2006 17:00:18 -0000 1.15 -+++ glibc-20060505T1443-fedora/debug/tst-chk1.c 24 Apr 2006 20:31:49 -0000 1.1.2.16 +--- glibc-20060511T1325/debug/tst-chk1.c 24 Apr 2006 17:00:18 -0000 1.15 ++++ glibc-20060511T1325-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. */ @@ -388,8 +388,8 @@ # define O 0 #else # define O 1 ---- glibc-20060505T1443/elf/ldconfig.c 7 Apr 2006 06:57:49 -0000 1.54 -+++ glibc-20060505T1443-fedora/elf/ldconfig.c 24 Apr 2006 08:55:38 -0000 1.47.2.9 +--- glibc-20060511T1325/elf/ldconfig.c 7 Apr 2006 06:57:49 -0000 1.54 ++++ glibc-20060511T1325-fedora/elf/ldconfig.c 24 Apr 2006 08:55:38 -0000 1.47.2.9 @@ -964,17 +964,19 @@ search_dirs (void) @@ -471,8 +471,8 @@ } search_dirs (); ---- glibc-20060505T1443/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060505T1443-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060511T1325/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060511T1325-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; @@ -497,8 +497,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060505T1443/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060505T1443-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060511T1325/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060511T1325-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -575,8 +575,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060505T1443/include/features.h 25 Apr 2006 20:34:32 -0000 1.43 -+++ glibc-20060505T1443-fedora/include/features.h 26 Apr 2006 20:18:17 -0000 1.35.2.12 +--- glibc-20060511T1325/include/features.h 25 Apr 2006 20:34:32 -0000 1.43 ++++ glibc-20060511T1325-fedora/include/features.h 26 Apr 2006 20:18:17 -0000 1.35.2.12 @@ -275,7 +275,13 @@ #endif @@ -592,16 +592,16 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060505T1443/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060505T1443-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060511T1325/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060511T1325-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060505T1443/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060505T1443-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060511T1325/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060511T1325-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060505T1443/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060505T1443-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060511T1325/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060511T1325-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 @@ -611,8 +611,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060505T1443/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 -+++ glibc-20060505T1443-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 +--- glibc-20060511T1325/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 ++++ glibc-20060511T1325-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 @@ -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. */ @@ -626,8 +626,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060505T1443/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060505T1443-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060511T1325/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060511T1325-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); @@ -658,8 +658,8 @@ #endif ---- glibc-20060505T1443/locale/iso-4217.def 26 Apr 2006 07:14:53 -0000 1.19 -+++ glibc-20060505T1443-fedora/locale/iso-4217.def 26 Apr 2006 20:18:17 -0000 1.15.2.4 +--- glibc-20060511T1325/locale/iso-4217.def 26 Apr 2006 07:14:53 -0000 1.19 ++++ glibc-20060511T1325-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 !!! @@ -751,8 +751,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060505T1443/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060505T1443-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060511T1325/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060511T1325-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, } } @@ -796,8 +796,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060505T1443/localedata/Makefile 26 Apr 2006 05:14:03 -0000 1.103 -+++ glibc-20060505T1443-fedora/localedata/Makefile 26 Apr 2006 20:18:17 -0000 1.101.2.3 +--- glibc-20060511T1325/localedata/Makefile 26 Apr 2006 05:14:03 -0000 1.103 ++++ glibc-20060511T1325-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/'`; \ @@ -806,8 +806,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060505T1443/localedata/SUPPORTED 2 May 2006 16:35:53 -0000 1.93 -+++ glibc-20060505T1443-fedora/localedata/SUPPORTED 5 May 2006 06:11:53 -0000 1.71.2.10 +--- glibc-20060511T1325/localedata/SUPPORTED 2 May 2006 16:35:53 -0000 1.93 ++++ glibc-20060511T1325-fedora/localedata/SUPPORTED 5 May 2006 06:11:53 -0000 1.71.2.10 @@ -75,6 +75,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -849,8 +849,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060505T1443/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060505T1443-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060511T1325/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060511T1325-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -865,8 +865,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060505T1443/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060505T1443-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060511T1325/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060511T1325-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -878,8 +878,8 @@ date_fmt "/ / " ---- glibc-20060505T1443/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060505T1443-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060511T1325/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060511T1325-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -950,8 +950,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060505T1443/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060505T1443-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060511T1325/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060511T1325-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -979,8 +979,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060505T1443/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060505T1443-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060511T1325/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060511T1325-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -1056,8 +1056,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060505T1443/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060505T1443-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060511T1325/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060511T1325-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) @@ -1113,17 +1113,17 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060505T1443/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20060505T1443-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20060511T1325/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20060511T1325-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-20060505T1443/nptl/ChangeLog 2 May 2006 06:17:16 -0000 1.890 -+++ glibc-20060505T1443-fedora/nptl/ChangeLog 5 May 2006 06:11:54 -0000 1.706.2.87 -@@ -813,6 +813,15 @@ +--- glibc-20060511T1325/nptl/ChangeLog 10 May 2006 22:19:45 -0000 1.894 ++++ glibc-20060511T1325-fedora/nptl/ChangeLog 11 May 2006 14:01:40 -0000 1.706.2.88 +@@ -835,6 +835,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1139,7 +1139,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1549,6 +1558,11 @@ +@@ -1571,6 +1580,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1151,7 +1151,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3623,6 +3637,11 @@ +@@ -3645,6 +3659,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1163,8 +1163,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060505T1443/nptl/Makefile 28 Mar 2006 04:13:27 -0000 1.180 -+++ glibc-20060505T1443-fedora/nptl/Makefile 28 Mar 2006 09:36:22 -0000 1.157.2.20 +--- glibc-20060511T1325/nptl/Makefile 28 Mar 2006 04:13:27 -0000 1.180 ++++ glibc-20060511T1325-fedora/nptl/Makefile 28 Mar 2006 09:36:22 -0000 1.157.2.20 @@ -519,15 +519,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1187,8 +1187,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060505T1443/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060505T1443-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060511T1325/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060511T1325-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; @@ -1213,8 +1213,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060505T1443/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060505T1443-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060511T1325/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060511T1325-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 + @@ -1222,8 +1222,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060505T1443/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 9 Apr 2006 02:42:29 -0000 1.30 -+++ glibc-20060505T1443-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 24 Apr 2006 08:55:42 -0000 1.25.2.5 +--- glibc-20060511T1325/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 9 Apr 2006 02:42:29 -0000 1.30 ++++ glibc-20060511T1325-fedora/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h 24 Apr 2006 08:55:42 -0000 1.25.2.5 @@ -65,6 +65,88 @@ #define BUSY_WAIT_NOP asm ("rep; nop") @@ -1559,8 +1559,8 @@ : "=m" (futex), "=&a" (ignore) \ : "m" (futex), \ "i" (offsetof (tcbhead_t, multiple_threads)) \ ---- glibc-20060505T1443/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 9 Apr 2006 02:42:29 -0000 1.15 -+++ glibc-20060505T1443-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 24 Apr 2006 08:55:43 -0000 1.13.2.3 +--- glibc-20060511T1325/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 9 Apr 2006 02:42:29 -0000 1.15 ++++ glibc-20060511T1325-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S 24 Apr 2006 08:55:43 -0000 1.13.2.3 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. @@ -1706,8 +1706,8 @@ .size __lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake ---- glibc-20060505T1443/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 2 Mar 2006 00:25:56 -0000 1.2 -+++ glibc-20060505T1443-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 6 Mar 2006 07:34:44 -0000 1.1.2.3 +--- glibc-20060511T1325/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 2 Mar 2006 00:25:56 -0000 1.2 ++++ glibc-20060511T1325-fedora/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S 6 Mar 2006 07:34:44 -0000 1.1.2.3 @@ -44,9 +44,16 @@ .hidden __lll_robust_mutex_lock_wait .align 16 @@ -1808,8 +1808,8 @@ - ret + cfi_endproc .size __lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait ---- glibc-20060505T1443/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 31 Mar 2005 10:00:15 -0000 1.14 -+++ glibc-20060505T1443-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 6 Mar 2006 07:33:30 -0000 1.11.2.4 +--- glibc-20060511T1325/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 31 Mar 2005 10:00:15 -0000 1.14 ++++ glibc-20060511T1325-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.S 6 Mar 2006 07:33:30 -0000 1.11.2.4 @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -1951,8 +1951,8 @@ .size __lll_mutex_unlock_wake,.-__lll_mutex_unlock_wake ---- glibc-20060505T1443/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 17 Feb 2006 08:06:14 -0000 1.26 -+++ glibc-20060505T1443-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 6 Mar 2006 07:33:30 -0000 1.23.2.3 +--- glibc-20060511T1325/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 17 Feb 2006 08:06:14 -0000 1.26 ++++ glibc-20060511T1325-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevellock.h 6 Mar 2006 07:33:30 -0000 1.23.2.3 @@ -46,6 +46,110 @@ #define BUSY_WAIT_NOP asm ("rep; nop") @@ -2340,8 +2340,8 @@ : "=m" (futex), "=&D" (ignore) \ : "m" (futex) \ : "ax", "cx", "r11", "cc", "memory"); }) ---- glibc-20060505T1443/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 2 Mar 2006 00:26:55 -0000 1.2 -+++ glibc-20060505T1443-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 6 Mar 2006 07:33:30 -0000 1.1.2.3 +--- glibc-20060511T1325/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 2 Mar 2006 00:26:55 -0000 1.2 ++++ glibc-20060511T1325-fedora/nptl/sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S 6 Mar 2006 07:33:30 -0000 1.1.2.3 @@ -46,8 +46,13 @@ .hidden __lll_robust_mutex_lock_wait .align 16 @@ -2436,8 +2436,8 @@ - retq + cfi_endproc .size __lll_robust_mutex_timedlock_wait,.-__lll_robust_mutex_timedlock_wait ---- glibc-20060505T1443/nscd/connections.c 2 May 2006 16:42:58 -0000 1.88 -+++ glibc-20060505T1443-fedora/nscd/connections.c 5 May 2006 06:11:54 -0000 1.55.2.24 +--- glibc-20060511T1325/nscd/connections.c 2 May 2006 16:42:58 -0000 1.88 ++++ glibc-20060511T1325-fedora/nscd/connections.c 5 May 2006 06:11:54 -0000 1.55.2.24 @@ -1901,3 +1901,21 @@ finish_drop_privileges (void) install_real_capabilities (new_caps); #endif @@ -2460,8 +2460,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060505T1443/nscd/nscd.c 6 Apr 2006 22:55:50 -0000 1.52 -+++ glibc-20060505T1443-fedora/nscd/nscd.c 24 Apr 2006 08:55:43 -0000 1.38.2.12 +--- glibc-20060511T1325/nscd/nscd.c 6 Apr 2006 22:55:50 -0000 1.52 ++++ glibc-20060511T1325-fedora/nscd/nscd.c 24 Apr 2006 08:55:43 -0000 1.38.2.12 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -2480,8 +2480,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060505T1443/nscd/nscd.conf 27 Apr 2006 14:46:36 -0000 1.13 -+++ glibc-20060505T1443-fedora/nscd/nscd.conf 27 Apr 2006 21:29:54 -0000 1.8.2.5 +--- glibc-20060511T1325/nscd/nscd.conf 27 Apr 2006 14:46:36 -0000 1.13 ++++ glibc-20060511T1325-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 @@ -2493,8 +2493,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060505T1443/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060505T1443-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060511T1325/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060511T1325-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 @@ -2535,8 +2535,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060505T1443/posix/Makefile 30 Apr 2006 20:16:28 -0000 1.190 -+++ glibc-20060505T1443-fedora/posix/Makefile 1 May 2006 07:53:45 -0000 1.171.2.18 +--- glibc-20060511T1325/posix/Makefile 30 Apr 2006 20:16:28 -0000 1.190 ++++ glibc-20060511T1325-fedora/posix/Makefile 1 May 2006 07:53:45 -0000 1.171.2.18 @@ -108,7 +108,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -2570,8 +2570,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060505T1443/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060505T1443-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060511T1325/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060511T1325-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 = @@ -2588,8 +2588,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060505T1443/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060505T1443-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060511T1325/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060511T1325-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 @@ -2605,8 +2605,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-20060505T1443/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060505T1443-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060511T1325/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060511T1325-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)) @@ -2618,8 +2618,8 @@ endif endif ---- glibc-20060505T1443/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060505T1443-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060511T1325/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060511T1325-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. */ @@ -2971,8 +2971,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20060505T1443/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060505T1443-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060511T1325/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060511T1325-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. @@ -3058,8 +3058,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060505T1443/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060505T1443-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060511T1325/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060511T1325-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); } @@ -3074,8 +3074,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060505T1443/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 -+++ glibc-20060505T1443-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 +--- glibc-20060511T1325/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 ++++ glibc-20060511T1325-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -3124,8 +3124,8 @@ + ret ^= stk; return ret; } ---- glibc-20060505T1443/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20060505T1443-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20060511T1325/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20060511T1325-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; @@ -3168,8 +3168,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20060505T1443/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060505T1443-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060511T1325/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060511T1325-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" @@ -3179,8 +3179,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060505T1443/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060505T1443-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060511T1325/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060511T1325-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; @@ -3226,8 +3226,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060505T1443/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060505T1443-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060511T1325/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060511T1325-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. @@ -3288,8 +3288,8 @@ + } while (0) + +#include_next ---- glibc-20060505T1443/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060505T1443-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060511T1325/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060511T1325-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) @@ -3322,24 +3322,24 @@ + } while (0) + #include_next ---- glibc-20060505T1443/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060505T1443-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060511T1325/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060511T1325-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-20060505T1443/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060505T1443-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060511T1325/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060511T1325-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-20060505T1443/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060505T1443-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060511T1325/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060511T1325-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"_ diff --git a/glibc.spec b/glibc.spec index fe2846a..2e8f588 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20060505T1443 +%define glibcdate 20060511T1325 %define glibcname glibc -%define glibcsrcdir glibc-20060505T1443 +%define glibcsrcdir glibc-20060511T1325 %define glibc_release_tarballs 0 %define glibcversion 2.4.90 -%define glibcrelease 6 +%define glibcrelease 7 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1397,6 +1397,11 @@ rm -f *.filelist* %endif %changelog +* Thu May 11 2006 Jakub Jelinek 2.4.90-7 +- update from CVS + - fix tcgetattr (#177965) + - fix (#191264) + * Fri May 5 2006 Jakub Jelinek 2.4.90-6 - update from CVS - rebuilt using fixed rpm diff --git a/sources b/sources index b63d429..9338606 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d5422d1ae08d6337e2d6b826f985f053 glibc-20060505T1443.tar.bz2 -afc7fa6664c60edba0b4e70534f3e791 glibc-fedora-20060505T1443.tar.bz2 +5179be9f20e16349e6473dd854616b46 glibc-20060511T1325.tar.bz2 +0c3df6553fcbf318cdf18a91e5d4f36b glibc-fedora-20060511T1325.tar.bz2