From 6a369ecfa9a45b92410668d579e03fad37f0130a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 6 Jul 2010 09:15:14 +0000 Subject: [PATCH] 2.12-3 --- .cvsignore | 4 +- glibc-fedora.patch | 279 +++++++++++++++++++++++++-------------------- glibc.spec | 104 +++++++++-------- import.log | 1 + sources | 4 +- 5 files changed, 217 insertions(+), 175 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0316723..e68d22f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.12-22-g6f8d0c6-fedora.tar.bz2 -glibc-2.12-22-g6f8d0c6.tar.bz2 +glibc-2.12-26-g9a98163-fedora.tar.bz2 +glibc-2.12-26-g9a98163.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 2acc445..b2b17a7 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,5 +1,15 @@ ---- glibc-2.12-22-g6f8d0c6/ChangeLog.15 -+++ glibc-2.12-2/ChangeLog.15 +--- glibc-2.12-26-g9a98163/ChangeLog ++++ glibc-2.12-3/ChangeLog +@@ -1,3 +1,7 @@ ++2010-06-21 Andreas Schwab ++ ++ * sysdeps/i386/i686/Makefile: Don't pass -mtune to assembler. ++ + 2010-06-02 Kirill A. Shutemov + + * elf/dl-reloc.c: Flush cache after solving TEXTRELs if arch +--- glibc-2.12-26-g9a98163/ChangeLog.15 ++++ glibc-2.12-3/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -65,8 +75,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.12-22-g6f8d0c6/ChangeLog.16 -+++ glibc-2.12-2/ChangeLog.16 +--- glibc-2.12-26-g9a98163/ChangeLog.16 ++++ glibc-2.12-3/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -120,8 +130,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.12-22-g6f8d0c6/ChangeLog.17 -+++ glibc-2.12-2/ChangeLog.17 +--- glibc-2.12-26-g9a98163/ChangeLog.17 ++++ glibc-2.12-3/ChangeLog.17 @@ -13,6 +13,13 @@ handled here anymore. Patch mostly by Matt Turner . @@ -220,8 +230,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.12-22-g6f8d0c6/Makeconfig -+++ glibc-2.12-2/Makeconfig +--- glibc-2.12-26-g9a98163/Makeconfig ++++ glibc-2.12-3/Makeconfig @@ -789,12 +789,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -238,8 +248,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.12-22-g6f8d0c6/csu/Makefile -+++ glibc-2.12-2/csu/Makefile +--- glibc-2.12-26-g9a98163/csu/Makefile ++++ glibc-2.12-3/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -250,8 +260,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.12-22-g6f8d0c6/csu/elf-init.c -+++ glibc-2.12-2/csu/elf-init.c +--- glibc-2.12-26-g9a98163/csu/elf-init.c ++++ glibc-2.12-3/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; @@ -276,8 +286,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.12-22-g6f8d0c6/debug/tst-chk1.c -+++ glibc-2.12-2/debug/tst-chk1.c +--- glibc-2.12-26-g9a98163/debug/tst-chk1.c ++++ glibc-2.12-3/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -306,8 +316,8 @@ # define O 0 # else # define O 1 ---- glibc-2.12-22-g6f8d0c6/elf/Makefile -+++ glibc-2.12-2/elf/Makefile +--- glibc-2.12-26-g9a98163/elf/Makefile ++++ glibc-2.12-3/elf/Makefile @@ -759,11 +759,11 @@ $(objpfx)tst-tls8.out: $(objpfx)tst-tlsmod3.so $(objpfx)tst-tlsmod4.so $(objpfx)tst-tls9: $(libdl) $(objpfx)tst-tls9.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so @@ -323,8 +333,8 @@ $(objpfx)tst-tls13: $(libdl) $(objpfx)tst-tls13.out: $(objpfx)tst-tlsmod13a.so ---- glibc-2.12-22-g6f8d0c6/elf/ldconfig.c -+++ glibc-2.12-2/elf/ldconfig.c +--- glibc-2.12-26-g9a98163/elf/ldconfig.c ++++ glibc-2.12-3/elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -406,8 +416,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.12-22-g6f8d0c6/elf/tst-stackguard1.c -+++ glibc-2.12-2/elf/tst-stackguard1.c +--- glibc-2.12-26-g9a98163/elf/tst-stackguard1.c ++++ glibc-2.12-3/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -432,16 +442,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.12-22-g6f8d0c6/include/bits/stdlib-ldbl.h -+++ glibc-2.12-2/include/bits/stdlib-ldbl.h +--- glibc-2.12-26-g9a98163/include/bits/stdlib-ldbl.h ++++ glibc-2.12-3/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.12-22-g6f8d0c6/include/bits/wchar-ldbl.h -+++ glibc-2.12-2/include/bits/wchar-ldbl.h +--- glibc-2.12-26-g9a98163/include/bits/wchar-ldbl.h ++++ glibc-2.12-3/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.12-22-g6f8d0c6/include/features.h -+++ glibc-2.12-2/include/features.h +--- glibc-2.12-26-g9a98163/include/features.h ++++ glibc-2.12-3/include/features.h @@ -308,8 +308,13 @@ #endif @@ -458,8 +468,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.12-22-g6f8d0c6/intl/locale.alias -+++ glibc-2.12-2/intl/locale.alias +--- glibc-2.12-26-g9a98163/intl/locale.alias ++++ glibc-2.12-3/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -469,8 +479,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.12-22-g6f8d0c6/libio/stdio.h -+++ glibc-2.12-2/libio/stdio.h +--- glibc-2.12-26-g9a98163/libio/stdio.h ++++ glibc-2.12-3/libio/stdio.h @@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -484,8 +494,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.12-22-g6f8d0c6/locale/iso-4217.def -+++ glibc-2.12-2/locale/iso-4217.def +--- glibc-2.12-26-g9a98163/locale/iso-4217.def ++++ glibc-2.12-3/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -577,8 +587,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.12-22-g6f8d0c6/locale/programs/locarchive.c -+++ glibc-2.12-2/locale/programs/locarchive.c +--- glibc-2.12-26-g9a98163/locale/programs/locarchive.c ++++ glibc-2.12-3/locale/programs/locarchive.c @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; @@ -637,8 +647,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.12-22-g6f8d0c6/localedata/Makefile -+++ glibc-2.12-2/localedata/Makefile +--- glibc-2.12-26-g9a98163/localedata/Makefile ++++ glibc-2.12-3/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -647,8 +657,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.12-22-g6f8d0c6/localedata/SUPPORTED -+++ glibc-2.12-2/localedata/SUPPORTED +--- glibc-2.12-26-g9a98163/localedata/SUPPORTED ++++ glibc-2.12-3/localedata/SUPPORTED @@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -690,8 +700,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.12-22-g6f8d0c6/localedata/locales/cy_GB -+++ glibc-2.12-2/localedata/locales/cy_GB +--- glibc-2.12-26-g9a98163/localedata/locales/cy_GB ++++ glibc-2.12-3/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -706,8 +716,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.12-22-g6f8d0c6/localedata/locales/en_GB -+++ glibc-2.12-2/localedata/locales/en_GB +--- glibc-2.12-26-g9a98163/localedata/locales/en_GB ++++ glibc-2.12-3/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -719,8 +729,8 @@ date_fmt "/ / " ---- glibc-2.12-22-g6f8d0c6/localedata/locales/no_NO -+++ glibc-2.12-2/localedata/locales/no_NO +--- glibc-2.12-26-g9a98163/localedata/locales/no_NO ++++ glibc-2.12-3/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -791,8 +801,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.12-22-g6f8d0c6/localedata/locales/zh_TW -+++ glibc-2.12-2/localedata/locales/zh_TW +--- glibc-2.12-26-g9a98163/localedata/locales/zh_TW ++++ glibc-2.12-3/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -820,8 +830,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.12-22-g6f8d0c6/malloc/mcheck.c -+++ glibc-2.12-2/malloc/mcheck.c +--- glibc-2.12-26-g9a98163/malloc/mcheck.c ++++ glibc-2.12-3/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -897,8 +907,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.12-22-g6f8d0c6/manual/libc.texinfo -+++ glibc-2.12-2/manual/libc.texinfo +--- glibc-2.12-26-g9a98163/manual/libc.texinfo ++++ glibc-2.12-3/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -908,8 +918,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.12-22-g6f8d0c6/misc/sys/cdefs.h -+++ glibc-2.12-2/misc/sys/cdefs.h +--- glibc-2.12-26-g9a98163/misc/sys/cdefs.h ++++ glibc-2.12-3/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) @@ -953,8 +963,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.12-22-g6f8d0c6/nis/nss -+++ glibc-2.12-2/nis/nss +--- glibc-2.12-26-g9a98163/nis/nss ++++ glibc-2.12-3/nis/nss @@ -25,7 +25,7 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get @@ -964,9 +974,12 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.12-22-g6f8d0c6/nptl/ChangeLog -+++ glibc-2.12-2/nptl/ChangeLog -@@ -1,3 +1,8 @@ +--- glibc-2.12-26-g9a98163/nptl/ChangeLog ++++ glibc-2.12-3/nptl/ChangeLog +@@ -3,6 +3,11 @@ + * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Fix incorrect + location of ifndef __ASSUME_FUTEX_CLOCK_REALTIME. + +2010-05-27 Andreas Schwab + + * Makefile ($(objpfx)tst-_res1): Depend on @@ -975,7 +988,7 @@ 2010-04-09 Ulrich Drepper [BZ #11390] -@@ -3884,6 +3889,15 @@ +@@ -3889,6 +3894,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -991,7 +1004,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4620,6 +4634,11 @@ +@@ -4625,6 +4639,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1003,7 +1016,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6694,6 +6713,11 @@ +@@ -6699,6 +6718,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1015,8 +1028,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.12-22-g6f8d0c6/nptl/Makefile -+++ glibc-2.12-2/nptl/Makefile +--- glibc-2.12-26-g9a98163/nptl/Makefile ++++ glibc-2.12-3/nptl/Makefile @@ -341,7 +341,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1058,8 +1071,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.12-22-g6f8d0c6/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.12-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.12-26-g9a98163/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.12-3/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 @@ -1068,8 +1081,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.12-22-g6f8d0c6/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.12-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.12-26-g9a98163/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.12-3/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1077,8 +1090,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.12-22-g6f8d0c6/nptl/tst-stackguard1.c -+++ glibc-2.12-2/nptl/tst-stackguard1.c +--- glibc-2.12-26-g9a98163/nptl/tst-stackguard1.c ++++ glibc-2.12-3/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1103,8 +1116,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.12-22-g6f8d0c6/nscd/nscd.conf -+++ glibc-2.12-2/nscd/nscd.conf +--- glibc-2.12-26-g9a98163/nscd/nscd.conf ++++ glibc-2.12-3/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1114,8 +1127,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.12-22-g6f8d0c6/nscd/nscd.init -+++ glibc-2.12-2/nscd/nscd.init +--- glibc-2.12-26-g9a98163/nscd/nscd.init ++++ glibc-2.12-3/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1192,8 +1205,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.12-22-g6f8d0c6/posix/Makefile -+++ glibc-2.12-2/posix/Makefile +--- glibc-2.12-26-g9a98163/posix/Makefile ++++ glibc-2.12-3/posix/Makefile @@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1214,8 +1227,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.12-22-g6f8d0c6/posix/gai.conf -+++ glibc-2.12-2/posix/gai.conf +--- glibc-2.12-26-g9a98163/posix/gai.conf ++++ glibc-2.12-3/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1240,8 +1253,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.12-22-g6f8d0c6/posix/getconf.speclist.h -+++ glibc-2.12-2/posix/getconf.speclist.h +--- glibc-2.12-26-g9a98163/posix/getconf.speclist.h ++++ glibc-2.12-3/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1282,8 +1295,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.12-22-g6f8d0c6/streams/Makefile -+++ glibc-2.12-2/streams/Makefile +--- glibc-2.12-26-g9a98163/streams/Makefile ++++ glibc-2.12-3/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1293,8 +1306,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.12-22-g6f8d0c6/sysdeps/generic/dl-cache.h -+++ glibc-2.12-2/sysdeps/generic/dl-cache.h +--- glibc-2.12-26-g9a98163/sysdeps/generic/dl-cache.h ++++ glibc-2.12-3/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1310,8 +1323,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.12-22-g6f8d0c6/sysdeps/i386/Makefile -+++ glibc-2.12-2/sysdeps/i386/Makefile +--- glibc-2.12-26-g9a98163/sysdeps/i386/Makefile ++++ glibc-2.12-3/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1336,8 +1349,30 @@ endif ifeq ($(subdir),elf) ---- glibc-2.12-22-g6f8d0c6/sysdeps/ia64/Makefile -+++ glibc-2.12-2/sysdeps/ia64/Makefile +--- glibc-2.12-26-g9a98163/sysdeps/i386/i686/Makefile ++++ glibc-2.12-3/sysdeps/i386/i686/Makefile +@@ -9,19 +9,3 @@ stack-align-test-flags += -msse + ifeq ($(subdir),string) + sysdep_routines += cacheinfo + endif +- +-ifeq (yes,$(config-asflags-i686)) +-CFLAGS-.o += -Wa,-mtune=i686 +-CFLAGS-.os += -Wa,-mtune=i686 +-CFLAGS-.op += -Wa,-mtune=i686 +-CFLAGS-.og += -Wa,-mtune=i686 +-CFLAGS-.ob += -Wa,-mtune=i686 +-CFLAGS-.oS += -Wa,-mtune=i686 +- +-ASFLAGS-.o += -Wa,-mtune=i686 +-ASFLAGS-.os += -Wa,-mtune=i686 +-ASFLAGS-.op += -Wa,-mtune=i686 +-ASFLAGS-.og += -Wa,-mtune=i686 +-ASFLAGS-.ob += -Wa,-mtune=i686 +-ASFLAGS-.oS += -Wa,-mtune=i686 +-endif +--- glibc-2.12-26-g9a98163/sysdeps/ia64/Makefile ++++ glibc-2.12-3/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1349,8 +1384,8 @@ endif endif ---- glibc-2.12-22-g6f8d0c6/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.12-2/sysdeps/ia64/ia64libgcc.S +--- glibc-2.12-26-g9a98163/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.12-3/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1702,8 +1737,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.12-22-g6f8d0c6/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.12-2/sysdeps/ia64/libgcc-compat.c +--- glibc-2.12-26-g9a98163/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.12-3/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1789,8 +1824,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.12-22-g6f8d0c6/sysdeps/posix/getaddrinfo.c -+++ glibc-2.12-2/sysdeps/posix/getaddrinfo.c +--- glibc-2.12-26-g9a98163/sysdeps/posix/getaddrinfo.c ++++ glibc-2.12-3/sysdeps/posix/getaddrinfo.c @@ -1099,10 +1099,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, @@ -1804,8 +1839,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.12-22-g6f8d0c6/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.12-2/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.12-26-g9a98163/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.12-3/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1814,8 +1849,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/nice.c -+++ glibc-2.12-2/sysdeps/unix/nice.c +--- glibc-2.12-26-g9a98163/sysdeps/unix/nice.c ++++ glibc-2.12-3/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1830,8 +1865,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1847,8 +1882,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1896,8 +1931,8 @@ } else #endif ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1940,8 +1975,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.12-3/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. @@ -2002,8 +2037,8 @@ + } while (0) + +#include_next ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2036,29 +2071,29 @@ + } while (0) + #include_next ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.12-3/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.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2084,8 +2119,8 @@ struct netlink_res { ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2095,13 +2130,13 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c @@ -1 +1 @@ -#include "../../fxstat.c" +#include "../../i386/fxstat.c" ---- glibc-2.12-22-g6f8d0c6/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.12-2/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.12-26-g9a98163/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.12-3/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2147,8 +2182,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.12-22-g6f8d0c6/timezone/zic.c -+++ glibc-2.12-2/timezone/zic.c +--- glibc-2.12-26-g9a98163/timezone/zic.c ++++ glibc-2.12-3/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 ba1508d..6acd86b 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.12-22-g6f8d0c6 +%define glibcsrcdir glibc-2.12-26-g9a98163 %define glibcversion 2.12 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 2 +Release: 3 # 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 @@ -1031,6 +1031,12 @@ rm -f *.filelist* %endif %changelog +* Tue Jul 6 2010 Andreas Schwab - 2.12-3 +- Update from 2.12 branch + - Fix use of extend_alloca in NIS + - Fix a couple of __REDIRECT () __THROW occurrences +- Workaround assembler bug sneaking in nopl (#579838) + * Tue Jun 1 2010 Andreas Schwab - 2.12-2 - Update from 2.12 branch - Correct x86 CPU family and model check (BZ#11640, #596554) @@ -1583,7 +1589,7 @@ rm -f *.filelist* - concurrent IPv4 and IPv6 DNS lookups by getaddrinfo * Mon May 5 2008 Jakub Jelinek 2.8-3 -- don't run telinit u in %post if both /dev/initctl and +- don't run telinit u in %%post if both /dev/initctl and /sbin/initctl exist (#444978) - workaround GCC ppc64 miscompilation of c{log{,10},acosh,atan}l (#444996) @@ -1608,7 +1614,7 @@ rm -f *.filelist* - update to trunk - misc fixes (BZ#4314, BZ#4407, BZ#5209, BZ#5436, BZ#5768, BZ#5998, BZ#6024) -- restart sshd in %post when upstart is used - it doesn't have +- restart sshd in %%post when upstart is used - it doesn't have /dev/initctl (#441763) - disable assert checking again @@ -1738,9 +1744,9 @@ rm -f *.filelist* * Tue Sep 18 2007 Jakub Jelinek 2.6.90-14 - -D_FORTIFY_SOURCE{,=2} support for C++ - fortification of fread{,_unlocked} -- support *scanf m allocation modifier (%ms, %mls, %mc, ...) +- support *scanf m allocation modifier (%%ms, %%mls, %%mc, ...) - in -std=c99 or -D_XOPEN_SOURCE=600 mode don't recognize - %as, %aS and %a[ as a GNU extension for *scanf + %%as, %%aS and %%a[ as a GNU extension for *scanf - fix splice, vmsplice, tee return value, make them cancellation points - mq_open checking @@ -1825,7 +1831,7 @@ rm -f *.filelist* - fix LD_AUDIT=a:b program (#180432) - don't crash on pseudo-zero long double values passed to *printf on i?86/x86_64/ia64 (BZ#4586) -- fix *printf %La and strtold with some hexadecimal floating point +- fix *printf %%La and strtold with some hexadecimal floating point constants on ppc/ppc64 - fix nextafterl on ppc/ppc64 - fix sem_timedwait on i?86 and x86_64 @@ -1861,10 +1867,10 @@ rm -f *.filelist* * Fri May 4 2007 Jakub Jelinek 2.5.90-22 - add transliteration for (BZ#3213) -- fix *scanf with %f on hexadecimal floats without exponent (BZ#4342) -- fix *printf with very large precisions for %s (#238406, BZ#4438) +- fix *scanf with %%f on hexadecimal floats without exponent (BZ#4342) +- fix *printf with very large precisions for %%s (#238406, BZ#4438) - fix inet_ntop size checking for AF_INET (BZ#4439) -- for *printf %e avoid 1.000e-00, for exponent 0 always use + sign (#238431) +- for *printf %%e avoid 1.000e-00, for exponent 0 always use + sign (#238431) - fix a regression introduced in #223467 changes - gethostby*_r alignment fixes (BZ#4381) - fix ifaddrs error handling @@ -1877,14 +1883,14 @@ rm -f *.filelist* then unlink the locale-archive template - this should save > 80MB of glibc-common occupied disk space - fix _XOPEN_VERSION (BZ#4364) -- fix printf with %g and values tiny bit smaller than 1.e-4 (#235864, +- fix printf with %%g and values tiny bit smaller than 1.e-4 (#235864, BZ#4362) - fix NIS+ __nisfind_server (#235229) * Sat Mar 31 2007 Jakub Jelinek 2.5.90-20 - assorted NIS+ speedups (#223467) - fix HAVE_LIBCAP configure detection (#178934) -- remove %{_prefix}/sbin/rpcinfo from glibc-common (#228894) +- remove %%{_prefix}/sbin/rpcinfo from glibc-common (#228894) - nexttoward*/nextafter* fixes (BZ#3306) - feholdexcept/feupdateenv fixes (BZ#3427) - speed up fnmatch with two or more * in the pattern @@ -1919,7 +1925,7 @@ rm -f *.filelist* - fix application crashes when doing NSS lookups through nscd mmapped databases and nscd decides to start garbage collection during the lookups (#219145, #225315) -- fix %0lld printing of 0LL on 32-bit architectures (BZ#3902) +- fix %%0lld printing of 0LL on 32-bit architectures (BZ#3902) - ignore errors from install-info in glibc-devel scriptlets (#223691) @@ -1972,7 +1978,7 @@ rm -f *.filelist* in __libc_start_main instead) - add unwind info for x86-64 restore_rt signal return landing pad (#217087) -- add power6x subdir to /%{_lib}/ and /%{_lib}/rtkaio/, +- add power6x subdir to /%%{_lib}/ and /%%{_lib}/rtkaio/, link all libs from ../power6/* into them * Tue Nov 28 2006 Jakub Jelinek 2.5.90-8 @@ -2005,7 +2011,7 @@ rm -f *.filelist* * Fri Nov 3 2006 Jakub Jelinek 2.5.90-4 - fix atexit backwards compatibility (#213388) - add mai_IN locale (#213415) -- remove bogus %{_libdir}/librt.so.1 symlink (#213555) +- remove bogus %%{_libdir}/librt.so.1 symlink (#213555) - fix memusage (#213656) - change libc.info category (#209493) @@ -2055,7 +2061,7 @@ rm -f *.filelist* AT_PLATFORM - fix ppc{32,64} libSegFault.so - use -mtune=generic even for glibc-devel.i386 (#206437) -- fix /%{_lib}/librt.so.1 symlink +- fix /%%{_lib}/librt.so.1 symlink * Fri Sep 15 2006 Jakub Jelinek 2.4.90-32 - on ppc* use just AT_PLATFORM and altivec AT_HWCAP bit for library selection @@ -2069,7 +2075,7 @@ rm -f *.filelist* - fix mktime on 32-bit arches a few years after 2038 (BZ#2821) * Thu Sep 7 2006 Jakub Jelinek 2.4.90-30 -- add librtkaio, to use it add /%{lib}/rtkaio to your +- add librtkaio, to use it add /%%{lib}/rtkaio to your LD_LIBRARY_PATH or /etc/ld.so.conf - fix or_IN February name (#204730) - fix pthread_create called from cancellation handlers (BZ#3124) @@ -2400,7 +2406,7 @@ rm -f *.filelist* * Thu Oct 20 2005 Jakub Jelinek 2.3.90-15 - update from CVS - - be permissive in %n check because of kernel bug #165351 (#171240) + - be permissive in %%n check because of kernel bug #165351 (#171240) - don't misalign stack in pthread_once on x86_64 (#170786, IT#81521) - many locale fixes @@ -2572,15 +2578,15 @@ rm -f *.filelist* - fix linuxthreads clocks - put xen libs into the glibc-2*.i686 package instead of a separate one - fix librt.so symlink in linuxthreads-devel -- do not include linuxthreads-devel on %{auxarches}, +- do not include linuxthreads-devel on %%{auxarches}, just on the base architectures * Wed Apr 27 2005 Jakub Jelinek 2.3.5-2 - update from CVS - with MALLOC_CHECK_=N N>0 (#153003) - fix recursive dlclose (#154641) - - handle %z in strptime (#154804) - - automatically append /%{_lib}/obsolete/linuxthreads/ + - handle %%z in strptime (#154804) + - automatically append /%%{_lib}/obsolete/linuxthreads/ to standard library search path if LD_ASSUME_KERNEL=N N <= 2.4.19 or for glibc 2.0 binaries (or broken ones that don't use errno/h_errno properly). Warning: all those will stop working when LinuxThreads @@ -2607,9 +2613,9 @@ rm -f *.filelist* - fix and with -std=c89 -fexceptions (#153774) * Mon Apr 4 2005 Jakub Jelinek 2.3.4-20 -- move LinuxThreads libraries to /%{_lib}/obsolete/linuxthreads/ - and NPTL libraries to /%{_lib}. To run a program against LinuxThreads, - LD_ASSUME_KERNEL=2.4.xx LD_LIBRARY_PATH=/%{_lib}/obsolete/linuxthreads/ +- move LinuxThreads libraries to /%%{_lib}/obsolete/linuxthreads/ + and NPTL libraries to /%%{_lib}. To run a program against LinuxThreads, + LD_ASSUME_KERNEL=2.4.xx LD_LIBRARY_PATH=/%%{_lib}/obsolete/linuxthreads/ is now needed - bzip2 ChangeLog* files instead of gzipping them @@ -2619,9 +2625,9 @@ rm -f *.filelist* - fix initgroups (BZ#661) - kill nptl-devel subpackage, add linuxthreads-devel, compile and link by default against NPTL and only with - -I/usr/include/linuxthreads -L/usr/%{_lib}/linuxthreads + -I/usr/include/linuxthreads -L/usr/%%{_lib}/linuxthreads against LinuxThreads -- package /usr/lib/debug/%{_lib}/tls/i{5,6}86 symlinks in +- package /usr/lib/debug/%%{_lib}/tls/i{5,6}86 symlinks in i386 glibc-debuginfo - limit number of ChangeLog* files in glibc-common %%doc to last 2.5 years of changes only to save space @@ -2650,14 +2656,14 @@ rm -f *.filelist* - with -D_FORTIFY_SOURCE=*, avoid defining read and a bunch of others as function-like macros, there are too many broken programs out there -- add %%dir %{_prefix}/%{_lib}/gconv to glibc's file list (#151372) +- add %%dir %%{_prefix}/%%{_lib}/gconv to glibc's file list (#151372) * Sun Mar 6 2005 Roland McGrath 2.3.4-14 - fix bits/socket2.h macro typos * Sat Mar 5 2005 Jakub Jelinek 2.3.4-12 - fix tst-chk{2,3} -- fix up AS_NEEDED directive in /usr/%{_lib}/libc.so +- fix up AS_NEEDED directive in /usr/%%{_lib}/libc.so - BuildReq binutils >= 2.15.94.0.2-1 for AS_NEEDED, in glibc-devel Conflict with binutils < 2.15.94.0.2-1 @@ -2709,9 +2715,9 @@ rm -f *.filelist* - change regex \B handling to match old GNU regex as well as perl/grep's dfa (from empty string inside of word to empty string not at a word boundary, BZ#693) - - slightly optimize i686 TLS accesses, use direct TLS %gs access in sem_* + - slightly optimize i686 TLS accesses, use direct TLS %%gs access in sem_* and allow building -mno-tls-direct-seg-refs glibc that is free of direct TLS - %gs access with negative offsets + %%gs access with negative offsets - fix addseverity - fix fmemopen - fix rewinddir @@ -2752,7 +2758,7 @@ rm -f *.filelist* - if /sbin/ldconfig doesn't exist when running glibc_post_upgrade.%%{_target_cpu}, just don't attempt to run it. This can happen during first install of bi-arch glibc and the - other arch glibc's %post wil run /sbin/ldconfig (#143326) + other arch glibc's %%post wil run /sbin/ldconfig (#143326) - use -o and --nostdlib options to create all needed gconv-modules.cache files on bi-arch setups @@ -2791,7 +2797,7 @@ rm -f *.filelist* * Tue Dec 14 2004 Jakub Jelinek 2.3.3-92 - update from CVS -- fix %{_prefix}/libexec/getconf filenames generation +- fix %%{_prefix}/libexec/getconf filenames generation * Tue Dec 14 2004 Jakub Jelinek 2.3.3-91 - update from CVS @@ -2801,7 +2807,7 @@ rm -f *.filelist* (#142214) - some more realloc corruption checks - fix getconf _POSIX_V6_WIDTH_RESTRICTED_ENVS output, - tweak %{_prefix}/libexec/getconf/ filenames + tweak %%{_prefix}/libexec/getconf/ filenames * Fri Dec 10 2004 Jakub Jelinek 2.3.3-90 - update from CVS @@ -2829,8 +2835,8 @@ rm -f *.filelist* check_dst_limits_calc_pos_1 (#142060) - make getpid () working with clone/clone2 without CLONE_THREAD (so far on i386/x86_64/ia64 only) -- move %{_prefix}/libexec/getconf/* to glibc from glibc-common -- make %{_prefix}/libexec/getconf directory owned by glibc package +- move %%{_prefix}/libexec/getconf/* to glibc from glibc-common +- make %%{_prefix}/libexec/getconf directory owned by glibc package * Fri Dec 3 2004 Jakub Jelinek 2.3.3-87 - update from CVS @@ -2855,7 +2861,7 @@ rm -f *.filelist* - support -v specification in getconf - fix sysconf (_SC_LFS64_CFLAGS) etc. - avoid thread stack aliasing issues on EM64T (#140803) -- move %{_prefix}/include/nptl headers from nptl-devel +- move %%{_prefix}/include/nptl headers from nptl-devel to glibc-headers, so that even NPTL specific programs can be built bi-arch without problems @@ -2887,8 +2893,8 @@ rm -f *.filelist* * Fri Nov 19 2004 Jakub Jelinek 2.3.3-80 - update from CVS - - with -D_FORTIFY_SOURCE=2, prevent missing %N$ formats - - for -D_FORTIFY_SOURCE=2 and %n in writable format string, + - with -D_FORTIFY_SOURCE=2, prevent missing %%N$ formats + - for -D_FORTIFY_SOURCE=2 and %%n in writable format string, issue special error message instead of using the buffer overflow detected one - speedup regex searching with REG_NOSUB, add RE_NO_SUB, @@ -3316,7 +3322,7 @@ rm -f *.filelist* - strtol speed optimization - don't try to use certainly unimplemented syscalls on ppc64 - kill -debug subpackage, move the libs to glibc-debuginfo{,-common} - into /usr/lib/debug/usr/%{_lib}/ directory + into /usr/lib/debug/usr/%%{_lib}/ directory - fix c_stubs with gcc 3.4 - move all the up to 3 builds into %%build scriptlet and leave only installation in the %%install scriptlet @@ -3665,7 +3671,7 @@ rm -f *.filelist* - fix zic bug on 64-bit platforms - some TLS handling fixes - make ldconfig look into alternate ABI dirs by default (#99402) -- move %{_datadir}/zoneinfo to tzdata package, so that it can be +- move %%{_datadir}/zoneinfo to tzdata package, so that it can be errataed separately from glibc - new add-on - rtkaio - prereq libgcc, as glibc now relies on libgcc_s.so.1 for pthread_cancel @@ -3875,7 +3881,7 @@ rm -f *.filelist* - fix NPTL pthread_cond_timedwait - fix sysconf (_SC_MONOTONIC_CLOCK) - use /%%{_lib}/tls instead of /lib/tls on x86-64 -- add /%{_lib}/tls/librt*so* and /%{_lib}/i686/librt*so* +- add /%%{_lib}/tls/librt*so* and /%%{_lib}/i686/librt*so* - display content of .out files for all make check failures * Wed Mar 26 2003 Jakub Jelinek 2.3.2-17 @@ -3941,7 +3947,7 @@ rm -f *.filelist* - update from CVS - only warn about errno, h_errno or _res for binaries, never libraries -- rebuilt with gcc-3.2.2-4 to use direct %gs TLS access insn sequences +- rebuilt with gcc-3.2.2-4 to use direct %%gs TLS access insn sequences * Sun Feb 23 2003 Jakub Jelinek 2.3.2-2 - update from CVS @@ -4124,8 +4130,8 @@ rm -f *.filelist* * Fri Dec 13 2002 Jakub Jelinek 2.3.1-14 - update from CVS - - replace __libc_lock_needed@GOTOFF(%ebx) with - %gs:offsetof(tcbhead_t, multiple_threads) + - replace __libc_lock_needed@GOTOFF(%%ebx) with + %%gs:offsetof(tcbhead_t, multiple_threads) - start of new NPTL cancellation wrappers * Thu Dec 12 2002 Jakub Jelinek 2.3.1-13 @@ -4178,7 +4184,7 @@ rm -f *.filelist* * Thu Oct 24 2002 Jakub Jelinek 2.3.1-4 - update from CVS - - fixed %a and %A in *printf (#75821) + - fixed %%a and %%A in *printf (#75821) - fix re_comp memory leaking (#76594) * Tue Oct 22 2002 Jakub Jelinek 2.3.1-3 @@ -4306,7 +4312,7 @@ rm -f *.filelist* * Wed Aug 14 2002 Jakub Jelinek 2.2.90-21 - fix path to locale-archive in libc reader -- build locale archive at glibc-common %post time +- build locale archive at glibc-common %%post time - export __strtold_internal and __wcstold_internal on Alpha again - workaround some localedata problems @@ -4551,9 +4557,9 @@ rm -f *.filelist* * Fri Aug 10 2001 Jakub Jelinek 2.2.4-4 - don't crash on catclose(-1) -- fix wscanf %[] handling +- fix wscanf %%[] handling - fix return value from swprintf -- handle year + %U/%W week + week day in strptime +- handle year + %%U/%%W week + week day in strptime * Thu Aug 9 2001 Jakub Jelinek 2.2.4-3 - update from CVS to @@ -4569,7 +4575,7 @@ rm -f *.filelist* * Sat Aug 4 2001 Jakub Jelinek - update from CVS - fix iconv cache handling -- glibc should not own %{_infodir}, %{_mandir} nor %{_mandir}/man3 (#50673) +- glibc should not own %%{_infodir}, %%{_mandir} nor %%{_mandir}/man3 (#50673) - add gconv-modules.cache as emtpy config file (#50699) - only run iconvconfig if /usr is mounted read-write (#50667) diff --git a/import.log b/import.log index d33b457..715ffaa 100644 --- a/import.log +++ b/import.log @@ -54,3 +54,4 @@ glibc-2_11_90-19:F-13:glibc-2.11.90-19.src.rpm:1271163610 glibc-2_11_90-20:F-13:glibc-2.11.90-20.src.rpm:1271415479 glibc-2_12-1:F-13:glibc-2.12-1.src.rpm:1273001446 glibc-2_12-2:F-13:glibc-2.12-2.src.rpm:1275412737 +glibc-2_12-3:F-13:glibc-2.12-3.src.rpm:1278407616 diff --git a/sources b/sources index 4bc85c5..e26b363 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b1375b88241b09a30254ba27a8108717 glibc-2.12-22-g6f8d0c6-fedora.tar.bz2 -bac0e30df68c81c76f1ab428da18e2bc glibc-2.12-22-g6f8d0c6.tar.bz2 +01dbf42969300b80e2ec43815528bd63 glibc-2.12-26-g9a98163-fedora.tar.bz2 +edf660380f52d77a4dd0fbe852f8c2e7 glibc-2.12-26-g9a98163.tar.bz2