From 98c76af435af70c9aa5e93fe19720a709711fd6e Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 2 Aug 2010 14:18:20 +0200 Subject: [PATCH] 2.12.90-7 --- .gitignore | 6 +- glibc-fedora.patch | 377 +++++++++++++++++++++++---------------------- glibc.spec | 27 +++- sources | 6 +- 4 files changed, 218 insertions(+), 198 deletions(-) diff --git a/.gitignore b/.gitignore index 9e04612..e2907ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -glibc-2.12-62-gb08c89d.tar.bz2 -glibc-ports-2.12-12-g71feaf7.tar.bz2 -glibc-2.12-62-gb08c89d-fedora.tar.bz2 +glibc-2.12-85-g73507d3-fedora.tar.xz +glibc-2.12-85-g73507d3.tar.xz +glibc-ports-2.12-12-g71feaf7.tar.xz diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 482db22..bc98f04 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,9 @@ ---- glibc-2.12-62-gb08c89d/ChangeLog -+++ glibc-2.12.90-6/ChangeLog -@@ -1,3 +1,14 @@ +--- glibc-2.12-85-g73507d3/ChangeLog ++++ glibc-2.12.90-7/ChangeLog +@@ -108,6 +108,17 @@ + * sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S: New file. + * sysdeps/powerpc/powerpc64/power6/fpu/s_copysignf.S: New file. + +2010-07-18 Andreas Schwab + + * debug/vdprintf_chk.c (__vdprintf_chk): Remove undefined @@ -15,7 +18,7 @@ 2010-07-09 Ulrich Drepper * sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Use __fcntl not -@@ -128,6 +139,32 @@ +@@ -238,6 +249,32 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -48,7 +51,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -180,6 +217,24 @@ +@@ -290,6 +327,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -73,8 +76,8 @@ 2010-05-28 Luis Machado * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. ---- glibc-2.12-62-gb08c89d/ChangeLog.15 -+++ glibc-2.12.90-6/ChangeLog.15 +--- glibc-2.12-85-g73507d3/ChangeLog.15 ++++ glibc-2.12.90-7/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -140,8 +143,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.12-62-gb08c89d/ChangeLog.16 -+++ glibc-2.12.90-6/ChangeLog.16 +--- glibc-2.12-85-g73507d3/ChangeLog.16 ++++ glibc-2.12.90-7/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -195,8 +198,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.12-62-gb08c89d/ChangeLog.17 -+++ glibc-2.12.90-6/ChangeLog.17 +--- glibc-2.12-85-g73507d3/ChangeLog.17 ++++ glibc-2.12.90-7/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -281,8 +284,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.12-62-gb08c89d/Makeconfig -+++ glibc-2.12.90-6/Makeconfig +--- glibc-2.12-85-g73507d3/Makeconfig ++++ glibc-2.12.90-7/Makeconfig @@ -789,12 +789,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -299,8 +302,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.12-62-gb08c89d/csu/Makefile -+++ glibc-2.12.90-6/csu/Makefile +--- glibc-2.12-85-g73507d3/csu/Makefile ++++ glibc-2.12.90-7/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -311,8 +314,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.12-62-gb08c89d/csu/elf-init.c -+++ glibc-2.12.90-6/csu/elf-init.c +--- glibc-2.12-85-g73507d3/csu/elf-init.c ++++ glibc-2.12.90-7/csu/elf-init.c @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -337,8 +340,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.12-62-gb08c89d/debug/tst-chk1.c -+++ glibc-2.12.90-6/debug/tst-chk1.c +--- glibc-2.12-85-g73507d3/debug/tst-chk1.c ++++ glibc-2.12.90-7/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -367,8 +370,8 @@ # define O 0 # else # define O 1 ---- glibc-2.12-62-gb08c89d/debug/vdprintf_chk.c -+++ glibc-2.12.90-6/debug/vdprintf_chk.c +--- glibc-2.12-85-g73507d3/debug/vdprintf_chk.c ++++ glibc-2.12.90-7/debug/vdprintf_chk.c @@ -50,10 +50,10 @@ __vdprintf_chk (int d, int flags, const char *format, va_list arg) INTUSE(_IO_un_link) (&tmpfil); return EOF; @@ -384,8 +387,8 @@ /* For flags > 0 (i.e. __USE_FORTIFY_LEVEL > 1) request that %n can only come from read-only format strings. */ ---- glibc-2.12-62-gb08c89d/elf/Makefile -+++ glibc-2.12.90-6/elf/Makefile +--- glibc-2.12-85-g73507d3/elf/Makefile ++++ glibc-2.12.90-7/elf/Makefile @@ -89,6 +89,7 @@ distribute := rtld-Rules \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload6mod1.c unload6mod2.c unload6mod3.c \ @@ -439,8 +442,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-62-gb08c89d/elf/dl-close.c -+++ glibc-2.12.90-6/elf/dl-close.c +--- glibc-2.12-85-g73507d3/elf/dl-close.c ++++ glibc-2.12.90-7/elf/dl-close.c @@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) imap->l_scope_max = new_size; @@ -455,8 +458,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-62-gb08c89d/elf/dl-init.c -+++ glibc-2.12.90-6/elf/dl-init.c +--- glibc-2.12-85-g73507d3/elf/dl-init.c ++++ glibc-2.12.90-7/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -479,8 +482,8 @@ -#endif } INTDEF (_dl_init) ---- glibc-2.12-62-gb08c89d/elf/dl-support.c -+++ glibc-2.12.90-6/elf/dl-support.c +--- glibc-2.12-85-g73507d3/elf/dl-support.c ++++ glibc-2.12.90-7/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; @@ -492,8 +495,8 @@ /* Random data provided by the kernel. */ void *_dl_random; ---- glibc-2.12-62-gb08c89d/elf/ldconfig.c -+++ glibc-2.12.90-6/elf/ldconfig.c +--- glibc-2.12-85-g73507d3/elf/ldconfig.c ++++ glibc-2.12.90-7/elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -575,8 +578,8 @@ } const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; ---- glibc-2.12-62-gb08c89d/elf/rtld.c -+++ glibc-2.12.90-6/elf/rtld.c +--- glibc-2.12-85-g73507d3/elf/rtld.c ++++ glibc-2.12.90-7/elf/rtld.c @@ -106,7 +106,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -604,8 +607,8 @@ if (*user_entry == (ElfW(Addr)) ENTRY_POINT) { ---- glibc-2.12-62-gb08c89d/elf/tst-stackguard1.c -+++ glibc-2.12.90-6/elf/tst-stackguard1.c +--- glibc-2.12-85-g73507d3/elf/tst-stackguard1.c ++++ glibc-2.12.90-7/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -630,8 +633,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.12-62-gb08c89d/elf/unload8.c -+++ glibc-2.12.90-6/elf/unload8.c +--- glibc-2.12-85-g73507d3/elf/unload8.c ++++ glibc-2.12.90-7/elf/unload8.c @@ -0,0 +1,33 @@ +#include +#include @@ -666,8 +669,8 @@ + + return 0; +} ---- glibc-2.12-62-gb08c89d/elf/unload8mod1.c -+++ glibc-2.12.90-6/elf/unload8mod1.c +--- glibc-2.12-85-g73507d3/elf/unload8mod1.c ++++ glibc-2.12.90-7/elf/unload8mod1.c @@ -0,0 +1,7 @@ +extern void mod2 (void); + @@ -676,12 +679,12 @@ +{ + mod2 (); +} ---- glibc-2.12-62-gb08c89d/elf/unload8mod1x.c -+++ glibc-2.12.90-6/elf/unload8mod1x.c +--- glibc-2.12-85-g73507d3/elf/unload8mod1x.c ++++ glibc-2.12.90-7/elf/unload8mod1x.c @@ -0,0 +1 @@ +int mod1x; ---- glibc-2.12-62-gb08c89d/elf/unload8mod2.c -+++ glibc-2.12.90-6/elf/unload8mod2.c +--- glibc-2.12-85-g73507d3/elf/unload8mod2.c ++++ glibc-2.12.90-7/elf/unload8mod2.c @@ -0,0 +1,7 @@ +extern void mod3 (void); + @@ -690,8 +693,8 @@ +{ + mod3 (); +} ---- glibc-2.12-62-gb08c89d/elf/unload8mod3.c -+++ glibc-2.12.90-6/elf/unload8mod3.c +--- glibc-2.12-85-g73507d3/elf/unload8mod3.c ++++ glibc-2.12.90-7/elf/unload8mod3.c @@ -0,0 +1,27 @@ +#include +#include @@ -720,16 +723,16 @@ + + atexit (mod3_fini); +} ---- glibc-2.12-62-gb08c89d/include/bits/stdlib-ldbl.h -+++ glibc-2.12.90-6/include/bits/stdlib-ldbl.h +--- glibc-2.12-85-g73507d3/include/bits/stdlib-ldbl.h ++++ glibc-2.12.90-7/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.12-62-gb08c89d/include/bits/wchar-ldbl.h -+++ glibc-2.12.90-6/include/bits/wchar-ldbl.h +--- glibc-2.12-85-g73507d3/include/bits/wchar-ldbl.h ++++ glibc-2.12.90-7/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.12-62-gb08c89d/include/features.h -+++ glibc-2.12.90-6/include/features.h +--- glibc-2.12-85-g73507d3/include/features.h ++++ glibc-2.12.90-7/include/features.h @@ -308,8 +308,13 @@ #endif @@ -746,16 +749,16 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.12-62-gb08c89d/include/sys/resource.h -+++ glibc-2.12.90-6/include/sys/resource.h +--- glibc-2.12-85-g73507d3/include/sys/resource.h ++++ glibc-2.12.90-7/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-62-gb08c89d/inet/Makefile -+++ glibc-2.12.90-6/inet/Makefile +--- glibc-2.12-85-g73507d3/inet/Makefile ++++ glibc-2.12.90-7/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -765,8 +768,8 @@ ifeq ($(have-thread-library),yes) CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions ---- glibc-2.12-62-gb08c89d/intl/locale.alias -+++ glibc-2.12.90-6/intl/locale.alias +--- glibc-2.12-85-g73507d3/intl/locale.alias ++++ glibc-2.12.90-7/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -776,8 +779,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.12-62-gb08c89d/libio/iofdopen.c -+++ glibc-2.12.90-6/libio/iofdopen.c +--- glibc-2.12-85-g73507d3/libio/iofdopen.c ++++ glibc-2.12.90-7/libio/iofdopen.c @@ -172,9 +172,8 @@ _IO_new_fdopen (fd, mode) } new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE; @@ -790,8 +793,8 @@ return &new_f->fp.file; } ---- glibc-2.12-62-gb08c89d/libio/iofopncook.c -+++ glibc-2.12.90-6/libio/iofopncook.c +--- glibc-2.12-85-g73507d3/libio/iofopncook.c ++++ glibc-2.12.90-7/libio/iofopncook.c @@ -154,9 +154,8 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write, INTUSE(_IO_file_init) (&cfile->__fp); @@ -804,8 +807,8 @@ /* We use a negative number different from -1 for _fileno to mark that this special stream is not associated with a real file, but still has ---- glibc-2.12-62-gb08c89d/libio/iovdprintf.c -+++ glibc-2.12.90-6/libio/iovdprintf.c +--- glibc-2.12-85-g73507d3/libio/iovdprintf.c ++++ glibc-2.12.90-7/libio/iovdprintf.c @@ -53,10 +53,10 @@ _IO_vdprintf (d, format, arg) INTUSE(_IO_un_link) (&tmpfil); return EOF; @@ -821,8 +824,8 @@ done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg); ---- glibc-2.12-62-gb08c89d/libio/oldiofdopen.c -+++ glibc-2.12.90-6/libio/oldiofdopen.c +--- glibc-2.12-85-g73507d3/libio/oldiofdopen.c ++++ glibc-2.12.90-7/libio/oldiofdopen.c @@ -130,9 +130,8 @@ _IO_old_fdopen (fd, mode) } new_f->fp.file._file._flags &= ~_IO_DELETE_DONT_CLOSE; @@ -835,8 +838,8 @@ return (_IO_FILE *) &new_f->fp; } ---- glibc-2.12-62-gb08c89d/libio/stdio.h -+++ glibc-2.12.90-6/libio/stdio.h +--- glibc-2.12-85-g73507d3/libio/stdio.h ++++ glibc-2.12.90-7/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. */ @@ -850,8 +853,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.12-62-gb08c89d/locale/iso-4217.def -+++ glibc-2.12.90-6/locale/iso-4217.def +--- glibc-2.12-85-g73507d3/locale/iso-4217.def ++++ glibc-2.12.90-7/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -943,8 +946,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.12-62-gb08c89d/locale/programs/locarchive.c -+++ glibc-2.12.90-6/locale/programs/locarchive.c +--- glibc-2.12-85-g73507d3/locale/programs/locarchive.c ++++ glibc-2.12.90-7/locale/programs/locarchive.c @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; @@ -1003,8 +1006,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.12-62-gb08c89d/localedata/Makefile -+++ glibc-2.12.90-6/localedata/Makefile +--- glibc-2.12-85-g73507d3/localedata/Makefile ++++ glibc-2.12.90-7/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -1013,8 +1016,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.12-62-gb08c89d/localedata/SUPPORTED -+++ glibc-2.12.90-6/localedata/SUPPORTED +--- glibc-2.12-85-g73507d3/localedata/SUPPORTED ++++ glibc-2.12.90-7/localedata/SUPPORTED @@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -1056,8 +1059,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.12-62-gb08c89d/localedata/locales/cy_GB -+++ glibc-2.12.90-6/localedata/locales/cy_GB +--- glibc-2.12-85-g73507d3/localedata/locales/cy_GB ++++ glibc-2.12.90-7/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1072,8 +1075,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.12-62-gb08c89d/localedata/locales/en_GB -+++ glibc-2.12.90-6/localedata/locales/en_GB +--- glibc-2.12-85-g73507d3/localedata/locales/en_GB ++++ glibc-2.12.90-7/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -1085,8 +1088,8 @@ date_fmt "/ / " ---- glibc-2.12-62-gb08c89d/localedata/locales/no_NO -+++ glibc-2.12.90-6/localedata/locales/no_NO +--- glibc-2.12-85-g73507d3/localedata/locales/no_NO ++++ glibc-2.12.90-7/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1157,8 +1160,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.12-62-gb08c89d/localedata/locales/zh_TW -+++ glibc-2.12.90-6/localedata/locales/zh_TW +--- glibc-2.12-85-g73507d3/localedata/locales/zh_TW ++++ glibc-2.12.90-7/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1186,8 +1189,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.12-62-gb08c89d/malloc/mcheck.c -+++ glibc-2.12.90-6/malloc/mcheck.c +--- glibc-2.12-85-g73507d3/malloc/mcheck.c ++++ glibc-2.12.90-7/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -1263,8 +1266,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.12-62-gb08c89d/manual/libc.texinfo -+++ glibc-2.12.90-6/manual/libc.texinfo +--- glibc-2.12-85-g73507d3/manual/libc.texinfo ++++ glibc-2.12.90-7/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1274,8 +1277,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.12-62-gb08c89d/misc/sys/cdefs.h -+++ glibc-2.12.90-6/misc/sys/cdefs.h +--- glibc-2.12-85-g73507d3/misc/sys/cdefs.h ++++ glibc-2.12.90-7/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1319,8 +1322,8 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.12-62-gb08c89d/nis/Makefile -+++ glibc-2.12.90-6/nis/Makefile +--- glibc-2.12-85-g73507d3/nis/Makefile ++++ glibc-2.12.90-7/nis/Makefile @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) include ../Rules @@ -1330,8 +1333,8 @@ $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version) $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \ ---- glibc-2.12-62-gb08c89d/nis/nss -+++ glibc-2.12.90-6/nis/nss +--- glibc-2.12-85-g73507d3/nis/nss ++++ glibc-2.12.90-7/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 @@ -1341,8 +1344,8 @@ # # ADJUNCT_AS_SHADOW # If set to TRUE, the passwd routines in the NIS NSS module will not ---- glibc-2.12-62-gb08c89d/nptl/ChangeLog -+++ glibc-2.12.90-6/nptl/ChangeLog +--- glibc-2.12-85-g73507d3/nptl/ChangeLog ++++ glibc-2.12.90-7/nptl/ChangeLog @@ -3926,6 +3926,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1383,8 +1386,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.12-62-gb08c89d/nptl/Makefile -+++ glibc-2.12.90-6/nptl/Makefile +--- glibc-2.12-85-g73507d3/nptl/Makefile ++++ glibc-2.12.90-7/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1417,8 +1420,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.12-62-gb08c89d/nptl/Versions -+++ glibc-2.12.90-6/nptl/Versions +--- glibc-2.12-85-g73507d3/nptl/Versions ++++ glibc-2.12.90-7/nptl/Versions @@ -29,6 +29,7 @@ libc { GLIBC_PRIVATE { # Internal libc interface to libpthread @@ -1427,8 +1430,8 @@ } } ---- glibc-2.12-62-gb08c89d/nptl/allocatestack.c -+++ glibc-2.12.90-6/nptl/allocatestack.c +--- glibc-2.12-85-g73507d3/nptl/allocatestack.c ++++ glibc-2.12.90-7/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. */ @@ -1447,8 +1450,8 @@ } while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling, ch | SETXID_BITMASK, ch)); ---- glibc-2.12-62-gb08c89d/nptl/nptl-init.c -+++ glibc-2.12.90-6/nptl/nptl-init.c +--- glibc-2.12-85-g73507d3/nptl/nptl-init.c ++++ glibc-2.12.90-7/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. */ @@ -1458,8 +1461,8 @@ || limit.rlim_cur == RLIM_INFINITY) /* The system limit is not usable. Use an architecture-specific default. */ ---- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.12.90-6/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.12-85-g73507d3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.12.90-7/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -1468,8 +1471,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.12.90-6/nptl/sysdeps/unix/sysv/linux/i386/Versions +--- glibc-2.12-85-g73507d3/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.12.90-7/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -1477,8 +1480,8 @@ + __uname; + } +} ---- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.12.90-6/nptl/sysdeps/unix/sysv/linux/i386/smp.h +--- glibc-2.12-85-g73507d3/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.12.90-7/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -1488,8 +1491,8 @@ cp = u.uts.version; else { ---- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.12.90-6/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.12-85-g73507d3/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.12.90-7/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1497,8 +1500,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.12-62-gb08c89d/nptl/tst-stackguard1.c -+++ glibc-2.12.90-6/nptl/tst-stackguard1.c +--- glibc-2.12-85-g73507d3/nptl/tst-stackguard1.c ++++ glibc-2.12.90-7/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1523,8 +1526,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.12-62-gb08c89d/nscd/nscd.conf -+++ glibc-2.12.90-6/nscd/nscd.conf +--- glibc-2.12-85-g73507d3/nscd/nscd.conf ++++ glibc-2.12.90-7/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1534,8 +1537,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.12-62-gb08c89d/nscd/nscd.init -+++ glibc-2.12.90-6/nscd/nscd.init +--- glibc-2.12-85-g73507d3/nscd/nscd.init ++++ glibc-2.12.90-7/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1612,8 +1615,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.12-62-gb08c89d/nss/Makefile -+++ glibc-2.12.90-6/nss/Makefile +--- glibc-2.12-85-g73507d3/nss/Makefile ++++ glibc-2.12.90-7/nss/Makefile @@ -74,6 +74,7 @@ endif include ../Rules @@ -1622,8 +1625,8 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a ---- glibc-2.12-62-gb08c89d/posix/Makefile -+++ glibc-2.12.90-6/posix/Makefile +--- glibc-2.12-85-g73507d3/posix/Makefile ++++ glibc-2.12.90-7/posix/Makefile @@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1644,8 +1647,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.12-62-gb08c89d/posix/gai.conf -+++ glibc-2.12.90-6/posix/gai.conf +--- glibc-2.12-85-g73507d3/posix/gai.conf ++++ glibc-2.12.90-7/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1670,8 +1673,8 @@ #scopev4 ::ffff:0.0.0.0/96 14 +# +# This is what the Red Hat setting currently uses. ---- glibc-2.12-62-gb08c89d/posix/getconf.speclist.h -+++ glibc-2.12.90-6/posix/getconf.speclist.h +--- glibc-2.12-85-g73507d3/posix/getconf.speclist.h ++++ glibc-2.12.90-7/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1712,8 +1715,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.12-62-gb08c89d/resolv/Makefile -+++ glibc-2.12.90-6/resolv/Makefile +--- glibc-2.12-85-g73507d3/resolv/Makefile ++++ glibc-2.12.90-7/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -1722,8 +1725,8 @@ # The BIND code elicits some harmless warnings. +cflags += -Wno-strict-prototypes -Wno-write-strings ---- glibc-2.12-62-gb08c89d/resource/getrlimit.c -+++ glibc-2.12.90-6/resource/getrlimit.c +--- glibc-2.12-85-g73507d3/resource/getrlimit.c ++++ glibc-2.12.90-7/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -1732,8 +1735,8 @@ weak_alias (__getrlimit, getrlimit) stub_warning (getrlimit) ---- glibc-2.12-62-gb08c89d/streams/Makefile -+++ glibc-2.12.90-6/streams/Makefile +--- glibc-2.12-85-g73507d3/streams/Makefile ++++ glibc-2.12.90-7/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1743,8 +1746,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.12-62-gb08c89d/sunrpc/Makefile -+++ glibc-2.12.90-6/sunrpc/Makefile +--- glibc-2.12-85-g73507d3/sunrpc/Makefile ++++ glibc-2.12.90-7/sunrpc/Makefile @@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions CPPFLAGS += -D_RPC_THREAD_SAFE_ @@ -1756,8 +1759,8 @@ include ../Rules $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \ ---- glibc-2.12-62-gb08c89d/sysdeps/generic/dl-cache.h -+++ glibc-2.12.90-6/sysdeps/generic/dl-cache.h +--- glibc-2.12-85-g73507d3/sysdeps/generic/dl-cache.h ++++ glibc-2.12.90-7/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1773,8 +1776,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-62-gb08c89d/sysdeps/i386/Makefile -+++ glibc-2.12.90-6/sysdeps/i386/Makefile +--- glibc-2.12-85-g73507d3/sysdeps/i386/Makefile ++++ glibc-2.12.90-7/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1799,8 +1802,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.12-62-gb08c89d/sysdeps/i386/i686/Makefile -+++ glibc-2.12.90-6/sysdeps/i386/i686/Makefile +--- glibc-2.12-85-g73507d3/sysdeps/i386/i686/Makefile ++++ glibc-2.12.90-7/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -1821,8 +1824,8 @@ -ASFLAGS-.ob += -Wa,-mtune=i686 -ASFLAGS-.oS += -Wa,-mtune=i686 -endif ---- glibc-2.12-62-gb08c89d/sysdeps/ia64/Makefile -+++ glibc-2.12.90-6/sysdeps/ia64/Makefile +--- glibc-2.12-85-g73507d3/sysdeps/ia64/Makefile ++++ glibc-2.12.90-7/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1834,8 +1837,8 @@ endif endif ---- glibc-2.12-62-gb08c89d/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.12.90-6/sysdeps/ia64/ia64libgcc.S +--- glibc-2.12-85-g73507d3/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.12.90-7/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2187,8 +2190,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.12-62-gb08c89d/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.12.90-6/sysdeps/ia64/libgcc-compat.c +--- glibc-2.12-85-g73507d3/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.12.90-7/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -2274,16 +2277,16 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.12-62-gb08c89d/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.12.90-6/sysdeps/mach/hurd/getrlimit.c +--- glibc-2.12-85-g73507d3/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.12.90-7/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-62-gb08c89d/sysdeps/posix/getaddrinfo.c -+++ glibc-2.12.90-6/sysdeps/posix/getaddrinfo.c +--- glibc-2.12-85-g73507d3/sysdeps/posix/getaddrinfo.c ++++ glibc-2.12.90-7/sysdeps/posix/getaddrinfo.c @@ -1099,10 +1099,12 @@ static const struct scopeentry /* Link-local addresses: scope 2. */ { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, @@ -2297,8 +2300,8 @@ /* Default: scope 14. */ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; ---- glibc-2.12-62-gb08c89d/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.12.90-6/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.12-85-g73507d3/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.12.90-7/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -2307,8 +2310,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.12-62-gb08c89d/sysdeps/powerpc/powerpc64/dl-machine.h -+++ glibc-2.12.90-6/sysdeps/powerpc/powerpc64/dl-machine.h +--- glibc-2.12-85-g73507d3/sysdeps/powerpc/powerpc64/dl-machine.h ++++ glibc-2.12.90-7/sysdeps/powerpc/powerpc64/dl-machine.h @@ -641,16 +641,14 @@ elf_machine_rela (struct link_map *map, value = elf_machine_tprel (map, sym_map, sym, reloc); if (dont_expect ((value & 3) != 0)) @@ -2328,16 +2331,16 @@ break; case R_PPC64_TPREL16: ---- glibc-2.12-62-gb08c89d/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.12.90-6/sysdeps/powerpc/powerpc64/elf/Makefile +--- glibc-2.12-85-g73507d3/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.12.90-7/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-62-gb08c89d/sysdeps/unix/nice.c -+++ glibc-2.12.90-6/sysdeps/unix/nice.c +--- glibc-2.12-85-g73507d3/sysdeps/unix/nice.c ++++ glibc-2.12.90-7/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -2352,8 +2355,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -2369,8 +2372,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -2418,8 +2421,8 @@ } else #endif ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2462,8 +2465,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/getpagesize.c -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/getpagesize.c +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -2473,8 +2476,8 @@ assert (GLRO(dl_pagesize) != 0); return GLRO(dl_pagesize); #else ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2535,16 +2538,16 @@ + } while (0) + +#include_next ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/i386/getrlimit.c +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.12.90-7/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-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2577,29 +2580,29 @@ + } while (0) + #include_next ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2625,8 +2628,8 @@ struct netlink_res { ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2636,13 +2639,13 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c @@ -1 +1 @@ -#include "../../fxstat.c" +#include "../../i386/fxstat.c" ---- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.12-85-g73507d3/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.12.90-7/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2688,8 +2691,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.12-62-gb08c89d/timezone/zic.c -+++ glibc-2.12.90-6/timezone/zic.c +--- glibc-2.12-85-g73507d3/timezone/zic.c ++++ glibc-2.12.90-7/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; diff --git a/glibc.spec b/glibc.spec index 087e33d..95d3389 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.12-62-gb08c89d +%define glibcsrcdir glibc-2.12-85-g73507d3 %define glibcversion 2.12.90 %define glibcportsdir glibc-ports-2.12-12-g71feaf7 ### glibc.spec.in follows: @@ -20,11 +20,12 @@ %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x %define debuginfocommonarches alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v %define multiarcharches ppc ppc64 %{ix86} x86_64 +%define portsarches alpha armv5tel Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 6 +Release: 7 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -33,9 +34,9 @@ Release: 6 License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ Group: System Environment/Libraries URL: http://www.gnu.org/software/glibc/ -Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2 -Source1: %{?glibc_release_url}%{glibcportsdir}.tar.bz2 -Source2: %{glibcsrcdir}-fedora.tar.bz2 +Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.xz +Source1: %{?glibc_release_url}%{glibcportsdir}.tar.xz +Source2: %{glibcsrcdir}-fedora.tar.xz Patch0: %{name}-fedora.patch Patch1: %{name}-ia64-lib64.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +56,7 @@ BuildRequires: /bin/ps, /bin/kill, /bin/awk # will be compatible with egcs 1.x.y BuildRequires: gcc >= 3.2 %define enablekernel 2.6.32 +Conflicts: kernel < %{enablekernel} %ifarch i386 %define nptl_target_cpu i486 %else @@ -334,6 +336,9 @@ AddOns=`echo */configure | sed -e 's!/configure!!g;s!\(linuxthreads\|nptl\|rtkai %ifarch %{rtkaioarches} AddOns=,rtkaio$AddOns %endif +%ifarch %{portsarches} +AddOns=,../%{glibcportsdir}$AddOns +%endif build_nptl() { @@ -1035,6 +1040,18 @@ rm -f *.filelist* %endif %changelog +* Mon Aug 2 2010 Andreas Schwab - 2.12.90-7 +- Update from master + - Add optimized x86-64 implementation of strnlen and strcaecmp + - Document M_PERTURB + - Fix vDSO synthetic hwcap handling so they are not masked out from + ld.so.cache matching + - POWER6/7 optimizations for copysign +- Build with ports addon on alpha and armv5tel +- Add conflict with kernel < 2.6.32 (#619538) +- Switch to xz compressed tar files +- build-locale-archive: process only directories matching *_* + * Wed Jul 21 2010 Andreas Schwab - 2.12.90-6 - Bump minimum kernel version to 2.6.32 diff --git a/sources b/sources index e73d3b0..d16d53f 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -1de506da02712be11f3e0f926564ac18 glibc-2.12-62-gb08c89d.tar.bz2 -fcec0c50709b63dc101ec3894fa97602 glibc-ports-2.12-12-g71feaf7.tar.bz2 -1583f2ace64e30b77d4009493f1d62b4 glibc-2.12-62-gb08c89d-fedora.tar.bz2 +9704d193f6a9e882b832d3ba854b043f glibc-2.12-85-g73507d3-fedora.tar.xz +a3d900a2d8d4d6269bd1e4cdb8799c85 glibc-2.12-85-g73507d3.tar.xz +27f2d898f0de8c19c9d69b959734cba6 glibc-ports-2.12-12-g71feaf7.tar.xz