rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2.11.1-2

Browse Source
This commit is contained in:
Andreas Schwab 2010-03-18 15:52:06 +00:00
parent 92e9135ef9
commit aa786aadd5
7 changed files with 131 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.cvsignore
View File

@ -1,2 +1,2 @@
glibc-2.11.1-fedora.tar.bz2
glibc-2.11.1.tar.bz2
glibc-2.11.1-4-g11c19d3-fedora.tar.bz2
glibc-2.11.1-4-g11c19d3.tar.bz2

236
glibc-fedora.patch
View File

@ -1,6 +1,6 @@
--- glibc-2.11.1/ChangeLog
+++ glibc-2.11.1-1/ChangeLog
@@ -1138,6 +1138,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
--- glibc-2.11.1-4-g11c19d3/ChangeLog
+++ glibc-2.11.1-2/ChangeLog
@@ -1169,6 +1169,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
the unique symbol hash table should not be const.
@ -12,7 +12,7 @@
2009-07-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove
@@ -1403,6 +1408,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
@@ -1434,6 +1439,11 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
out common code into new function get_common_indeces. Determine
extended family and model for Intel processors.
@ -24,7 +24,7 @@
2009-06-26 Ulrich Drepper <drepper@redhat.com>
* resolv/resolv.h: Define RES_SNGLKUPREOP.
@@ -10096,6 +10106,10 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
@@ -10127,6 +10137,10 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
[BZ #4368]
* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
@ -35,7 +35,7 @@
2007-04-16 Ulrich Drepper <drepper@redhat.com>
[BZ #4364]
@@ -11353,6 +11367,15 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
@@ -11384,6 +11398,15 @@ d2009-10-30 Ulrich Drepper <drepper@redhat.com>
separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3.
@ -51,8 +51,8 @@
2006-12-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3632]
--- glibc-2.11.1/ChangeLog.15
+++ glibc-2.11.1-1/ChangeLog.15
--- glibc-2.11.1-4-g11c19d3/ChangeLog.15
+++ glibc-2.11.1-2/ChangeLog.15
@@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek <jakub@redhat.com>
@ -118,8 +118,8 @@
2004-08-30 Roland McGrath <roland@frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
--- glibc-2.11.1/ChangeLog.16
+++ glibc-2.11.1-1/ChangeLog.16
--- glibc-2.11.1-4-g11c19d3/ChangeLog.16
+++ glibc-2.11.1-2/ChangeLog.16
@@ -2042,6 +2042,9 @@
(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
followed by __THROW.
@ -173,8 +173,8 @@
2005-07-28 Thomas Schwinge <schwinge@nic-nac-project.de>
[BZ #1137]
--- glibc-2.11.1/Makeconfig
+++ glibc-2.11.1-1/Makeconfig
--- glibc-2.11.1-4-g11c19d3/Makeconfig
+++ glibc-2.11.1-2/Makeconfig
@@ -780,12 +780,12 @@ endif
# The assembler can generate debug information too.
ifndef ASFLAGS
@ -191,8 +191,8 @@
ifndef BUILD_CC
BUILD_CC = $(CC)
--- glibc-2.11.1/csu/Makefile
+++ glibc-2.11.1-1/csu/Makefile
--- glibc-2.11.1-4-g11c19d3/csu/Makefile
+++ glibc-2.11.1-2/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
$(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@ -203,8 +203,8 @@
vpath initfini.c $(sysdirs)
--- glibc-2.11.1/csu/elf-init.c
+++ glibc-2.11.1-1/csu/elf-init.c
--- glibc-2.11.1-4-g11c19d3/csu/elf-init.c
+++ glibc-2.11.1-2/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;
@ -229,8 +229,8 @@
/* These function symbols are provided for the .init/.fini section entry
points automagically by the linker. */
--- glibc-2.11.1/debug/tst-chk1.c
+++ glibc-2.11.1-1/debug/tst-chk1.c
--- glibc-2.11.1-4-g11c19d3/debug/tst-chk1.c
+++ glibc-2.11.1-2/debug/tst-chk1.c
@@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
@ -259,8 +259,8 @@
# define O 0
# else
# define O 1
--- glibc-2.11.1/elf/ldconfig.c
+++ glibc-2.11.1-1/elf/ldconfig.c
--- glibc-2.11.1-4-g11c19d3/elf/ldconfig.c
+++ glibc-2.11.1-2/elf/ldconfig.c
@@ -1020,17 +1020,19 @@ search_dirs (void)
@ -342,8 +342,8 @@
}
if (! opt_ignore_aux_cache)
--- glibc-2.11.1/elf/tst-stackguard1.c
+++ glibc-2.11.1-1/elf/tst-stackguard1.c
--- glibc-2.11.1-4-g11c19d3/elf/tst-stackguard1.c
+++ glibc-2.11.1-2/elf/tst-stackguard1.c
@@ -160,17 +160,21 @@ do_test (void)
the 16 runs, something is very wrong. */
int ndifferences = 0;
@ -368,16 +368,16 @@
{
puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value");
--- glibc-2.11.1/include/bits/stdlib-ldbl.h
+++ glibc-2.11.1-1/include/bits/stdlib-ldbl.h
--- glibc-2.11.1-4-g11c19d3/include/bits/stdlib-ldbl.h
+++ glibc-2.11.1-2/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@
+#include <stdlib/bits/stdlib-ldbl.h>
--- glibc-2.11.1/include/bits/wchar-ldbl.h
+++ glibc-2.11.1-1/include/bits/wchar-ldbl.h
--- glibc-2.11.1-4-g11c19d3/include/bits/wchar-ldbl.h
+++ glibc-2.11.1-2/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@
+#include <wcsmbs/bits/wchar-ldbl.h>
--- glibc-2.11.1/include/features.h
+++ glibc-2.11.1-1/include/features.h
--- glibc-2.11.1-4-g11c19d3/include/features.h
+++ glibc-2.11.1-2/include/features.h
@@ -299,8 +299,13 @@
#endif
@ -394,8 +394,8 @@
# define __USE_FORTIFY_LEVEL 2
# else
# define __USE_FORTIFY_LEVEL 1
--- glibc-2.11.1/intl/locale.alias
+++ glibc-2.11.1-1/intl/locale.alias
--- glibc-2.11.1-4-g11c19d3/intl/locale.alias
+++ glibc-2.11.1-2/intl/locale.alias
@@ -57,8 +57,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR
@ -405,8 +405,8 @@
norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
--- glibc-2.11.1/libio/stdio.h
+++ glibc-2.11.1-1/libio/stdio.h
--- glibc-2.11.1-4-g11c19d3/libio/stdio.h
+++ glibc-2.11.1-2/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. */
@ -420,8 +420,8 @@
__BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */
--- glibc-2.11.1/locale/iso-4217.def
+++ glibc-2.11.1-1/locale/iso-4217.def
--- glibc-2.11.1-4-g11c19d3/locale/iso-4217.def
+++ glibc-2.11.1-2/locale/iso-4217.def
@@ -8,6 +8,7 @@
*
* !!! The list has to be sorted !!!
@ -513,8 +513,8 @@
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */
--- glibc-2.11.1/locale/programs/locarchive.c
+++ glibc-2.11.1-1/locale/programs/locarchive.c
--- glibc-2.11.1-4-g11c19d3/locale/programs/locarchive.c
+++ glibc-2.11.1-2/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,
@ -546,8 +546,8 @@
add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p)
{
--- glibc-2.11.1/localedata/Makefile
+++ glibc-2.11.1-1/localedata/Makefile
--- glibc-2.11.1-4-g11c19d3/localedata/Makefile
+++ glibc-2.11.1-2/localedata/Makefile
@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@ -556,8 +556,8 @@
-i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \
--- glibc-2.11.1/localedata/SUPPORTED
+++ glibc-2.11.1-1/localedata/SUPPORTED
--- glibc-2.11.1-4-g11c19d3/localedata/SUPPORTED
+++ glibc-2.11.1-2/localedata/SUPPORTED
@@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \
@ -599,8 +599,8 @@
ta_IN/UTF-8 \
te_IN/UTF-8 \
tg_TJ.UTF-8/UTF-8 \
--- glibc-2.11.1/localedata/locales/cy_GB
+++ glibc-2.11.1-1/localedata/locales/cy_GB
--- glibc-2.11.1-4-g11c19d3/localedata/locales/cy_GB
+++ glibc-2.11.1-2/localedata/locales/cy_GB
@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061><U0077><U0072>";/
d_t_fmt "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
@ -615,8 +615,8 @@
END LC_TIME
LC_MESSAGES
--- glibc-2.11.1/localedata/locales/en_GB
+++ glibc-2.11.1-1/localedata/locales/en_GB
--- glibc-2.11.1-4-g11c19d3/localedata/locales/en_GB
+++ glibc-2.11.1-2/localedata/locales/en_GB
@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
@ -628,8 +628,8 @@
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>"
--- glibc-2.11.1/localedata/locales/no_NO
+++ glibc-2.11.1-1/localedata/locales/no_NO
--- glibc-2.11.1-4-g11c19d3/localedata/locales/no_NO
+++ glibc-2.11.1-2/localedata/locales/no_NO
@@ -0,0 +1,69 @@
+escape_char /
+comment_char %
@ -700,8 +700,8 @@
+LC_ADDRESS
+copy "nb_NO"
+END LC_ADDRESS
--- glibc-2.11.1/localedata/locales/zh_TW
+++ glibc-2.11.1-1/localedata/locales/zh_TW
--- glibc-2.11.1-4-g11c19d3/localedata/locales/zh_TW
+++ glibc-2.11.1-2/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
comment_char %
escape_char /
@ -729,8 +729,8 @@
revision "0.2"
date "2000-08-02"
%
--- glibc-2.11.1/malloc/mcheck.c
+++ glibc-2.11.1-1/malloc/mcheck.c
--- glibc-2.11.1-4-g11c19d3/malloc/mcheck.c
+++ glibc-2.11.1-2/malloc/mcheck.c
@@ -24,9 +24,25 @@
# include <mcheck.h>
# include <stdint.h>
@ -806,8 +806,8 @@
old_free_hook = __free_hook;
__free_hook = freehook;
--- glibc-2.11.1/manual/libc.texinfo
+++ glibc-2.11.1-1/manual/libc.texinfo
--- glibc-2.11.1-4-g11c19d3/manual/libc.texinfo
+++ glibc-2.11.1-2/manual/libc.texinfo
@@ -5,7 +5,7 @@
@c setchapternewpage odd
@ -817,8 +817,8 @@
@direntry
* Libc: (libc). C library.
@end direntry
--- glibc-2.11.1/misc/sys/cdefs.h
+++ glibc-2.11.1-1/misc/sys/cdefs.h
--- glibc-2.11.1-4-g11c19d3/misc/sys/cdefs.h
+++ glibc-2.11.1-2/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)
@ -862,16 +862,16 @@
# define __va_arg_pack() __builtin_va_arg_pack ()
# define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif
--- glibc-2.11.1/nis/nss
+++ glibc-2.11.1-1/nis/nss
--- glibc-2.11.1-4-g11c19d3/nis/nss
+++ glibc-2.11.1-2/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.1/nptl/ChangeLog
+++ glibc-2.11.1-1/nptl/ChangeLog
--- glibc-2.11.1-4-g11c19d3/nptl/ChangeLog
+++ glibc-2.11.1-2/nptl/ChangeLog
@@ -3739,6 +3739,15 @@
Use __sigfillset. Document that sigfillset does the right thing wrt
to SIGSETXID.
@ -912,8 +912,8 @@
2003-07-25 Jakub Jelinek <jakub@redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-2.11.1/nptl/Makefile
+++ glibc-2.11.1-1/nptl/Makefile
--- glibc-2.11.1-4-g11c19d3/nptl/Makefile
+++ glibc-2.11.1-2/nptl/Makefile
@@ -339,7 +339,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs)
omit-deps += crti crtn
@ -946,8 +946,8 @@
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif
--- 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
--- glibc-2.11.1-4-g11c19d3/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.11.1-2/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
@ -956,8 +956,8 @@
+#define _XOPEN_STREAMS -1
+
#endif /* bits/posix_opt.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
--- glibc-2.11.1-4-g11c19d3/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.11.1-2/nptl/sysdeps/unix/sysv/linux/kernel-features.h
@@ -0,0 +1,6 @@
+#include_next <kernel-features.h>
+
@ -965,8 +965,8 @@
+#ifndef __ASSUME_CLONE_THREAD_FLAGS
+# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif
--- glibc-2.11.1/nptl/tst-stackguard1.c
+++ glibc-2.11.1-1/nptl/tst-stackguard1.c
--- glibc-2.11.1-4-g11c19d3/nptl/tst-stackguard1.c
+++ glibc-2.11.1-2/nptl/tst-stackguard1.c
@@ -190,17 +190,21 @@ do_test (void)
the 16 runs, something is very wrong. */
int ndifferences = 0;
@ -991,8 +991,8 @@
{
puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value");
--- glibc-2.11.1/nscd/nscd.conf
+++ glibc-2.11.1-1/nscd/nscd.conf
--- glibc-2.11.1-4-g11c19d3/nscd/nscd.conf
+++ glibc-2.11.1-2/nscd/nscd.conf
@@ -33,7 +33,7 @@
# logfile /var/log/nscd.log
# threads 4
@ -1002,8 +1002,8 @@
# stat-user somebody
debug-level 0
# reload-count 5
--- glibc-2.11.1/nscd/nscd.init
+++ glibc-2.11.1-1/nscd/nscd.init
--- glibc-2.11.1-4-g11c19d3/nscd/nscd.init
+++ glibc-2.11.1-2/nscd/nscd.init
@@ -9,6 +9,7 @@
# slow naming services like NIS, NIS+, LDAP, or hesiod.
# processname: /usr/sbin/nscd
@ -1075,8 +1075,8 @@
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- glibc-2.11.1/posix/Makefile
+++ glibc-2.11.1-1/posix/Makefile
--- glibc-2.11.1-4-g11c19d3/posix/Makefile
+++ glibc-2.11.1-2/posix/Makefile
@@ -303,15 +303,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist
@ -1097,8 +1097,8 @@
+ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
+ > $@.new
mv -f $@.new $@
--- glibc-2.11.1/posix/getconf.speclist.h
+++ glibc-2.11.1-1/posix/getconf.speclist.h
--- glibc-2.11.1-4-g11c19d3/posix/getconf.speclist.h
+++ glibc-2.11.1-2/posix/getconf.speclist.h
@@ -0,0 +1,39 @@
+#include <unistd.h>
+const char *START_OF_STRINGS =
@ -1139,8 +1139,8 @@
+"XBS5_LPBIG_OFFBIG"
+#endif
+"";
--- glibc-2.11.1/streams/Makefile
+++ glibc-2.11.1-1/streams/Makefile
--- glibc-2.11.1-4-g11c19d3/streams/Makefile
+++ glibc-2.11.1-2/streams/Makefile
@@ -21,7 +21,7 @@
#
subdir := streams
@ -1150,8 +1150,8 @@
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules
--- glibc-2.11.1/sysdeps/generic/dl-cache.h
+++ glibc-2.11.1-1/sysdeps/generic/dl-cache.h
--- glibc-2.11.1-4-g11c19d3/sysdeps/generic/dl-cache.h
+++ glibc-2.11.1-2/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir)
#endif
@ -1167,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.1/sysdeps/i386/Makefile
+++ glibc-2.11.1-1/sysdeps/i386/Makefile
--- glibc-2.11.1-4-g11c19d3/sysdeps/i386/Makefile
+++ glibc-2.11.1-2/sysdeps/i386/Makefile
@@ -2,6 +2,8 @@
# Every i386 port in use uses gas syntax (I think).
asm-CPPFLAGS += -DGAS_SYNTAX
@ -1193,8 +1193,8 @@
endif
ifeq ($(subdir),elf)
--- glibc-2.11.1/sysdeps/ia64/Makefile
+++ glibc-2.11.1-1/sysdeps/ia64/Makefile
--- glibc-2.11.1-4-g11c19d3/sysdeps/ia64/Makefile
+++ glibc-2.11.1-2/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
ifeq (yes,$(build-shared))
@ -1206,8 +1206,8 @@
endif
endif
--- glibc-2.11.1/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.11.1-1/sysdeps/ia64/ia64libgcc.S
--- glibc-2.11.1-4-g11c19d3/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.11.1-2/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency
- alternative. */
@ -1559,8 +1559,8 @@
- .symver ___multi3, __multi3@GLIBC_2.2
-
-#endif
--- glibc-2.11.1/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.11.1-1/sysdeps/ia64/libgcc-compat.c
--- glibc-2.11.1-4-g11c19d3/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.11.1-2/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 Free Software Foundation, Inc.
@ -1646,8 +1646,8 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+
+#endif
--- glibc-2.11.1/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.11.1-1/sysdeps/powerpc/powerpc64/Makefile
--- glibc-2.11.1-4-g11c19d3/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.11.1-2/sysdeps/powerpc/powerpc64/Makefile
@@ -30,6 +30,7 @@ ifneq ($(elf),no)
# we use -fpic instead which is much better.
CFLAGS-initfini.s += -fpic -O1
@ -1656,8 +1656,8 @@
endif
ifeq ($(subdir),elf)
--- glibc-2.11.1/sysdeps/unix/nice.c
+++ glibc-2.11.1-1/sysdeps/unix/nice.c
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/nice.c
+++ glibc-2.11.1-2/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save);
}
@ -1672,8 +1672,8 @@
if (result == -1)
{
if (errno == EACCES)
--- glibc-2.11.1/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/check_pf.c
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@
#include <unistd.h>
#include <sys/socket.h>
@ -1689,8 +1689,8 @@
#ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0
--- glibc-2.11.1/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/dl-osinfo.h
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -17,10 +17,13 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
@ -1738,8 +1738,8 @@
}
else
#endif
--- glibc-2.11.1/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/futimesat.c
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
{
int result;
@ -1782,8 +1782,8 @@
{
size_t filelen = strlen (file);
if (__builtin_expect (filelen == 0, 0))
--- glibc-2.11.1/sysdeps/unix/sysv/linux/i386/clone.S
+++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/i386/clone.S
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/i386/clone.S
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/i386/clone.S
@@ -120,9 +120,6 @@ L(pseudo_end):
ret
@ -1802,8 +1802,8 @@
cfi_startproc
PSEUDO_END (BP_SYM (__clone))
--- 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
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.11.1-2/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.
@ -1864,8 +1864,8 @@
+ } while (0)
+
+#include_next <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
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID)
@ -1898,29 +1898,29 @@
+ } while (0)
+
#include_next <dl-cache.h>
--- 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
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/i386/dl-procinfo.c>
+#else
+#include <sysdeps/generic/dl-procinfo.c>
+#endif
--- 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
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
+#else
+#include <sysdeps/generic/dl-procinfo.h>
+#endif
--- 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
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.11.1-2/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.1/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/netlinkaccess.h
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@
#include <kernel-features.h>
@ -1946,8 +1946,8 @@
struct netlink_res
{
--- glibc-2.11.1/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/paths.h
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/paths.h
@@ -62,7 +62,7 @@
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux"
@ -1957,8 +1957,8 @@
#define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-2.11.1/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.11.1-1/sysdeps/unix/sysv/linux/tcsetattr.c
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
{
struct __kernel_termios k_termios;
@ -2004,8 +2004,8 @@
+ return retval;
}
libc_hidden_def (tcsetattr)
--- 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
--- glibc-2.11.1-4-g11c19d3/sysdeps/unix/sysv/linux/x86_64/clone.S
+++ glibc-2.11.1-2/sysdeps/unix/sysv/linux/x86_64/clone.S
@@ -89,9 +89,6 @@ L(pseudo_end):
ret
@ -2024,8 +2024,8 @@
cfi_startproc;
PSEUDO_END (BP_SYM (__clone))
--- glibc-2.11.1/timezone/zic.c
+++ glibc-2.11.1-1/timezone/zic.c
--- glibc-2.11.1-4-g11c19d3/timezone/zic.c
+++ glibc-2.11.1-2/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int zonecount;
if (stdrp != NULL && stdrp->r_hiyear == 2037)
return;

35
glibc-sparc64-reloc.patch
View File

@ -1,35 +0,0 @@
ChangeLog | 6 ++++++
sysdeps/sparc/sparc64/dl-machine.h | 10 ++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
--- a/ChangeLog
+++ a/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-09 David S. Miller <davem@davemloft.net>
+
+ * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Handling
+ of R_SPARC_TLS_LE_* needs to use 32-bit loads and stores, not
+ 64-bit ones.
+
2009-10-27 Aurelien Jarno <aurelien@aurel32.net>
[BZ #10855]
--- a/sysdeps/sparc/sparc64/dl-machine.h
+++ a/sysdeps/sparc/sparc64/dl-machine.h
@@ -513,11 +513,13 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
value = sym->st_value - sym_map->l_tls_offset
+ reloc->r_addend;
if (r_type == R_SPARC_TLS_LE_HIX22)
- *reloc_addr = (*reloc_addr & 0xffc00000)
- | (((~value) >> 10) & 0x3fffff);
+ *(unsigned int *)reloc_addr =
+ ((*(unsigned int *)reloc_addr & 0xffc00000)
+ | (((~value) >> 10) & 0x3fffff));
else
- *reloc_addr = (*reloc_addr & 0xffffe000) | (value & 0x3ff)
- | 0x1c00;
+ *(unsigned int *)reloc_addr =
+ ((*(unsigned int *)reloc_addr & 0xffffe000) | (value & 0x3ff)
+ | 0x1c00);
}
break;
# endif

21
glibc.spec
View File

@ -1,5 +1,4 @@
%define glibcsrcdir glibc-2.11.1
%define glibc_release_url ftp://sources.redhat.com/pub/glibc/releases/
%define glibcsrcdir glibc-2.11.1-4-g11c19d3
%define glibcversion 2.11.1
### 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: 2
# 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
@ -42,9 +41,6 @@ Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2
Source1: %{glibcsrcdir}-fedora.tar.bz2
Patch0: %{name}-fedora.patch
Patch1: %{name}-ia64-lib64.patch
Patch2: sparc-shared-mapping.patch
Patch3: glibc-sparc64-reloc.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: glibc-profile < 2.4
Provides: ldconfig
@ -250,8 +246,6 @@ package or when debugging this package.
%prep
%setup -q -n %{glibcsrcdir} -b1
%patch0 -E -p1
%patch2 -p1
%patch3 -p1
%ifarch ia64
%if "%{_lib}" == "lib64"
%patch1 -p1
@ -1043,11 +1037,12 @@ rm -f *.filelist*
%endif
%changelog
* Thu Mar 09 2010 Dennis Gilmore <dennis@ausil.us> - 2.11.1-3
- add patch to fix sparc TLS reloc (BZ#571551).
* Wed Feb 10 2010 Dennis Gilmore <dennis@ausil.us> - 2.11.1-2
- add sparc locale patch commited upstream to the fedora branch
* Wed Mar 17 2010 Andreas Schwab <schwab@redhat.com> - 2.11.1-2
- Update from 2.11 branch
- regcomp.c: do not ignore memory allocation failure (BZ#11127)
- Fix typo in feature selection macro use
- Avoid ELF lookup race
- Fix a few error cases in *name4_r lookup handling (#573904, BZ#11000)
* Mon Dec 14 2009 Andreas Schwab <schwab@redhat.com> - 2.11.1-1
- Update to 2.11.1 release.

1
import.log
View File

@ -40,3 +40,4 @@ 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
glibc-2_11_1-2:F-12:glibc-2.11.1-2.src.rpm:1268927149

4
sources
View File

@ -1,2 +1,2 @@
9962f713f1178089a7f5c91be722b407 glibc-2.11.1-fedora.tar.bz2
6856d5d8b1239556687f0d1217f3f266 glibc-2.11.1.tar.bz2
6d039c73c8ba06daa3324e96dd392fef glibc-2.11.1-4-g11c19d3-fedora.tar.bz2
b7e765fa327700ae462e2b71e462ad87 glibc-2.11.1-4-g11c19d3.tar.bz2

54
sparc-shared-mapping.patch
View File

@ -1,54 +0,0 @@
From 6a147cc6e402e7167fa1213c31dc42a6fa38f52b Mon Sep 17 00:00:00 2001
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 8 Feb 2010 14:58:31 +0100
Subject: [PATCH] Use shared mapping to reserve memory when creating locale archive
---
ChangeLog | 7 +++++++
locale/programs/locarchive.c | 6 +++---
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
index a585058..4335369 100644
--- a/locale/programs/locarchive.c
+++ b/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;
if (total < reserved
- && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
-1, 0)) != MAP_FAILED))
xflags = MAP_FIXED;
else
@@ -396,7 +396,7 @@ enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
size_t reserved = RESERVE_MMAP_SIZE;
int xflags = 0;
if (total < reserved
- && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
-1, 0)) != MAP_FAILED))
xflags = MAP_FIXED;
else
@@ -614,7 +614,7 @@ open_archive (struct locarhandle *ah, bool readonly)
int xflags = 0;
void *p;
if (st.st_size < reserved
- && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
+ && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
-1, 0)) != MAP_FAILED))
xflags = MAP_FIXED;
else
--- glibc-2.11.1/ChangeLog.orig 2010-02-10 17:01:30.000000000 -0600
+++ glibc-2.11.1/ChangeLog 2010-02-10 17:02:25.000000000 -0600
@@ -1,3 +1,10 @@
+2009-10-27 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #10855]
+ * locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
+ used later with MMAP_FIXED | MMAP_SHARED to cope with different
+ alignment restrictions.
+
2009-11-24 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/grantpt.c (grantpt): Use CLOSE_ALL_FDS is available