diff --git a/.cvsignore b/.cvsignore index 69f36c8..042fb17 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.11.tar.bz2 -glibc-2.11-fedora.tar.bz2 +glibc-2.11-25-g8d7c09b-fedora.tar.bz2 +glibc-2.11-25-g8d7c09b.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index bbb24b0..952109e 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,75 +1,23 @@ ---- glibc-2.11/ChangeLog -+++ glibc-2.11-2/ChangeLog -@@ -1,3 +1,27 @@ -+2009-11-04 Jakub Jelinek -+ -+ * misc/sys/uio.h (preadv, pwritev): Fix type of last argument -+ when -D_FILE_OFFSET_BITS=64. -+ -+ * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h (fallocate): Fix types -+ of last two arguments when -D_FILE_OFFSET_BITS=64. -+ * sysdeps/unix/sysv/linux/i386/bits/fcntl.h (fallocate): Likewise. -+ * sysdeps/unix/sysv/linux/s390/bits/fcntl.h (fallocate): Likewise. -+ * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h (fallocate): Likewise. -+ * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (fallocate): Likewise. -+ * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (fallocate): Likewise. -+ * sysdeps/unix/sysv/linux/sh/bits/fcntl.h (fallocate): Likewise. -+ -+2009-11-03 Jakub Jelinek -+ -+ * sysdeps/powerpc/powerpc64/dl-machine.h (resolve_ifunc): Don't -+ relocate opd entry when resolving prelink conflicts. -+ -+2009-11-03 Andreas Schwab -+ -+ * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Add -+ readahead. -+ - 2009-10-30 Ulrich Drepper - - * version.h (VERSION): Bump for 2.11 release. -@@ -209,22 +233,6 @@ d2009-10-30 Ulrich Drepper - * sysdeps/generic/netinet/ip.h: Define IPTOS_ENC* and IPTOS_DSCP* - macros. Patch by Philip Prindeville . - -- [BZ #10840] -- * sysdeps/unix/sysv/linux/kernel-features.h: Define -- __ASSUME_F_GETOWN_EX. -- * sysdeps/unix/sysv/linux/fcntl.c: Implement F_GETOWN using F_GETOWN_EX -- if possible. -- * sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise. -- -- * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Define F_OWNER_* -- and f_owner_ex. -- * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise. -- - [BZ #10847] - * sysdeps/gnu/getutmp.c: Allow compatibility code to play around with - getutmpx symbol. -@@ -312,17 +320,6 @@ d2009-10-30 Ulrich Drepper - * locale/C-time.c: Revert week-1stday back to 19971130 and set - first_weekday to 1 and first_workday to 2. - --2009-10-01 Ulrich Drepper -- -- * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Define F_SETOWN_EX and -- F_GETOWN_EX. -- * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise. -- * sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise. -- - 2009-09-28 Andreas Schwab - - * stdio-common/printf_fp.c: Check for and avoid integer overflows. -@@ -980,6 +977,11 @@ d2009-10-30 Ulrich Drepper +--- glibc-2.11-25-g8d7c09b/ChangeLog ++++ glibc-2.11-4/ChangeLog +@@ -1,3 +1,16 @@ ++2009-11-24 Ulrich Drepper ++ ++ * sysdeps/unix/grantpt.c (grantpt): Use CLOSE_ALL_FDS is available ++ before the exec. ++ * sysdeps/unix/sysv/linux/grantpt.c: New file. ++ * login/programs/pt_chown.c (main): Don't print message on errors ++ when doing real work. ++ ++ * csu/elf-init.c (__libc_csu_irel): New function. Code to perform ++ irel relocations split out from... ++ (__libc_csu_init): ...here. ++ * csu/libc-start.c [!SHARED]: Call __libc_csu_irel early. ++ + 2009-11-18 H.J. Lu + + [BZ #10162] +@@ -1121,6 +1134,11 @@ d2009-10-30 Ulrich Drepper * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in the unique symbol hash table should not be const. @@ -81,7 +29,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -1245,6 +1247,11 @@ d2009-10-30 Ulrich Drepper +@@ -1386,6 +1404,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -93,7 +41,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -9938,6 +9945,10 @@ d2009-10-30 Ulrich Drepper +@@ -10079,6 +10102,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -104,7 +52,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -11195,6 +11206,15 @@ d2009-10-30 Ulrich Drepper +@@ -11336,6 +11363,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -120,8 +68,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.11/ChangeLog.15 -+++ glibc-2.11-2/ChangeLog.15 +--- glibc-2.11-25-g8d7c09b/ChangeLog.15 ++++ glibc-2.11-4/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -187,8 +135,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.11/ChangeLog.16 -+++ glibc-2.11-2/ChangeLog.16 +--- glibc-2.11-25-g8d7c09b/ChangeLog.16 ++++ glibc-2.11-4/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -242,8 +190,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.11/Makeconfig -+++ glibc-2.11-2/Makeconfig +--- glibc-2.11-25-g8d7c09b/Makeconfig ++++ glibc-2.11-4/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -260,8 +208,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.11/csu/Makefile -+++ glibc-2.11-2/csu/Makefile +--- glibc-2.11-25-g8d7c09b/csu/Makefile ++++ glibc-2.11-4/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -272,8 +220,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.11/csu/elf-init.c -+++ glibc-2.11-2/csu/elf-init.c +--- glibc-2.11-25-g8d7c09b/csu/elf-init.c ++++ glibc-2.11-4/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; @@ -298,8 +246,69 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-2.11/debug/tst-chk1.c -+++ glibc-2.11-2/debug/tst-chk1.c +@@ -72,15 +89,14 @@ extern void _fini (void); + /* These functions are passed to __libc_start_main by the startup code. + These get statically linked into each program. For dynamically linked + programs, this module will come from libc_nonshared.a and differs from +- the libc.a module in that it doesn't call the preinit array. */ ++ the libc.a module in that it doesn't call the preinit array and performs ++ explicit IREL{,A} relocations. */ + +-void +-__libc_csu_init (int argc, char **argv, char **envp) +-{ +- /* For dynamically linked executables the preinit array is executed by +- the dynamic linker (before initializing any shared object. */ + + #ifndef LIBC_NONSHARED ++void ++__libc_csu_irel (void) ++{ + # ifdef USE_MULTIARCH + # ifdef ELF_MACHINE_IRELA + { +@@ -98,7 +114,17 @@ __libc_csu_init (int argc, char **argv, char **envp) + } + # endif + # endif ++} ++#endif ++ + ++void ++__libc_csu_init (int argc, char **argv, char **envp) ++{ ++ /* For dynamically linked executables the preinit array is executed by ++ the dynamic linker (before initializing any shared object. */ ++ ++#ifndef LIBC_NONSHARED + /* For static executables, preinit happens right before init. */ + { + const size_t size = __preinit_array_end - __preinit_array_start; +--- glibc-2.11-25-g8d7c09b/csu/libc-start.c ++++ glibc-2.11-4/csu/libc-start.c +@@ -24,6 +24,9 @@ + #include + + extern void __libc_init_first (int argc, char **argv, char **envp); ++#ifndef SHARED ++extern void __libc_csu_irel (void); ++#endif + + extern int __libc_multiple_libcs; + +@@ -134,6 +137,9 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), + } + # endif + ++ /* Performe IREL{,A} relocations. */ ++ __libc_csu_irel (); ++ + /* Initialize the thread library at least a bit since the libgcc + functions are using thread functions if these are available and + we need to setup errno. */ +--- glibc-2.11-25-g8d7c09b/debug/tst-chk1.c ++++ glibc-2.11-4/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -328,8 +337,8 @@ # define O 0 # else # define O 1 ---- glibc-2.11/elf/ldconfig.c -+++ glibc-2.11-2/elf/ldconfig.c +--- glibc-2.11-25-g8d7c09b/elf/ldconfig.c ++++ glibc-2.11-4/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -411,8 +420,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.11/elf/tst-stackguard1.c -+++ glibc-2.11-2/elf/tst-stackguard1.c +--- glibc-2.11-25-g8d7c09b/elf/tst-stackguard1.c ++++ glibc-2.11-4/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -437,16 +446,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11/include/bits/stdlib-ldbl.h -+++ glibc-2.11-2/include/bits/stdlib-ldbl.h +--- glibc-2.11-25-g8d7c09b/include/bits/stdlib-ldbl.h ++++ glibc-2.11-4/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11/include/bits/wchar-ldbl.h -+++ glibc-2.11-2/include/bits/wchar-ldbl.h +--- glibc-2.11-25-g8d7c09b/include/bits/wchar-ldbl.h ++++ glibc-2.11-4/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11/include/features.h -+++ glibc-2.11-2/include/features.h +--- glibc-2.11-25-g8d7c09b/include/features.h ++++ glibc-2.11-4/include/features.h @@ -299,8 +299,13 @@ #endif @@ -463,8 +472,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.11/intl/locale.alias -+++ glibc-2.11-2/intl/locale.alias +--- glibc-2.11-25-g8d7c09b/intl/locale.alias ++++ glibc-2.11-4/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -474,8 +483,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.11/libio/stdio.h -+++ glibc-2.11-2/libio/stdio.h +--- glibc-2.11-25-g8d7c09b/libio/stdio.h ++++ glibc-2.11-4/libio/stdio.h @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -489,8 +498,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.11/locale/iso-4217.def -+++ glibc-2.11-2/locale/iso-4217.def +--- glibc-2.11-25-g8d7c09b/locale/iso-4217.def ++++ glibc-2.11-4/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -582,8 +591,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.11/locale/programs/locarchive.c -+++ glibc-2.11-2/locale/programs/locarchive.c +--- glibc-2.11-25-g8d7c09b/locale/programs/locarchive.c ++++ glibc-2.11-4/locale/programs/locarchive.c @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b) /* forward decls for below */ static uint32_t add_locale (struct locarhandle *ah, const char *name, @@ -615,8 +624,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.11/localedata/Makefile -+++ glibc-2.11-2/localedata/Makefile +--- glibc-2.11-25-g8d7c09b/localedata/Makefile ++++ glibc-2.11-4/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -625,8 +634,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.11/localedata/SUPPORTED -+++ glibc-2.11-2/localedata/SUPPORTED +--- glibc-2.11-25-g8d7c09b/localedata/SUPPORTED ++++ glibc-2.11-4/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -668,8 +677,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.11/localedata/locales/cy_GB -+++ glibc-2.11-2/localedata/locales/cy_GB +--- glibc-2.11-25-g8d7c09b/localedata/locales/cy_GB ++++ glibc-2.11-4/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -684,8 +693,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.11/localedata/locales/en_GB -+++ glibc-2.11-2/localedata/locales/en_GB +--- glibc-2.11-25-g8d7c09b/localedata/locales/en_GB ++++ glibc-2.11-4/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -697,8 +706,8 @@ date_fmt "/ / " ---- glibc-2.11/localedata/locales/no_NO -+++ glibc-2.11-2/localedata/locales/no_NO +--- glibc-2.11-25-g8d7c09b/localedata/locales/no_NO ++++ glibc-2.11-4/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -769,8 +778,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.11/localedata/locales/zh_TW -+++ glibc-2.11-2/localedata/locales/zh_TW +--- glibc-2.11-25-g8d7c09b/localedata/locales/zh_TW ++++ glibc-2.11-4/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -798,8 +807,29 @@ revision "0.2" date "2000-08-02" % ---- glibc-2.11/malloc/mcheck.c -+++ glibc-2.11-2/malloc/mcheck.c +--- glibc-2.11-25-g8d7c09b/login/programs/pt_chown.c ++++ glibc-2.11-4/login/programs/pt_chown.c +@@ -154,8 +154,7 @@ main (int argc, char *argv[]) + # define ncap_list (sizeof (cap_list) / sizeof (cap_list[0])) + cap_t caps = cap_init (); + if (caps == NULL) +- error (FAIL_ENOMEM, errno, +- _("Failed to initialize drop of capabilities")); ++ return FAIL_ENOMEM; + + /* There is no reason why these should not work. */ + cap_set_flag (caps, CAP_PERMITTED, ncap_list, cap_list, CAP_SET); +@@ -166,7 +165,7 @@ main (int argc, char *argv[]) + cap_free (caps); + + if (__builtin_expect (res != 0, 0)) +- error (FAIL_EXEC, errno, _("cap_set_proc failed")); ++ return FAIL_EXEC; + } + #endif + +--- glibc-2.11-25-g8d7c09b/malloc/mcheck.c ++++ glibc-2.11-4/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -875,8 +905,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.11/manual/libc.texinfo -+++ glibc-2.11-2/manual/libc.texinfo +--- glibc-2.11-25-g8d7c09b/manual/libc.texinfo ++++ glibc-2.11-4/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -886,8 +916,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.11/misc/sys/cdefs.h -+++ glibc-2.11-2/misc/sys/cdefs.h +--- glibc-2.11-25-g8d7c09b/misc/sys/cdefs.h ++++ glibc-2.11-4/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) @@ -931,32 +961,26 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.11/misc/sys/uio.h -+++ glibc-2.11-2/misc/sys/uio.h -@@ -80,10 +80,10 @@ extern ssize_t pwritev (int __fd, __const struct iovec *__iovec, int __count, - # else - # ifdef __REDIRECT - extern ssize_t __REDIRECT (preadv, (int __fd, __const struct iovec *__iovec, -- int __count, __off_t __offset), -+ int __count, __off64_t __offset), - preadv64) __wur; - extern ssize_t __REDIRECT (pwritev, (int __fd, __const struct iovec *__iovec, -- int __count, __off_t __offset), -+ int __count, __off64_t __offset), - pwritev64) __wur; - # else - # define preadv preadv64 ---- glibc-2.11/nis/nss -+++ glibc-2.11-2/nis/nss +--- glibc-2.11-25-g8d7c09b/nis/nss ++++ glibc-2.11-4/nis/nss @@ -25,4 +25,4 @@ # memory with every getXXent() call. Otherwise each getXXent() call # might result into a network communication with the server to get # the next entry. -#SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE ---- glibc-2.11/nptl/ChangeLog -+++ glibc-2.11-2/nptl/ChangeLog -@@ -3727,6 +3727,15 @@ +--- glibc-2.11-25-g8d7c09b/nptl/ChangeLog ++++ glibc-2.11-4/nptl/ChangeLog +@@ -1,3 +1,8 @@ ++2009-11-27 Andreas Schwab ++ ++ * sysdeps/unix/sysv/linux/x86_64/cancellation.S: Reload ++ THREAD_SELF->cancelhandling after returning from futex call. ++ + 2009-11-03 Andreas Schwab + + [BZ #4457] +@@ -3734,6 +3739,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -972,7 +996,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4463,6 +4472,11 @@ +@@ -4470,6 +4484,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -984,7 +1008,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6537,6 +6551,11 @@ +@@ -6544,6 +6563,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -996,8 +1020,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.11/nptl/Makefile -+++ glibc-2.11-2/nptl/Makefile +--- glibc-2.11-25-g8d7c09b/nptl/Makefile ++++ glibc-2.11-4/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1030,8 +1054,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-2.11/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h -+++ glibc-2.11-2/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +--- glibc-2.11-25-g8d7c09b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11-4/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 @@ -1040,8 +1064,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.h */ ---- glibc-2.11/nptl/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.11-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h +--- glibc-2.11-25-g8d7c09b/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11-4/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1049,8 +1073,28 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-2.11/nptl/tst-stackguard1.c -+++ glibc-2.11-2/nptl/tst-stackguard1.c +--- glibc-2.11-25-g8d7c09b/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S ++++ glibc-2.11-4/nptl/sysdeps/unix/sysv/linux/x86_64/cancellation.S +@@ -96,8 +96,8 @@ ENTRY(__pthread_disable_asynccancel) + cmpxchgl %r11d, %fs:CANCELHANDLING + jnz 2b + +-3: movl %r11d, %eax +- andl $(TCB_CANCELING_BITMASK|TCB_CANCELED_BITMASK), %eax ++ movl %r11d, %eax ++3: andl $(TCB_CANCELING_BITMASK|TCB_CANCELED_BITMASK), %eax + cmpl $TCB_CANCELING_BITMASK, %eax + je 4f + 1: ret +@@ -111,5 +111,6 @@ ENTRY(__pthread_disable_asynccancel) + addq $CANCELHANDLING, %rdi + LOAD_PRIVATE_FUTEX_WAIT (%esi) + syscall ++ movl %fs:CANCELHANDLING, %eax + jmp 3b + END(__pthread_disable_asynccancel) +--- glibc-2.11-25-g8d7c09b/nptl/tst-stackguard1.c ++++ glibc-2.11-4/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1075,8 +1119,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11/nscd/nscd.conf -+++ glibc-2.11-2/nscd/nscd.conf +--- glibc-2.11-25-g8d7c09b/nscd/nscd.conf ++++ glibc-2.11-4/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1086,8 +1130,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.11/nscd/nscd.init -+++ glibc-2.11-2/nscd/nscd.init +--- glibc-2.11-25-g8d7c09b/nscd/nscd.init ++++ glibc-2.11-4/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1159,9 +1203,9 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.11/posix/Makefile -+++ glibc-2.11-2/posix/Makefile -@@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ +--- glibc-2.11-25-g8d7c09b/posix/Makefile ++++ glibc-2.11-4/posix/Makefile +@@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1181,8 +1225,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.11/posix/getconf.speclist.h -+++ glibc-2.11-2/posix/getconf.speclist.h +--- glibc-2.11-25-g8d7c09b/posix/getconf.speclist.h ++++ glibc-2.11-4/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1223,8 +1267,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.11/streams/Makefile -+++ glibc-2.11-2/streams/Makefile +--- glibc-2.11-25-g8d7c09b/streams/Makefile ++++ glibc-2.11-4/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1234,8 +1278,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.11/sysdeps/generic/dl-cache.h -+++ glibc-2.11-2/sysdeps/generic/dl-cache.h +--- glibc-2.11-25-g8d7c09b/sysdeps/generic/dl-cache.h ++++ glibc-2.11-4/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1251,8 +1295,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.11/sysdeps/i386/Makefile -+++ glibc-2.11-2/sysdeps/i386/Makefile +--- glibc-2.11-25-g8d7c09b/sysdeps/i386/Makefile ++++ glibc-2.11-4/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1277,8 +1321,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11/sysdeps/ia64/Makefile -+++ glibc-2.11-2/sysdeps/ia64/Makefile +--- glibc-2.11-25-g8d7c09b/sysdeps/ia64/Makefile ++++ glibc-2.11-4/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1290,8 +1334,8 @@ endif endif ---- glibc-2.11/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.11-2/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11-25-g8d7c09b/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11-4/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1643,8 +1687,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.11/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.11-2/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11-25-g8d7c09b/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11-4/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1730,8 +1774,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.11/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.11-2/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11-25-g8d7c09b/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11-4/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1740,35 +1784,21 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11/sysdeps/powerpc/powerpc64/dl-machine.h -+++ glibc-2.11-2/sysdeps/powerpc/powerpc64/dl-machine.h -@@ -531,13 +531,14 @@ auto inline Elf64_Addr __attribute__ ((always_inline)) - resolve_ifunc (Elf64_Addr value, - const struct link_map *map, const struct link_map *sym_map) - { -+#ifndef RESOLVE_CONFLICT_FIND_MAP - /* The function we are calling may not yet have its opd entry relocated. */ - Elf64_FuncDesc opd; - if (map != sym_map --#if !defined RTLD_BOOTSTRAP && defined SHARED -+# if !defined RTLD_BOOTSTRAP && defined SHARED - /* Bootstrap map doesn't have l_relocated set for it. */ - && sym_map != &GL(dl_rtld_map) --#endif -+# endif - && !sym_map->l_relocated) - { - Elf64_FuncDesc *func = (Elf64_FuncDesc *) value; -@@ -546,6 +547,7 @@ resolve_ifunc (Elf64_Addr value, - opd.fd_aux = func->fd_aux; - value = (Elf64_Addr) &opd; - } +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/grantpt.c ++++ glibc-2.11-4/sysdeps/unix/grantpt.c +@@ -190,6 +190,10 @@ grantpt (int fd) + if (__dup2 (fd, PTY_FILENO) < 0) + _exit (FAIL_EBADF); + ++#ifdef CLOSE_ALL_FDS ++ CLOSE_ALL_FDS (); +#endif - return ((Elf64_Addr (*) (void)) value) (); - } - ---- glibc-2.11/sysdeps/unix/nice.c -+++ glibc-2.11-2/sysdeps/unix/nice.c ++ + execle (_PATH_PT_CHOWN, basename (_PATH_PT_CHOWN), NULL, NULL); + _exit (FAIL_EXEC); + } +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/nice.c ++++ glibc-2.11-4/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1783,8 +1813,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.11/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1800,8 +1830,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.11/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1849,80 +1879,8 @@ } else #endif ---- glibc-2.11/sysdeps/unix/sysv/linux/fcntl.c -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/fcntl.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2000, 2002, 2003, 2004, 2009 Free Software Foundation, Inc. -+/* Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -23,40 +23,6 @@ - #include - - #include --#include -- -- --#ifdef __ASSUME_F_GETOWN_EX --# define miss_F_GETOWN_EX 0 --#else --static int miss_F_GETOWN_EX; --#endif -- -- --static int --do_fcntl (int fd, int cmd, void *arg) --{ -- if (cmd != F_GETOWN || miss_F_GETOWN_EX) -- return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); -- -- INTERNAL_SYSCALL_DECL (err); -- struct f_owner_ex fex; -- int res = INTERNAL_SYSCALL (fcntl, err, 3, fd, F_GETOWN_EX, &fex); -- if (!INTERNAL_SYSCALL_ERROR_P (res, err)) -- return fex.type == F_OWNER_GID ? -fex.pid : fex.pid; -- --#ifndef __ASSUME_F_GETOWN_EX -- if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL) -- { -- res = INLINE_SYSCALL (fcntl, 3, fd, F_GETOWN, arg); -- miss_F_GETOWN_EX = 1; -- return res; -- } --#endif -- -- __set_errno (INTERNAL_SYSCALL_ERRNO (res, err)); -- return -1; --} - - - #ifndef NO_CANCELLATION -@@ -70,7 +36,7 @@ __fcntl_nocancel (int fd, int cmd, ...) - arg = va_arg (ap, void *); - va_end (ap); - -- return do_fcntl (fd, cmd, arg); -+ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); - } - #endif - -@@ -86,11 +52,11 @@ __libc_fcntl (int fd, int cmd, ...) - va_end (ap); - - if (SINGLE_THREAD_P || cmd != F_SETLKW) -- return do_fcntl (fd, cmd, arg); -+ return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); - - int oldtype = LIBC_CANCEL_ASYNC (); - -- int result = do_fcntl (fd, cmd, arg); -+ int result = INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); - - LIBC_CANCEL_RESET (oldtype); - ---- glibc-2.11/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1965,70 +1923,53 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- glibc-2.11/sysdeps/unix/sysv/linux/i386/bits/fcntl.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/i386/bits/fcntl.h -@@ -1,5 +1,5 @@ - /* O_*, F_*, FD_* bit values for Linux. -- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009 -+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -85,15 +85,13 @@ - #define F_SETLKW64 14 /* Set record locking info (blocking). */ - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -168,23 +166,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD -@@ -259,8 +240,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, - extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); - # else - # ifdef __REDIRECT --extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, -- __off_t __len), -+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, -+ __off64_t __len), - fallocate64); - # else - # define fallocate fallocate64 ---- glibc-2.11/sysdeps/unix/sysv/linux/i386/clone.S -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/i386/clone.S +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/grantpt.c ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/grantpt.c +@@ -0,0 +1,42 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "not-cancel.h" ++#include "pty-private.h" ++ ++ ++/* Close all file descriptors except the one specified. */ ++static void ++close_all_fds (void) ++{ ++ DIR *dir = __opendir ("/proc/self/fd"); ++ if (dir != NULL) ++ { ++ struct dirent64 *d; ++ while ((d = __readdir64 (dir)) != NULL) ++ if (isdigit (d->d_name[0])) ++ { ++ char *endp; ++ long int fd = strtol (d->d_name, &endp, 10); ++ if (*endp == '\0' && fd != PTY_FILENO && fd != dirfd (dir)) ++ close_not_cancel_no_status (fd); ++ } ++ ++ __closedir (dir); ++ ++ int nullfd = open_not_cancel_2 (_PATH_DEVNULL, O_RDONLY); ++ assert (nullfd == STDIN_FILENO); ++ nullfd = open_not_cancel_2 (_PATH_DEVNULL, O_WRONLY); ++ assert (nullfd == STDOUT_FILENO); ++ __dup2 (STDOUT_FILENO, STDERR_FILENO); ++ } ++} ++#define CLOSE_ALL_FDS() close_all_fds() ++ ++#include +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/i386/clone.S ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -2047,8 +1988,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.11/sysdeps/unix/sysv/linux/i386/dl-cache.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/i386/dl-cache.h +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11-4/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. @@ -2109,119 +2050,8 @@ + } while (0) + +#include_next ---- glibc-2.11/sysdeps/unix/sysv/linux/i386/fcntl.c -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/i386/fcntl.c -@@ -1,4 +1,4 @@ --/* Copyright (C) 2000,2002,2003,2004,2006,2009 Free Software Foundation, Inc. -+/* Copyright (C) 2000,2002,2003,2004,2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -30,13 +30,6 @@ - int __have_no_fcntl64; - #endif - --#ifdef __ASSUME_F_GETOWN_EX --# define miss_F_GETOWN_EX 0 --#else --static int miss_F_GETOWN_EX; --#endif -- -- - #if defined NO_CANCELLATION && __ASSUME_FCNTL64 == 0 - # define __fcntl_nocancel __libc_fcntl - #endif -@@ -126,26 +119,6 @@ __fcntl_nocancel (int fd, int cmd, ...) - assert (F_SETLK - F_SETLKW == F_SETLK64 - F_SETLKW64); - return INLINE_SYSCALL (fcntl, 3, fd, cmd + F_SETLK - F_SETLK64, &fl); - } -- case F_GETOWN: -- if (! miss_F_GETOWN_EX) -- { -- INTERNAL_SYSCALL_DECL (err); -- struct f_owner_ex fex; -- int res = INTERNAL_SYSCALL (fcntl, err, 3, fd, F_GETOWN_EX, &fex); -- if (!INTERNAL_SYSCALL_ERROR_P (res, err)) -- return fex.type == F_OWNER_GID ? -fex.pid : fex.pid; -- --#ifndef __ASSUME_F_GETOWN_EX -- if (INTERNAL_SYSCALL_ERRNO (res, err) == EINVAL) -- miss_F_GETOWN_EX = 1; -- else --#endif -- { -- __set_errno (INTERNAL_SYSCALL_ERRNO (res, err)); -- return -1; -- } -- } -- /* FALLTHROUGH */ - default: - return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg); - } ---- glibc-2.11/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h -@@ -1,5 +1,5 @@ - /* O_*, F_*, FD_* bit values for Linux/IA64. -- Copyright (C) 1999,2000,2004,2006,2007,2009 Free Software Foundation, Inc. -+ Copyright (C) 1999, 2000, 2004, 2006, 2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -81,15 +81,13 @@ - #define F_SETLKW64 7 /* Set record locking info (blocking). */ - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -161,23 +159,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ -@@ -253,8 +234,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, - extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); - # else - # ifdef __REDIRECT --extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, -- __off_t __len), -+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, -+ __off64_t __len), - fallocate64); - # else - # define fallocate fallocate64 ---- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-cache.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2254,40 +2084,29 @@ + } while (0) + #include_next ---- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- glibc-2.11/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11-4/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.11/sysdeps/unix/sysv/linux/kernel-features.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/kernel-features.h -@@ -542,8 +542,3 @@ - # define __ASSUME_PREADV 1 - # define __ASSUME_PWRITEV 1 - #endif -- --/* Support for F_GETOWN_EX was introduced in 2.6.32. */ --#if __LINUX_KERNEL_VERSION >= 0x020620 --# define __ASSUME_F_GETOWN_EX 1 --#endif ---- glibc-2.11/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2313,8 +2132,8 @@ struct netlink_res { ---- glibc-2.11/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2324,267 +2143,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.11/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h -@@ -1,5 +1,5 @@ - /* O_*, F_*, FD_* bit values for Linux/PowerPC. -- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009 -+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -85,15 +85,13 @@ - #define F_SETLKW64 14 /* Set record locking info (blocking). */ - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -168,23 +166,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD -@@ -259,8 +240,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, - extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); - # else - # ifdef __REDIRECT --extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, -- __off_t __len), -+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, -+ __off64_t __len), - fallocate64); - # else - # define fallocate fallocate64 ---- glibc-2.11/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list -@@ -3,3 +3,6 @@ - # System calls with wrappers. - oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0 - oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0 -+ -+# Due to 64bit alignment there is a dummy second parameter -+readahead - readahead i:iiiii __readahead readahead ---- glibc-2.11/sysdeps/unix/sysv/linux/s390/bits/fcntl.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/s390/bits/fcntl.h -@@ -1,5 +1,5 @@ - /* O_*, F_*, FD_* bit values for Linux. -- Copyright (C) 2000,2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc. -+ Copyright (C) 2000,2001,2002,2004,2006,2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -100,15 +100,13 @@ - #endif - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -183,23 +181,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD -@@ -279,8 +260,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, - extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); - # else - # ifdef __REDIRECT --extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, -- __off_t __len), -+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, -+ __off64_t __len), - fallocate64); - # else - # define fallocate fallocate64 ---- glibc-2.11/sysdeps/unix/sysv/linux/sh/bits/fcntl.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/sh/bits/fcntl.h -@@ -1,5 +1,5 @@ - /* O_*, F_*, FD_* bit values for Linux. -- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007, 2009 -+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2004, 2006, 2007 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -85,15 +85,13 @@ - #define F_SETLKW64 14 /* Set record locking info (blocking). */ - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving of SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving of SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -168,23 +166,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD -@@ -259,8 +240,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, - extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); - # else - # ifdef __REDIRECT --extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, -- __off_t __len), -+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, -+ __off64_t __len), - fallocate64); - # else - # define fallocate fallocate64 ---- glibc-2.11/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h -@@ -1,5 +1,5 @@ - /* O_*, F_*, FD_* bit values for Linux/SPARC. -- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007, 2009 -+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2003, 2004, 2006, 2007 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - -@@ -83,8 +83,8 @@ - #define F_GETFL 3 /* Get file status flags. */ - #define F_SETFL 4 /* Set file status flags. */ - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_GETOWN 5 /* Get owner (process receiving SIGIO). */ --# define F_SETOWN 6 /* Set owner (process receiving SIGIO). */ -+# define F_GETOWN 5 /* Get owner of socket (receiver of SIGIO). */ -+# define F_SETOWN 6 /* Set owner of socket (receiver of SIGIO). */ - #endif - #ifndef __USE_FILE_OFFSET64 - # define F_GETLK 7 /* Get record locking info. */ -@@ -99,8 +99,6 @@ - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_GETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_SETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -187,23 +185,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD -@@ -278,8 +259,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, - extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); - # else - # ifdef __REDIRECT --extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, -- __off_t __len), -+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, -+ __off64_t __len), - fallocate64); - # else - # define fallocate fallocate64 ---- glibc-2.11/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2630,70 +2190,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-2.11/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h -@@ -1,5 +1,5 @@ - /* O_*, F_*, FD_* bit values for Linux/x86-64. -- Copyright (C) 2001,2002,2004,2006,2007,2009 Free Software Foundation, Inc. -+ Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -99,15 +99,13 @@ - #endif - - #if defined __USE_BSD || defined __USE_UNIX98 --# define F_SETOWN 8 /* Get owner (process receiving of SIGIO). */ --# define F_GETOWN 9 /* Set owner (process receiving of SIGIO). */ -+# define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ -+# define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ - #endif - - #ifdef __USE_GNU - # define F_SETSIG 10 /* Set number of signal to be sent. */ - # define F_GETSIG 11 /* Get number of signal to be sent. */ --# define F_SETOWN_EX 12 /* Get owner (thread receiving SIGIO). */ --# define F_GETOWN_EX 13 /* Set owner (thread receiving SIGIO). */ - #endif - - #ifdef __USE_GNU -@@ -182,23 +180,6 @@ struct flock64 - }; - #endif - --#ifdef __USE_GNU --/* Owner types. */ --enum __pid_type -- { -- F_OWNER_TID = 0, /* Kernel thread. */ -- F_OWNER_PID, /* Process. */ -- F_OWNER_GID /* Process group. */ -- }; -- --/* Structure to use with F_GETOWN_EX and F_SETOWN_EX. */ --struct f_owner_ex -- { -- enum __pid_type type; /* Owner type of ID. */ -- __pid_t pid; /* ID of owner. */ -- }; --#endif -- - /* Define some more compatibility macros to be backward compatible with - BSD systems which did not managed to hide these kernel macros. */ - #ifdef __USE_BSD -@@ -273,8 +254,8 @@ extern ssize_t tee (int __fdin, int __fdout, size_t __len, - extern int fallocate (int __fd, int __mode, __off_t __offset, __off_t __len); - # else - # ifdef __REDIRECT --extern int __REDIRECT (fallocate, (int __fd, int __mode, __off_t __offset, -- __off_t __len), -+extern int __REDIRECT (fallocate, (int __fd, int __mode, __off64_t __offset, -+ __off64_t __len), - fallocate64); - # else - # define fallocate fallocate64 ---- glibc-2.11/sysdeps/unix/sysv/linux/x86_64/clone.S -+++ glibc-2.11-2/sysdeps/unix/sysv/linux/x86_64/clone.S +--- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/x86_64/clone.S ++++ glibc-2.11-4/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2712,8 +2210,8 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.11/timezone/zic.c -+++ glibc-2.11-2/timezone/zic.c +--- glibc-2.11-25-g8d7c09b/timezone/zic.c ++++ glibc-2.11-4/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 e9f1ea7..1a97269 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,5 +1,4 @@ -%define glibcsrcdir glibc-2.11 -%define glibc_release_url ftp://sources.redhat.com/pub/glibc/releases/ +%define glibcsrcdir glibc-2.11-25-g8d7c09b %define glibcversion 2.11 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -29,7 +28,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 3 +Release: 4 # 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 @@ -1038,6 +1037,22 @@ rm -f *.filelist* %endif %changelog +* Mon Nov 30 2009 Andreas Schwab - 2.11-4 +- Update from 2.11 branch + - Fix sync_file_range on ppc/ppc64. + - Fix getwc* and putwc* on non-wide streams (BZ#10958). + - Avoid warnings in CPU_* macros when using const bitsets (BZ#10918). + - Fix ranges with multibyte characters as endpoints. + - Handle LC_GLOBAL_LOCALE in duplocale (BZ#10969). + - Fix _NC_LOCALE_NAME definition (BZ#10968). + - Add missing Linux MADV_* definitions (BZ#10972). + - Handle running out of buffer space with IPv6 mapping enabled. + - Avoid memset warning in one case (#532492). + - Restore locking in free_check (#504963). +- Fix infloop in __pthread_disable_asynccancel on x86_64 (#537690). +- Prevent unintended file desriptor leak in grantpt (#530558). +- Fix startup to security-relevant statically linked binaries (#528631). + * Tue Nov 24 2009 Andreas Schwab - 2.11-3 - Enable multi-arch support for ppc and ppc64 on RHEL-6 diff --git a/import.log b/import.log index e04f485..57f9896 100644 --- a/import.log +++ b/import.log @@ -38,3 +38,4 @@ glibc-2_10_90-27:F-12:glibc-2.10.90-27.src.rpm:1256915929 glibc-2_11-1:F-12:glibc-2.11-1.src.rpm:1257175795 glibc-2_11-2:F-12:glibc-2.11-2.src.rpm:1257422307 glibc-2_11-3:F-12:glibc-2.11-3.src.rpm:1259075120 +glibc-2_11-4:F-12:glibc-2.11-4.src.rpm:1259591029 diff --git a/sources b/sources index 53c571f..0972ee5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -2c990f97e9ff9fb1c3c85fe826e991b9 glibc-2.11.tar.bz2 -d7839555afb452d936347ec2d2309ee0 glibc-2.11-fedora.tar.bz2 +670cb75b78c5a83905d871e807c21637 glibc-2.11-25-g8d7c09b-fedora.tar.bz2 +fdbb8b905305551f1824932ba01fbf35 glibc-2.11-25-g8d7c09b.tar.bz2