From e55a010d5b33aa8a3d8122ab15038746f37cf4a1 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 12 Jan 2010 16:32:14 +0000 Subject: [PATCH] 2.11.90-8 --- .cvsignore | 4 +- glibc-fedora.patch | 174 +++++++++++++++++---------------------------- glibc.spec | 8 ++- import.log | 1 + sources | 4 +- 5 files changed, 77 insertions(+), 114 deletions(-) diff --git a/.cvsignore b/.cvsignore index d4671ea..30f88c4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.11-100-g33780b6.tar.bz2 -glibc-2.11-100-g33780b6-fedora.tar.bz2 +glibc-2.11-112-g8500fa8-fedora.tar.bz2 +glibc-2.11-112-g8500fa8.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index b346b1c..ffb35ac 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,17 +1,17 @@ ---- glibc-2.11-100-g33780b6/ChangeLog +--- glibc-2.11-112-g8500fa8/ChangeLog +++ glibc-2.11.90-7/ChangeLog -@@ -1,3 +1,10 @@ +@@ -47,6 +47,10 @@ + + * conform/data/unistd.h-data: lockf-constants Not needed for POSIX. + +2010-01-11 Andreas Schwab + -+ * io/fcntl.h: Only include once. -+ * io/sys/stat.h: Likewise. -+ -+ * bits/confname.h: Add missing comma, remove trailing commas. ++ * bits/confname.h: Remove trailing comma. + 2010-01-10 Ulrich Drepper * sysdeps/unix/sysv/linux/bits/sigaction.h: SA_RESTART, SA_NODEFER, -@@ -1549,6 +1556,11 @@ d2009-10-30 Ulrich Drepper +@@ -1598,6 +1602,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. @@ -23,7 +23,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -1814,6 +1826,11 @@ d2009-10-30 Ulrich Drepper +@@ -1863,6 +1872,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -35,7 +35,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -10507,6 +10524,10 @@ d2009-10-30 Ulrich Drepper +@@ -10556,6 +10570,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -46,7 +46,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -11764,6 +11785,15 @@ d2009-10-30 Ulrich Drepper +@@ -11813,6 +11831,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -62,7 +62,7 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.11-100-g33780b6/ChangeLog.15 +--- glibc-2.11-112-g8500fa8/ChangeLog.15 +++ glibc-2.11.90-7/ChangeLog.15 @@ -477,6 +477,14 @@ @@ -129,7 +129,7 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.11-100-g33780b6/ChangeLog.16 +--- glibc-2.11-112-g8500fa8/ChangeLog.16 +++ glibc-2.11.90-7/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT @@ -184,7 +184,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.11-100-g33780b6/Makeconfig +--- glibc-2.11-112-g8500fa8/Makeconfig +++ glibc-2.11.90-7/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. @@ -202,7 +202,7 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.11-100-g33780b6/bits/confname.h +--- glibc-2.11-112-g8500fa8/bits/confname.h +++ glibc-2.11.90-7/bits/confname.h @@ -527,7 +527,7 @@ enum @@ -213,21 +213,7 @@ #define _SC_THREAD_ROBUST_PRIO_PROTECT _SC_THREAD_ROBUST_PRIO_PROTECT }; -@@ -667,11 +667,11 @@ enum - #define _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LDFLAGS - _CS_POSIX_V7_LPBIG_OFFBIG_LIBS, - #define _CS_POSIX_V7_LPBIG_OFFBIG_LIBS _CS_POSIX_V7_LPBIG_OFFBIG_LIBS -- _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS -+ _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS, - #define _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS _CS_POSIX_V7_LPBIG_OFFBIG_LINTFLAGS - - _CS_V6_ENV, - #define _CS_V6_ENV _CS_V6_ENV -- _CS_V7_ENV, -+ _CS_V7_ENV - #define _CS_V7_ENV _CS_V7_ENV - }; ---- glibc-2.11-100-g33780b6/csu/Makefile +--- glibc-2.11-112-g8500fa8/csu/Makefile +++ glibc-2.11.90-7/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h @@ -239,7 +225,7 @@ vpath initfini.c $(sysdirs) ---- glibc-2.11-100-g33780b6/csu/elf-init.c +--- glibc-2.11-112-g8500fa8/csu/elf-init.c +++ glibc-2.11.90-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; @@ -265,7 +251,7 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.11-100-g33780b6/debug/tst-chk1.c +--- glibc-2.11-112-g8500fa8/debug/tst-chk1.c +++ glibc-2.11.90-7/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA @@ -295,7 +281,7 @@ # define O 0 # else # define O 1 ---- glibc-2.11-100-g33780b6/elf/ldconfig.c +--- glibc-2.11-112-g8500fa8/elf/ldconfig.c +++ glibc-2.11.90-7/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -378,7 +364,7 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.11-100-g33780b6/elf/tst-stackguard1.c +--- glibc-2.11-112-g8500fa8/elf/tst-stackguard1.c +++ glibc-2.11.90-7/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ @@ -404,17 +390,17 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-100-g33780b6/include/bits/stdlib-ldbl.h +--- glibc-2.11-112-g8500fa8/include/bits/stdlib-ldbl.h +++ glibc-2.11.90-7/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-100-g33780b6/include/bits/wchar-ldbl.h +--- glibc-2.11-112-g8500fa8/include/bits/wchar-ldbl.h +++ glibc-2.11.90-7/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-100-g33780b6/include/features.h +--- glibc-2.11-112-g8500fa8/include/features.h +++ glibc-2.11.90-7/include/features.h -@@ -304,8 +304,13 @@ +@@ -310,8 +310,13 @@ #endif #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \ @@ -430,7 +416,7 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.11-100-g33780b6/intl/locale.alias +--- glibc-2.11-112-g8500fa8/intl/locale.alias +++ glibc-2.11.90-7/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR @@ -441,35 +427,7 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.11-100-g33780b6/io/fcntl.h -+++ glibc-2.11.90-7/io/fcntl.h -@@ -38,7 +38,10 @@ __BEGIN_DECLS - # include /* For __mode_t and __dev_t. */ - # define __need_timespec - # include --# include -+# ifndef __bits_stat_h_included -+# include -+# define __bits_stat_h_included -+# endif - - # define S_IFMT __S_IFMT - # define S_IFDIR __S_IFDIR ---- glibc-2.11-100-g33780b6/io/sys/stat.h -+++ glibc-2.11.90-7/io/sys/stat.h -@@ -104,7 +104,10 @@ typedef __blksize_t blksize_t; - - __BEGIN_DECLS - --#include -+#ifndef __bits_stat_h_included -+# include -+# define __bits_stat_h_included -+#endif - - #if defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN - # define S_IFMT __S_IFMT ---- glibc-2.11-100-g33780b6/libio/stdio.h +--- glibc-2.11-112-g8500fa8/libio/stdio.h +++ glibc-2.11.90-7/libio/stdio.h @@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ @@ -484,7 +442,7 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.11-100-g33780b6/locale/iso-4217.def +--- glibc-2.11-112-g8500fa8/locale/iso-4217.def +++ glibc-2.11.90-7/locale/iso-4217.def @@ -8,6 +8,7 @@ * @@ -577,7 +535,7 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.11-100-g33780b6/locale/programs/locarchive.c +--- glibc-2.11-112-g8500fa8/locale/programs/locarchive.c +++ glibc-2.11.90-7/locale/programs/locarchive.c @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ @@ -610,7 +568,7 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.11-100-g33780b6/localedata/Makefile +--- glibc-2.11-112-g8500fa8/localedata/Makefile +++ glibc-2.11.90-7/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ @@ -620,7 +578,7 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.11-100-g33780b6/localedata/SUPPORTED +--- glibc-2.11-112-g8500fa8/localedata/SUPPORTED +++ glibc-2.11.90-7/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ @@ -663,7 +621,7 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.11-100-g33780b6/localedata/locales/cy_GB +--- glibc-2.11-112-g8500fa8/localedata/locales/cy_GB +++ glibc-2.11.90-7/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" @@ -679,7 +637,7 @@ END LC_TIME LC_MESSAGES ---- glibc-2.11-100-g33780b6/localedata/locales/en_GB +--- glibc-2.11-112-g8500fa8/localedata/locales/en_GB +++ glibc-2.11.90-7/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" @@ -692,7 +650,7 @@ date_fmt "/ / " ---- glibc-2.11-100-g33780b6/localedata/locales/no_NO +--- glibc-2.11-112-g8500fa8/localedata/locales/no_NO +++ glibc-2.11.90-7/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / @@ -764,7 +722,7 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.11-100-g33780b6/localedata/locales/zh_TW +--- glibc-2.11-112-g8500fa8/localedata/locales/zh_TW +++ glibc-2.11.90-7/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % @@ -793,7 +751,7 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.11-100-g33780b6/malloc/mcheck.c +--- glibc-2.11-112-g8500fa8/malloc/mcheck.c +++ glibc-2.11.90-7/malloc/mcheck.c @@ -24,9 +24,25 @@ # include @@ -870,7 +828,7 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.11-100-g33780b6/manual/libc.texinfo +--- glibc-2.11-112-g8500fa8/manual/libc.texinfo +++ glibc-2.11.90-7/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -881,7 +839,7 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.11-100-g33780b6/misc/sys/cdefs.h +--- glibc-2.11-112-g8500fa8/misc/sys/cdefs.h +++ glibc-2.11.90-7/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) @@ -926,7 +884,7 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.11-100-g33780b6/nis/nss +--- glibc-2.11-112-g8500fa8/nis/nss +++ glibc-2.11.90-7/nis/nss @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call @@ -934,7 +892,7 @@ # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-2.11-100-g33780b6/nptl/ChangeLog +--- glibc-2.11-112-g8500fa8/nptl/ChangeLog +++ glibc-2.11.90-7/nptl/ChangeLog @@ -3807,6 +3807,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt @@ -976,7 +934,7 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.11-100-g33780b6/nptl/Makefile +--- glibc-2.11-112-g8500fa8/nptl/Makefile +++ glibc-2.11.90-7/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) @@ -1010,7 +968,7 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.11-100-g33780b6/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11-112-g8500fa8/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ glibc-2.11.90-7/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ @@ -1020,7 +978,7 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.11-100-g33780b6/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11-112-g8500fa8/nptl/sysdeps/unix/sysv/linux/kernel-features.h +++ glibc-2.11.90-7/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next @@ -1029,7 +987,7 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.11-100-g33780b6/nptl/tst-stackguard1.c +--- glibc-2.11-112-g8500fa8/nptl/tst-stackguard1.c +++ glibc-2.11.90-7/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ @@ -1055,7 +1013,7 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-100-g33780b6/nscd/nscd.conf +--- glibc-2.11-112-g8500fa8/nscd/nscd.conf +++ glibc-2.11.90-7/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log @@ -1066,7 +1024,7 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.11-100-g33780b6/nscd/nscd.init +--- glibc-2.11-112-g8500fa8/nscd/nscd.init +++ glibc-2.11.90-7/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. @@ -1139,7 +1097,7 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.11-100-g33780b6/posix/Makefile +--- glibc-2.11-112-g8500fa8/posix/Makefile +++ glibc-2.11.90-7/posix/Makefile @@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ @@ -1161,7 +1119,7 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.11-100-g33780b6/posix/getconf.speclist.h +--- glibc-2.11-112-g8500fa8/posix/getconf.speclist.h +++ glibc-2.11.90-7/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include @@ -1203,7 +1161,7 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.11-100-g33780b6/streams/Makefile +--- glibc-2.11-112-g8500fa8/streams/Makefile +++ glibc-2.11.90-7/streams/Makefile @@ -21,7 +21,7 @@ # @@ -1214,7 +1172,7 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.11-100-g33780b6/sysdeps/generic/dl-cache.h +--- glibc-2.11-112-g8500fa8/sysdeps/generic/dl-cache.h +++ glibc-2.11.90-7/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) @@ -1231,7 +1189,7 @@ #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-100-g33780b6/sysdeps/i386/Makefile +--- glibc-2.11-112-g8500fa8/sysdeps/i386/Makefile +++ glibc-2.11.90-7/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). @@ -1257,7 +1215,7 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-100-g33780b6/sysdeps/ia64/Makefile +--- glibc-2.11-112-g8500fa8/sysdeps/ia64/Makefile +++ glibc-2.11.90-7/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing @@ -1270,7 +1228,7 @@ endif endif ---- glibc-2.11-100-g33780b6/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11-112-g8500fa8/sysdeps/ia64/ia64libgcc.S +++ glibc-2.11.90-7/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency @@ -1623,7 +1581,7 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.11-100-g33780b6/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11-112-g8500fa8/sysdeps/ia64/libgcc-compat.c +++ glibc-2.11.90-7/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility @@ -1710,7 +1668,7 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.11-100-g33780b6/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11-112-g8500fa8/sysdeps/powerpc/powerpc64/Makefile +++ glibc-2.11.90-7/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. @@ -1720,7 +1678,7 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-100-g33780b6/sysdeps/unix/nice.c +--- glibc-2.11-112-g8500fa8/sysdeps/unix/nice.c +++ glibc-2.11.90-7/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); @@ -1736,7 +1694,7 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/check_pf.c +++ glibc-2.11.90-7/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include @@ -1753,7 +1711,7 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/dl-osinfo.h +++ glibc-2.11.90-7/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA @@ -1802,7 +1760,7 @@ } else #endif ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/futimesat.c +++ glibc-2.11.90-7/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { @@ -1846,7 +1804,7 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/i386/dl-cache.h +++ glibc-2.11.90-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. @@ -1908,7 +1866,7 @@ + } while (0) + +#include_next ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/ia64/dl-cache.h +++ glibc-2.11.90-7/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ @@ -1942,7 +1900,7 @@ + } while (0) + #include_next ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +++ glibc-2.11.90-7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig @@ -1950,7 +1908,7 @@ +#else +#include +#endif ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +++ glibc-2.11.90-7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig @@ -1958,12 +1916,12 @@ +#else +#include +#endif ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +++ glibc-2.11.90-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-100-g33780b6/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/netlinkaccess.h +++ glibc-2.11.90-7/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ @@ -1990,7 +1948,7 @@ struct netlink_res { ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/paths.h +++ glibc-2.11.90-7/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" @@ -2001,7 +1959,7 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.11-100-g33780b6/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11-112-g8500fa8/sysdeps/unix/sysv/linux/tcsetattr.c +++ glibc-2.11.90-7/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { @@ -2048,7 +2006,7 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.11-100-g33780b6/timezone/zic.c +--- glibc-2.11-112-g8500fa8/timezone/zic.c +++ glibc-2.11.90-7/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) diff --git a/glibc.spec b/glibc.spec index 7cd8c5b..db9907e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.11-100-g33780b6 +%define glibcsrcdir glibc-2.11-112-g8500fa8 %define glibcversion 2.11.90 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -24,7 +24,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 7 +Release: 8 # 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 @@ -1033,6 +1033,10 @@ rm -f *.filelist* %endif %changelog +* Tue Jan 12 2010 Andreas Schwab - 2.11.90-8 +- Update from master. + - More POSIX conformance fixes. + * Mon Jan 11 2010 Andreas Schwab - 2.11.90-7 - Fix build failure. diff --git a/import.log b/import.log index 88b5f2c..97b790a 100644 --- a/import.log +++ b/import.log @@ -39,3 +39,4 @@ glibc-2_11_90-4:HEAD:glibc-2.11.90-4.src.rpm:1260808586 glibc-2_11_90-5:HEAD:glibc-2.11.90-5.src.rpm:1262613598 glibc-2_11_90-6:HEAD:glibc-2.11.90-6.src.rpm:1263202828 glibc-2_11_90-7:HEAD:glibc-2.11.90-7.src.rpm:1263223934 +glibc-2_11_90-8:HEAD:glibc-2.11.90-8.src.rpm:1263312973 diff --git a/sources b/sources index 2208ed8..c11b92b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2855dd7f96cba8d4d067625b6537300e glibc-2.11-100-g33780b6.tar.bz2 -e463d9ec3563aa1681d00dc57e954ffa glibc-2.11-100-g33780b6-fedora.tar.bz2 +ed1e7582e0c5d2552937e58db3875c4e glibc-2.11-112-g8500fa8-fedora.tar.bz2 +984be76e1d3a4c3afcbd78064da05ef8 glibc-2.11-112-g8500fa8.tar.bz2