rpms/glibc/devel .cvsignore, 1.208, 1.209 glibc-fedora.patch, 1.228, 1.229 glibc.spec, 1.317, 1.318 sources, 1.232, 1.233 glibc-ldconfig-speedup.patch, 1.5, NONE glibc-ppc-rt.patch, 1.2, NONE
Roland McGrath (roland)
fedora-extras-commits at redhat.com
Fri Aug 10 01:55:45 UTC 2007
Author: roland
Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31056/devel
Modified Files:
.cvsignore glibc-fedora.patch glibc.spec sources
Removed Files:
glibc-ldconfig-speedup.patch glibc-ppc-rt.patch
Log Message:
2.6.90-5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/.cvsignore,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- .cvsignore 4 Aug 2007 21:26:28 -0000 1.208
+++ .cvsignore 10 Aug 2007 01:55:12 -0000 1.209
@@ -1,2 +1,2 @@
-glibc-20070804T2027.tar.bz2
-glibc-fedora-20070804T2027.tar.bz2
+glibc-20070809T0939.tar.bz2
+glibc-fedora-20070809T0939.tar.bz2
glibc-fedora.patch:
Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.228
retrieving revision 1.229
diff -u -r1.228 -r1.229
--- glibc-fedora.patch 4 Aug 2007 21:26:28 -0000 1.228
+++ glibc-fedora.patch 10 Aug 2007 01:55:12 -0000 1.229
@@ -1,6 +1,6 @@
---- glibc-20070804T2027/ChangeLog 4 Aug 2007 20:26:01 -0000 1.10756
-+++ glibc-20070804T2027-fedora/ChangeLog 4 Aug 2007 20:51:39 -0000 1.8782.2.262
-@@ -1349,6 +1349,13 @@
+--- glibc-20070809T0939/ChangeLog 7 Aug 2007 05:36:32 -0000 1.10761
++++ glibc-20070809T0939-fedora/ChangeLog 9 Aug 2007 10:29:32 -0000 1.8782.2.263
+@@ -1388,6 +1388,13 @@
* include/sys/cdefs.h: Redefine __nonnull so that test for
incorrect parameters in the libc code itself are not omitted.
@@ -14,7 +14,7 @@
2007-05-09 Jakub Jelinek <jakub at redhat.com>
* sysdeps/ia64/fpu/fraiseexcpt.c (feraiseexcept): Don't raise overflow
-@@ -1644,6 +1651,10 @@
+@@ -1683,6 +1690,10 @@
[BZ #4368]
* stdlib/stdlib.h: Remove obsolete part of comment for realpath.
@@ -25,7 +25,7 @@
2007-04-16 Ulrich Drepper <drepper at redhat.com>
[BZ #4364]
-@@ -2901,6 +2912,15 @@
+@@ -2940,6 +2951,15 @@
separators also if no non-zero digits found.
* stdlib/Makefile (tests): Add tst-strtod3.
@@ -41,8 +41,8 @@
2006-12-09 Ulrich Drepper <drepper at redhat.com>
[BZ #3632]
---- glibc-20070804T2027/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1
-+++ glibc-20070804T2027-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3
+--- glibc-20070809T0939/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1
++++ glibc-20070809T0939-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3
@@ -477,6 +477,14 @@
2004-11-26 Jakub Jelinek <jakub at redhat.com>
@@ -108,8 +108,8 @@
2004-08-30 Roland McGrath <roland at frob.com>
* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-20070804T2027/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1
-+++ glibc-20070804T2027-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1
+--- glibc-20070809T0939/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1
++++ glibc-20070809T0939-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1
@@ -171,6 +171,11 @@
[BZ #2611]
* stdio-common/renameat.c (renameat): Fix typo.
@@ -281,8 +281,8 @@
2005-02-10 Roland McGrath <roland at redhat.com>
[BZ #157]
---- glibc-20070804T2027/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79
-+++ glibc-20070804T2027-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6
+--- glibc-20070809T0939/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79
++++ glibc-20070809T0939-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6
@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
$(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -293,8 +293,8 @@
vpath initfini.c $(sysdirs)
---- glibc-20070804T2027/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8
-+++ glibc-20070804T2027-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6
+--- glibc-20070809T0939/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8
++++ glibc-20070809T0939-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,
extern void (*__fini_array_start []) (void) attribute_hidden;
extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -319,8 +319,8 @@
/* These function symbols are provided for the .init/.fini section entry
points automagically by the linker. */
---- glibc-20070804T2027/debug/tst-chk1.c 24 Apr 2006 17:00:18 -0000 1.15
-+++ glibc-20070804T2027-fedora/debug/tst-chk1.c 24 Apr 2006 20:31:49 -0000 1.1.2.16
+--- glibc-20070809T0939/debug/tst-chk1.c 24 Apr 2006 17:00:18 -0000 1.15
++++ glibc-20070809T0939-fedora/debug/tst-chk1.c 24 Apr 2006 20:31:49 -0000 1.1.2.16
@@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
@@ -349,8 +349,8 @@
# define O 0
#else
# define O 1
---- glibc-20070804T2027/elf/ldconfig.c 16 Jul 2007 00:54:59 -0000 1.60
-+++ glibc-20070804T2027-fedora/elf/ldconfig.c 31 Jul 2007 17:45:49 -0000 1.47.2.15
+--- glibc-20070809T0939/elf/ldconfig.c 16 Jul 2007 00:54:59 -0000 1.60
++++ glibc-20070809T0939-fedora/elf/ldconfig.c 31 Jul 2007 17:45:49 -0000 1.47.2.15
@@ -966,17 +966,19 @@ search_dirs (void)
@@ -432,8 +432,8 @@
}
search_dirs ();
---- glibc-20070804T2027/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1
-+++ glibc-20070804T2027-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3
+--- glibc-20070809T0939/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1
++++ glibc-20070809T0939-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3
@@ -160,17 +160,21 @@ do_test (void)
the 16 runs, something is very wrong. */
int ndifferences = 0;
@@ -458,8 +458,8 @@
{
puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value");
---- glibc-20070804T2027/include/features.h 19 Jul 2007 17:27:30 -0000 1.47
-+++ glibc-20070804T2027-fedora/include/features.h 31 Jul 2007 17:45:50 -0000 1.35.2.16
+--- glibc-20070809T0939/include/features.h 19 Jul 2007 17:27:30 -0000 1.47
++++ glibc-20070809T0939-fedora/include/features.h 31 Jul 2007 17:45:50 -0000 1.35.2.16
@@ -282,7 +282,13 @@
#endif
@@ -475,16 +475,16 @@
# if _FORTIFY_SOURCE > 1
# define __USE_FORTIFY_LEVEL 2
# else
---- glibc-20070804T2027/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070804T2027-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1
+--- glibc-20070809T0939/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070809T0939-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-20070804T2027/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070804T2027-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1
+--- glibc-20070809T0939/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070809T0939-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-20070804T2027/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23
-+++ glibc-20070804T2027-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1
+--- glibc-20070809T0939/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23
++++ glibc-20070809T0939-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1
@@ -58,8 +58,6 @@ korean ko_KR.eucKR
korean.euc ko_KR.eucKR
ko_KR ko_KR.eucKR
@@ -494,8 +494,8 @@
norwegian nb_NO.ISO-8859-1
nynorsk nn_NO.ISO-8859-1
polish pl_PL.ISO-8859-2
---- glibc-20070804T2027/libio/stdio.h 17 Feb 2007 18:26:15 -0000 1.89
-+++ glibc-20070804T2027-fedora/libio/stdio.h 21 Feb 2007 11:15:50 -0000 1.78.2.11
+--- glibc-20070809T0939/libio/stdio.h 17 Feb 2007 18:26:15 -0000 1.89
++++ glibc-20070809T0939-fedora/libio/stdio.h 21 Feb 2007 11:15:50 -0000 1.78.2.11
@@ -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. */
@@ -509,8 +509,8 @@
__BEGIN_NAMESPACE_STD
/* Remove file FILENAME. */
---- glibc-20070804T2027/libio/bits/stdio2.h 17 Mar 2007 17:04:08 -0000 1.5
-+++ glibc-20070804T2027-fedora/libio/bits/stdio2.h 17 Mar 2007 21:52:49 -0000 1.1.2.7
+--- glibc-20070809T0939/libio/bits/stdio2.h 17 Mar 2007 17:04:08 -0000 1.5
++++ glibc-20070809T0939-fedora/libio/bits/stdio2.h 17 Mar 2007 21:52:49 -0000 1.1.2.7
@@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr
extern int __vprintf_chk (int __flag, __const char *__restrict __format,
_G_va_list __ap);
@@ -541,8 +541,8 @@
#endif
---- glibc-20070804T2027/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20
-+++ glibc-20070804T2027-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5
+--- glibc-20070809T0939/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20
++++ glibc-20070809T0939-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5
@@ -8,6 +8,7 @@
*
* !!! The list has to be sorted !!!
@@ -634,8 +634,8 @@
DEFINE_INT_CURR("PYG") /* Paraguay Guarani */
DEFINE_INT_CURR("QAR") /* Qatar Rial */
DEFINE_INT_CURR("ROL") /* Romanian Leu */
---- glibc-20070804T2027/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25
-+++ glibc-20070804T2027-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4
+--- glibc-20070809T0939/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25
++++ glibc-20070809T0939-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
/* forward decls for below */
static uint32_t add_locale (struct locarhandle *ah, const char *name,
@@ -667,8 +667,8 @@
add_alias (struct locarhandle *ah, const char *alias, bool replace,
const char *oldname, uint32_t *locrec_offset_p)
{
---- glibc-20070804T2027/localedata/Makefile 10 Jul 2007 22:12:52 -0000 1.106
-+++ glibc-20070804T2027-fedora/localedata/Makefile 31 Jul 2007 17:45:53 -0000 1.101.2.6
+--- glibc-20070809T0939/localedata/Makefile 10 Jul 2007 22:12:52 -0000 1.106
++++ glibc-20070809T0939-fedora/localedata/Makefile 31 Jul 2007 17:45:53 -0000 1.101.2.6
@@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
echo -n '...'; \
input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -677,8 +677,8 @@
-i locales/$$input -c -f charmaps/$$charset \
$(addprefix --prefix=,$(install_root)) $$locale; \
echo ' done'; \
---- glibc-20070804T2027/localedata/SUPPORTED 4 May 2007 20:52:45 -0000 1.103
-+++ glibc-20070804T2027-fedora/localedata/SUPPORTED 10 May 2007 06:44:26 -0000 1.71.2.17
+--- glibc-20070809T0939/localedata/SUPPORTED 4 May 2007 20:52:45 -0000 1.103
++++ glibc-20070809T0939-fedora/localedata/SUPPORTED 10 May 2007 06:44:26 -0000 1.71.2.17
@@ -80,6 +80,7 @@ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \
da_DK.UTF-8/UTF-8 \
@@ -720,8 +720,8 @@
ta_IN/UTF-8 \
te_IN/UTF-8 \
tg_TJ.UTF-8/UTF-8 \
---- glibc-20070804T2027/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4
-+++ glibc-20070804T2027-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2
+--- glibc-20070809T0939/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4
++++ glibc-20070809T0939-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
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>"
@@ -736,8 +736,8 @@
END LC_TIME
LC_MESSAGES
---- glibc-20070804T2027/localedata/locales/en_GB 1 Oct 2006 16:18:33 -0000 1.14
-+++ glibc-20070804T2027-fedora/localedata/locales/en_GB 2 Oct 2006 19:02:41 -0000 1.10.2.4
+--- glibc-20070809T0939/localedata/locales/en_GB 1 Oct 2006 16:18:33 -0000 1.14
++++ glibc-20070809T0939-fedora/localedata/locales/en_GB 2 Oct 2006 19:02:41 -0000 1.10.2.4
@@ -116,8 +116,8 @@ mon "<U004A><U0061><U006E><U0075
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>"
@@ -749,8 +749,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-20070804T2027/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070804T2027-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1
+--- glibc-20070809T0939/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000
++++ glibc-20070809T0939-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1
@@ -0,0 +1,69 @@
+escape_char /
+comment_char %
@@ -821,8 +821,8 @@
+LC_ADDRESS
+copy "nb_NO"
+END LC_ADDRESS
---- glibc-20070804T2027/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7
-+++ glibc-20070804T2027-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2
+--- glibc-20070809T0939/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7
++++ glibc-20070809T0939-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2
@@ -1,7 +1,7 @@
comment_char %
escape_char /
@@ -850,8 +850,8 @@
revision "0.2"
date "2000-08-02"
%
---- glibc-20070804T2027/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20
-+++ glibc-20070804T2027-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2
+--- glibc-20070809T0939/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20
++++ glibc-20070809T0939-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2
@@ -24,9 +24,25 @@
# include <mcheck.h>
# include <stdint.h>
@@ -927,8 +927,8 @@
old_free_hook = __free_hook;
__free_hook = freehook;
---- glibc-20070804T2027/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43
-+++ glibc-20070804T2027-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1
+--- glibc-20070809T0939/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43
++++ glibc-20070809T0939-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1
@@ -40,6 +40,18 @@
# include <libio/iolibio.h>
# define setvbuf(s, b, f, l) INTUSE(_IO_setvbuf) (s, b, f, l)
@@ -984,8 +984,8 @@
__memalign_hook = tr_memalignhook;
__malloc_hook = tr_mallochook;
---- glibc-20070804T2027/manual/libc.texinfo 31 Jul 2007 01:53:58 -0000 1.95
-+++ glibc-20070804T2027-fedora/manual/libc.texinfo 31 Jul 2007 17:45:53 -0000 1.94.2.2
+--- glibc-20070809T0939/manual/libc.texinfo 31 Jul 2007 01:53:58 -0000 1.95
++++ glibc-20070809T0939-fedora/manual/libc.texinfo 31 Jul 2007 17:45:53 -0000 1.94.2.2
@@ -5,7 +5,7 @@
@c setchapternewpage odd
@@ -995,17 +995,17 @@
@direntry
* Libc: (libc). C library.
@end direntry
---- glibc-20070804T2027/nis/nss 28 Apr 2006 21:02:23 -0000 1.3
-+++ glibc-20070804T2027-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2
+--- glibc-20070809T0939/nis/nss 28 Apr 2006 21:02:23 -0000 1.3
++++ glibc-20070809T0939-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2
@@ -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-20070804T2027/nptl/ChangeLog 3 Aug 2007 15:47:59 -0000 1.1016
-+++ glibc-20070804T2027-fedora/nptl/ChangeLog 4 Aug 2007 20:51:41 -0000 1.706.2.133
-@@ -2635,6 +2635,15 @@
+--- glibc-20070809T0939/nptl/ChangeLog 5 Aug 2007 13:43:19 -0000 1.1017
++++ glibc-20070809T0939-fedora/nptl/ChangeLog 9 Aug 2007 10:29:33 -0000 1.706.2.134
+@@ -2643,6 +2643,15 @@
Use __sigfillset. Document that sigfillset does the right thing wrt
to SIGSETXID.
@@ -1021,7 +1021,7 @@
2005-07-11 Jakub Jelinek <jakub at redhat.com>
[BZ #1102]
-@@ -3371,6 +3380,11 @@
+@@ -3379,6 +3388,11 @@
Move definition inside libpthread, libc, librt check. Provide
definition for rtld.
@@ -1033,7 +1033,7 @@
2004-09-02 Ulrich Drepper <drepper at redhat.com>
* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -5445,6 +5459,11 @@
+@@ -5453,6 +5467,11 @@
* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
@@ -1045,8 +1045,8 @@
2003-07-25 Jakub Jelinek <jakub at redhat.com>
* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-20070804T2027/nptl/Makefile 26 May 2007 01:30:09 -0000 1.190
-+++ glibc-20070804T2027-fedora/nptl/Makefile 31 Jul 2007 17:45:54 -0000 1.157.2.32
+--- glibc-20070809T0939/nptl/Makefile 26 May 2007 01:30:09 -0000 1.190
++++ glibc-20070809T0939-fedora/nptl/Makefile 31 Jul 2007 17:45:54 -0000 1.157.2.32
@@ -340,7 +340,8 @@ endif
extra-objs += $(crti-objs) $(crtn-objs)
omit-deps += crti crtn
@@ -1079,8 +1079,8 @@
else
$(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
endif
---- glibc-20070804T2027/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1
-+++ glibc-20070804T2027-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3
+--- glibc-20070809T0939/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1
++++ glibc-20070809T0939-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3
@@ -190,17 +190,21 @@ do_test (void)
the 16 runs, something is very wrong. */
int ndifferences = 0;
@@ -1105,8 +1105,8 @@
{
puts ("stack guard canaries are not randomized enough");
puts ("nor equal to the default canary value");
---- glibc-20070804T2027/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070804T2027-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1
+--- glibc-20070809T0939/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070809T0939-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>
+
@@ -1114,8 +1114,8 @@
+#ifndef __ASSUME_CLONE_THREAD_FLAGS
+# define __ASSUME_CLONE_THREAD_FLAGS 1
+#endif
---- glibc-20070804T2027/nscd/connections.c 16 Jul 2007 00:54:58 -0000 1.99
-+++ glibc-20070804T2027-fedora/nscd/connections.c 31 Jul 2007 17:45:59 -0000 1.55.2.30
+--- glibc-20070809T0939/nscd/connections.c 16 Jul 2007 00:54:58 -0000 1.99
++++ glibc-20070809T0939-fedora/nscd/connections.c 31 Jul 2007 17:45:59 -0000 1.55.2.30
@@ -69,6 +69,7 @@ static gid_t *server_groups;
# define NGROUPS 32
#endif
@@ -1181,8 +1181,8 @@
+{
+ sighup_pending = 1;
+}
---- glibc-20070804T2027/nscd/nscd.c 16 Jul 2007 00:54:58 -0000 1.58
-+++ glibc-20070804T2027-fedora/nscd/nscd.c 31 Jul 2007 17:46:00 -0000 1.38.2.17
+--- glibc-20070809T0939/nscd/nscd.c 16 Jul 2007 00:54:58 -0000 1.58
++++ glibc-20070809T0939-fedora/nscd/nscd.c 31 Jul 2007 17:46:00 -0000 1.38.2.17
@@ -120,6 +120,9 @@ static struct argp argp =
options, parse_opt, NULL, doc,
};
@@ -1201,8 +1201,8 @@
signal (SIGPIPE, SIG_IGN);
/* Cleanup files created by a previous 'bind'. */
---- glibc-20070804T2027/nscd/nscd.conf 14 Jan 2007 05:24:04 -0000 1.14
-+++ glibc-20070804T2027-fedora/nscd/nscd.conf 17 Jan 2007 10:42:40 -0000 1.8.2.6
+--- glibc-20070809T0939/nscd/nscd.conf 14 Jan 2007 05:24:04 -0000 1.14
++++ glibc-20070809T0939-fedora/nscd/nscd.conf 17 Jan 2007 10:42:40 -0000 1.8.2.6
@@ -33,8 +33,8 @@
# logfile /var/log/nscd.log
# threads 6
@@ -1214,8 +1214,8 @@
debug-level 0
# reload-count 5
paranoia no
---- glibc-20070804T2027/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10
-+++ glibc-20070804T2027-fedora/nscd/nscd.init 5 Dec 2006 21:50:20 -0000 1.6.2.5
+--- glibc-20070809T0939/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10
++++ glibc-20070809T0939-fedora/nscd/nscd.init 5 Dec 2006 21:50:20 -0000 1.6.2.5
@@ -9,6 +9,7 @@
# slow naming services like NIS, NIS+, LDAP, or hesiod.
# processname: /usr/sbin/nscd
@@ -1256,8 +1256,8 @@
RETVAL=$?
echo
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd
---- glibc-20070804T2027/posix/Makefile 2 Aug 2007 09:59:18 -0000 1.200
-+++ glibc-20070804T2027-fedora/posix/Makefile 4 Aug 2007 20:51:43 -0000 1.171.2.26
+--- glibc-20070809T0939/posix/Makefile 4 Aug 2007 20:48:38 -0000 1.201
++++ glibc-20070809T0939-fedora/posix/Makefile 4 Aug 2007 20:51:43 -0000 1.171.2.26
@@ -300,7 +300,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi
mv -f $@/$$spec.new $@/$$spec; \
done < $(objpfx)getconf.speclist
@@ -1265,14 +1265,13 @@
-$(objpfx)getconf.speclist: $(objpfx)getconf
- LC_ALL=C GETCONF_DIR=/dev/null \
- $(run-program-prefix) $< _POSIX_V6_WIDTH_RESTRICTED_ENVS > $@.new
-- mv -f $@.new
+$(objpfx)getconf.speclist: getconf.speclist.h
+ $(CC) -E $(CFLAGS) $(CPPFLAGS) $< \
+ | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \
+ > $@.new
-+ mv -f $@.new $@
---- glibc-20070804T2027/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070804T2027-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2
+ mv -f $@.new $@
+--- glibc-20070809T0939/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070809T0939-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2
@@ -0,0 +1,15 @@
+#include <unistd.h>
+const char *START_OF_STRINGS =
@@ -1289,8 +1288,8 @@
+"POSIX_V6_LPBIG_OFFBIG"
+#endif
+"";
---- glibc-20070804T2027/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13
-+++ glibc-20070804T2027-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1
+--- glibc-20070809T0939/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13
++++ glibc-20070809T0939-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1
@@ -36,6 +36,14 @@
# define add_system_dir(dir) add_dir (dir)
#endif
@@ -1306,8 +1305,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-20070804T2027/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20
-+++ glibc-20070804T2027-fedora/sysdeps/i386/Makefile 30 Jun 2006 09:16:34 -0000 1.16.2.4
+--- glibc-20070809T0939/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20
++++ glibc-20070809T0939-fedora/sysdeps/i386/Makefile 30 Jun 2006 09:16:34 -0000 1.16.2.4
@@ -64,4 +64,12 @@ endif
ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
@@ -1321,8 +1320,8 @@
+CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS
+CFLAGS-.oS += -mno-tls-direct-seg-refs
endif
---- glibc-20070804T2027/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10
-+++ glibc-20070804T2027-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1
+--- glibc-20070809T0939/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10
++++ glibc-20070809T0939-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1
@@ -12,8 +12,8 @@ elide-routines.os += hp-timing
ifeq (yes,$(build-shared))
@@ -1334,8 +1333,8 @@
endif
endif
---- glibc-20070804T2027/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2
-+++ glibc-20070804T2027-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1
+--- glibc-20070809T0939/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2
++++ glibc-20070809T0939-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1
@@ -1,350 +0,0 @@
-/* From the Intel IA-64 Optimization Guide, choose the minimum latency
- alternative. */
@@ -1687,8 +1686,8 @@
- .symver ___multi3, __multi3 at GLIBC_2.2
-
-#endif
---- glibc-20070804T2027/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070804T2027-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1
+--- glibc-20070809T0939/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070809T0939-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1
@@ -0,0 +1,84 @@
+/* pre-.hidden libgcc compatibility
+ Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1774,8 +1773,8 @@
+symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
+
+#endif
---- glibc-20070804T2027/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8
-+++ glibc-20070804T2027-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5
+--- glibc-20070809T0939/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8
++++ glibc-20070809T0939-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5
@@ -30,6 +30,7 @@ ifneq ($(elf),no)
# we use -fpic instead which is much better.
CFLAGS-initfini.s += -fpic -O1
@@ -1784,8 +1783,8 @@
endif
ifeq ($(subdir),elf)
---- glibc-20070804T2027/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7
-+++ glibc-20070804T2027-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2
+--- glibc-20070809T0939/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7
++++ glibc-20070809T0939-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2
@@ -42,7 +42,12 @@ nice (int incr)
__set_errno (save);
}
@@ -1800,8 +1799,8 @@
if (result == -1)
{
if (errno == EACCES)
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/check_pf.c 16 Jun 2007 16:54:40 -0000 1.11
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/check_pf.c 31 Jul 2007 17:46:12 -0000 1.3.2.8
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/check_pf.c 16 Jun 2007 16:54:40 -0000 1.11
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/check_pf.c 31 Jul 2007 17:46:12 -0000 1.3.2.8
@@ -27,13 +27,10 @@
#include <unistd.h>
#include <sys/socket.h>
@@ -1817,9 +1816,9 @@
#ifndef IFA_F_TEMPORARY
# define IFA_F_TEMPORARY IFA_F_SECONDARY
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/dl-osinfo.h 1 Aug 2006 06:55:27 -0000 1.23
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 2 Aug 2006 16:57:42 -0000 1.14.2.9
-@@ -18,11 +18,14 @@
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/dl-osinfo.h 6 Aug 2007 20:10:18 -0000 1.24
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 9 Aug 2007 10:29:35 -0000 1.14.2.10
+@@ -19,11 +19,14 @@
02111-1307 USA. */
#include <string.h>
@@ -1834,7 +1833,7 @@
#ifndef MIN
# define MIN(a,b) (((a)<(b))?(a):(b))
-@@ -176,5 +179,31 @@ _dl_setup_stack_chk_guard (void)
+@@ -170,5 +173,31 @@ _dl_setup_stack_chk_guard (void)
unsigned char *p = (unsigned char *) &ret;
p[sizeof (ret) - 1] = 255;
p[sizeof (ret) - 2] = '\n';
@@ -1866,8 +1865,8 @@
+ ret ^= stk;
return ret;
}
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7
@@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
{
int result;
@@ -1910,8 +1909,8 @@
{
size_t filelen = strlen (file);
static const char procfd[] = "/proc/self/fd/%d/%s";
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3
++++ glibc-20070809T0939-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>
@@ -1937,8 +1936,8 @@
struct netlink_res
{
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11
++++ glibc-20070809T0939-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"
@@ -1948,8 +1947,8 @@
#define _PATH_WTMP "/var/log/wtmp"
/* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16
++++ glibc-20070809T0939-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;
@@ -1995,8 +1994,8 @@
+ return retval;
}
libc_hidden_def (tcsetattr)
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6
@@ -120,9 +120,6 @@ L(pseudo_end):
ret
@@ -2015,8 +2014,8 @@
cfi_startproc
PSEUDO_END (BP_SYM (__clone))
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1
@@ -0,0 +1,59 @@
+/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
+ Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2077,8 +2076,8 @@
+ } while (0)
+
+#include_next <dl-cache.h>
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1
@@ -22,4 +22,31 @@
#define _dl_cache_check_flags(flags) \
((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2111,29 +2110,29 @@
+ } while (0)
+
#include_next <dl-cache.h>
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1
@@ -0,0 +1,5 @@
+#ifdef IS_IN_ldconfig
+#include <sysdeps/i386/dl-procinfo.c>
+#else
+#include <sysdeps/generic/dl-procinfo.c>
+#endif
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1
@@ -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-20070804T2027/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.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 /emul/ia32-linux\2\3"_
---- glibc-20070804T2027/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7
-+++ glibc-20070804T2027-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4
+--- glibc-20070809T0939/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7
++++ glibc-20070809T0939-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4
@@ -89,9 +89,6 @@ L(pseudo_end):
ret
Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- glibc.spec 5 Aug 2007 11:15:33 -0000 1.317
+++ glibc.spec 10 Aug 2007 01:55:13 -0000 1.318
@@ -1,9 +1,10 @@
-%define glibcdate 20070804T2027
+%define glibcdate 20070809T0939
%define glibcname glibc
-%define glibcsrcdir glibc-20070804T2027
+%define glibcsrcdir glibc-20070809T0939
%define glibc_release_tarballs 0
%define glibcversion 2.6.90
-%define glibcrelease 4
+%define glibcrelease 5
+%define run_glibc_tests 1
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon
%ifarch %{xenarches}
@@ -41,8 +42,6 @@
Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2
Patch0: %{glibcname}-fedora.patch
Patch1: %{name}-ia64-lib64.patch
-Patch2: glibc-ldconfig-speedup.patch
-Patch3: glibc-ppc-rt.patch
Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
@@ -217,6 +216,7 @@
%package debuginfo
Summary: Debug information for package %{name}
Group: Development/Debug
+AutoReqProv: no
%ifarch %{debuginfocommonarches}
Requires: glibc-debuginfo-common = %{version}-%{release}
%endif
@@ -238,6 +238,7 @@
%package debuginfo-common
Summary: Debug information for package %{name}
Group: Development/Debug
+AutoReqProv: no
%description debuginfo-common
This package provides debug information for package %{name}.
@@ -255,8 +256,6 @@
%patch1 -p1
%endif
%endif
-%patch2 -p1
-%patch3 -p1
# A lot of programs still misuse memcpy when they have to use
# memmove. The memcpy implementation below is not tolerant at
@@ -497,11 +496,11 @@
# Include ld.so.conf
echo 'include ld.so.conf.d/*.conf' > $RPM_BUILD_ROOT/etc/ld.so.conf
-touch $RPM_BUILD_ROOT/etc/ld.so.cache
+> $RPM_BUILD_ROOT/etc/ld.so.cache
chmod 644 $RPM_BUILD_ROOT/etc/ld.so.conf
mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-touch $RPM_BUILD_ROOT/etc/sysconfig/nscd
+> $RPM_BUILD_ROOT/etc/sysconfig/nscd
# Include %{_prefix}/%{_lib}/gconv/gconv-modules.cache
> $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gconv/gconv-modules.cache
@@ -702,6 +701,8 @@
%endif
%endif
+%if %{run_glibc_tests}
+
# Increase timeouts
export TIMEOUTFACTOR=16
parent=$$
@@ -750,84 +751,37 @@
readelf -Wr $RPM_BUILD_ROOT/%{_lib}/libc-*.so | sed -n -e "$PLTCMD"
echo ====================PLT RELOCS END==================
-%if "%{_enable_debug_packages}" == "1"
+%endif
-case "$-" in *x*) save_trace=yes;; esac
-set +x
-echo Building debuginfo subpackage...
-
-blf=debugfiles.list
-sf=debugsources.list
-cblf=debugcommonfiles.list
-csf=debugcommonsources.list
-
-echo -n > $sf
-echo -n > $csf
-
-strip $RPM_BUILD_ROOT/{sbin/ldconfig,usr/sbin/glibc_post_upgrade.%{_target_cpu},usr/sbin/build-locale-archive}
-
-# Strip ELF binaries
-for f in `cat rpm.filelist nosegneg.filelist \
- | grep -v '%%\(dir\|lang\|config\|verify\)'`; do
- bf=$RPM_BUILD_ROOT$f
- if [ -f $bf -a -x $bf -a ! -h $bf ]; then
- if `file $bf 2>/dev/null | grep 'ELF.*, not stripped' | grep -vq 'statically linked'`; then
- bd=`dirname $f`
- outd=$RPM_BUILD_ROOT/usr/lib/debug$bd
- mkdir -p $outd
- echo extracting debug info from $f
- /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug -l $sf $bf
- bn=`basename $f`
- case $f in
- /%{_lib}/*) eu-strip -g -f $outd/$bn.debug $bf || :;;
- *) eu-strip -f $outd/$bn.debug $bf || :;;
- esac
- if [ -f $outd/$bn.debug ]; then echo /usr/lib/debug$bd/$bn.debug >> $blf; fi
- fi
- fi
-done
+%if "%{_enable_debug_packages}" == "1"
-for f in `cat common.filelist utils.filelist nscd.filelist \
- | grep -v '%%\(dir\|lang\|config\|verify\)'`; do
- bf=$RPM_BUILD_ROOT$f
- if [ -f $bf -a -x $bf -a ! -h $bf ]; then
- if `file $bf 2>/dev/null | grep 'ELF.*, not stripped' | grep -vq 'statically linked'`; then
- bd=`dirname $f`
- outd=$RPM_BUILD_ROOT/usr/lib/debug$bd
- mkdir -p $outd
- echo extracting debug info from $f
- /usr/lib/rpm/debugedit -b $RPM_BUILD_DIR -d /usr/src/debug -l $csf $bf
- bn=`basename $f`
- eu-strip -f $outd/$bn.debug $bf || :
- if [ -f $outd/$bn.debug ]; then echo /usr/lib/debug$bd/$bn.debug >> $cblf; fi
- fi
- fi
-done
+# The #line directives gperf generates do not give the proper
+# file name relative to the build directory.
+(cd locale; ln -s programs/*.gperf .)
+(cd iconv; ln -s ../locale/programs/charmap-kw.gperf .)
+
+ls -l $RPM_BUILD_ROOT/usr/bin/getconf
+ls -l $RPM_BUILD_ROOT/usr/libexec/getconf
+eu-readelf -hS $RPM_BUILD_ROOT/usr/bin/getconf $RPM_BUILD_ROOT/usr/libexec/getconf/*
-for f in `find $RPM_BUILD_ROOT/%{_lib} -type l`; do
- l=`ls -l $f`
- l=${l#* -> }
- t=/usr/lib/debug`dirname ${f#$RPM_BUILD_ROOT}`
- if grep -q "^$t/$l.debug\$" $blf; then
- ln -sf $l.debug $RPM_BUILD_ROOT$t/`basename $f`.debug
- echo $t/`basename $f`.debug >> $blf
- elif grep -q "^$t.debug/$l\$" $cblf; then
- ln -sf $l.debug $RPM_BUILD_ROOT$t/`basename $f`.debug
- echo $t/`basename $f`.debug >> $cblf
- fi
-done
+find_debuginfo_args='--strict-build-id -g'
+%ifarch %{debuginfocommonarches}
+find_debuginfo_args="$find_debuginfo_args \
+ -l common.filelist -l utils.filelist -l nscd.filelist \
+ -o debuginfocommon.filelist \
+ -l rpm.filelist -l nosegneg.filelist \
+"
+%endif
+/usr/lib/rpm/find-debuginfo.sh $find_debuginfo_args -o debuginfo.filelist
-echo Sorting source file lists. Might take a while...
-xargs -0 -n 1 echo < $sf | LC_ALL=C grep -v '/<internal>$\|<built-in>$\|\.gperf$' | LC_ALL=C sort -u > $sf.sorted
-xargs -0 -n 1 echo < $csf | LC_ALL=C grep -v '/<internal>$\|<built-in>$\|\.gperf$' | LC_ALL=C sort -u > $csf.sorted
-mkdir -p $RPM_BUILD_ROOT/usr/src/debug
-cat $sf.sorted $csf.sorted \
- | (cd $RPM_BUILD_DIR; LC_ALL=C sort -u | cpio -pdm ${RPM_BUILD_ROOT}/usr/src/debug)
-# stupid cpio creates new directories in mode 0700, fixup
-find $RPM_BUILD_ROOT/usr/src/debug -type d -print | xargs chmod a+rx
+list_debug_archives()
+{
+ local dir=%{_prefix}/lib/debug%{_prefix}/%{_lib}
+ (cd $RPM_BUILD_ROOT; ls ${dir#/}/*.a) | sed 's,^,/,'
+}
%ifarch %{debuginfocommonarches}
-%ifarch %{auxarches}
+
%ifarch %{ix86}
%define basearch i386
%endif
@@ -837,43 +791,48 @@
%ifarch sparc sparcv9
%define basearch sparc
%endif
-cat $blf > debuginfo.filelist
-find $RPM_BUILD_ROOT/usr/src/debug/%{glibcsrcdir} -type d \
- | sed "s#^$RPM_BUILD_ROOT#%%dir #" >> debuginfo.filelist
-grep '/generic/\|/linux/\|/%{basearch}/\|/nptl\(_db\)\?/\|^%{glibcsrcdir}/build' \
- $sf.sorted | sed 's|^|/usr/src/debug/|' >> debuginfo.filelist
-touch debuginfocommon.filelist
+
+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
+
+# auxarches get only these few source files
+auxarches_debugsources=\
+'/(generic|linux|%{basearch}|nptl(_db)?)/|/%{glibcsrcdir}/build|/dl-osinfo\.h'
+
+egrep "$auxarches_debugsources" debuginfocommon.sources >> debuginfo.filelist
+
+egrep -v "$auxarches_debugsources" \
+ debuginfocommon.sources >> debuginfocommon.filelist
+%ifarch %{auxarches}
%else
-( grep '^%{glibcsrcdir}/build-\|dl-osinfo\.h' $csf.sorted || : ) > $csf.sorted.build
-cat $blf > debuginfo.filelist
-cat $cblf > debuginfocommon.filelist
-grep '^%{glibcsrcdir}/build-\|dl-osinfo\.h' $sf.sorted \
- | sed 's|^|/usr/src/debug/|' >> debuginfo.filelist
-find $RPM_BUILD_ROOT/usr/src/debug/%{glibcsrcdir} -type d \
- | sed "s#^$RPM_BUILD_ROOT#%%dir #" >> debuginfocommon.filelist
-( cat $csf.sorted; grep -v -f $csf.sorted.build $sf.sorted ) \
- | grep -v 'dl-osinfo\.h' | LC_ALL=C sort -u \
- | sed 's|^|/usr/src/debug/|' >> debuginfocommon.filelist
+# non-aux arches when there is a debuginfo-common
+# all the sources go into debuginfo-common
+#cat debuginfocommon.sources >> debuginfocommon.filelist
%endif
+
+list_debug_archives >> debuginfocommon.filelist
+
%else
-cat $blf $cblf | LC_ALL=C sort -u > debuginfo.filelist
-echo '/usr/src/debug/%{glibcsrcdir}' >> debuginfo.filelist
-%endif
-[ "x$save_trace" = xyes ] && set -x
+list_debug_archives >> debuginfo.filelist
%endif
+%endif
+
+rm -f $RPM_BUILD_ROOT%{_infodir}/dir
+
%ifarch %{auxarches}
-case "$-" in *x*) save_trace=yes;; esac
-set +x
+
echo Cutting down the list of unpackaged files
-for i in `sed '/%%dir/d;/%%config/d;/%%verify/d;s/%%lang([^)]*) //' \
+>> debuginfocommon.filelist
+sed -e '/%%dir/d;/%%config/d;/%%verify/d;s/%%lang([^)]*) //;s#^/*##' \
common.filelist devel.filelist headers.filelist \
- utils.filelist nscd.filelist`; do
- [ -f "$RPM_BUILD_ROOT$i" ] && rm -f "$RPM_BUILD_ROOT$i" || :
-done
-[ "x$save_trace" = xyes ] && set -x
+ utils.filelist nscd.filelist debuginfocommon.filelist |
+(cd $RPM_BUILD_ROOT; xargs --no-run-if-empty rm -f 2> /dev/null || :)
%else
@@ -883,7 +842,7 @@
%endif
%ifnarch %{auxarches}
-touch $RPM_BUILD_ROOT/%{_prefix}/lib/locale/locale-archive
+> $RPM_BUILD_ROOT/%{_prefix}/lib/locale/locale-archive
%endif
mkdir -p $RPM_BUILD_ROOT/var/cache/ldconfig
@@ -1041,20 +1000,16 @@
%ifnarch %{auxarches}
%files debuginfo-common -f debuginfocommon.filelist
%defattr(-,root,root)
-%dir %{_prefix}/lib/debug
-%dir %{_prefix}/lib/debug/%{_prefix}
-%dir %{_prefix}/lib/debug/%{_prefix}/%{_lib}
-%{_prefix}/lib/debug/%{_prefix}/%{_lib}/*.a
%endif
-%else
-%dir %{_prefix}/lib/debug
-%dir %{_prefix}/lib/debug/%{_prefix}
-%dir %{_prefix}/lib/debug/%{_prefix}/%{_lib}
-%{_prefix}/lib/debug/%{_prefix}/%{_lib}/*.a
%endif
%endif
%changelog
+* Thu Aug 9 2007 Roland McGrath <roland at redhat.com> 2.6.90-5
+- update to trunk
+ - fix local PLT regressions
+- spec file revamp for new find-debuginfo.sh
+
* Sun Aug 5 2007 Jakub Jelinek <jakub at redhat.com> 2.6.90-4
- fix librt.so and librtkaio.so on ppc32, so that it is not using
bss PLT
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/sources,v
retrieving revision 1.232
retrieving revision 1.233
diff -u -r1.232 -r1.233
--- sources 4 Aug 2007 21:26:28 -0000 1.232
+++ sources 10 Aug 2007 01:55:13 -0000 1.233
@@ -1,2 +1,2 @@
-8fcade7531f836bbb792630ab6e40869 glibc-20070804T2027.tar.bz2
-a6aa554b36b7405d19a91dcdbe0fc48d glibc-fedora-20070804T2027.tar.bz2
+a65662501550df48bc1c49914f4f10e3 glibc-20070809T0939.tar.bz2
+ac05491cd8377fb81997346467c55585 glibc-fedora-20070809T0939.tar.bz2
--- glibc-ldconfig-speedup.patch DELETED ---
--- glibc-ppc-rt.patch DELETED ---
More information about the fedora-extras-commits
mailing list