From ebd7654e99c6e40c8121c8272e5d9ddd04f4d928 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Tue, 28 Sep 2010 15:19:46 +0200 Subject: [PATCH] 2.12.90-14 --- glibc-fedora.patch | 225 +++++++++++++++++++++++++-------------------- glibc.spec | 8 +- sources | 2 +- 3 files changed, 133 insertions(+), 102 deletions(-) diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 59bb166..c3cdb41 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,11 @@ --- glibc-2.12-163-g315970f/ChangeLog -+++ glibc-2.12.90-13/ChangeLog -@@ -1,3 +1,26 @@ ++++ glibc-2.12.90-14/ChangeLog +@@ -1,3 +1,31 @@ ++2010-09-28 Andreas Schwab ++ ++ * elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs) ++ before performing relro protection. ++ +2010-09-27 Andreas Schwab + + * include/link.h (struct link_map): Add l_free_initfini. @@ -27,7 +32,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -60,6 +83,13 @@ +@@ -60,6 +88,13 @@ * resolv/res_init.c (__res_vinit): Count the default server we added. @@ -41,7 +46,7 @@ 2010-09-08 Chung-Lin Tang Ulrich Drepper -@@ -798,6 +828,32 @@ +@@ -798,6 +833,32 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -74,7 +79,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -850,6 +906,24 @@ +@@ -850,6 +911,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -100,7 +105,7 @@ * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. --- glibc-2.12-163-g315970f/ChangeLog.15 -+++ glibc-2.12.90-13/ChangeLog.15 ++++ glibc-2.12.90-14/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -167,7 +172,7 @@ * scripts/extract-abilist.awk: If `lastversion' variable defined, omit --- glibc-2.12-163-g315970f/ChangeLog.16 -+++ glibc-2.12.90-13/ChangeLog.16 ++++ glibc-2.12.90-14/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -222,7 +227,7 @@ [BZ #1137] --- glibc-2.12-163-g315970f/ChangeLog.17 -+++ glibc-2.12.90-13/ChangeLog.17 ++++ glibc-2.12.90-14/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -308,7 +313,7 @@ [BZ #3632] --- glibc-2.12-163-g315970f/Makeconfig -+++ glibc-2.12.90-13/Makeconfig ++++ glibc-2.12.90-14/Makeconfig @@ -789,12 +789,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -346,7 +351,7 @@ endif # Makeconfig not yet included --- glibc-2.12-163-g315970f/csu/Makefile -+++ glibc-2.12.90-13/csu/Makefile ++++ glibc-2.12.90-14/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -358,7 +363,7 @@ vpath initfini.c $(sysdirs) --- glibc-2.12-163-g315970f/csu/elf-init.c -+++ glibc-2.12.90-13/csu/elf-init.c ++++ glibc-2.12.90-14/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; @@ -384,7 +389,7 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ --- glibc-2.12-163-g315970f/debug/tst-chk1.c -+++ glibc-2.12.90-13/debug/tst-chk1.c ++++ glibc-2.12.90-14/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -414,7 +419,7 @@ # else # define O 1 --- glibc-2.12-163-g315970f/elf/Makefile -+++ glibc-2.12.90-13/elf/Makefile ++++ glibc-2.12.90-14/elf/Makefile @@ -89,6 +89,7 @@ distribute := rtld-Rules \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload6mod1.c unload6mod2.c unload6mod3.c \ @@ -469,7 +474,7 @@ $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so --- glibc-2.12-163-g315970f/elf/dl-close.c -+++ glibc-2.12.90-13/elf/dl-close.c ++++ glibc-2.12.90-14/elf/dl-close.c @@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) imap->l_scope_max = new_size; @@ -485,7 +490,7 @@ /* The loader is gone, so mark the object as not having one. Note: l_idx != IDX_STILL_USED -> object will be removed. */ --- glibc-2.12-163-g315970f/elf/dl-deps.c -+++ glibc-2.12.90-13/elf/dl-deps.c ++++ glibc-2.12.90-14/elf/dl-deps.c @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -503,7 +508,7 @@ { atomic_write_barrier (); --- glibc-2.12-163-g315970f/elf/dl-init.c -+++ glibc-2.12.90-13/elf/dl-init.c ++++ glibc-2.12.90-14/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -527,7 +532,7 @@ } INTDEF (_dl_init) --- glibc-2.12-163-g315970f/elf/dl-libc.c -+++ glibc-2.12.90-13/elf/dl-libc.c ++++ glibc-2.12.90-14/elf/dl-libc.c @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -555,7 +560,7 @@ if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 --- glibc-2.12-163-g315970f/elf/dl-support.c -+++ glibc-2.12.90-13/elf/dl-support.c ++++ glibc-2.12.90-14/elf/dl-support.c @@ -80,10 +80,8 @@ unsigned long long _dl_load_adds; create a fake scope containing nothing. */ struct r_scope_elem _dl_initial_searchlist; @@ -568,7 +573,7 @@ /* Random data provided by the kernel. */ void *_dl_random; --- glibc-2.12-163-g315970f/elf/ldconfig.c -+++ glibc-2.12.90-13/elf/ldconfig.c ++++ glibc-2.12.90-14/elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -651,7 +656,7 @@ const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; --- glibc-2.12-163-g315970f/elf/rtld-Rules -+++ glibc-2.12.90-13/elf/rtld-Rules ++++ glibc-2.12.90-14/elf/rtld-Rules @@ -93,6 +93,12 @@ else # These are the basic compilation rules corresponding to the Makerules ones. # The sysd-rules generated makefile already defines pattern rules for rtld-% @@ -676,7 +681,7 @@ $(objpfx)rtld-%.os: $(objpfx)%.s $(before-compile); $(compile-command.s) $(objpfx)rtld-%.os: $(objpfx)%.c $(before-compile); $(compile-command.c) --- glibc-2.12-163-g315970f/elf/rtld.c -+++ glibc-2.12.90-13/elf/rtld.c ++++ glibc-2.12.90-14/elf/rtld.c @@ -106,7 +106,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -704,7 +709,18 @@ if (*user_entry == (ElfW(Addr)) ENTRY_POINT) { -@@ -2244,6 +2240,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", +@@ -2172,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + we need it in the memory handling later. */ + GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; + ++ /* Remember the last search directory added at startup, now that ++ malloc will no longer be the one from dl-minimal.c. */ ++ GLRO(dl_init_all_dirs) = GL(dl_all_dirs); ++ + if (prelinked) + { + if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) +@@ -2244,6 +2244,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", lnp->dont_free = 1; lnp = lnp->next; } @@ -712,8 +728,19 @@ if (l != &GL(dl_rtld_map)) _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +@@ -2291,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", + lossage); + } + +- /* Remember the last search directory added at startup, now that +- malloc will no longer be the one from dl-minimal.c. */ +- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); +- + if (! prelinked && rtld_multiple_ref) + { + /* There was an explicit ref to the dynamic linker as a shared lib. --- glibc-2.12-163-g315970f/elf/tst-stackguard1.c -+++ glibc-2.12.90-13/elf/tst-stackguard1.c ++++ glibc-2.12.90-14/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -739,7 +766,7 @@ puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); --- glibc-2.12-163-g315970f/elf/unload8.c -+++ glibc-2.12.90-13/elf/unload8.c ++++ glibc-2.12.90-14/elf/unload8.c @@ -0,0 +1,33 @@ +#include +#include @@ -775,7 +802,7 @@ + return 0; +} --- glibc-2.12-163-g315970f/elf/unload8mod1.c -+++ glibc-2.12.90-13/elf/unload8mod1.c ++++ glibc-2.12.90-14/elf/unload8mod1.c @@ -0,0 +1,7 @@ +extern void mod2 (void); + @@ -785,11 +812,11 @@ + mod2 (); +} --- glibc-2.12-163-g315970f/elf/unload8mod1x.c -+++ glibc-2.12.90-13/elf/unload8mod1x.c ++++ glibc-2.12.90-14/elf/unload8mod1x.c @@ -0,0 +1 @@ +int mod1x; --- glibc-2.12-163-g315970f/elf/unload8mod2.c -+++ glibc-2.12.90-13/elf/unload8mod2.c ++++ glibc-2.12.90-14/elf/unload8mod2.c @@ -0,0 +1,7 @@ +extern void mod3 (void); + @@ -799,7 +826,7 @@ + mod3 (); +} --- glibc-2.12-163-g315970f/elf/unload8mod3.c -+++ glibc-2.12.90-13/elf/unload8mod3.c ++++ glibc-2.12.90-14/elf/unload8mod3.c @@ -0,0 +1,27 @@ +#include +#include @@ -829,15 +856,15 @@ + atexit (mod3_fini); +} --- glibc-2.12-163-g315970f/include/bits/stdlib-ldbl.h -+++ glibc-2.12.90-13/include/bits/stdlib-ldbl.h ++++ glibc-2.12.90-14/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include --- glibc-2.12-163-g315970f/include/bits/wchar-ldbl.h -+++ glibc-2.12.90-13/include/bits/wchar-ldbl.h ++++ glibc-2.12.90-14/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include --- glibc-2.12-163-g315970f/include/features.h -+++ glibc-2.12.90-13/include/features.h ++++ glibc-2.12.90-14/include/features.h @@ -308,8 +308,13 @@ #endif @@ -855,7 +882,7 @@ # else # define __USE_FORTIFY_LEVEL 1 --- glibc-2.12-163-g315970f/include/link.h -+++ glibc-2.12.90-13/include/link.h ++++ glibc-2.12.90-14/include/link.h @@ -192,6 +192,9 @@ struct link_map during LD_TRACE_PRELINKING=1 contains any DT_SYMBOLIC @@ -867,7 +894,7 @@ /* Collected information about own RPATH directories. */ struct r_search_path_struct l_rpath_dirs; --- glibc-2.12-163-g315970f/include/sys/resource.h -+++ glibc-2.12.90-13/include/sys/resource.h ++++ glibc-2.12.90-14/include/sys/resource.h @@ -12,4 +12,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage) extern int __setrlimit (enum __rlimit_resource __resource, @@ -875,7 +902,7 @@ +libc_hidden_proto (__getrlimit) #endif --- glibc-2.12-163-g315970f/inet/Makefile -+++ glibc-2.12.90-13/inet/Makefile ++++ glibc-2.12.90-14/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -886,7 +913,7 @@ CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions --- glibc-2.12-163-g315970f/intl/locale.alias -+++ glibc-2.12.90-13/intl/locale.alias ++++ glibc-2.12.90-14/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -897,7 +924,7 @@ nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 --- glibc-2.12-163-g315970f/libio/stdio.h -+++ glibc-2.12.90-13/libio/stdio.h ++++ glibc-2.12.90-14/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. */ @@ -912,7 +939,7 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ --- glibc-2.12-163-g315970f/locale/iso-4217.def -+++ glibc-2.12.90-13/locale/iso-4217.def ++++ glibc-2.12.90-14/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1005,7 +1032,7 @@ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ --- glibc-2.12-163-g315970f/locale/programs/locarchive.c -+++ glibc-2.12.90-13/locale/programs/locarchive.c ++++ glibc-2.12.90-14/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; @@ -1065,7 +1092,7 @@ const char *oldname, uint32_t *locrec_offset_p) { --- glibc-2.12-163-g315970f/localedata/Makefile -+++ glibc-2.12.90-13/localedata/Makefile ++++ glibc-2.12.90-14/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1075,7 +1102,7 @@ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ --- glibc-2.12-163-g315970f/localedata/SUPPORTED -+++ glibc-2.12.90-13/localedata/SUPPORTED ++++ glibc-2.12.90-14/localedata/SUPPORTED @@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1118,7 +1145,7 @@ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ --- glibc-2.12-163-g315970f/localedata/locales/cy_GB -+++ glibc-2.12.90-13/localedata/locales/cy_GB ++++ glibc-2.12.90-14/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1134,7 +1161,7 @@ LC_MESSAGES --- glibc-2.12-163-g315970f/localedata/locales/en_GB -+++ glibc-2.12.90-13/localedata/locales/en_GB ++++ glibc-2.12.90-14/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1147,7 +1174,7 @@ / " --- glibc-2.12-163-g315970f/localedata/locales/no_NO -+++ glibc-2.12.90-13/localedata/locales/no_NO ++++ glibc-2.12.90-14/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1219,7 +1246,7 @@ +copy "nb_NO" +END LC_ADDRESS --- glibc-2.12-163-g315970f/localedata/locales/zh_TW -+++ glibc-2.12.90-13/localedata/locales/zh_TW ++++ glibc-2.12.90-14/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1248,7 +1275,7 @@ date "2000-08-02" % --- glibc-2.12-163-g315970f/malloc/mcheck.c -+++ glibc-2.12.90-13/malloc/mcheck.c ++++ glibc-2.12.90-14/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -1325,7 +1352,7 @@ old_free_hook = __free_hook; __free_hook = freehook; --- glibc-2.12-163-g315970f/manual/libc.texinfo -+++ glibc-2.12.90-13/manual/libc.texinfo ++++ glibc-2.12.90-14/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1336,7 +1363,7 @@ * Libc: (libc). C library. @end direntry --- glibc-2.12-163-g315970f/misc/sys/cdefs.h -+++ glibc-2.12.90-13/misc/sys/cdefs.h ++++ glibc-2.12.90-14/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) @@ -1381,7 +1408,7 @@ # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif --- glibc-2.12-163-g315970f/nis/Makefile -+++ glibc-2.12.90-13/nis/Makefile ++++ glibc-2.12.90-14/nis/Makefile @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) include ../Rules @@ -1392,7 +1419,7 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ --- glibc-2.12-163-g315970f/nis/nss -+++ glibc-2.12.90-13/nis/nss ++++ glibc-2.12.90-14/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 @@ -1403,7 +1430,7 @@ # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not --- glibc-2.12-163-g315970f/nptl/ChangeLog -+++ glibc-2.12.90-13/nptl/ChangeLog ++++ glibc-2.12.90-14/nptl/ChangeLog @@ -3958,6 +3958,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1445,7 +1472,7 @@ * tst-cancel17.c (do_test): Check if aio_cancel failed. --- glibc-2.12-163-g315970f/nptl/Makefile -+++ glibc-2.12.90-13/nptl/Makefile ++++ glibc-2.12.90-14/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1479,7 +1506,7 @@ $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif --- glibc-2.12-163-g315970f/nptl/Versions -+++ glibc-2.12.90-13/nptl/Versions ++++ glibc-2.12.90-14/nptl/Versions @@ -29,6 +29,7 @@ libc { GLIBC_PRIVATE { # Internal libc interface to libpthread @@ -1489,7 +1516,7 @@ } --- glibc-2.12-163-g315970f/nptl/allocatestack.c -+++ glibc-2.12.90-13/nptl/allocatestack.c ++++ glibc-2.12.90-14/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. */ @@ -1509,7 +1536,7 @@ while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, ch | SETXID_BITMASK, ch)); --- glibc-2.12-163-g315970f/nptl/nptl-init.c -+++ glibc-2.12.90-13/nptl/nptl-init.c ++++ glibc-2.12.90-14/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. */ @@ -1520,7 +1547,7 @@ /* The system limit is not usable. Use an architecture-specific default. */ --- glibc-2.12-163-g315970f/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.12.90-13/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.12.90-14/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 @@ -1530,7 +1557,7 @@ + #endif /* bits/posix_opt.h */ --- glibc-2.12-163-g315970f/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.12.90-13/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.12.90-14/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -1539,7 +1566,7 @@ + } +} --- glibc-2.12-163-g315970f/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.12.90-13/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.12.90-14/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -1550,7 +1577,7 @@ else { --- glibc-2.12-163-g315970f/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.12.90-13/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.12.90-14/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1559,7 +1586,7 @@ +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif --- glibc-2.12-163-g315970f/nptl/tst-stackguard1.c -+++ glibc-2.12.90-13/nptl/tst-stackguard1.c ++++ glibc-2.12.90-14/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1585,7 +1612,7 @@ puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); --- glibc-2.12-163-g315970f/nscd/nscd.conf -+++ glibc-2.12.90-13/nscd/nscd.conf ++++ glibc-2.12.90-14/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1596,7 +1623,7 @@ debug-level 0 # reload-count 5 --- glibc-2.12-163-g315970f/nscd/nscd.init -+++ glibc-2.12.90-13/nscd/nscd.init ++++ glibc-2.12.90-14/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1674,7 +1701,7 @@ *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" --- glibc-2.12-163-g315970f/nss/Makefile -+++ glibc-2.12.90-13/nss/Makefile ++++ glibc-2.12.90-14/nss/Makefile @@ -75,6 +75,7 @@ endif include ../Rules @@ -1684,7 +1711,7 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a --- glibc-2.12-163-g315970f/nss/nss_files/files-XXX.c -+++ glibc-2.12.90-13/nss/nss_files/files-XXX.c ++++ glibc-2.12.90-14/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 @@ -1702,7 +1729,7 @@ if (buflen < sizeof *data + 2) --- glibc-2.12-163-g315970f/posix/Makefile -+++ glibc-2.12.90-13/posix/Makefile ++++ glibc-2.12.90-14/posix/Makefile @@ -313,15 +313,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1724,7 +1751,7 @@ + > $@.new mv -f $@.new $@ --- glibc-2.12-163-g315970f/posix/gai.conf -+++ glibc-2.12.90-13/posix/gai.conf ++++ glibc-2.12.90-14/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1750,7 +1777,7 @@ +# +# This is what the Red Hat setting currently uses. --- glibc-2.12-163-g315970f/posix/getconf.speclist.h -+++ glibc-2.12.90-13/posix/getconf.speclist.h ++++ glibc-2.12.90-14/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1792,7 +1819,7 @@ +#endif +""; --- glibc-2.12-163-g315970f/posix/regcomp.c -+++ glibc-2.12.90-13/posix/regcomp.c ++++ glibc-2.12.90-14/posix/regcomp.c @@ -2736,40 +2736,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. @@ -1925,7 +1952,7 @@ /* No valid character, treat it as a normal character. */ --- glibc-2.12-163-g315970f/resolv/Makefile -+++ glibc-2.12.90-13/resolv/Makefile ++++ glibc-2.12.90-14/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -1935,7 +1962,7 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings --- glibc-2.12-163-g315970f/resource/getrlimit.c -+++ glibc-2.12.90-13/resource/getrlimit.c ++++ glibc-2.12.90-14/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -1945,7 +1972,7 @@ stub_warning (getrlimit) --- glibc-2.12-163-g315970f/stdio-common/vfprintf.c -+++ glibc-2.12.90-13/stdio-common/vfprintf.c ++++ glibc-2.12.90-14/stdio-common/vfprintf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2008, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1991-2008, 2009, 2010 Free Software Foundation, Inc. @@ -1998,7 +2025,7 @@ len = strlen (string); \ } \ --- glibc-2.12-163-g315970f/streams/Makefile -+++ glibc-2.12.90-13/streams/Makefile ++++ glibc-2.12.90-14/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -2009,7 +2036,7 @@ include ../Rules --- glibc-2.12-163-g315970f/sunrpc/Makefile -+++ glibc-2.12.90-13/sunrpc/Makefile ++++ glibc-2.12.90-14/sunrpc/Makefile @@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions CPPFLAGS += -D_RPC_THREAD_SAFE_ @@ -2022,7 +2049,7 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \ --- glibc-2.12-163-g315970f/sysdeps/generic/dl-cache.h -+++ glibc-2.12.90-13/sysdeps/generic/dl-cache.h ++++ glibc-2.12.90-14/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -2039,7 +2066,7 @@ /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another --- glibc-2.12-163-g315970f/sysdeps/i386/Makefile -+++ glibc-2.12.90-13/sysdeps/i386/Makefile ++++ glibc-2.12.90-14/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -2065,7 +2092,7 @@ ifeq ($(subdir),elf) --- glibc-2.12-163-g315970f/sysdeps/i386/i686/Makefile -+++ glibc-2.12.90-13/sysdeps/i386/i686/Makefile ++++ glibc-2.12.90-14/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -2087,7 +2114,7 @@ -ASFLAGS-.oS += -Wa,-mtune=i686 -endif --- glibc-2.12-163-g315970f/sysdeps/i386/i686/multiarch/strspn.S -+++ glibc-2.12.90-13/sysdeps/i386/i686/multiarch/strspn.S ++++ glibc-2.12.90-14/sysdeps/i386/i686/multiarch/strspn.S @@ -76,8 +76,8 @@ END(strspn) # define ENTRY(name) \ .type __strspn_ia32, @function; \ @@ -2100,7 +2127,7 @@ # undef END # define END(name) \ --- glibc-2.12-163-g315970f/sysdeps/ia64/Makefile -+++ glibc-2.12.90-13/sysdeps/ia64/Makefile ++++ glibc-2.12.90-14/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -2113,7 +2140,7 @@ endif --- glibc-2.12-163-g315970f/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.12.90-13/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.12.90-14/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2466,7 +2493,7 @@ - -#endif --- glibc-2.12-163-g315970f/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.12.90-13/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.12.90-14/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -2553,7 +2580,7 @@ + +#endif --- glibc-2.12-163-g315970f/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.12.90-13/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.12.90-14/sysdeps/mach/hurd/getrlimit.c @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) return 0; @@ -2561,7 +2588,7 @@ +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) --- glibc-2.12-163-g315970f/sysdeps/posix/getaddrinfo.c -+++ glibc-2.12.90-13/sysdeps/posix/getaddrinfo.c ++++ glibc-2.12.90-14/sysdeps/posix/getaddrinfo.c @@ -1100,10 +1100,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, @@ -2576,7 +2603,7 @@ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; --- glibc-2.12-163-g315970f/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.12.90-13/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.12.90-14/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -2586,7 +2613,7 @@ ifeq ($(subdir),elf) --- glibc-2.12-163-g315970f/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.12.90-13/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.12.90-14/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) @@ -2594,7 +2621,7 @@ + +CFLAGS-gmon-start.c = -fno-strict-aliasing --- glibc-2.12-163-g315970f/sysdeps/unix/nice.c -+++ glibc-2.12.90-13/sysdeps/unix/nice.c ++++ glibc-2.12.90-14/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -2610,7 +2637,7 @@ { if (errno == EACCES) --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -2627,7 +2654,7 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -2676,7 +2703,7 @@ else #endif --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2720,7 +2747,7 @@ size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -2731,7 +2758,7 @@ return GLRO(dl_pagesize); #else --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.12.90-14/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. @@ -2793,7 +2820,7 @@ + +#include_next --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) } @@ -2801,7 +2828,7 @@ +libc_hidden_weak (__getrlimit) versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2); --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2835,7 +2862,7 @@ + #include_next --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include @@ -2843,7 +2870,7 @@ +#include +#endif --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include @@ -2851,12 +2878,12 @@ +#include +#endif --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2883,7 +2910,7 @@ struct netlink_res { --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2894,12 +2921,12 @@ /* Provide trailing slash, since mostly used for building pathnames. */ --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c @@ -1 +1 @@ -#include "../../fxstat.c" +#include "../../i386/fxstat.c" --- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.12.90-13/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2946,7 +2973,7 @@ } libc_hidden_def (tcsetattr) --- glibc-2.12-163-g315970f/timezone/zic.c -+++ glibc-2.12.90-13/timezone/zic.c ++++ glibc-2.12.90-14/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 3e4a2b6..51e95fd 100644 --- a/glibc.spec +++ b/glibc.spec @@ -24,7 +24,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 13 +Release: 14 # 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 @@ -1026,6 +1026,10 @@ rm -f *.filelist* %endif %changelog +* Tue Sep 28 2010 Andreas Schwab - 2.12.90-14 +- Don't try to write to _rtld_global_ro after performing relro + protection (#638091) + * Mon Sep 27 2010 Andreas Schwab - 2.12.90-13 - Update from master - Add two forgotten licence exceptions @@ -1040,7 +1044,7 @@ rm -f *.filelist* - Actually make it possible to user the default name server - Fix memory leak on init/fini dependency list (#632936) - Fix handling of collating symbols in regexps (BZ#11561) -- Don't parse %s format argument as multibyte string (BZ#6530) +- Don't parse %%s format argument as multibyte string (BZ#6530) - Fix overflow in nss files parser - Fix spurious nop at start of __strspn_ia32 diff --git a/sources b/sources index d3b246e..726b6d0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -1b64b925d1b0965f6a62f36468d9f37c glibc-2.12-163-g315970f-fedora.tar.xz +8495ae3328a435121102815130457abb glibc-2.12-163-g315970f-fedora.tar.xz 1ce25bd2bfb7fe19892b3bc9ab9ad78a glibc-2.12-163-g315970f.tar.xz 863d519df96251c7319dacbc53df1288 glibc-ports-2.12-31-g6c14d67.tar.xz