From b5e3485a74172c06e380a73e78aeba4abd218559 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Nov 02 2009 15:42:30 +0000 Subject: 2.11-1 --- diff --git a/.cvsignore b/.cvsignore index ede51c8..6935a89 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.10-405-g3a83202-fedora.tar.bz2 -glibc-2.10-405-g3a83202.tar.bz2 +glibc-2.11-fedora.tar.bz2 +glibc-2.11.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index fa0329e..4950f8b 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-2.10-405-g3a83202/ChangeLog -+++ glibc-2.10.90-27/ChangeLog -@@ -195,22 +195,6 @@ d2009-10-30 Ulrich Drepper +--- glibc-2.11/ChangeLog ++++ glibc-2.11-1/ChangeLog +@@ -209,22 +209,6 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/netinet/ip.h: Define IPTOS_ENC* and IPTOS_DSCP* macros. Patch by Philip Prindeville . @@ -23,7 +23,7 @@ [BZ #10847] * sysdeps/gnu/getutmp.c: Allow compatibility code to play around with getutmpx symbol. -@@ -298,17 +282,6 @@ d2009-10-30 Ulrich Drepper +@@ -312,17 +296,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. @@ -41,7 +41,7 @@ 2009-09-28 Andreas Schwab * stdio-common/printf_fp.c: Check for and avoid integer overflows. -@@ -966,6 +939,11 @@ d2009-10-30 Ulrich Drepper +@@ -980,6 +953,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. @@ -53,7 +53,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -1231,6 +1209,11 @@ d2009-10-30 Ulrich Drepper +@@ -1245,6 +1223,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -65,7 +65,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -9924,6 +9907,10 @@ d2009-10-30 Ulrich Drepper +@@ -9938,6 +9921,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -76,7 +76,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -11181,6 +11168,15 @@ d2009-10-30 Ulrich Drepper +@@ -11195,6 +11182,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -92,8 +92,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.10-405-g3a83202/ChangeLog.15 -+++ glibc-2.10.90-27/ChangeLog.15 +--- glibc-2.11/ChangeLog.15 ++++ glibc-2.11-1/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -159,8 +159,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.10-405-g3a83202/ChangeLog.16 -+++ glibc-2.10.90-27/ChangeLog.16 +--- glibc-2.11/ChangeLog.16 ++++ glibc-2.11-1/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -214,8 +214,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.10-405-g3a83202/Makeconfig -+++ glibc-2.10.90-27/Makeconfig +--- glibc-2.11/Makeconfig ++++ glibc-2.11-1/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -232,8 +232,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.10-405-g3a83202/csu/Makefile -+++ glibc-2.10.90-27/csu/Makefile +--- glibc-2.11/csu/Makefile ++++ glibc-2.11-1/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -244,8 +244,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.10-405-g3a83202/csu/elf-init.c -+++ glibc-2.10.90-27/csu/elf-init.c +--- glibc-2.11/csu/elf-init.c ++++ glibc-2.11-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; @@ -270,8 +270,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.10-405-g3a83202/debug/tst-chk1.c -+++ glibc-2.10.90-27/debug/tst-chk1.c +--- glibc-2.11/debug/tst-chk1.c ++++ glibc-2.11-1/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -300,8 +300,8 @@ # define O 0 # else # define O 1 ---- glibc-2.10-405-g3a83202/elf/ldconfig.c -+++ glibc-2.10.90-27/elf/ldconfig.c +--- glibc-2.11/elf/ldconfig.c ++++ glibc-2.11-1/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -383,8 +383,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.10-405-g3a83202/elf/tst-stackguard1.c -+++ glibc-2.10.90-27/elf/tst-stackguard1.c +--- glibc-2.11/elf/tst-stackguard1.c ++++ glibc-2.11-1/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -409,16 +409,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10-405-g3a83202/include/bits/stdlib-ldbl.h -+++ glibc-2.10.90-27/include/bits/stdlib-ldbl.h +--- glibc-2.11/include/bits/stdlib-ldbl.h ++++ glibc-2.11-1/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10-405-g3a83202/include/bits/wchar-ldbl.h -+++ glibc-2.10.90-27/include/bits/wchar-ldbl.h +--- glibc-2.11/include/bits/wchar-ldbl.h ++++ glibc-2.11-1/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10-405-g3a83202/include/features.h -+++ glibc-2.10.90-27/include/features.h +--- glibc-2.11/include/features.h ++++ glibc-2.11-1/include/features.h @@ -299,8 +299,13 @@ #endif @@ -435,8 +435,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.10-405-g3a83202/intl/locale.alias -+++ glibc-2.10.90-27/intl/locale.alias +--- glibc-2.11/intl/locale.alias ++++ glibc-2.11-1/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -446,8 +446,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.10-405-g3a83202/libio/stdio.h -+++ glibc-2.10.90-27/libio/stdio.h +--- glibc-2.11/libio/stdio.h ++++ glibc-2.11-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. */ @@ -461,8 +461,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.10-405-g3a83202/locale/iso-4217.def -+++ glibc-2.10.90-27/locale/iso-4217.def +--- glibc-2.11/locale/iso-4217.def ++++ glibc-2.11-1/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -554,8 +554,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.10-405-g3a83202/locale/programs/locarchive.c -+++ glibc-2.10.90-27/locale/programs/locarchive.c +--- glibc-2.11/locale/programs/locarchive.c ++++ glibc-2.11-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, @@ -587,8 +587,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.10-405-g3a83202/localedata/Makefile -+++ glibc-2.10.90-27/localedata/Makefile +--- glibc-2.11/localedata/Makefile ++++ glibc-2.11-1/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -597,8 +597,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.10-405-g3a83202/localedata/SUPPORTED -+++ glibc-2.10.90-27/localedata/SUPPORTED +--- glibc-2.11/localedata/SUPPORTED ++++ glibc-2.11-1/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -623,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 \ @@ -632,7 +632,7 @@ nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ -@@ -363,6 +368,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 \ @@ -640,8 +640,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.10-405-g3a83202/localedata/locales/cy_GB -+++ glibc-2.10.90-27/localedata/locales/cy_GB +--- glibc-2.11/localedata/locales/cy_GB ++++ glibc-2.11-1/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -656,8 +656,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.10-405-g3a83202/localedata/locales/en_GB -+++ glibc-2.10.90-27/localedata/locales/en_GB +--- glibc-2.11/localedata/locales/en_GB ++++ glibc-2.11-1/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -669,8 +669,8 @@ date_fmt "/ / " ---- glibc-2.10-405-g3a83202/localedata/locales/no_NO -+++ glibc-2.10.90-27/localedata/locales/no_NO +--- glibc-2.11/localedata/locales/no_NO ++++ glibc-2.11-1/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -741,8 +741,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.10-405-g3a83202/localedata/locales/zh_TW -+++ glibc-2.10.90-27/localedata/locales/zh_TW +--- glibc-2.11/localedata/locales/zh_TW ++++ glibc-2.11-1/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -770,8 +770,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.10-405-g3a83202/malloc/mcheck.c -+++ glibc-2.10.90-27/malloc/mcheck.c +--- glibc-2.11/malloc/mcheck.c ++++ glibc-2.11-1/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -847,8 +847,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.10-405-g3a83202/manual/libc.texinfo -+++ glibc-2.10.90-27/manual/libc.texinfo +--- glibc-2.11/manual/libc.texinfo ++++ glibc-2.11-1/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -858,8 +858,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.10-405-g3a83202/misc/sys/cdefs.h -+++ glibc-2.10.90-27/misc/sys/cdefs.h +--- glibc-2.11/misc/sys/cdefs.h ++++ glibc-2.11-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) @@ -903,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-405-g3a83202/nis/nss -+++ glibc-2.10.90-27/nis/nss +--- glibc-2.11/nis/nss ++++ glibc-2.11-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-405-g3a83202/nptl/ChangeLog -+++ glibc-2.10.90-27/nptl/ChangeLog -@@ -3725,6 +3725,15 @@ +--- glibc-2.11/nptl/ChangeLog ++++ glibc-2.11-1/nptl/ChangeLog +@@ -3727,6 +3727,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -929,7 +929,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4461,6 +4470,11 @@ +@@ -4463,6 +4472,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -941,7 +941,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6535,6 +6549,11 @@ +@@ -6537,6 +6551,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -953,8 +953,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.10-405-g3a83202/nptl/Makefile -+++ glibc-2.10.90-27/nptl/Makefile +--- glibc-2.11/nptl/Makefile ++++ glibc-2.11-1/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -987,8 +987,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.10-405-g3a83202/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.10.90-27/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11-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 @@ -997,8 +997,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.10-405-g3a83202/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.10.90-27/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1006,8 +1006,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.10-405-g3a83202/nptl/tst-stackguard1.c -+++ glibc-2.10.90-27/nptl/tst-stackguard1.c +--- glibc-2.11/nptl/tst-stackguard1.c ++++ glibc-2.11-1/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1032,8 +1032,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10-405-g3a83202/nscd/nscd.conf -+++ glibc-2.10.90-27/nscd/nscd.conf +--- glibc-2.11/nscd/nscd.conf ++++ glibc-2.11-1/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1043,8 +1043,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.10-405-g3a83202/nscd/nscd.init -+++ glibc-2.10.90-27/nscd/nscd.init +--- glibc-2.11/nscd/nscd.init ++++ glibc-2.11-1/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1116,8 +1116,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.10-405-g3a83202/posix/Makefile -+++ glibc-2.10.90-27/posix/Makefile +--- glibc-2.11/posix/Makefile ++++ glibc-2.11-1/posix/Makefile @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1138,8 +1138,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.10-405-g3a83202/posix/getconf.speclist.h -+++ glibc-2.10.90-27/posix/getconf.speclist.h +--- glibc-2.11/posix/getconf.speclist.h ++++ glibc-2.11-1/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1180,8 +1180,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.10-405-g3a83202/streams/Makefile -+++ glibc-2.10.90-27/streams/Makefile +--- glibc-2.11/streams/Makefile ++++ glibc-2.11-1/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1191,8 +1191,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.10-405-g3a83202/sysdeps/generic/dl-cache.h -+++ glibc-2.10.90-27/sysdeps/generic/dl-cache.h +--- glibc-2.11/sysdeps/generic/dl-cache.h ++++ glibc-2.11-1/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1208,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-405-g3a83202/sysdeps/i386/Makefile -+++ glibc-2.10.90-27/sysdeps/i386/Makefile +--- glibc-2.11/sysdeps/i386/Makefile ++++ glibc-2.11-1/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1234,8 +1234,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10-405-g3a83202/sysdeps/ia64/Makefile -+++ glibc-2.10.90-27/sysdeps/ia64/Makefile +--- glibc-2.11/sysdeps/ia64/Makefile ++++ glibc-2.11-1/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1247,8 +1247,8 @@ endif endif ---- glibc-2.10-405-g3a83202/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.10.90-27/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11-1/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1600,8 +1600,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.10-405-g3a83202/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.10.90-27/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11-1/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1687,8 +1687,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.10-405-g3a83202/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.10.90-27/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11-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 @@ -1697,8 +1697,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10-405-g3a83202/sysdeps/unix/nice.c -+++ glibc-2.10.90-27/sysdeps/unix/nice.c +--- glibc-2.11/sysdeps/unix/nice.c ++++ glibc-2.11-1/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1713,8 +1713,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1730,8 +1730,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11-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. */ @@ -1779,8 +1779,8 @@ } else #endif ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/fcntl.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/fcntl.c +--- glibc-2.11/sysdeps/unix/sysv/linux/fcntl.c ++++ glibc-2.11-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. @@ -1851,8 +1851,8 @@ LIBC_CANCEL_RESET (oldtype); ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1895,8 +1895,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/i386/bits/fcntl.h ++++ glibc-2.11-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 @@ -1946,8 +1946,8 @@ /* 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.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/clone.S -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-2.11/sysdeps/unix/sysv/linux/i386/clone.S ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1966,8 +1966,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11-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. @@ -2028,8 +2028,8 @@ + } while (0) + +#include_next ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/i386/fcntl.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/i386/fcntl.c +--- glibc-2.11/sysdeps/unix/sysv/linux/i386/fcntl.c ++++ glibc-2.11-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. @@ -2077,8 +2077,8 @@ default: return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); } ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h ++++ glibc-2.11-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. @@ -2128,8 +2128,8 @@ /* Define some more compatibility macros to be backward compatible with BSD systems which did not managed to hide these kernel macros. */ ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2162,29 +2162,29 @@ + } while (0) + #include_next ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11-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-405-g3a83202/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/kernel-features.h @@ -542,8 +542,3 @@ # define __ASSUME_PREADV 1 # define __ASSUME_PWRITEV 1 @@ -2194,8 +2194,8 @@ -#if __LINUX_KERNEL_VERSION >= 0x020620 -# define __ASSUME_F_GETOWN_EX 1 -#endif ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2221,8 +2221,8 @@ struct netlink_res { ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2232,8 +2232,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h ++++ glibc-2.11-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 @@ -2283,8 +2283,8 @@ /* 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.10-405-g3a83202/sysdeps/unix/sysv/linux/s390/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/s390/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/s390/bits/fcntl.h ++++ glibc-2.11-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. @@ -2334,8 +2334,8 @@ /* 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.10-405-g3a83202/sysdeps/unix/sysv/linux/sh/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/sh/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/sh/bits/fcntl.h ++++ glibc-2.11-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 @@ -2385,8 +2385,8 @@ /* 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.10-405-g3a83202/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h ++++ glibc-2.11-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 @@ -2438,8 +2438,8 @@ /* 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.10-405-g3a83202/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2485,8 +2485,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.10-405-g3a83202/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h +--- glibc-2.11/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h ++++ glibc-2.11-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. @@ -2536,8 +2536,8 @@ /* 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.10-405-g3a83202/sysdeps/unix/sysv/linux/x86_64/clone.S -+++ glibc-2.10.90-27/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-2.11/sysdeps/unix/sysv/linux/x86_64/clone.S ++++ glibc-2.11-1/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2556,8 +2556,8 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.10-405-g3a83202/timezone/zic.c -+++ glibc-2.10.90-27/timezone/zic.c +--- glibc-2.11/timezone/zic.c ++++ glibc-2.11-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 721a282..11d801e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,5 +1,6 @@ -%define glibcsrcdir glibc-2.10-405-g3a83202 -%define glibcversion 2.10.90 +%define glibcsrcdir glibc-2.11 +%define glibc_release_url ftp://sources.redhat.com/pub/glibc/releases/ +%define glibcversion 2.11 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon sparcv9v sparc64v alphaev6 @@ -18,13 +19,13 @@ %endif %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x %define debuginfocommonarches alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v -%define multiarcharches %{ix86} x86_64 ppc ppc64 +%define multiarcharches %{ix86} x86_64 %define _unpackaged_files_terminate_build 0 Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 27 +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 +35,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) @@ -241,8 +236,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" @@ -386,7 +380,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 \ @@ -688,13 +682,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 .. @@ -1035,6 +1029,11 @@ rm -f *.filelist* %endif %changelog +* 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). diff --git a/import.log b/import.log index 0e008d6..3645248 100644 --- a/import.log +++ b/import.log @@ -35,3 +35,4 @@ glibc-2_10_90-24:HEAD:glibc-2.10.90-24.src.rpm:1254140947 glibc-2_10_90-25:F-12:glibc-2.10.90-25.src.rpm:1255355210 glibc-2_10_90-26:F-12:glibc-2.10.90-26.src.rpm:1255953059 glibc-2_10_90-27:F-12:glibc-2.10.90-27.src.rpm:1256915929 +glibc-2_11-1:F-12:glibc-2.11-1.src.rpm:1257175795 diff --git a/sources b/sources index a837946..40d3d61 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -86f1d478fff63d6fb0953694fc1ed53d glibc-2.10-405-g3a83202-fedora.tar.bz2 -204a3cdd20ead34cddacad6748af1d04 glibc-2.10-405-g3a83202.tar.bz2 +dfc5c4eb74f1f20003d4523269656699 glibc-2.11-fedora.tar.bz2 +2c990f97e9ff9fb1c3c85fe826e991b9 glibc-2.11.tar.bz2