diff --git a/.cvsignore b/.cvsignore index 19267bf..4540fa5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20060301T0647.tar.bz2 -glibc-fedora-20060301T0647.tar.bz2 +glibc-20060302T0855.tar.bz2 +glibc-fedora-20060302T0855.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 05d40eb..34af045 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,27 @@ ---- glibc-20060301T0647/ChangeLog 1 Mar 2006 06:38:57 -0000 1.10036 -+++ glibc-20060301T0647-fedora/ChangeLog 1 Mar 2006 06:55:37 -0000 1.8782.2.165 -@@ -804,6 +804,11 @@ +--- glibc-20060302T0855/ChangeLog 2 Mar 2006 04:49:45 -0000 1.10046 ++++ glibc-20060302T0855-fedora/ChangeLog 2 Mar 2006 09:59:46 -0000 1.8782.2.168 +@@ -1,3 +1,20 @@ ++2006-03-02 Jakub Jelinek ++ ++ * malloc/malloc.c (MALLOC_ALIGNMENT): Set to __alignof__ (long double) ++ if long double is more aligned than 2 * SIZE_SZ. ++ (misaligned_chunk): Define. ++ (public_rEALLOc, _int_free, _int_realloc): Use it. ++ ++2006-03-02 Jakub Jelinek ++ ++ * elf/check-textrel.c: Include config.h. ++ (AB(handle_file)): Don't fail if PF_X | PF_W on architectures known ++ to have executable writable PLT. ++ * sysdeps/powerpc/powerpc32/configure.in (HAVE_PPC_SECURE_PLT): New ++ test. ++ * sysdeps/powerpc/powerpc32/configure: Rebuilt. ++ * config.h.in (HAVE_PPC_SECURE_PLT): Add. ++ + 2006-01-05 H.J. Lu + + [BZ #2013] +@@ -859,6 +876,11 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -12,7 +33,7 @@ 2006-02-02 Ulrich Drepper * sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat] -@@ -863,6 +868,11 @@ +@@ -918,6 +940,11 @@ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. @@ -24,7 +45,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -3289,6 +3299,10 @@ +@@ -3344,6 +3371,10 @@ * elf/order2mod2.c (init): Cast ignored value to void. @@ -35,7 +56,7 @@ 2005-12-27 Ulrich Drepper * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -3572,6 +3586,26 @@ +@@ -3627,6 +3658,26 @@ * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, use sysdeps/unix/time.c implementation. @@ -62,7 +83,7 @@ 2005-12-19 Ulrich Drepper [BZ #1955] -@@ -6690,6 +6724,11 @@ +@@ -6745,6 +6796,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. @@ -74,7 +95,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -7684,6 +7723,12 @@ +@@ -7739,6 +7795,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -87,7 +108,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -7808,6 +7853,17 @@ +@@ -7863,6 +7925,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -105,7 +126,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -10868,6 +10924,18 @@ +@@ -10923,6 +10996,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -124,8 +145,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20060301T0647/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20060301T0647-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060302T0855/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20060302T0855-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. @@ -175,8 +196,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-20060301T0647/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20060301T0647-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20060302T0855/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20060302T0855-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. @@ -203,8 +224,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20060301T0647/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20060301T0647-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20060302T0855/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20060302T0855-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -285,8 +306,20 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20060301T0647/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20060301T0647-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20060302T0855/config.h.in 22 Feb 2006 02:09:03 -0000 1.78 ++++ glibc-20060302T0855-fedora/config.h.in 2 Mar 2006 09:59:02 -0000 1.70.2.5 +@@ -200,6 +200,9 @@ + /* Define if your assembler and linker support R_PPC_REL16* relocs. */ + #undef HAVE_ASM_PPC_REL16 + ++/* Define if your compiler defaults to -msecure-plt mode on ppc. */ ++#undef HAVE_PPC_SECURE_PLT ++ + /* Define if __stack_chk_guard canary should be randomized at program startup. */ + #undef ENABLE_STACKGUARD_RANDOMIZE + +--- glibc-20060302T0855/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20060302T0855-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; @@ -311,8 +344,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20060301T0647/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20060301T0647-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20060302T0855/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20060302T0855-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. */ @@ -341,8 +374,34 @@ # define O 0 #else # define O 1 ---- glibc-20060301T0647/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 -+++ glibc-20060301T0647-fedora/elf/ldconfig.c 2 Jan 2006 10:52:50 -0000 1.47.2.7 +--- glibc-20060302T0855/elf/check-textrel.c 12 Jan 2006 00:23:10 -0000 1.7 ++++ glibc-20060302T0855-fedora/elf/check-textrel.c 2 Mar 2006 09:59:03 -0000 1.5.2.2 +@@ -18,6 +18,7 @@ + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + ++#include "config.h" + #include + #include + #include +@@ -88,7 +89,15 @@ AB(handle_file) (const char *fname, int + { + printf ("%s: segment %zu is executable and writable\n", + fname, cnt); ++#if !defined __sparc__ \ ++ && !defined __alpha__ \ ++ && (!defined __powerpc__ || defined __powerpc64__ || defined HAVE_PPC_SECURE_PLT) ++ /* sparc, sparc64, alpha and powerpc32 (the last one only when using ++ -mbss-plt) are expected to have PF_X | PF_W segment containing .plt ++ section, it is part of their ABI. It is bad security wise, nevertheless ++ this test shouldn't fail because of this. */ + return 1; ++#endif + } + + if (dynphdr == NULL) +--- glibc-20060302T0855/elf/ldconfig.c 1 Jan 2006 19:15:56 -0000 1.52 ++++ glibc-20060302T0855-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))) @@ -444,8 +503,8 @@ } search_dirs (); ---- glibc-20060301T0647/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20060301T0647-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20060302T0855/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20060302T0855-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; @@ -470,8 +529,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060301T0647/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 -+++ glibc-20060301T0647-fedora/iconv/iconvconfig.c 2 Jan 2006 10:52:50 -0000 1.19.2.6 +--- glibc-20060302T0855/iconv/iconvconfig.c 1 Jan 2006 19:15:56 -0000 1.25 ++++ glibc-20060302T0855-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) @@ -548,8 +607,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20060301T0647/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 -+++ glibc-20060301T0647-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 +--- glibc-20060302T0855/include/features.h 5 Jan 2006 12:25:35 -0000 1.42 ++++ glibc-20060302T0855-fedora/include/features.h 6 Jan 2006 09:23:23 -0000 1.35.2.11 @@ -275,7 +275,13 @@ #endif @@ -565,16 +624,16 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20060301T0647/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060302T0855/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060301T0647/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20060302T0855/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20060301T0647/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20060301T0647-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20060302T0855/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20060302T0855-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 @@ -584,8 +643,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20060301T0647/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 -+++ glibc-20060301T0647-fedora/libio/stdio.h 30 Jan 2006 09:29:46 -0000 1.78.2.8 +--- glibc-20060302T0855/libio/stdio.h 16 Jan 2006 20:12:21 -0000 1.86 ++++ glibc-20060302T0855-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. */ @@ -599,8 +658,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20060301T0647/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20060301T0647-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20060302T0855/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20060302T0855-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); @@ -631,8 +690,8 @@ #endif ---- glibc-20060301T0647/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20060301T0647-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20060302T0855/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20060302T0855-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 !!! @@ -724,8 +783,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20060301T0647/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20060301T0647-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20060302T0855/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20060302T0855-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, } } @@ -769,8 +828,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20060301T0647/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20060301T0647-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20060302T0855/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20060302T0855-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/'`; \ @@ -779,8 +838,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20060301T0647/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20060301T0647-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20060302T0855/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20060302T0855-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 \ @@ -822,8 +881,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20060301T0647/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20060301T0647-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20060302T0855/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20060302T0855-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -838,8 +897,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20060301T0647/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20060301T0647-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20060302T0855/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20060302T0855-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -851,8 +910,8 @@ date_fmt "/ / " ---- glibc-20060301T0647/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20060302T0855/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -923,8 +982,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20060301T0647/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20060301T0647-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20060302T0855/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20060302T0855-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -952,8 +1011,70 @@ revision "0.2" date "2000-08-02" % ---- glibc-20060301T0647/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20060301T0647-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20060302T0855/malloc/malloc.c 21 Nov 2005 15:43:03 -0000 1.155 ++++ glibc-20060302T0855-fedora/malloc/malloc.c 2 Mar 2006 09:59:46 -0000 1.127.2.23 +@@ -188,7 +188,8 @@ + Changing default word sizes: + + INTERNAL_SIZE_T size_t +- MALLOC_ALIGNMENT 2 * sizeof(INTERNAL_SIZE_T) ++ MALLOC_ALIGNMENT MAX (2 * sizeof(INTERNAL_SIZE_T), ++ __alignof__ (long double)) + + Configuration and functionality options: + +@@ -380,7 +381,8 @@ extern "C" { + + + #ifndef MALLOC_ALIGNMENT +-#define MALLOC_ALIGNMENT (2 * SIZE_SZ) ++#define MALLOC_ALIGNMENT (2 * SIZE_SZ < __alignof__ (long double) \ ++ ? __alignof__ (long double) : 2 * SIZE_SZ) + #endif + + /* The corresponding bit mask value */ +@@ -1807,7 +1809,11 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+- + + /* Check if m has acceptable alignment */ + +-#define aligned_OK(m) (((unsigned long)((m)) & (MALLOC_ALIGN_MASK)) == 0) ++#define aligned_OK(m) (((unsigned long)(m) & MALLOC_ALIGN_MASK) == 0) ++ ++#define misaligned_chunk(p) \ ++ ((uintptr_t)(MALLOC_ALIGNMENT == 2 * SIZE_SZ ? (p) : chunk2mem (p)) \ ++ & MALLOC_ALIGN_MASK) + + + /* +@@ -3468,7 +3474,7 @@ public_rEALLOc(Void_t* oldmem, size_t by + Therefore we can exclude some size values which might appear + here by accident or by "design" from some intruder. */ + if (__builtin_expect ((uintptr_t) oldp > (uintptr_t) -oldsize, 0) +- || __builtin_expect ((uintptr_t) oldp & MALLOC_ALIGN_MASK, 0)) ++ || __builtin_expect (misaligned_chunk (oldp), 0)) + { + malloc_printerr (check_action, "realloc(): invalid pointer", oldmem); + return NULL; +@@ -4282,7 +4288,7 @@ _int_free(mstate av, Void_t* mem) + Therefore we can exclude some size values which might appear + here by accident or by "design" from some intruder. */ + if (__builtin_expect ((uintptr_t) p > (uintptr_t) -size, 0) +- || __builtin_expect ((uintptr_t) p & MALLOC_ALIGN_MASK, 0)) ++ || __builtin_expect (misaligned_chunk (p), 0)) + { + errstr = "free(): invalid pointer"; + errout: +@@ -4628,7 +4634,7 @@ _int_realloc(mstate av, Void_t* oldmem, + oldsize = chunksize(oldp); + + /* Simple tests for old block integrity. */ +- if (__builtin_expect ((uintptr_t) oldp & MALLOC_ALIGN_MASK, 0)) ++ if (__builtin_expect (misaligned_chunk (oldp), 0)) + { + errstr = "realloc(): invalid pointer"; + errout: +--- glibc-20060302T0855/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20060302T0855-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -1029,8 +1150,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20060301T0647/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 -+++ glibc-20060301T0647-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20060302T0855/malloc/mtrace.c 14 Sep 2004 04:24:46 -0000 1.41 ++++ glibc-20060302T0855-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) @@ -1086,21 +1207,9 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20060301T0647/nptl/ChangeLog 1 Mar 2006 03:37:59 -0000 1.874 -+++ glibc-20060301T0647-fedora/nptl/ChangeLog 1 Mar 2006 07:44:56 -0000 1.706.2.81 -@@ -1,3 +1,11 @@ -+2006-03-01 Jakub Jelinek -+ -+ * sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_robust_mutex_dead, -+ lll_robust_mutex_trylock, lll_robust_mutex_lock, -+ lll_robust_mutex_cond_lock, lll_robust_mutex_timedlock, -+ lll_robust_mutex_unlock): Define. -+ (__lll_robust_lock_wait, __lll_robust_timedlock_wait): New prototypes. -+ - 2006-02-28 H.J. Lu - - * sysdeps/unix/sysv/linux/ia64/clone2.S: Include -@@ -690,6 +698,15 @@ +--- glibc-20060302T0855/nptl/ChangeLog 2 Mar 2006 00:28:24 -0000 1.876 ++++ glibc-20060302T0855-fedora/nptl/ChangeLog 2 Mar 2006 09:06:17 -0000 1.706.2.82 +@@ -711,6 +711,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1116,7 +1225,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -1426,6 +1443,11 @@ +@@ -1447,6 +1456,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1128,7 +1237,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -3500,6 +3522,11 @@ +@@ -3521,6 +3535,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1140,8 +1249,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20060301T0647/nptl/Makefile 28 Feb 2006 09:36:05 -0000 1.179 -+++ glibc-20060301T0647-fedora/nptl/Makefile 1 Mar 2006 06:55:40 -0000 1.157.2.19 +--- glibc-20060302T0855/nptl/Makefile 28 Feb 2006 09:36:05 -0000 1.179 ++++ glibc-20060302T0855-fedora/nptl/Makefile 1 Mar 2006 06:55:40 -0000 1.157.2.19 @@ -519,15 +519,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -1164,8 +1273,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20060301T0647/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20060301T0647-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20060302T0855/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20060302T0855-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; @@ -1190,8 +1299,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20060301T0647/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20060302T0855/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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 + @@ -1199,115 +1308,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20060301T0647/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h 3 Jan 2006 23:42:57 -0000 1.6 -+++ glibc-20060301T0647-fedora/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.h 1 Mar 2006 07:44:57 -0000 1.4.2.3 -@@ -78,6 +78,15 @@ - INTERNAL_SYSCALL_ERROR_P (__ret, __err); \ - }) - -+#define lll_robust_mutex_dead(futexv) \ -+ do \ -+ { \ -+ int *__futexp = &(futexv); \ -+ atomic_or (__futexp, FUTEX_OWNER_DIED); \ -+ lll_futex_wake (__futexp, 1); \ -+ } \ -+ while (0) -+ - /* Returns non-zero if error happened, zero if success. */ - #ifdef __sparc32_atomic_do_lock - /* Avoid FUTEX_WAKE_OP if supporting pre-v9 CPUs. */ -@@ -112,9 +121,18 @@ __lll_mutex_cond_trylock (int *futex) - } - #define lll_mutex_cond_trylock(futex) __lll_mutex_cond_trylock (&(futex)) - -+static inline int -+__attribute__ ((always_inline)) -+__lll_robust_mutex_trylock (int *futex, int id) -+{ -+ return atomic_compare_and_exchange_val_acq (futex, id, 0) != 0; -+} -+#define lll_robust_mutex_trylock(futex, id) \ -+ __lll_robust_mutex_trylock (&(futex), id) -+ - - extern void __lll_lock_wait (int *futex) attribute_hidden; -- -+extern int __lll_robust_lock_wait (int *futex) attribute_hidden; - - static inline void - __attribute__ ((always_inline)) -@@ -127,6 +145,17 @@ __lll_mutex_lock (int *futex) - } - #define lll_mutex_lock(futex) __lll_mutex_lock (&(futex)) - -+static inline int -+__attribute__ ((always_inline)) -+__lll_robust_mutex_lock (int *futex, int id) -+{ -+ int result = 0; -+ if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0) -+ result = __lll_robust_lock_wait (futex); -+ return result; -+} -+#define lll_robust_mutex_lock(futex, id) \ -+ __lll_robust_mutex_lock (&(futex), id) - - static inline void - __attribute__ ((always_inline)) -@@ -139,10 +168,14 @@ __lll_mutex_cond_lock (int *futex) - } - #define lll_mutex_cond_lock(futex) __lll_mutex_cond_lock (&(futex)) - -+#define lll_robust_mutex_cond_lock(futex, id) \ -+ __lll_robust_mutex_lock (&(futex), (id) | FUTEX_WAITERS) -+ - - extern int __lll_timedlock_wait (int *futex, const struct timespec *) - attribute_hidden; -- -+extern int __lll_robust_timedlock_wait (int *futex, const struct timespec *) -+ attribute_hidden; - - static inline int - __attribute__ ((always_inline)) -@@ -158,6 +191,19 @@ __lll_mutex_timedlock (int *futex, const - #define lll_mutex_timedlock(futex, abstime) \ - __lll_mutex_timedlock (&(futex), abstime) - -+static inline int -+__attribute__ ((always_inline)) -+__lll_robust_mutex_timedlock (int *futex, const struct timespec *abstime, -+ int id) -+{ -+ int result = 0; -+ if (atomic_compare_and_exchange_bool_acq (futex, id, 0) != 0) -+ result = __lll_robust_timedlock_wait (futex, abstime); -+ return result; -+} -+#define lll_robust_mutex_timedlock(futex, abstime, id) \ -+ __lll_robust_mutex_timedlock (&(futex), abstime, id) -+ - #define lll_mutex_unlock(lock) \ - ((void) ({ \ - int *__futex = &(lock); \ -@@ -166,6 +212,14 @@ __lll_mutex_timedlock (int *futex, const - lll_futex_wake (__futex, 1); \ - })) - -+#define lll_robust_mutex_unlock(lock) \ -+ ((void) ({ \ -+ int *__futex = &(lock); \ -+ int __val = atomic_exchange_rel (__futex, 0); \ -+ if (__builtin_expect (__val & FUTEX_WAITERS, 0)) \ -+ lll_futex_wake (__futex, 1); \ -+ })) -+ - #define lll_mutex_unlock_force(lock) \ - ((void) ({ \ - int *__futex = &(lock); \ ---- glibc-20060301T0647/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 -+++ glibc-20060301T0647-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 +--- glibc-20060302T0855/nscd/connections.c 3 Jan 2006 21:26:28 -0000 1.82 ++++ glibc-20060302T0855-fedora/nscd/connections.c 4 Jan 2006 07:58:21 -0000 1.55.2.19 @@ -1873,3 +1873,18 @@ finish_drop_privileges (void) exit (4); } @@ -1327,8 +1329,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20060301T0647/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 -+++ glibc-20060301T0647-fedora/nscd/nscd.c 2 Jan 2006 10:52:53 -0000 1.38.2.11 +--- glibc-20060302T0855/nscd/nscd.c 1 Jan 2006 19:15:56 -0000 1.51 ++++ glibc-20060302T0855-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, }; @@ -1347,8 +1349,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20060301T0647/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20060301T0647-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20060302T0855/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20060302T0855-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 @@ -1360,8 +1362,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20060301T0647/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20060301T0647-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20060302T0855/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20060302T0855-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 @@ -1402,8 +1404,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20060301T0647/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 -+++ glibc-20060301T0647-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 +--- glibc-20060302T0855/posix/Makefile 8 Jan 2006 09:39:15 -0000 1.188 ++++ glibc-20060302T0855-fedora/posix/Makefile 9 Jan 2006 21:55:00 -0000 1.171.2.16 @@ -107,7 +107,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1437,8 +1439,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20060301T0647/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20060302T0855/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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 = @@ -1455,8 +1457,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20060301T0647/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20060301T0647-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20060302T0855/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20060302T0855-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 @@ -1472,8 +1474,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-20060301T0647/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20060301T0647-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20060302T0855/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20060302T0855-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)) @@ -1485,8 +1487,8 @@ endif endif ---- glibc-20060301T0647/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20060301T0647-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20060302T0855/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20060302T0855-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. */ @@ -1838,8 +1840,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20060301T0647/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060302T0855/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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. @@ -1925,8 +1927,63 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20060301T0647/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20060301T0647-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20060302T0855/sysdeps/powerpc/powerpc32/configure 17 Jun 2005 22:58:48 -0000 1.1 ++++ glibc-20060302T0855-fedora/sysdeps/powerpc/powerpc32/configure 2 Mar 2006 09:59:03 -0000 1.1.2.2 +@@ -31,3 +31,32 @@ if test $libc_cv_ppc_rel16 = yes; then + _ACEOF + + fi ++ ++# See whether GCC uses -msecure-plt. ++echo "$as_me:$LINENO: checking for -msecure-plt by default" >&5 ++echo $ECHO_N "checking for -msecure-plt by default... $ECHO_C" >&6 ++if test "${libc_cv_ppc_secure_plt+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ echo 'int foo (void) { extern int bar; return bar; }' > conftest.c ++libc_cv_ppc_secure_plt=no ++if { ac_try='${CC-cc} -S $CFLAGS conftest.c -fpic -o conftest.s 1>&5' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ if grep '_GLOBAL_OFFSET_TABLE_-.*@ha' conftest.s > /dev/null 2>&1; then ++ libc_cv_ppc_secure_plt=yes ++ fi ++fi ++rm -rf conftest* ++fi ++echo "$as_me:$LINENO: result: $libc_cv_ppc_secure_plt" >&5 ++echo "${ECHO_T}$libc_cv_ppc_secure_plt" >&6 ++if test $libc_cv_ppc_secure_plt = yes; then ++ cat >>confdefs.h <<\_ACEOF ++#define HAVE_PPC_SECURE_PLT 1 ++_ACEOF ++ ++fi +--- glibc-20060302T0855/sysdeps/powerpc/powerpc32/configure.in 17 Jun 2005 22:58:48 -0000 1.1 ++++ glibc-20060302T0855-fedora/sysdeps/powerpc/powerpc32/configure.in 2 Mar 2006 09:59:03 -0000 1.1.2.2 +@@ -16,3 +16,17 @@ rm -f conftest*]) + if test $libc_cv_ppc_rel16 = yes; then + AC_DEFINE(HAVE_ASM_PPC_REL16) + fi ++ ++# See whether GCC uses -msecure-plt. ++AC_CACHE_CHECK(for -msecure-plt by default, libc_cv_ppc_secure_plt, [dnl ++echo 'int foo (void) { extern int bar; return bar; }' > conftest.c ++libc_cv_ppc_secure_plt=no ++if AC_TRY_COMMAND(${CC-cc} -S $CFLAGS conftest.c -fpic -o conftest.s 1>&AS_MESSAGE_LOG_FD); then ++ if grep '_GLOBAL_OFFSET_TABLE_-.*@ha' conftest.s > /dev/null 2>&1; then ++ libc_cv_ppc_secure_plt=yes ++ fi ++fi ++rm -rf conftest*]) ++if test $libc_cv_ppc_secure_plt = yes; then ++ AC_DEFINE(HAVE_PPC_SECURE_PLT) ++fi +--- glibc-20060302T0855/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20060302T0855-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); } @@ -1941,8 +1998,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Jan 2006 21:55:08 -0000 1.14.2.8 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Jan 2006 08:21:15 -0000 1.22 ++++ glibc-20060302T0855-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. */ @@ -1991,8 +2048,8 @@ + ret ^= stk; return ret; } ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20060302T0855-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; @@ -2035,8 +2092,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20060302T0855-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" @@ -2046,8 +2103,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20060302T0855-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; @@ -2093,8 +2150,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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. @@ -2155,8 +2212,8 @@ + } while (0) + +#include_next ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20060302T0855-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) @@ -2189,35 +2246,24 @@ + } while (0) + #include_next ---- glibc-20060301T0647/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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-20060301T0647/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20060302T0855-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-20060301T0647/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20060301T0647-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20060302T0855/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20060302T0855-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h.jj 2006-02-28 15:14:07.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h 2006-03-01 13:31:48.000000000 +0100 -@@ -268,7 +268,7 @@ - register unsigned long gpr6 asm ("6") = (unsigned long)(arg5); - #define DECLARGS_6(arg1, arg2, arg3, arg4, arg5, arg6) \ - DECLARGS_5(arg1, arg2, arg3, arg4, arg5) \ -- register unsigned long gpr6 asm ("7") = (unsigned long)(arg6); -+ register unsigned long gpr7 asm ("7") = (unsigned long)(arg6); - - #define ASMFMT_0 - #define ASMFMT_1 , "0" (gpr2) diff --git a/glibc.spec b/glibc.spec index 1a0d89c..d8ee533 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20060301T0647 +%define glibcdate 20060302T0855 %define glibcname glibc -%define glibcsrcdir glibc-20060301T0647 +%define glibcsrcdir glibc-20060302T0855 %define glibc_release_tarballs 0 -%define glibcversion 2.3.90 -%define glibcrelease 39 +%define glibcversion 2.3.91 +%define glibcrelease 1 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -1337,6 +1337,14 @@ rm -f *.filelist* %endif %changelog +* Thu Mar 2 2006 Jakub Jelinek 2.3.91-1 +- update from CVS + - fixes for various arches +- ensure malloc returns pointers aligned to at least + MIN (2 * sizeof (size_t), __alignof__ (long double)) + (only on ppc32 this has not been the case lately with addition + of 128-bit long double, #182742) + * Wed Mar 1 2006 Jakub Jelinek 2.3.90-39 - update from CVS diff --git a/sources b/sources index 99a8bcf..f330ae5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -661cdfb8abebd6f892a18c3280f1add1 glibc-20060301T0647.tar.bz2 -7c4abda7310c1672d4a075c027670766 glibc-fedora-20060301T0647.tar.bz2 +7787f2784c74be230cbb307b44a8a883 glibc-20060302T0855.tar.bz2 +3dd6039e4a284e1cde38324db43f8ebb glibc-fedora-20060302T0855.tar.bz2