From b6e16aef73808e6bb9b893442664e68a8c014daa Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Fri, 20 Nov 2009 11:04:12 +0000 Subject: [PATCH] 2.10.2-1 --- .cvsignore | 4 +- glibc-fedora.patch | 234 ++++++++++++++++++++++----------------------- glibc.spec | 30 +++--- import.log | 1 + sources | 4 +- 5 files changed, 140 insertions(+), 133 deletions(-) diff --git a/.cvsignore b/.cvsignore index d1512f6..3531665 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.10.1-69-gaa152ec-fedora.tar.bz2 -glibc-2.10.1-69-gaa152ec.tar.bz2 +glibc-2.10.2-fedora.tar.bz2 +glibc-2.10.2.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 45f52b4..1c13148 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-2.10.1-69-gaa152ec/ChangeLog -+++ glibc-2.10.1-4/ChangeLog -@@ -8066,6 +8066,13 @@ +--- glibc-2.10.2/ChangeLog ++++ glibc-2.10.2-1/ChangeLog +@@ -8178,6 +8178,13 @@ * include/sys/cdefs.h: Redefine __nonnull so that test for incorrect parameters in the libc code itself are not omitted. @@ -14,7 +14,7 @@ 2007-05-09 Jakub Jelinek * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow -@@ -8361,6 +8368,10 @@ +@@ -8473,6 +8480,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -25,7 +25,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -9618,6 +9629,15 @@ +@@ -9730,6 +9741,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -41,8 +41,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.10.1-69-gaa152ec/ChangeLog.15 -+++ glibc-2.10.1-4/ChangeLog.15 +--- glibc-2.10.2/ChangeLog.15 ++++ glibc-2.10.2-1/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -108,8 +108,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.10.1-69-gaa152ec/ChangeLog.16 -+++ glibc-2.10.1-4/ChangeLog.16 +--- glibc-2.10.2/ChangeLog.16 ++++ glibc-2.10.2-1/ChangeLog.16 @@ -171,6 +171,11 @@ [BZ #2611] * stdio-common/renameat.c (renameat): Fix typo. @@ -281,8 +281,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-2.10.1-69-gaa152ec/csu/Makefile -+++ glibc-2.10.1-4/csu/Makefile +--- glibc-2.10.2/csu/Makefile ++++ glibc-2.10.2-1/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -293,8 +293,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.10.1-69-gaa152ec/csu/elf-init.c -+++ glibc-2.10.1-4/csu/elf-init.c +--- glibc-2.10.2/csu/elf-init.c ++++ glibc-2.10.2-1/csu/elf-init.c @@ -49,6 +49,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; @@ -319,8 +319,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.10.1-69-gaa152ec/debug/tst-chk1.c -+++ glibc-2.10.1-4/debug/tst-chk1.c +--- glibc-2.10.2/debug/tst-chk1.c ++++ glibc-2.10.2-1/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -349,8 +349,8 @@ # define O 0 # else # define O 1 ---- glibc-2.10.1-69-gaa152ec/elf/ldconfig.c -+++ glibc-2.10.1-4/elf/ldconfig.c +--- glibc-2.10.2/elf/ldconfig.c ++++ glibc-2.10.2-1/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -432,8 +432,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.10.1-69-gaa152ec/elf/tst-stackguard1.c -+++ glibc-2.10.1-4/elf/tst-stackguard1.c +--- glibc-2.10.2/elf/tst-stackguard1.c ++++ glibc-2.10.2-1/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -458,16 +458,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10.1-69-gaa152ec/include/bits/stdlib-ldbl.h -+++ glibc-2.10.1-4/include/bits/stdlib-ldbl.h +--- glibc-2.10.2/include/bits/stdlib-ldbl.h ++++ glibc-2.10.2-1/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10.1-69-gaa152ec/include/bits/wchar-ldbl.h -+++ glibc-2.10.1-4/include/bits/wchar-ldbl.h +--- glibc-2.10.2/include/bits/wchar-ldbl.h ++++ glibc-2.10.2-1/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.10.1-69-gaa152ec/include/features.h -+++ glibc-2.10.1-4/include/features.h +--- glibc-2.10.2/include/features.h ++++ glibc-2.10.2-1/include/features.h @@ -299,8 +299,13 @@ #endif @@ -484,8 +484,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.10.1-69-gaa152ec/intl/locale.alias -+++ glibc-2.10.1-4/intl/locale.alias +--- glibc-2.10.2/intl/locale.alias ++++ glibc-2.10.2-1/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -495,8 +495,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.10.1-69-gaa152ec/libio/stdio.h -+++ glibc-2.10.1-4/libio/stdio.h +--- glibc-2.10.2/libio/stdio.h ++++ glibc-2.10.2-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. */ @@ -510,8 +510,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.10.1-69-gaa152ec/locale/iso-4217.def -+++ glibc-2.10.1-4/locale/iso-4217.def +--- glibc-2.10.2/locale/iso-4217.def ++++ glibc-2.10.2-1/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -603,8 +603,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.10.1-69-gaa152ec/locale/programs/locarchive.c -+++ glibc-2.10.1-4/locale/programs/locarchive.c +--- glibc-2.10.2/locale/programs/locarchive.c ++++ glibc-2.10.2-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, @@ -636,8 +636,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.10.1-69-gaa152ec/localedata/Makefile -+++ glibc-2.10.1-4/localedata/Makefile +--- glibc-2.10.2/localedata/Makefile ++++ glibc-2.10.2-1/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -646,8 +646,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.10.1-69-gaa152ec/localedata/SUPPORTED -+++ glibc-2.10.1-4/localedata/SUPPORTED +--- glibc-2.10.2/localedata/SUPPORTED ++++ glibc-2.10.2-1/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -689,8 +689,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.10.1-69-gaa152ec/localedata/locales/cy_GB -+++ glibc-2.10.1-4/localedata/locales/cy_GB +--- glibc-2.10.2/localedata/locales/cy_GB ++++ glibc-2.10.2-1/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -705,8 +705,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.10.1-69-gaa152ec/localedata/locales/en_GB -+++ glibc-2.10.1-4/localedata/locales/en_GB +--- glibc-2.10.2/localedata/locales/en_GB ++++ glibc-2.10.2-1/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -718,8 +718,8 @@ date_fmt "/ / " ---- glibc-2.10.1-69-gaa152ec/localedata/locales/no_NO -+++ glibc-2.10.1-4/localedata/locales/no_NO +--- glibc-2.10.2/localedata/locales/no_NO ++++ glibc-2.10.2-1/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -790,8 +790,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.10.1-69-gaa152ec/localedata/locales/zh_TW -+++ glibc-2.10.1-4/localedata/locales/zh_TW +--- glibc-2.10.2/localedata/locales/zh_TW ++++ glibc-2.10.2-1/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -819,8 +819,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.10.1-69-gaa152ec/malloc/mcheck.c -+++ glibc-2.10.1-4/malloc/mcheck.c +--- glibc-2.10.2/malloc/mcheck.c ++++ glibc-2.10.2-1/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -896,8 +896,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.10.1-69-gaa152ec/manual/libc.texinfo -+++ glibc-2.10.1-4/manual/libc.texinfo +--- glibc-2.10.2/manual/libc.texinfo ++++ glibc-2.10.2-1/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -907,8 +907,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.10.1-69-gaa152ec/misc/sys/cdefs.h -+++ glibc-2.10.1-4/misc/sys/cdefs.h +--- glibc-2.10.2/misc/sys/cdefs.h ++++ glibc-2.10.2-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) @@ -952,17 +952,17 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.10.1-69-gaa152ec/nis/nss -+++ glibc-2.10.1-4/nis/nss +--- glibc-2.10.2/nis/nss ++++ glibc-2.10.2-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.1-69-gaa152ec/nptl/ChangeLog -+++ glibc-2.10.1-4/nptl/ChangeLog -@@ -3508,6 +3508,15 @@ +--- glibc-2.10.2/nptl/ChangeLog ++++ glibc-2.10.2-1/nptl/ChangeLog +@@ -3536,6 +3536,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -978,7 +978,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4244,6 +4253,11 @@ +@@ -4272,6 +4281,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -990,7 +990,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6318,6 +6332,11 @@ +@@ -6346,6 +6360,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1002,8 +1002,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.10.1-69-gaa152ec/nptl/Makefile -+++ glibc-2.10.1-4/nptl/Makefile +--- glibc-2.10.2/nptl/Makefile ++++ glibc-2.10.2-1/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1036,8 +1036,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.10.1-69-gaa152ec/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.10.1-4/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.10.2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.10.2-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -187,4 +187,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -1046,8 +1046,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.10.1-69-gaa152ec/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.10.1-4/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.10.2/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.10.2-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1055,8 +1055,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.10.1-69-gaa152ec/nptl/tst-stackguard1.c -+++ glibc-2.10.1-4/nptl/tst-stackguard1.c +--- glibc-2.10.2/nptl/tst-stackguard1.c ++++ glibc-2.10.2-1/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1081,8 +1081,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.10.1-69-gaa152ec/nscd/nscd.conf -+++ glibc-2.10.1-4/nscd/nscd.conf +--- glibc-2.10.2/nscd/nscd.conf ++++ glibc-2.10.2-1/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1092,8 +1092,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.10.1-69-gaa152ec/nscd/nscd.init -+++ glibc-2.10.1-4/nscd/nscd.init +--- glibc-2.10.2/nscd/nscd.init ++++ glibc-2.10.2-1/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1150,9 +1150,9 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.10.1-69-gaa152ec/posix/Makefile -+++ glibc-2.10.1-4/posix/Makefile -@@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ +--- glibc-2.10.2/posix/Makefile ++++ glibc-2.10.2-1/posix/Makefile +@@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1172,8 +1172,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.10.1-69-gaa152ec/posix/getconf.speclist.h -+++ glibc-2.10.1-4/posix/getconf.speclist.h +--- glibc-2.10.2/posix/getconf.speclist.h ++++ glibc-2.10.2-1/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1214,8 +1214,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.10.1-69-gaa152ec/streams/Makefile -+++ glibc-2.10.1-4/streams/Makefile +--- glibc-2.10.2/streams/Makefile ++++ glibc-2.10.2-1/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1225,8 +1225,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.10.1-69-gaa152ec/sysdeps/generic/dl-cache.h -+++ glibc-2.10.1-4/sysdeps/generic/dl-cache.h +--- glibc-2.10.2/sysdeps/generic/dl-cache.h ++++ glibc-2.10.2-1/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1242,8 +1242,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.1-69-gaa152ec/sysdeps/i386/Makefile -+++ glibc-2.10.1-4/sysdeps/i386/Makefile +--- glibc-2.10.2/sysdeps/i386/Makefile ++++ glibc-2.10.2-1/sysdeps/i386/Makefile @@ -64,6 +64,14 @@ endif ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS))) @@ -1259,8 +1259,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10.1-69-gaa152ec/sysdeps/ia64/Makefile -+++ glibc-2.10.1-4/sysdeps/ia64/Makefile +--- glibc-2.10.2/sysdeps/ia64/Makefile ++++ glibc-2.10.2-1/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1272,8 +1272,8 @@ endif endif ---- glibc-2.10.1-69-gaa152ec/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.10.1-4/sysdeps/ia64/ia64libgcc.S +--- glibc-2.10.2/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.10.2-1/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1625,8 +1625,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.10.1-69-gaa152ec/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.10.1-4/sysdeps/ia64/libgcc-compat.c +--- glibc-2.10.2/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.10.2-1/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1712,8 +1712,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.10.1-69-gaa152ec/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.10.1-4/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.10.2/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.10.2-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 @@ -1722,8 +1722,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/nice.c -+++ glibc-2.10.1-4/sysdeps/unix/nice.c +--- glibc-2.10.2/sysdeps/unix/nice.c ++++ glibc-2.10.2-1/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1738,8 +1738,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.10.2/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1755,8 +1755,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.10.2/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.10.2-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. */ @@ -1804,8 +1804,8 @@ } else #endif ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.10.2/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1848,8 +1848,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/i386/clone.S -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-2.10.2/sysdeps/unix/sysv/linux/i386/clone.S ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1868,8 +1868,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.10.2/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.10.2-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. @@ -1930,8 +1930,8 @@ + } while (0) + +#include_next ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.10.2/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -1964,29 +1964,29 @@ + } while (0) + #include_next ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.10.2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.10.2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.10.2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.10.2-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.1-69-gaa152ec/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.10.2/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2012,8 +2012,8 @@ struct netlink_res { ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.10.2/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2023,8 +2023,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.10.2/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2070,8 +2070,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.10.1-69-gaa152ec/sysdeps/unix/sysv/linux/x86_64/clone.S -+++ glibc-2.10.1-4/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-2.10.2/sysdeps/unix/sysv/linux/x86_64/clone.S ++++ glibc-2.10.2-1/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret diff --git a/glibc.spec b/glibc.spec index 78b079e..3de702f 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,5 +1,6 @@ -%define glibcsrcdir glibc-2.10.1-69-gaa152ec -%define glibcversion 2.10.1 +%define glibcsrcdir glibc-2.10.2 +%define glibc_release_url ftp://sources.redhat.com/pub/glibc/releases/ +%define glibcversion 2.10.2 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches i686 athlon sparcv9v sparc64v alphaev6 @@ -23,7 +24,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 5 +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 @@ -33,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) @@ -226,8 +221,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" @@ -1016,6 +1010,18 @@ rm -f *.filelist* %endif %changelog +* Fri Nov 20 2009 Andreas Schwab - 2.10.2-1 +- Update to glibc-2.10.2 release. + - Correct readahead syscall wrapper on powerpc32 + - Fix preadv, pwritev and fallocate for -D_FILE_OFFSET_BITS=64 (#533063) + - Fix endless loop in localedef + - Handle POSIX2_LINE_MAX in getconf + - Fix timer_create to initialize timer_t properly + - Fix lookup of group names in hesiod initgroups + - Fix fsetpos on wide streams + - Fix overflow handling in fdim + - Recognize ill-formed { } expressions in regcomp + * Wed Aug 19 2009 Andreas Schwab - 2.10.1-5 - Update from release/2.10/master. - handle missing nss module for biarch systems (#512309) diff --git a/import.log b/import.log index 5666a0c..41cfa6c 100644 --- a/import.log +++ b/import.log @@ -24,3 +24,4 @@ glibc-2_10_1-1:F-11:glibc-2.10.1-1.src.rpm:1241982035 glibc-2_10_1-3:F-11:glibc-2.10.1-3.src.rpm:1249041173 glibc-2_10_1-4:F-11:glibc-2.10.1-4.src.rpm:1249380620 glibc-2_10_1-5:F-11:glibc-2.10.1-5.src.rpm:1250691493 +glibc-2_10_2-1:F-11:glibc-2.10.2-1.src.rpm:1258714926 diff --git a/sources b/sources index 3328a05..e24cc82 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -38fc321acecfbd74a3e5c05f8da5c964 glibc-2.10.1-69-gaa152ec-fedora.tar.bz2 -8ba9a3a7cb89a6aea3a27818b78d3ede glibc-2.10.1-69-gaa152ec.tar.bz2 +cb2a4936159d010379fec92d45324f20 glibc-2.10.2-fedora.tar.bz2 +53d5ecd9b013a3b459b1d3170739a179 glibc-2.10.2.tar.bz2