From 6c0e600a935a7f1a5a23b4186dc269eca8cbde6d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Nov 12 2009 17:51:25 +0000 Subject: 2.11.90-1 --- diff --git a/.cvsignore b/.cvsignore index e94ea06..319610e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.10-343-gf450806-fedora.tar.bz2 -glibc-2.10-343-gf450806.tar.bz2 +glibc-2.11-12-g24c0bf7-fedora.tar.bz2 +glibc-2.11-12-g24c0bf7.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 920da25..a996cc6 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,47 @@ ---- glibc-2.10-343-gf450806/ChangeLog -+++ glibc-2.10.90-23/ChangeLog -@@ -639,6 +639,11 @@ +--- glibc-2.11-12-g24c0bf7/ChangeLog ++++ glibc-2.11.90-1/ChangeLog +@@ -275,22 +275,6 @@ d2009-10-30 Ulrich Drepper + * sysdeps/generic/netinet/ip.h: Define IPTOS_ENC* and IPTOS_DSCP* + macros. Patch by Philip Prindeville . + +- [BZ #10840] +- * sysdeps/unix/sysv/linux/kernel-features.h: Define +- __ASSUME_F_GETOWN_EX. +- * sysdeps/unix/sysv/linux/fcntl.c: Implement F_GETOWN using F_GETOWN_EX +- if possible. +- * sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise. +- +- * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Define F_OWNER_* +- and f_owner_ex. +- * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise. +- + [BZ #10847] + * sysdeps/gnu/getutmp.c: Allow compatibility code to play around with + getutmpx symbol. +@@ -378,17 +362,6 @@ d2009-10-30 Ulrich Drepper + * locale/C-time.c: Revert week-1stday back to 19971130 and set + first_weekday to 1 and first_workday to 2. + +-2009-10-01 Ulrich Drepper +- +- * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Define F_SETOWN_EX and +- F_GETOWN_EX. +- * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise. +- * sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise. +- + 2009-09-28 Andreas Schwab + + * stdio-common/printf_fp.c: Check for and avoid integer overflows. +@@ -1046,6 +1019,11 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -12,7 +53,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -904,6 +909,11 @@ +@@ -1311,6 +1289,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -24,21 +65,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -9302,6 +9312,13 @@ - * include/sys/cdefs.h: Redefine __nonnull so that test for - incorrect parameters in the libc code itself are not omitted. - -+2006-07-02 Jakub Jelinek -+ -+ * nscd/connections.c (sighup_pending): New variable. -+ (nscd_run): If sighup_pending, prune all 3 caches. -+ (sighup_handler): Don't prune caches here, rather just set -+ sighup_pending flag. -+ - 2007-05-09 Jakub Jelinek - - * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow -@@ -9597,6 +9614,10 @@ +@@ -10004,6 +9987,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -49,7 +76,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -10854,6 +10875,15 @@ +@@ -11261,6 +11248,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -65,8 +92,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.10-343-gf450806/ChangeLog.15 -+++ glibc-2.10.90-23/ChangeLog.15 +--- glibc-2.11-12-g24c0bf7/ChangeLog.15 ++++ glibc-2.11.90-1/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -132,68 +159,19 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.10-343-gf450806/ChangeLog.16 -+++ glibc-2.10.90-23/ChangeLog.16 -@@ -171,6 +171,11 @@ - [BZ #2611] - * stdio-common/renameat.c (renameat): Fix typo. - -+2006-04-27 Jakub Jelinek -+ -+ * nscd/connections.c (sighup_handler): Only run prune_cache on -+ enabled databases. -+ - 2006-04-26 Roland McGrath - - * Makeconfig (%.v.i rule): Don't use -DASSEMBLER. -@@ -1030,6 +1035,34 @@ - _SC_CPUTIME and _SC_THREAD_CPUTIME here. - * sysdeps/unix/sysv/linux/x86_64/sysconf.c (__sysconf): Likewise. - -+2006-03-04 Jakub Jelinek -+ Roland McGrath -+ -+ * sysdeps/unix/sysv/linux/i386/lowlevellock.h -+ (LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END, -+ LLL_STUB_UNWIND_INFO_3, LLL_STUB_UNWIND_INFO_4): Define. -+ (lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock, -+ lll_robust_mutex_cond_lock, lll_mutex_timedlock, -+ lll_robust_mutex_timedlock, lll_mutex_unlock, -+ lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them. -+ Add _L_*_ symbols around the subsection. -+ * sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S: Add unwind info. -+ * sysdeps/unix/sysv/linux/i386/i486/lowlevelrobustlock.S: Likewise. -+ -+2006-03-03 Jakub Jelinek -+ Roland McGrath -+ -+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h -+ (LLL_STUB_UNWIND_INFO_START, LLL_STUB_UNWIND_INFO_END, -+ LLL_STUB_UNWIND_INFO_5, LLL_STUB_UNWIND_INFO_6): Define. -+ (lll_mutex_lock, lll_robust_mutex_lock, lll_mutex_cond_lock, -+ lll_robust_mutex_cond_lock, lll_mutex_timedlock, -+ lll_robust_mutex_timedlock, lll_mutex_unlock, -+ lll_robust_mutex_unlock, lll_lock, lll_unlock): Use them. -+ Add _L_*_ symbols around the subsection. -+ * sysdeps/unix/sysv/linux/x86_64/lowlevellock.S: Add unwind info. -+ * sysdeps/unix/sysv/linux/x86_64/lowlevelrobustlock.S: Likewise. -+ - 2006-03-05 Roland McGrath - - * malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value. -@@ -2042,6 +2075,11 @@ +--- glibc-2.11-12-g24c0bf7/ChangeLog.16 ++++ glibc-2.11.90-1/ChangeLog.16 +@@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. + * sysdeps/unix/sysv/linux/futimesat.c (futimesat): If + file == NULL, use __futimes unconditionally. + -+ * manual/filesys.texi (futimes): Fix prototype. -+ 2006-02-02 Ulrich Drepper * sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat] -@@ -2101,6 +2139,11 @@ +@@ -2101,6 +2104,11 @@ * sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo. * sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps. @@ -205,57 +183,7 @@ 2006-01-19 Thomas Schwinge * libio/genops.c: Include . -@@ -4527,6 +4570,10 @@ - - * elf/order2mod2.c (init): Cast ignored value to void. - -+2005-12-27 Jakub Jelinek -+ -+ * elf/ldconfig.c (search_dir): Skip prelink temporaries. -+ - 2005-12-27 Ulrich Drepper - - * elf/tst-tls13.c (do_test): Avoid using the library path when -@@ -4810,6 +4857,26 @@ - * sysdeps/unix/sysv/linux/time.c: If __NR_time is not defined, - use sysdeps/unix/time.c implementation. - -+2005-12-20 Jakub Jelinek -+ -+ * malloc/mtrace.c (__libc_malloc, __libc_free, __libc_realloc, -+ __libc_memalign): Add prototypes and libc_hidden_proto resp. -+ defines for !_LIBC. -+ (tr_freehook): Call __libc_free instead of free. -+ (tr_mallochook): Call __libc_malloc instead of malloc. -+ (tr_reallochook): Call __libc_realloc instead of realloc. -+ (tr_memalignhook): Call __libc_memalign instead of memalign. -+ * malloc/mcheck.c: Include stdlib.h. -+ (__libc_malloc, __libc_free, __libc_realloc, -+ __libc_memalign): Add prototypes and libc_hidden_proto resp. -+ defines for !_LIBC. -+ (freehook): Call __libc_free instead of free. -+ (mallochook): Call __libc_malloc instead of malloc. -+ (reallochook): Call __libc_realloc instead of realloc. -+ (memalignhook): Call __libc_memalign instead of memalign. -+ (mcheck): Call __libc_malloc and __libc_free instead of -+ malloc and free. -+ - 2005-12-19 Ulrich Drepper - - [BZ #1955] -@@ -7928,6 +7995,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. - -+2005-10-03 Jakub Jelinek -+ -+ * nscd/selinux.c (audit_init): Print error string in the failure -+ message. -+ - 2005-10-03 Roland McGrath - - * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -8922,6 +8994,12 @@ +@@ -8922,6 +8930,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -268,7 +196,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -9046,6 +9124,17 @@ +@@ -9046,6 +9060,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -286,27 +214,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -12106,6 +12195,18 @@ - - * scripts/soversions.awk: Fix default version set handling. - -+2005-02-09 Jakub Jelinek -+ -+ * sysdeps/unix/sysv/linux/bits/termios.h (CMSPAR): Define. -+ * sysdeps/unix/sysv/linux/alpha/bits/termios.h: Add __USE_MISC -+ and __USE_XOPEN guards to match linux/bits/termios.h. -+ (CMSPAR): Define. -+ * sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Add __USE_MISC -+ and __USE_XOPEN guards to match linux/bits/termios.h. -+ (CMSPAR): Define. -+ * sysdeps/unix/sysv/linux/sparc/bits/termios.h: Add __USE_MISC -+ and __USE_XOPEN guards to match linux/bits/termios.h. -+ - 2005-02-10 Roland McGrath - - [BZ #157] ---- glibc-2.10-343-gf450806/Makeconfig -+++ glibc-2.10.90-23/Makeconfig +--- glibc-2.11-12-g24c0bf7/Makeconfig ++++ glibc-2.11.90-1/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -323,8 +232,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.10-343-gf450806/csu/Makefile -+++ glibc-2.10.90-23/csu/Makefile +--- glibc-2.11-12-g24c0bf7/csu/Makefile ++++ glibc-2.11.90-1/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -335,8 +244,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.10-343-gf450806/csu/elf-init.c -+++ glibc-2.10.90-23/csu/elf-init.c +--- glibc-2.11-12-g24c0bf7/csu/elf-init.c ++++ glibc-2.11.90-1/csu/elf-init.c @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -361,8 +270,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.10-343-gf450806/debug/tst-chk1.c -+++ glibc-2.10.90-23/debug/tst-chk1.c +--- glibc-2.11-12-g24c0bf7/debug/tst-chk1.c ++++ glibc-2.11.90-1/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -391,8 +300,8 @@ # define O 0 # else # define O 1 ---- glibc-2.10-343-gf450806/elf/ldconfig.c -+++ glibc-2.10.90-23/elf/ldconfig.c +--- glibc-2.11-12-g24c0bf7/elf/ldconfig.c ++++ glibc-2.11.90-1/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -474,8 +383,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.10-343-gf450806/elf/tst-stackguard1.c -+++ glibc-2.10.90-23/elf/tst-stackguard1.c +--- glibc-2.11-12-g24c0bf7/elf/tst-stackguard1.c ++++ glibc-2.11.90-1/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -500,16 +409,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10-343-gf450806/include/bits/stdlib-ldbl.h -+++ glibc-2.10.90-23/include/bits/stdlib-ldbl.h +--- glibc-2.11-12-g24c0bf7/include/bits/stdlib-ldbl.h ++++ glibc-2.11.90-1/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10-343-gf450806/include/bits/wchar-ldbl.h -+++ glibc-2.10.90-23/include/bits/wchar-ldbl.h +--- glibc-2.11-12-g24c0bf7/include/bits/wchar-ldbl.h ++++ glibc-2.11.90-1/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10-343-gf450806/include/features.h -+++ glibc-2.10.90-23/include/features.h +--- glibc-2.11-12-g24c0bf7/include/features.h ++++ glibc-2.11.90-1/include/features.h @@ -299,8 +299,13 @@ #endif @@ -526,8 +435,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.10-343-gf450806/intl/locale.alias -+++ glibc-2.10.90-23/intl/locale.alias +--- glibc-2.11-12-g24c0bf7/intl/locale.alias ++++ glibc-2.11.90-1/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -537,8 +446,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.10-343-gf450806/libio/stdio.h -+++ glibc-2.10.90-23/libio/stdio.h +--- glibc-2.11-12-g24c0bf7/libio/stdio.h ++++ glibc-2.11.90-1/libio/stdio.h @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -552,8 +461,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.10-343-gf450806/locale/iso-4217.def -+++ glibc-2.10.90-23/locale/iso-4217.def +--- glibc-2.11-12-g24c0bf7/locale/iso-4217.def ++++ glibc-2.11.90-1/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -645,8 +554,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.10-343-gf450806/locale/programs/locarchive.c -+++ glibc-2.10.90-23/locale/programs/locarchive.c +--- glibc-2.11-12-g24c0bf7/locale/programs/locarchive.c ++++ glibc-2.11.90-1/locale/programs/locarchive.c @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -678,8 +587,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.10-343-gf450806/localedata/Makefile -+++ glibc-2.10.90-23/localedata/Makefile +--- glibc-2.11-12-g24c0bf7/localedata/Makefile ++++ glibc-2.11.90-1/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -688,8 +597,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.10-343-gf450806/localedata/SUPPORTED -+++ glibc-2.10.90-23/localedata/SUPPORTED +--- glibc-2.11-12-g24c0bf7/localedata/SUPPORTED ++++ glibc-2.11.90-1/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -714,7 +623,7 @@ en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ en_ZW.UTF-8/UTF-8 \ -@@ -304,6 +307,8 @@ nl_NL/ISO-8859-1 \ +@@ -305,6 +308,8 @@ nl_NL/ISO-8859-1 \ nl_NL@euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ @@ -723,7 +632,7 @@ nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ -@@ -362,6 +367,7 @@ sv_FI/ISO-8859-1 \ +@@ -364,6 +369,7 @@ sv_FI/ISO-8859-1 \ sv_FI@euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -731,8 +640,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.10-343-gf450806/localedata/locales/cy_GB -+++ glibc-2.10.90-23/localedata/locales/cy_GB +--- glibc-2.11-12-g24c0bf7/localedata/locales/cy_GB ++++ glibc-2.11.90-1/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -747,8 +656,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.10-343-gf450806/localedata/locales/en_GB -+++ glibc-2.10.90-23/localedata/locales/en_GB +--- glibc-2.11-12-g24c0bf7/localedata/locales/en_GB ++++ glibc-2.11.90-1/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -760,8 +669,8 @@ date_fmt "/ / " ---- glibc-2.10-343-gf450806/localedata/locales/no_NO -+++ glibc-2.10.90-23/localedata/locales/no_NO +--- glibc-2.11-12-g24c0bf7/localedata/locales/no_NO ++++ glibc-2.11.90-1/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -832,8 +741,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.10-343-gf450806/localedata/locales/zh_TW -+++ glibc-2.10.90-23/localedata/locales/zh_TW +--- glibc-2.11-12-g24c0bf7/localedata/locales/zh_TW ++++ glibc-2.11.90-1/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -861,8 +770,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.10-343-gf450806/malloc/mcheck.c -+++ glibc-2.10.90-23/malloc/mcheck.c +--- glibc-2.11-12-g24c0bf7/malloc/mcheck.c ++++ glibc-2.11.90-1/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -938,8 +847,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.10-343-gf450806/manual/libc.texinfo -+++ glibc-2.10.90-23/manual/libc.texinfo +--- glibc-2.11-12-g24c0bf7/manual/libc.texinfo ++++ glibc-2.11.90-1/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -949,8 +858,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.10-343-gf450806/misc/sys/cdefs.h -+++ glibc-2.10.90-23/misc/sys/cdefs.h +--- glibc-2.11-12-g24c0bf7/misc/sys/cdefs.h ++++ glibc-2.11.90-1/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -994,17 +903,17 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.10-343-gf450806/nis/nss -+++ glibc-2.10.90-23/nis/nss +--- glibc-2.11-12-g24c0bf7/nis/nss ++++ glibc-2.11.90-1/nis/nss @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-2.10-343-gf450806/nptl/ChangeLog -+++ glibc-2.10.90-23/nptl/ChangeLog -@@ -3717,6 +3717,15 @@ +--- glibc-2.11-12-g24c0bf7/nptl/ChangeLog ++++ glibc-2.11.90-1/nptl/ChangeLog +@@ -3734,6 +3734,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1020,7 +929,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4453,6 +4462,11 @@ +@@ -4470,6 +4479,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1032,7 +941,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6527,6 +6541,11 @@ +@@ -6544,6 +6558,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1044,8 +953,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.10-343-gf450806/nptl/Makefile -+++ glibc-2.10.90-23/nptl/Makefile +--- glibc-2.11-12-g24c0bf7/nptl/Makefile ++++ glibc-2.11.90-1/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1078,8 +987,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.10-343-gf450806/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.10.90-23/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11-12-g24c0bf7/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11.90-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -1088,8 +997,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.10-343-gf450806/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.10.90-23/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11-12-g24c0bf7/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11.90-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1097,8 +1006,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.10-343-gf450806/nptl/tst-stackguard1.c -+++ glibc-2.10.90-23/nptl/tst-stackguard1.c +--- glibc-2.11-12-g24c0bf7/nptl/tst-stackguard1.c ++++ glibc-2.11.90-1/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1123,8 +1032,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10-343-gf450806/nscd/nscd.conf -+++ glibc-2.10.90-23/nscd/nscd.conf +--- glibc-2.11-12-g24c0bf7/nscd/nscd.conf ++++ glibc-2.11.90-1/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1134,8 +1043,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.10-343-gf450806/nscd/nscd.init -+++ glibc-2.10.90-23/nscd/nscd.init +--- glibc-2.11-12-g24c0bf7/nscd/nscd.init ++++ glibc-2.11.90-1/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1207,8 +1116,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.10-343-gf450806/posix/Makefile -+++ glibc-2.10.90-23/posix/Makefile +--- glibc-2.11-12-g24c0bf7/posix/Makefile ++++ glibc-2.11.90-1/posix/Makefile @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1229,8 +1138,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.10-343-gf450806/posix/getconf.speclist.h -+++ glibc-2.10.90-23/posix/getconf.speclist.h +--- glibc-2.11-12-g24c0bf7/posix/getconf.speclist.h ++++ glibc-2.11.90-1/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1271,8 +1180,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.10-343-gf450806/streams/Makefile -+++ glibc-2.10.90-23/streams/Makefile +--- glibc-2.11-12-g24c0bf7/streams/Makefile ++++ glibc-2.11.90-1/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1282,8 +1191,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.10-343-gf450806/sysdeps/generic/dl-cache.h -+++ glibc-2.10.90-23/sysdeps/generic/dl-cache.h +--- glibc-2.11-12-g24c0bf7/sysdeps/generic/dl-cache.h ++++ glibc-2.11.90-1/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1299,8 +1208,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-2.10-343-gf450806/sysdeps/i386/Makefile -+++ glibc-2.10.90-23/sysdeps/i386/Makefile +--- glibc-2.11-12-g24c0bf7/sysdeps/i386/Makefile ++++ glibc-2.11.90-1/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1325,8 +1234,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10-343-gf450806/sysdeps/ia64/Makefile -+++ glibc-2.10.90-23/sysdeps/ia64/Makefile +--- glibc-2.11-12-g24c0bf7/sysdeps/ia64/Makefile ++++ glibc-2.11.90-1/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1338,8 +1247,8 @@ endif endif ---- glibc-2.10-343-gf450806/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.10.90-23/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11-12-g24c0bf7/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11.90-1/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1691,8 +1600,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.10-343-gf450806/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.10.90-23/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11-12-g24c0bf7/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11.90-1/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1778,8 +1687,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.10-343-gf450806/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.10.90-23/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11-12-g24c0bf7/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11.90-1/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1788,8 +1697,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10-343-gf450806/sysdeps/unix/nice.c -+++ glibc-2.10.90-23/sysdeps/unix/nice.c +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/nice.c ++++ glibc-2.11.90-1/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1804,8 +1713,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1821,8 +1730,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1870,8 +1779,80 @@ } else #endif ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/fcntl.c ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/fcntl.c +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2000, 2002, 2003, 2004, 2009 Free Software Foundation, Inc. ++/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -23,40 +23,6 @@ + #include + + #include +-#include +- +- +-#ifdef __ASSUME_F_GETOWN_EX +-# define miss_F_GETOWN_EX 0 +-#else +-static int miss_F_GETOWN_EX; +-#endif +- +- +-static int +-do_fcntl (int fd, int cmd, void *arg) +-{ +- if (cmd != F_GETOWN || miss_F_GETOWN_EX) +- return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); +- +- INTERNAL_SYSCALL_DECL (err); +- struct f_owner_ex fex; +- int res = INTERNAL_SYSCALL (fcntl, err, 3, fd, F_GETOWN_EX, &fex); +- if (!INTERNAL_SYSCALL_ERROR_P (res, err)) +- return fex.type == F_OWNER_GID ? -fex.pid : fex.pid; +- +-#ifndef __ASSUME_F_GETOWN_EX +- if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL) +- { +- res = INLINE_SYSCALL (fcntl, 3, fd, F_GETOWN, arg); +- miss_F_GETOWN_EX = 1; +- return res; +- } +-#endif +- +- __set_errno (INTERNAL_SYSCALL_ERRNO (res, err)); +- return -1; +-} + + + #ifndef NO_CANCELLATION +@@ -70,7 +36,7 @@ __fcntl_nocancel (int fd, int cmd, ...) + arg = va_arg (ap, void *); + va_end (ap); + +- return do_fcntl (fd, cmd, arg); ++ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); + } + #endif + +@@ -86,11 +52,11 @@ __libc_fcntl (int fd, int cmd, ...) + va_end (ap); + + if (SINGLE_THREAD_P || cmd != F_SETLKW) +- return do_fcntl (fd, cmd, arg); ++ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); + + int oldtype = LIBC_CANCEL_ASYNC (); + +- int result = do_fcntl (fd, cmd, arg); ++ int result = INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); + + LIBC_CANCEL_RESET (oldtype); + +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1913,9 +1894,60 @@ + if (fd != AT_FDCWD && file[0] != '/') { size_t filelen = strlen (file); - static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/i386/clone.S -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/i386/clone.S + if (__builtin_expect (filelen == 0, 0)) +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/i386/bits/fcntl.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/i386/bits/fcntl.h +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux. +- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009 ++ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -85,15 +85,13 @@ + #define F_SETLKW64 14 /* Set record locking info (blocking). */ + + #if defined __USE_BSD || defined __USE_UNIX98 +-# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ +-# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ ++# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ ++# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ + #endif + + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +-# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ + #endif + + #ifdef __USE_GNU +@@ -168,23 +166,6 @@ struct flock64 + }; + #endif + +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_GID /* Process group. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/i386/clone.S ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1934,8 +1966,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -1996,8 +2028,108 @@ + } while (0) + +#include_next ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/i386/fcntl.c ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/i386/fcntl.c +@@ -1,4 +1,4 @@ +-/* Copyright (C) 2000,2002,2003,2004,2006,2009 Free Software Foundation, Inc. ++/* Copyright (C) 2000,2002,2003,2004,2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -30,13 +30,6 @@ + int __have_no_fcntl64; + #endif + +-#ifdef __ASSUME_F_GETOWN_EX +-# define miss_F_GETOWN_EX 0 +-#else +-static int miss_F_GETOWN_EX; +-#endif +- +- + #if defined NO_CANCELLATION && __ASSUME_FCNTL64 == 0 + # define __fcntl_nocancel __libc_fcntl + #endif +@@ -126,26 +119,6 @@ __fcntl_nocancel (int fd, int cmd, ...) + assert (F_SETLK - F_SETLKW == F_SETLK64 - F_SETLKW64); + return INLINE_SYSCALL (fcntl, 3, fd, cmd + F_SETLK - F_SETLK64, &fl); + } +- case F_GETOWN: +- if (! miss_F_GETOWN_EX) +- { +- INTERNAL_SYSCALL_DECL (err); +- struct f_owner_ex fex; +- int res = INTERNAL_SYSCALL (fcntl, err, 3, fd, F_GETOWN_EX, &fex); +- if (!INTERNAL_SYSCALL_ERROR_P (res, err)) +- return fex.type == F_OWNER_GID ? -fex.pid : fex.pid; +- +-#ifndef __ASSUME_F_GETOWN_EX +- if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL) +- miss_F_GETOWN_EX = 1; +- else +-#endif +- { +- __set_errno (INTERNAL_SYSCALL_ERRNO (res, err)); +- return -1; +- } +- } +- /* FALLTHROUGH */ + default: + return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); + } +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux/IA64. +- Copyright (C) 1999,2000,2004,2006,2007,2009 Free Software Foundation, Inc. ++ Copyright (C) 1999, 2000, 2004, 2006, 2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -81,15 +81,13 @@ + #define F_SETLKW64 7 /* Set record locking info (blocking). */ + + #if defined __USE_BSD || defined __USE_UNIX98 +-# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ +-# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ ++# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ ++# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ + #endif + + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +-# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ + #endif + + #ifdef __USE_GNU +@@ -161,23 +159,6 @@ struct flock64 + }; + #endif + +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_GID /* Process group. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2030,29 +2162,40 @@ + } while (0) + #include_next ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -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"_ ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/kernel-features.h +@@ -542,8 +542,3 @@ + # define __ASSUME_PREADV 1 + # define __ASSUME_PWRITEV 1 + #endif +- +-/* Support for F_GETOWN_EX was introduced in 2.6.32. */ +-#if __LINUX_KERNEL_VERSION >= 0x020620 +-# define __ASSUME_F_GETOWN_EX 1 +-#endif +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2078,8 +2221,8 @@ struct netlink_res { ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2089,8 +2232,214 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux/PowerPC. +- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009 ++ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -85,15 +85,13 @@ + #define F_SETLKW64 14 /* Set record locking info (blocking). */ + + #if defined __USE_BSD || defined __USE_UNIX98 +-# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ +-# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ ++# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ ++# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ + #endif + + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +-# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ + #endif + + #ifdef __USE_GNU +@@ -168,23 +166,6 @@ struct flock64 + }; + #endif + +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_GID /* Process group. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/s390/bits/fcntl.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/s390/bits/fcntl.h +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux. +- Copyright (C) 2000,2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc. ++ Copyright (C) 2000,2001,2002,2004,2006,2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -100,15 +100,13 @@ + #endif + + #if defined __USE_BSD || defined __USE_UNIX98 +-# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ +-# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ ++# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ ++# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ + #endif + + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +-# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ + #endif + + #ifdef __USE_GNU +@@ -183,23 +181,6 @@ struct flock64 + }; + #endif + +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_GID /* Process group. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/sh/bits/fcntl.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/sh/bits/fcntl.h +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux. +- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009 ++ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -85,15 +85,13 @@ + #define F_SETLKW64 14 /* Set record locking info (blocking). */ + + #if defined __USE_BSD || defined __USE_UNIX98 +-# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ +-# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ ++# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ ++# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ + #endif + + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 12 /* Get owner (thread receiving of SIGIO). */ +-# define F_GETOWN_EX 13 /* Set owner (thread receiving of SIGIO). */ + #endif + + #ifdef __USE_GNU +@@ -168,23 +166,6 @@ struct flock64 + }; + #endif + +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_GID /* Process group. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux/SPARC. +- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009 ++ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007 + Free Software Foundation, Inc. + This file is part of the GNU C Library. + +@@ -83,8 +83,8 @@ + #define F_GETFL 3 /* Get file status flags. */ + #define F_SETFL 4 /* Set file status flags. */ + #if defined __USE_BSD || defined __USE_UNIX98 +-# define F_GETOWN 5 /* Get owner (process receiving SIGIO). */ +-# define F_SETOWN 6 /* Set owner (process receiving SIGIO). */ ++# define F_GETOWN 5 /* Get owner of socket (receiver of SIGIO). */ ++# define F_SETOWN 6 /* Set owner of socket (receiver of SIGIO). */ + #endif + #ifndef __USE_FILE_OFFSET64 + # define F_GETLK 7 /* Get record locking info. */ +@@ -99,8 +99,6 @@ + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_GETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +-# define F_SETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ + #endif + + #ifdef __USE_GNU +@@ -187,23 +185,6 @@ struct flock64 + }; + #endif + +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_GID /* Process group. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2136,8 +2485,59 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.10-343-gf450806/sysdeps/unix/sysv/linux/x86_64/clone.S -+++ glibc-2.10.90-23/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h +@@ -1,5 +1,5 @@ + /* O_*, F_*, FD_* bit values for Linux/x86-64. +- Copyright (C) 2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc. ++ Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -99,15 +99,13 @@ + #endif + + #if defined __USE_BSD || defined __USE_UNIX98 +-# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ +-# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ ++# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ ++# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ + #endif + + #ifdef __USE_GNU + # define F_SETSIG 10 /* Set number of signal to be sent. */ + # define F_GETSIG 11 /* Get number of signal to be sent. */ +-# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ +-# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ + #endif + + #ifdef __USE_GNU +@@ -182,23 +180,6 @@ struct flock64 + }; + #endif + +-#ifdef __USE_GNU +-/* Owner types. */ +-enum __pid_type +- { +- F_OWNER_TID = 0, /* Kernel thread. */ +- F_OWNER_PID, /* Process. */ +- F_OWNER_GID /* Process group. */ +- }; +- +-/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ +-struct f_owner_ex +- { +- enum __pid_type type; /* Owner type of ID. */ +- __pid_t pid; /* ID of owner. */ +- }; +-#endif +- + /* Define some more compatibility macros to be backward compatible with + BSD systems which did not managed to hide these kernel macros. */ + #ifdef __USE_BSD +--- glibc-2.11-12-g24c0bf7/sysdeps/unix/sysv/linux/x86_64/clone.S ++++ glibc-2.11.90-1/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2156,8 +2556,8 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.10-343-gf450806/timezone/zic.c -+++ glibc-2.10.90-23/timezone/zic.c +--- glibc-2.11-12-g24c0bf7/timezone/zic.c ++++ glibc-2.11.90-1/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; diff --git a/glibc.spec b/glibc.spec index f9085b1..fd4bcf4 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,5 +1,5 @@ -%define glibcsrcdir glibc-2.10-343-gf450806 -%define glibcversion 2.10.90 +%define glibcsrcdir glibc-2.11-12-g24c0bf7 +%define glibcversion 2.11.90 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon sparcv9v sparc64v alphaev6 @@ -24,7 +24,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 24 +Release: 1 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -34,13 +34,7 @@ License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ Group: System Environment/Libraries URL: http://sources.redhat.com/glibc/ Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2 -%if 0%{?glibc_release_url:1} -%define glibc_libidn_srcdir %(echo %{glibcsrcdir} | sed s/glibc-/glibc-libidn-/) -Source1: %{glibc_release_url}%{glibc_libidn_srcdir}.tar.bz2 -%define glibc_release_unpack -a1 -%define glibc_release_setup mv %{glibc_libidn_srcdir} libidn -%endif -Source2: %{glibcsrcdir}-fedora.tar.bz2 +Source1: %{glibcsrcdir}-fedora.tar.bz2 Patch0: %{name}-fedora.patch Patch1: %{name}-ia64-lib64.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -68,6 +62,7 @@ BuildRequires: gcc >= 3.2 %ifarch %{multiarcharches} # Need STT_IFUNC support BuildRequires: binutils >= 2.19.51.0.10 +Conflicts: binutils < 2.19.51.0.10 # Earlier releases have broken support for IRELATIVE relocations Conflicts: prelink < 0.4.2 %else @@ -240,8 +235,7 @@ package or when debugging this package. %endif %prep -%setup -q -n %{glibcsrcdir} %{?glibc_release_unpack} -b2 -%{?glibc_release_setup} +%setup -q -n %{glibcsrcdir} -b1 %patch0 -E -p1 %ifarch ia64 %if "%{_lib}" == "lib64" @@ -320,8 +314,6 @@ GXX="g++ -m64" %endif BuildFlags="$BuildFlags -fasynchronous-unwind-tables" -# gcc is a memory hog without that (#523172). -BuildFlags="$BuildFlags -fno-var-tracking-assignments" # Add -DNDEBUG unless using a prerelease case %{version} in *.*.9[0-9]*) ;; @@ -387,7 +379,7 @@ build_nptl linuxnptl-power6 %endif cd build-%{nptl_target_cpu}-linuxnptl -$GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ +$GCC -static -L. -Os -g ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ -DNO_SIZE_OPTIMIZATION \ %ifarch i386 i486 i586 -DARCH_386 \ @@ -425,53 +417,60 @@ ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/librtkaio-*.so` $RPM_BUILD_ROOT/ %if %{buildxen} %define nosegneg_subdir_base i686 %define nosegneg_subdir i686/nosegneg +%define nosegneg_subdir_up ../.. cd build-%{nptl_target_cpu}-linuxnptl-nosegneg -SubDir=%{nosegneg_subdir} -mkdir -p $RPM_BUILD_ROOT/%{_lib}/$SubDir/ -cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libc.so.*` -cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libm.so.*` -cp -a nptl/libpthread.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/libpthread-%{version}.so -pushd $RPM_BUILD_ROOT/%{_lib}/$SubDir -ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/libpthread.so.*` -popd -cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/$librtso -cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*` +destdir=$RPM_BUILD_ROOT/%{_lib}/%{nosegneg_subdir} +mkdir -p $destdir +for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db +do + libbase=${lib#*/} + libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so) + # Only install if different from base lib + if cmp -s ${lib}.so ../build-%{nptl_target_cpu}-linuxnptl/${lib}.so; then + ln -sf %{nosegneg_subdir_up}/$libbaseso $destdir/$libbaseso + else + cp -a ${lib}.so $destdir/$libbaseso + fi + ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*) +done %ifarch %{rtkaioarches} -mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir -cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/$SubDir/$librtso +destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/%{nosegneg_subdir} +mkdir -p $destdir +librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/) +if cmp -s rtkaio/librtkaio.so ../build-%{nptl_target_cpu}-linuxnptl/rtkaio/librtkaio.so; then + ln -s %{nosegneg_subdir_up}/$librtkaioso $destdir/$librtkaioso +else + cp -a rtkaio/librtkaio.so $destdir/$librtkaioso +fi +ln -sf $librtkaioso $destdir/$librtso %endif cd .. %endif %if %{buildpower6} cd build-%{nptl_target_cpu}-linuxnptl-power6 -mkdir -p $RPM_BUILD_ROOT/%{_lib}/power6{,x} -cp -a libc.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libc-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libc.so.*` -cp -a math/libm.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libm-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libm.so.*` -cp -a nptl/libpthread.so $RPM_BUILD_ROOT/%{_lib}/power6/libpthread-%{version}.so -pushd $RPM_BUILD_ROOT/%{_lib}/power6 -ln -sf libpthread-*.so `basename $RPM_BUILD_ROOT/%{_lib}/libpthread.so.*` -popd -cp -a rt/librt.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/$librtso -cp -a nptl_db/libthread_db.so $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/libthread_db-*.so` $RPM_BUILD_ROOT/%{_lib}/power6/`basename $RPM_BUILD_ROOT/%{_lib}/libthread_db.so.*` -pushd $RPM_BUILD_ROOT/%{_lib}/power6x +destdir=$RPM_BUILD_ROOT/%{_lib}/power6 +mkdir -p ${destdir} +for lib in libc math/libm nptl/libpthread rt/librt nptl_db/libthread_db +do + libbase=${lib#*/} + libbaseso=$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}-*.so) + cp -a ${lib}.so $destdir/$libbaseso + ln -sf $libbaseso $destdir/$(basename $RPM_BUILD_ROOT/%{_lib}/${libbase}.so.*) +done +mkdir -p ${destdir}x +pushd ${destdir}x ln -sf ../power6/*.so . cp -a ../power6/*.so.* . popd %ifarch %{rtkaioarches} -mkdir -p $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6{,x} -cp -a rtkaio/librtkaio.so $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/`basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/` -ln -sf `basename $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/librtkaio-*.so` $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6/$librtso -pushd $RPM_BUILD_ROOT/%{_lib}/rtkaio/power6x +destdir=$RPM_BUILD_ROOT/%{_lib}/rtkaio/power6 +mkdir -p $destdir +librtkaioso=$(basename $RPM_BUILD_ROOT/%{_lib}/librt-*.so | sed s/librt-/librtkaio-/) +cp -a rtkaio/librtkaio.so $destdir/$librtkaioso +ln -sf $librtkaioso $destdir/$librtso +mkdir -p ${destdir}x +pushd ${destdir}x ln -sf ../power6/*.so . cp -a ../power6/*.so.* . popd @@ -682,13 +681,13 @@ touch -r timezone/northamerica $RPM_BUILD_ROOT/etc/localtime touch -r sunrpc/etc.rpc $RPM_BUILD_ROOT/etc/rpc cd fedora -$GCC -Os -static -o build-locale-archive build-locale-archive.c \ +$GCC -Os -g -static -o build-locale-archive build-locale-archive.c \ ../build-%{nptl_target_cpu}-linuxnptl/locale/locarchive.o \ ../build-%{nptl_target_cpu}-linuxnptl/locale/md5.o \ -DDATADIR=\"%{_datadir}\" -DPREFIX=\"%{_prefix}\" \ -L../build-%{nptl_target_cpu}-linuxnptl install -m 700 build-locale-archive $RPM_BUILD_ROOT/usr/sbin/build-locale-archive -$GCC -Os -static -o tzdata-update tzdata-update.c \ +$GCC -Os -g -static -o tzdata-update tzdata-update.c \ -L../build-%{nptl_target_cpu}-linuxnptl install -m 700 tzdata-update $RPM_BUILD_ROOT/usr/sbin/tzdata-update cd .. @@ -1029,6 +1028,48 @@ rm -f *.filelist* %endif %changelog +* Thu Nov 12 2009 Andreas Schwab - 2.11.90-1 +- Update from master. + +* Thu Nov 5 2009 Andreas Schwab - 2.11-2 +- Fix readahead on powerpc32. +- Fix R_PPC64_{JMP_IREL,IRELATIVE} handling. +- Fix preadv, pwritev and fallocate for -D_FILE_OFFSET_BITS=64 (#533063). + +* Mon Nov 2 2009 Andreas Schwab - 2.11-1 +- Update to 2.11 release. +- Disable multi-arch support on PowerPC again since binutils is too old. +- Fix crash in tzdata-update due to use of multi-arch symbol (#532128). + +* Fri Oct 30 2009 Andreas Schwab - 2.10.90-27 +- Update from master. + - Fix races in setXid implementation (BZ#3270). + - Implement IFUNC for PPC and enable multi-arch support. + - Implement mkstemps/mkstemps64 and mkostemps/mkostemps64 (BZ#10349). + - Fix IA-64 and S390 sigevent definitions (BZ#10446). + - Fix memory leak in NIS grp database handling (BZ#10713). + - Print timestamp in nscd debug messages (BZ#10742). + - Fix mixing IPv4 and IPv6 name server in resolv.conf. + - Fix range checks in coshl. + - Implement SSE4.2 optimized strchr and strrchr. + - Handle IFUNC symbols in dlsym (#529965). + - Misc fixes (BZ#10312, BZ#10315, BZ#10319, BZ#10391, BZ#10425, + BZ#10540, BZ#10553, BZ#10564, BZ#10609, BZ#10692, BZ#10780, + BZ#10717, BZ#10784, BZ#10789, BZ#10847 +- No longer build with -fno-var-tracking-assignments. + +* Mon Oct 19 2009 Andreas Schwab - 2.10.90-26 +- Update from master. + - Add ____longjmp_chk for sparc. +- Avoid installing the same libraries twice. + +* Mon Oct 12 2009 Andreas Schwab - 2.10.90-25 +- Update from master + - Fix descriptor leak when calling dlopen with RTLD_NOLOAD (#527409). + - Fix week-1stday in C locale. + - Check for integer overflows in formatting functions. + - Fix locale program error handling (#525363). + * Mon Sep 28 2009 Andreas Schwab - 2.10.90-24 - Update from master. - Fix missing reloc dependency (#517001). diff --git a/import.log b/import.log index 86825f6..918e0d4 100644 --- a/import.log +++ b/import.log @@ -32,3 +32,4 @@ glibc-2_10_90-21:HEAD:glibc-2.10.90-21.src.rpm:1252314102 glibc-2_10_90-22:HEAD:glibc-2.10.90-22.src.rpm:1252930886 glibc-2_10_90-23:HEAD:glibc-2.10.90-23.src.rpm:1253528881 glibc-2_10_90-24:HEAD:glibc-2.10.90-24.src.rpm:1254140947 +glibc-2_11_90-1:HEAD:glibc-2.11.90-1.src.rpm:1258048159 diff --git a/sources b/sources index 09f491e..59dc4da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -be1259fdd4fa0ec48668085c15bcd6d0 glibc-2.10-343-gf450806-fedora.tar.bz2 -65cd71dd2818a4de21a3eba59a20c180 glibc-2.10-343-gf450806.tar.bz2 +e3f0405ffd8cdb72da2ae382cdc85697 glibc-2.11-12-g24c0bf7-fedora.tar.bz2 +6b1673df005832948288a326df0a8bbe glibc-2.11-12-g24c0bf7.tar.bz2