rpms/glibc/devel .cvsignore, 1.270, 1.271 glibc-fedora.patch, 1.303, 1.304 glibc.spec, 1.393, 1.394 import.log, 1.14, 1.15 sources, 1.295, 1.296
Andreas Schwab
schwab at fedoraproject.org
Fri Jun 26 15:46:57 UTC 2009
Author: schwab
Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4444/devel
Modified Files:
.cvsignore glibc-fedora.patch glibc.spec import.log sources
Log Message:
2.10.90-1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -p -r1.270 -r1.271
--- .cvsignore 14 Apr 2009 21:28:24 -0000 1.270
+++ .cvsignore 26 Jun 2009 15:46:26 -0000 1.271
@@ -1,2 +1,2 @@
-glibc-20090414T2104.tar.bz2
-glibc-fedora-20090414T2104.tar.bz2
+glibc-2.10-125-g44d20bc-fedora.tar.bz2
+glibc-2.10-125-g44d20bc.tar.bz2
glibc-fedora.patch:
Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- glibc-fedora.patch 14 Apr 2009 21:28:25 -0000 1.303
+++ glibc-fedora.patch 26 Jun 2009 15:46:27 -0000 1.304
@@ -1,6 +1,20 @@
---- glibc-20090414T2104/ChangeLog 14 Apr 2009 20:57:17 -0000 1.11588
-+++ glibc-20090414T2104-fedora/ChangeLog 14 Apr 2009 21:18:54 -0000 1.8782.2.328
-@@ -7217,6 +7217,13 @@
+--- glibc-2.10-125-g44d20bc/ChangeLog
++++ glibc-2.10.90-1/ChangeLog
+@@ -1,3 +1,13 @@
++2009-06-26 Andreas Schwab <aschwab at redhat.com>
++
++ * timezone/zic.c (stringzone): Don't try to generate a POSIX TZ
++ string when the timezone ends in DST.
++
++ * sysdeps/powerpc/powerpc32/____longjmp_chk.S (CHECK_SP): Save lr
++ before call.
++ * sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP):
++ Likewise.
++
+ 2009-06-26 Ulrich Drepper <drepper at redhat.com>
+
+ * resolv/resolv.h: Define RES_SNGLKUPREOP.
+@@ -8396,6 +8406,13 @@
* include/sys/cdefs.h: Redefine __nonnull so that test for
incorrect parameters in the libc code itself are not omitted.
@@ -14,7 +28,7 @@
2007-05-09 Jakub Jelinek <jakub at redhat.com>
* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -7512,6 +7519,10 @@
+@@ -8691,6 +8708,10 @@
[BZ #4368]
* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
@@ -25,7 +39,7 @@
2007-04-16 Ulrich Drepper <drepper at redhat.com>
[BZ #4364]
-@@ -8769,6 +8780,15 @@
+@@ -9948,6 +9969,15 @@
separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3.
@@ -41,8 +55,8 @@
2006-12-09 Ulrich Drepper <drepper at redhat.com>
[BZ #3632]
---- glibc-20090414T2104/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1
-+++ glibc-20090414T2104-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3
+--- glibc-2.10-125-g44d20bc/ChangeLog.15
++++ glibc-2.10.90-1/ChangeLog.15
@@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek <jakub at redhat.com>
@@ -108,8 +122,8 @@
2004-08-30 Roland McGrath <roland at frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20090414T2104/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1
-+++ glibc-20090414T2104-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1
+--- glibc-2.10-125-g44d20bc/ChangeLog.16
++++ glibc-2.10.90-1/ChangeLog.16
@@ -171,6 +171,11 @@
[BZ #2611]
* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +295,8 @@
2005-02-10 Roland McGrath <roland at redhat.com>
[BZ #157]
---- glibc-20090414T2104/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79
-+++ glibc-20090414T2104-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6
+--- glibc-2.10-125-g44d20bc/csu/Makefile
++++ glibc-2.10.90-1/csu/Makefile
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
$(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,9 +307,9 @@
vpath initfini.c $(sysdirs)
---- glibc-20090414T2104/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8
-+++ glibc-20090414T2104-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6
-@@ -49,6 +49,23 @@ extern void (*__init_array_end []) (int,
+--- glibc-2.10-125-g44d20bc/csu/elf-init.c
++++ glibc-2.10.90-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;
@@ -319,8 +333,8 @@
/* These function symbols are provided for the .init/.fini section entry
points automagically by the linker. */
---- glibc-20090414T2104/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19
-+++ glibc-20090414T2104-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19
+--- glibc-2.10-125-g44d20bc/debug/tst-chk1.c
++++ glibc-2.10.90-1/debug/tst-chk1.c
@@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
@@ -349,8 +363,8 @@
# define O 0
# else
# define O 1
---- glibc-20090414T2104/elf/ldconfig.c 6 Feb 2009 20:09:33 -0000 1.65
-+++ glibc-20090414T2104-fedora/elf/ldconfig.c 18 Feb 2009 15:49:28 -0000 1.47.2.20
+--- glibc-2.10-125-g44d20bc/elf/ldconfig.c
++++ glibc-2.10.90-1/elf/ldconfig.c
@@ -1020,17 +1020,19 @@ search_dirs (void)
@@ -373,7 +387,7 @@
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;
while ((dir = strsep (&cp, " \t")) != NULL)
if (dir[0] != '\0')
@@ -389,7 +403,7 @@
}
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. */
static void
parse_conf_include (const char *config_file, unsigned int lineno,
@@ -398,7 +412,7 @@
{
if (opt_chroot && pattern[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:
for (size_t i = 0; i < gl.gl_pathc; ++i)
@@ -432,8 +446,8 @@
}
if (! opt_ignore_aux_cache)
---- glibc-20090414T2104/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1
-+++ glibc-20090414T2104-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3
+--- glibc-2.10-125-g44d20bc/elf/tst-stackguard1.c
++++ glibc-2.10.90-1/elf/tst-stackguard1.c
@@ -160,17 +160,21 @@ do_test (void)
the 16 runs, something is very wrong. */
int ndifferences = 0;
@@ -458,9 +472,17 @@
{
puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value");
---- glibc-20090414T2104/include/features.h 26 Feb 2009 01:43:33 -0000 1.53
-+++ glibc-20090414T2104-fedora/include/features.h 9 Mar 2009 14:35:16 -0000 1.35.2.22
-@@ -297,8 +297,13 @@
+--- glibc-2.10-125-g44d20bc/include/bits/stdlib-ldbl.h
++++ glibc-2.10.90-1/include/bits/stdlib-ldbl.h
+@@ -0,0 +1 @@
++#include <stdlib/bits/stdlib-ldbl.h>
+--- glibc-2.10-125-g44d20bc/include/bits/wchar-ldbl.h
++++ glibc-2.10.90-1/include/bits/wchar-ldbl.h
+@@ -0,0 +1 @@
++#include <wcsmbs/bits/wchar-ldbl.h>
+--- glibc-2.10-125-g44d20bc/include/features.h
++++ glibc-2.10.90-1/include/features.h
+@@ -299,8 +299,13 @@
#endif
#if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \
@@ -476,16 +498,8 @@
# define __USE_FORTIFY_LEVEL 2
# else
# define __USE_FORTIFY_LEVEL 1
---- glibc-20090414T2104/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1
-@@ -0,0 +1 @@
-+#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-20090414T2104/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1
-@@ -0,0 +1 @@
-+#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-20090414T2104/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24
-+++ glibc-20090414T2104-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2
+--- glibc-2.10-125-g44d20bc/intl/locale.alias
++++ glibc-2.10.90-1/intl/locale.alias
@@ -57,8 +57,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR
@@ -495,8 +509,8 @@
norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
---- glibc-20090414T2104/libio/stdio.h 26 Feb 2009 15:43:58 -0000 1.94
-+++ glibc-20090414T2104-fedora/libio/stdio.h 9 Mar 2009 14:35:17 -0000 1.78.2.15
+--- glibc-2.10-125-g44d20bc/libio/stdio.h
++++ glibc-2.10.90-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. */
@@ -510,8 +524,8 @@
__BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */
---- glibc-20090414T2104/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20
-+++ glibc-20090414T2104-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5
+--- glibc-2.10-125-g44d20bc/locale/iso-4217.def
++++ glibc-2.10.90-1/locale/iso-4217.def
@@ -8,6 +8,7 @@
*
* !!! The list has to be sorted !!!
@@ -520,7 +534,7 @@
DEFINE_INT_CURR("AED") /* United Arab Emirates Dirham */
DEFINE_INT_CURR("AFN") /* Afghanistan Afgani */
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("AOA") /* Angolan Kwanza */
DEFINE_INT_CURR("ARS") /* Argentine Peso */
@@ -535,7 +549,7 @@
DEFINE_INT_CURR("BGN") /* Bulgarian Lev */
DEFINE_INT_CURR("BHD") /* Bahraini Dinar */
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("CYP") /* Cypriot Pound */
DEFINE_INT_CURR("CZK") /* Czech Koruna */
@@ -543,7 +557,7 @@
DEFINE_INT_CURR("DJF") /* Djibouti Franc */
DEFINE_INT_CURR("DKK") /* Danish Krone (Faroe Islands, Greenland) */
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("EGP") /* Egyptian Pound */
DEFINE_INT_CURR("ERN") /* Eritrean Nakfa */
@@ -564,7 +578,7 @@
DEFINE_INT_CURR("GTQ") /* Guatemala Quetzal */
DEFINE_INT_CURR("GYD") /* Guyana 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("HUF") /* Hungarian Forint */
DEFINE_INT_CURR("IDR") /* Indonesia Rupiah */
@@ -579,7 +593,7 @@
DEFINE_INT_CURR("JEP") /* Jersey Pound */
DEFINE_INT_CURR("JMD") /* Jamaican Dollar */
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("LSL") /* Lesotho Maloti */
DEFINE_INT_CURR("LTL") /* Lithuanian Litas */
@@ -587,7 +601,7 @@
DEFINE_INT_CURR("LVL") /* Latvia Lat */
DEFINE_INT_CURR("LYD") /* Libyan Arab Jamahiriya Dinar */
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("NGN") /* Nigeria Naira */
DEFINE_INT_CURR("NIO") /* Nicaragua Cordoba Oro */
@@ -595,7 +609,7 @@
DEFINE_INT_CURR("NOK") /* Norwegian Krone */
DEFINE_INT_CURR("NPR") /* Nepalese Rupee */
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("PKR") /* Pakistan Rupee */
DEFINE_INT_CURR("PLN") /* Polish Zloty */
@@ -603,9 +617,9 @@
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */
---- glibc-20090414T2104/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25
-+++ glibc-20090414T2104-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4
-@@ -222,9 +222,9 @@ oldlocrecentcmp (const void *a, const vo
+--- glibc-2.10-125-g44d20bc/locale/programs/locarchive.c
++++ glibc-2.10.90-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,
locale_data_t data, bool replace);
@@ -616,9 +630,9 @@
+ bool replace, const char *oldname,
+ uint32_t *locrec_offset_p);
- static void
- enlarge_archive (struct locarhandle *ah, const struct locarhead *head)
-@@ -542,7 +542,7 @@ close_archive (struct locarhandle *ah)
+
+ static bool
+@@ -649,7 +649,7 @@ close_archive (struct locarhandle *ah)
#include "../../intl/explodename.c"
#include "../../intl/l10nflist.c"
@@ -627,7 +641,7 @@
insert_name (struct locarhandle *ah,
const char *name, size_t name_len, bool replace)
{
-@@ -600,7 +600,7 @@ insert_name (struct locarhandle *ah,
+@@ -707,7 +707,7 @@ insert_name (struct locarhandle *ah,
return &namehashtab[idx];
}
@@ -636,9 +650,9 @@
add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p)
{
---- glibc-20090414T2104/localedata/Makefile 7 Feb 2009 05:28:00 -0000 1.110
-+++ glibc-20090414T2104-fedora/localedata/Makefile 18 Feb 2009 15:49:33 -0000 1.101.2.10
-@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
+--- glibc-2.10-125-g44d20bc/localedata/Makefile
++++ glibc-2.10.90-1/localedata/Makefile
+@@ -225,6 +225,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
$(LOCALEDEF) --alias-file=../intl/locale.alias \
@@ -646,8 +660,8 @@
-i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \
---- glibc-20090414T2104/localedata/SUPPORTED 14 Mar 2009 18:33:15 -0000 1.116
-+++ glibc-20090414T2104-fedora/localedata/SUPPORTED 20 Mar 2009 20:00:15 -0000 1.71.2.24
+--- glibc-2.10-125-g44d20bc/localedata/SUPPORTED
++++ glibc-2.10.90-1/localedata/SUPPORTED
@@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \
@@ -656,7 +670,7 @@
de_AT.UTF-8/UTF-8 \
de_AT/ISO-8859-1 \
de_AT at euro/ISO-8859-15 \
-@@ -114,6 +115,7 @@ en_DK.UTF-8/UTF-8 \
+@@ -115,6 +116,7 @@ en_DK.UTF-8/UTF-8 \
en_DK/ISO-8859-1 \
en_GB.UTF-8/UTF-8 \
en_GB/ISO-8859-1 \
@@ -664,7 +678,7 @@
en_HK.UTF-8/UTF-8 \
en_HK/ISO-8859-1 \
en_IE.UTF-8/UTF-8 \
-@@ -129,6 +131,7 @@ en_SG.UTF-8/UTF-8 \
+@@ -130,6 +132,7 @@ en_SG.UTF-8/UTF-8 \
en_SG/ISO-8859-1 \
en_US.UTF-8/UTF-8 \
en_US/ISO-8859-1 \
@@ -672,7 +686,7 @@
en_ZA.UTF-8/UTF-8 \
en_ZA/ISO-8859-1 \
en_ZW.UTF-8/UTF-8 \
-@@ -302,6 +305,8 @@ nl_NL/ISO-8859-1 \
+@@ -304,6 +307,8 @@ nl_NL/ISO-8859-1 \
nl_NL at euro/ISO-8859-15 \
nn_NO.UTF-8/UTF-8 \
nn_NO/ISO-8859-1 \
@@ -681,7 +695,7 @@
nr_ZA/UTF-8 \
nso_ZA/UTF-8 \
oc_FR.UTF-8/UTF-8 \
-@@ -360,6 +365,7 @@ sv_FI/ISO-8859-1 \
+@@ -362,6 +367,7 @@ sv_FI/ISO-8859-1 \
sv_FI at euro/ISO-8859-15 \
sv_SE.UTF-8/UTF-8 \
sv_SE/ISO-8859-1 \
@@ -689,9 +703,9 @@
ta_IN/UTF-8 \
te_IN/UTF-8 \
tg_TJ.UTF-8/UTF-8 \
---- glibc-20090414T2104/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4
-+++ glibc-20090414T2104-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2
-@@ -248,8 +248,11 @@ mon "<U0049><U006F><U006E><U0061
+--- glibc-2.10-125-g44d20bc/localedata/locales/cy_GB
++++ glibc-2.10.90-1/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>"
t_fmt "<U0025><U0054>"
@@ -705,9 +719,9 @@
END LC_TIME
LC_MESSAGES
---- glibc-20090414T2104/localedata/locales/en_GB 31 Oct 2008 19:00:57 -0000 1.18
-+++ glibc-20090414T2104-fedora/localedata/locales/en_GB 31 Oct 2008 21:33:57 -0000 1.10.2.7
-@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075
+--- glibc-2.10-125-g44d20bc/localedata/locales/en_GB
++++ glibc-2.10.90-1/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>"
t_fmt "<U0025><U0054>"
@@ -718,8 +732,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-20090414T2104/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1
+--- glibc-2.10-125-g44d20bc/localedata/locales/no_NO
++++ glibc-2.10.90-1/localedata/locales/no_NO
@@ -0,0 +1,69 @@
+escape_char /
+comment_char %
@@ -790,8 +804,8 @@
+LC_ADDRESS
+copy "nb_NO"
+END LC_ADDRESS
---- glibc-20090414T2104/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7
-+++ glibc-20090414T2104-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2
+--- glibc-2.10-125-g44d20bc/localedata/locales/zh_TW
++++ glibc-2.10.90-1/localedata/locales/zh_TW
@@ -1,7 +1,7 @@
comment_char %
escape_char /
@@ -819,8 +833,8 @@
revision "0.2"
date "2000-08-02"
%
---- glibc-20090414T2104/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20
-+++ glibc-20090414T2104-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2
+--- glibc-2.10-125-g44d20bc/malloc/mcheck.c
++++ glibc-2.10.90-1/malloc/mcheck.c
@@ -24,9 +24,25 @@
# include <mcheck.h>
# include <stdint.h>
@@ -847,7 +861,7 @@
/* Old hook values. */
static void (*old_free_hook) (__ptr_t ptr, __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)
(*old_free_hook) (ptr, caller);
else
@@ -856,7 +870,7 @@
__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,
caller);
else
@@ -865,7 +879,7 @@
__malloc_hook = mallochook;
if (hdr == 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)
block = (*old_memalign_hook) (alignment, slop + size + 1, caller);
else
@@ -874,7 +888,7 @@
__memalign_hook = memalignhook;
if (block == 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,
caller);
else
@@ -896,8 +910,8 @@
old_free_hook = __free_hook;
__free_hook = freehook;
---- glibc-20090414T2104/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98
-+++ glibc-20090414T2104-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4
+--- glibc-2.10-125-g44d20bc/manual/libc.texinfo
++++ glibc-2.10.90-1/manual/libc.texinfo
@@ -5,7 +5,7 @@
@c setchapternewpage odd
@@ -907,8 +921,8 @@
@direntry
* Libc: (libc). C library.
@end direntry
---- glibc-20090414T2104/misc/sys/cdefs.h 2 Mar 2009 15:56:03 -0000 1.74
-+++ glibc-20090414T2104-fedora/misc/sys/cdefs.h 9 Mar 2009 14:35:17 -0000 1.58.2.11
+--- glibc-2.10-125-g44d20bc/misc/sys/cdefs.h
++++ glibc-2.10.90-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)
@@ -952,17 +966,17 @@
# define __va_arg_pack() __builtin_va_arg_pack ()
# define __va_arg_pack_len() __builtin_va_arg_pack_len ()
#endif
---- glibc-20090414T2104/nis/nss 28 Apr 2006 21:02:23 -0000 1.3
-+++ glibc-20090414T2104-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2
+--- glibc-2.10-125-g44d20bc/nis/nss
++++ glibc-2.10.90-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-20090414T2104/nptl/ChangeLog 15 Mar 2009 09:03:38 -0000 1.1109
-+++ glibc-20090414T2104-fedora/nptl/ChangeLog 20 Mar 2009 20:00:16 -0000 1.706.2.170
-@@ -3449,6 +3449,15 @@
+--- glibc-2.10-125-g44d20bc/nptl/ChangeLog
++++ glibc-2.10.90-1/nptl/ChangeLog
+@@ -3524,6 +3524,15 @@
Use __sigfillset. Document that sigfillset does the right thing wrt
to SIGSETXID.
@@ -978,7 +992,7 @@
2005-07-11 Jakub Jelinek <jakub at redhat.com>
[BZ #1102]
-@@ -4185,6 +4194,11 @@
+@@ -4260,6 +4269,11 @@
Move definition inside libpthread, libc, librt check. Provide
definition for rtld.
@@ -990,7 +1004,7 @@
2004-09-02 Ulrich Drepper <drepper at redhat.com>
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6259,6 +6273,11 @@
+@@ -6334,6 +6348,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
@@ -1002,8 +1016,8 @@
2003-07-25 Jakub Jelinek <jakub at redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20090414T2104/nptl/Makefile 12 Nov 2008 13:38:23 -0000 1.195
-+++ glibc-20090414T2104-fedora/nptl/Makefile 12 Nov 2008 20:29:34 -0000 1.157.2.37
+--- glibc-2.10-125-g44d20bc/nptl/Makefile
++++ glibc-2.10.90-1/nptl/Makefile
@@ -339,7 +339,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs)
omit-deps += crti crtn
@@ -1036,8 +1050,27 @@
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif
---- glibc-20090414T2104/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1
-+++ glibc-20090414T2104-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3
+--- glibc-2.10-125-g44d20bc/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.10.90-1/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+@@ -187,4 +187,7 @@
+ /* Typed memory objects are not available. */
+ #define _POSIX_TYPED_MEMORY_OBJECTS -1
+
++/* Streams are not available. */
++#define _XOPEN_STREAMS -1
++
+ #endif /* bits/posix_opt.h */
+--- glibc-2.10-125-g44d20bc/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.10.90-1/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+@@ -0,0 +1,6 @@
++#include_next <kernel-features.h>
++
++/* NPTL can always assume all clone thread flags work. */
++#ifndef __ASSUME_CLONE_THREAD_FLAGS
++# define __ASSUME_CLONE_THREAD_FLAGS 1
++#endif
+--- glibc-2.10-125-g44d20bc/nptl/tst-stackguard1.c
++++ glibc-2.10.90-1/nptl/tst-stackguard1.c
@@ -190,17 +190,21 @@ do_test (void)
the 16 runs, something is very wrong. */
int ndifferences = 0;
@@ -1062,27 +1095,8 @@
{
puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value");
---- glibc-20090414T2104/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1
-@@ -0,0 +1,6 @@
-+#include_next <kernel-features.h>
-+
-+/* NPTL can always assume all clone thread flags work. */
-+#ifndef __ASSUME_CLONE_THREAD_FLAGS
-+# define __ASSUME_CLONE_THREAD_FLAGS 1
-+#endif
---- glibc-20090414T2104/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 26 Feb 2009 16:22:45 -0000 1.18
-+++ glibc-20090414T2104-fedora/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h 9 Mar 2009 14:35:18 -0000 1.8.2.10
-@@ -187,4 +187,7 @@
- /* Typed memory objects are not available. */
- #define _POSIX_TYPED_MEMORY_OBJECTS -1
-
-+/* Streams are not available. */
-+#define _XOPEN_STREAMS -1
-+
- #endif /* bits/posix_opt.h */
---- glibc-20090414T2104/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16
-+++ glibc-20090414T2104-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7
+--- glibc-2.10-125-g44d20bc/nscd/nscd.conf
++++ glibc-2.10.90-1/nscd/nscd.conf
@@ -33,7 +33,7 @@
# logfile /var/log/nscd.log
# threads 4
@@ -1092,8 +1106,8 @@
# stat-user somebody
debug-level 0
# reload-count 5
---- glibc-20090414T2104/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10
-+++ glibc-20090414T2104-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6
+--- glibc-2.10-125-g44d20bc/nscd/nscd.init
++++ glibc-2.10.90-1/nscd/nscd.init
@@ -9,6 +9,7 @@
# slow naming services like NIS, NIS+, LDAP, or hesiod.
# processname: /usr/sbin/nscd
@@ -1150,9 +1164,9 @@
;;
*)
echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-20090414T2104/posix/Makefile 7 Feb 2009 08:18:49 -0000 1.204
-+++ glibc-20090414T2104-fedora/posix/Makefile 18 Feb 2009 15:49:37 -0000 1.171.2.28
-@@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
+--- glibc-2.10-125-g44d20bc/posix/Makefile
++++ glibc-2.10.90-1/posix/Makefile
+@@ -301,15 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist
@@ -1172,8 +1186,8 @@
+ | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
+ > $@.new
mv -f $@.new $@
---- glibc-20090414T2104/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/posix/getconf.speclist.h 18 Feb 2009 16:47:01 -0000 1.1.2.3
+--- glibc-2.10-125-g44d20bc/posix/getconf.speclist.h
++++ glibc-2.10.90-1/posix/getconf.speclist.h
@@ -0,0 +1,39 @@
+#include <unistd.h>
+const char *START_OF_STRINGS =
@@ -1214,8 +1228,8 @@
+"XBS5_LPBIG_OFFBIG"
+#endif
+"";
---- glibc-20090414T2104/streams/Makefile 23 Oct 2002 23:48:41 -0000 1.4
-+++ glibc-20090414T2104-fedora/streams/Makefile 14 Mar 2008 22:36:46 -0000 1.4.2.1
+--- glibc-2.10-125-g44d20bc/streams/Makefile
++++ glibc-2.10.90-1/streams/Makefile
@@ -21,7 +21,7 @@
#
subdir := streams
@@ -1225,8 +1239,8 @@
routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach
include ../Rules
---- glibc-20090414T2104/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13
-+++ glibc-20090414T2104-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1
+--- glibc-2.10-125-g44d20bc/sysdeps/generic/dl-cache.h
++++ glibc-2.10.90-1/sysdeps/generic/dl-cache.h
@@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir)
#endif
@@ -1242,8 +1256,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-20090414T2104/sysdeps/i386/Makefile 13 May 2008 05:30:43 -0000 1.21
-+++ glibc-20090414T2104-fedora/sysdeps/i386/Makefile 15 May 2008 07:57:47 -0000 1.16.2.5
+--- glibc-2.10-125-g44d20bc/sysdeps/i386/Makefile
++++ glibc-2.10.90-1/sysdeps/i386/Makefile
@@ -64,6 +64,14 @@ endif
ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1259,8 +1273,8 @@
endif
ifeq ($(subdir),elf)
---- glibc-20090414T2104/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10
-+++ glibc-20090414T2104-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1
+--- glibc-2.10-125-g44d20bc/sysdeps/ia64/Makefile
++++ glibc-2.10.90-1/sysdeps/ia64/Makefile
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
ifeq (yes,$(build-shared))
@@ -1272,8 +1286,8 @@
endif
endif
---- glibc-20090414T2104/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2
-+++ glibc-20090414T2104-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1
+--- glibc-2.10-125-g44d20bc/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.10.90-1/sysdeps/ia64/ia64libgcc.S
@@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency
- alternative. */
@@ -1625,8 +1639,8 @@
- .symver ___multi3, __multi3 at GLIBC_2.2
-
-#endif
---- glibc-20090414T2104/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1
+--- glibc-2.10-125-g44d20bc/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.10.90-1/sysdeps/ia64/libgcc-compat.c
@@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1712,8 +1726,27 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+
+#endif
---- glibc-20090414T2104/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8
-+++ glibc-20090414T2104-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5
+--- glibc-2.10-125-g44d20bc/sysdeps/powerpc/powerpc32/____longjmp_chk.S
++++ glibc-2.10.90-1/sysdeps/powerpc/powerpc32/____longjmp_chk.S
+@@ -49,8 +49,16 @@
+ #define CHECK_SP(reg) \
+ cmplw reg, r1; \
+ bge+ .Lok; \
++ cfi_remember_state; \
++ mflr r0; \
++ stwu r1,-16(r1); \
++ cfi_adjust_cfa_offset (16); \
++ stw r0,20(r1); \
++ cfi_offset (lr, 4); \
+ LOAD_ARG; \
+ bl HIDDEN_JUMPTARGET (__fortify_fail); \
++ nop; \
++ cfi_restore_state; \
+ .Lok:
+
+ #include <__longjmp-common.S>
+--- glibc-2.10-125-g44d20bc/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.10.90-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
@@ -1722,8 +1755,27 @@
endif
ifeq ($(subdir),elf)
---- glibc-20090414T2104/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7
-+++ glibc-20090414T2104-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2
+--- glibc-2.10-125-g44d20bc/sysdeps/powerpc/powerpc64/____longjmp_chk.S
++++ glibc-2.10.90-1/sysdeps/powerpc/powerpc64/____longjmp_chk.S
+@@ -32,8 +32,16 @@
+ #define CHECK_SP(reg) \
+ cmpld reg, r1; \
+ bge+ .Lok; \
++ cfi_remember_state; \
++ mflr r0; \
++ std r0,16(r1); \
++ stdu r1,-112(r1); \
++ cfi_adjust_cfa_offset (112); \
++ cfi_offset (lr, 16); \
+ ld r3,.LC1 at toc(2); \
+ bl HIDDEN_JUMPTARGET (__fortify_fail); \
++ nop; \
++ cfi_restore_state; \
+ .Lok:
+
+ #include <__longjmp-common.S>
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/nice.c
++++ glibc-2.10.90-1/sysdeps/unix/nice.c
@@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save);
}
@@ -1738,8 +1790,8 @@
if (result == -1)
{
if (errno == EACCES)
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.10.90-1/sysdeps/unix/sysv/linux/check_pf.c
@@ -27,13 +27,10 @@
#include <unistd.h>
#include <sys/socket.h>
@@ -1755,8 +1807,8 @@
#ifndef IFA_F_HOMEADDRESS
# define IFA_F_HOMEADDRESS 0
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/dl-osinfo.h 11 Jan 2009 04:42:04 -0000 1.29
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 4 Feb 2009 22:36:00 -0000 1.14.2.15
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.10.90-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. */
@@ -1771,7 +1823,7 @@
#ifndef MIN
# 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;
p[sizeof (ret) - 1] = 255;
p[sizeof (ret) - 2] = '\n';
@@ -1804,8 +1856,8 @@
}
else
#endif
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.10.90-1/sysdeps/unix/sysv/linux/futimesat.c
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
{
int result;
@@ -1848,93 +1900,8 @@
{
size_t filelen = strlen (file);
static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3
-@@ -25,6 +25,24 @@
-
- #include <kernel-features.h>
-
-+#ifndef IFA_MAX
-+/* 2.6.19 kernel headers helpfully removed some macros and
-+ moved lots of stuff into new headers, some of which aren't
-+ included by linux/rtnetlink.h. */
-+#include <linux/if_addr.h>
-+#endif
-+
-+#ifndef IFA_RTA
-+# define IFA_RTA(r) \
-+ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifaddrmsg))))
-+# define IFA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifaddrmsg))
-+#endif
-+
-+#ifndef IFLA_RTA
-+# define IFLA_RTA(r) \
-+ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifinfomsg))))
-+# define IFLA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifinfomsg))
-+#endif
-
- struct netlink_res
- {
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1
-@@ -61,7 +61,7 @@
- #define _PATH_TTY "/dev/tty"
- #define _PATH_UNIX "/boot/vmlinux"
- #define _PATH_UTMP "/var/run/utmp"
--#define _PATH_VI "/usr/bin/vi"
-+#define _PATH_VI "/bin/vi"
- #define _PATH_WTMP "/var/log/wtmp"
-
- /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1
-@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
- {
- struct __kernel_termios k_termios;
- unsigned long int cmd;
-+ int retval;
-
- switch (optional_actions)
- {
-@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios
- memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
- __KERNEL_NCCS * sizeof (cc_t));
-
-- return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
-+ retval = INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
-+
-+ if (retval == 0 && cmd == TCSETS)
-+ {
-+ /* The Linux kernel has a bug which silently ignore the invalid
-+ c_cflag on pty. We have to check it here. */
-+ int save = errno;
-+ retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
-+ if (retval)
-+ {
-+ /* We cannot verify if the setting is ok. We don't return
-+ an error (?). */
-+ __set_errno (save);
-+ retval = 0;
-+ }
-+ else if ((termios_p->c_cflag & (PARENB | CREAD))
-+ != (k_termios.c_cflag & (PARENB | CREAD))
-+ || ((termios_p->c_cflag & CSIZE)
-+ && ((termios_p->c_cflag & CSIZE)
-+ != (k_termios.c_cflag & CSIZE))))
-+ {
-+ /* It looks like the Linux kernel silently changed the
-+ PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
-+ error. */
-+ __set_errno (EINVAL);
-+ retval = -1;
-+ }
-+ }
-+
-+ return retval;
- }
- libc_hidden_def (tcsetattr)
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/i386/clone.S
++++ glibc-2.10.90-1/sysdeps/unix/sysv/linux/i386/clone.S
@@ -120,9 +120,6 @@ L(pseudo_end):
ret
@@ -1953,8 +1920,8 @@
cfi_startproc
PSEUDO_END (BP_SYM (__clone))
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.10.90-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.
@@ -2015,8 +1982,8 @@
+ } while (0)
+
+#include_next <dl-cache.h>
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.10.90-1/sysdeps/unix/sysv/linux/ia64/dl-cache.h
@@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2049,29 +2016,114 @@
+ } while (0)
+
#include_next <dl-cache.h>
---- glibc-20090414T2104/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.10.90-1/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-20090414T2104/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.10.90-1/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-20090414T2104/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.10.90-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-20090414T2104/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7
-+++ glibc-20090414T2104-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.10.90-1/sysdeps/unix/sysv/linux/netlinkaccess.h
+@@ -25,6 +25,24 @@
+
+ #include <kernel-features.h>
+
++#ifndef IFA_MAX
++/* 2.6.19 kernel headers helpfully removed some macros and
++ moved lots of stuff into new headers, some of which aren't
++ included by linux/rtnetlink.h. */
++#include <linux/if_addr.h>
++#endif
++
++#ifndef IFA_RTA
++# define IFA_RTA(r) \
++ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifaddrmsg))))
++# define IFA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifaddrmsg))
++#endif
++
++#ifndef IFLA_RTA
++# define IFLA_RTA(r) \
++ ((struct rtattr*) ((char*)(r) + NLMSG_ALIGN (sizeof (struct ifinfomsg))))
++# define IFLA_PAYLOAD(n) NLMSG_PAYLOAD (n, sizeof (struct ifinfomsg))
++#endif
+
+ struct netlink_res
+ {
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.10.90-1/sysdeps/unix/sysv/linux/paths.h
+@@ -62,7 +62,7 @@
+ #define _PATH_TTY "/dev/tty"
+ #define _PATH_UNIX "/boot/vmlinux"
+ #define _PATH_UTMP "/var/run/utmp"
+-#define _PATH_VI "/usr/bin/vi"
++#define _PATH_VI "/bin/vi"
+ #define _PATH_WTMP "/var/log/wtmp"
+
+ /* Provide trailing slash, since mostly used for building pathnames. */
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.10.90-1/sysdeps/unix/sysv/linux/tcsetattr.c
+@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
+ {
+ struct __kernel_termios k_termios;
+ unsigned long int cmd;
++ int retval;
+
+ switch (optional_actions)
+ {
+@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios_p)
+ memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
+ __KERNEL_NCCS * sizeof (cc_t));
+
+- return INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
++ retval = INLINE_SYSCALL (ioctl, 3, fd, cmd, &k_termios);
++
++ if (retval == 0 && cmd == TCSETS)
++ {
++ /* The Linux kernel has a bug which silently ignore the invalid
++ c_cflag on pty. We have to check it here. */
++ int save = errno;
++ retval = INLINE_SYSCALL (ioctl, 3, fd, TCGETS, &k_termios);
++ if (retval)
++ {
++ /* We cannot verify if the setting is ok. We don't return
++ an error (?). */
++ __set_errno (save);
++ retval = 0;
++ }
++ else if ((termios_p->c_cflag & (PARENB | CREAD))
++ != (k_termios.c_cflag & (PARENB | CREAD))
++ || ((termios_p->c_cflag & CSIZE)
++ && ((termios_p->c_cflag & CSIZE)
++ != (k_termios.c_cflag & CSIZE))))
++ {
++ /* It looks like the Linux kernel silently changed the
++ PARENB/CREAD/CSIZE bits in c_cflag. Report it as an
++ error. */
++ __set_errno (EINVAL);
++ retval = -1;
++ }
++ }
++
++ return retval;
+ }
+ libc_hidden_def (tcsetattr)
+--- glibc-2.10-125-g44d20bc/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ glibc-2.10.90-1/sysdeps/unix/sysv/linux/x86_64/clone.S
@@ -89,9 +89,6 @@ L(pseudo_end):
ret
@@ -2090,3 +2142,14 @@
cfi_startproc;
PSEUDO_END (BP_SYM (__clone))
+--- glibc-2.10-125-g44d20bc/timezone/zic.c
++++ glibc-2.10.90-1/timezone/zic.c
+@@ -1921,7 +1921,7 @@ const int zonecount;
+ if (stdrp != NULL && stdrp->r_hiyear == 2037)
+ return;
+ }
+- if (stdrp == NULL && zp->z_nrules != 0)
++ if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0))
+ return;
+ abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
+ doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);
Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.393
retrieving revision 1.394
diff -u -p -r1.393 -r1.394
--- glibc.spec 14 Apr 2009 21:28:25 -0000 1.393
+++ glibc.spec 26 Jun 2009 15:46:27 -0000 1.394
@@ -1,7 +1,6 @@
-%define glibcdate 20090414T2104
-%define glibcname glibc
-%define glibcsrcdir glibc-20090414T2104
-%define glibc_release_tarballs 0
+%define glibcsrcdir glibc-2.10-125-g44d20bc
+%define glibcversion 2.10.90
+### glibc.spec.in follows:
%define run_glibc_tests 1
%define auxarches i686 athlon sparcv9v sparc64v alphaev6
%define xenarches i686 athlon
@@ -19,11 +18,13 @@
%endif
%define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x
%define debuginfocommonarches %{ix86} alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v
+%define multiarcharches %{ix86} x86_64
%define _unpackaged_files_terminate_build 0
+
Summary: The GNU libc libraries
Name: glibc
-Version: 2.9.90
-Release: 16
+Version: %{glibcversion}
+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
@@ -32,14 +33,15 @@ Release: 16
License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System Environment/Libraries
URL: http://sources.redhat.com/glibc/
-Source0: %{glibcsrcdir}.tar.bz2
-%if %{glibc_release_tarballs}
-Source1: %(echo %{glibcsrcdir} | sed s/glibc-/glibc-linuxthreads-/).tar.bz2
-Source2: %(echo %{glibcsrcdir} | sed s/glibc-/glibc-libidn-/).tar.bz2
-%define glibc_release_unpack -a1 -a2
+Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2
+%if 0%{?glibc_release_url:1}
+%define glibc_libidn_srcdir %(echo %{glibcsrcdir} | sed s/glibc-/glibc-libidn-/)
+Source1: %{glibc_release_url}%{glibc_libidn_srcdir}.tar.bz2
+%define glibc_release_unpack -a1
+%define glibc_release_setup mv %{glibc_libidn_srcdir} libidn
%endif
-Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2
-Patch0: %{glibcname}-fedora.patch
+Source2: %{glibcsrcdir}-fedora.tar.bz2
+Patch0: %{name}-fedora.patch
Patch1: %{name}-ia64-lib64.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Obsoletes: glibc-profile < 2.4
@@ -65,12 +67,17 @@ BuildRequires: gcc >= 3.2
%endif
# Need AS_NEEDED directive
# Need --hash-style=* support
+%ifarch %{multiarcharches}
+# Need STT_IFUNC support
+BuildRequires: binutils >= 2.19.51.0.10
+%else
BuildRequires: binutils >= 2.17.50.0.2-5
+%endif
BuildRequires: gcc >= 3.2.1-5
%ifarch ppc s390 s390x
BuildRequires: gcc >= 4.1.0-0.17
%endif
-%if "%{_enable_debug_packages}" == "1"
+%if 0%{?_enable_debug_packages}
BuildRequires: elfutils >= 0.72
BuildRequires: rpm >= 4.2-0.56
%endif
@@ -104,7 +111,8 @@ Install glibc-xen if you might run your
Summary: Object files for development using standard C libraries.
Group: Development/Libraries
Requires(pre): /sbin/install-info
-Requires(pre): %{name}-headers = %{version}-%{release}
+Requires(pre): %{name}-headers
+Requires: %{name}-headers = %{version}-%{release}
Requires: %{name} = %{version}-%{release}
%description devel
@@ -184,7 +192,7 @@ which can be helpful during program debu
If unsure if you need this, don't install this package.
-%if "%{_enable_debug_packages}" == "1"
+%if 0%{?_enable_debug_packages}
%define debug_package %{nil}
%define __debug_install_post %{nil}
%global __debug_package 1
@@ -225,7 +233,8 @@ package or when debugging this package.
%endif
%prep
-%setup -q -n %{glibcsrcdir} %{glibc_release_unpack} -a3
+%setup -q -n %{glibcsrcdir} %{?glibc_release_unpack} -b2
+%{?glibc_release_setup}
%patch0 -E -p1
%ifarch ia64
%if "%{_lib}" == "lib64"
@@ -324,6 +333,9 @@ CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLA
--with-headers=%{_prefix}/include --enable-bind-now \
--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
--host %{nptl_target_cpu}-redhat-linux \
+%ifarch %{multiarcharches}
+ --enable-multi-arch \
+%endif
--disable-profile --enable-experimental-malloc --enable-nss-crypt
make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
@@ -343,10 +355,10 @@ if [ "$platform" != power6 ]; then
mkdir -p power6emul/{lib,lib64}
$GCC -shared -O2 -fpic -o power6emul/%{_lib}/power6emul.so fedora/power6emul.c -Wl,-z,initfirst
%ifarch ppc
- echo '' | gcc -shared -nostdlib -O2 -fpic -m64 -o power6emul/lib64/power6emul.so -xc -
+ gcc -shared -nostdlib -O2 -fpic -m64 -o power6emul/lib64/power6emul.so -xc - </dev/null
%endif
%ifarch ppc64
- echo '' | gcc -shared -nostdlib -O2 -fpic -m32 -o power6emul/lib/power6emul.so -xc -
+ gcc -shared -nostdlib -O2 -fpic -m32 -o power6emul/lib/power6emul.so -xc - < /dev/null
%endif
export LD_PRELOAD=`pwd`/power6emul/\$LIB/power6emul.so
fi
@@ -555,40 +567,43 @@ rm -f $RPM_BUILD_ROOT/etc/gai.conf
rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo
# BUILD THE FILE LIST
-find $RPM_BUILD_ROOT -type f -or -type l |
- sed -e 's|.*/etc|%config &|' \
- -e 's|.*/gconv/gconv-modules$|%verify(not md5 size mtime) %config(noreplace) &|' \
- -e 's|.*/gconv/gconv-modules.cache|%verify(not md5 size mtime) &|' \
- -e '/lib\/debug/d' > rpm.filelist.in
-for n in %{_prefix}/share %{_prefix}/include %{_prefix}/lib/locale; do
- find ${RPM_BUILD_ROOT}${n} -type d | \
- grep -v '%{_prefix}/share$' | \
- grep -v '%{_infodir}' | \
- sed "s/^/%dir /" >> rpm.filelist.in
-done
-
-# primary filelist
-SHARE_LANG='s|.*/share/locale/\([^/_]\+\).*/LC_MESSAGES/.*\.mo|%lang(\1) &|'
-LIB_LANG='s|.*/lib/locale/\([^/_]\+\)|%lang(\1) &|'
-# rpm does not handle %lang() tagged files hardlinked together accross
-# languages very well, temporarily disable
-LIB_LANG=''
-sed -e "s|$RPM_BUILD_ROOT||" -e "$LIB_LANG" -e "$SHARE_LANG" < rpm.filelist.in |
- grep -v '/etc/\(localtime\|nsswitch.conf\|ld.so.conf\|ld.so.cache\|default\)' | \
- grep -v '/%{_lib}/lib\(pcprofile\|memusage\).so' | \
- grep -v 'bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\)' | \
- sort > rpm.filelist
+{
+ find $RPM_BUILD_ROOT \( -type f -or -type l \) \
+ \( \
+ -name etc -printf "%%%%config " -o \
+ -name gconv-modules \
+ -printf "%%%%verify(not md5 size mtime) %%%%config(noreplace) " -o \
+ -name gconv-modules.cache \
+ -printf "%%%%verify(not md5 size mtime) " \
+ , \
+ ! -path "*/lib/debug" -printf "/%%P\n" \)
+ find $RPM_BUILD_ROOT -type d \
+ \( -path '*%{_prefix}/share/*' ! -path '*%{_infodir}' -o \
+ -path "*%{_prefix}/include/*" -o \
+ -path "*%{_prefix}/lib/locale/*" \
+ \) -printf "%%%%dir /%%P\n"
+} | {
+
+ # primary filelist
+ SHARE_LANG='s|.*/share/locale/\([^/_]\+\).*/LC_MESSAGES/.*\.mo|%lang(\1) &|'
+ LIB_LANG='s|.*/lib/locale/\([^/_]\+\)|%lang(\1) &|'
+ # rpm does not handle %lang() tagged files hardlinked together accross
+ # languages very well, temporarily disable
+ LIB_LANG=''
+ sed -e "$LIB_LANG" -e "$SHARE_LANG" \
+ -e '\,/etc/\(localtime\|nsswitch.conf\|ld\.so\.conf\|ld\.so\.cache\|default\),d' \
+ -e '\,/%{_lib}/lib\(pcprofile\|memusage\)\.so,d' \
+ -e '\,bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\),d'
+} | sort > rpm.filelist
mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_lib}
mv -f $RPM_BUILD_ROOT/%{_lib}/lib{pcprofile,memusage}.so $RPM_BUILD_ROOT%{_prefix}/%{_lib}
for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do
- cp -a $i $i.tmp
sed -e 's~=/%{_lib}/libpcprofile.so~=%{_prefix}/%{_lib}/libpcprofile.so~' \
-e 's~=/%{_lib}/libmemusage.so~=%{_prefix}/%{_lib}/libmemusage.so~' \
-e 's~='\''/\\\$LIB/libpcprofile.so~='\''%{_prefix}/\\$LIB/libpcprofile.so~' \
-e 's~='\''/\\\$LIB/libmemusage.so~='\''%{_prefix}/\\$LIB/libmemusage.so~' \
- $i.tmp > $i
- chmod 755 $i; rm -f $i.tmp
+ -i $i
done
grep '%{_infodir}' < rpm.filelist | grep -v '%{_infodir}/dir' > devel.filelist
@@ -598,9 +613,9 @@ grep '%{_prefix}/include' < rpm.filelist
egrep -v '%{_prefix}/include/(linuxthreads|gnu/stubs-[32164]+\.h)' \
> headers.filelist
-mv rpm.filelist rpm.filelist.full
-grep -v '%{_prefix}/%{_lib}/lib.*_p.a' rpm.filelist.full |
- egrep -v "(%{_prefix}/include)|(%{_infodir})" > rpm.filelist
+sed -i -e '\|%{_prefix}/%{_lib}/lib.*_p.a|d' \
+ -e '\|%{_prefix}/include|d' \
+ -e '\|%{_infodir}|d' rpm.filelist
grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist \
| grep '/lib\(\(c\|pthread\|nldbl\)_nonshared\|bsd\(\|-compat\)\|g\|ieee\|mcheck\|rpcsvc\)\.a$' \
@@ -611,12 +626,11 @@ grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm
grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist
grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist
-mv rpm.filelist rpm.filelist.full
-grep -v '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist.full |
- grep -v '%{_prefix}/%{_lib}/.*\.o' |
- grep -v '%{_prefix}/%{_lib}/lib.*\.so'|
- grep -v '%{_prefix}/%{_lib}/linuxthreads' |
- grep -v 'nscd' > rpm.filelist
+sed -i -e '\|%{_prefix}/%{_lib}/lib.*\.a|d' \
+ -e '\|%{_prefix}/%{_lib}/.*\.o|d' \
+ -e '\|%{_prefix}/%{_lib}/lib.*\.so|d' \
+ -e '\|%{_prefix}/%{_lib}/linuxthreads|d' \
+ -e '\|nscd|d' rpm.filelist
grep '%{_prefix}/bin' < rpm.filelist >> common.filelist
#grep '%{_prefix}/lib/locale' < rpm.filelist | grep -v /locale-archive.tmpl >> common.filelist
@@ -625,18 +639,16 @@ grep '%{_prefix}/sbin/[^gi]' < rpm.filel
grep '%{_prefix}/share' < rpm.filelist | \
grep -v '%{_prefix}/share/zoneinfo' >> common.filelist
-mv rpm.filelist rpm.filelist.full
-grep -v '%{_prefix}/bin' < rpm.filelist.full |
- grep -v '%{_prefix}/lib/locale' |
- grep -v '%{_prefix}/libexec/pt_chown' |
- grep -v '%{_prefix}/sbin/[^gi]' |
- grep -v '%{_prefix}/share' > rpm.filelist
+sed -i -e '\|%{_prefix}/bin|d' \
+ -e '\|%{_prefix}/lib/locale|d' \
+ -e '\|%{_prefix}/libexec/pt_chown|d' \
+ -e '\|%{_prefix}/sbin/[^gi]|d' \
+ -e '\|%{_prefix}/share|d' rpm.filelist
> nosegneg.filelist
%if %{xenpackage}
grep '/%{_lib}/%{nosegneg_subdir}' < rpm.filelist >> nosegneg.filelist
-mv rpm.filelist rpm.filelist.full
-grep -v '/%{_lib}/%{nosegneg_subdir}' < rpm.filelist.full > rpm.filelist
+sed -i -e '\|/%{_lib}/%{nosegneg_subdir}|d' rpm.filelist
%endif
echo '%{_prefix}/sbin/build-locale-archive' >> common.filelist
@@ -758,7 +770,7 @@ ar rcs libpthread.a libpthread.o
rm libpthread.o
popd
-%if "%{_enable_debug_packages}" == "1"
+%if 0%{?_enable_debug_packages}
# The #line directives gperf generates do not give the proper
# file name relative to the build directory.
@@ -782,7 +794,7 @@ find_debuginfo_args="$find_debuginfo_arg
list_debug_archives()
{
local dir=%{_prefix}/lib/debug%{_prefix}/%{_lib}
- (cd $RPM_BUILD_ROOT; ls ${dir#/}/*.a) | sed 's,^,/,'
+ find $RPM_BUILD_ROOT$dir -name "*.a" -printf "$dir/%%P\n"
}
%ifarch %{debuginfocommonarches}
@@ -798,10 +810,9 @@ list_debug_archives()
%endif
sed -i '\#^%{_prefix}/src/debug/#d' debuginfocommon.filelist
-(cd $RPM_BUILD_ROOT%{_prefix}/src; find debug -type d) |
-sed 's#^#%dir %{_prefix}/src/#' > debuginfocommon.sources
-(cd $RPM_BUILD_ROOT%{_prefix}/src; find debug ! -type d) |
-sed 's#^#%{_prefix}/src/#' >> debuginfocommon.sources
+find $RPM_BUILD_ROOT%{_prefix}/src/debug \
+ \( -type d -printf '%%%%dir ' \) , \
+ -printf '%{_prefix}/src/debug/%%P\n' > debuginfocommon.sources
# auxarches get only these few source files
auxarches_debugsources=\
@@ -811,8 +822,7 @@ egrep "$auxarches_debugsources" debuginf
egrep -v "$auxarches_debugsources" \
debuginfocommon.sources >> debuginfocommon.filelist
-%ifarch %{auxarches}
-%else
+%ifnarch %{auxarches}
# non-aux arches when there is a debuginfo-common
# all the sources go into debuginfo-common
#cat debuginfocommon.sources >> debuginfocommon.filelist
@@ -822,7 +832,8 @@ list_debug_archives >> debuginfocommon.f
%else
-list_debug_archives >> debuginfo.filelist
+# already found by find-debuginfo
+#list_debug_archives >> debuginfo.filelist
%endif
@@ -1001,7 +1012,7 @@ rm -f *.filelist*
%ghost %config(missingok,noreplace) /etc/sysconfig/nscd
%endif
-%if "%{_enable_debug_packages}" == "1"
+%if 0%{?_enable_debug_packages}
%files debuginfo -f debuginfo.filelist
%defattr(-,root,root)
%ifarch %{debuginfocommonarches}
@@ -1013,6 +1024,60 @@ rm -f *.filelist*
%endif
%changelog
+* Thu Jun 26 2009 Andreas Schwab <aschwab at redhat.com> 2.10.90-1
+- Update from master.
+- Enable multi-arch support on x86/x86-64.
+- Add requires glibc-headers to glibc-devel (#476295).
+- Implement second fallback mode for DNS requests (#505105).
+- Don't generate invalid POSIX TZ string for Asia/Dhaka timezone (#506941).
+- Allow backtrace through __longjmp_chk on powerpc.
+
+* Fri May 22 2009 Jakub Jelinek <jakub at redhat.com> 2.10.1-2
+- fix accept4 on architectures other than i?86/x86_64
+- robustify nscd client code during server GC
+- fix up nscd segfaults during daemon shutdown
+- fix memchr on ia64 (BZ#10162)
+- replace the Sun RPC license with the BSD license, with the explicit
+ permission of Sun Microsystems
+- fix up powerpc long double errno reporting
+
+* Sun May 10 2009 Jakub Jelinek <jakub at redhat.com> 2.10.1-1
+- fix up getsgent_r and getsgnam_r exports on i?86 and ppc
+
+* Sat May 9 2009 Jakub Jelinek <jakub at redhat.com> 2.10-2
+- update from trunk
+ - glibc 2.10 release
+ - fix memchr on x86_64 (#499689)
+
+* Mon Apr 27 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-22
+- update from trunk
+ - further localedef fixes
+- fix build-locale-archive
+
+* Fri Apr 24 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-21
+- update from trunk
+ - fix localedef
+ - fix SHIFT_JIS iconv EILSEQ handling (#497267)
+ - misc fixes (BZ#10093, BZ#10100)
+
+* Fri Apr 24 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-20
+- update from trunk
+ - fix p{read,write}v{,64} (#497429, #497434)
+ - fix strfmon (#496386)
+
+* Thu Apr 16 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-19
+- update from trunk
+ - fix dlopen from statically linked binaries (#495830)
+
+* Thu Apr 16 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-18
+- update from trunk
+ - fix fallocate
+
+* Wed Apr 15 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-17
+- update from trunk
+ - if threads have very small stack sizes, use much smaller buffer
+ in __get_nprocs when called from within malloc (#494631)
+
* Tue Apr 14 2009 Jakub Jelinek <jakub at redhat.com> 2.9.90-16
- update from trunk
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log 14 Apr 2009 21:28:25 -0000 1.14
+++ import.log 26 Jun 2009 15:46:27 -0000 1.15
@@ -12,3 +12,4 @@ glibc-2_9_90-13:HEAD:glibc-2.9.90-13.src
glibc-2_9_90-14:HEAD:glibc-2.9.90-14.src.rpm:1239208984
glibc-2_9_90-15:HEAD:glibc-2.9.90-15.src.rpm:1239312092
glibc-2_9_90-16:HEAD:glibc-2.9.90-16.src.rpm:1239744476
+glibc-2_10_90-1:HEAD:glibc-2.10.90-1.src.rpm:1246030924
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- sources 14 Apr 2009 21:28:25 -0000 1.295
+++ sources 26 Jun 2009 15:46:27 -0000 1.296
@@ -1,2 +1,2 @@
-3ebf1a888adc2664139dd0e471f9db36 glibc-20090414T2104.tar.bz2
-d0eaef4a6c4f78b4951471429277944d glibc-fedora-20090414T2104.tar.bz2
+c73a8955c88d4c2eab27905297ab256c glibc-2.10-125-g44d20bc-fedora.tar.bz2
+b25495976286f19a0aa654744d57930d glibc-2.10-125-g44d20bc.tar.bz2
More information about the fedora-extras-commits
mailing list