From 3b880a91756a4b172dbec44ecc8bc98ad6c82020 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 7 Mar 2011 17:50:04 +0100 Subject: [PATCH] 2.13.90-6 --- .gitignore | 6 +- glibc-fedora.patch | 529 ++++++++++++++++++++++++++++----------------- glibc.spec | 13 +- sources | 6 +- 4 files changed, 349 insertions(+), 205 deletions(-) diff --git a/.gitignore b/.gitignore index 138090e..7536b31 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-2.13-33-g4bff6e0-fedora.tar.xz -/glibc-2.13-33-g4bff6e0.tar.xz -/glibc-ports-2.13-6-g57d366b.tar.xz +/glibc-2.13-39-g6a5ee10-fedora.tar.xz +/glibc-2.13-39-g6a5ee10.tar.xz +/glibc-ports-2.13-8-gfb3ed18.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index fb18eb1..ee11fb5 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,9 @@ ---- glibc-2.13-33-g4bff6e0/ChangeLog -+++ glibc-2.13.90-5/ChangeLog -@@ -1,3 +1,9 @@ +--- glibc-2.13-39-g6a5ee10/ChangeLog ++++ glibc-2.13.90-6/ChangeLog +@@ -34,18 +34,17 @@ + * sysdeps/sparc/sparc64/multiarch/memset.S(__bzero): Call + __bzero_ultra1 instead of __memset_ultra1. + +2011-03-02 Andreas Schwab + + [BZ #12454] @@ -8,9 +11,21 @@ + dependencies when there are none. + 2011-02-23 Andreas Schwab - Ulrich Drepper +- Ulrich Drepper -@@ -178,6 +184,12 @@ + [BZ #12509] +- * include/link.h (struct link_map): Add l_orig_initfini. + * elf/dl-load.c (_dl_map_object_from_fd): Free realname before + returning unsuccessfully. +- * elf/dl-close.c (_dl_close_worker): If this is the last explicit +- close of a file loaded at startup, restore the original l_initfini +- list. +- * elf/dl-deps.c (_dl_map_object_deps): Don't free old l_initfini +- list, store the pointer. + * elf/Makefile ($(objpfx)noload-mem): New rule. + (noload-ENV): Define. + (tests): Add $(objpfx)noload-mem. +@@ -214,6 +213,12 @@ * shadow/sgetspent.c: Check return value of __sgetspent_r instead of errno. @@ -23,7 +38,7 @@ 2011-01-19 Ulrich Drepper [BZ #11724] -@@ -502,6 +514,11 @@ +@@ -538,6 +543,11 @@ * sysdeps/unix/sysv/linux/sys/swap.h (SWAP_FLAG_DISCARD): Define. @@ -35,12 +50,19 @@ 2010-11-11 Andreas Schwab * posix/fnmatch_loop.c (NEW_PATTERN): Fix use of alloca. -@@ -865,6 +882,22 @@ +@@ -901,6 +911,29 @@ * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): Mask out sign-bit copies when constructing f_fsid. +2010-09-27 Andreas Schwab + ++ * include/link.h (struct link_map): Add l_free_initfini. ++ * elf/dl-deps.c (_dl_map_object_deps): Set it when assigning ++ l_initfini. ++ * elf/rtld.c (dl_main): Clear it on all objects loaded on startup. ++ * elf/dl-libc.c (free_mem): Free l_initfini if l_free_initfini is ++ set. ++ + [BZ #11561] + * posix/regcomp.c (parse_bracket_exp): When looking up collating + elements compare against the byte sequence of it, not its name. @@ -58,7 +80,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -1656,6 +1689,32 @@ +@@ -1692,6 +1725,32 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -91,7 +113,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -1708,6 +1767,24 @@ +@@ -1744,6 +1803,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -116,8 +138,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.13-33-g4bff6e0/ChangeLog.15 -+++ glibc-2.13.90-5/ChangeLog.15 +--- glibc-2.13-39-g6a5ee10/ChangeLog.15 ++++ glibc-2.13.90-6/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -183,8 +205,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.13-33-g4bff6e0/ChangeLog.16 -+++ glibc-2.13.90-5/ChangeLog.16 +--- glibc-2.13-39-g6a5ee10/ChangeLog.16 ++++ glibc-2.13.90-6/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -238,8 +260,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.13-33-g4bff6e0/ChangeLog.17 -+++ glibc-2.13.90-5/ChangeLog.17 +--- glibc-2.13-39-g6a5ee10/ChangeLog.17 ++++ glibc-2.13.90-6/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -318,8 +340,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.13-33-g4bff6e0/Makeconfig -+++ glibc-2.13.90-5/Makeconfig +--- glibc-2.13-39-g6a5ee10/Makeconfig ++++ glibc-2.13.90-6/Makeconfig @@ -785,12 +785,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -336,8 +358,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.13-33-g4bff6e0/csu/Makefile -+++ glibc-2.13.90-5/csu/Makefile +--- glibc-2.13-39-g6a5ee10/csu/Makefile ++++ glibc-2.13.90-6/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -348,8 +370,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.13-33-g4bff6e0/csu/elf-init.c -+++ glibc-2.13.90-5/csu/elf-init.c +--- glibc-2.13-39-g6a5ee10/csu/elf-init.c ++++ glibc-2.13.90-6/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; @@ -374,8 +396,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.13-33-g4bff6e0/debug/tst-chk1.c -+++ glibc-2.13.90-5/debug/tst-chk1.c +--- glibc-2.13-39-g6a5ee10/debug/tst-chk1.c ++++ glibc-2.13.90-6/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -404,8 +426,8 @@ # define O 0 # else # define O 1 ---- glibc-2.13-33-g4bff6e0/elf/Makefile -+++ glibc-2.13.90-5/elf/Makefile +--- glibc-2.13-39-g6a5ee10/elf/Makefile ++++ glibc-2.13.90-6/elf/Makefile @@ -89,6 +89,7 @@ distribute := rtld-Rules \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload6mod1.c unload6mod2.c unload6mod3.c \ @@ -459,9 +481,36 @@ ifdef libdl $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so ---- glibc-2.13-33-g4bff6e0/elf/dl-close.c -+++ glibc-2.13.90-5/elf/dl-close.c -@@ -430,6 +430,13 @@ _dl_close_worker (struct link_map *map) +--- glibc-2.13-39-g6a5ee10/elf/dl-close.c ++++ glibc-2.13.90-6/elf/dl-close.c +@@ -1,5 +1,5 @@ + /* Close a shared object opened by `_dl_open'. +- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map) + if (map->l_direct_opencount > 0 || map->l_type != lt_loaded + || dl_close_state != not_pending) + { +- if (map->l_direct_opencount == 0) +- { +- if (map->l_type == lt_loaded) +- dl_close_state = rerun; +- else if (map->l_type == lt_library) +- { +- struct link_map **oldp = map->l_initfini; +- map->l_initfini = map->l_orig_initfini; +- _dl_scope_free (oldp); +- } +- } ++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) ++ dl_close_state = rerun; + + /* There are still references to this object. Do nothing more. */ + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) +@@ -430,6 +421,13 @@ _dl_close_worker (struct link_map *map) imap->l_scope_max = new_size; } @@ -475,9 +524,17 @@ /* The loader is gone, so mark the object as not having one. Note: l_idx != IDX_STILL_USED -> object will be removed. */ ---- glibc-2.13-33-g4bff6e0/elf/dl-deps.c -+++ glibc-2.13.90-5/elf/dl-deps.c -@@ -623,55 +623,58 @@ Filters not supported with LD_TRACE_PRELINKING")); +--- glibc-2.13-39-g6a5ee10/elf/dl-deps.c ++++ glibc-2.13.90-6/elf/dl-deps.c +@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, + nneeded * sizeof needed[0]); + atomic_write_barrier (); + l->l_initfini = l_initfini; ++ l->l_free_initfini = 1; + } + + /* If we have no auxiliary objects just go on to the next map. */ +@@ -623,61 +624,65 @@ Filters not supported with LD_TRACE_PRELINKING")); /* We can skip looking for the binary itself which is at the front of the search list. */ @@ -577,8 +634,22 @@ } /* Terminate the list of dependencies. */ ---- glibc-2.13-33-g4bff6e0/elf/dl-init.c -+++ glibc-2.13.90-5/elf/dl-init.c + l_initfini[nlist] = NULL; + atomic_write_barrier (); + map->l_initfini = l_initfini; ++ map->l_free_initfini = 1; + if (l_reldeps != NULL) + { + atomic_write_barrier (); +@@ -686,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING")); + _dl_scope_free (old_l_reldeps); + } + if (old_l_initfini != NULL) +- map->l_orig_initfini = old_l_initfini; ++ _dl_scope_free (old_l_initfini); + } +--- glibc-2.13-39-g6a5ee10/elf/dl-init.c ++++ glibc-2.13.90-6/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -601,8 +672,36 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.13-33-g4bff6e0/elf/dl-object.c -+++ glibc-2.13.90-5/elf/dl-object.c +--- glibc-2.13-39-g6a5ee10/elf/dl-libc.c ++++ glibc-2.13.90-6/elf/dl-libc.c +@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) + + for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) + { +- /* Remove all additional names added to the objects. */ + for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next) + { + struct libname_list *lnp = l->l_libname->next; + + l->l_libname->next = NULL; + ++ /* Remove all additional names added to the objects. */ + while (lnp != NULL) + { + struct libname_list *old = lnp; +@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem) + if (! old->dont_free) + free (old); + } ++ ++ /* Free the initfini dependency list. */ ++ if (l->l_free_initfini) ++ free (l->l_initfini); + } + + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 +--- glibc-2.13-39-g6a5ee10/elf/dl-object.c ++++ glibc-2.13.90-6/elf/dl-object.c @@ -220,6 +220,9 @@ _dl_new_object (char *realname, const char *libname, int type, out: new->l_origin = origin; @@ -613,8 +712,8 @@ return new; } ---- glibc-2.13-33-g4bff6e0/elf/dl-support.c -+++ glibc-2.13.90-5/elf/dl-support.c +--- glibc-2.13-39-g6a5ee10/elf/dl-support.c ++++ glibc-2.13.90-6/elf/dl-support.c @@ -81,10 +81,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -626,8 +725,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.13-33-g4bff6e0/elf/ldconfig.c -+++ glibc-2.13.90-5/elf/ldconfig.c +--- glibc-2.13-39-g6a5ee10/elf/ldconfig.c ++++ glibc-2.13.90-6/elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -709,8 +808,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.13-33-g4bff6e0/elf/rtld.c -+++ glibc-2.13.90-5/elf/rtld.c +--- glibc-2.13-39-g6a5ee10/elf/rtld.c ++++ glibc-2.13.90-6/elf/rtld.c @@ -107,7 +107,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -738,7 +837,15 @@ if (*user_entry == (ElfW(Addr)) ENTRY_POINT) { -@@ -2304,7 +2300,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +@@ -2255,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + lnp->dont_free = 1; + lnp = lnp->next; + } ++ l->l_free_initfini = 0; + + if (l != &GL(dl_rtld_map)) + _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +@@ -2304,7 +2301,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", /* Make sure no new search directories have been added. */ assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs)); @@ -746,8 +853,8 @@ if (! prelinked && rtld_multiple_ref) { /* There was an explicit ref to the dynamic linker as a shared lib. ---- glibc-2.13-33-g4bff6e0/elf/tst-stackguard1.c -+++ glibc-2.13.90-5/elf/tst-stackguard1.c +--- glibc-2.13-39-g6a5ee10/elf/tst-stackguard1.c ++++ glibc-2.13.90-6/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -772,8 +879,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.13-33-g4bff6e0/elf/unload8.c -+++ glibc-2.13.90-5/elf/unload8.c +--- glibc-2.13-39-g6a5ee10/elf/unload8.c ++++ glibc-2.13.90-6/elf/unload8.c @@ -0,0 +1,33 @@ +#include +#include @@ -808,8 +915,8 @@ + + return 0; +} ---- glibc-2.13-33-g4bff6e0/elf/unload8mod1.c -+++ glibc-2.13.90-5/elf/unload8mod1.c +--- glibc-2.13-39-g6a5ee10/elf/unload8mod1.c ++++ glibc-2.13.90-6/elf/unload8mod1.c @@ -0,0 +1,7 @@ +extern void mod2 (void); + @@ -818,12 +925,12 @@ +{ + mod2 (); +} ---- glibc-2.13-33-g4bff6e0/elf/unload8mod1x.c -+++ glibc-2.13.90-5/elf/unload8mod1x.c +--- glibc-2.13-39-g6a5ee10/elf/unload8mod1x.c ++++ glibc-2.13.90-6/elf/unload8mod1x.c @@ -0,0 +1 @@ +int mod1x; ---- glibc-2.13-33-g4bff6e0/elf/unload8mod2.c -+++ glibc-2.13.90-5/elf/unload8mod2.c +--- glibc-2.13-39-g6a5ee10/elf/unload8mod2.c ++++ glibc-2.13.90-6/elf/unload8mod2.c @@ -0,0 +1,7 @@ +extern void mod3 (void); + @@ -832,8 +939,8 @@ +{ + mod3 (); +} ---- glibc-2.13-33-g4bff6e0/elf/unload8mod3.c -+++ glibc-2.13.90-5/elf/unload8mod3.c +--- glibc-2.13-39-g6a5ee10/elf/unload8mod3.c ++++ glibc-2.13.90-6/elf/unload8mod3.c @@ -0,0 +1,27 @@ +#include +#include @@ -862,16 +969,16 @@ + + atexit (mod3_fini); +} ---- glibc-2.13-33-g4bff6e0/include/bits/stdlib-ldbl.h -+++ glibc-2.13.90-5/include/bits/stdlib-ldbl.h +--- glibc-2.13-39-g6a5ee10/include/bits/stdlib-ldbl.h ++++ glibc-2.13.90-6/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.13-33-g4bff6e0/include/bits/wchar-ldbl.h -+++ glibc-2.13.90-5/include/bits/wchar-ldbl.h +--- glibc-2.13-39-g6a5ee10/include/bits/wchar-ldbl.h ++++ glibc-2.13.90-6/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.13-33-g4bff6e0/include/features.h -+++ glibc-2.13.90-5/include/features.h +--- glibc-2.13-39-g6a5ee10/include/features.h ++++ glibc-2.13.90-6/include/features.h @@ -309,8 +309,13 @@ #endif @@ -888,16 +995,46 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.13-33-g4bff6e0/include/sys/resource.h -+++ glibc-2.13.90-5/include/sys/resource.h +--- glibc-2.13-39-g6a5ee10/include/link.h ++++ glibc-2.13.90-6/include/link.h +@@ -1,6 +1,6 @@ + /* Data structure for communication from the run-time dynamic linker for + loaded ELF shared objects. +- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -192,6 +192,9 @@ struct link_map + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ ++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be ++ freed, ie. not allocated with ++ the dummy malloc in ld.so. */ + + /* Collected information about own RPATH directories. */ + struct r_search_path_struct l_rpath_dirs; +@@ -240,9 +243,6 @@ struct link_map + + /* List of object in order of the init and fini calls. */ + struct link_map **l_initfini; +- /* The init and fini list generated at startup, saved when the +- object is also loaded dynamically. */ +- struct link_map **l_orig_initfini; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps +--- glibc-2.13-39-g6a5ee10/include/sys/resource.h ++++ glibc-2.13.90-6/include/sys/resource.h @@ -13,4 +13,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) extern int __setrlimit (enum __rlimit_resource __resource, const struct rlimit *__rlimits); +libc_hidden_proto (__getrlimit) #endif ---- glibc-2.13-33-g4bff6e0/inet/Makefile -+++ glibc-2.13.90-5/inet/Makefile +--- glibc-2.13-39-g6a5ee10/inet/Makefile ++++ glibc-2.13.90-6/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -907,8 +1044,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.13-33-g4bff6e0/intl/locale.alias -+++ glibc-2.13.90-5/intl/locale.alias +--- glibc-2.13-39-g6a5ee10/intl/locale.alias ++++ glibc-2.13.90-6/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -918,8 +1055,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.13-33-g4bff6e0/libio/stdio.h -+++ glibc-2.13.90-5/libio/stdio.h +--- glibc-2.13-39-g6a5ee10/libio/stdio.h ++++ glibc-2.13.90-6/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. */ @@ -933,8 +1070,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.13-33-g4bff6e0/locale/iso-4217.def -+++ glibc-2.13.90-5/locale/iso-4217.def +--- glibc-2.13-39-g6a5ee10/locale/iso-4217.def ++++ glibc-2.13.90-6/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1026,8 +1163,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.13-33-g4bff6e0/locale/programs/locarchive.c -+++ glibc-2.13.90-5/locale/programs/locarchive.c +--- glibc-2.13-39-g6a5ee10/locale/programs/locarchive.c ++++ glibc-2.13.90-6/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; @@ -1086,8 +1223,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.13-33-g4bff6e0/localedata/ChangeLog -+++ glibc-2.13.90-5/localedata/ChangeLog +--- glibc-2.13-39-g6a5ee10/localedata/ChangeLog ++++ glibc-2.13.90-6/localedata/ChangeLog @@ -1,3 +1,8 @@ +2010-12-08 Andreas Schwab + @@ -1097,8 +1234,8 @@ 2010-05-17 Andreas Schwab * locales/es_CR (LC_ADDRESS): Fix character names in lang_ab. ---- glibc-2.13-33-g4bff6e0/localedata/Makefile -+++ glibc-2.13.90-5/localedata/Makefile +--- glibc-2.13-39-g6a5ee10/localedata/Makefile ++++ glibc-2.13.90-6/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1107,8 +1244,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.13-33-g4bff6e0/localedata/SUPPORTED -+++ glibc-2.13.90-5/localedata/SUPPORTED +--- glibc-2.13-39-g6a5ee10/localedata/SUPPORTED ++++ glibc-2.13.90-6/localedata/SUPPORTED @@ -46,8 +46,8 @@ ar_TN.UTF-8/UTF-8 \ ar_TN/ISO-8859-6 \ ar_YE.UTF-8/UTF-8 \ @@ -1172,8 +1309,8 @@ ug_CN/UTF-8 \ uk_UA.UTF-8/UTF-8 \ uk_UA/KOI8-U \ ---- glibc-2.13-33-g4bff6e0/localedata/locales/cy_GB -+++ glibc-2.13.90-5/localedata/locales/cy_GB +--- glibc-2.13-39-g6a5ee10/localedata/locales/cy_GB ++++ glibc-2.13.90-6/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1188,8 +1325,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.13-33-g4bff6e0/localedata/locales/en_GB -+++ glibc-2.13.90-5/localedata/locales/en_GB +--- glibc-2.13-39-g6a5ee10/localedata/locales/en_GB ++++ glibc-2.13.90-6/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1201,8 +1338,8 @@ date_fmt "/ / " ---- glibc-2.13-33-g4bff6e0/localedata/locales/no_NO -+++ glibc-2.13.90-5/localedata/locales/no_NO +--- glibc-2.13-39-g6a5ee10/localedata/locales/no_NO ++++ glibc-2.13.90-6/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1273,8 +1410,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.13-33-g4bff6e0/localedata/locales/zh_TW -+++ glibc-2.13.90-5/localedata/locales/zh_TW +--- glibc-2.13-39-g6a5ee10/localedata/locales/zh_TW ++++ glibc-2.13.90-6/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1302,8 +1439,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.13-33-g4bff6e0/login/programs/pt_chown.c -+++ glibc-2.13.90-5/login/programs/pt_chown.c +--- glibc-2.13-39-g6a5ee10/login/programs/pt_chown.c ++++ glibc-2.13.90-6/login/programs/pt_chown.c @@ -29,6 +29,7 @@ #include #include @@ -1345,8 +1482,8 @@ - return EXIT_SUCCESS; } ---- glibc-2.13-33-g4bff6e0/malloc/mcheck.c -+++ glibc-2.13.90-5/malloc/mcheck.c +--- glibc-2.13-39-g6a5ee10/malloc/mcheck.c ++++ glibc-2.13.90-6/malloc/mcheck.c @@ -25,10 +25,26 @@ # include # include @@ -1423,8 +1560,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.13-33-g4bff6e0/manual/libc.texinfo -+++ glibc-2.13.90-5/manual/libc.texinfo +--- glibc-2.13-39-g6a5ee10/manual/libc.texinfo ++++ glibc-2.13.90-6/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1434,8 +1571,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.13-33-g4bff6e0/misc/sys/cdefs.h -+++ glibc-2.13.90-5/misc/sys/cdefs.h +--- glibc-2.13-39-g6a5ee10/misc/sys/cdefs.h ++++ glibc-2.13.90-6/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) @@ -1479,8 +1616,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.13-33-g4bff6e0/nis/Makefile -+++ glibc-2.13.90-5/nis/Makefile +--- glibc-2.13-39-g6a5ee10/nis/Makefile ++++ glibc-2.13.90-6/nis/Makefile @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) include ../Rules @@ -1490,8 +1627,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.13-33-g4bff6e0/nis/nss -+++ glibc-2.13.90-5/nis/nss +--- glibc-2.13-39-g6a5ee10/nis/nss ++++ glibc-2.13.90-6/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 @@ -1501,8 +1638,8 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.13-33-g4bff6e0/nptl/ChangeLog -+++ glibc-2.13.90-5/nptl/ChangeLog +--- glibc-2.13-39-g6a5ee10/nptl/ChangeLog ++++ glibc-2.13.90-6/nptl/ChangeLog @@ -3991,6 +3991,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1543,8 +1680,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.13-33-g4bff6e0/nptl/Makefile -+++ glibc-2.13.90-5/nptl/Makefile +--- glibc-2.13-39-g6a5ee10/nptl/Makefile ++++ glibc-2.13.90-6/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1577,8 +1714,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.13-33-g4bff6e0/nptl/Versions -+++ glibc-2.13.90-5/nptl/Versions +--- glibc-2.13-39-g6a5ee10/nptl/Versions ++++ glibc-2.13.90-6/nptl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; # Internal libc interface to libpthread @@ -1587,8 +1724,8 @@ } } ---- glibc-2.13-33-g4bff6e0/nptl/allocatestack.c -+++ glibc-2.13.90-5/nptl/allocatestack.c +--- glibc-2.13-39-g6a5ee10/nptl/allocatestack.c ++++ glibc-2.13.90-6/nptl/allocatestack.c @@ -994,7 +994,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) /* If the thread is exiting right now, ignore it. */ @@ -1607,8 +1744,8 @@ } while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, ch | SETXID_BITMASK, ch)); ---- glibc-2.13-33-g4bff6e0/nptl/nptl-init.c -+++ glibc-2.13.90-5/nptl/nptl-init.c +--- glibc-2.13-39-g6a5ee10/nptl/nptl-init.c ++++ glibc-2.13.90-6/nptl/nptl-init.c @@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void) /* Determine the default allowed stack size. This is the size used in case the user does not specify one. */ @@ -1618,8 +1755,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.13-33-g4bff6e0/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.13.90-5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.13-39-g6a5ee10/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.13.90-6/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 @@ -1628,8 +1765,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.13-33-g4bff6e0/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.13.90-5/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.13-39-g6a5ee10/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.13.90-6/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -1637,8 +1774,8 @@ + __uname; + } +} ---- glibc-2.13-33-g4bff6e0/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.13.90-5/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.13-39-g6a5ee10/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.13.90-6/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -1648,8 +1785,8 @@ cp = u.uts.version; else { ---- glibc-2.13-33-g4bff6e0/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.13.90-5/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.13-39-g6a5ee10/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.13.90-6/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1657,8 +1794,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.13-33-g4bff6e0/nptl/tst-stackguard1.c -+++ glibc-2.13.90-5/nptl/tst-stackguard1.c +--- glibc-2.13-39-g6a5ee10/nptl/tst-stackguard1.c ++++ glibc-2.13.90-6/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1683,8 +1820,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.13-33-g4bff6e0/nscd/nscd.conf -+++ glibc-2.13.90-5/nscd/nscd.conf +--- glibc-2.13-39-g6a5ee10/nscd/nscd.conf ++++ glibc-2.13.90-6/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1694,8 +1831,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.13-33-g4bff6e0/nscd/nscd.init -+++ glibc-2.13.90-5/nscd/nscd.init +--- glibc-2.13-39-g6a5ee10/nscd/nscd.init ++++ glibc-2.13.90-6/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1772,8 +1909,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.13-33-g4bff6e0/nss/Makefile -+++ glibc-2.13.90-5/nss/Makefile +--- glibc-2.13-39-g6a5ee10/nss/Makefile ++++ glibc-2.13.90-6/nss/Makefile @@ -75,6 +75,7 @@ endif include ../Rules @@ -1782,8 +1919,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.13-33-g4bff6e0/nss/nss_files/files-XXX.c -+++ glibc-2.13.90-5/nss/nss_files/files-XXX.c +--- glibc-2.13-39-g6a5ee10/nss/nss_files/files-XXX.c ++++ glibc-2.13.90-6/nss/nss_files/files-XXX.c @@ -1,5 +1,5 @@ /* Common code for file-based databases in nss_files module. - Copyright (C) 1996-1999,2001,2002,2004,2007,2008 @@ -1800,8 +1937,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.13-33-g4bff6e0/posix/Makefile -+++ glibc-2.13.90-5/posix/Makefile +--- glibc-2.13-39-g6a5ee10/posix/Makefile ++++ glibc-2.13.90-6/posix/Makefile @@ -325,15 +325,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1822,8 +1959,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.13-33-g4bff6e0/posix/gai.conf -+++ glibc-2.13.90-5/posix/gai.conf +--- glibc-2.13-39-g6a5ee10/posix/gai.conf ++++ glibc-2.13.90-6/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1848,8 +1985,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.13-33-g4bff6e0/posix/getconf.speclist.h -+++ glibc-2.13.90-5/posix/getconf.speclist.h +--- glibc-2.13-39-g6a5ee10/posix/getconf.speclist.h ++++ glibc-2.13.90-6/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1890,8 +2027,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.13-33-g4bff6e0/posix/regcomp.c -+++ glibc-2.13.90-5/posix/regcomp.c +--- glibc-2.13-39-g6a5ee10/posix/regcomp.c ++++ glibc-2.13.90-6/posix/regcomp.c @@ -2745,40 +2745,29 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token, /* Local function for parse_bracket_exp used in _LIBC environement. @@ -2023,8 +2160,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.13-33-g4bff6e0/resolv/Makefile -+++ glibc-2.13.90-5/resolv/Makefile +--- glibc-2.13-39-g6a5ee10/resolv/Makefile ++++ glibc-2.13.90-6/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -2033,8 +2170,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.13-33-g4bff6e0/resource/getrlimit.c -+++ glibc-2.13.90-5/resource/getrlimit.c +--- glibc-2.13-39-g6a5ee10/resource/getrlimit.c ++++ glibc-2.13.90-6/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -2043,8 +2180,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.13-33-g4bff6e0/stdio-common/vfprintf.c -+++ glibc-2.13.90-5/stdio-common/vfprintf.c +--- glibc-2.13-39-g6a5ee10/stdio-common/vfprintf.c ++++ glibc-2.13.90-6/stdio-common/vfprintf.c @@ -1160,41 +1160,9 @@ vfprintf (FILE *s, const CHAR_T *format, va_list ap) else if (!is_long && spec != L_('S')) \ { \ @@ -2090,8 +2227,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.13-33-g4bff6e0/streams/Makefile -+++ glibc-2.13.90-5/streams/Makefile +--- glibc-2.13-39-g6a5ee10/streams/Makefile ++++ glibc-2.13.90-6/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -2101,8 +2238,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.13-33-g4bff6e0/sunrpc/Makefile -+++ glibc-2.13.90-5/sunrpc/Makefile +--- glibc-2.13-39-g6a5ee10/sunrpc/Makefile ++++ glibc-2.13.90-6/sunrpc/Makefile @@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions CPPFLAGS += -D_RPC_THREAD_SAFE_ @@ -2114,8 +2251,8 @@ include ../Rules $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \ ---- glibc-2.13-33-g4bff6e0/sysdeps/generic/dl-cache.h -+++ glibc-2.13.90-5/sysdeps/generic/dl-cache.h +--- glibc-2.13-39-g6a5ee10/sysdeps/generic/dl-cache.h ++++ glibc-2.13.90-6/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -2131,8 +2268,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.13-33-g4bff6e0/sysdeps/i386/Makefile -+++ glibc-2.13.90-5/sysdeps/i386/Makefile +--- glibc-2.13-39-g6a5ee10/sysdeps/i386/Makefile ++++ glibc-2.13.90-6/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -2157,8 +2294,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.13-33-g4bff6e0/sysdeps/i386/i686/Makefile -+++ glibc-2.13.90-5/sysdeps/i386/i686/Makefile +--- glibc-2.13-39-g6a5ee10/sysdeps/i386/i686/Makefile ++++ glibc-2.13.90-6/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -2179,8 +2316,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.13-33-g4bff6e0/sysdeps/i386/i686/multiarch/strspn.S -+++ glibc-2.13.90-5/sysdeps/i386/i686/multiarch/strspn.S +--- glibc-2.13-39-g6a5ee10/sysdeps/i386/i686/multiarch/strspn.S ++++ glibc-2.13.90-6/sysdeps/i386/i686/multiarch/strspn.S @@ -76,8 +76,8 @@ END(strspn) # define ENTRY(name) \ .type __strspn_ia32, @function; \ @@ -2192,8 +2329,8 @@ CALL_MCOUNT # undef END # define END(name) \ ---- glibc-2.13-33-g4bff6e0/sysdeps/ia64/Makefile -+++ glibc-2.13.90-5/sysdeps/ia64/Makefile +--- glibc-2.13-39-g6a5ee10/sysdeps/ia64/Makefile ++++ glibc-2.13.90-6/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -2205,8 +2342,8 @@ endif endif ---- glibc-2.13-33-g4bff6e0/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.13.90-5/sysdeps/ia64/ia64libgcc.S +--- glibc-2.13-39-g6a5ee10/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.13.90-6/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2558,8 +2695,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.13-33-g4bff6e0/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.13.90-5/sysdeps/ia64/libgcc-compat.c +--- glibc-2.13-39-g6a5ee10/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.13.90-6/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -2645,16 +2782,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.13-33-g4bff6e0/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.13.90-5/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.13-39-g6a5ee10/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.13.90-6/sysdeps/mach/hurd/getrlimit.c @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) return 0; } +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) ---- glibc-2.13-33-g4bff6e0/sysdeps/posix/getaddrinfo.c -+++ glibc-2.13.90-5/sysdeps/posix/getaddrinfo.c +--- glibc-2.13-39-g6a5ee10/sysdeps/posix/getaddrinfo.c ++++ glibc-2.13.90-6/sysdeps/posix/getaddrinfo.c @@ -1101,10 +1101,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, @@ -2668,8 +2805,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.13-33-g4bff6e0/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.13.90-5/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.13-39-g6a5ee10/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.13.90-6/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -2678,16 +2815,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.13-33-g4bff6e0/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.13.90-5/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.13-39-g6a5ee10/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.13.90-6/sysdeps/powerpc/powerpc64/elf/Makefile @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs) CFLAGS-rtld-memmove.os = $(no-special-regs) CFLAGS-rtld-memchr.os = $(no-special-regs) CFLAGS-rtld-strnlen.os = $(no-special-regs) + +CFLAGS-gmon-start.c = -fno-strict-aliasing ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/nice.c -+++ glibc-2.13.90-5/sysdeps/unix/nice.c +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/nice.c ++++ glibc-2.13.90-6/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -2702,8 +2839,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -2719,8 +2856,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -2768,8 +2905,8 @@ } else #endif ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2812,8 +2949,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -2823,8 +2960,8 @@ assert (GLRO(dl_pagesize) != 0); return GLRO(dl_pagesize); #else ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.13.90-6/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. @@ -2885,16 +3022,16 @@ + } while (0) + +#include_next ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) } weak_alias (__new_getrlimit, __getrlimit); +libc_hidden_weak (__getrlimit) versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2); ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2927,29 +3064,29 @@ + } while (0) + #include_next ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.13.90-6/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.13-33-g4bff6e0/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2975,8 +3112,8 @@ struct netlink_res { ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2986,8 +3123,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.13-33-g4bff6e0/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.13.90-5/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.13-39-g6a5ee10/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.13.90-6/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -3033,8 +3170,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.13-33-g4bff6e0/timezone/zic.c -+++ glibc-2.13.90-5/timezone/zic.c +--- glibc-2.13-39-g6a5ee10/timezone/zic.c ++++ glibc-2.13.90-6/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 fd3306a..8361084 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.13-33-g4bff6e0 +%define glibcsrcdir glibc-2.13-39-g6a5ee10 %define glibcversion 2.13.90 -%define glibcportsdir glibc-ports-2.13-6-g57d366b +%define glibcportsdir glibc-ports-2.13-8-gfb3ed18 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon alphaev6 @@ -25,7 +25,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 5 +Release: 6 # 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 @@ -1043,6 +1043,13 @@ rm -f *.filelist* %endif %changelog +* Mon Mar 7 2011 Andreas Schwab - 2.13.90-6 +- Update from master + - Fix loading first object along a path when tracing + - Enable SSE2 memset for AMD'supcoming Orochi processor + - Don't read past end of buffer in fmemopen +- Revert broken changes (#682307) + * Wed Mar 2 2011 Andreas Schwab - 2.13.90-5 - Update from master - Fix memory leak in dlopen with RTLD_NOLOAD (BZ#12509) diff --git a/sources b/sources index a2f7ffb..2964f70 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -75ac7da4ec2e10f1fef9054f7a37c9ee glibc-2.13-33-g4bff6e0-fedora.tar.xz -5c230f01bdda56c4eb527eb3b3daadf7 glibc-2.13-33-g4bff6e0.tar.xz -811bae46f44600d486881064e175555e glibc-ports-2.13-6-g57d366b.tar.xz +72dfc7d22615d6c1b9031cd031485668 glibc-2.13-39-g6a5ee10-fedora.tar.xz +a89c9dfb7498466c4d13833a5d553ed4 glibc-2.13-39-g6a5ee10.tar.xz +def1c8b4f13efe6c677a298855cd6cc4 glibc-ports-2.13-8-gfb3ed18.tar.xz