From 808dafc80ec4980166838ad8d04a59af1647d371 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 21 Jul 2010 15:08:07 +0000 Subject: [PATCH] 2.12.90-6 --- .cvsignore | 2 +- glibc-fedora.patch | 288 +++++++++++++++++++++++++++++++-------------- glibc.spec | 7 +- import.log | 1 + sources | 2 +- 5 files changed, 208 insertions(+), 92 deletions(-) diff --git a/.cvsignore b/.cvsignore index a028f23..9e04612 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -glibc-2.12-62-gb08c89d-fedora.tar.bz2 glibc-2.12-62-gb08c89d.tar.bz2 glibc-ports-2.12-12-g71feaf7.tar.bz2 +glibc-2.12-62-gb08c89d-fedora.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 8f57c62..482db22 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,21 @@ --- glibc-2.12-62-gb08c89d/ChangeLog -+++ glibc-2.12.90-5/ChangeLog -@@ -128,6 +128,32 @@ ++++ glibc-2.12.90-6/ChangeLog +@@ -1,3 +1,14 @@ ++2010-07-18 Andreas Schwab ++ ++ * debug/vdprintf_chk.c (__vdprintf_chk): Remove undefined ++ operation. ++ * libio/iofdopen.c (_IO_new_fdopen): Likewise. ++ * libio/iofopncook.c (_IO_cookie_init): Likewise. ++ * libio/iovdprintf.c (_IO_vdprintf): Likewise. ++ * libio/oldiofdopen.c (_IO_old_fdopen): Likewise. ++ * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela): ++ Likewise. ++ + 2010-07-09 Ulrich Drepper + + * sysdeps/unix/sysv/linux/fpathconf.c (__fpathconf): Use __fcntl not +@@ -128,6 +139,32 @@ call returning > 0 value. * sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise. @@ -33,7 +48,7 @@ 2010-06-07 Andreas Schwab * dlfcn/Makefile: Remove explicit dependencies on libc.so and -@@ -180,6 +206,24 @@ +@@ -180,6 +217,24 @@ * hurd/hurd/fd.h (__file_name_lookup_at): Update comment. * sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS. @@ -59,7 +74,7 @@ * sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi. --- glibc-2.12-62-gb08c89d/ChangeLog.15 -+++ glibc-2.12.90-5/ChangeLog.15 ++++ glibc-2.12.90-6/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -126,7 +141,7 @@ * scripts/extract-abilist.awk: If `lastversion' variable defined, omit --- glibc-2.12-62-gb08c89d/ChangeLog.16 -+++ glibc-2.12.90-5/ChangeLog.16 ++++ glibc-2.12.90-6/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -181,7 +196,7 @@ [BZ #1137] --- glibc-2.12-62-gb08c89d/ChangeLog.17 -+++ glibc-2.12.90-5/ChangeLog.17 ++++ glibc-2.12.90-6/ChangeLog.17 @@ -256,6 +256,12 @@ * Makerules (libc-abis): Fix search for libc-abis in add-ons. @@ -267,7 +282,7 @@ [BZ #3632] --- glibc-2.12-62-gb08c89d/Makeconfig -+++ glibc-2.12.90-5/Makeconfig ++++ glibc-2.12.90-6/Makeconfig @@ -789,12 +789,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -285,7 +300,7 @@ ifndef BUILD_CC BUILD_CC = $(CC) --- glibc-2.12-62-gb08c89d/csu/Makefile -+++ glibc-2.12.90-5/csu/Makefile ++++ glibc-2.12.90-6/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -297,7 +312,7 @@ vpath initfini.c $(sysdirs) --- glibc-2.12-62-gb08c89d/csu/elf-init.c -+++ glibc-2.12.90-5/csu/elf-init.c ++++ glibc-2.12.90-6/csu/elf-init.c @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **) extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden; @@ -323,7 +338,7 @@ /* 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-5/debug/tst-chk1.c ++++ glibc-2.12.90-6/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -352,8 +367,25 @@ # 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 +@@ -50,10 +50,10 @@ __vdprintf_chk (int d, int flags, const char *format, va_list arg) + INTUSE(_IO_un_link) (&tmpfil); + return EOF; + } +- tmpfil.file._IO_file_flags = +- (_IO_mask_flags (&tmpfil.file, _IO_NO_READS, +- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING) +- | _IO_DELETE_DONT_CLOSE); ++ tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE; ++ ++ _IO_mask_flags (&tmpfil.file, _IO_NO_READS, ++ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); + + /* 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-5/elf/Makefile ++++ glibc-2.12.90-6/elf/Makefile @@ -89,6 +89,7 @@ distribute := rtld-Rules \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload6mod1.c unload6mod2.c unload6mod3.c \ @@ -408,7 +440,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-62-gb08c89d/elf/dl-close.c -+++ glibc-2.12.90-5/elf/dl-close.c ++++ glibc-2.12.90-6/elf/dl-close.c @@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map) imap->l_scope_max = new_size; @@ -424,7 +456,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-62-gb08c89d/elf/dl-init.c -+++ glibc-2.12.90-5/elf/dl-init.c ++++ glibc-2.12.90-6/elf/dl-init.c @@ -24,11 +24,9 @@ /* Type of the initializer. */ typedef void (*init_t) (int, char **, char **); @@ -448,7 +480,7 @@ } INTDEF (_dl_init) --- glibc-2.12-62-gb08c89d/elf/dl-support.c -+++ glibc-2.12.90-5/elf/dl-support.c ++++ glibc-2.12.90-6/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; @@ -461,7 +493,7 @@ /* Random data provided by the kernel. */ void *_dl_random; --- glibc-2.12-62-gb08c89d/elf/ldconfig.c -+++ glibc-2.12.90-5/elf/ldconfig.c ++++ glibc-2.12.90-6/elf/ldconfig.c @@ -1031,17 +1031,19 @@ search_dirs (void) @@ -544,7 +576,7 @@ const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; --- glibc-2.12-62-gb08c89d/elf/rtld.c -+++ glibc-2.12.90-5/elf/rtld.c ++++ glibc-2.12.90-6/elf/rtld.c @@ -106,7 +106,6 @@ static struct audit_list struct audit_list *next; } *audit_list; @@ -573,7 +605,7 @@ if (*user_entry == (ElfW(Addr)) ENTRY_POINT) { --- glibc-2.12-62-gb08c89d/elf/tst-stackguard1.c -+++ glibc-2.12.90-5/elf/tst-stackguard1.c ++++ glibc-2.12.90-6/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -599,7 +631,7 @@ 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-5/elf/unload8.c ++++ glibc-2.12.90-6/elf/unload8.c @@ -0,0 +1,33 @@ +#include +#include @@ -635,7 +667,7 @@ + return 0; +} --- glibc-2.12-62-gb08c89d/elf/unload8mod1.c -+++ glibc-2.12.90-5/elf/unload8mod1.c ++++ glibc-2.12.90-6/elf/unload8mod1.c @@ -0,0 +1,7 @@ +extern void mod2 (void); + @@ -645,11 +677,11 @@ + mod2 (); +} --- glibc-2.12-62-gb08c89d/elf/unload8mod1x.c -+++ glibc-2.12.90-5/elf/unload8mod1x.c ++++ glibc-2.12.90-6/elf/unload8mod1x.c @@ -0,0 +1 @@ +int mod1x; --- glibc-2.12-62-gb08c89d/elf/unload8mod2.c -+++ glibc-2.12.90-5/elf/unload8mod2.c ++++ glibc-2.12.90-6/elf/unload8mod2.c @@ -0,0 +1,7 @@ +extern void mod3 (void); + @@ -659,7 +691,7 @@ + mod3 (); +} --- glibc-2.12-62-gb08c89d/elf/unload8mod3.c -+++ glibc-2.12.90-5/elf/unload8mod3.c ++++ glibc-2.12.90-6/elf/unload8mod3.c @@ -0,0 +1,27 @@ +#include +#include @@ -689,15 +721,15 @@ + atexit (mod3_fini); +} --- glibc-2.12-62-gb08c89d/include/bits/stdlib-ldbl.h -+++ glibc-2.12.90-5/include/bits/stdlib-ldbl.h ++++ glibc-2.12.90-6/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include --- glibc-2.12-62-gb08c89d/include/bits/wchar-ldbl.h -+++ glibc-2.12.90-5/include/bits/wchar-ldbl.h ++++ glibc-2.12.90-6/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include --- glibc-2.12-62-gb08c89d/include/features.h -+++ glibc-2.12.90-5/include/features.h ++++ glibc-2.12.90-6/include/features.h @@ -308,8 +308,13 @@ #endif @@ -715,7 +747,7 @@ # else # define __USE_FORTIFY_LEVEL 1 --- glibc-2.12-62-gb08c89d/include/sys/resource.h -+++ glibc-2.12.90-5/include/sys/resource.h ++++ glibc-2.12.90-6/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, @@ -723,7 +755,7 @@ +libc_hidden_proto (__getrlimit) #endif --- glibc-2.12-62-gb08c89d/inet/Makefile -+++ glibc-2.12.90-5/inet/Makefile ++++ glibc-2.12.90-6/inet/Makefile @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \ include ../Rules @@ -734,7 +766,7 @@ CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions --- glibc-2.12-62-gb08c89d/intl/locale.alias -+++ glibc-2.12.90-5/intl/locale.alias ++++ glibc-2.12.90-6/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -744,8 +776,67 @@ 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 +@@ -172,9 +172,8 @@ _IO_new_fdopen (fd, mode) + } + new_f->fp.file._flags &= ~_IO_DELETE_DONT_CLOSE; + +- new_f->fp.file._IO_file_flags = +- _IO_mask_flags (&new_f->fp.file, read_write, +- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); ++ _IO_mask_flags (&new_f->fp.file, read_write, ++ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); + + return &new_f->fp.file; + } +--- glibc-2.12-62-gb08c89d/libio/iofopncook.c ++++ glibc-2.12.90-6/libio/iofopncook.c +@@ -154,9 +154,8 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write, + + INTUSE(_IO_file_init) (&cfile->__fp); + +- cfile->__fp.file._IO_file_flags = +- _IO_mask_flags (&cfile->__fp.file, read_write, +- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); ++ _IO_mask_flags (&cfile->__fp.file, read_write, ++ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); + + /* 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 +@@ -53,10 +53,10 @@ _IO_vdprintf (d, format, arg) + INTUSE(_IO_un_link) (&tmpfil); + return EOF; + } +- tmpfil.file._IO_file_flags = +- (_IO_mask_flags (&tmpfil.file, _IO_NO_READS, +- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING) +- | _IO_DELETE_DONT_CLOSE); ++ tmpfil.file._flags |= _IO_DELETE_DONT_CLOSE; ++ ++ _IO_mask_flags (&tmpfil.file, _IO_NO_READS, ++ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); + + done = INTUSE(_IO_vfprintf) (&tmpfil.file, format, arg); + +--- glibc-2.12-62-gb08c89d/libio/oldiofdopen.c ++++ glibc-2.12.90-6/libio/oldiofdopen.c +@@ -130,9 +130,8 @@ _IO_old_fdopen (fd, mode) + } + new_f->fp.file._file._flags &= ~_IO_DELETE_DONT_CLOSE; + +- new_f->fp.file._file._IO_file_flags = +- _IO_mask_flags (&new_f->fp.file._file, read_write, +- _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); ++ _IO_mask_flags (&new_f->fp.file._file, read_write, ++ _IO_NO_READS+_IO_NO_WRITES+_IO_IS_APPENDING); + + return (_IO_FILE *) &new_f->fp; + } --- glibc-2.12-62-gb08c89d/libio/stdio.h -+++ glibc-2.12.90-5/libio/stdio.h ++++ glibc-2.12.90-6/libio/stdio.h @@ -165,10 +165,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -760,7 +851,7 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ --- glibc-2.12-62-gb08c89d/locale/iso-4217.def -+++ glibc-2.12.90-5/locale/iso-4217.def ++++ glibc-2.12.90-6/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -853,7 +944,7 @@ 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-5/locale/programs/locarchive.c ++++ glibc-2.12.90-6/locale/programs/locarchive.c @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah) size_t reserved = RESERVE_MMAP_SIZE; int xflags = 0; @@ -913,7 +1004,7 @@ const char *oldname, uint32_t *locrec_offset_p) { --- glibc-2.12-62-gb08c89d/localedata/Makefile -+++ glibc-2.12.90-5/localedata/Makefile ++++ glibc-2.12.90-6/localedata/Makefile @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -923,7 +1014,7 @@ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ --- glibc-2.12-62-gb08c89d/localedata/SUPPORTED -+++ glibc-2.12.90-5/localedata/SUPPORTED ++++ glibc-2.12.90-6/localedata/SUPPORTED @@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -966,7 +1057,7 @@ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ --- glibc-2.12-62-gb08c89d/localedata/locales/cy_GB -+++ glibc-2.12.90-5/localedata/locales/cy_GB ++++ glibc-2.12.90-6/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -982,7 +1073,7 @@ LC_MESSAGES --- glibc-2.12-62-gb08c89d/localedata/locales/en_GB -+++ glibc-2.12.90-5/localedata/locales/en_GB ++++ glibc-2.12.90-6/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -995,7 +1086,7 @@ / " --- glibc-2.12-62-gb08c89d/localedata/locales/no_NO -+++ glibc-2.12.90-5/localedata/locales/no_NO ++++ glibc-2.12.90-6/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -1067,7 +1158,7 @@ +copy "nb_NO" +END LC_ADDRESS --- glibc-2.12-62-gb08c89d/localedata/locales/zh_TW -+++ glibc-2.12.90-5/localedata/locales/zh_TW ++++ glibc-2.12.90-6/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -1096,7 +1187,7 @@ date "2000-08-02" % --- glibc-2.12-62-gb08c89d/malloc/mcheck.c -+++ glibc-2.12.90-5/malloc/mcheck.c ++++ glibc-2.12.90-6/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -1173,7 +1264,7 @@ old_free_hook = __free_hook; __free_hook = freehook; --- glibc-2.12-62-gb08c89d/manual/libc.texinfo -+++ glibc-2.12.90-5/manual/libc.texinfo ++++ glibc-2.12.90-6/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -1184,7 +1275,7 @@ * Libc: (libc). C library. @end direntry --- glibc-2.12-62-gb08c89d/misc/sys/cdefs.h -+++ glibc-2.12.90-5/misc/sys/cdefs.h ++++ glibc-2.12.90-6/misc/sys/cdefs.h @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1229,7 +1320,7 @@ # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif --- glibc-2.12-62-gb08c89d/nis/Makefile -+++ glibc-2.12.90-5/nis/Makefile ++++ glibc-2.12.90-6/nis/Makefile @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes)) include ../Rules @@ -1240,7 +1331,7 @@ $(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-5/nis/nss ++++ glibc-2.12.90-6/nis/nss @@ -25,7 +25,7 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get @@ -1251,7 +1342,7 @@ # 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-5/nptl/ChangeLog ++++ glibc-2.12.90-6/nptl/ChangeLog @@ -3926,6 +3926,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1293,7 +1384,7 @@ * tst-cancel17.c (do_test): Check if aio_cancel failed. --- glibc-2.12-62-gb08c89d/nptl/Makefile -+++ glibc-2.12.90-5/nptl/Makefile ++++ glibc-2.12.90-6/nptl/Makefile @@ -342,7 +342,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1327,7 +1418,7 @@ $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif --- glibc-2.12-62-gb08c89d/nptl/Versions -+++ glibc-2.12.90-5/nptl/Versions ++++ glibc-2.12.90-6/nptl/Versions @@ -29,6 +29,7 @@ libc { GLIBC_PRIVATE { # Internal libc interface to libpthread @@ -1337,7 +1428,7 @@ } --- glibc-2.12-62-gb08c89d/nptl/allocatestack.c -+++ glibc-2.12.90-5/nptl/allocatestack.c ++++ glibc-2.12.90-6/nptl/allocatestack.c @@ -994,7 +994,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t) /* If the thread is exiting right now, ignore it. */ @@ -1357,7 +1448,7 @@ 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-5/nptl/nptl-init.c ++++ glibc-2.12.90-6/nptl/nptl-init.c @@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void) /* Determine the default allowed stack size. This is the size used in case the user does not specify one. */ @@ -1368,7 +1459,7 @@ /* 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-5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.12.90-6/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h @@ -189,4 +189,7 @@ /* Typed memory objects are not available. */ #define _POSIX_TYPED_MEMORY_OBJECTS -1 @@ -1378,7 +1469,7 @@ + #endif /* bits/posix_opt.h */ --- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/i386/Versions -+++ glibc-2.12.90-5/nptl/sysdeps/unix/sysv/linux/i386/Versions ++++ glibc-2.12.90-6/nptl/sysdeps/unix/sysv/linux/i386/Versions @@ -0,0 +1,6 @@ +libc { + GLIBC_PRIVATE { @@ -1387,7 +1478,7 @@ + } +} --- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/i386/smp.h -+++ glibc-2.12.90-5/nptl/sysdeps/unix/sysv/linux/i386/smp.h ++++ glibc-2.12.90-6/nptl/sysdeps/unix/sysv/linux/i386/smp.h @@ -37,7 +37,7 @@ is_smp_system (void) char *cp; @@ -1398,7 +1489,7 @@ else { --- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.12.90-5/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.12.90-6/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1407,7 +1498,7 @@ +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif --- glibc-2.12-62-gb08c89d/nptl/tst-stackguard1.c -+++ glibc-2.12.90-5/nptl/tst-stackguard1.c ++++ glibc-2.12.90-6/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1433,7 +1524,7 @@ 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-5/nscd/nscd.conf ++++ glibc-2.12.90-6/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1444,7 +1535,7 @@ debug-level 0 # reload-count 5 --- glibc-2.12-62-gb08c89d/nscd/nscd.init -+++ glibc-2.12.90-5/nscd/nscd.init ++++ glibc-2.12.90-6/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1522,7 +1613,7 @@ *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" --- glibc-2.12-62-gb08c89d/nss/Makefile -+++ glibc-2.12.90-5/nss/Makefile ++++ glibc-2.12.90-6/nss/Makefile @@ -74,6 +74,7 @@ endif include ../Rules @@ -1532,7 +1623,7 @@ ifeq (yes,$(build-static-nss)) $(objpfx)getent: $(objpfx)libnss_files.a --- glibc-2.12-62-gb08c89d/posix/Makefile -+++ glibc-2.12.90-5/posix/Makefile ++++ glibc-2.12.90-6/posix/Makefile @@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1554,7 +1645,7 @@ + > $@.new mv -f $@.new $@ --- glibc-2.12-62-gb08c89d/posix/gai.conf -+++ glibc-2.12.90-5/posix/gai.conf ++++ glibc-2.12.90-6/posix/gai.conf @@ -41,7 +41,7 @@ # # precedence @@ -1580,7 +1671,7 @@ +# +# This is what the Red Hat setting currently uses. --- glibc-2.12-62-gb08c89d/posix/getconf.speclist.h -+++ glibc-2.12.90-5/posix/getconf.speclist.h ++++ glibc-2.12.90-6/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1622,7 +1713,7 @@ +#endif +""; --- glibc-2.12-62-gb08c89d/resolv/Makefile -+++ glibc-2.12.90-5/resolv/Makefile ++++ glibc-2.12.90-6/resolv/Makefile @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \ -Dgetnetbyaddr=res_getnetbyaddr @@ -1632,7 +1723,7 @@ # 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-5/resource/getrlimit.c ++++ glibc-2.12.90-6/resource/getrlimit.c @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) __set_errno (ENOSYS); return -1; @@ -1642,7 +1733,7 @@ stub_warning (getrlimit) --- glibc-2.12-62-gb08c89d/streams/Makefile -+++ glibc-2.12.90-5/streams/Makefile ++++ glibc-2.12.90-6/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1653,7 +1744,7 @@ include ../Rules --- glibc-2.12-62-gb08c89d/sunrpc/Makefile -+++ glibc-2.12.90-5/sunrpc/Makefile ++++ glibc-2.12.90-6/sunrpc/Makefile @@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions CPPFLAGS += -D_RPC_THREAD_SAFE_ @@ -1666,7 +1757,7 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \ --- glibc-2.12-62-gb08c89d/sysdeps/generic/dl-cache.h -+++ glibc-2.12.90-5/sysdeps/generic/dl-cache.h ++++ glibc-2.12.90-6/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1683,7 +1774,7 @@ /* 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-5/sysdeps/i386/Makefile ++++ glibc-2.12.90-6/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1709,7 +1800,7 @@ ifeq ($(subdir),elf) --- glibc-2.12-62-gb08c89d/sysdeps/i386/i686/Makefile -+++ glibc-2.12.90-5/sysdeps/i386/i686/Makefile ++++ glibc-2.12.90-6/sysdeps/i386/i686/Makefile @@ -9,19 +9,3 @@ stack-align-test-flags += -msse ifeq ($(subdir),string) sysdep_routines += cacheinfo @@ -1731,7 +1822,7 @@ -ASFLAGS-.oS += -Wa,-mtune=i686 -endif --- glibc-2.12-62-gb08c89d/sysdeps/ia64/Makefile -+++ glibc-2.12.90-5/sysdeps/ia64/Makefile ++++ glibc-2.12.90-6/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1744,7 +1835,7 @@ endif --- glibc-2.12-62-gb08c89d/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.12.90-5/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.12.90-6/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -2097,7 +2188,7 @@ - -#endif --- glibc-2.12-62-gb08c89d/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.12.90-5/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.12.90-6/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -2184,7 +2275,7 @@ + +#endif --- glibc-2.12-62-gb08c89d/sysdeps/mach/hurd/getrlimit.c -+++ glibc-2.12.90-5/sysdeps/mach/hurd/getrlimit.c ++++ glibc-2.12.90-6/sysdeps/mach/hurd/getrlimit.c @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) return 0; @@ -2192,7 +2283,7 @@ +libc_hidden_def (__getrlimit) weak_alias (__getrlimit, getrlimit) --- glibc-2.12-62-gb08c89d/sysdeps/posix/getaddrinfo.c -+++ glibc-2.12.90-5/sysdeps/posix/getaddrinfo.c ++++ glibc-2.12.90-6/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 }, @@ -2207,7 +2298,7 @@ { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 } }; --- glibc-2.12-62-gb08c89d/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.12.90-5/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.12.90-6/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -2216,8 +2307,29 @@ 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 +@@ -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)) + _dl_reloc_overflow (map, "R_PPC64_TPREL16_LO_DS", reloc_addr, refsym); +- *(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr, +- value, 0xfffc); ++ BIT_INSERT (*(Elf64_Half *) reloc_addr, value, 0xfffc); + break; + + case R_PPC64_TPREL16_DS: + value = elf_machine_tprel (map, sym_map, sym, reloc); + if (dont_expect ((value + 0x8000) >= 0x10000 || (value & 3) != 0)) + _dl_reloc_overflow (map, "R_PPC64_TPREL16_DS", reloc_addr, refsym); +- *(Elf64_Half *) reloc_addr = BIT_INSERT (*(Elf64_Half *) reloc_addr, +- value, 0xfffc); ++ BIT_INSERT (*(Elf64_Half *) reloc_addr, value, 0xfffc); + break; + + case R_PPC64_TPREL16: --- glibc-2.12-62-gb08c89d/sysdeps/powerpc/powerpc64/elf/Makefile -+++ glibc-2.12.90-5/sysdeps/powerpc/powerpc64/elf/Makefile ++++ glibc-2.12.90-6/sysdeps/powerpc/powerpc64/elf/Makefile @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs) CFLAGS-rtld-memmove.os = $(no-special-regs) CFLAGS-rtld-memchr.os = $(no-special-regs) @@ -2225,7 +2337,7 @@ + +CFLAGS-gmon-start.c = -fno-strict-aliasing --- glibc-2.12-62-gb08c89d/sysdeps/unix/nice.c -+++ glibc-2.12.90-5/sysdeps/unix/nice.c ++++ glibc-2.12.90-6/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -2241,7 +2353,7 @@ { if (errno == EACCES) --- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -2258,7 +2370,7 @@ #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-5/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -2307,7 +2419,7 @@ else #endif --- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -2351,7 +2463,7 @@ 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-5/sysdeps/unix/sysv/linux/getpagesize.c ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/getpagesize.c @@ -28,7 +28,7 @@ int __getpagesize () @@ -2362,7 +2474,7 @@ return GLRO(dl_pagesize); #else --- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/i386/dl-cache.h @@ -0,0 +1,59 @@ +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. + Copyright (C) 2004 Free Software Foundation, Inc. @@ -2424,7 +2536,7 @@ + +#include_next --- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/i386/getrlimit.c -+++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/i386/getrlimit.c ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/i386/getrlimit.c @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits) } @@ -2432,7 +2544,7 @@ +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-5/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2466,7 +2578,7 @@ + #include_next --- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include @@ -2474,7 +2586,7 @@ +#include +#endif --- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include @@ -2482,12 +2594,12 @@ +#include +#endif --- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed @@ -1 +1 @@ -s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_ --- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2514,7 +2626,7 @@ struct netlink_res { --- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2525,12 +2637,12 @@ /* 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-5/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c ++++ glibc-2.12.90-6/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-5/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.12.90-6/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2577,7 +2689,7 @@ } libc_hidden_def (tcsetattr) --- glibc-2.12-62-gb08c89d/timezone/zic.c -+++ glibc-2.12.90-5/timezone/zic.c ++++ glibc-2.12.90-6/timezone/zic.c @@ -1921,7 +1921,7 @@ const int zonecount; if (stdrp != NULL && stdrp->r_hiyear == 2037) return; diff --git a/glibc.spec b/glibc.spec index 8047359..087e33d 100644 --- a/glibc.spec +++ b/glibc.spec @@ -24,7 +24,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 5 +Release: 6 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -54,7 +54,7 @@ BuildRequires: /bin/ps, /bin/kill, /bin/awk # This is to ensure that __frame_state_for is exported by glibc # will be compatible with egcs 1.x.y BuildRequires: gcc >= 3.2 -%define enablekernel 2.6.18 +%define enablekernel 2.6.32 %ifarch i386 %define nptl_target_cpu i486 %else @@ -1035,6 +1035,9 @@ rm -f *.filelist* %endif %changelog +* Wed Jul 21 2010 Andreas Schwab - 2.12.90-6 +- Bump minimum kernel version to 2.6.32 + * Mon Jul 12 2010 Andreas Schwab - 2.12.90-5 - Update from master - Don't pass NULL occation to dl_signal_cerror diff --git a/import.log b/import.log index baed58e..c5b0b13 100644 --- a/import.log +++ b/import.log @@ -49,3 +49,4 @@ glibc-2_12_90-2:HEAD:glibc-2.12.90-2.src.rpm:1275317456 glibc-2_12_90-3:HEAD:glibc-2.12.90-3.src.rpm:1276590910 glibc-2_12_90-4:HEAD:glibc-2.12.90-4.src.rpm:1278074148 glibc-2_12_90-5:HEAD:glibc-2.12.90-5.src.rpm:1278934623 +glibc-2_12_90-6:HEAD:glibc-2.12.90-6.src.rpm:1279724779 diff --git a/sources b/sources index 4c67676..e73d3b0 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -07c477bee234e27d025eda134e61effb glibc-2.12-62-gb08c89d-fedora.tar.bz2 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