From 7870b7800ae971749411238efe95e6aba6cc6992 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Oct 04 2010 11:27:15 +0000 Subject: 2.12.90-15 --- diff --git a/.gitignore b/.gitignore index 51a21ac..54eafbe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/glibc-2.12-163-g315970f-fedora.tar.xz -/glibc-2.12-163-g315970f.tar.xz -/glibc-ports-2.12-31-g6c14d67.tar.xz +/glibc-2.12-175-g1c37565-fedora.tar.xz +/glibc-2.12-175-g1c37565.tar.xz +/glibc-ports-2.12-32-gdc54bc1.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index c3cdb41..d417495 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,9 @@ ---- glibc-2.12-163-g315970f/ChangeLog -+++ glibc-2.12.90-14/ChangeLog -@@ -1,3 +1,31 @@ +--- glibc-2.12-175-g1c37565/ChangeLog ++++ glibc-2.12.90-15/ChangeLog +@@ -40,6 +40,34 @@ + * sysdeps/unix/sysv/linux/internal_statvfs.c (INTERNAL_STATVFS): + Mask out sign-bit copies when constructing f_fsid. + +2010-09-28 Andreas Schwab + + * elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs) @@ -32,7 +35,7 @@ 2010-09-24 Petr Baudis * debug/stack_chk_fail_local.c: Add missing licence exception. -@@ -60,6 +88,13 @@ +@@ -93,6 +121,13 @@ * resolv/res_init.c (__res_vinit): Count the default server we added. @@ -46,7 +49,7 @@ 2010-09-08 Chung-Lin Tang Ulrich Drepper -@@ -798,6 +833,32 @@ +@@ -831,6 +866,32 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -79,7 +82,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -850,6 +911,24 @@ +@@ -883,6 +944,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -104,8 +107,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.12-163-g315970f/ChangeLog.15 -+++ glibc-2.12.90-14/ChangeLog.15 +--- glibc-2.12-175-g1c37565/ChangeLog.15 ++++ glibc-2.12.90-15/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -171,8 +174,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.12-163-g315970f/ChangeLog.16 -+++ glibc-2.12.90-14/ChangeLog.16 +--- glibc-2.12-175-g1c37565/ChangeLog.16 ++++ glibc-2.12.90-15/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -226,8 +229,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.12-163-g315970f/ChangeLog.17 -+++ glibc-2.12.90-14/ChangeLog.17 +--- glibc-2.12-175-g1c37565/ChangeLog.17 ++++ glibc-2.12.90-15/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -312,8 +315,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.12-163-g315970f/Makeconfig -+++ glibc-2.12.90-14/Makeconfig +--- glibc-2.12-175-g1c37565/Makeconfig ++++ glibc-2.12.90-15/Makeconfig @@ -789,12 +789,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -350,8 +353,8 @@ endif # Makeconfig not yet included ---- glibc-2.12-163-g315970f/csu/Makefile -+++ glibc-2.12.90-14/csu/Makefile +--- glibc-2.12-175-g1c37565/csu/Makefile ++++ glibc-2.12.90-15/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -362,8 +365,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.12-163-g315970f/csu/elf-init.c -+++ glibc-2.12.90-14/csu/elf-init.c +--- glibc-2.12-175-g1c37565/csu/elf-init.c ++++ glibc-2.12.90-15/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; @@ -388,8 +391,8 @@ /* 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-14/debug/tst-chk1.c +--- glibc-2.12-175-g1c37565/debug/tst-chk1.c ++++ glibc-2.12.90-15/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -418,8 +421,8 @@ # define O 0 # else # define O 1 ---- glibc-2.12-163-g315970f/elf/Makefile -+++ glibc-2.12.90-14/elf/Makefile +--- glibc-2.12-175-g1c37565/elf/Makefile ++++ glibc-2.12.90-15/elf/Makefile @@ -89,6 +89,7 @@ distribute := rtld-Rules \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload6mod1.c unload6mod2.c unload6mod3.c \ @@ -473,8 +476,8 @@ 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.12-163-g315970f/elf/dl-close.c -+++ glibc-2.12.90-14/elf/dl-close.c +--- glibc-2.12-175-g1c37565/elf/dl-close.c ++++ glibc-2.12.90-15/elf/dl-close.c @@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) imap->l_scope_max = new_size; @@ -489,8 +492,8 @@ /* 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-14/elf/dl-deps.c +--- glibc-2.12-175-g1c37565/elf/dl-deps.c ++++ glibc-2.12.90-15/elf/dl-deps.c @@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map, nneeded * sizeof needed[0]); atomic_write_barrier (); @@ -507,8 +510,8 @@ if (l_reldeps != NULL) { atomic_write_barrier (); ---- glibc-2.12-163-g315970f/elf/dl-init.c -+++ glibc-2.12.90-14/elf/dl-init.c +--- glibc-2.12-175-g1c37565/elf/dl-init.c ++++ glibc-2.12.90-15/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -531,8 +534,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.12-163-g315970f/elf/dl-libc.c -+++ glibc-2.12.90-14/elf/dl-libc.c +--- glibc-2.12-175-g1c37565/elf/dl-libc.c ++++ glibc-2.12.90-15/elf/dl-libc.c @@ -265,13 +265,13 @@ libc_freeres_fn (free_mem) for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns) @@ -559,8 +562,8 @@ } 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-14/elf/dl-support.c +--- glibc-2.12-175-g1c37565/elf/dl-support.c ++++ glibc-2.12.90-15/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; @@ -572,8 +575,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.12-163-g315970f/elf/ldconfig.c -+++ glibc-2.12.90-14/elf/ldconfig.c +--- glibc-2.12-175-g1c37565/elf/ldconfig.c ++++ glibc-2.12.90-15/elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -655,8 +658,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.12-163-g315970f/elf/rtld-Rules -+++ glibc-2.12.90-14/elf/rtld-Rules +--- glibc-2.12-175-g1c37565/elf/rtld-Rules ++++ glibc-2.12.90-15/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-% @@ -680,8 +683,8 @@ $(objpfx)rtld-%.os: $(objpfx)%.S $(before-compile); $(compile-command.S) $(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-14/elf/rtld.c +--- glibc-2.12-175-g1c37565/elf/rtld.c ++++ glibc-2.12.90-15/elf/rtld.c @@ -106,7 +106,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -739,8 +742,8 @@ 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-14/elf/tst-stackguard1.c +--- glibc-2.12-175-g1c37565/elf/tst-stackguard1.c ++++ glibc-2.12.90-15/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -765,8 +768,8 @@ { 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-14/elf/unload8.c +--- glibc-2.12-175-g1c37565/elf/unload8.c ++++ glibc-2.12.90-15/elf/unload8.c @@ -0,0 +1,33 @@ +#include +#include @@ -801,8 +804,8 @@ + + return 0; +} ---- glibc-2.12-163-g315970f/elf/unload8mod1.c -+++ glibc-2.12.90-14/elf/unload8mod1.c +--- glibc-2.12-175-g1c37565/elf/unload8mod1.c ++++ glibc-2.12.90-15/elf/unload8mod1.c @@ -0,0 +1,7 @@ +extern void mod2 (void); + @@ -811,12 +814,12 @@ +{ + mod2 (); +} ---- glibc-2.12-163-g315970f/elf/unload8mod1x.c -+++ glibc-2.12.90-14/elf/unload8mod1x.c +--- glibc-2.12-175-g1c37565/elf/unload8mod1x.c ++++ glibc-2.12.90-15/elf/unload8mod1x.c @@ -0,0 +1 @@ +int mod1x; ---- glibc-2.12-163-g315970f/elf/unload8mod2.c -+++ glibc-2.12.90-14/elf/unload8mod2.c +--- glibc-2.12-175-g1c37565/elf/unload8mod2.c ++++ glibc-2.12.90-15/elf/unload8mod2.c @@ -0,0 +1,7 @@ +extern void mod3 (void); + @@ -825,8 +828,8 @@ +{ + mod3 (); +} ---- glibc-2.12-163-g315970f/elf/unload8mod3.c -+++ glibc-2.12.90-14/elf/unload8mod3.c +--- glibc-2.12-175-g1c37565/elf/unload8mod3.c ++++ glibc-2.12.90-15/elf/unload8mod3.c @@ -0,0 +1,27 @@ +#include +#include @@ -855,16 +858,16 @@ + + atexit (mod3_fini); +} ---- glibc-2.12-163-g315970f/include/bits/stdlib-ldbl.h -+++ glibc-2.12.90-14/include/bits/stdlib-ldbl.h +--- glibc-2.12-175-g1c37565/include/bits/stdlib-ldbl.h ++++ glibc-2.12.90-15/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.12-163-g315970f/include/bits/wchar-ldbl.h -+++ glibc-2.12.90-14/include/bits/wchar-ldbl.h +--- glibc-2.12-175-g1c37565/include/bits/wchar-ldbl.h ++++ glibc-2.12.90-15/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.12-163-g315970f/include/features.h -+++ glibc-2.12.90-14/include/features.h +--- glibc-2.12-175-g1c37565/include/features.h ++++ glibc-2.12.90-15/include/features.h @@ -308,8 +308,13 @@ #endif @@ -881,8 +884,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.12-163-g315970f/include/link.h -+++ glibc-2.12.90-14/include/link.h +--- glibc-2.12-175-g1c37565/include/link.h ++++ glibc-2.12.90-15/include/link.h @@ -192,6 +192,9 @@ struct link_map during LD_TRACE_PRELINKING=1 contains any DT_SYMBOLIC @@ -893,16 +896,16 @@ /* 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-14/include/sys/resource.h +--- glibc-2.12-175-g1c37565/include/sys/resource.h ++++ glibc-2.12.90-15/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, const struct rlimit *__rlimits); +libc_hidden_proto (__getrlimit) #endif ---- glibc-2.12-163-g315970f/inet/Makefile -+++ glibc-2.12.90-14/inet/Makefile +--- glibc-2.12-175-g1c37565/inet/Makefile ++++ glibc-2.12.90-15/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -912,8 +915,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.12-163-g315970f/intl/locale.alias -+++ glibc-2.12.90-14/intl/locale.alias +--- glibc-2.12-175-g1c37565/intl/locale.alias ++++ glibc-2.12.90-15/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -923,8 +926,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.12-163-g315970f/libio/stdio.h -+++ glibc-2.12.90-14/libio/stdio.h +--- glibc-2.12-175-g1c37565/libio/stdio.h ++++ glibc-2.12.90-15/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. */ @@ -938,8 +941,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.12-163-g315970f/locale/iso-4217.def -+++ glibc-2.12.90-14/locale/iso-4217.def +--- glibc-2.12-175-g1c37565/locale/iso-4217.def ++++ glibc-2.12.90-15/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -1031,8 +1034,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ 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-14/locale/programs/locarchive.c +--- glibc-2.12-175-g1c37565/locale/programs/locarchive.c ++++ glibc-2.12.90-15/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; @@ -1091,8 +1094,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.12-163-g315970f/localedata/Makefile -+++ glibc-2.12.90-14/localedata/Makefile +--- glibc-2.12-175-g1c37565/localedata/Makefile ++++ glibc-2.12.90-15/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1101,8 +1104,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.12-163-g315970f/localedata/SUPPORTED -+++ glibc-2.12.90-14/localedata/SUPPORTED +--- glibc-2.12-175-g1c37565/localedata/SUPPORTED ++++ glibc-2.12.90-15/localedata/SUPPORTED @@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1144,8 +1147,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.12-163-g315970f/localedata/locales/cy_GB -+++ glibc-2.12.90-14/localedata/locales/cy_GB +--- glibc-2.12-175-g1c37565/localedata/locales/cy_GB ++++ glibc-2.12.90-15/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1160,8 +1163,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.12-163-g315970f/localedata/locales/en_GB -+++ glibc-2.12.90-14/localedata/locales/en_GB +--- glibc-2.12-175-g1c37565/localedata/locales/en_GB ++++ glibc-2.12.90-15/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1173,8 +1176,8 @@ date_fmt "/ / " ---- glibc-2.12-163-g315970f/localedata/locales/no_NO -+++ glibc-2.12.90-14/localedata/locales/no_NO +--- glibc-2.12-175-g1c37565/localedata/locales/no_NO ++++ glibc-2.12.90-15/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1245,8 +1248,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.12-163-g315970f/localedata/locales/zh_TW -+++ glibc-2.12.90-14/localedata/locales/zh_TW +--- glibc-2.12-175-g1c37565/localedata/locales/zh_TW ++++ glibc-2.12.90-15/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1274,14 +1277,15 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.12-163-g315970f/malloc/mcheck.c -+++ glibc-2.12.90-14/malloc/mcheck.c -@@ -24,9 +24,25 @@ +--- glibc-2.12-175-g1c37565/malloc/mcheck.c ++++ glibc-2.12.90-15/malloc/mcheck.c +@@ -25,10 +25,26 @@ # include # include # include +# include # include + # include #endif +#ifdef _LIBC @@ -1302,7 +1306,7 @@ /* Old hook values. */ static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t); static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t); -@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t caller) +@@ -199,7 +215,7 @@ freehook (__ptr_t ptr, const __ptr_t caller) if (old_free_hook != NULL) (*old_free_hook) (ptr, caller); else @@ -1311,7 +1315,7 @@ __free_hook = freehook; } -@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller) +@@ -222,7 +238,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller) hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1, caller); else @@ -1320,7 +1324,7 @@ __malloc_hook = mallochook; if (hdr == NULL) return NULL; -@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size, +@@ -259,7 +275,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size, if (old_memalign_hook != NULL) block = (*old_memalign_hook) (alignment, slop + size + 1, caller); else @@ -1329,7 +1333,7 @@ __memalign_hook = memalignhook; if (block == NULL) return NULL; -@@ -300,8 +316,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller) +@@ -320,8 +336,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller) sizeof (struct hdr) + size + 1, caller); else @@ -1340,7 +1344,7 @@ __free_hook = freehook; __malloc_hook = mallochook; __memalign_hook = memalignhook; -@@ -361,8 +377,8 @@ mcheck (func) +@@ -381,8 +397,8 @@ mcheck (func) if (__malloc_initialized <= 0 && !mcheck_used) { /* We call malloc() once here to ensure it is initialized. */ @@ -1351,8 +1355,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.12-163-g315970f/manual/libc.texinfo -+++ glibc-2.12.90-14/manual/libc.texinfo +--- glibc-2.12-175-g1c37565/manual/libc.texinfo ++++ glibc-2.12.90-15/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1362,8 +1366,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.12-163-g315970f/misc/sys/cdefs.h -+++ glibc-2.12.90-14/misc/sys/cdefs.h +--- glibc-2.12-175-g1c37565/misc/sys/cdefs.h ++++ glibc-2.12.90-15/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) @@ -1407,8 +1411,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.12-163-g315970f/nis/Makefile -+++ glibc-2.12.90-14/nis/Makefile +--- glibc-2.12-175-g1c37565/nis/Makefile ++++ glibc-2.12.90-15/nis/Makefile @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) include ../Rules @@ -1418,8 +1422,8 @@ $(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-14/nis/nss +--- glibc-2.12-175-g1c37565/nis/nss ++++ glibc-2.12.90-15/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 @@ -1429,8 +1433,8 @@ # # 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-14/nptl/ChangeLog +--- glibc-2.12-175-g1c37565/nptl/ChangeLog ++++ glibc-2.12.90-15/nptl/ChangeLog @@ -3958,6 +3958,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1471,8 +1475,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.12-163-g315970f/nptl/Makefile -+++ glibc-2.12.90-14/nptl/Makefile +--- glibc-2.12-175-g1c37565/nptl/Makefile ++++ glibc-2.12.90-15/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1505,8 +1509,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.12-163-g315970f/nptl/Versions -+++ glibc-2.12.90-14/nptl/Versions +--- glibc-2.12-175-g1c37565/nptl/Versions ++++ glibc-2.12.90-15/nptl/Versions @@ -29,6 +29,7 @@ libc { GLIBC_PRIVATE { # Internal libc interface to libpthread @@ -1515,8 +1519,8 @@ } } ---- glibc-2.12-163-g315970f/nptl/allocatestack.c -+++ glibc-2.12.90-14/nptl/allocatestack.c +--- glibc-2.12-175-g1c37565/nptl/allocatestack.c ++++ glibc-2.12.90-15/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. */ @@ -1535,8 +1539,8 @@ } 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-14/nptl/nptl-init.c +--- glibc-2.12-175-g1c37565/nptl/nptl-init.c ++++ glibc-2.12.90-15/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. */ @@ -1546,8 +1550,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* 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-14/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.12-175-g1c37565/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.12.90-15/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 @@ -1556,8 +1560,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.12-163-g315970f/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.12.90-14/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.12-175-g1c37565/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.12.90-15/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -1565,8 +1569,8 @@ + __uname; + } +} ---- glibc-2.12-163-g315970f/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.12.90-14/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.12-175-g1c37565/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.12.90-15/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -1576,8 +1580,8 @@ cp = u.uts.version; else { ---- glibc-2.12-163-g315970f/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.12.90-14/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.12-175-g1c37565/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.12.90-15/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1585,8 +1589,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.12-163-g315970f/nptl/tst-stackguard1.c -+++ glibc-2.12.90-14/nptl/tst-stackguard1.c +--- glibc-2.12-175-g1c37565/nptl/tst-stackguard1.c ++++ glibc-2.12.90-15/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1611,8 +1615,8 @@ { 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-14/nscd/nscd.conf +--- glibc-2.12-175-g1c37565/nscd/nscd.conf ++++ glibc-2.12.90-15/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1622,8 +1626,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.12-163-g315970f/nscd/nscd.init -+++ glibc-2.12.90-14/nscd/nscd.init +--- glibc-2.12-175-g1c37565/nscd/nscd.init ++++ glibc-2.12.90-15/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1700,8 +1704,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.12-163-g315970f/nss/Makefile -+++ glibc-2.12.90-14/nss/Makefile +--- glibc-2.12-175-g1c37565/nss/Makefile ++++ glibc-2.12.90-15/nss/Makefile @@ -75,6 +75,7 @@ endif include ../Rules @@ -1710,8 +1714,8 @@ 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-14/nss/nss_files/files-XXX.c +--- glibc-2.12-175-g1c37565/nss/nss_files/files-XXX.c ++++ glibc-2.12.90-15/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 @@ -1728,8 +1732,8 @@ int parse_result; if (buflen < sizeof *data + 2) ---- glibc-2.12-163-g315970f/posix/Makefile -+++ glibc-2.12.90-14/posix/Makefile +--- glibc-2.12-175-g1c37565/posix/Makefile ++++ glibc-2.12.90-15/posix/Makefile @@ -313,15 +313,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1750,8 +1754,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.12-163-g315970f/posix/gai.conf -+++ glibc-2.12.90-14/posix/gai.conf +--- glibc-2.12-175-g1c37565/posix/gai.conf ++++ glibc-2.12.90-15/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1776,8 +1780,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.12-163-g315970f/posix/getconf.speclist.h -+++ glibc-2.12.90-14/posix/getconf.speclist.h +--- glibc-2.12-175-g1c37565/posix/getconf.speclist.h ++++ glibc-2.12.90-15/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1818,8 +1822,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.12-163-g315970f/posix/regcomp.c -+++ glibc-2.12.90-14/posix/regcomp.c +--- glibc-2.12-175-g1c37565/posix/regcomp.c ++++ glibc-2.12.90-15/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. @@ -1951,8 +1955,8 @@ { /* No valid character, treat it as a normal character. */ ---- glibc-2.12-163-g315970f/resolv/Makefile -+++ glibc-2.12.90-14/resolv/Makefile +--- glibc-2.12-175-g1c37565/resolv/Makefile ++++ glibc-2.12.90-15/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -1961,8 +1965,8 @@ # 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-14/resource/getrlimit.c +--- glibc-2.12-175-g1c37565/resource/getrlimit.c ++++ glibc-2.12.90-15/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -1971,8 +1975,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.12-163-g315970f/stdio-common/vfprintf.c -+++ glibc-2.12.90-14/stdio-common/vfprintf.c +--- glibc-2.12-175-g1c37565/stdio-common/vfprintf.c ++++ glibc-2.12.90-15/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. @@ -2024,8 +2028,8 @@ else \ len = strlen (string); \ } \ ---- glibc-2.12-163-g315970f/streams/Makefile -+++ glibc-2.12.90-14/streams/Makefile +--- glibc-2.12-175-g1c37565/streams/Makefile ++++ glibc-2.12.90-15/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -2035,8 +2039,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.12-163-g315970f/sunrpc/Makefile -+++ glibc-2.12.90-14/sunrpc/Makefile +--- glibc-2.12-175-g1c37565/sunrpc/Makefile ++++ glibc-2.12.90-15/sunrpc/Makefile @@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions CPPFLAGS += -D_RPC_THREAD_SAFE_ @@ -2048,8 +2052,8 @@ include ../Rules $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \ ---- glibc-2.12-163-g315970f/sysdeps/generic/dl-cache.h -+++ glibc-2.12.90-14/sysdeps/generic/dl-cache.h +--- glibc-2.12-175-g1c37565/sysdeps/generic/dl-cache.h ++++ glibc-2.12.90-15/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -2065,8 +2069,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.12-163-g315970f/sysdeps/i386/Makefile -+++ glibc-2.12.90-14/sysdeps/i386/Makefile +--- glibc-2.12-175-g1c37565/sysdeps/i386/Makefile ++++ glibc-2.12.90-15/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -2091,8 +2095,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.12-163-g315970f/sysdeps/i386/i686/Makefile -+++ glibc-2.12.90-14/sysdeps/i386/i686/Makefile +--- glibc-2.12-175-g1c37565/sysdeps/i386/i686/Makefile ++++ glibc-2.12.90-15/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -2113,8 +2117,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.12-163-g315970f/sysdeps/i386/i686/multiarch/strspn.S -+++ glibc-2.12.90-14/sysdeps/i386/i686/multiarch/strspn.S +--- glibc-2.12-175-g1c37565/sysdeps/i386/i686/multiarch/strspn.S ++++ glibc-2.12.90-15/sysdeps/i386/i686/multiarch/strspn.S @@ -76,8 +76,8 @@ END(strspn) # define ENTRY(name) \ .type __strspn_ia32, @function; \ @@ -2126,8 +2130,8 @@ CALL_MCOUNT # undef END # define END(name) \ ---- glibc-2.12-163-g315970f/sysdeps/ia64/Makefile -+++ glibc-2.12.90-14/sysdeps/ia64/Makefile +--- glibc-2.12-175-g1c37565/sysdeps/ia64/Makefile ++++ glibc-2.12.90-15/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -2139,8 +2143,8 @@ endif endif ---- glibc-2.12-163-g315970f/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.12.90-14/sysdeps/ia64/ia64libgcc.S +--- glibc-2.12-175-g1c37565/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.12.90-15/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2492,8 +2496,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.12-163-g315970f/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.12.90-14/sysdeps/ia64/libgcc-compat.c +--- glibc-2.12-175-g1c37565/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.12.90-15/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -2579,16 +2583,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.12-163-g315970f/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.12.90-14/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.12-175-g1c37565/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.12.90-15/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.12-163-g315970f/sysdeps/posix/getaddrinfo.c -+++ glibc-2.12.90-14/sysdeps/posix/getaddrinfo.c +--- glibc-2.12-175-g1c37565/sysdeps/posix/getaddrinfo.c ++++ glibc-2.12.90-15/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 }, @@ -2602,8 +2606,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.12-163-g315970f/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.12.90-14/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.12-175-g1c37565/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.12.90-15/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -2612,16 +2616,16 @@ endif ifeq ($(subdir),elf) ---- glibc-2.12-163-g315970f/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.12.90-14/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.12-175-g1c37565/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.12.90-15/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.12-163-g315970f/sysdeps/unix/nice.c -+++ glibc-2.12.90-14/sysdeps/unix/nice.c +--- glibc-2.12-175-g1c37565/sysdeps/unix/nice.c ++++ glibc-2.12.90-15/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -2636,8 +2640,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -2653,8 +2657,8 @@ #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-14/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -2702,8 +2706,8 @@ } else #endif ---- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2746,8 +2750,8 @@ { 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-14/sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -2757,8 +2761,8 @@ assert (GLRO(dl_pagesize) != 0); return GLRO(dl_pagesize); #else ---- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.12.90-15/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. @@ -2819,16 +2823,16 @@ + } while (0) + +#include_next ---- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.12.90-15/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.12-163-g315970f/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2861,29 +2865,29 @@ + } while (0) + #include_next ---- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.12.90-15/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-14/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2909,8 +2913,8 @@ struct netlink_res { ---- glibc-2.12-163-g315970f/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.12.90-14/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2920,13 +2924,13 @@ #define _PATH_WTMP "/var/log/wtmp" /* 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-14/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c ++++ glibc-2.12.90-15/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-14/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.12-175-g1c37565/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.12.90-15/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2972,8 +2976,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.12-163-g315970f/timezone/zic.c -+++ glibc-2.12.90-14/timezone/zic.c +--- glibc-2.12-175-g1c37565/timezone/zic.c ++++ glibc-2.12.90-15/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 51e95fd..082511c 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.12-163-g315970f +%define glibcsrcdir glibc-2.12-175-g1c37565 %define glibcversion 2.12.90 -%define glibcportsdir glibc-ports-2.12-31-g6c14d67 +%define glibcportsdir glibc-ports-2.12-32-gdc54bc1 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon alphaev6 @@ -24,7 +24,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 14 +Release: 15 # 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,15 @@ rm -f *.filelist* %endif %changelog +* Mon Oct 4 2010 Andreas Schwab - 2.12.90-15 +- Update from master + - Handle large requests in debugging hooks for malloc (BZ#12005) + - Fix handling of remaining bytes in buffer for strncmp and + strncasecmp (BZ#12077) + - Handle cgroup and btrfs filesystems in statvfs + - S/390: Fix highgprs check in startup code (BZ#12067) + - Properly convert f_fsid in statvfs (BZ#11611) + * Tue Sep 28 2010 Andreas Schwab - 2.12.90-14 - Don't try to write to _rtld_global_ro after performing relro protection (#638091) diff --git a/sources b/sources index 726b6d0..1e61f6c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -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 +22c654855d56014d4b14aea4d6e38410 glibc-2.12-175-g1c37565-fedora.tar.xz +c923c38b5ab857513dab2be47640a529 glibc-2.12-175-g1c37565.tar.xz +9d6d2ed492a6e6208b9dceb1cdf302a9 glibc-ports-2.12-32-gdc54bc1.tar.xz