diff --git a/.cvsignore b/.cvsignore index 12d4830..b6a4462 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.11-332-g2e7c805-fedora.tar.bz2 -glibc-2.11-332-g2e7c805.tar.bz2 +glibc-2.11-369-gea42a20-fedora.tar.bz2 +glibc-2.11-369-gea42a20.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 7fc4566..25e9770 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,9 @@ ---- glibc-2.11-332-g2e7c805/ChangeLog -+++ glibc-2.11.90-17/ChangeLog -@@ -1,3 +1,9 @@ +--- glibc-2.11-369-gea42a20/ChangeLog ++++ glibc-2.11.90-18/ChangeLog +@@ -105,6 +105,12 @@ + + * Makerules (libc-abis): Fix search for libc-abis in add-ons. + +2010-04-06 Ulrich Drepper + + * sysdeps/posix/getaddrinfo.c (default_scopes): Assign global @@ -10,7 +13,7 @@ 2010-04-05 Thomas Schwinge * sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/. -@@ -747,6 +753,19 @@ +@@ -859,6 +865,19 @@ * sysdeps/x86_64/fpu/fegetenv.c: Likewise * sysdeps/s390/fpu/fegetenv.c: Likewise. Remove unused headers. @@ -30,7 +33,7 @@ 2010-02-05 H.J. Lu [BZ #11230] -@@ -2689,6 +2708,11 @@ d2009-10-30 Ulrich Drepper +@@ -2802,6 +2821,11 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -42,7 +45,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -2954,6 +2978,11 @@ d2009-10-30 Ulrich Drepper +@@ -3067,6 +3091,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -54,7 +57,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -11647,6 +11676,10 @@ d2009-10-30 Ulrich Drepper +@@ -11760,6 +11789,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -65,7 +68,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -12904,6 +12937,15 @@ d2009-10-30 Ulrich Drepper +@@ -13017,6 +13050,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -81,8 +84,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.11-332-g2e7c805/ChangeLog.15 -+++ glibc-2.11.90-17/ChangeLog.15 +--- glibc-2.11-369-gea42a20/ChangeLog.15 ++++ glibc-2.11.90-18/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -148,8 +151,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.11-332-g2e7c805/ChangeLog.16 -+++ glibc-2.11.90-17/ChangeLog.16 +--- glibc-2.11-369-gea42a20/ChangeLog.16 ++++ glibc-2.11.90-18/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -203,8 +206,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.11-332-g2e7c805/Makeconfig -+++ glibc-2.11.90-17/Makeconfig +--- glibc-2.11-369-gea42a20/Makeconfig ++++ glibc-2.11.90-18/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -221,8 +224,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.11-332-g2e7c805/csu/Makefile -+++ glibc-2.11.90-17/csu/Makefile +--- glibc-2.11-369-gea42a20/csu/Makefile ++++ glibc-2.11.90-18/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -233,8 +236,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.11-332-g2e7c805/csu/elf-init.c -+++ glibc-2.11.90-17/csu/elf-init.c +--- glibc-2.11-369-gea42a20/csu/elf-init.c ++++ glibc-2.11.90-18/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; @@ -259,8 +262,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.11-332-g2e7c805/debug/tst-chk1.c -+++ glibc-2.11.90-17/debug/tst-chk1.c +--- glibc-2.11-369-gea42a20/debug/tst-chk1.c ++++ glibc-2.11.90-18/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -289,8 +292,8 @@ # define O 0 # else # define O 1 ---- glibc-2.11-332-g2e7c805/elf/ldconfig.c -+++ glibc-2.11.90-17/elf/ldconfig.c +--- glibc-2.11-369-gea42a20/elf/ldconfig.c ++++ glibc-2.11.90-18/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -372,8 +375,8 @@ } char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.11-332-g2e7c805/elf/tst-stackguard1.c -+++ glibc-2.11.90-17/elf/tst-stackguard1.c +--- glibc-2.11-369-gea42a20/elf/tst-stackguard1.c ++++ glibc-2.11.90-18/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -398,16 +401,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-332-g2e7c805/include/bits/stdlib-ldbl.h -+++ glibc-2.11.90-17/include/bits/stdlib-ldbl.h +--- glibc-2.11-369-gea42a20/include/bits/stdlib-ldbl.h ++++ glibc-2.11.90-18/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-332-g2e7c805/include/bits/wchar-ldbl.h -+++ glibc-2.11.90-17/include/bits/wchar-ldbl.h +--- glibc-2.11-369-gea42a20/include/bits/wchar-ldbl.h ++++ glibc-2.11.90-18/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-332-g2e7c805/include/features.h -+++ glibc-2.11.90-17/include/features.h +--- glibc-2.11-369-gea42a20/include/features.h ++++ glibc-2.11.90-18/include/features.h @@ -308,8 +308,13 @@ #endif @@ -424,8 +427,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.11-332-g2e7c805/intl/locale.alias -+++ glibc-2.11.90-17/intl/locale.alias +--- glibc-2.11-369-gea42a20/intl/locale.alias ++++ glibc-2.11.90-18/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -435,8 +438,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.11-332-g2e7c805/libio/stdio.h -+++ glibc-2.11.90-17/libio/stdio.h +--- glibc-2.11-369-gea42a20/libio/stdio.h ++++ glibc-2.11.90-18/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. */ @@ -450,8 +453,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.11-332-g2e7c805/locale/iso-4217.def -+++ glibc-2.11.90-17/locale/iso-4217.def +--- glibc-2.11-369-gea42a20/locale/iso-4217.def ++++ glibc-2.11.90-18/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -543,8 +546,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.11-332-g2e7c805/locale/programs/locarchive.c -+++ glibc-2.11.90-17/locale/programs/locarchive.c +--- glibc-2.11-369-gea42a20/locale/programs/locarchive.c ++++ glibc-2.11.90-18/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; @@ -603,8 +606,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.11-332-g2e7c805/localedata/Makefile -+++ glibc-2.11.90-17/localedata/Makefile +--- glibc-2.11-369-gea42a20/localedata/Makefile ++++ glibc-2.11.90-18/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -613,9 +616,9 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.11-332-g2e7c805/localedata/SUPPORTED -+++ glibc-2.11.90-17/localedata/SUPPORTED -@@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ +--- glibc-2.11-369-gea42a20/localedata/SUPPORTED ++++ glibc-2.11.90-18/localedata/SUPPORTED +@@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ da_DK/ISO-8859-1 \ @@ -623,7 +626,7 @@ de_AT.UTF-8/UTF-8 \ de_AT/ISO-8859-1 \ de_AT@euro/ISO-8859-15 \ -@@ -115,6 +116,7 @@ en_DK.UTF-8/UTF-8 \ +@@ -116,6 +117,7 @@ en_DK.UTF-8/UTF-8 \ en_DK/ISO-8859-1 \ en_GB.UTF-8/UTF-8 \ en_GB/ISO-8859-1 \ @@ -631,7 +634,7 @@ en_HK.UTF-8/UTF-8 \ en_HK/ISO-8859-1 \ en_IE.UTF-8/UTF-8 \ -@@ -130,6 +132,7 @@ en_SG.UTF-8/UTF-8 \ +@@ -131,6 +133,7 @@ en_SG.UTF-8/UTF-8 \ en_SG/ISO-8859-1 \ en_US.UTF-8/UTF-8 \ en_US/ISO-8859-1 \ @@ -639,7 +642,7 @@ en_ZA.UTF-8/UTF-8 \ en_ZA/ISO-8859-1 \ en_ZW.UTF-8/UTF-8 \ -@@ -305,6 +308,8 @@ nl_NL/ISO-8859-1 \ +@@ -307,6 +310,8 @@ nl_NL/ISO-8859-1 \ nl_NL@euro/ISO-8859-15 \ nn_NO.UTF-8/UTF-8 \ nn_NO/ISO-8859-1 \ @@ -648,7 +651,7 @@ nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ -@@ -364,6 +369,7 @@ sv_FI/ISO-8859-1 \ +@@ -367,6 +372,7 @@ sv_FI/ISO-8859-1 \ sv_FI@euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -656,8 +659,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.11-332-g2e7c805/localedata/locales/cy_GB -+++ glibc-2.11.90-17/localedata/locales/cy_GB +--- glibc-2.11-369-gea42a20/localedata/locales/cy_GB ++++ glibc-2.11.90-18/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -672,8 +675,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.11-332-g2e7c805/localedata/locales/en_GB -+++ glibc-2.11.90-17/localedata/locales/en_GB +--- glibc-2.11-369-gea42a20/localedata/locales/en_GB ++++ glibc-2.11.90-18/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -685,8 +688,8 @@ date_fmt "/ / " ---- glibc-2.11-332-g2e7c805/localedata/locales/no_NO -+++ glibc-2.11.90-17/localedata/locales/no_NO +--- glibc-2.11-369-gea42a20/localedata/locales/no_NO ++++ glibc-2.11.90-18/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -757,8 +760,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.11-332-g2e7c805/localedata/locales/zh_TW -+++ glibc-2.11.90-17/localedata/locales/zh_TW +--- glibc-2.11-369-gea42a20/localedata/locales/zh_TW ++++ glibc-2.11.90-18/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -786,8 +789,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.11-332-g2e7c805/malloc/mcheck.c -+++ glibc-2.11.90-17/malloc/mcheck.c +--- glibc-2.11-369-gea42a20/malloc/mcheck.c ++++ glibc-2.11.90-18/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -863,8 +866,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.11-332-g2e7c805/manual/libc.texinfo -+++ glibc-2.11.90-17/manual/libc.texinfo +--- glibc-2.11-369-gea42a20/manual/libc.texinfo ++++ glibc-2.11.90-18/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -874,8 +877,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.11-332-g2e7c805/misc/sys/cdefs.h -+++ glibc-2.11.90-17/misc/sys/cdefs.h +--- glibc-2.11-369-gea42a20/misc/sys/cdefs.h ++++ glibc-2.11.90-18/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) @@ -919,17 +922,20 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.11-332-g2e7c805/nis/nss -+++ glibc-2.11.90-17/nis/nss -@@ -25,4 +25,4 @@ +--- glibc-2.11-369-gea42a20/nis/nss ++++ glibc-2.11.90-18/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 # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-2.11-332-g2e7c805/nptl/ChangeLog -+++ glibc-2.11.90-17/nptl/ChangeLog -@@ -3873,6 +3873,15 @@ + # + # ADJUNCT_AS_SHADOW + # If set to TRUE, the passwd routines in the NIS NSS module will not +--- glibc-2.11-369-gea42a20/nptl/ChangeLog ++++ glibc-2.11.90-18/nptl/ChangeLog +@@ -3884,6 +3884,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -945,7 +951,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4609,6 +4618,11 @@ +@@ -4620,6 +4629,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -957,7 +963,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6683,6 +6697,11 @@ +@@ -6694,6 +6708,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -969,9 +975,9 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.11-332-g2e7c805/nptl/Makefile -+++ glibc-2.11.90-17/nptl/Makefile -@@ -339,7 +339,8 @@ endif +--- glibc-2.11-369-gea42a20/nptl/Makefile ++++ glibc-2.11.90-18/nptl/Makefile +@@ -341,7 +341,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -981,7 +987,7 @@ endif CFLAGS-flockfile.c = -D_IO_MTSAFE_IO -@@ -525,15 +526,19 @@ $(addprefix $(objpfx), \ +@@ -527,15 +528,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a $(objpfx)tst-unload: $(common-objpfx)dlfcn/libdl.so @@ -1003,8 +1009,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.11-332-g2e7c805/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.11.90-17/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11-369-gea42a20/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11.90-18/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 @@ -1013,8 +1019,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.11-332-g2e7c805/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.11.90-17/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11-369-gea42a20/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11.90-18/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1022,8 +1028,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.11-332-g2e7c805/nptl/tst-stackguard1.c -+++ glibc-2.11.90-17/nptl/tst-stackguard1.c +--- glibc-2.11-369-gea42a20/nptl/tst-stackguard1.c ++++ glibc-2.11.90-18/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1048,8 +1054,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-332-g2e7c805/nscd/nscd.conf -+++ glibc-2.11.90-17/nscd/nscd.conf +--- glibc-2.11-369-gea42a20/nscd/nscd.conf ++++ glibc-2.11.90-18/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1059,8 +1065,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.11-332-g2e7c805/nscd/nscd.init -+++ glibc-2.11.90-17/nscd/nscd.init +--- glibc-2.11-369-gea42a20/nscd/nscd.init ++++ glibc-2.11.90-18/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1132,9 +1138,9 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.11-332-g2e7c805/posix/Makefile -+++ glibc-2.11.90-17/posix/Makefile -@@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ +--- glibc-2.11-369-gea42a20/posix/Makefile ++++ glibc-2.11.90-18/posix/Makefile +@@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1154,8 +1160,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.11-332-g2e7c805/posix/gai.conf -+++ glibc-2.11.90-17/posix/gai.conf +--- glibc-2.11-369-gea42a20/posix/gai.conf ++++ glibc-2.11.90-18/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1180,8 +1186,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.11-332-g2e7c805/posix/getconf.speclist.h -+++ glibc-2.11.90-17/posix/getconf.speclist.h +--- glibc-2.11-369-gea42a20/posix/getconf.speclist.h ++++ glibc-2.11.90-18/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1222,8 +1228,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.11-332-g2e7c805/streams/Makefile -+++ glibc-2.11.90-17/streams/Makefile +--- glibc-2.11-369-gea42a20/streams/Makefile ++++ glibc-2.11.90-18/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1233,8 +1239,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.11-332-g2e7c805/sysdeps/generic/dl-cache.h -+++ glibc-2.11.90-17/sysdeps/generic/dl-cache.h +--- glibc-2.11-369-gea42a20/sysdeps/generic/dl-cache.h ++++ glibc-2.11.90-18/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1250,8 +1256,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.11-332-g2e7c805/sysdeps/i386/Makefile -+++ glibc-2.11.90-17/sysdeps/i386/Makefile +--- glibc-2.11-369-gea42a20/sysdeps/i386/Makefile ++++ glibc-2.11.90-18/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1276,8 +1282,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-332-g2e7c805/sysdeps/ia64/Makefile -+++ glibc-2.11.90-17/sysdeps/ia64/Makefile +--- glibc-2.11-369-gea42a20/sysdeps/ia64/Makefile ++++ glibc-2.11.90-18/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1289,8 +1295,8 @@ endif endif ---- glibc-2.11-332-g2e7c805/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.11.90-17/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11-369-gea42a20/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11.90-18/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1642,8 +1648,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.11-332-g2e7c805/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.11.90-17/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11-369-gea42a20/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11.90-18/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1729,8 +1735,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.11-332-g2e7c805/sysdeps/posix/getaddrinfo.c -+++ glibc-2.11.90-17/sysdeps/posix/getaddrinfo.c +--- glibc-2.11-369-gea42a20/sysdeps/posix/getaddrinfo.c ++++ glibc-2.11.90-18/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 }, @@ -1744,8 +1750,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.11-332-g2e7c805/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.11.90-17/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11-369-gea42a20/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11.90-18/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1754,8 +1760,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-332-g2e7c805/sysdeps/unix/nice.c -+++ glibc-2.11.90-17/sysdeps/unix/nice.c +--- glibc-2.11-369-gea42a20/sysdeps/unix/nice.c ++++ glibc-2.11.90-18/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1770,8 +1776,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1787,8 +1793,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1836,8 +1842,8 @@ } else #endif ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1880,8 +1886,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11.90-18/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. @@ -1942,8 +1948,8 @@ + } while (0) + +#include_next ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -1976,29 +1982,29 @@ + } while (0) + #include_next ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11.90-18/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.11-332-g2e7c805/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2024,8 +2030,8 @@ struct netlink_res { ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2035,13 +2041,13 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c @@ -1 +1 @@ -#include "../../fxstat.c" +#include "../../i386/fxstat.c" ---- glibc-2.11-332-g2e7c805/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.11.90-17/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11-369-gea42a20/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11.90-18/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2087,8 +2093,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.11-332-g2e7c805/timezone/zic.c -+++ glibc-2.11.90-17/timezone/zic.c +--- glibc-2.11-369-gea42a20/timezone/zic.c ++++ glibc-2.11.90-18/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 4437efd..25879b0 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.11-332-g2e7c805 +%define glibcsrcdir glibc-2.11-369-gea42a20 %define glibcversion 2.11.90 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -23,7 +23,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 17 +Release: 18 # 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 @@ -1029,6 +1029,18 @@ rm -f *.filelist* %endif %changelog +* Mon Apr 12 2010 Andreas Schwab - 2.11.90-18 +- Update from master + - Implement interfaces to set and get names of threads (BZ#11390) + - Locale data updates (BZ#10824, BZ#10936, BZ#11470, BZ#11471) + - Print reload count in nscd statistics (BZ#10915) + - Fix reading loginuid file in getlogin{,_r} + - Fix fallocate error return on i386 + - Fix cproj implmentation (BZ#10401) + - Fix getopt handing (BZ#11039, BZ#11040, BZ#11041) + - Implement new mode for NIS passwd.adjunct.byname table (BZ#11134) + - Obey LD_HWCAP_MASK in ld.so.cache lookups + * Tue Apr 6 2010 Andreas Schwab - 2.11.90-17 - Update from master - Locale data updates (BZ#11007, BZ#11258, BZ#11272, BZ#10554) diff --git a/import.log b/import.log index 447bfd7..518ce17 100644 --- a/import.log +++ b/import.log @@ -49,3 +49,4 @@ glibc-2_11_90-14:F-13:glibc-2.11.90-14.src.rpm:1266928256 glibc-2_11_90-15:F-13:glibc-2.11.90-15.src.rpm:1268148292 glibc-2_11_90-16:F-13:glibc-2.11.90-16.src.rpm:1268921606 glibc-2_11_90-17:F-13:glibc-2.11.90-17.src.rpm:1270555199 +glibc-2_11_90-18:F-13:glibc-2.11.90-18.src.rpm:1271075557 diff --git a/sources b/sources index af118f3..d5aebc5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a195dffcb3829dfeeaee29b06a294de0 glibc-2.11-332-g2e7c805-fedora.tar.bz2 -27c723796a6e46b0cf98a8b2ebf5914e glibc-2.11-332-g2e7c805.tar.bz2 +69862e392185d5c1b75a755d7d1b73ea glibc-2.11-369-gea42a20-fedora.tar.bz2 +b3b1d618d8b9b1bb3b69391823492914 glibc-2.11-369-gea42a20.tar.bz2