diff --git a/.cvsignore b/.cvsignore index 042fb17..d26ff71 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-2.11-25-g8d7c09b-fedora.tar.bz2 -glibc-2.11-25-g8d7c09b.tar.bz2 +glibc-2.11.1-fedora.tar.bz2 +glibc-2.11.1.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 952109e..3eaba29 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,23 +1,6 @@ ---- 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 +--- glibc-2.11.1/ChangeLog ++++ glibc-2.11.1-1/ChangeLog +@@ -1138,6 +1138,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. @@ -29,7 +12,7 @@ 2009-07-21 Ulrich Drepper * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove -@@ -1386,6 +1404,11 @@ d2009-10-30 Ulrich Drepper +@@ -1403,6 +1408,11 @@ d2009-10-30 Ulrich Drepper out common code into new function get_common_indeces. Determine extended family and model for Intel processors. @@ -41,7 +24,7 @@ 2009-06-26 Ulrich Drepper * resolv/resolv.h: Define RES_SNGLKUPREOP. -@@ -10079,6 +10102,10 @@ d2009-10-30 Ulrich Drepper +@@ -10096,6 +10106,10 @@ d2009-10-30 Ulrich Drepper [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -52,7 +35,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -11336,6 +11363,15 @@ d2009-10-30 Ulrich Drepper +@@ -11353,6 +11367,15 @@ d2009-10-30 Ulrich Drepper separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -68,8 +51,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-2.11-25-g8d7c09b/ChangeLog.15 -+++ glibc-2.11-4/ChangeLog.15 +--- glibc-2.11.1/ChangeLog.15 ++++ glibc-2.11.1-1/ChangeLog.15 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -135,8 +118,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-2.11-25-g8d7c09b/ChangeLog.16 -+++ glibc-2.11-4/ChangeLog.16 +--- glibc-2.11.1/ChangeLog.16 ++++ glibc-2.11.1-1/ChangeLog.16 @@ -2042,6 +2042,9 @@ (__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT followed by __THROW. @@ -190,8 +173,8 @@ 2005-07-28 Thomas Schwinge [BZ #1137] ---- glibc-2.11-25-g8d7c09b/Makeconfig -+++ glibc-2.11-4/Makeconfig +--- glibc-2.11.1/Makeconfig ++++ glibc-2.11.1-1/Makeconfig @@ -780,12 +780,12 @@ endif # The assembler can generate debug information too. ifndef ASFLAGS @@ -208,8 +191,8 @@ ifndef BUILD_CC BUILD_CC = $(CC) ---- glibc-2.11-25-g8d7c09b/csu/Makefile -+++ glibc-2.11-4/csu/Makefile +--- glibc-2.11.1/csu/Makefile ++++ glibc-2.11.1-1/csu/Makefile @@ -93,7 +93,8 @@ omit-deps += $(crtstuff) $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ @@ -220,8 +203,8 @@ vpath initfini.c $(sysdirs) ---- glibc-2.11-25-g8d7c09b/csu/elf-init.c -+++ glibc-2.11-4/csu/elf-init.c +--- glibc-2.11.1/csu/elf-init.c ++++ glibc-2.11.1-1/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; @@ -246,69 +229,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ -@@ -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 +--- glibc-2.11.1/debug/tst-chk1.c ++++ glibc-2.11.1-1/debug/tst-chk1.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -337,8 +259,8 @@ # define O 0 # else # define O 1 ---- glibc-2.11-25-g8d7c09b/elf/ldconfig.c -+++ glibc-2.11-4/elf/ldconfig.c +--- glibc-2.11.1/elf/ldconfig.c ++++ glibc-2.11.1-1/elf/ldconfig.c @@ -1020,17 +1020,19 @@ search_dirs (void) @@ -420,8 +342,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-2.11-25-g8d7c09b/elf/tst-stackguard1.c -+++ glibc-2.11-4/elf/tst-stackguard1.c +--- glibc-2.11.1/elf/tst-stackguard1.c ++++ glibc-2.11.1-1/elf/tst-stackguard1.c @@ -160,17 +160,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -446,16 +368,16 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-25-g8d7c09b/include/bits/stdlib-ldbl.h -+++ glibc-2.11-4/include/bits/stdlib-ldbl.h +--- glibc-2.11.1/include/bits/stdlib-ldbl.h ++++ glibc-2.11.1-1/include/bits/stdlib-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-25-g8d7c09b/include/bits/wchar-ldbl.h -+++ glibc-2.11-4/include/bits/wchar-ldbl.h +--- glibc-2.11.1/include/bits/wchar-ldbl.h ++++ glibc-2.11.1-1/include/bits/wchar-ldbl.h @@ -0,0 +1 @@ +#include ---- glibc-2.11-25-g8d7c09b/include/features.h -+++ glibc-2.11-4/include/features.h +--- glibc-2.11.1/include/features.h ++++ glibc-2.11.1-1/include/features.h @@ -299,8 +299,13 @@ #endif @@ -472,8 +394,8 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-2.11-25-g8d7c09b/intl/locale.alias -+++ glibc-2.11-4/intl/locale.alias +--- glibc-2.11.1/intl/locale.alias ++++ glibc-2.11.1-1/intl/locale.alias @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -483,8 +405,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-2.11-25-g8d7c09b/libio/stdio.h -+++ glibc-2.11-4/libio/stdio.h +--- glibc-2.11.1/libio/stdio.h ++++ glibc-2.11.1-1/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. */ @@ -498,8 +420,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-2.11-25-g8d7c09b/locale/iso-4217.def -+++ glibc-2.11-4/locale/iso-4217.def +--- glibc-2.11.1/locale/iso-4217.def ++++ glibc-2.11.1-1/locale/iso-4217.def @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -591,8 +513,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-2.11-25-g8d7c09b/locale/programs/locarchive.c -+++ glibc-2.11-4/locale/programs/locarchive.c +--- glibc-2.11.1/locale/programs/locarchive.c ++++ glibc-2.11.1-1/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, @@ -624,8 +546,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-2.11-25-g8d7c09b/localedata/Makefile -+++ glibc-2.11-4/localedata/Makefile +--- glibc-2.11.1/localedata/Makefile ++++ glibc-2.11.1-1/localedata/Makefile @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -634,8 +556,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-2.11-25-g8d7c09b/localedata/SUPPORTED -+++ glibc-2.11-4/localedata/SUPPORTED +--- glibc-2.11.1/localedata/SUPPORTED ++++ glibc-2.11.1-1/localedata/SUPPORTED @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -677,8 +599,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-2.11-25-g8d7c09b/localedata/locales/cy_GB -+++ glibc-2.11-4/localedata/locales/cy_GB +--- glibc-2.11.1/localedata/locales/cy_GB ++++ glibc-2.11.1-1/localedata/locales/cy_GB @@ -248,8 +248,11 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -693,8 +615,8 @@ END LC_TIME LC_MESSAGES ---- glibc-2.11-25-g8d7c09b/localedata/locales/en_GB -+++ glibc-2.11-4/localedata/locales/en_GB +--- glibc-2.11.1/localedata/locales/en_GB ++++ glibc-2.11.1-1/localedata/locales/en_GB @@ -116,8 +116,8 @@ mon "";/ d_t_fmt "" d_fmt "" @@ -706,8 +628,8 @@ date_fmt "/ / " ---- glibc-2.11-25-g8d7c09b/localedata/locales/no_NO -+++ glibc-2.11-4/localedata/locales/no_NO +--- glibc-2.11.1/localedata/locales/no_NO ++++ glibc-2.11.1-1/localedata/locales/no_NO @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -778,8 +700,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-2.11-25-g8d7c09b/localedata/locales/zh_TW -+++ glibc-2.11-4/localedata/locales/zh_TW +--- glibc-2.11.1/localedata/locales/zh_TW ++++ glibc-2.11.1-1/localedata/locales/zh_TW @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -807,29 +729,8 @@ revision "0.2" date "2000-08-02" % ---- 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 +--- glibc-2.11.1/malloc/mcheck.c ++++ glibc-2.11.1-1/malloc/mcheck.c @@ -24,9 +24,25 @@ # include # include @@ -905,8 +806,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-2.11-25-g8d7c09b/manual/libc.texinfo -+++ glibc-2.11-4/manual/libc.texinfo +--- glibc-2.11.1/manual/libc.texinfo ++++ glibc-2.11.1-1/manual/libc.texinfo @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -916,8 +817,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-2.11-25-g8d7c09b/misc/sys/cdefs.h -+++ glibc-2.11-4/misc/sys/cdefs.h +--- glibc-2.11.1/misc/sys/cdefs.h ++++ glibc-2.11.1-1/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) @@ -961,26 +862,17 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-2.11-25-g8d7c09b/nis/nss -+++ glibc-2.11-4/nis/nss +--- glibc-2.11.1/nis/nss ++++ glibc-2.11.1-1/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-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 @@ +--- glibc-2.11.1/nptl/ChangeLog ++++ glibc-2.11.1-1/nptl/ChangeLog +@@ -3739,6 +3739,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -996,7 +888,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -4470,6 +4484,11 @@ +@@ -4475,6 +4484,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1008,7 +900,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -6544,6 +6563,11 @@ +@@ -6549,6 +6563,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1020,8 +912,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-2.11-25-g8d7c09b/nptl/Makefile -+++ glibc-2.11-4/nptl/Makefile +--- glibc-2.11.1/nptl/Makefile ++++ glibc-2.11.1-1/nptl/Makefile @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1054,8 +946,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- 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 +--- glibc-2.11.1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ++++ glibc-2.11.1-1/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 @@ -1064,8 +956,8 @@ +#define _XOPEN_STREAMS -1 + #endif /* bits/posix_opt.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 +--- glibc-2.11.1/nptl/sysdeps/unix/sysv/linux/kernel-features.h ++++ glibc-2.11.1-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h @@ -0,0 +1,6 @@ +#include_next + @@ -1073,28 +965,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- 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 +--- glibc-2.11.1/nptl/tst-stackguard1.c ++++ glibc-2.11.1-1/nptl/tst-stackguard1.c @@ -190,17 +190,21 @@ do_test (void) the 16 runs, something is very wrong. */ int ndifferences = 0; @@ -1119,8 +991,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-2.11-25-g8d7c09b/nscd/nscd.conf -+++ glibc-2.11-4/nscd/nscd.conf +--- glibc-2.11.1/nscd/nscd.conf ++++ glibc-2.11.1-1/nscd/nscd.conf @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1130,8 +1002,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-2.11-25-g8d7c09b/nscd/nscd.init -+++ glibc-2.11-4/nscd/nscd.init +--- glibc-2.11.1/nscd/nscd.init ++++ glibc-2.11.1-1/nscd/nscd.init @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1203,8 +1075,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-2.11-25-g8d7c09b/posix/Makefile -+++ glibc-2.11-4/posix/Makefile +--- glibc-2.11.1/posix/Makefile ++++ glibc-2.11.1-1/posix/Makefile @@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \ mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1225,8 +1097,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-2.11-25-g8d7c09b/posix/getconf.speclist.h -+++ glibc-2.11-4/posix/getconf.speclist.h +--- glibc-2.11.1/posix/getconf.speclist.h ++++ glibc-2.11.1-1/posix/getconf.speclist.h @@ -0,0 +1,39 @@ +#include +const char *START_OF_STRINGS = @@ -1267,8 +1139,8 @@ +"XBS5_LPBIG_OFFBIG" +#endif +""; ---- glibc-2.11-25-g8d7c09b/streams/Makefile -+++ glibc-2.11-4/streams/Makefile +--- glibc-2.11.1/streams/Makefile ++++ glibc-2.11.1-1/streams/Makefile @@ -21,7 +21,7 @@ # subdir := streams @@ -1278,8 +1150,8 @@ routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach include ../Rules ---- glibc-2.11-25-g8d7c09b/sysdeps/generic/dl-cache.h -+++ glibc-2.11-4/sysdeps/generic/dl-cache.h +--- glibc-2.11.1/sysdeps/generic/dl-cache.h ++++ glibc-2.11.1-1/sysdeps/generic/dl-cache.h @@ -36,6 +36,14 @@ # define add_system_dir(dir) add_dir (dir) #endif @@ -1295,8 +1167,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-25-g8d7c09b/sysdeps/i386/Makefile -+++ glibc-2.11-4/sysdeps/i386/Makefile +--- glibc-2.11.1/sysdeps/i386/Makefile ++++ glibc-2.11.1-1/sysdeps/i386/Makefile @@ -2,6 +2,8 @@ # Every i386 port in use uses gas syntax (I think). asm-CPPFLAGS += -DGAS_SYNTAX @@ -1321,8 +1193,8 @@ endif ifeq ($(subdir),elf) ---- glibc-2.11-25-g8d7c09b/sysdeps/ia64/Makefile -+++ glibc-2.11-4/sysdeps/ia64/Makefile +--- glibc-2.11.1/sysdeps/ia64/Makefile ++++ glibc-2.11.1-1/sysdeps/ia64/Makefile @@ -12,8 +12,8 @@ elide-routines.os += hp-timing ifeq (yes,$(build-shared)) @@ -1334,8 +1206,8 @@ endif endif ---- glibc-2.11-25-g8d7c09b/sysdeps/ia64/ia64libgcc.S -+++ glibc-2.11-4/sysdeps/ia64/ia64libgcc.S +--- glibc-2.11.1/sysdeps/ia64/ia64libgcc.S ++++ glibc-2.11.1-1/sysdeps/ia64/ia64libgcc.S @@ -1,350 +0,0 @@ -/* From the Intel IA-64 Optimization Guide, choose the minimum latency - alternative. */ @@ -1687,8 +1559,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-2.11-25-g8d7c09b/sysdeps/ia64/libgcc-compat.c -+++ glibc-2.11-4/sysdeps/ia64/libgcc-compat.c +--- glibc-2.11.1/sysdeps/ia64/libgcc-compat.c ++++ glibc-2.11.1-1/sysdeps/ia64/libgcc-compat.c @@ -0,0 +1,84 @@ +/* pre-.hidden libgcc compatibility + Copyright (C) 2002 Free Software Foundation, Inc. @@ -1774,8 +1646,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-2.11-25-g8d7c09b/sysdeps/powerpc/powerpc64/Makefile -+++ glibc-2.11-4/sysdeps/powerpc/powerpc64/Makefile +--- glibc-2.11.1/sysdeps/powerpc/powerpc64/Makefile ++++ glibc-2.11.1-1/sysdeps/powerpc/powerpc64/Makefile @@ -30,6 +30,7 @@ ifneq ($(elf),no) # we use -fpic instead which is much better. CFLAGS-initfini.s += -fpic -O1 @@ -1784,21 +1656,8 @@ endif ifeq ($(subdir),elf) ---- 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 -+ - 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 +--- glibc-2.11.1/sysdeps/unix/nice.c ++++ glibc-2.11.1-1/sysdeps/unix/nice.c @@ -42,7 +42,12 @@ nice (int incr) __set_errno (save); } @@ -1813,8 +1672,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/check_pf.c -+++ glibc-2.11-4/sysdeps/unix/sysv/linux/check_pf.c +--- glibc-2.11.1/sysdeps/unix/sysv/linux/check_pf.c ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/check_pf.c @@ -27,13 +27,10 @@ #include #include @@ -1830,8 +1689,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/dl-osinfo.h -+++ glibc-2.11-4/sysdeps/unix/sysv/linux/dl-osinfo.h +--- glibc-2.11.1/sysdeps/unix/sysv/linux/dl-osinfo.h ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -17,10 +17,13 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -1879,8 +1738,8 @@ } else #endif ---- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/futimesat.c -+++ glibc-2.11-4/sysdeps/unix/sysv/linux/futimesat.c +--- glibc-2.11.1/sysdeps/unix/sysv/linux/futimesat.c ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/futimesat.c @@ -37,14 +37,14 @@ futimesat (fd, file, tvp) { int result; @@ -1923,53 +1782,8 @@ { size_t filelen = strlen (file); if (__builtin_expect (filelen == 0, 0)) ---- 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 +--- glibc-2.11.1/sysdeps/unix/sysv/linux/i386/clone.S ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/i386/clone.S @@ -120,9 +120,6 @@ L(pseudo_end): ret @@ -1988,8 +1802,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- 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 +--- glibc-2.11.1/sysdeps/unix/sysv/linux/i386/dl-cache.h ++++ glibc-2.11.1-1/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. @@ -2050,8 +1864,8 @@ + } while (0) + +#include_next ---- 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 +--- glibc-2.11.1/sysdeps/unix/sysv/linux/ia64/dl-cache.h ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h @@ -22,4 +22,31 @@ #define _dl_cache_check_flags(flags) \ ((flags) == _DL_CACHE_DEFAULT_ID) @@ -2084,29 +1898,29 @@ + } while (0) + #include_next ---- 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 +--- glibc-2.11.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- 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 +--- glibc-2.11.1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include +#else +#include +#endif ---- 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 +--- glibc-2.11.1/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed ++++ glibc-2.11.1-1/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-25-g8d7c09b/sysdeps/unix/sysv/linux/netlinkaccess.h -+++ glibc-2.11-4/sysdeps/unix/sysv/linux/netlinkaccess.h +--- glibc-2.11.1/sysdeps/unix/sysv/linux/netlinkaccess.h ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/netlinkaccess.h @@ -25,6 +25,24 @@ #include @@ -2132,8 +1946,8 @@ struct netlink_res { ---- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/paths.h -+++ glibc-2.11-4/sysdeps/unix/sysv/linux/paths.h +--- glibc-2.11.1/sysdeps/unix/sysv/linux/paths.h ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/paths.h @@ -62,7 +62,7 @@ #define _PATH_TTY "/dev/tty" #define _PATH_UNIX "/boot/vmlinux" @@ -2143,8 +1957,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-2.11-25-g8d7c09b/sysdeps/unix/sysv/linux/tcsetattr.c -+++ glibc-2.11-4/sysdeps/unix/sysv/linux/tcsetattr.c +--- glibc-2.11.1/sysdeps/unix/sysv/linux/tcsetattr.c ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/tcsetattr.c @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p) { struct __kernel_termios k_termios; @@ -2190,8 +2004,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- 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 +--- glibc-2.11.1/sysdeps/unix/sysv/linux/x86_64/clone.S ++++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -89,9 +89,6 @@ L(pseudo_end): ret @@ -2210,8 +2024,8 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- glibc-2.11-25-g8d7c09b/timezone/zic.c -+++ glibc-2.11-4/timezone/zic.c +--- glibc-2.11.1/timezone/zic.c ++++ glibc-2.11.1-1/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 1a97269..5755160 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,5 +1,6 @@ -%define glibcsrcdir glibc-2.11-25-g8d7c09b -%define glibcversion 2.11 +%define glibcsrcdir glibc-2.11.1 +%define glibc_release_url ftp://sources.redhat.com/pub/glibc/releases/ +%define glibcversion 2.11.1 ### glibc.spec.in follows: %define run_glibc_tests 1 %define auxarches athlon sparcv9v sparc64v alphaev6 @@ -28,7 +29,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 4 +Release: 1 # 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 @@ -1037,6 +1038,11 @@ rm -f *.filelist* %endif %changelog +* Mon Dec 14 2009 Andreas Schwab - 2.11.1-1 +- Update to 2.11.1 release. + - Locale updates. + - Don't reuse RPC XIDs across forks. + * Mon Nov 30 2009 Andreas Schwab - 2.11-4 - Update from 2.11 branch - Fix sync_file_range on ppc/ppc64. diff --git a/import.log b/import.log index 57f9896..bb16879 100644 --- a/import.log +++ b/import.log @@ -39,3 +39,4 @@ 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 +glibc-2_11_1-1:F-12:glibc-2.11.1-1.src.rpm:1262612086 diff --git a/sources b/sources index 0972ee5..e633ca6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -670cb75b78c5a83905d871e807c21637 glibc-2.11-25-g8d7c09b-fedora.tar.bz2 -fdbb8b905305551f1824932ba01fbf35 glibc-2.11-25-g8d7c09b.tar.bz2 +9962f713f1178089a7f5c91be722b407 glibc-2.11.1-fedora.tar.bz2 +6856d5d8b1239556687f0d1217f3f266 glibc-2.11.1.tar.bz2