diff --git a/.cvsignore b/.cvsignore index 0d352f4..7a30399 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20070804T2027.tar.bz2 -glibc-fedora-20070804T2027.tar.bz2 +glibc-20070809T0939.tar.bz2 +glibc-fedora-20070809T0939.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index b9e6502..997b2ee 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -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 * 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 [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 [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 @@ -108,8 +108,8 @@ 2004-08-30 Roland McGrath * 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 [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 ---- 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 ---- 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 "" d_fmt "" @@ -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 "" d_fmt "" @@ -749,8 +749,8 @@ date_fmt "/ / " ---- 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 # include @@ -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 # 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 [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 * 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 * 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 + @@ -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 +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@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 #include @@ -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 @@ -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 @@ -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 ---- 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 ---- 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 +#else +#include +#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 +#else +#include +#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 diff --git a/glibc-ldconfig-speedup.patch b/glibc-ldconfig-speedup.patch deleted file mode 100644 index 606c9cb..0000000 --- a/glibc-ldconfig-speedup.patch +++ /dev/null @@ -1,1142 +0,0 @@ -2007-08-01 Andreas Jaeger - Jakub Jelinek - - * elf/ldconfig.c (opt_ignore_aux_cache): Add new option. - (options): Add option. - (parse_opt): Handle option. - (manual_link): Adjust process_file caller. Call implicit_soname. - (search_dir): Formatting. Use and populate auxiliary cache. - (main): Load and save auxiliary cache. - * elf/readlib.c (process_file): Add stat_buf argument. Pass struct - stat64 from fstat64 to caller. - (implicit_soname): New function. - * elf/readelflib.c (process_elf_file): If DT_SONAME is not present, - leave *soname as NULL. - * elf/cache.c: Include libgen.h. - (print_entry, print_cache, compare, save_cache, add_to_cache): - Formatting and cleanups. - (aux_cache_entry_id, aux_cache_entry, aux_cache_file_entry, - aux_cache_file): New structures. - (AUX_CACHEMAGIC): Define. - (primes): New array. - (aux_hash_size, aux_hash): New variables. - (aux_cache_entry_id_hash, nextprime, init_aux_cache, - search_aux_cache, insert_to_aux_cache, add_to_aux_cache, - load_aux_cache, save_aux_cache): New functions. - * sysdeps/generic/ldconfig.h (_PATH_LDCONFIG_AUX_CACHE): Define. - (init_aux_cache, search_aux_cache, add_to_aux_cache, - load_aux_cache, save_aux_cache, implicit_soname): New prototypes. - (process_file): Adjust prototype. - ---- libc/elf/ldconfig.c.jj 2007-07-16 09:58:46.000000000 +0200 -+++ libc/elf/ldconfig.c 2007-08-01 18:54:26.000000000 +0200 -@@ -112,6 +112,9 @@ static char *opt_chroot; - /* Manually link given shared libraries. */ - static int opt_manual_link; - -+/* Should we ignore an old auxiliary cache file? */ -+static int opt_ignore_aux_cache; -+ - /* Cache file to use. */ - static char *cache_file; - -@@ -142,6 +145,7 @@ static const struct argp_option options[ - { NULL, 'n', NULL, 0, N_("Only process directories specified on the command line. Don't build cache."), 0}, - { NULL, 'l', NULL, 0, N_("Manually link individual libraries."), 0}, - { "format", 'c', N_("FORMAT"), 0, N_("Format to use: new, old or compat (default)"), 0}, -+ { "ignore-aux-cache", 'i', NULL, 0, N_("Ignore auxiliary cache file"), 0}, - { NULL, 0, NULL, 0, NULL, 0 } - }; - -@@ -238,10 +242,15 @@ parse_opt (int key, char *arg, struct ar - { - case 'C': - cache_file = arg; -+ /* Ignore auxiliary cache since we use non-standard cache. */ -+ opt_ignore_aux_cache = 1; - break; - case 'f': - config_file = arg; - break; -+ case 'i': -+ opt_ignore_aux_cache = 1; -+ break; - case 'l': - opt_manual_link = 1; - break; -@@ -518,7 +527,7 @@ manual_link (char *library) - if (libname) - { - /* Successfully split names. Check if path is just "/" to avoid -- an empty path. */ -+ an empty path. */ - if (libname == path) - { - libname = library + 1; -@@ -572,14 +581,17 @@ manual_link (char *library) - free (path); - return; - } -+ - if (process_file (real_library, library, libname, &flag, &osversion, -- &soname, 0)) -+ &soname, 0, &stat_buf)) - { - error (0, 0, _("No link created since soname could not be found for %s"), - library); - free (path); - return; - } -+ if (soname == NULL) -+ soname = implicit_soname (libname, flag); - create_links (real_path, path, libname, soname); - free (soname); - free (path); -@@ -625,23 +637,7 @@ struct dlib_entry - static void - search_dir (const struct dir_entry *entry) - { -- DIR *dir; -- struct dirent64 *direntry; -- char *file_name, *dir_name, *real_file_name, *real_name; -- int file_name_len, real_file_name_len, len; -- char *soname; -- struct dlib_entry *dlibs; -- struct dlib_entry *dlib_ptr; -- struct stat64 lstat_buf, stat_buf; -- int is_link, is_dir; - uint64_t hwcap = path_hwcap (entry->path); -- unsigned int osversion; -- -- file_name_len = PATH_MAX; -- file_name = alloca (file_name_len); -- -- dlibs = NULL; -- - if (opt_verbose) - { - if (hwcap != 0) -@@ -650,6 +646,11 @@ search_dir (const struct dir_entry *entr - printf ("%s:\n", entry->path); - } - -+ char *dir_name; -+ char *real_file_name; -+ size_t real_file_name_len; -+ size_t file_name_len = PATH_MAX; -+ char *file_name = alloca (file_name_len); - if (opt_chroot) - { - dir_name = chroot_canon (opt_chroot, entry->path); -@@ -663,6 +664,7 @@ search_dir (const struct dir_entry *entr - real_file_name = file_name; - } - -+ DIR *dir; - if (dir_name == NULL || (dir = opendir (dir_name)) == NULL) - { - if (opt_verbose) -@@ -672,6 +674,8 @@ search_dir (const struct dir_entry *entr - return; - } - -+ struct dirent64 *direntry; -+ struct dlib_entry *dlibs = NULL; - while ((direntry = readdir64 (dir)) != NULL) - { - int flag; -@@ -695,7 +699,8 @@ search_dir (const struct dir_entry *entr - #endif - !is_hwcap_platform (direntry->d_name))) - continue; -- len = strlen (direntry->d_name); -+ -+ size_t len = strlen (direntry->d_name); - /* Skip temporary files created by the prelink program. Files with - names like these are never really DSOs we want to look at. */ - if (len >= sizeof (".#prelink#") - 1) -@@ -727,7 +732,10 @@ search_dir (const struct dir_entry *entr - } - sprintf (real_file_name, "%s/%s", dir_name, direntry->d_name); - } -+ -+ struct stat64 lstat_buf; - #ifdef _DIRENT_HAVE_D_TYPE -+ /* We optimize and try to do the lstat call only if needed. */ - if (direntry->d_type != DT_UNKNOWN) - lstat_buf.st_mode = DTTOIF (direntry->d_type); - else -@@ -738,9 +746,11 @@ search_dir (const struct dir_entry *entr - continue; - } - -- is_link = S_ISLNK (lstat_buf.st_mode); -+ struct stat64 stat_buf; -+ int is_dir; -+ int is_link = S_ISLNK (lstat_buf.st_mode); - if (is_link) -- { -+ { - /* In case of symlink, we check if the symlink refers to - a directory. */ - if (__builtin_expect (stat64 (real_file_name, &stat_buf), 0)) -@@ -754,6 +764,12 @@ search_dir (const struct dir_entry *entr - continue; - } - is_dir = S_ISDIR (stat_buf.st_mode); -+ -+ /* lstat_buf is later stored, update contents. */ -+ lstat_buf.st_dev = stat_buf.st_dev; -+ lstat_buf.st_ino = stat_buf.st_ino; -+ lstat_buf.st_size = stat_buf.st_size; -+ lstat_buf.st_ctime = stat_buf.st_ctime; - } - else - is_dir = S_ISDIR (lstat_buf.st_mode); -@@ -767,36 +783,28 @@ search_dir (const struct dir_entry *entr - new_entry->path = xstrdup (file_name); - new_entry->flag = entry->flag; - new_entry->next = NULL; -- if (is_link) -+#ifdef _DIRENT_HAVE_D_TYPE -+ /* We have filled in lstat only #ifndef -+ _DIRENT_HAVE_D_TYPE. Fill it in if needed. */ -+ if (!is_link -+ && direntry->d_type != DT_UNKNOWN -+ && __builtin_expect (lstat64 (real_file_name, &lstat_buf), 0)) - { -- new_entry->ino = stat_buf.st_ino; -- new_entry->dev = stat_buf.st_dev; -+ error (0, errno, _("Cannot lstat %s"), file_name); -+ free (new_entry->path); -+ free (new_entry); -+ continue; - } -- else -- { --#ifdef _DIRENT_HAVE_D_TYPE -- /* We have filled in lstat only #ifndef -- _DIRENT_HAVE_D_TYPE. Fill it in if needed. */ -- if (direntry->d_type != DT_UNKNOWN -- && __builtin_expect (lstat64 (real_file_name, &lstat_buf), -- 0)) -- { -- error (0, errno, _("Cannot lstat %s"), file_name); -- free (new_entry->path); -- free (new_entry); -- continue; -- } - #endif -- -- new_entry->ino = lstat_buf.st_ino; -- new_entry->dev = lstat_buf.st_dev; -- } -+ new_entry->ino = lstat_buf.st_ino; -+ new_entry->dev = lstat_buf.st_dev; - add_single_dir (new_entry, 0); - continue; - } - else if (!S_ISREG (lstat_buf.st_mode) && !is_link) - continue; - -+ char *real_name; - if (opt_chroot && is_link) - { - real_name = chroot_canon (opt_chroot, file_name); -@@ -810,14 +818,36 @@ search_dir (const struct dir_entry *entr - else - real_name = real_file_name; - -- if (process_file (real_name, file_name, direntry->d_name, &flag, -- &osversion, &soname, is_link)) -+#ifdef _DIRENT_HAVE_D_TYPE -+ /* Call lstat64 if not done yet. */ -+ if (!is_link -+ && direntry->d_type != DT_UNKNOWN -+ && __builtin_expect (lstat64 (real_file_name, &lstat_buf), 0)) - { -- if (real_name != real_file_name) -- free (real_name); -+ error (0, errno, _("Cannot lstat %s"), file_name); - continue; - } -+#endif -+ -+ /* First search whether the auxiliary cache contains this -+ library already and it's not changed. */ -+ char *soname; -+ unsigned int osversion; -+ if (!search_aux_cache (&lstat_buf, &flag, &osversion, &soname)) -+ { -+ if (process_file (real_name, file_name, direntry->d_name, &flag, -+ &osversion, &soname, is_link, &lstat_buf)) -+ { -+ if (real_name != real_file_name) -+ free (real_name); -+ continue; -+ } -+ else if (opt_build_cache) -+ add_to_aux_cache (&lstat_buf, flag, osversion, soname); -+ } - -+ if (soname == NULL) -+ soname = implicit_soname (direntry->d_name, flag); - - /* A link may just point to itself. */ - if (is_link) -@@ -834,7 +864,7 @@ search_dir (const struct dir_entry *entr - || strncmp (real_base_name, soname, len) != 0) - is_link = 0; - } -- } -+ } - - if (real_name != real_file_name) - free (real_name); -@@ -849,6 +879,7 @@ search_dir (const struct dir_entry *entr - && (entry->flag == FLAG_ELF_LIBC5 - || entry->flag == FLAG_ELF_LIBC6)) - flag = entry->flag; -+ - /* Some sanity checks to print warnings. */ - if (opt_verbose) - { -@@ -864,6 +895,7 @@ search_dir (const struct dir_entry *entr - } - - /* Add library to list. */ -+ struct dlib_entry *dlib_ptr; - for (dlib_ptr = dlibs; dlib_ptr != NULL; dlib_ptr = dlib_ptr->next) - { - /* Is soname already in list? */ -@@ -888,12 +920,13 @@ search_dir (const struct dir_entry *entr - dlib_ptr->flag = flag; - else - error (0, 0, _("libraries %s and %s in directory %s have same soname but different type."), -- dlib_ptr->name, direntry->d_name, entry->path); -+ dlib_ptr->name, direntry->d_name, -+ entry->path); - } - free (dlib_ptr->name); -- dlib_ptr->osversion = osversion; - dlib_ptr->name = xstrdup (direntry->d_name); - dlib_ptr->is_link = is_link; -+ dlib_ptr->osversion = osversion; - } - /* Don't add this library, abort loop. */ - /* Also free soname, since it's dynamically allocated. */ -@@ -906,10 +939,10 @@ search_dir (const struct dir_entry *entr - { - dlib_ptr = (struct dlib_entry *)xmalloc (sizeof (struct dlib_entry)); - dlib_ptr->name = xstrdup (direntry->d_name); -- dlib_ptr->flag = flag; -- dlib_ptr->osversion = osversion; - dlib_ptr->soname = soname; -+ dlib_ptr->flag = flag; - dlib_ptr->is_link = is_link; -+ dlib_ptr->osversion = osversion; - /* Add at head of list. */ - dlib_ptr->next = dlibs; - dlibs = dlib_ptr; -@@ -920,6 +953,7 @@ search_dir (const struct dir_entry *entr - - /* Now dlibs contains a list of all libs - add those to the cache - and created all symbolic links. */ -+ struct dlib_entry *dlib_ptr; - for (dlib_ptr = dlibs; dlib_ptr != NULL; dlib_ptr = dlib_ptr->next) - { - /* Don't create links to links. */ -@@ -1246,7 +1280,7 @@ main (int argc, char **argv) - if (opt_chroot) - { - /* Canonicalize the directory name of cache_file, not cache_file, -- because we'll rename a temporary cache file to it. */ -+ because we'll rename a temporary cache file to it. */ - char *p = strrchr (cache_file, '/'); - char *canon = chroot_canon (opt_chroot, - p ? (*p = '\0', cache_file) : "/"); -@@ -1293,10 +1327,18 @@ main (int argc, char **argv) - add_system_dir (LIBDIR); - } - -+ if (! opt_ignore_aux_cache) -+ load_aux_cache (_PATH_LDCONFIG_AUX_CACHE); -+ else -+ init_aux_cache (); -+ - search_dirs (); - - if (opt_build_cache) -- save_cache (cache_file); -+ { -+ save_cache (cache_file); -+ save_aux_cache (_PATH_LDCONFIG_AUX_CACHE); -+ } - - return 0; - } ---- libc/elf/readlib.c.jj 2007-07-16 09:58:46.000000000 +0200 -+++ libc/elf/readlib.c 2007-08-01 18:54:26.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1999-2003, 2005 Free Software Foundation, Inc. -+/* Copyright (C) 1999-2003, 2005, 2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 1999 and - Jakub Jelinek , 1999. -@@ -69,7 +69,7 @@ static struct known_names known_libs[] = - int - process_file (const char *real_file_name, const char *file_name, - const char *lib, int *flag, unsigned int *osversion, -- char **soname, int is_link) -+ char **soname, int is_link, struct stat64 *stat_buf) - { - FILE *file; - struct stat64 statbuf; -@@ -135,7 +135,7 @@ process_file (const char *real_file_name - ) - { - /* Aout files don't have a soname, just return the name -- including the major number. */ -+ including the major number. */ - char *copy, *major, *dot; - copy = xstrdup (lib); - major = strstr (copy, ".so."); -@@ -175,8 +175,31 @@ process_file (const char *real_file_name - munmap (file_contents, statbuf.st_size); - fclose (file); - -+ *stat_buf = statbuf; - return ret; - } - -+/* Returns made up soname if lib doesn't have explicit DT_SONAME. */ -+ -+char * -+implicit_soname (const char *lib, int flag) -+{ -+ char *soname = xstrdup (lib); -+ -+ if ((flag & FLAG_TYPE_MASK) != FLAG_LIBC4) -+ return soname; -+ -+ /* Aout files don't have a soname, just return the name -+ including the major number. */ -+ char *major = strstr (soname, ".so."); -+ if (major) -+ { -+ char *dot = strstr (major + 4, "."); -+ if (dot) -+ *dot = '\0'; -+ } -+ return soname; -+} -+ - /* Get architecture specific version of process_elf_file. */ - #include ---- libc/elf/readelflib.c.jj 2007-07-03 12:36:59.000000000 +0200 -+++ libc/elf/readelflib.c 2007-08-01 18:54:26.000000000 +0200 -@@ -231,11 +231,5 @@ process_elf_file (const char *file_name, - } - } - -- /* We reach this point only if the file doesn't contain a DT_SONAME -- or if we can't classify the library. If it doesn't have a -- soname, return the name of the library. */ -- if (*soname == NULL) -- *soname = xstrdup (lib); -- - return 0; - } ---- libc/elf/cache.c.jj 2007-07-16 09:58:46.000000000 +0200 -+++ libc/elf/cache.c 2007-08-01 19:00:30.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1999-2003,2005,2006 Free Software Foundation, Inc. -+/* Copyright (C) 1999-2003,2005,2006,2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 1999. - -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -80,16 +81,16 @@ print_entry (const char *lib, int flag, - fputs (",x86-64", stdout); - break; - case FLAG_S390_LIB64: -- fputs(",64bit", stdout); -+ fputs (",64bit", stdout); - break; - case FLAG_POWERPC_LIB64: -- fputs(",64bit", stdout); -+ fputs (",64bit", stdout); - break; - case FLAG_MIPS64_LIBN32: -- fputs(",N32", stdout); -+ fputs (",N32", stdout); - break; - case FLAG_MIPS64_LIBN64: -- fputs(",64bit", stdout); -+ fputs (",64bit", stdout); - case 0: - break; - default: -@@ -128,19 +129,11 @@ print_entry (const char *lib, int flag, - void - print_cache (const char *cache_name) - { -- size_t cache_size; -- struct stat64 st; -- int fd; -- unsigned int i; -- struct cache_file *cache; -- struct cache_file_new *cache_new = NULL; -- const char *cache_data; -- int format = 0; -- -- fd = open (cache_name, O_RDONLY); -+ int fd = open (cache_name, O_RDONLY); - if (fd < 0) - error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"), cache_name); - -+ struct stat64 st; - if (fstat64 (fd, &st) < 0 - /* No need to map the file if it is empty. */ - || st.st_size == 0) -@@ -149,14 +142,19 @@ print_cache (const char *cache_name) - return; - } - -- cache = mmap (0, st.st_size, PROT_READ, MAP_SHARED, fd, 0); -+ struct cache_file *cache -+ = mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); - if (cache == MAP_FAILED) - error (EXIT_FAILURE, errno, _("mmap of cache file failed.\n")); -- cache_size = st.st_size; - -+ size_t cache_size = st.st_size; - if (cache_size < sizeof (struct cache_file)) - error (EXIT_FAILURE, 0, _("File is not a cache file.\n")); - -+ struct cache_file_new *cache_new = NULL; -+ const char *cache_data; -+ int format = 0; -+ - if (memcmp (cache->magic, CACHEMAGIC, sizeof CACHEMAGIC - 1)) - { - /* This can only be the new format without the old one. */ -@@ -201,7 +199,7 @@ print_cache (const char *cache_name) - printf (_("%d libs found in cache `%s'\n"), cache->nlibs, cache_name); - - /* Print everything. */ -- for (i = 0; i < cache->nlibs; i++) -+ for (unsigned int i = 0; i < cache->nlibs; i++) - print_entry (cache_data + cache->libs[i].key, - cache->libs[i].flags, 0, 0, - cache_data + cache->libs[i].value); -@@ -212,7 +210,7 @@ print_cache (const char *cache_name) - cache_new->nlibs, cache_name); - - /* Print everything. */ -- for (i = 0; i < cache_new->nlibs; i++) -+ for (unsigned int i = 0; i < cache_new->nlibs; i++) - print_entry (cache_data + cache_new->libs[i].key, - cache_new->libs[i].flags, - cache_new->libs[i].osversion, -@@ -231,15 +229,11 @@ init_cache (void) - entries = NULL; - } - -- -- --static --int compare (const struct cache_entry *e1, const struct cache_entry *e2) -+static int -+compare (const struct cache_entry *e1, const struct cache_entry *e2) - { -- int res; -- - /* We need to swap entries here to get the correct sort order. */ -- res = _dl_cache_libcmp (e2->lib, e1->lib); -+ int res = _dl_cache_libcmp (e2->lib, e1->lib); - if (res == 0) - { - if (e1->flags < e2->flags) -@@ -267,29 +261,19 @@ int compare (const struct cache_entry *e - void - save_cache (const char *cache_name) - { -- struct cache_entry *entry; -- int fd, idx_old, idx_new; -- size_t total_strlen, len; -- char *strings, *str, *temp_name; -- struct cache_file *file_entries = NULL; -- struct cache_file_new *file_entries_new = NULL; -- size_t file_entries_size = 0; -- size_t file_entries_new_size = 0; -- unsigned int str_offset; -- /* Number of cache entries. */ -- int cache_entry_count = 0; -- /* Number of normal cache entries. */ -- int cache_entry_old_count = 0; -- /* Pad for alignment of cache_file_new. */ -- size_t pad; -- - /* The cache entries are sorted already, save them in this order. */ - - /* Count the length of all strings. */ - /* The old format doesn't contain hwcap entries and doesn't contain - libraries in subdirectories with hwcaps entries. Count therefore - also all entries with hwcap == 0. */ -- total_strlen = 0; -+ size_t total_strlen = 0; -+ struct cache_entry *entry; -+ /* Number of cache entries. */ -+ int cache_entry_count = 0; -+ /* Number of normal cache entries. */ -+ int cache_entry_old_count = 0; -+ - for (entry = entries; entry != NULL; entry = entry->next) - { - /* Account the final NULs. */ -@@ -300,8 +284,8 @@ save_cache (const char *cache_name) - } - - /* Create the on disk cache structure. */ -- /* First an array for all strings. */ -- strings = (char *)xmalloc (total_strlen); -+ struct cache_file *file_entries = NULL; -+ size_t file_entries_size = 0; - - if (opt_format != 2) - { -@@ -315,25 +299,27 @@ save_cache (const char *cache_name) - /* And the list of all entries in the old format. */ - file_entries_size = sizeof (struct cache_file) - + cache_entry_old_count * sizeof (struct file_entry); -- file_entries = (struct cache_file *) xmalloc (file_entries_size); -+ file_entries = xmalloc (file_entries_size); - - /* Fill in the header. */ -- memset (file_entries, 0, sizeof (struct cache_file)); -+ memset (file_entries, '\0', sizeof (struct cache_file)); - memcpy (file_entries->magic, CACHEMAGIC, sizeof CACHEMAGIC - 1); - - file_entries->nlibs = cache_entry_old_count; - } - -+ struct cache_file_new *file_entries_new = NULL; -+ size_t file_entries_new_size = 0; -+ - if (opt_format != 0) - { - /* And the list of all entries in the new format. */ - file_entries_new_size = sizeof (struct cache_file_new) - + cache_entry_count * sizeof (struct file_entry_new); -- file_entries_new = -- (struct cache_file_new *) xmalloc (file_entries_new_size); -+ file_entries_new = xmalloc (file_entries_new_size); - - /* Fill in the header. */ -- memset (file_entries_new, 0, sizeof (struct cache_file_new)); -+ memset (file_entries_new, '\0', sizeof (struct cache_file_new)); - memcpy (file_entries_new->magic, CACHEMAGIC_NEW, - sizeof CACHEMAGIC_NEW - 1); - memcpy (file_entries_new->version, CACHE_VERSION, -@@ -343,17 +329,24 @@ save_cache (const char *cache_name) - file_entries_new->len_strings = total_strlen; - } - -- pad = ALIGN_CACHE (file_entries_size) - file_entries_size; -+ /* Pad for alignment of cache_file_new. */ -+ size_t pad = ALIGN_CACHE (file_entries_size) - file_entries_size; - - /* If we have both formats, we hide the new format in the strings - table, we have to adjust all string indices for this so that - old libc5/glibc 2 dynamic linkers just ignore them. */ -+ unsigned int str_offset; - if (opt_format != 0) - str_offset = file_entries_new_size; - else - str_offset = 0; - -- str = strings; -+ /* An array for all strings. */ -+ char *strings = xmalloc (total_strlen); -+ char *str = strings; -+ int idx_old; -+ int idx_new; -+ - for (idx_old = 0, idx_new = 0, entry = entries; entry != NULL; - entry = entry->next, ++idx_new) - { -@@ -375,21 +368,18 @@ save_cache (const char *cache_name) - file_entries_new->libs[idx_new].hwcap = entry->hwcap; - file_entries_new->libs[idx_new].key = str_offset; - } -- len = strlen (entry->lib); -- str = stpcpy (str, entry->lib); -- /* Account the final NUL. */ -- ++str; -- str_offset += len + 1; -+ -+ size_t len = strlen (entry->lib) + 1; -+ str = mempcpy (str, entry->lib, len); -+ str_offset += len; - /* Then the path. */ - if (opt_format != 2 && entry->hwcap == 0) - file_entries->libs[idx_old].value = str_offset + pad; - if (opt_format != 0) - file_entries_new->libs[idx_new].value = str_offset; -- len = strlen (entry->path); -- str = stpcpy (str, entry->path); -- /* Account the final NUL. */ -- ++str; -- str_offset += len + 1; -+ len = strlen (entry->path) + 1; -+ str = mempcpy (str, entry->path, len); -+ str_offset += len; - /* Ignore entries with hwcap for old format. */ - if (entry->hwcap == 0) - ++idx_old; -@@ -403,16 +393,12 @@ save_cache (const char *cache_name) - /* Write out the cache. */ - - /* Write cache first to a temporary file and rename it later. */ -- temp_name = xmalloc (strlen (cache_name) + 2); -+ char *temp_name = xmalloc (strlen (cache_name) + 2); - sprintf (temp_name, "%s~", cache_name); -- /* First remove an old copy if it exists. */ -- if (unlink (temp_name) && errno != ENOENT) -- error (EXIT_FAILURE, errno, _("Can't remove old temporary cache file %s"), -- temp_name); - - /* Create file. */ -- fd = open (temp_name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, -- S_IROTH|S_IRGRP|S_IRUSR|S_IWUSR); -+ int fd = open (temp_name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, -+ S_IRUSR|S_IWUSR); - if (fd < 0) - error (EXIT_FAILURE, errno, _("Can't create temporary cache file %s"), - temp_name); -@@ -439,11 +425,10 @@ save_cache (const char *cache_name) - error (EXIT_FAILURE, errno, _("Writing of cache data failed")); - } - -- if (write (fd, strings, total_strlen) != (ssize_t) total_strlen) -+ if (write (fd, strings, total_strlen) != (ssize_t) total_strlen -+ || close (fd)) - error (EXIT_FAILURE, errno, _("Writing of cache data failed")); - -- close (fd); -- - /* Make sure user can always read cache file */ - if (chmod (temp_name, S_IROTH|S_IRGRP|S_IRUSR|S_IWUSR)) - error (EXIT_FAILURE, errno, -@@ -463,8 +448,6 @@ save_cache (const char *cache_name) - while (entries) - { - entry = entries; -- free (entry->path); -- free (entry->lib); - entries = entries->next; - free (entry); - } -@@ -476,33 +459,29 @@ void - add_to_cache (const char *path, const char *lib, int flags, - unsigned int osversion, uint64_t hwcap) - { -- struct cache_entry *new_entry, *ptr, *prev; -- char *full_path; -- size_t len, i; -- -- new_entry = (struct cache_entry *) xmalloc (sizeof (struct cache_entry)); -- -- len = strlen (lib) + strlen (path) + 2; -- -- full_path = (char *) xmalloc (len); -- snprintf (full_path, len, "%s/%s", path, lib); -- -- new_entry->lib = xstrdup (lib); -- new_entry->path = full_path; -+ size_t liblen = strlen (lib) + 1; -+ size_t len = liblen + strlen (path) + 1; -+ struct cache_entry *new_entry -+ = xmalloc (sizeof (struct cache_entry) + liblen + len); -+ -+ new_entry->lib = memcpy ((char *) (new_entry + 1), lib, liblen); -+ new_entry->path = new_entry->lib + liblen; -+ snprintf (new_entry->path, len, "%s/%s", path, lib); - new_entry->flags = flags; - new_entry->osversion = osversion; - new_entry->hwcap = hwcap; - new_entry->bits_hwcap = 0; - - /* Count the number of bits set in the masked value. */ -- for (i = 0; (~((1ULL << i) - 1) & hwcap) != 0 && i < 8 * sizeof (hwcap); ++i) -+ for (size_t i = 0; -+ (~((1ULL << i) - 1) & hwcap) != 0 && i < 8 * sizeof (hwcap); ++i) - if ((hwcap & (1ULL << i)) != 0) - ++new_entry->bits_hwcap; - - - /* Keep the list sorted - search for right place to insert. */ -- ptr = entries; -- prev = entries; -+ struct cache_entry *ptr = entries; -+ struct cache_entry *prev = entries; - while (ptr != NULL) - { - if (compare (ptr, new_entry) > 0) -@@ -522,3 +501,304 @@ add_to_cache (const char *path, const ch - prev->next = new_entry; - } - } -+ -+ -+/* Auxiliary cache. */ -+ -+struct aux_cache_entry_id -+{ -+ uint64_t ino; -+ uint64_t ctime; -+ uint64_t size; -+ uint64_t dev; -+}; -+ -+struct aux_cache_entry -+{ -+ struct aux_cache_entry_id id; -+ int flags; -+ unsigned int osversion; -+ int used; -+ char *soname; -+ struct aux_cache_entry *next; -+}; -+ -+#define AUX_CACHEMAGIC "glibc-ld.so.auxcache-1.0" -+ -+struct aux_cache_file_entry -+{ -+ struct aux_cache_entry_id id; /* Unique id of entry. */ -+ int32_t flags; /* This is 1 for an ELF library. */ -+ uint32_t soname; /* String table indice. */ -+ uint32_t osversion; /* Required OS version. */ -+ int32_t pad; -+}; -+ -+/* ldconfig maintains an auxiliary cache file that allows -+ only reading those libraries that have changed since the last iteration. -+ For this for each library some information is cached in the auxiliary -+ cache. */ -+struct aux_cache_file -+{ -+ char magic[sizeof AUX_CACHEMAGIC - 1]; -+ uint32_t nlibs; /* Number of entries. */ -+ uint32_t len_strings; /* Size of string table. */ -+ struct aux_cache_file_entry libs[0]; /* Entries describing libraries. */ -+ /* After this the string table of size len_strings is found. */ -+}; -+ -+static unsigned int primes[] = -+{ -+ 1021, 2039, 4093, 8191, 16381, 32749, 65521, 131071, 262139, -+ 524287, 1048573, 2097143, 4194301, 8388593, 16777213, 33554393, -+ 67108859, 134217689, 268435399, 536870909, 1073741789, 2147483647 -+}; -+ -+static size_t aux_hash_size; -+static struct aux_cache_entry **aux_hash; -+ -+/* Simplistic hash function for aux_cache_entry_id. */ -+static unsigned int -+aux_cache_entry_id_hash (struct aux_cache_entry_id *id) -+{ -+ uint64_t ret = ((id->ino * 11 + id->ctime) * 11 + id->size) * 11 + id->dev; -+ return ret ^ (ret >> 32); -+} -+ -+static size_t nextprime (size_t x) -+{ -+ for (unsigned int i = 0; i < sizeof (primes) / sizeof (primes[0]); ++i) -+ if (primes[i] >= x) -+ return primes[i]; -+ return x; -+} -+ -+void -+init_aux_cache (void) -+{ -+ aux_hash_size = primes[3]; -+ aux_hash = xcalloc (aux_hash_size, sizeof (struct aux_cache_entry *)); -+} -+ -+int -+search_aux_cache (struct stat64 *stat_buf, int *flags, -+ unsigned int *osversion, char **soname) -+{ -+ struct aux_cache_entry_id id; -+ id.ino = (uint64_t) stat_buf->st_ino; -+ id.ctime = (uint64_t) stat_buf->st_ctime; -+ id.size = (uint64_t) stat_buf->st_size; -+ id.dev = (uint64_t) stat_buf->st_dev; -+ -+ unsigned int hash = aux_cache_entry_id_hash (&id); -+ struct aux_cache_entry *entry; -+ for (entry = aux_hash[hash % aux_hash_size]; entry; entry = entry->next) -+ if (id.ino == entry->id.ino -+ && id.ctime == entry->id.ctime -+ && id.size == entry->id.size -+ && id.dev == entry->id.dev) -+ { -+ *flags = entry->flags; -+ *osversion = entry->osversion; -+ if (entry->soname != NULL) -+ *soname = xstrdup (entry->soname); -+ else -+ *soname = NULL; -+ entry->used = 1; -+ return 1; -+ } -+ -+ return 0; -+} -+ -+static void -+insert_to_aux_cache (struct aux_cache_entry_id *id, int flags, -+ unsigned int osversion, const char *soname, int used) -+{ -+ size_t hash = aux_cache_entry_id_hash (id) % aux_hash_size; -+ struct aux_cache_entry *entry; -+ for (entry = aux_hash[hash]; entry; entry = entry->next) -+ if (id->ino == entry->id.ino -+ && id->ctime == entry->id.ctime -+ && id->size == entry->id.size -+ && id->dev == entry->id.dev) -+ abort (); -+ -+ size_t len = soname ? strlen (soname) + 1 : 0; -+ entry = xmalloc (sizeof (struct aux_cache_entry) + len); -+ entry->id = *id; -+ entry->flags = flags; -+ entry->osversion = osversion; -+ entry->used = used; -+ if (soname != NULL) -+ entry->soname = memcpy ((char *) (entry + 1), soname, len); -+ else -+ entry->soname = NULL; -+ entry->next = aux_hash[hash]; -+ aux_hash[hash] = entry; -+} -+ -+void -+add_to_aux_cache (struct stat64 *stat_buf, int flags, -+ unsigned int osversion, const char *soname) -+{ -+ struct aux_cache_entry_id id; -+ id.ino = (uint64_t) stat_buf->st_ino; -+ id.ctime = (uint64_t) stat_buf->st_ctime; -+ id.size = (uint64_t) stat_buf->st_size; -+ id.dev = (uint64_t) stat_buf->st_dev; -+ insert_to_aux_cache (&id, flags, osversion, soname, 1); -+} -+ -+/* Load auxiliary cache to search for unchanged entries. */ -+void -+load_aux_cache (const char *aux_cache_name) -+{ -+ int fd = open (aux_cache_name, O_RDONLY); -+ if (fd < 0) -+ { -+ init_aux_cache (); -+ return; -+ } -+ -+ struct stat64 st; -+ if (fstat64 (fd, &st) < 0 || st.st_size < sizeof (struct aux_cache_file)) -+ { -+ close (fd); -+ init_aux_cache (); -+ return; -+ } -+ -+ size_t aux_cache_size = st.st_size; -+ struct aux_cache_file *aux_cache -+ = mmap (NULL, aux_cache_size, PROT_READ, MAP_PRIVATE, fd, 0); -+ if (aux_cache == MAP_FAILED -+ || aux_cache_size < sizeof (struct aux_cache_file) -+ || memcmp (aux_cache->magic, AUX_CACHEMAGIC, sizeof AUX_CACHEMAGIC - 1) -+ || aux_cache->nlibs < 0 -+ || aux_cache->nlibs >= aux_cache_size) -+ { -+ close (fd); -+ init_aux_cache (); -+ return; -+ } -+ -+ aux_hash_size = nextprime (aux_cache->nlibs); -+ aux_hash = xcalloc (aux_hash_size, sizeof (struct aux_cache_entry *)); -+ -+ const char *aux_cache_data -+ = (const char *) &aux_cache->libs[aux_cache->nlibs]; -+ for (unsigned int i = 0; i < aux_cache->nlibs; ++i) -+ insert_to_aux_cache (&aux_cache->libs[i].id, -+ aux_cache->libs[i].flags, -+ aux_cache->libs[i].osversion, -+ aux_cache->libs[i].soname == 0 -+ ? NULL : aux_cache_data + aux_cache->libs[i].soname, -+ 0); -+ -+ munmap (aux_cache, aux_cache_size); -+ close (fd); -+} -+ -+/* Save the contents of the auxiliary cache. */ -+void -+save_aux_cache (const char *aux_cache_name) -+{ -+ /* Count the length of all sonames. We start with empty string. */ -+ size_t total_strlen = 1; -+ /* Number of cache entries. */ -+ int cache_entry_count = 0; -+ -+ for (size_t i = 0; i < aux_hash_size; ++i) -+ for (struct aux_cache_entry *entry = aux_hash[i]; -+ entry != NULL; entry = entry->next) -+ if (entry->used) -+ { -+ ++cache_entry_count; -+ if (entry->soname != NULL) -+ total_strlen += strlen (entry->soname) + 1; -+ } -+ -+ /* Auxiliary cache. */ -+ size_t file_entries_size -+ = sizeof (struct aux_cache_file) -+ + cache_entry_count * sizeof (struct aux_cache_file_entry); -+ struct aux_cache_file *file_entries -+ = xmalloc (file_entries_size + total_strlen); -+ -+ /* Fill in the header of the auxiliary cache. */ -+ memset (file_entries, '\0', sizeof (struct aux_cache_file)); -+ memcpy (file_entries->magic, AUX_CACHEMAGIC, sizeof AUX_CACHEMAGIC - 1); -+ -+ file_entries->nlibs = cache_entry_count; -+ file_entries->len_strings = total_strlen; -+ -+ /* Initial String offset for auxiliary cache is always after the -+ special empty string. */ -+ unsigned int str_offset = 1; -+ -+ /* An array for all strings. */ -+ char *str = (char *) file_entries + file_entries_size; -+ *str++ = '\0'; -+ -+ size_t idx = 0; -+ for (size_t i = 0; i < aux_hash_size; ++i) -+ for (struct aux_cache_entry *entry = aux_hash[i]; -+ entry != NULL; entry = entry->next) -+ if (entry->used) -+ { -+ file_entries->libs[idx].id = entry->id; -+ file_entries->libs[idx].flags = entry->flags; -+ if (entry->soname == NULL) -+ file_entries->libs[idx].soname = 0; -+ else -+ { -+ file_entries->libs[idx].soname = str_offset; -+ -+ size_t len = strlen (entry->soname) + 1; -+ str = mempcpy (str, entry->soname, len); -+ str_offset += len; -+ } -+ file_entries->libs[idx].osversion = entry->osversion; -+ file_entries->libs[idx++].pad = 0; -+ } -+ -+ /* Write out auxiliary cache file. */ -+ /* Write auxiliary cache first to a temporary file and rename it later. */ -+ -+ char *temp_name = xmalloc (strlen (aux_cache_name) + 2); -+ sprintf (temp_name, "%s~", aux_cache_name); -+ -+ /* Check that directory exists and create if needed. */ -+ char *dir = strdupa (aux_cache_name); -+ dir = dirname (dir); -+ -+ struct stat64 st; -+ if (stat64 (dir, &st) < 0) -+ { -+ if (mkdir (dir, 0700) < 0) -+ goto out_fail; -+ } -+ -+ /* Create file. */ -+ int fd = open (temp_name, O_CREAT|O_WRONLY|O_TRUNC|O_NOFOLLOW, -+ S_IRUSR|S_IWUSR); -+ if (fd < 0) -+ goto out_fail; -+ -+ if (write (fd, file_entries, file_entries_size + total_strlen) -+ != (ssize_t) (file_entries_size + total_strlen) -+ || close (fd)) -+ { -+ unlink (temp_name); -+ goto out_fail; -+ } -+ -+ /* Move temporary to its final location. */ -+ if (rename (temp_name, aux_cache_name)) -+ unlink (temp_name); -+ -+out_fail: -+ /* Free allocated memory. */ -+ free (file_entries); -+} ---- libc/sysdeps/generic/ldconfig.h.jj 2003-03-14 06:32:49.000000000 +0100 -+++ libc/sysdeps/generic/ldconfig.h 2007-08-01 18:54:26.000000000 +0200 -@@ -1,4 +1,4 @@ --/* Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. -+/* Copyright (C) 1999, 2000, 2002, 2003, 2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 1999. - -@@ -35,6 +35,9 @@ - #define FLAG_MIPS64_LIBN32 0x0600 - #define FLAG_MIPS64_LIBN64 0x0700 - -+/* Name of auxiliary cache. */ -+#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache" -+ - /* Declared in cache.c. */ - extern void print_cache (const char *cache_name); - -@@ -45,10 +48,24 @@ extern void save_cache (const char *cach - extern void add_to_cache (const char *path, const char *lib, int flags, - unsigned int osversion, uint64_t hwcap); - -+extern void init_aux_cache (void); -+ -+extern void load_aux_cache (const char *aux_cache_name); -+ -+extern int search_aux_cache (struct stat64 *stat_buf, int *flags, -+ unsigned int *osversion, char **soname); -+ -+extern void add_to_aux_cache (struct stat64 *stat_buf, int flags, -+ unsigned int osversion, const char *soname); -+ -+extern void save_aux_cache (const char *aux_cache_name); -+ - /* Declared in readlib.c. */ - extern int process_file (const char *real_file_name, const char *file_name, - const char *lib, int *flag, unsigned int *osversion, -- char **soname, int is_link); -+ char **soname, int is_link, struct stat64 *stat_buf); -+ -+extern char *implicit_soname (const char *lib, int flag); - - /* Declared in readelflib.c. */ - extern int process_elf_file (const char *file_name, const char *lib, int *flag, diff --git a/glibc-ppc-rt.patch b/glibc-ppc-rt.patch deleted file mode 100644 index fd7e23d..0000000 --- a/glibc-ppc-rt.patch +++ /dev/null @@ -1,94 +0,0 @@ -2007-08-05 Jakub Jelinek - - * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h (PSEUDO): - Don't use CGOTSETUP and CGOTRESTORE macros. - (CGOTSETUP, CGOTRESTORE): Remove. - (CENABLE, CDISABLE): Don't use JUMPTARGET, branch to - @local symbol. - - * sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S (__socket): - Don't use CGOTSETUP and CGOTRESTORE macros. - ---- libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h.jj 2006-10-29 22:48:07.000000000 +0100 -+++ libc/nptl/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep-cancel.h 2007-08-05 12:29:44.000000000 +0200 -@@ -1,5 +1,5 @@ - /* Cancellable system call stubs. Linux/PowerPC version. -- Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -+ Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Franz Sirl , 2003. - -@@ -44,7 +44,6 @@ - mflr 9; \ - stw 9,52(1); \ - cfi_offset (lr, 4); \ -- CGOTSETUP; \ - DOCARGS_##args; /* save syscall args around CENABLE. */ \ - CENABLE; \ - stw 3,16(1); /* store CENABLE return value (MASK). */ \ -@@ -58,7 +57,6 @@ - lwz 4,52(1); \ - lwz 0,12(1); /* restore CR/R3. */ \ - lwz 3,8(1); \ -- CGOTRESTORE; \ - mtlr 4; \ - mtcr 0; \ - addi 1,1,48; -@@ -84,9 +82,6 @@ - # define DOCARGS_6 stw 8,40(1); DOCARGS_5 - # define UNDOCARGS_6 lwz 8,40(1); UNDOCARGS_5 - --# define CGOTSETUP --# define CGOTRESTORE -- - # ifdef IS_IN_libpthread - # define CENABLE bl __pthread_enable_asynccancel@local - # define CDISABLE bl __pthread_disable_asynccancel@local -@@ -94,20 +89,8 @@ - # define CENABLE bl __libc_enable_asynccancel@local - # define CDISABLE bl __libc_disable_asynccancel@local - # elif defined IS_IN_librt --# define CENABLE bl JUMPTARGET(__librt_enable_asynccancel) --# define CDISABLE bl JUMPTARGET(__librt_disable_asynccancel) --# if defined HAVE_AS_REL16 && defined PIC --# undef CGOTSETUP --# define CGOTSETUP \ -- bcl 20,31,1f; \ -- 1: stw 30,44(1); \ -- mflr 30; \ -- addis 30,30,_GLOBAL_OFFSET_TABLE-1b@ha; \ -- addi 30,30,_GLOBAL_OFFSET_TABLE-1b@l --# undef CGOTRESTORE --# define CGOTRESTORE \ -- lwz 30,44(1) --# endif -+# define CENABLE bl __librt_enable_asynccancel@local -+# define CDISABLE bl __librt_disable_asynccancel@local - # else - # error Unsupported library - # endif ---- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S.jj 2006-01-04 20:58:34.000000000 +0100 -+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S 2007-08-05 13:39:59.000000000 +0200 -@@ -1,4 +1,5 @@ --/* Copyright (C) 1995,96,97,99, 2003, 2006 Free Software Foundation, Inc. -+/* Copyright (C) 1995-1997, 1999, 2003, 2006, 2007 -+ Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or -@@ -93,7 +94,6 @@ ENTRY(__socket) - mflr r9 - stw r9,52(r1) - cfi_offset (lr, 4) -- CGOTSETUP - CENABLE - stw r3,16(r1) - li r3,P(SOCKOP_,socket) -@@ -107,7 +107,6 @@ ENTRY(__socket) - lwz r4,52(r1) - lwz r0,12(r1) - lwz r3,8(r1) -- CGOTRESTORE - mtlr r4 - mtcr r0 - addi r1,r1,48 diff --git a/glibc.spec b/glibc.spec index 91c86a5..07bf562 100644 --- a/glibc.spec +++ b/glibc.spec @@ -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 @@ Source2: %(echo %{glibcsrcdir} | sed s/glibc-/glibc-libidn-/).tar.bz2 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 @@ If unsure if you need this, don't install this package. %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 @@ with -static -L%{_prefix}/lib/debug%{_prefix}/%{_lib} compiler options. %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 @@ package or when debugging this package. %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 @@ rm -f $RPM_BUILD_ROOT/etc/ld.so.cache # 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 @@ ln -sf /%{_lib}/ld-linux-ia64.so.2 $RPM_BUILD_ROOT/lib/ld-linux-ia64.so.2 %endif %endif +%if %{run_glibc_tests} + # Increase timeouts export TIMEOUTFACTOR=16 parent=$$ @@ -750,84 +751,37 @@ echo ====================PLT RELOCS LIBC.SO============== readelf -Wr $RPM_BUILD_ROOT/%{_lib}/libc-*.so | sed -n -e "$PLTCMD" echo ====================PLT RELOCS END================== +%endif + %if "%{_enable_debug_packages}" == "1" -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 +# 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 .) -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 +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 '/$\|$\|\.gperf$' | LC_ALL=C sort -u > $sf.sorted -xargs -0 -n 1 echo < $csf | LC_ALL=C grep -v '/$\|$\|\.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 @@ find $RPM_BUILD_ROOT/usr/src/debug -type d -print | xargs chmod a+rx %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 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid} %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 @@ rm -f *.filelist* %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 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 2.6.90-4 - fix librt.so and librtkaio.so on ppc32, so that it is not using bss PLT diff --git a/sources b/sources index 4aaf4aa..120f64a 100644 --- a/sources +++ b/sources @@ -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