From 96f42f961a8adcfe58d8632003f39daf4cf14e5b Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Jan 02 2006 21:54:32 +0000 Subject: auto-import glibc-2.3.90-25 on branch devel from glibc-2.3.90-25.src.rpm --- diff --git a/.cvsignore b/.cvsignore index 8696446..d030215 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20060102T1045.tar.bz2 -glibc-fedora-20060102T1045.tar.bz2 +glibc-20060102T2114.tar.bz2 +glibc-fedora-20060102T2114.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index c72209c..d308a61 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-20060102T1045/ChangeLog 1 Jan 2006 19:18:49 -0000 1.9842 -+++ glibc-20060102T1045-fedora/ChangeLog 2 Jan 2006 10:52:48 -0000 1.8782.2.145 -@@ -266,6 +266,10 @@ +--- glibc-20060102T2114/ChangeLog 2 Jan 2006 20:52:28 -0000 1.9843 ++++ glibc-20060102T2114-fedora/ChangeLog 2 Jan 2006 21:28:06 -0000 1.8782.2.146 +@@ -300,6 +300,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -11,7 +11,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -549,6 +553,26 @@ +@@ -583,6 +587,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -38,7 +38,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -3667,6 +3691,11 @@ +@@ -3701,6 +3725,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -50,7 +50,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -4661,6 +4690,12 @@ +@@ -4695,6 +4724,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -63,7 +63,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -4785,6 +4820,17 @@ +@@ -4819,6 +4854,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -81,7 +81,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -7845,6 +7891,18 @@ +@@ -7879,6 +7925,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -100,8 +100,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060102T1045/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060102T1045-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060102T2114/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060102T2114-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. @@ -151,8 +151,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-20060102T1045/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060102T1045-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060102T2114/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060102T2114-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. @@ -179,8 +179,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060102T1045/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060102T1045-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060102T2114/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060102T2114-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -261,8 +261,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060102T1045/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060102T1045-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060102T2114/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060102T2114-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; @@ -287,8 +287,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060102T1045/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060102T1045-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060102T2114/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060102T2114-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. */ @@ -317,8 +317,8 @@ # define O 0 #else # define O 1 ---- glibc-20060102T1045/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060102T1045-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060102T2114/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060102T2114-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 @@ -693,7 +693,18 @@ search_dir (const struct dir_entry *entr #endif !is_hwcap_platform (direntry->d_name))) @@ -420,8 +420,8 @@ } search_dirs (); ---- glibc-20060102T1045/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060102T1045-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060102T2114/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060102T2114-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; @@ -446,8 +446,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060102T1045/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060102T1045-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060102T2114/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060102T2114-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) @@ -524,8 +524,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060102T1045/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 -+++ glibc-20060102T1045-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 +--- glibc-20060102T2114/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 ++++ glibc-20060102T2114-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 @@ -265,7 +265,13 @@ #endif @@ -541,8 +541,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060102T1045/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060102T1045-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060102T2114/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060102T2114-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 @@ -552,8 +552,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060102T1045/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 -+++ glibc-20060102T1045-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 +--- glibc-20060102T2114/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 ++++ glibc-20060102T2114-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -567,8 +567,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060102T1045/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060102T1045-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060102T2114/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060102T2114-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); @@ -599,8 +599,8 @@ #endif ---- glibc-20060102T1045/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060102T1045-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060102T2114/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060102T2114-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 !!! @@ -692,8 +692,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060102T1045/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060102T1045-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060102T2114/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060102T2114-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, } } @@ -737,8 +737,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060102T1045/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060102T1045-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060102T2114/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060102T2114-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/'`; \ @@ -747,8 +747,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060102T1045/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060102T1045-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060102T2114/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060102T2114-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -790,8 +790,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060102T1045/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060102T1045-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060102T2114/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060102T2114-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -806,8 +806,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060102T1045/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060102T1045-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060102T2114/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060102T2114-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -819,8 +819,8 @@ date_fmt "/ / " ---- glibc-20060102T1045/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060102T2114/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -891,8 +891,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060102T1045/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060102T1045-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060102T2114/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060102T2114-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -920,8 +920,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060102T1045/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060102T1045-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060102T2114/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060102T2114-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -997,8 +997,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060102T1045/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060102T1045-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060102T2114/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060102T2114-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) @@ -1054,9 +1054,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060102T1045/nptl/ChangeLog 1 Jan 2006 19:14:15 -0000 1.831 -+++ glibc-20060102T1045-fedora/nptl/ChangeLog 2 Jan 2006 10:52:51 -0000 1.706.2.69 -@@ -329,6 +329,15 @@ +--- glibc-20060102T2114/nptl/ChangeLog 2 Jan 2006 20:57:43 -0000 1.832 ++++ glibc-20060102T2114-fedora/nptl/ChangeLog 2 Jan 2006 21:28:09 -0000 1.706.2.70 +@@ -337,6 +337,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1072,7 +1072,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1065,6 +1074,11 @@ +@@ -1073,6 +1082,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1084,7 +1084,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3139,6 +3153,11 @@ +@@ -3147,6 +3161,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1096,8 +1096,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060102T1045/nptl/Makefile 28 Dec 2005 20:48:24 -0000 1.174 -+++ glibc-20060102T1045-fedora/nptl/Makefile 2 Jan 2006 10:52:51 -0000 1.157.2.15 +--- glibc-20060102T2114/nptl/Makefile 28 Dec 2005 20:48:24 -0000 1.174 ++++ glibc-20060102T2114-fedora/nptl/Makefile 2 Jan 2006 10:52:51 -0000 1.157.2.15 @@ -507,15 +507,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1120,8 +1120,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060102T1045/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060102T1045-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060102T2114/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060102T2114-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; @@ -1146,8 +1146,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060102T1045/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060102T2114/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-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 + @@ -1155,8 +1155,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060102T1045/nscd/connections.c 30 Dec 2005 16:51:19 -0000 1.81 -+++ glibc-20060102T1045-fedora/nscd/connections.c 2 Jan 2006 10:52:53 -0000 1.55.2.18 +--- glibc-20060102T2114/nscd/connections.c 30 Dec 2005 16:51:19 -0000 1.81 ++++ glibc-20060102T2114-fedora/nscd/connections.c 2 Jan 2006 10:52:53 -0000 1.55.2.18 @@ -1880,3 +1880,18 @@ finish_drop_privileges (void) exit (4); } @@ -1176,8 +1176,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060102T1045/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060102T1045-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060102T2114/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060102T2114-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1196,8 +1196,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060102T1045/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060102T1045-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060102T2114/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060102T2114-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 @@ -1209,8 +1209,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060102T1045/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060102T1045-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060102T2114/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060102T2114-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 @@ -1251,8 +1251,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060102T1045/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 -+++ glibc-20060102T1045-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 +--- glibc-20060102T2114/nscd/selinux.c 29 Dec 2005 00:44:09 -0000 1.6 ++++ glibc-20060102T2114-fedora/nscd/selinux.c 2 Jan 2006 10:52:53 -0000 1.1.2.6 @@ -147,7 +147,7 @@ audit_init (void) if (audit_fd < 0 /* If kernel doesn't support audit, bail out */ @@ -1262,8 +1262,8 @@ } #endif /* HAVE_LIBAUDIT */ ---- glibc-20060102T1045/posix/Makefile 26 Sep 2005 21:13:27 -0000 1.186 -+++ glibc-20060102T1045-fedora/posix/Makefile 3 Oct 2005 20:44:16 -0000 1.171.2.14 +--- glibc-20060102T2114/posix/Makefile 2 Jan 2006 20:39:39 -0000 1.187 ++++ glibc-20060102T2114-fedora/posix/Makefile 2 Jan 2006 21:28:09 -0000 1.171.2.15 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1297,8 +1297,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060102T1045/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060102T2114/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-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 = @@ -1315,8 +1315,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060102T1045/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060102T1045-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060102T2114/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060102T2114-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 @@ -1332,8 +1332,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-20060102T1045/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060102T1045-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060102T2114/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060102T2114-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)) @@ -1345,8 +1345,8 @@ endif endif ---- glibc-20060102T1045/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060102T1045-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060102T2114/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060102T2114-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. */ @@ -1698,8 +1698,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20060102T1045/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060102T2114/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-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. @@ -1785,8 +1785,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060102T1045/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060102T1045-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060102T2114/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060102T2114-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); } @@ -1801,8 +1801,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 ++++ glibc-20060102T2114-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. */ @@ -1851,8 +1851,8 @@ + ret ^= stk; return ret; } ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060102T2114-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" @@ -1862,8 +1862,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060102T2114-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; @@ -1909,8 +1909,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-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. @@ -1971,8 +1971,8 @@ + } while (0) + +#include_next ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060102T2114-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) @@ -2005,24 +2005,24 @@ + } while (0) + #include_next ---- glibc-20060102T1045/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-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-20060102T1045/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060102T2114-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-20060102T1045/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060102T1045-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060102T2114/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060102T2114-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 b05fac7..aa2dcba 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20060102T1045 +%define glibcdate 20060102T2114 %define glibcname glibc -%define glibcsrcdir glibc-20060102T1045 +%define glibcsrcdir glibc-20060102T2114 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 24 +%define glibcrelease 25 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -33,7 +33,6 @@ Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2 Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ppc-assume.patch Patch2: %{name}-ia64-lib64.patch -Patch3: glibc-s390-mangling.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile @@ -241,7 +240,6 @@ package or when debugging this package. %patch2 -p1 %endif %endif -%patch3 -p1 # Hack till glibc-kernheaders get updated, argh mkdir asm @@ -610,6 +608,8 @@ rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion* # NPTL is not usable outside of glibc, so include # the generic one (#162634) cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h +# And needs sanitizing as well. +cp -a redhat/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then mkdir -p $RPM_BUILD_ROOT%{_infodir} @@ -1122,6 +1122,11 @@ rm -f *.filelist* %endif %changelog +* Mon Jan 2 2006 Jakub Jelinek 2.3.90-25 +- update from CVS + - s390{,x} and sparc{,64} pointer mangling fixes + - install a sanitized LinuxThreads + * Mon Jan 2 2006 Jakub Jelinek 2.3.90-24 - update from CVS - nscd audit changes (#174422) diff --git a/sources b/sources index c66feaa..0aab381 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d325caec1b616a7248414ca0777f835f glibc-20060102T1045.tar.bz2 -ff30af7539141c68570b535fa984d340 glibc-fedora-20060102T1045.tar.bz2 +85ebdefc3ca2c467c2bc510ba2493e99 glibc-20060102T2114.tar.bz2 +56fe24b10957d19c55ae53c2bc21676a glibc-fedora-20060102T2114.tar.bz2