diff --git a/.cvsignore b/.cvsignore index 459f6bb..ffe9c8e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20050912T0656.tar.bz2 -glibc-fedora-20050912T0656.tar.bz2 +glibc-20051003T2040.tar.bz2 +glibc-fedora-20051003T2040.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 77904f3..9999e10 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,16 +1,15 @@ ---- glibc-20050912T0656/ChangeLog 10 Sep 2005 03:20:33 -0000 1.9521 -+++ glibc-20050912T0656-fedora/ChangeLog 12 Sep 2005 09:38:54 -0000 1.8782.2.126 -@@ -1,3 +1,9 @@ -+2005-09-12 Jakub Jelinek +--- glibc-20051003T2040/ChangeLog 3 Oct 2005 19:37:50 -0000 1.9579 ++++ glibc-20051003T2040-fedora/ChangeLog 3 Oct 2005 20:54:46 -0000 1.8782.2.128 +@@ -1,3 +1,8 @@ ++2005-10-03 Jakub Jelinek + -+ * malloc.c (struct malloc_chunk): Fix comment typo. -+ (public_cALLOc): For mmapped chunks and perturb_byte != 0, -+ don't clear SIZE_SZ bytes more than should be cleared. ++ * nscd/selinux.c (audit_init): Print error string in the failure ++ message. + - 2005-09-09 Jakub Jelinek + 2005-10-03 Roland McGrath - * inet/getnetgrent_r.c: Include assert. -@@ -492,6 +498,12 @@ + * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. +@@ -992,6 +997,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -23,7 +22,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -614,6 +626,17 @@ +@@ -1114,6 +1125,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -41,7 +40,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -3665,6 +3688,18 @@ +@@ -4165,6 +4187,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -60,8 +59,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20050912T0656/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20050912T0656-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20051003T2040/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20051003T2040-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. @@ -111,8 +110,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-20050912T0656/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20050912T0656-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20051003T2040/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20051003T2040-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. @@ -139,8 +138,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20050912T0656/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20050912T0656-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20051003T2040/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20051003T2040-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -221,8 +220,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20050912T0656/csu/elf-init.c 7 Jul 2005 22:56:11 -0000 1.7 -+++ glibc-20050912T0656-fedora/csu/elf-init.c 8 Jul 2005 09:09:45 -0000 1.3.2.4 +--- glibc-20051003T2040/csu/elf-init.c 7 Jul 2005 22:56:11 -0000 1.7 ++++ glibc-20051003T2040-fedora/csu/elf-init.c 8 Jul 2005 09:09:45 -0000 1.3.2.4 @@ -48,6 +48,24 @@ extern void (*__init_array_end []) (int, attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden; @@ -248,8 +247,8 @@ #endif /* These function symbols are provided for the .init/.fini section entry ---- glibc-20050912T0656/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20050912T0656-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20051003T2040/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20051003T2040-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. */ @@ -278,8 +277,8 @@ # define O 0 #else # define O 1 ---- glibc-20050912T0656/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 -+++ glibc-20050912T0656-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 +--- glibc-20051003T2040/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 ++++ glibc-20051003T2040-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 @@ -953,17 +953,19 @@ search_dirs (void) @@ -361,8 +360,8 @@ } search_dirs (); ---- glibc-20050912T0656/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20050912T0656-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20051003T2040/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20051003T2040-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; @@ -387,8 +386,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20050912T0656/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 -+++ glibc-20050912T0656-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 +--- glibc-20051003T2040/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 ++++ glibc-20051003T2040-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 @@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -465,8 +464,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20050912T0656/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 -+++ glibc-20050912T0656-fedora/include/features.h 27 Jun 2005 13:04:16 -0000 1.35.2.8 +--- glibc-20051003T2040/include/features.h 17 Feb 2005 01:10:58 -0000 1.38 ++++ glibc-20051003T2040-fedora/include/features.h 27 Jun 2005 13:04:16 -0000 1.35.2.8 @@ -262,7 +262,13 @@ # define __USE_REENTRANT 1 #endif @@ -482,8 +481,8 @@ # if _FORTIFY_SOURCE == 1 # define __USE_FORTIFY_LEVEL 1 # elif _FORTIFY_SOURCE > 1 ---- glibc-20050912T0656/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20050912T0656-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20051003T2040/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20051003T2040-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 @@ -493,8 +492,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20050912T0656/libio/stdio.h 1 Sep 2005 15:14:59 -0000 1.82 -+++ glibc-20050912T0656-fedora/libio/stdio.h 12 Sep 2005 07:10:33 -0000 1.78.2.5 +--- glibc-20051003T2040/libio/stdio.h 1 Sep 2005 15:14:59 -0000 1.82 ++++ glibc-20051003T2040-fedora/libio/stdio.h 12 Sep 2005 07:10:33 -0000 1.78.2.5 @@ -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. */ @@ -508,8 +507,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20050912T0656/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20050912T0656-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20051003T2040/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20051003T2040-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); @@ -540,8 +539,8 @@ #endif ---- glibc-20050912T0656/locale/iso-4217.def 20 Mar 2005 04:14:36 -0000 1.16 -+++ glibc-20050912T0656-fedora/locale/iso-4217.def 24 Mar 2005 08:19:03 -0000 1.15.2.2 +--- glibc-20051003T2040/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20051003T2040-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 !!! @@ -633,8 +632,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20050912T0656/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20050912T0656-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 +--- glibc-20051003T2040/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 ++++ glibc-20051003T2040-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 @@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -678,8 +677,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20050912T0656/localedata/Makefile 7 Aug 2004 23:38:13 -0000 1.101 -+++ glibc-20050912T0656-fedora/localedata/Makefile 22 Sep 2004 21:20:58 -0000 1.101.2.1 +--- glibc-20051003T2040/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20051003T2040-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/'`; \ @@ -688,9 +687,9 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20050912T0656/localedata/SUPPORTED 28 Apr 2005 14:21:30 -0000 1.75 -+++ glibc-20050912T0656-fedora/localedata/SUPPORTED 3 May 2005 09:28:25 -0000 1.71.2.5 -@@ -68,6 +68,7 @@ cy_GB.UTF-8/UTF-8 \ +--- glibc-20051003T2040/localedata/SUPPORTED 25 Sep 2005 17:11:48 -0000 1.80 ++++ glibc-20051003T2040-fedora/localedata/SUPPORTED 3 Oct 2005 20:44:15 -0000 1.71.2.6 +@@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ da_DK/ISO-8859-1 \ @@ -698,7 +697,7 @@ de_AT.UTF-8/UTF-8 \ de_AT/ISO-8859-1 \ de_AT@euro/ISO-8859-15 \ -@@ -94,6 +95,7 @@ en_DK.UTF-8/UTF-8 \ +@@ -95,6 +96,7 @@ en_DK.UTF-8/UTF-8 \ en_DK/ISO-8859-1 \ en_GB.UTF-8/UTF-8 \ en_GB/ISO-8859-1 \ @@ -706,7 +705,7 @@ en_HK.UTF-8/UTF-8 \ en_HK/ISO-8859-1 \ en_IE.UTF-8/UTF-8 \ -@@ -108,6 +110,7 @@ en_SG.UTF-8/UTF-8 \ +@@ -109,6 +111,7 @@ en_SG.UTF-8/UTF-8 \ en_SG/ISO-8859-1 \ en_US.UTF-8/UTF-8 \ en_US/ISO-8859-1 \ @@ -714,7 +713,7 @@ en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ en_ZW.UTF-8/UTF-8 \ -@@ -253,6 +256,8 @@ nl_NL/ISO-8859-1 \ +@@ -260,6 +263,8 @@ nl_NL/ISO-8859-1 \ nl_NL@euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ @@ -723,7 +722,7 @@ oc_FR.UTF-8/UTF-8 \ oc_FR/ISO-8859-1 \ om_ET/UTF-8 \ -@@ -297,6 +302,7 @@ sv_FI/ISO-8859-1 \ +@@ -304,6 +309,7 @@ sv_FI/ISO-8859-1 \ sv_FI@euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -731,8 +730,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20050912T0656/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20050912T0656-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20051003T2040/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20051003T2040-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -747,8 +746,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20050912T0656/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20050912T0656-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20051003T2040/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20051003T2040-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -760,8 +759,8 @@ date_fmt "/ / " ---- glibc-20050912T0656/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050912T0656-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20051003T2040/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051003T2040-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -832,8 +831,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20050912T0656/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20050912T0656-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20051003T2040/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20051003T2040-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -861,35 +860,9 @@ revision "0.2" date "2000-08-02" % ---- glibc-20050912T0656/malloc/malloc.c 20 Mar 2005 18:08:52 -0000 1.148 -+++ glibc-20050912T0656-fedora/malloc/malloc.c 12 Sep 2005 09:39:03 -0000 1.127.2.18 -@@ -1726,7 +1726,7 @@ struct malloc_chunk { - mem-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | User data starts here... . - . . -- . (malloc_usable_space() bytes) . -+ . (malloc_usable_size() bytes) . - . | - nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | Size of chunk | -@@ -3691,8 +3691,12 @@ public_cALLOc(size_t n, size_t elem_size - - /* Two optional cases in which clearing not necessary */ - #if HAVE_MMAP -- if (perturb_byte == 0 && chunk_is_mmapped(p)) -- return mem; -+ if (chunk_is_mmapped (p)) -+ { -+ if (__builtin_expect (perturb_byte, 0)) -+ MALLOC_ZERO (mem, sz); -+ return mem; -+ } - #endif - - csz = chunksize(p); ---- glibc-20050912T0656/nptl/ChangeLog 8 Sep 2005 17:41:56 -0000 1.795 -+++ glibc-20050912T0656-fedora/nptl/ChangeLog 12 Sep 2005 07:10:36 -0000 1.706.2.58 -@@ -35,6 +35,15 @@ +--- glibc-20051003T2040/nptl/ChangeLog 2 Oct 2005 15:40:54 -0000 1.799 ++++ glibc-20051003T2040-fedora/nptl/ChangeLog 3 Oct 2005 20:44:16 -0000 1.706.2.59 +@@ -70,6 +70,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -905,7 +878,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -770,6 +779,11 @@ +@@ -805,6 +814,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -917,7 +890,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2844,6 +2858,11 @@ +@@ -2879,6 +2893,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -929,8 +902,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20050912T0656/nptl/Makefile 11 Jul 2005 16:40:21 -0000 1.169 -+++ glibc-20050912T0656-fedora/nptl/Makefile 21 Jul 2005 08:25:47 -0000 1.157.2.12 +--- glibc-20051003T2040/nptl/Makefile 11 Jul 2005 16:40:21 -0000 1.169 ++++ glibc-20051003T2040-fedora/nptl/Makefile 21 Jul 2005 08:25:47 -0000 1.157.2.12 @@ -502,15 +502,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -953,51 +926,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20050912T0656/nptl/pthread_cond_destroy.c 2 Sep 2004 18:45:37 -0000 1.5 -+++ glibc-20050912T0656-fedora/nptl/pthread_cond_destroy.c 22 Sep 2004 21:21:01 -0000 1.5.2.1 -@@ -44,15 +44,35 @@ __pthread_cond_destroy (cond) - broadcasted, but still are using the pthread_cond_t structure, - pthread_cond_destroy needs to wait for them. */ - unsigned int nwaiters = cond->__data.__nwaiters; -- while (nwaiters >= (1 << COND_CLOCK_BITS)) -+ -+ if (nwaiters >= (1 << COND_CLOCK_BITS)) - { -- lll_mutex_unlock (cond->__data.__lock); -+ /* Wake everybody on the associated mutex in case there are -+ threads that have been requeued to it. -+ Without this, pthread_cond_destroy could block potentially -+ for a long time or forever, as it would depend on other -+ thread's using the mutex. -+ When all threads waiting on the mutex are woken up, pthread_cond_wait -+ only waits for threads to acquire and release the internal -+ condvar lock. */ -+ if (cond->__data.__mutex != NULL -+ && cond->__data.__mutex != (void *) ~0l) -+ { -+ pthread_mutex_t *mut = (pthread_mutex_t *) cond->__data.__mutex; -+ lll_futex_wake (&mut->__data.__lock, INT_MAX); -+ } -+ -+ do -+ { -+ lll_mutex_unlock (cond->__data.__lock); - -- lll_futex_wait (&cond->__data.__nwaiters, nwaiters); -+ lll_futex_wait (&cond->__data.__nwaiters, nwaiters); - -- lll_mutex_lock (cond->__data.__lock); -+ lll_mutex_lock (cond->__data.__lock); - -- nwaiters = cond->__data.__nwaiters; -+ nwaiters = cond->__data.__nwaiters; -+ } -+ while (nwaiters >= (1 << COND_CLOCK_BITS)); - } - - return 0; ---- glibc-20050912T0656/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20050912T0656-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20051003T2040/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20051003T2040-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; @@ -1022,8 +952,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20050912T0656/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050912T0656-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20051003T2040/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051003T2040-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 + @@ -1031,8 +961,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20050912T0656/nscd/connections.c 23 Aug 2005 23:12:00 -0000 1.76 -+++ glibc-20050912T0656-fedora/nscd/connections.c 24 Aug 2005 07:23:30 -0000 1.55.2.14 +--- glibc-20051003T2040/nscd/connections.c 23 Aug 2005 23:12:00 -0000 1.76 ++++ glibc-20051003T2040-fedora/nscd/connections.c 24 Aug 2005 07:23:30 -0000 1.55.2.14 @@ -1849,3 +1849,18 @@ finish_drop_privileges (void) exit (4); } @@ -1052,8 +982,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20050912T0656/nscd/nscd.c 24 Aug 2005 06:33:23 -0000 1.48 -+++ glibc-20050912T0656-fedora/nscd/nscd.c 24 Aug 2005 07:23:30 -0000 1.38.2.9 +--- glibc-20051003T2040/nscd/nscd.c 24 Aug 2005 06:33:23 -0000 1.48 ++++ glibc-20051003T2040-fedora/nscd/nscd.c 24 Aug 2005 07:23:30 -0000 1.38.2.9 @@ -122,6 +122,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1072,8 +1002,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20050912T0656/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20050912T0656-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20051003T2040/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20051003T2040-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 @@ -1085,8 +1015,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20050912T0656/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20050912T0656-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20051003T2040/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20051003T2040-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 @@ -1127,8 +1057,19 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20050912T0656/posix/Makefile 24 Jul 2005 21:39:12 -0000 1.185 -+++ glibc-20050912T0656-fedora/posix/Makefile 25 Jul 2005 06:37:55 -0000 1.171.2.13 +--- glibc-20051003T2040/nscd/selinux.c 20 Jun 2005 15:44:41 -0000 1.5 ++++ glibc-20051003T2040-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 (); + if (audit_fd < 0) +- dbg_log (_("Failed opening connection to the audit subsystem")); ++ dbg_log (_("Failed opening connection to the audit subsystem: %m")); + } + #endif /* HAVE_LIBAUDIT */ + +--- glibc-20051003T2040/posix/Makefile 26 Sep 2005 21:13:27 -0000 1.186 ++++ glibc-20051003T2040-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 \ @@ -1162,8 +1103,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20050912T0656/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050912T0656-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20051003T2040/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051003T2040-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 = @@ -1180,8 +1121,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20050912T0656/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20050912T0656-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20051003T2040/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20051003T2040-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 @@ -1197,8 +1138,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-20050912T0656/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20050912T0656-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20051003T2040/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20051003T2040-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)) @@ -1210,8 +1151,8 @@ endif endif ---- glibc-20050912T0656/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20050912T0656-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20051003T2040/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20051003T2040-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. */ @@ -1563,8 +1504,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20050912T0656/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050912T0656-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20051003T2040/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051003T2040-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. @@ -1650,8 +1591,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20050912T0656/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20050912T0656-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20051003T2040/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20051003T2040-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); } @@ -1666,8 +1607,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20050912T0656/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20050912T0656-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20051003T2040/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 ++++ glibc-20051003T2040-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. */ @@ -1716,8 +1657,8 @@ + ret ^= stk; return ret; } ---- glibc-20050912T0656/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20050912T0656-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20051003T2040/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20051003T2040-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" @@ -1727,8 +1668,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20050912T0656/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 -+++ glibc-20050912T0656-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 +--- glibc-20051003T2040/sysdeps/unix/sysv/linux/readonly-area.c 18 Oct 2004 04:17:11 -0000 1.1 ++++ glibc-20051003T2040-fedora/sysdeps/unix/sysv/linux/readonly-area.c 20 Oct 2004 11:04:51 -0000 1.1.2.2 @@ -33,7 +33,10 @@ __readonly_area (const char *ptr, size_t FILE *fp = fopen ("/proc/self/maps", "rc"); @@ -1741,8 +1682,8 @@ /* We need no locking. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); ---- glibc-20050912T0656/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20050912T0656-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20051003T2040/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20051003T2040-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; @@ -1788,8 +1729,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20050912T0656/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050912T0656-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20051003T2040/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051003T2040-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. @@ -1850,8 +1791,8 @@ + } while (0) + +#include_next ---- glibc-20050912T0656/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20050912T0656-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20051003T2040/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20051003T2040-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) @@ -1884,24 +1825,24 @@ + } while (0) + #include_next ---- glibc-20050912T0656/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050912T0656-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20051003T2040/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051003T2040-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-20050912T0656/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20050912T0656-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20051003T2040/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051003T2040-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-20050912T0656/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20050912T0656-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20051003T2040/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20051003T2040-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 0e0cb5b..bbda5ef 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20050912T0656 +%define glibcdate 20051003T2040 %define glibcname glibc -%define glibcsrcdir glibc-20050912T0656 +%define glibcsrcdir glibc-20051003T2040 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 12 +%define glibcrelease 13 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1088,6 +1088,14 @@ rm -f *.filelist* %endif %changelog +* Mon Oct 3 2005 Jakub Jelinek 2.3.90-13 +- update from CVS + - fix setuid etc. hangs if some thread exits during the call (#167766) + - fix innetgr memory leak (#169051) + - support > 2GB nscd log files (#168851) + - too many other changes to list here +- include errno in nscd message if audit_open failed (#169148) + * Mon Sep 12 2005 Jakub Jelinek 2.3.90-12 - update from CVS - netgrp handling fixes (#167728) diff --git a/sources b/sources index 5f12ce8..6474a1f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8ed7bbb958f1ca9444946217782f9d65 glibc-20050912T0656.tar.bz2 -35e4834cbd9f62f48477179791127025 glibc-fedora-20050912T0656.tar.bz2 +9cbc00a923e6b8786782e13d7e0ff987 glibc-20051003T2040.tar.bz2 +7a21292202d96230f3145eaea05809ab glibc-fedora-20051003T2040.tar.bz2