From 1cb881ce137cd0455024025763641b40651baef6 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 19 Oct 2009 11:52:48 +0000 Subject: [PATCH] 2.10.90-26 --- .cvsignore | 4 +- glibc-fedora.patch | 266 ++++++++++++++++++++++----------------------- glibc.spec | 86 ++++++++------- import.log | 1 + sources | 4 +- 5 files changed, 187 insertions(+), 174 deletions(-) diff --git a/.cvsignore b/.cvsignore index a1b928c..f6247ce 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.10-355-g1abedcd-fedora.tar.bz2 -glibc-2.10-355-g1abedcd.tar.bz2 +glibc-2.10-357-ga0902db-fedora.tar.bz2 +glibc-2.10-357-ga0902db.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index ae238bc..f018f89 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-2.10-355-g1abedcd/ChangeLog -+++ glibc-2.10.90-24/ChangeLog -@@ -34,17 +34,6 @@ +--- glibc-2.10-357-ga0902db/ChangeLog ++++ glibc-2.10.90-26/ChangeLog +@@ -44,17 +44,6 @@ * locale/C-time.c: Revert week-1stday back to 19971130 and set first_weekday to 1 and first_workday to 2. @@ -18,7 +18,7 @@ 2009-09-28 Andreas Schwab * stdio-common/printf_fp.c: Check for and avoid integer overflows. -@@ -702,6 +691,11 @@ +@@ -712,6 +701,11 @@ * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -30,7 +30,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -967,6 +961,11 @@ +@@ -977,6 +971,11 @@ out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -42,7 +42,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -9660,6 +9659,10 @@ +@@ -9670,6 +9669,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -53,7 +53,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -10917,6 +10920,15 @@ +@@ -10927,6 +10930,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -69,8 +69,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.10-355-g1abedcd/ChangeLog.15 -+++ glibc-2.10.90-24/ChangeLog.15 +--- glibc-2.10-357-ga0902db/ChangeLog.15 ++++ glibc-2.10.90-26/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -136,8 +136,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.10-355-g1abedcd/ChangeLog.16 -+++ glibc-2.10.90-24/ChangeLog.16 +--- glibc-2.10-357-ga0902db/ChangeLog.16 ++++ glibc-2.10.90-26/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -191,8 +191,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.10-355-g1abedcd/Makeconfig -+++ glibc-2.10.90-24/Makeconfig +--- glibc-2.10-357-ga0902db/Makeconfig ++++ glibc-2.10.90-26/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -209,8 +209,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.10-355-g1abedcd/csu/Makefile -+++ glibc-2.10.90-24/csu/Makefile +--- glibc-2.10-357-ga0902db/csu/Makefile ++++ glibc-2.10.90-26/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -221,8 +221,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.10-355-g1abedcd/csu/elf-init.c -+++ glibc-2.10.90-24/csu/elf-init.c +--- glibc-2.10-357-ga0902db/csu/elf-init.c ++++ glibc-2.10.90-26/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; @@ -247,8 +247,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.10-355-g1abedcd/debug/tst-chk1.c -+++ glibc-2.10.90-24/debug/tst-chk1.c +--- glibc-2.10-357-ga0902db/debug/tst-chk1.c ++++ glibc-2.10.90-26/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -277,8 +277,8 @@ # define O 0 # else # define O 1 ---- glibc-2.10-355-g1abedcd/elf/ldconfig.c -+++ glibc-2.10.90-24/elf/ldconfig.c +--- glibc-2.10-357-ga0902db/elf/ldconfig.c ++++ glibc-2.10.90-26/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -360,8 +360,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.10-355-g1abedcd/elf/tst-stackguard1.c -+++ glibc-2.10.90-24/elf/tst-stackguard1.c +--- glibc-2.10-357-ga0902db/elf/tst-stackguard1.c ++++ glibc-2.10.90-26/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -386,16 +386,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10-355-g1abedcd/include/bits/stdlib-ldbl.h -+++ glibc-2.10.90-24/include/bits/stdlib-ldbl.h +--- glibc-2.10-357-ga0902db/include/bits/stdlib-ldbl.h ++++ glibc-2.10.90-26/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10-355-g1abedcd/include/bits/wchar-ldbl.h -+++ glibc-2.10.90-24/include/bits/wchar-ldbl.h +--- glibc-2.10-357-ga0902db/include/bits/wchar-ldbl.h ++++ glibc-2.10.90-26/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10-355-g1abedcd/include/features.h -+++ glibc-2.10.90-24/include/features.h +--- glibc-2.10-357-ga0902db/include/features.h ++++ glibc-2.10.90-26/include/features.h @@ -299,8 +299,13 @@ #endif @@ -412,8 +412,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.10-355-g1abedcd/intl/locale.alias -+++ glibc-2.10.90-24/intl/locale.alias +--- glibc-2.10-357-ga0902db/intl/locale.alias ++++ glibc-2.10.90-26/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -423,8 +423,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.10-355-g1abedcd/libio/stdio.h -+++ glibc-2.10.90-24/libio/stdio.h +--- glibc-2.10-357-ga0902db/libio/stdio.h ++++ glibc-2.10.90-26/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. */ @@ -438,8 +438,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.10-355-g1abedcd/locale/iso-4217.def -+++ glibc-2.10.90-24/locale/iso-4217.def +--- glibc-2.10-357-ga0902db/locale/iso-4217.def ++++ glibc-2.10.90-26/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -531,8 +531,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.10-355-g1abedcd/locale/programs/locarchive.c -+++ glibc-2.10.90-24/locale/programs/locarchive.c +--- glibc-2.10-357-ga0902db/locale/programs/locarchive.c ++++ glibc-2.10.90-26/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, @@ -564,8 +564,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.10-355-g1abedcd/localedata/Makefile -+++ glibc-2.10.90-24/localedata/Makefile +--- glibc-2.10-357-ga0902db/localedata/Makefile ++++ glibc-2.10.90-26/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -574,8 +574,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.10-355-g1abedcd/localedata/SUPPORTED -+++ glibc-2.10.90-24/localedata/SUPPORTED +--- glibc-2.10-357-ga0902db/localedata/SUPPORTED ++++ glibc-2.10.90-26/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -617,8 +617,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.10-355-g1abedcd/localedata/locales/cy_GB -+++ glibc-2.10.90-24/localedata/locales/cy_GB +--- glibc-2.10-357-ga0902db/localedata/locales/cy_GB ++++ glibc-2.10.90-26/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -633,8 +633,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.10-355-g1abedcd/localedata/locales/en_GB -+++ glibc-2.10.90-24/localedata/locales/en_GB +--- glibc-2.10-357-ga0902db/localedata/locales/en_GB ++++ glibc-2.10.90-26/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -646,8 +646,8 @@ date_fmt "/ / " ---- glibc-2.10-355-g1abedcd/localedata/locales/no_NO -+++ glibc-2.10.90-24/localedata/locales/no_NO +--- glibc-2.10-357-ga0902db/localedata/locales/no_NO ++++ glibc-2.10.90-26/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -718,8 +718,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.10-355-g1abedcd/localedata/locales/zh_TW -+++ glibc-2.10.90-24/localedata/locales/zh_TW +--- glibc-2.10-357-ga0902db/localedata/locales/zh_TW ++++ glibc-2.10.90-26/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -747,8 +747,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.10-355-g1abedcd/malloc/mcheck.c -+++ glibc-2.10.90-24/malloc/mcheck.c +--- glibc-2.10-357-ga0902db/malloc/mcheck.c ++++ glibc-2.10.90-26/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -824,8 +824,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.10-355-g1abedcd/manual/libc.texinfo -+++ glibc-2.10.90-24/manual/libc.texinfo +--- glibc-2.10-357-ga0902db/manual/libc.texinfo ++++ glibc-2.10.90-26/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -835,8 +835,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.10-355-g1abedcd/misc/sys/cdefs.h -+++ glibc-2.10.90-24/misc/sys/cdefs.h +--- glibc-2.10-357-ga0902db/misc/sys/cdefs.h ++++ glibc-2.10.90-26/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) @@ -880,16 +880,16 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.10-355-g1abedcd/nis/nss -+++ glibc-2.10.90-24/nis/nss +--- glibc-2.10-357-ga0902db/nis/nss ++++ glibc-2.10.90-26/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-355-g1abedcd/nptl/ChangeLog -+++ glibc-2.10.90-24/nptl/ChangeLog +--- glibc-2.10-357-ga0902db/nptl/ChangeLog ++++ glibc-2.10.90-26/nptl/ChangeLog @@ -3717,6 +3717,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -930,8 +930,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.10-355-g1abedcd/nptl/Makefile -+++ glibc-2.10.90-24/nptl/Makefile +--- glibc-2.10-357-ga0902db/nptl/Makefile ++++ glibc-2.10.90-26/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -964,8 +964,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.10-355-g1abedcd/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.10.90-24/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.10-357-ga0902db/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.10.90-26/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 @@ -974,8 +974,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.10-355-g1abedcd/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.10.90-24/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.10-357-ga0902db/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.10.90-26/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -983,8 +983,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.10-355-g1abedcd/nptl/tst-stackguard1.c -+++ glibc-2.10.90-24/nptl/tst-stackguard1.c +--- glibc-2.10-357-ga0902db/nptl/tst-stackguard1.c ++++ glibc-2.10.90-26/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1009,8 +1009,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10-355-g1abedcd/nscd/nscd.conf -+++ glibc-2.10.90-24/nscd/nscd.conf +--- glibc-2.10-357-ga0902db/nscd/nscd.conf ++++ glibc-2.10.90-26/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1020,8 +1020,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.10-355-g1abedcd/nscd/nscd.init -+++ glibc-2.10.90-24/nscd/nscd.init +--- glibc-2.10-357-ga0902db/nscd/nscd.init ++++ glibc-2.10.90-26/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1093,8 +1093,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.10-355-g1abedcd/posix/Makefile -+++ glibc-2.10.90-24/posix/Makefile +--- glibc-2.10-357-ga0902db/posix/Makefile ++++ glibc-2.10.90-26/posix/Makefile @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1115,8 +1115,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.10-355-g1abedcd/posix/getconf.speclist.h -+++ glibc-2.10.90-24/posix/getconf.speclist.h +--- glibc-2.10-357-ga0902db/posix/getconf.speclist.h ++++ glibc-2.10.90-26/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1157,8 +1157,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.10-355-g1abedcd/streams/Makefile -+++ glibc-2.10.90-24/streams/Makefile +--- glibc-2.10-357-ga0902db/streams/Makefile ++++ glibc-2.10.90-26/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1168,8 +1168,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.10-355-g1abedcd/sysdeps/generic/dl-cache.h -+++ glibc-2.10.90-24/sysdeps/generic/dl-cache.h +--- glibc-2.10-357-ga0902db/sysdeps/generic/dl-cache.h ++++ glibc-2.10.90-26/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1185,8 +1185,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-355-g1abedcd/sysdeps/i386/Makefile -+++ glibc-2.10.90-24/sysdeps/i386/Makefile +--- glibc-2.10-357-ga0902db/sysdeps/i386/Makefile ++++ glibc-2.10.90-26/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1211,8 +1211,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10-355-g1abedcd/sysdeps/ia64/Makefile -+++ glibc-2.10.90-24/sysdeps/ia64/Makefile +--- glibc-2.10-357-ga0902db/sysdeps/ia64/Makefile ++++ glibc-2.10.90-26/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1224,8 +1224,8 @@ endif endif ---- glibc-2.10-355-g1abedcd/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.10.90-24/sysdeps/ia64/ia64libgcc.S +--- glibc-2.10-357-ga0902db/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.10.90-26/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1577,8 +1577,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.10-355-g1abedcd/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.10.90-24/sysdeps/ia64/libgcc-compat.c +--- glibc-2.10-357-ga0902db/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.10.90-26/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1664,8 +1664,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.10-355-g1abedcd/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.10.90-24/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.10-357-ga0902db/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.10.90-26/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1674,8 +1674,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10-355-g1abedcd/sysdeps/unix/nice.c -+++ glibc-2.10.90-24/sysdeps/unix/nice.c +--- glibc-2.10-357-ga0902db/sysdeps/unix/nice.c ++++ glibc-2.10.90-26/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1690,8 +1690,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1707,8 +1707,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1756,8 +1756,8 @@ } else #endif ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1800,8 +1800,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/i386/bits/fcntl.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/i386/bits/fcntl.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/i386/bits/fcntl.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/i386/bits/fcntl.h @@ -85,15 +85,13 @@ #define F_SETLKW64 14 /* Set record locking info (blocking). */ @@ -1820,8 +1820,8 @@ #endif #ifdef __USE_GNU ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/i386/clone.S -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/i386/clone.S ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1840,8 +1840,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.10.90-26/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. @@ -1902,8 +1902,8 @@ + } while (0) + +#include_next ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h @@ -81,15 +81,13 @@ #define F_SETLKW64 7 /* Set record locking info (blocking). */ @@ -1922,8 +1922,8 @@ #endif #ifdef __USE_GNU ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -1956,29 +1956,29 @@ + } while (0) + #include_next ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.10.90-26/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-355-g1abedcd/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2004,8 +2004,8 @@ struct netlink_res { ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2015,8 +2015,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h @@ -85,15 +85,13 @@ #define F_SETLKW64 14 /* Set record locking info (blocking). */ @@ -2035,8 +2035,8 @@ #endif #ifdef __USE_GNU ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/s390/bits/fcntl.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/s390/bits/fcntl.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/s390/bits/fcntl.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/s390/bits/fcntl.h @@ -100,15 +100,13 @@ #endif @@ -2055,8 +2055,8 @@ #endif #ifdef __USE_GNU ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/sh/bits/fcntl.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/sh/bits/fcntl.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/sh/bits/fcntl.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/sh/bits/fcntl.h @@ -85,15 +85,13 @@ #define F_SETLKW64 14 /* Set record locking info (blocking). */ @@ -2075,8 +2075,8 @@ #endif #ifdef __USE_GNU ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h @@ -83,8 +83,8 @@ #define F_GETFL 3 /* Get file status flags. */ #define F_SETFL 4 /* Set file status flags. */ @@ -2097,8 +2097,8 @@ #endif #ifdef __USE_GNU ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2144,8 +2144,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h @@ -99,15 +99,13 @@ #endif @@ -2164,8 +2164,8 @@ #endif #ifdef __USE_GNU ---- glibc-2.10-355-g1abedcd/sysdeps/unix/sysv/linux/x86_64/clone.S -+++ glibc-2.10.90-24/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-2.10-357-ga0902db/sysdeps/unix/sysv/linux/x86_64/clone.S ++++ glibc-2.10.90-26/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2184,8 +2184,8 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.10-355-g1abedcd/timezone/zic.c -+++ glibc-2.10.90-24/timezone/zic.c +--- glibc-2.10-357-ga0902db/timezone/zic.c ++++ glibc-2.10.90-26/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 348f0e2..95c6198 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.10-355-g1abedcd +%define glibcsrcdir glibc-2.10-357-ga0902db %define glibcversion 2.10.90 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -24,7 +24,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 25 +Release: 26 # 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 @@ -426,53 +426,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 @@ -1030,6 +1037,11 @@ rm -f *.filelist* %endif %changelog +* 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). diff --git a/import.log b/import.log index e6e392d..0602324 100644 --- a/import.log +++ b/import.log @@ -33,3 +33,4 @@ 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_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 diff --git a/sources b/sources index b7ce41d..118ab65 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4bd27aa3e6ca4bfd87dfb4f0e31c781d glibc-2.10-355-g1abedcd-fedora.tar.bz2 -8c609449db04e3275e5652cfc7b2c0ec glibc-2.10-355-g1abedcd.tar.bz2 +e703ae2fd4a7b6157f61fcd53327d171 glibc-2.10-357-ga0902db-fedora.tar.bz2 +8ddcba36d261fb0c5b8487e79ba07708 glibc-2.10-357-ga0902db.tar.bz2