From 41a8bce3190250236f7ed818f8f0c51764dc05ed Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: May 14 2010 11:30:35 +0000 Subject: 2.11.1-7 --- diff --git a/.cvsignore b/.cvsignore index 12e034e..173f22b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.11.1-4-g11c19d3.tar.bz2 -glibc-2.11.1-4-g11c19d3-fedora.tar.bz2 +glibc-2.11.1-61-g6d27018-fedora.tar.bz2 +glibc-2.11.1-61-g6d27018.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 44f2e07..3c0b989 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,11 +1,9 @@ ---- glibc-2.11.1-4-g11c19d3/ChangeLog -+++ glibc-2.11.1-6/ChangeLog -@@ -1,3 +1,21 @@ -+2010-03-25 Andreas Schwab -+ -+ * sysdeps/posix/getaddrinfo.c (gaih_inet): Reset no_data before -+ each action. -+ +--- glibc-2.11.1-61-g6d27018/ChangeLog ++++ glibc-2.11.1-7/ChangeLog +@@ -272,6 +272,19 @@ + redundant and incorrect else block which overwrites current line + with the partial next line. + +2010-03-09 David S. Miller + + * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handling @@ -22,7 +20,7 @@ 2010-01-14 Ulrich Drepper [BZ #11127] -@@ -1169,6 +1187,11 @@ d2009-10-30 Ulrich Drepper +@@ -1443,6 +1456,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. @@ -34,7 +32,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -1434,6 +1457,11 @@ d2009-10-30 Ulrich Drepper +@@ -1708,6 +1726,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -46,7 +44,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -10127,6 +10155,10 @@ d2009-10-30 Ulrich Drepper +@@ -10401,6 +10424,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -57,7 +55,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -11384,6 +11416,15 @@ d2009-10-30 Ulrich Drepper +@@ -11658,6 +11685,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -73,8 +71,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.11.1-4-g11c19d3/ChangeLog.15 -+++ glibc-2.11.1-6/ChangeLog.15 +--- glibc-2.11.1-61-g6d27018/ChangeLog.15 ++++ glibc-2.11.1-7/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -140,8 +138,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.11.1-4-g11c19d3/ChangeLog.16 -+++ glibc-2.11.1-6/ChangeLog.16 +--- glibc-2.11.1-61-g6d27018/ChangeLog.16 ++++ glibc-2.11.1-7/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -195,8 +193,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.11.1-4-g11c19d3/Makeconfig -+++ glibc-2.11.1-6/Makeconfig +--- glibc-2.11.1-61-g6d27018/Makeconfig ++++ glibc-2.11.1-7/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -213,8 +211,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.11.1-4-g11c19d3/csu/Makefile -+++ glibc-2.11.1-6/csu/Makefile +--- glibc-2.11.1-61-g6d27018/csu/Makefile ++++ glibc-2.11.1-7/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -225,8 +223,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.11.1-4-g11c19d3/csu/elf-init.c -+++ glibc-2.11.1-6/csu/elf-init.c +--- glibc-2.11.1-61-g6d27018/csu/elf-init.c ++++ glibc-2.11.1-7/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; @@ -251,8 +249,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.11.1-4-g11c19d3/debug/tst-chk1.c -+++ glibc-2.11.1-6/debug/tst-chk1.c +--- glibc-2.11.1-61-g6d27018/debug/tst-chk1.c ++++ glibc-2.11.1-7/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -281,9 +279,9 @@ # define O 0 # else # define O 1 ---- glibc-2.11.1-4-g11c19d3/elf/ldconfig.c -+++ glibc-2.11.1-6/elf/ldconfig.c -@@ -1020,17 +1020,19 @@ search_dirs (void) +--- glibc-2.11.1-61-g6d27018/elf/ldconfig.c ++++ glibc-2.11.1-7/elf/ldconfig.c +@@ -1031,17 +1031,19 @@ search_dirs (void) static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -305,7 +303,7 @@ if (do_chroot && opt_chroot) { -@@ -1091,7 +1093,14 @@ parse_conf (const char *filename, bool do_chroot) +@@ -1102,7 +1104,14 @@ parse_conf (const char *filename, bool do_chroot) cp += 8; while ((dir = strsep (&cp, " \t")) != NULL) if (dir[0] != '\0') @@ -321,7 +319,7 @@ } else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5])) { -@@ -1154,7 +1163,7 @@ parse_conf (const char *filename, bool do_chroot) +@@ -1165,7 +1174,7 @@ parse_conf (const char *filename, bool do_chroot) config files to read. */ static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -330,7 +328,7 @@ { if (opt_chroot && pattern[0] != '/') error (EXIT_FAILURE, 0, -@@ -1184,7 +1193,7 @@ parse_conf_include (const char *config_file, unsigned int lineno, +@@ -1197,7 +1206,7 @@ parse_conf_include (const char *config_file, unsigned int lineno, { case 0: for (size_t i = 0; i < gl.gl_pathc; ++i) @@ -339,7 +337,7 @@ globfree64 (&gl); break; -@@ -1227,6 +1236,8 @@ main (int argc, char **argv) +@@ -1240,6 +1249,8 @@ main (int argc, char **argv) /* Set the text message domain. */ textdomain (_libc_intl_domainname); @@ -348,7 +346,7 @@ /* Parse and process arguments. */ int remaining; argp_parse (&argp, argc, argv, 0, &remaining, NULL); -@@ -1338,12 +1349,14 @@ main (int argc, char **argv) +@@ -1349,12 +1360,14 @@ main (int argc, char **argv) if (!opt_only_cline) { @@ -363,9 +361,9 @@ + add_arch_dirs (config_file); } - if (! opt_ignore_aux_cache) ---- glibc-2.11.1-4-g11c19d3/elf/tst-stackguard1.c -+++ glibc-2.11.1-6/elf/tst-stackguard1.c + const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; +--- glibc-2.11.1-61-g6d27018/elf/tst-stackguard1.c ++++ glibc-2.11.1-7/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -390,16 +388,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11.1-4-g11c19d3/include/bits/stdlib-ldbl.h -+++ glibc-2.11.1-6/include/bits/stdlib-ldbl.h +--- glibc-2.11.1-61-g6d27018/include/bits/stdlib-ldbl.h ++++ glibc-2.11.1-7/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11.1-4-g11c19d3/include/bits/wchar-ldbl.h -+++ glibc-2.11.1-6/include/bits/wchar-ldbl.h +--- glibc-2.11.1-61-g6d27018/include/bits/wchar-ldbl.h ++++ glibc-2.11.1-7/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11.1-4-g11c19d3/include/features.h -+++ glibc-2.11.1-6/include/features.h +--- glibc-2.11.1-61-g6d27018/include/features.h ++++ glibc-2.11.1-7/include/features.h @@ -299,8 +299,13 @@ #endif @@ -416,8 +414,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.11.1-4-g11c19d3/intl/locale.alias -+++ glibc-2.11.1-6/intl/locale.alias +--- glibc-2.11.1-61-g6d27018/intl/locale.alias ++++ glibc-2.11.1-7/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -427,8 +425,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.11.1-4-g11c19d3/libio/stdio.h -+++ glibc-2.11.1-6/libio/stdio.h +--- glibc-2.11.1-61-g6d27018/libio/stdio.h ++++ glibc-2.11.1-7/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. */ @@ -442,8 +440,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.11.1-4-g11c19d3/locale/iso-4217.def -+++ glibc-2.11.1-6/locale/iso-4217.def +--- glibc-2.11.1-61-g6d27018/locale/iso-4217.def ++++ glibc-2.11.1-7/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -535,8 +533,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.11.1-4-g11c19d3/locale/programs/locarchive.c -+++ glibc-2.11.1-6/locale/programs/locarchive.c +--- glibc-2.11.1-61-g6d27018/locale/programs/locarchive.c ++++ glibc-2.11.1-7/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; @@ -595,9 +593,9 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.11.1-4-g11c19d3/localedata/Makefile -+++ glibc-2.11.1-6/localedata/Makefile -@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir +--- glibc-2.11.1-61-g6d27018/localedata/Makefile ++++ glibc-2.11.1-7/localedata/Makefile +@@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ $(LOCALEDEF) --alias-file=../intl/locale.alias \ @@ -605,8 +603,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.11.1-4-g11c19d3/localedata/SUPPORTED -+++ glibc-2.11.1-6/localedata/SUPPORTED +--- glibc-2.11.1-61-g6d27018/localedata/SUPPORTED ++++ glibc-2.11.1-7/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -648,8 +646,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.11.1-4-g11c19d3/localedata/locales/cy_GB -+++ glibc-2.11.1-6/localedata/locales/cy_GB +--- glibc-2.11.1-61-g6d27018/localedata/locales/cy_GB ++++ glibc-2.11.1-7/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -664,8 +662,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.11.1-4-g11c19d3/localedata/locales/en_GB -+++ glibc-2.11.1-6/localedata/locales/en_GB +--- glibc-2.11.1-61-g6d27018/localedata/locales/en_GB ++++ glibc-2.11.1-7/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -677,8 +675,8 @@ date_fmt "/ / " ---- glibc-2.11.1-4-g11c19d3/localedata/locales/no_NO -+++ glibc-2.11.1-6/localedata/locales/no_NO +--- glibc-2.11.1-61-g6d27018/localedata/locales/no_NO ++++ glibc-2.11.1-7/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -749,8 +747,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.11.1-4-g11c19d3/localedata/locales/zh_TW -+++ glibc-2.11.1-6/localedata/locales/zh_TW +--- glibc-2.11.1-61-g6d27018/localedata/locales/zh_TW ++++ glibc-2.11.1-7/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -778,8 +776,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.11.1-4-g11c19d3/malloc/mcheck.c -+++ glibc-2.11.1-6/malloc/mcheck.c +--- glibc-2.11.1-61-g6d27018/malloc/mcheck.c ++++ glibc-2.11.1-7/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -855,8 +853,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.11.1-4-g11c19d3/manual/libc.texinfo -+++ glibc-2.11.1-6/manual/libc.texinfo +--- glibc-2.11.1-61-g6d27018/manual/libc.texinfo ++++ glibc-2.11.1-7/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -866,8 +864,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.11.1-4-g11c19d3/misc/sys/cdefs.h -+++ glibc-2.11.1-6/misc/sys/cdefs.h +--- glibc-2.11.1-61-g6d27018/misc/sys/cdefs.h ++++ glibc-2.11.1-7/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) @@ -911,16 +909,16 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.11.1-4-g11c19d3/nis/nss -+++ glibc-2.11.1-6/nis/nss +--- glibc-2.11.1-61-g6d27018/nis/nss ++++ glibc-2.11.1-7/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.11.1-4-g11c19d3/nptl/ChangeLog -+++ glibc-2.11.1-6/nptl/ChangeLog +--- glibc-2.11.1-61-g6d27018/nptl/ChangeLog ++++ glibc-2.11.1-7/nptl/ChangeLog @@ -3739,6 +3739,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -961,8 +959,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.11.1-4-g11c19d3/nptl/Makefile -+++ glibc-2.11.1-6/nptl/Makefile +--- glibc-2.11.1-61-g6d27018/nptl/Makefile ++++ glibc-2.11.1-7/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -995,8 +993,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.11.1-4-g11c19d3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.11.1-6/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11.1-61-g6d27018/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11.1-7/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 @@ -1005,8 +1003,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.11.1-4-g11c19d3/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.11.1-6/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11.1-61-g6d27018/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11.1-7/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1014,8 +1012,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.11.1-4-g11c19d3/nptl/tst-stackguard1.c -+++ glibc-2.11.1-6/nptl/tst-stackguard1.c +--- glibc-2.11.1-61-g6d27018/nptl/tst-stackguard1.c ++++ glibc-2.11.1-7/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1040,8 +1038,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11.1-4-g11c19d3/nscd/nscd.conf -+++ glibc-2.11.1-6/nscd/nscd.conf +--- glibc-2.11.1-61-g6d27018/nscd/nscd.conf ++++ glibc-2.11.1-7/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1051,8 +1049,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.11.1-4-g11c19d3/nscd/nscd.init -+++ glibc-2.11.1-6/nscd/nscd.init +--- glibc-2.11.1-61-g6d27018/nscd/nscd.init ++++ glibc-2.11.1-7/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1124,8 +1122,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.11.1-4-g11c19d3/posix/Makefile -+++ glibc-2.11.1-6/posix/Makefile +--- glibc-2.11.1-61-g6d27018/posix/Makefile ++++ glibc-2.11.1-7/posix/Makefile @@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1146,8 +1144,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.11.1-4-g11c19d3/posix/getconf.speclist.h -+++ glibc-2.11.1-6/posix/getconf.speclist.h +--- glibc-2.11.1-61-g6d27018/posix/getconf.speclist.h ++++ glibc-2.11.1-7/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1188,8 +1186,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.11.1-4-g11c19d3/streams/Makefile -+++ glibc-2.11.1-6/streams/Makefile +--- glibc-2.11.1-61-g6d27018/streams/Makefile ++++ glibc-2.11.1-7/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1199,8 +1197,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.11.1-4-g11c19d3/sysdeps/generic/dl-cache.h -+++ glibc-2.11.1-6/sysdeps/generic/dl-cache.h +--- glibc-2.11.1-61-g6d27018/sysdeps/generic/dl-cache.h ++++ glibc-2.11.1-7/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1216,8 +1214,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.1-4-g11c19d3/sysdeps/i386/Makefile -+++ glibc-2.11.1-6/sysdeps/i386/Makefile +--- glibc-2.11.1-61-g6d27018/sysdeps/i386/Makefile ++++ glibc-2.11.1-7/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1242,8 +1240,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11.1-4-g11c19d3/sysdeps/ia64/Makefile -+++ glibc-2.11.1-6/sysdeps/ia64/Makefile +--- glibc-2.11.1-61-g6d27018/sysdeps/ia64/Makefile ++++ glibc-2.11.1-7/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1255,8 +1253,8 @@ endif endif ---- glibc-2.11.1-4-g11c19d3/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.11.1-6/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11.1-61-g6d27018/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11.1-7/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1608,8 +1606,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.11.1-4-g11c19d3/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.11.1-6/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11.1-61-g6d27018/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11.1-7/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1695,18 +1693,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.11.1-4-g11c19d3/sysdeps/posix/getaddrinfo.c -+++ glibc-2.11.1-6/sysdeps/posix/getaddrinfo.c -@@ -702,6 +702,7 @@ gaih_inet (const char *name, const struct gaih_service *service, - - while (!no_more) - { -+ no_data = 0; - nss_gethostbyname4_r fct4 - = __nss_lookup_function (nip, "gethostbyname4_r"); - if (fct4 != NULL) ---- glibc-2.11.1-4-g11c19d3/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.11.1-6/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11.1-61-g6d27018/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11.1-7/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1715,8 +1703,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11.1-4-g11c19d3/sysdeps/sparc/sparc64/dl-machine.h -+++ glibc-2.11.1-6/sysdeps/sparc/sparc64/dl-machine.h +--- glibc-2.11.1-61-g6d27018/sysdeps/sparc/sparc64/dl-machine.h ++++ glibc-2.11.1-7/sysdeps/sparc/sparc64/dl-machine.h @@ -623,11 +623,13 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, value = sym->st_value - sym_map->l_tls_offset + reloc->r_addend; @@ -1735,8 +1723,8 @@ } break; # endif ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/nice.c -+++ glibc-2.11.1-6/sysdeps/unix/nice.c +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/nice.c ++++ glibc-2.11.1-7/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1751,8 +1739,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1768,8 +1756,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1817,8 +1805,8 @@ } else #endif ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1861,8 +1849,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/i386/clone.S -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/i386/clone.S ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1881,8 +1869,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11.1-7/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. @@ -1943,8 +1931,8 @@ + } while (0) + +#include_next ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -1977,29 +1965,29 @@ + } while (0) + #include_next ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11.1-7/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.1-4-g11c19d3/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2025,8 +2013,8 @@ struct netlink_res { ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2036,8 +2024,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/sparc/sparc64/msgrcv.c @@ -0,0 +1,49 @@ +/* Copyright (C) 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -2088,8 +2076,8 @@ + return result; +} +weak_alias (__libc_msgrcv, msgrcv) ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2135,8 +2123,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/x86_64/clone.S -+++ glibc-2.11.1-6/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-2.11.1-61-g6d27018/sysdeps/unix/sysv/linux/x86_64/clone.S ++++ glibc-2.11.1-7/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2155,8 +2143,8 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.11.1-4-g11c19d3/timezone/zic.c -+++ glibc-2.11.1-6/timezone/zic.c +--- glibc-2.11.1-61-g6d27018/timezone/zic.c ++++ glibc-2.11.1-7/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 5d9f7dc..e6b4c68 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.11.1-4-g11c19d3 +%define glibcsrcdir glibc-2.11.1-61-g6d27018 %define glibcversion 2.11.1 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -28,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 6 +Release: 7 # 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 @@ -1037,6 +1037,32 @@ rm -f *.filelist* %endif %changelog +* Fri May 14 2010 Andreas Schwab - 2.11.1-7 +- Update from 2.11 branch + - Fix ldconfig to handle symlinks in chroot correctly (BZ#11149) + - Fix handling if newline in addmntent + - Fix ttyname_r callers not to expect errno was set (BZ#11538) + - Don't crash in trace mode when dependencies are missing + - Fix crash on reloading of gai data in nscd + - Fix fallocate error return on i386 + - Fix getopt option handing (BZ#11039, BZ#11040, BZ#11041) + - Handle DNS timeouts in old-style lookup code (BZ#11010) + - Fix aux cache handling in ldconfig with chroot (BZ#11149) + - Fix printing error messages in getopt (BZ#11043) + - Declare iruserok and iruserok_af (BZ#11070) + - Fix option aliasing in argp (BZ#11254) + - Fix concurrent handling of __cpu_features (BZ#11292) + - Handle unnecessary padding in getdents64 (BZ#11333) + - Fix changes to interface list during getifaddrs calls (BZ#11387) + - Missing memory barrier in DES initialization (BZ#11449) + - Calls to cuserid can result in buffer overruns and/or overflows (BZ#11397) + - Fix R_X86_64_PC32 overflow detection + - Fix reporting of I/O errors in *dprintf functions (BZ#11319) + - Fix assertion in palloc and pvalloc as well (BZ#5553) + - Fix file descriotor leak in nftw with FTW_CHDIR (BZ#11271) + - Fix endless loop with invalid /etc/shells file (BZ#11242) + - _nl_load_locale incorrectly handles mmap() failures (BZ#11200) + * Fri Apr 16 2010 Andreas Schwab - 2.11.1-6 - Fix spurious UNAVAIL status in getaddrinfo (#576667, #581673) diff --git a/import.log b/import.log index 7eb3223..f7acad2 100644 --- a/import.log +++ b/import.log @@ -43,3 +43,4 @@ glibc-2_11_1-1:F-12:glibc-2.11.1-1.src.rpm:1262612086 glibc-2_11_1-2:F-12:glibc-2.11.1-2.src.rpm:1268927149 glibc-2_11_1-4:F-12:glibc-2.11.1-4.src.rpm:1268929381 glibc-2_11_1-6:F-12:glibc-2.11.1-6.src.rpm:1271420717 +glibc-2_11_1-7:F-12:glibc-2.11.1-7.src.rpm:1273836523 diff --git a/sources b/sources index cc33ac9..7e0fb6d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b7e765fa327700ae462e2b71e462ad87 glibc-2.11.1-4-g11c19d3.tar.bz2 -6f17bca00ff53b4a94b742d3c968b8d7 glibc-2.11.1-4-g11c19d3-fedora.tar.bz2 +ffe0292fab3d8699435e025f56a512bd glibc-2.11.1-61-g6d27018-fedora.tar.bz2 +7be03bf420a50615ed6a9c45026bbdcb glibc-2.11.1-61-g6d27018.tar.bz2