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

2.10.90-18

Browse Source
This commit is contained in:
Andreas Schwab 2009-09-01 11:03:11 +00:00
parent 79e4f027f9
commit f81c27d40a
5 changed files with 158 additions and 151 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.10-312-g2df4be8.tar.bz2 glibc-2.10-318-gc2735e9-fedora.tar.bz2
glibc-2.10-312-g2df4be8-fedora.tar.bz2 glibc-2.10-318-gc2735e9.tar.bz2

290
glibc-fedora.patch
View File

@ -1,6 +1,6 @@
--- glibc-2.10-312-g2df4be8/ChangeLog --- glibc-2.10-318-gc2735e9/ChangeLog
+++ glibc-2.10.90-17/ChangeLog +++ glibc-2.10.90-18/ChangeLog
@@ -497,6 +497,11 @@ @@ -519,6 +519,11 @@
* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in * sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in
the unique symbol hash table should not be const. the unique symbol hash table should not be const.
@ -12,7 +12,7 @@
2009-07-21 Ulrich Drepper <drepper@redhat.com> 2009-07-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove * sysdeps/x86_64/multiarch/strstr.c: Minor cleanups. Remove
@@ -762,6 +767,11 @@ @@ -784,6 +789,11 @@
out common code into new function get_common_indeces. Determine out common code into new function get_common_indeces. Determine
extended family and model for Intel processors. extended family and model for Intel processors.
@ -24,7 +24,7 @@
2009-06-26 Ulrich Drepper <drepper@redhat.com> 2009-06-26 Ulrich Drepper <drepper@redhat.com>
* resolv/resolv.h: Define RES_SNGLKUPREOP. * resolv/resolv.h: Define RES_SNGLKUPREOP.
@@ -9160,6 +9170,13 @@ @@ -9182,6 +9192,13 @@
* include/sys/cdefs.h: Redefine __nonnull so that test for * include/sys/cdefs.h: Redefine __nonnull so that test for
incorrect parameters in the libc code itself are not omitted. incorrect parameters in the libc code itself are not omitted.
@ -38,7 +38,7 @@
2007-05-09 Jakub Jelinek <jakub@redhat.com> 2007-05-09 Jakub Jelinek <jakub@redhat.com>
* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow * sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
@@ -9455,6 +9472,10 @@ @@ -9477,6 +9494,10 @@
[BZ #4368] [BZ #4368]
* stdlib/stdlib.h: Remove obsolete part of comment for realpath. * stdlib/stdlib.h: Remove obsolete part of comment for realpath.
@ -49,7 +49,7 @@
2007-04-16 Ulrich Drepper <drepper@redhat.com> 2007-04-16 Ulrich Drepper <drepper@redhat.com>
[BZ #4364] [BZ #4364]
@@ -10712,6 +10733,15 @@ @@ -10734,6 +10755,15 @@
separators also if no non-zero digits found. separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3. * stdlib/Makefile (tests): Add tst-strtod3.
@ -65,8 +65,8 @@
2006-12-09 Ulrich Drepper <drepper@redhat.com> 2006-12-09 Ulrich Drepper <drepper@redhat.com>
[BZ #3632] [BZ #3632]
--- glibc-2.10-312-g2df4be8/ChangeLog.15 --- glibc-2.10-318-gc2735e9/ChangeLog.15
+++ glibc-2.10.90-17/ChangeLog.15 +++ glibc-2.10.90-18/ChangeLog.15
@@ -477,6 +477,14 @@ @@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek <jakub@redhat.com> 2004-11-26 Jakub Jelinek <jakub@redhat.com>
@ -132,8 +132,8 @@
2004-08-30 Roland McGrath <roland@frob.com> 2004-08-30 Roland McGrath <roland@frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit * scripts/extract-abilist.awk: If `lastversion' variable defined, omit
--- glibc-2.10-312-g2df4be8/ChangeLog.16 --- glibc-2.10-318-gc2735e9/ChangeLog.16
+++ glibc-2.10.90-17/ChangeLog.16 +++ glibc-2.10.90-18/ChangeLog.16
@@ -171,6 +171,11 @@ @@ -171,6 +171,11 @@
[BZ #2611] [BZ #2611]
* stdio-common/renameat.c (renameat): Fix typo. * stdio-common/renameat.c (renameat): Fix typo.
@ -305,8 +305,8 @@
2005-02-10 Roland McGrath <roland@redhat.com> 2005-02-10 Roland McGrath <roland@redhat.com>
[BZ #157] [BZ #157]
--- glibc-2.10-312-g2df4be8/Makeconfig --- glibc-2.10-318-gc2735e9/Makeconfig
+++ glibc-2.10.90-17/Makeconfig +++ glibc-2.10.90-18/Makeconfig
@@ -780,12 +780,12 @@ endif @@ -780,12 +780,12 @@ endif
# The assembler can generate debug information too. # The assembler can generate debug information too.
ifndef ASFLAGS ifndef ASFLAGS
@ -323,8 +323,8 @@
ifndef BUILD_CC ifndef BUILD_CC
BUILD_CC = $(CC) BUILD_CC = $(CC)
--- glibc-2.10-312-g2df4be8/csu/Makefile --- glibc-2.10-318-gc2735e9/csu/Makefile
+++ glibc-2.10.90-17/csu/Makefile +++ glibc-2.10.90-18/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff) @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
$(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@ $(compile.S) -g0 $(ASFLAGS-.os) -o $@
@ -335,9 +335,9 @@
vpath initfini.c $(sysdirs) vpath initfini.c $(sysdirs)
--- glibc-2.10-312-g2df4be8/csu/elf-init.c --- glibc-2.10-318-gc2735e9/csu/elf-init.c
+++ glibc-2.10.90-17/csu/elf-init.c +++ glibc-2.10.90-18/csu/elf-init.c
@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
extern void (*__fini_array_start []) (void) attribute_hidden; extern void (*__fini_array_start []) (void) attribute_hidden;
extern void (*__fini_array_end []) (void) attribute_hidden; extern void (*__fini_array_end []) (void) attribute_hidden;
@ -361,8 +361,8 @@
/* These function symbols are provided for the .init/.fini section entry /* These function symbols are provided for the .init/.fini section entry
points automagically by the linker. */ points automagically by the linker. */
--- glibc-2.10-312-g2df4be8/debug/tst-chk1.c --- glibc-2.10-318-gc2735e9/debug/tst-chk1.c
+++ glibc-2.10.90-17/debug/tst-chk1.c +++ glibc-2.10.90-18/debug/tst-chk1.c
@@ -17,6 +17,9 @@ @@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
@ -391,8 +391,8 @@
# define O 0 # define O 0
# else # else
# define O 1 # define O 1
--- glibc-2.10-312-g2df4be8/elf/ldconfig.c --- glibc-2.10-318-gc2735e9/elf/ldconfig.c
+++ glibc-2.10.90-17/elf/ldconfig.c +++ glibc-2.10.90-18/elf/ldconfig.c
@@ -1020,17 +1020,19 @@ search_dirs (void) @@ -1020,17 +1020,19 @@ search_dirs (void)
@ -415,7 +415,7 @@
if (do_chroot && opt_chroot) if (do_chroot && opt_chroot)
{ {
@@ -1091,7 +1093,14 @@ parse_conf (const char *filename, bool d @@ -1091,7 +1093,14 @@ parse_conf (const char *filename, bool do_chroot)
cp += 8; cp += 8;
while ((dir = strsep (&cp, " \t")) != NULL) while ((dir = strsep (&cp, " \t")) != NULL)
if (dir[0] != '\0') if (dir[0] != '\0')
@ -431,7 +431,7 @@
} }
else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5])) else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5]))
{ {
@@ -1154,7 +1163,7 @@ parse_conf (const char *filename, bool d @@ -1154,7 +1163,7 @@ parse_conf (const char *filename, bool do_chroot)
config files to read. */ config files to read. */
static void static void
parse_conf_include (const char *config_file, unsigned int lineno, parse_conf_include (const char *config_file, unsigned int lineno,
@ -440,7 +440,7 @@
{ {
if (opt_chroot && pattern[0] != '/') if (opt_chroot && pattern[0] != '/')
error (EXIT_FAILURE, 0, error (EXIT_FAILURE, 0,
@@ -1184,7 +1193,7 @@ parse_conf_include (const char *config_f @@ -1184,7 +1193,7 @@ parse_conf_include (const char *config_file, unsigned int lineno,
{ {
case 0: case 0:
for (size_t i = 0; i < gl.gl_pathc; ++i) for (size_t i = 0; i < gl.gl_pathc; ++i)
@ -474,8 +474,8 @@
} }
if (! opt_ignore_aux_cache) if (! opt_ignore_aux_cache)
--- glibc-2.10-312-g2df4be8/elf/tst-stackguard1.c --- glibc-2.10-318-gc2735e9/elf/tst-stackguard1.c
+++ glibc-2.10.90-17/elf/tst-stackguard1.c +++ glibc-2.10.90-18/elf/tst-stackguard1.c
@@ -160,17 +160,21 @@ do_test (void) @@ -160,17 +160,21 @@ do_test (void)
the 16 runs, something is very wrong. */ the 16 runs, something is very wrong. */
int ndifferences = 0; int ndifferences = 0;
@ -500,16 +500,16 @@
{ {
puts ("stack guard canaries are not randomized enough"); puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value"); puts ("nor equal to the default canary value");
--- glibc-2.10-312-g2df4be8/include/bits/stdlib-ldbl.h --- glibc-2.10-318-gc2735e9/include/bits/stdlib-ldbl.h
+++ glibc-2.10.90-17/include/bits/stdlib-ldbl.h +++ glibc-2.10.90-18/include/bits/stdlib-ldbl.h
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+#include <stdlib/bits/stdlib-ldbl.h> +#include <stdlib/bits/stdlib-ldbl.h>
--- glibc-2.10-312-g2df4be8/include/bits/wchar-ldbl.h --- glibc-2.10-318-gc2735e9/include/bits/wchar-ldbl.h
+++ glibc-2.10.90-17/include/bits/wchar-ldbl.h +++ glibc-2.10.90-18/include/bits/wchar-ldbl.h
@@ -0,0 +1 @@ @@ -0,0 +1 @@
+#include <wcsmbs/bits/wchar-ldbl.h> +#include <wcsmbs/bits/wchar-ldbl.h>
--- glibc-2.10-312-g2df4be8/include/features.h --- glibc-2.10-318-gc2735e9/include/features.h
+++ glibc-2.10.90-17/include/features.h +++ glibc-2.10.90-18/include/features.h
@@ -299,8 +299,13 @@ @@ -299,8 +299,13 @@
#endif #endif
@ -526,8 +526,8 @@
# define __USE_FORTIFY_LEVEL 2 # define __USE_FORTIFY_LEVEL 2
# else # else
# define __USE_FORTIFY_LEVEL 1 # define __USE_FORTIFY_LEVEL 1
--- glibc-2.10-312-g2df4be8/intl/locale.alias --- glibc-2.10-318-gc2735e9/intl/locale.alias
+++ glibc-2.10.90-17/intl/locale.alias +++ glibc-2.10.90-18/intl/locale.alias
@@ -57,8 +57,6 @@ korean ko_KR.eucKR @@ -57,8 +57,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR ko_KR ko_KR.eucKR
@ -537,8 +537,8 @@
norwegian nb_NO.ISO-8859-1 norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2 polish pl_PL.ISO-8859-2
--- glibc-2.10-312-g2df4be8/libio/stdio.h --- glibc-2.10-318-gc2735e9/libio/stdio.h
+++ glibc-2.10.90-17/libio/stdio.h +++ glibc-2.10.90-18/libio/stdio.h
@@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t;
extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdin; /* Standard input stream. */
extern struct _IO_FILE *stdout; /* Standard output stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */
@ -552,8 +552,8 @@
__BEGIN_NAMESPACE_STD __BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */ /* Remove file FILENAME. */
--- glibc-2.10-312-g2df4be8/locale/iso-4217.def --- glibc-2.10-318-gc2735e9/locale/iso-4217.def
+++ glibc-2.10.90-17/locale/iso-4217.def +++ glibc-2.10.90-18/locale/iso-4217.def
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
* *
* !!! The list has to be sorted !!! * !!! The list has to be sorted !!!
@ -562,7 +562,7 @@
DEFINE_INT_CURR("AED") /* United Arab Emirates Dirham */ DEFINE_INT_CURR("AED") /* United Arab Emirates Dirham */
DEFINE_INT_CURR("AFN") /* Afghanistan Afgani */ DEFINE_INT_CURR("AFN") /* Afghanistan Afgani */
DEFINE_INT_CURR("ALL") /* Albanian Lek */ DEFINE_INT_CURR("ALL") /* Albanian Lek */
@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD") /* Armenia Dram @@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD") /* Armenia Dram */
DEFINE_INT_CURR("ANG") /* Netherlands Antilles */ DEFINE_INT_CURR("ANG") /* Netherlands Antilles */
DEFINE_INT_CURR("AOA") /* Angolan Kwanza */ DEFINE_INT_CURR("AOA") /* Angolan Kwanza */
DEFINE_INT_CURR("ARS") /* Argentine Peso */ DEFINE_INT_CURR("ARS") /* Argentine Peso */
@ -577,7 +577,7 @@
DEFINE_INT_CURR("BGN") /* Bulgarian Lev */ DEFINE_INT_CURR("BGN") /* Bulgarian Lev */
DEFINE_INT_CURR("BHD") /* Bahraini Dinar */ DEFINE_INT_CURR("BHD") /* Bahraini Dinar */
DEFINE_INT_CURR("BIF") /* Burundi Franc */ DEFINE_INT_CURR("BIF") /* Burundi Franc */
@@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP") /* Cuban Peso * @@ -44,6 +47,7 @@ DEFINE_INT_CURR("CUP") /* Cuban Peso */
DEFINE_INT_CURR("CVE") /* Cape Verde Escudo */ DEFINE_INT_CURR("CVE") /* Cape Verde Escudo */
DEFINE_INT_CURR("CYP") /* Cypriot Pound */ DEFINE_INT_CURR("CYP") /* Cypriot Pound */
DEFINE_INT_CURR("CZK") /* Czech Koruna */ DEFINE_INT_CURR("CZK") /* Czech Koruna */
@ -585,7 +585,7 @@
DEFINE_INT_CURR("DJF") /* Djibouti Franc */ DEFINE_INT_CURR("DJF") /* Djibouti Franc */
DEFINE_INT_CURR("DKK") /* Danish Krone (Faroe Islands, Greenland) */ DEFINE_INT_CURR("DKK") /* Danish Krone (Faroe Islands, Greenland) */
DEFINE_INT_CURR("DOP") /* Dominican Republic */ DEFINE_INT_CURR("DOP") /* Dominican Republic */
@@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD") /* Algerian Dina @@ -51,16 +55,20 @@ DEFINE_INT_CURR("DZD") /* Algerian Dinar */
DEFINE_INT_CURR("EEK") /* Estonian Kroon */ DEFINE_INT_CURR("EEK") /* Estonian Kroon */
DEFINE_INT_CURR("EGP") /* Egyptian Pound */ DEFINE_INT_CURR("EGP") /* Egyptian Pound */
DEFINE_INT_CURR("ERN") /* Eritrean Nakfa */ DEFINE_INT_CURR("ERN") /* Eritrean Nakfa */
@ -606,7 +606,7 @@
DEFINE_INT_CURR("GTQ") /* Guatemala Quetzal */ DEFINE_INT_CURR("GTQ") /* Guatemala Quetzal */
DEFINE_INT_CURR("GYD") /* Guyana Dollar */ DEFINE_INT_CURR("GYD") /* Guyana Dollar */
DEFINE_INT_CURR("HKD") /* Hong Kong Dollar */ DEFINE_INT_CURR("HKD") /* Hong Kong Dollar */
@@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK") /* Croatia Kuna @@ -69,12 +77,14 @@ DEFINE_INT_CURR("HRK") /* Croatia Kuna */
DEFINE_INT_CURR("HTG") /* Haiti Gourde */ DEFINE_INT_CURR("HTG") /* Haiti Gourde */
DEFINE_INT_CURR("HUF") /* Hungarian Forint */ DEFINE_INT_CURR("HUF") /* Hungarian Forint */
DEFINE_INT_CURR("IDR") /* Indonesia Rupiah */ DEFINE_INT_CURR("IDR") /* Indonesia Rupiah */
@ -621,7 +621,7 @@
DEFINE_INT_CURR("JEP") /* Jersey Pound */ DEFINE_INT_CURR("JEP") /* Jersey Pound */
DEFINE_INT_CURR("JMD") /* Jamaican Dollar */ DEFINE_INT_CURR("JMD") /* Jamaican Dollar */
DEFINE_INT_CURR("JOD") /* Jordanian Dinar */ DEFINE_INT_CURR("JOD") /* Jordanian Dinar */
@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR") /* Sri Lankan Ru @@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR") /* Sri Lankan Rupee */
DEFINE_INT_CURR("LRD") /* Liberian Dollar */ DEFINE_INT_CURR("LRD") /* Liberian Dollar */
DEFINE_INT_CURR("LSL") /* Lesotho Maloti */ DEFINE_INT_CURR("LSL") /* Lesotho Maloti */
DEFINE_INT_CURR("LTL") /* Lithuanian Litas */ DEFINE_INT_CURR("LTL") /* Lithuanian Litas */
@ -629,7 +629,7 @@
DEFINE_INT_CURR("LVL") /* Latvia Lat */ DEFINE_INT_CURR("LVL") /* Latvia Lat */
DEFINE_INT_CURR("LYD") /* Libyan Arab Jamahiriya Dinar */ DEFINE_INT_CURR("LYD") /* Libyan Arab Jamahiriya Dinar */
DEFINE_INT_CURR("MAD") /* Moroccan Dirham */ DEFINE_INT_CURR("MAD") /* Moroccan Dirham */
@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM") /* Mozambique Me @@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM") /* Mozambique Metical */
DEFINE_INT_CURR("NAD") /* Namibia Dollar */ DEFINE_INT_CURR("NAD") /* Namibia Dollar */
DEFINE_INT_CURR("NGN") /* Nigeria Naira */ DEFINE_INT_CURR("NGN") /* Nigeria Naira */
DEFINE_INT_CURR("NIO") /* Nicaragua Cordoba Oro */ DEFINE_INT_CURR("NIO") /* Nicaragua Cordoba Oro */
@ -637,7 +637,7 @@
DEFINE_INT_CURR("NOK") /* Norwegian Krone */ DEFINE_INT_CURR("NOK") /* Norwegian Krone */
DEFINE_INT_CURR("NPR") /* Nepalese Rupee */ DEFINE_INT_CURR("NPR") /* Nepalese Rupee */
DEFINE_INT_CURR("NZD") /* New Zealand Dollar */ DEFINE_INT_CURR("NZD") /* New Zealand Dollar */
@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK") /* Papau New Gui @@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK") /* Papau New Guinea Kina */
DEFINE_INT_CURR("PHP") /* Philippines Peso */ DEFINE_INT_CURR("PHP") /* Philippines Peso */
DEFINE_INT_CURR("PKR") /* Pakistan Rupee */ DEFINE_INT_CURR("PKR") /* Pakistan Rupee */
DEFINE_INT_CURR("PLN") /* Polish Zloty */ DEFINE_INT_CURR("PLN") /* Polish Zloty */
@ -645,9 +645,9 @@
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */ DEFINE_INT_CURR("ROL") /* Romanian Leu */
--- glibc-2.10-312-g2df4be8/locale/programs/locarchive.c --- glibc-2.10-318-gc2735e9/locale/programs/locarchive.c
+++ glibc-2.10.90-17/locale/programs/locarchive.c +++ glibc-2.10.90-18/locale/programs/locarchive.c
@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const vo @@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const void *b)
/* forward decls for below */ /* forward decls for below */
static uint32_t add_locale (struct locarhandle *ah, const char *name, static uint32_t add_locale (struct locarhandle *ah, const char *name,
locale_data_t data, bool replace); locale_data_t data, bool replace);
@ -678,9 +678,9 @@
add_alias (struct locarhandle *ah, const char *alias, bool replace, add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p) const char *oldname, uint32_t *locrec_offset_p)
{ {
--- glibc-2.10-312-g2df4be8/localedata/Makefile --- glibc-2.10-318-gc2735e9/localedata/Makefile
+++ glibc-2.10.90-17/localedata/Makefile +++ glibc-2.10.90-18/localedata/Makefile
@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo @@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
echo -n '...'; \ echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
$(LOCALEDEF) --alias-file=../intl/locale.alias \ $(LOCALEDEF) --alias-file=../intl/locale.alias \
@ -688,8 +688,8 @@
-i locales/$$input -c -f charmaps/$$charset \ -i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \ $(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \ echo ' done'; \
--- glibc-2.10-312-g2df4be8/localedata/SUPPORTED --- glibc-2.10-318-gc2735e9/localedata/SUPPORTED
+++ glibc-2.10.90-17/localedata/SUPPORTED +++ glibc-2.10.90-18/localedata/SUPPORTED
@@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \ cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \ da_DK.UTF-8/UTF-8 \
@ -731,9 +731,9 @@
ta_IN/UTF-8 \ ta_IN/UTF-8 \
te_IN/UTF-8 \ te_IN/UTF-8 \
tg_TJ.UTF-8/UTF-8 \ tg_TJ.UTF-8/UTF-8 \
--- glibc-2.10-312-g2df4be8/localedata/locales/cy_GB --- glibc-2.10-318-gc2735e9/localedata/locales/cy_GB
+++ glibc-2.10.90-17/localedata/locales/cy_GB +++ glibc-2.10.90-18/localedata/locales/cy_GB
@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061 @@ -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_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>" d_fmt "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"
t_fmt "<U0025><U0054>" t_fmt "<U0025><U0054>"
@ -747,9 +747,9 @@
END LC_TIME END LC_TIME
LC_MESSAGES LC_MESSAGES
--- glibc-2.10-312-g2df4be8/localedata/locales/en_GB --- glibc-2.10-318-gc2735e9/localedata/locales/en_GB
+++ glibc-2.10.90-17/localedata/locales/en_GB +++ glibc-2.10.90-18/localedata/locales/en_GB
@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075 @@ -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_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>" d_fmt "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
t_fmt "<U0025><U0054>" t_fmt "<U0025><U0054>"
@ -760,8 +760,8 @@
date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/ date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/ <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
<U0025><U005A><U0020><U0025><U0059>" <U0025><U005A><U0020><U0025><U0059>"
--- glibc-2.10-312-g2df4be8/localedata/locales/no_NO --- glibc-2.10-318-gc2735e9/localedata/locales/no_NO
+++ glibc-2.10.90-17/localedata/locales/no_NO +++ glibc-2.10.90-18/localedata/locales/no_NO
@@ -0,0 +1,69 @@ @@ -0,0 +1,69 @@
+escape_char / +escape_char /
+comment_char % +comment_char %
@ -832,8 +832,8 @@
+LC_ADDRESS +LC_ADDRESS
+copy "nb_NO" +copy "nb_NO"
+END LC_ADDRESS +END LC_ADDRESS
--- glibc-2.10-312-g2df4be8/localedata/locales/zh_TW --- glibc-2.10-318-gc2735e9/localedata/locales/zh_TW
+++ glibc-2.10.90-17/localedata/locales/zh_TW +++ glibc-2.10.90-18/localedata/locales/zh_TW
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
comment_char % comment_char %
escape_char / escape_char /
@ -861,8 +861,8 @@
revision "0.2" revision "0.2"
date "2000-08-02" date "2000-08-02"
% %
--- glibc-2.10-312-g2df4be8/malloc/mcheck.c --- glibc-2.10-318-gc2735e9/malloc/mcheck.c
+++ glibc-2.10.90-17/malloc/mcheck.c +++ glibc-2.10.90-18/malloc/mcheck.c
@@ -24,9 +24,25 @@ @@ -24,9 +24,25 @@
# include <mcheck.h> # include <mcheck.h>
# include <stdint.h> # include <stdint.h>
@ -889,7 +889,7 @@
/* Old hook values. */ /* Old hook values. */
static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t); static void (*old_free_hook) (__ptr_t ptr, __const __ptr_t);
static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t); static __ptr_t (*old_malloc_hook) (__malloc_size_t size, const __ptr_t);
@@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t cal @@ -197,7 +213,7 @@ freehook (__ptr_t ptr, const __ptr_t caller)
if (old_free_hook != NULL) if (old_free_hook != NULL)
(*old_free_hook) (ptr, caller); (*old_free_hook) (ptr, caller);
else else
@ -898,7 +898,7 @@
__free_hook = freehook; __free_hook = freehook;
} }
@@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const @@ -214,7 +230,7 @@ mallochook (__malloc_size_t size, const __ptr_t caller)
hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1, hdr = (struct hdr *) (*old_malloc_hook) (sizeof (struct hdr) + size + 1,
caller); caller);
else else
@ -907,7 +907,7 @@
__malloc_hook = mallochook; __malloc_hook = mallochook;
if (hdr == NULL) if (hdr == NULL)
return NULL; return NULL;
@@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment, @@ -245,7 +261,7 @@ memalignhook (__malloc_size_t alignment, __malloc_size_t size,
if (old_memalign_hook != NULL) if (old_memalign_hook != NULL)
block = (*old_memalign_hook) (alignment, slop + size + 1, caller); block = (*old_memalign_hook) (alignment, slop + size + 1, caller);
else else
@ -916,7 +916,7 @@
__memalign_hook = memalignhook; __memalign_hook = memalignhook;
if (block == NULL) if (block == NULL)
return NULL; return NULL;
@@ -300,8 +316,8 @@ reallochook (__ptr_t ptr, __malloc_size_ @@ -300,8 +316,8 @@ reallochook (__ptr_t ptr, __malloc_size_t size, const __ptr_t caller)
sizeof (struct hdr) + size + 1, sizeof (struct hdr) + size + 1,
caller); caller);
else else
@ -938,8 +938,8 @@
old_free_hook = __free_hook; old_free_hook = __free_hook;
__free_hook = freehook; __free_hook = freehook;
--- glibc-2.10-312-g2df4be8/manual/libc.texinfo --- glibc-2.10-318-gc2735e9/manual/libc.texinfo
+++ glibc-2.10.90-17/manual/libc.texinfo +++ glibc-2.10.90-18/manual/libc.texinfo
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
@c setchapternewpage odd @c setchapternewpage odd
@ -949,8 +949,8 @@
@direntry @direntry
* Libc: (libc). C library. * Libc: (libc). C library.
@end direntry @end direntry
--- glibc-2.10-312-g2df4be8/misc/sys/cdefs.h --- glibc-2.10-318-gc2735e9/misc/sys/cdefs.h
+++ glibc-2.10.90-17/misc/sys/cdefs.h +++ glibc-2.10.90-18/misc/sys/cdefs.h
@@ -132,7 +132,10 @@ @@ -132,7 +132,10 @@
#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
#define __bos0(ptr) __builtin_object_size (ptr, 0) #define __bos0(ptr) __builtin_object_size (ptr, 0)
@ -994,17 +994,17 @@
# define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack() __builtin_va_arg_pack ()
# define __va_arg_pack_len() __builtin_va_arg_pack_len () # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif #endif
--- glibc-2.10-312-g2df4be8/nis/nss --- glibc-2.10-318-gc2735e9/nis/nss
+++ glibc-2.10.90-17/nis/nss +++ glibc-2.10.90-18/nis/nss
@@ -25,4 +25,4 @@ @@ -25,4 +25,4 @@
# memory with every getXXent() call. Otherwise each getXXent() call # memory with every getXXent() call. Otherwise each getXXent() call
# might result into a network communication with the server to get # might result into a network communication with the server to get
# the next entry. # the next entry.
-#SETENT_BATCH_READ=TRUE -#SETENT_BATCH_READ=TRUE
+SETENT_BATCH_READ=TRUE +SETENT_BATCH_READ=TRUE
--- glibc-2.10-312-g2df4be8/nptl/ChangeLog --- glibc-2.10-318-gc2735e9/nptl/ChangeLog
+++ glibc-2.10.90-17/nptl/ChangeLog +++ glibc-2.10.90-18/nptl/ChangeLog
@@ -3700,6 +3700,15 @@ @@ -3705,6 +3705,15 @@
Use __sigfillset. Document that sigfillset does the right thing wrt Use __sigfillset. Document that sigfillset does the right thing wrt
to SIGSETXID. to SIGSETXID.
@ -1020,7 +1020,7 @@
2005-07-11 Jakub Jelinek <jakub@redhat.com> 2005-07-11 Jakub Jelinek <jakub@redhat.com>
[BZ #1102] [BZ #1102]
@@ -4436,6 +4445,11 @@ @@ -4441,6 +4450,11 @@
Move definition inside libpthread, libc, librt check. Provide Move definition inside libpthread, libc, librt check. Provide
definition for rtld. definition for rtld.
@ -1032,7 +1032,7 @@
2004-09-02 Ulrich Drepper <drepper@redhat.com> 2004-09-02 Ulrich Drepper <drepper@redhat.com>
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
@@ -6510,6 +6524,11 @@ @@ -6515,6 +6529,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
@ -1044,8 +1044,8 @@
2003-07-25 Jakub Jelinek <jakub@redhat.com> 2003-07-25 Jakub Jelinek <jakub@redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed. * tst-cancel17.c (do_test): Check if aio_cancel failed.
--- glibc-2.10-312-g2df4be8/nptl/Makefile --- glibc-2.10-318-gc2735e9/nptl/Makefile
+++ glibc-2.10.90-17/nptl/Makefile +++ glibc-2.10.90-18/nptl/Makefile
@@ -339,7 +339,8 @@ endif @@ -339,7 +339,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs) extra-objs += $(crti-objs) $(crtn-objs)
omit-deps += crti crtn omit-deps += crti crtn
@ -1078,8 +1078,8 @@
else else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif endif
--- glibc-2.10-312-g2df4be8/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h --- glibc-2.10-318-gc2735e9/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+++ glibc-2.10.90-17/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h +++ glibc-2.10.90-18/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
@@ -189,4 +189,7 @@ @@ -189,4 +189,7 @@
/* Typed memory objects are not available. */ /* Typed memory objects are not available. */
#define _POSIX_TYPED_MEMORY_OBJECTS -1 #define _POSIX_TYPED_MEMORY_OBJECTS -1
@ -1088,8 +1088,8 @@
+#define _XOPEN_STREAMS -1 +#define _XOPEN_STREAMS -1
+ +
#endif /* bits/posix_opt.h */ #endif /* bits/posix_opt.h */
--- glibc-2.10-312-g2df4be8/nptl/sysdeps/unix/sysv/linux/kernel-features.h --- glibc-2.10-318-gc2735e9/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+++ glibc-2.10.90-17/nptl/sysdeps/unix/sysv/linux/kernel-features.h +++ glibc-2.10.90-18/nptl/sysdeps/unix/sysv/linux/kernel-features.h
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
+#include_next <kernel-features.h> +#include_next <kernel-features.h>
+ +
@ -1097,8 +1097,8 @@
+#ifndef __ASSUME_CLONE_THREAD_FLAGS +#ifndef __ASSUME_CLONE_THREAD_FLAGS
+# define __ASSUME_CLONE_THREAD_FLAGS 1 +# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif +#endif
--- glibc-2.10-312-g2df4be8/nptl/tst-stackguard1.c --- glibc-2.10-318-gc2735e9/nptl/tst-stackguard1.c
+++ glibc-2.10.90-17/nptl/tst-stackguard1.c +++ glibc-2.10.90-18/nptl/tst-stackguard1.c
@@ -190,17 +190,21 @@ do_test (void) @@ -190,17 +190,21 @@ do_test (void)
the 16 runs, something is very wrong. */ the 16 runs, something is very wrong. */
int ndifferences = 0; int ndifferences = 0;
@ -1123,8 +1123,8 @@
{ {
puts ("stack guard canaries are not randomized enough"); puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value"); puts ("nor equal to the default canary value");
--- glibc-2.10-312-g2df4be8/nscd/nscd.conf --- glibc-2.10-318-gc2735e9/nscd/nscd.conf
+++ glibc-2.10.90-17/nscd/nscd.conf +++ glibc-2.10.90-18/nscd/nscd.conf
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
# logfile /var/log/nscd.log # logfile /var/log/nscd.log
# threads 4 # threads 4
@ -1134,8 +1134,8 @@
# stat-user somebody # stat-user somebody
debug-level 0 debug-level 0
# reload-count 5 # reload-count 5
--- glibc-2.10-312-g2df4be8/nscd/nscd.init --- glibc-2.10-318-gc2735e9/nscd/nscd.init
+++ glibc-2.10.90-17/nscd/nscd.init +++ glibc-2.10.90-18/nscd/nscd.init
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
# slow naming services like NIS, NIS+, LDAP, or hesiod. # slow naming services like NIS, NIS+, LDAP, or hesiod.
# processname: /usr/sbin/nscd # processname: /usr/sbin/nscd
@ -1192,9 +1192,9 @@
;; ;;
*) *)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
--- glibc-2.10-312-g2df4be8/posix/Makefile --- glibc-2.10-318-gc2735e9/posix/Makefile
+++ glibc-2.10.90-17/posix/Makefile +++ glibc-2.10.90-18/posix/Makefile
@@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi @@ -302,15 +302,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
mv -f $@/$$spec.new $@/$$spec; \ mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist done < $(objpfx)getconf.speclist
@ -1214,8 +1214,8 @@
+ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \ + | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
+ > $@.new + > $@.new
mv -f $@.new $@ mv -f $@.new $@
--- glibc-2.10-312-g2df4be8/posix/getconf.speclist.h --- glibc-2.10-318-gc2735e9/posix/getconf.speclist.h
+++ glibc-2.10.90-17/posix/getconf.speclist.h +++ glibc-2.10.90-18/posix/getconf.speclist.h
@@ -0,0 +1,39 @@ @@ -0,0 +1,39 @@
+#include <unistd.h> +#include <unistd.h>
+const char *START_OF_STRINGS = +const char *START_OF_STRINGS =
@ -1256,8 +1256,8 @@
+"XBS5_LPBIG_OFFBIG" +"XBS5_LPBIG_OFFBIG"
+#endif +#endif
+""; +"";
--- glibc-2.10-312-g2df4be8/streams/Makefile --- glibc-2.10-318-gc2735e9/streams/Makefile
+++ glibc-2.10.90-17/streams/Makefile +++ glibc-2.10.90-18/streams/Makefile
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
# #
subdir := streams subdir := streams
@ -1267,8 +1267,8 @@
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules include ../Rules
--- glibc-2.10-312-g2df4be8/sysdeps/generic/dl-cache.h --- glibc-2.10-318-gc2735e9/sysdeps/generic/dl-cache.h
+++ glibc-2.10.90-17/sysdeps/generic/dl-cache.h +++ glibc-2.10.90-18/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@ @@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir) # define add_system_dir(dir) add_dir (dir)
#endif #endif
@ -1284,8 +1284,8 @@
#define CACHEMAGIC "ld.so-1.7.0" #define CACHEMAGIC "ld.so-1.7.0"
/* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another /* libc5 and glibc 2.0/2.1 use the same format. For glibc 2.2 another
--- glibc-2.10-312-g2df4be8/sysdeps/i386/Makefile --- glibc-2.10-318-gc2735e9/sysdeps/i386/Makefile
+++ glibc-2.10.90-17/sysdeps/i386/Makefile +++ glibc-2.10.90-18/sysdeps/i386/Makefile
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
# Every i386 port in use uses gas syntax (I think). # Every i386 port in use uses gas syntax (I think).
asm-CPPFLAGS += -DGAS_SYNTAX asm-CPPFLAGS += -DGAS_SYNTAX
@ -1310,8 +1310,8 @@
endif endif
ifeq ($(subdir),elf) ifeq ($(subdir),elf)
--- glibc-2.10-312-g2df4be8/sysdeps/ia64/Makefile --- glibc-2.10-318-gc2735e9/sysdeps/ia64/Makefile
+++ glibc-2.10.90-17/sysdeps/ia64/Makefile +++ glibc-2.10.90-18/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
ifeq (yes,$(build-shared)) ifeq (yes,$(build-shared))
@ -1323,8 +1323,8 @@
endif endif
endif endif
--- glibc-2.10-312-g2df4be8/sysdeps/ia64/ia64libgcc.S --- glibc-2.10-318-gc2735e9/sysdeps/ia64/ia64libgcc.S
+++ glibc-2.10.90-17/sysdeps/ia64/ia64libgcc.S +++ glibc-2.10.90-18/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@ @@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
- alternative. */ - alternative. */
@ -1676,8 +1676,8 @@
- .symver ___multi3, __multi3@GLIBC_2.2 - .symver ___multi3, __multi3@GLIBC_2.2
- -
-#endif -#endif
--- glibc-2.10-312-g2df4be8/sysdeps/ia64/libgcc-compat.c --- glibc-2.10-318-gc2735e9/sysdeps/ia64/libgcc-compat.c
+++ glibc-2.10.90-17/sysdeps/ia64/libgcc-compat.c +++ glibc-2.10.90-18/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@ @@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility +/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002 Free Software Foundation, Inc.
@ -1763,8 +1763,8 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+ +
+#endif +#endif
--- glibc-2.10-312-g2df4be8/sysdeps/powerpc/powerpc64/Makefile --- glibc-2.10-318-gc2735e9/sysdeps/powerpc/powerpc64/Makefile
+++ glibc-2.10.90-17/sysdeps/powerpc/powerpc64/Makefile +++ glibc-2.10.90-18/sysdeps/powerpc/powerpc64/Makefile
@@ -30,6 +30,7 @@ ifneq ($(elf),no) @@ -30,6 +30,7 @@ ifneq ($(elf),no)
# we use -fpic instead which is much better. # we use -fpic instead which is much better.
CFLAGS-initfini.s += -fpic -O1 CFLAGS-initfini.s += -fpic -O1
@ -1773,8 +1773,8 @@
endif endif
ifeq ($(subdir),elf) ifeq ($(subdir),elf)
--- glibc-2.10-312-g2df4be8/sysdeps/unix/nice.c --- glibc-2.10-318-gc2735e9/sysdeps/unix/nice.c
+++ glibc-2.10.90-17/sysdeps/unix/nice.c +++ glibc-2.10.90-18/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr) @@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save); __set_errno (save);
} }
@ -1789,8 +1789,8 @@
if (result == -1) if (result == -1)
{ {
if (errno == EACCES) if (errno == EACCES)
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/check_pf.c --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/check_pf.c
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/check_pf.c +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@ @@ -27,13 +27,10 @@
#include <unistd.h> #include <unistd.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -1806,8 +1806,8 @@
#ifndef IFA_F_HOMEADDRESS #ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0 # define IFA_F_HOMEADDRESS 0
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/dl-osinfo.h --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/dl-osinfo.h
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/dl-osinfo.h +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/dl-osinfo.h
@@ -17,10 +17,13 @@ @@ -17,10 +17,13 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
@ -1822,7 +1822,7 @@
#ifndef MIN #ifndef MIN
# define MIN(a,b) (((a)<(b))?(a):(b)) # define MIN(a,b) (((a)<(b))?(a):(b))
@@ -80,6 +83,32 @@ _dl_setup_stack_chk_guard (void *dl_rand @@ -80,6 +83,32 @@ _dl_setup_stack_chk_guard (void *dl_random)
unsigned char *p = (unsigned char *) &ret; unsigned char *p = (unsigned char *) &ret;
p[sizeof (ret) - 1] = 255; p[sizeof (ret) - 1] = 255;
p[sizeof (ret) - 2] = '\n'; p[sizeof (ret) - 2] = '\n';
@ -1855,8 +1855,8 @@
} }
else else
#endif #endif
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/futimesat.c --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/futimesat.c
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/futimesat.c +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp) @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
{ {
int result; int result;
@ -1899,8 +1899,8 @@
{ {
size_t filelen = strlen (file); size_t filelen = strlen (file);
static const char procfd[] = "/proc/self/fd/%d/%s"; static const char procfd[] = "/proc/self/fd/%d/%s";
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/i386/clone.S --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/i386/clone.S
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/i386/clone.S +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/i386/clone.S
@@ -120,9 +120,6 @@ L(pseudo_end): @@ -120,9 +120,6 @@ L(pseudo_end):
ret ret
@ -1919,8 +1919,8 @@
cfi_startproc cfi_startproc
PSEUDO_END (BP_SYM (__clone)) PSEUDO_END (BP_SYM (__clone))
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/i386/dl-cache.h --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/i386/dl-cache.h
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/i386/dl-cache.h +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/i386/dl-cache.h
@@ -0,0 +1,59 @@ @@ -0,0 +1,59 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig. +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+ Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004 Free Software Foundation, Inc.
@ -1981,8 +1981,8 @@
+ } while (0) + } while (0)
+ +
+#include_next <dl-cache.h> +#include_next <dl-cache.h>
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-cache.h --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/dl-cache.h +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@ @@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \ #define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID) ((flags) == _DL_CACHE_DEFAULT_ID)
@ -2015,29 +2015,29 @@
+ } while (0) + } while (0)
+ +
#include_next <dl-cache.h> #include_next <dl-cache.h>
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig +#ifdef IS_IN_ldconfig
+#include <sysdeps/i386/dl-procinfo.c> +#include <sysdeps/i386/dl-procinfo.c>
+#else +#else
+#include <sysdeps/generic/dl-procinfo.c> +#include <sysdeps/generic/dl-procinfo.c>
+#endif +#endif
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
@@ -0,0 +1,5 @@ @@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig +#ifdef IS_IN_ldconfig
+#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h> +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
+#else +#else
+#include <sysdeps/generic/dl-procinfo.h> +#include <sysdeps/generic/dl-procinfo.h>
+#endif +#endif
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
@@ -1 +1 @@ @@ -1 +1 @@
-s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 \2\3"_ -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"_ +s_^\(RTLDLIST=\)\([^ ]*\)-ia64\(\.so\.[0-9.]*\)[ ]*$_\1"\2-ia64\3 /emul/ia32-linux\2\3"_
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/netlinkaccess.h --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/netlinkaccess.h
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/netlinkaccess.h +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/netlinkaccess.h
@@ -25,6 +25,24 @@ @@ -25,6 +25,24 @@
#include <kernel-features.h> #include <kernel-features.h>
@ -2063,8 +2063,8 @@
struct netlink_res struct netlink_res
{ {
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/paths.h --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/paths.h
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/paths.h +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/paths.h
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
#define _PATH_TTY "/dev/tty" #define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "/boot/vmlinux" #define _PATH_UNIX "/boot/vmlinux"
@ -2074,9 +2074,9 @@
#define _PATH_WTMP "/var/log/wtmp" #define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */ /* Provide trailing slash, since mostly used for building pathnames. */
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/tcsetattr.c --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/tcsetattr.c
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/tcsetattr.c +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/tcsetattr.c
@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
{ {
struct __kernel_termios k_termios; struct __kernel_termios k_termios;
unsigned long int cmd; unsigned long int cmd;
@ -2084,7 +2084,7 @@
switch (optional_actions) switch (optional_actions)
{ {
@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios @@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios_p)
memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0], memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
__KERNEL_NCCS * sizeof (cc_t)); __KERNEL_NCCS * sizeof (cc_t));
@ -2121,8 +2121,8 @@
+ return retval; + return retval;
} }
libc_hidden_def (tcsetattr) libc_hidden_def (tcsetattr)
--- glibc-2.10-312-g2df4be8/sysdeps/unix/sysv/linux/x86_64/clone.S --- glibc-2.10-318-gc2735e9/sysdeps/unix/sysv/linux/x86_64/clone.S
+++ glibc-2.10.90-17/sysdeps/unix/sysv/linux/x86_64/clone.S +++ glibc-2.10.90-18/sysdeps/unix/sysv/linux/x86_64/clone.S
@@ -89,9 +89,6 @@ L(pseudo_end): @@ -89,9 +89,6 @@ L(pseudo_end):
ret ret
@ -2141,8 +2141,8 @@
cfi_startproc; cfi_startproc;
PSEUDO_END (BP_SYM (__clone)) PSEUDO_END (BP_SYM (__clone))
--- glibc-2.10-312-g2df4be8/timezone/zic.c --- glibc-2.10-318-gc2735e9/timezone/zic.c
+++ glibc-2.10.90-17/timezone/zic.c +++ glibc-2.10.90-18/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int zonecount; @@ -1921,7 +1921,7 @@ const int zonecount;
if (stdrp != NULL && stdrp->r_hiyear == 2037) if (stdrp != NULL && stdrp->r_hiyear == 2037)
return; return;

10
glibc.spec
View File

@ -1,4 +1,4 @@
%define glibcsrcdir glibc-2.10-312-g2df4be8 %define glibcsrcdir glibc-2.10-318-gc2735e9
%define glibcversion 2.10.90 %define glibcversion 2.10.90
### glibc.spec.in follows: ### glibc.spec.in follows:
%define run_glibc_tests 1 %define run_glibc_tests 1
@ -24,7 +24,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 17 Release: 18
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs # Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@ -351,6 +351,7 @@ build_CFLAGS="$BuildFlags -g -O3 $*"
--enable-multi-arch \ --enable-multi-arch \
%endif %endif
--disable-profile --enable-experimental-malloc --enable-nss-crypt --disable-profile --enable-experimental-malloc --enable-nss-crypt
make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
cd .. cd ..
@ -1028,10 +1029,15 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Tue Sep 1 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-18
- Update from master.
- fix parse error in <bits/mathinline.h> (#520209).
* Thu Aug 27 2009 Roland McGrath <roland@redhat.com> - 2.10.90-17 * Thu Aug 27 2009 Roland McGrath <roland@redhat.com> - 2.10.90-17
- Update from master. - Update from master.
* Wed Aug 26 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-16 * Wed Aug 26 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-16
- Update from master.
- handle AVX saving on x86-64 in interrupted symbol lookups (#519081). - handle AVX saving on x86-64 in interrupted symbol lookups (#519081).
* Mon Aug 24 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-15 * Mon Aug 24 2009 Andreas Schwab <schwab@redhat.com> - 2.10.90-15

1
import.log
View File

@ -25,3 +25,4 @@ glibc-2_10_90-14:HEAD:glibc-2.10.90-14.src.rpm:1250516718
glibc-2_10_90-15:HEAD:glibc-2.10.90-15.src.rpm:1251105646 glibc-2_10_90-15:HEAD:glibc-2.10.90-15.src.rpm:1251105646
glibc-2_10_90-16:HEAD:glibc-2.10.90-16.src.rpm:1251288654 glibc-2_10_90-16:HEAD:glibc-2.10.90-16.src.rpm:1251288654
glibc-2_10_90-17:HEAD:glibc-2.10.90-17.src.rpm:1251406917 glibc-2_10_90-17:HEAD:glibc-2.10.90-17.src.rpm:1251406917
glibc-2_10_90-18:HEAD:glibc-2.10.90-18.src.rpm:1251802906

4
sources
View File

@ -1,2 +1,2 @@
e9d285d54d60e73798293d32abdabcf7 glibc-2.10-312-g2df4be8.tar.bz2 65209cf11136a0670e363757daaf02bb glibc-2.10-318-gc2735e9-fedora.tar.bz2
8dd0742bf8c3a90a22197c3e054c3271 glibc-2.10-312-g2df4be8-fedora.tar.bz2 c48e6a1a15bd51200059e92847ce8c60 glibc-2.10-318-gc2735e9.tar.bz2