diff --git a/.cvsignore b/.cvsignore index 13adc77..4c381ad 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20051220T1751.tar.bz2 -glibc-fedora-20051220T1751.tar.bz2 +glibc-20051221T0931.tar.bz2 +glibc-fedora-20051221T0931.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index d6f117e..41d1789 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-20051220T1751/ChangeLog 20 Dec 2005 16:51:14 -0000 1.9778 -+++ glibc-20051220T1751-fedora/ChangeLog 20 Dec 2005 18:05:56 -0000 1.8782.2.139 -@@ -22,6 +22,34 @@ +--- glibc-20051221T0931/ChangeLog 21 Dec 2005 08:34:35 -0000 1.9793 ++++ glibc-20051221T0931-fedora/ChangeLog 21 Dec 2005 09:46:54 -0000 1.8782.2.141 +@@ -97,6 +97,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -23,19 +23,11 @@ + (memalignhook): Call __libc_memalign instead of memalign. + (mcheck): Call __libc_malloc and __libc_free instead of + malloc and free. -+ -+ Workaround for http://gcc.gnu.org/PR25240 -+ * include/libc-symbols.h (weak_extern): Define using weak attribute. -+ (_weak_extern): Remove. -+ (weak_tls_extern): Define. -+ * locale/uselocale.c (DEFINE_CATEGORY): Use weak_tls_extern for -+ _nl_current_##category. -+ * locale/setlocale.c (DEFINE_CATEGORY): Likewise. + 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -3140,6 +3168,11 @@ +@@ -3215,6 +3235,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. @@ -47,7 +39,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -4134,6 +4167,12 @@ +@@ -4209,6 +4234,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -60,7 +52,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -4258,6 +4297,17 @@ +@@ -4333,6 +4364,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -78,7 +70,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -7318,6 +7368,18 @@ +@@ -7393,6 +7435,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -97,8 +89,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20051220T1751/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20051220T1751-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20051221T0931/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20051221T0931-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. @@ -148,8 +140,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-20051220T1751/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20051220T1751-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20051221T0931/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20051221T0931-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. @@ -176,8 +168,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20051220T1751/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20051220T1751-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20051221T0931/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20051221T0931-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -258,8 +250,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20051220T1751/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20051220T1751-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20051221T0931/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20051221T0931-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; @@ -284,8 +276,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20051220T1751/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20051220T1751-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20051221T0931/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20051221T0931-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. */ @@ -314,8 +306,8 @@ # define O 0 #else # define O 1 ---- glibc-20051220T1751/elf/ldconfig.c 7 Dec 2005 05:47:27 -0000 1.50 -+++ glibc-20051220T1751-fedora/elf/ldconfig.c 19 Dec 2005 12:11:14 -0000 1.47.2.4 +--- glibc-20051221T0931/elf/ldconfig.c 7 Dec 2005 05:47:27 -0000 1.50 ++++ glibc-20051221T0931-fedora/elf/ldconfig.c 19 Dec 2005 12:11:14 -0000 1.47.2.4 @@ -951,17 +951,19 @@ search_dirs (void) @@ -397,8 +389,8 @@ } search_dirs (); ---- glibc-20051220T1751/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20051220T1751-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20051221T0931/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20051221T0931-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; @@ -423,8 +415,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20051220T1751/iconv/iconvconfig.c 7 Dec 2005 05:47:27 -0000 1.24 -+++ glibc-20051220T1751-fedora/iconv/iconvconfig.c 19 Dec 2005 12:11:14 -0000 1.19.2.5 +--- glibc-20051221T0931/iconv/iconvconfig.c 7 Dec 2005 05:47:27 -0000 1.24 ++++ glibc-20051221T0931-fedora/iconv/iconvconfig.c 19 Dec 2005 12:11:14 -0000 1.19.2.5 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -501,8 +493,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20051220T1751/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 -+++ glibc-20051220T1751-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 +--- glibc-20051221T0931/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 ++++ glibc-20051221T0931-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 @@ -265,7 +265,13 @@ #endif @@ -518,21 +510,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20051220T1751/include/libc-symbols.h 6 Nov 2005 02:05:18 -0000 1.73 -+++ glibc-20051220T1751-fedora/include/libc-symbols.h 20 Dec 2005 10:55:59 -0000 1.64.2.8 -@@ -114,8 +114,8 @@ - extern __typeof (name) aliasname __attribute__ ((weak, alias (#name))); - - /* Declare SYMBOL as weak undefined symbol (resolved to 0 if not defined). */ --# define weak_extern(symbol) _weak_extern (weak symbol) --# define _weak_extern(expr) _Pragma (#expr) -+# define weak_extern(symbol) extern __typeof (symbol) symbol __attribute__ ((weak)); -+# define weak_tls_extern(symbol) extern __thread __typeof (symbol) symbol __attribute__ ((weak)); - - # else - ---- glibc-20051220T1751/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20051220T1751-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20051221T0931/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20051221T0931-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 @@ -542,8 +521,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20051220T1751/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 -+++ glibc-20051220T1751-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 +--- glibc-20051221T0931/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 ++++ glibc-20051221T0931-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. */ @@ -557,8 +536,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20051220T1751/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20051220T1751-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20051221T0931/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20051221T0931-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); @@ -589,8 +568,8 @@ #endif ---- glibc-20051220T1751/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20051220T1751-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20051221T0931/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20051221T0931-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 !!! @@ -682,30 +661,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20051220T1751/locale/setlocale.c 23 Mar 2005 03:01:50 -0000 1.67 -+++ glibc-20051220T1751-fedora/locale/setlocale.c 20 Dec 2005 10:55:59 -0000 1.66.2.2 -@@ -39,7 +39,7 @@ - # define DEFINE_CATEGORY(category, category_name, items, a) \ - extern char _nl_current_##category##_used; \ - weak_extern (_nl_current_##category##_used) \ -- weak_extern (_nl_current_##category) -+ weak_tls_extern (_nl_current_##category) - # include "categories.def" - # undef DEFINE_CATEGORY - ---- glibc-20051220T1751/locale/uselocale.c 14 Mar 2004 20:40:48 -0000 1.5 -+++ glibc-20051220T1751-fedora/locale/uselocale.c 20 Dec 2005 10:55:59 -0000 1.5.2.1 -@@ -54,7 +54,7 @@ __uselocale (locale_t newloc) - { \ - extern char _nl_current_##category##_used; \ - weak_extern (_nl_current_##category##_used) \ -- weak_extern (_nl_current_##category) \ -+ weak_tls_extern (_nl_current_##category) \ - if (&_nl_current_##category##_used != 0) \ - _nl_current_##category = &locobj->__locales[category]; \ - } ---- glibc-20051220T1751/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20051220T1751-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20051221T0931/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20051221T0931-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, } } @@ -749,8 +706,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20051220T1751/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20051220T1751-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20051221T0931/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20051221T0931-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/'`; \ @@ -759,8 +716,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20051220T1751/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20051220T1751-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20051221T0931/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20051221T0931-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 \ @@ -802,8 +759,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20051220T1751/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20051220T1751-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20051221T0931/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20051221T0931-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -818,8 +775,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20051220T1751/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20051220T1751-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20051221T0931/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20051221T0931-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -831,8 +788,8 @@ date_fmt "/ / " ---- glibc-20051220T1751/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051220T1751-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20051221T0931/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051221T0931-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -903,8 +860,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20051220T1751/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20051220T1751-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20051221T0931/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20051221T0931-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -932,8 +889,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20051220T1751/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20051220T1751-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20051221T0931/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20051221T0931-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -1009,8 +966,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20051220T1751/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20051220T1751-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20051221T0931/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20051221T0931-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) @@ -1066,8 +1023,8 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20051220T1751/nptl/ChangeLog 20 Dec 2005 15:25:12 -0000 1.816 -+++ glibc-20051220T1751-fedora/nptl/ChangeLog 20 Dec 2005 18:05:56 -0000 1.706.2.66 +--- glibc-20051221T0931/nptl/ChangeLog 20 Dec 2005 15:25:12 -0000 1.816 ++++ glibc-20051221T0931-fedora/nptl/ChangeLog 20 Dec 2005 18:05:56 -0000 1.706.2.66 @@ -183,6 +183,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1108,8 +1065,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20051220T1751/nptl/Makefile 16 Oct 2005 09:25:52 -0000 1.171 -+++ glibc-20051220T1751-fedora/nptl/Makefile 20 Oct 2005 06:59:53 -0000 1.157.2.13 +--- glibc-20051221T0931/nptl/Makefile 16 Oct 2005 09:25:52 -0000 1.171 ++++ glibc-20051221T0931-fedora/nptl/Makefile 20 Oct 2005 06:59:53 -0000 1.157.2.13 @@ -500,15 +500,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1132,8 +1089,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20051220T1751/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20051220T1751-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20051221T0931/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20051221T0931-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; @@ -1158,8 +1115,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20051220T1751/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051220T1751-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20051221T0931/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051221T0931-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 + @@ -1167,8 +1124,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20051220T1751/nscd/connections.c 7 Dec 2005 05:47:27 -0000 1.80 -+++ glibc-20051220T1751-fedora/nscd/connections.c 19 Dec 2005 12:11:23 -0000 1.55.2.17 +--- glibc-20051221T0931/nscd/connections.c 7 Dec 2005 05:47:27 -0000 1.80 ++++ glibc-20051221T0931-fedora/nscd/connections.c 19 Dec 2005 12:11:23 -0000 1.55.2.17 @@ -1899,3 +1899,18 @@ finish_drop_privileges (void) exit (4); } @@ -1188,8 +1145,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20051220T1751/nscd/nscd.c 7 Dec 2005 05:47:27 -0000 1.49 -+++ glibc-20051220T1751-fedora/nscd/nscd.c 19 Dec 2005 12:11:23 -0000 1.38.2.10 +--- glibc-20051221T0931/nscd/nscd.c 7 Dec 2005 05:47:27 -0000 1.49 ++++ glibc-20051221T0931-fedora/nscd/nscd.c 19 Dec 2005 12:11:23 -0000 1.38.2.10 @@ -120,6 +120,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1208,8 +1165,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20051220T1751/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20051220T1751-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20051221T0931/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20051221T0931-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 @@ -1221,8 +1178,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20051220T1751/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20051220T1751-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20051221T0931/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20051221T0931-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 @@ -1263,8 +1220,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20051220T1751/nscd/selinux.c 20 Jun 2005 15:44:41 -0000 1.5 -+++ glibc-20051220T1751-fedora/nscd/selinux.c 3 Oct 2005 20:54:46 -0000 1.1.2.5 +--- glibc-20051221T0931/nscd/selinux.c 20 Jun 2005 15:44:41 -0000 1.5 ++++ glibc-20051221T0931-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 (); @@ -1274,8 +1231,8 @@ } #endif /* HAVE_LIBAUDIT */ ---- glibc-20051220T1751/posix/Makefile 26 Sep 2005 21:13:27 -0000 1.186 -+++ glibc-20051220T1751-fedora/posix/Makefile 3 Oct 2005 20:44:16 -0000 1.171.2.14 +--- glibc-20051221T0931/posix/Makefile 26 Sep 2005 21:13:27 -0000 1.186 ++++ glibc-20051221T0931-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 \ @@ -1309,8 +1266,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20051220T1751/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051220T1751-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20051221T0931/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051221T0931-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 = @@ -1327,8 +1284,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20051220T1751/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20051220T1751-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20051221T0931/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20051221T0931-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 @@ -1344,8 +1301,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-20051220T1751/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20051220T1751-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20051221T0931/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20051221T0931-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)) @@ -1357,8 +1314,8 @@ endif endif ---- glibc-20051220T1751/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20051220T1751-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20051221T0931/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20051221T0931-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. */ @@ -1710,8 +1667,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20051220T1751/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051220T1751-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20051221T0931/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051221T0931-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. @@ -1797,8 +1754,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20051220T1751/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20051220T1751-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20051221T0931/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20051221T0931-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); } @@ -1813,8 +1770,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20051220T1751/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20051220T1751-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20051221T0931/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 ++++ glibc-20051221T0931-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. */ @@ -1863,8 +1820,8 @@ + ret ^= stk; return ret; } ---- glibc-20051220T1751/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20051220T1751-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20051221T0931/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20051221T0931-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" @@ -1874,8 +1831,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20051220T1751/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20051220T1751-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20051221T0931/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20051221T0931-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; @@ -1921,8 +1878,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20051220T1751/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051220T1751-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20051221T0931/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051221T0931-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. @@ -1983,8 +1940,8 @@ + } while (0) + +#include_next ---- glibc-20051220T1751/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20051220T1751-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20051221T0931/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20051221T0931-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) @@ -2017,24 +1974,24 @@ + } while (0) + #include_next ---- glibc-20051220T1751/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051220T1751-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20051221T0931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051221T0931-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-20051220T1751/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051220T1751-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20051221T0931/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051221T0931-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-20051220T1751/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20051220T1751-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20051221T0931/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20051221T0931-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 c55ba38..50ac228 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20051220T1751 +%define glibcdate 20051221T0931 %define glibcname glibc -%define glibcsrcdir glibc-20051220T1751 +%define glibcsrcdir glibc-20051221T0931 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 21 +%define glibcrelease 22 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1079,6 +1079,11 @@ rm -f *.filelist* %endif %changelog +* Wed Dec 21 2005 Jakub Jelinek 2.3.90-22 +- update from CVS + - minor fts fixes +- revert broken _Pragma () workaround + * Tue Dec 20 2005 Jakub Jelinek 2.3.90-21 - update from CVS - fix pointer (de)mangling in gconv_cache.c diff --git a/sources b/sources index b006892..585dd45 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -15f8955fd29612bfdcc4073cbee604ca glibc-20051220T1751.tar.bz2 -01ebc8932a2f864f30feb8c2ea9b181e glibc-fedora-20051220T1751.tar.bz2 +e64ddbee94cf4fce74c3db8bcd2fc991 glibc-20051221T0931.tar.bz2 +59a5ff9060518aac05d1ba52fdbda1ee glibc-fedora-20051221T0931.tar.bz2