From 7d351d9b1519d7f387167530721786d696405175 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 17 Apr 2007 00:12:45 +0000 Subject: [PATCH] auto-import glibc-2.5.90-21 on branch devel from glibc-2.5.90-21.src.rpm --- .cvsignore | 4 +- glibc-fedora.patch | 304 ++++++++++++++++++++++++--------------------- glibc.spec | 48 ++++--- sources | 4 +- 4 files changed, 193 insertions(+), 167 deletions(-) diff --git a/.cvsignore b/.cvsignore index 20beb31..c7017e9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20070331T1609.tar.bz2 -glibc-fedora-20070331T1609.tar.bz2 +glibc-20070416T2350.tar.bz2 +glibc-fedora-20070416T2350.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 333034e..6be01d0 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,14 @@ ---- glibc-20070331T1609/ChangeLog 26 Mar 2007 20:41:09 -0000 1.10570 -+++ glibc-20070331T1609-fedora/ChangeLog 31 Mar 2007 17:23:53 -0000 1.8782.2.237 -@@ -1054,6 +1054,15 @@ +--- glibc-20070416T2350/ChangeLog 16 Apr 2007 23:44:21 -0000 1.10587 ++++ glibc-20070416T2350-fedora/ChangeLog 16 Apr 2007 23:59:01 -0000 1.8782.2.239 +@@ -1,3 +1,7 @@ ++2007-04-16 Jakub Jelinek ++ ++ * locale/programs/locarchive.c (add_alias, insert_name): Remove static. ++ + 2007-04-16 Ulrich Drepper + + [BZ #4364] +@@ -1255,6 +1259,15 @@ separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. @@ -16,8 +24,8 @@ 2006-12-09 Ulrich Drepper [BZ #3632] ---- glibc-20070331T1609/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20070331T1609-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 +--- glibc-20070416T2350/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20070416T2350-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -83,8 +91,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20070331T1609/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20070331T1609-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20070416T2350/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20070416T2350-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. @@ -256,8 +264,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20070331T1609/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 -+++ glibc-20070331T1609-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 +--- glibc-20070416T2350/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 ++++ glibc-20070416T2350-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 $@ @@ -268,8 +276,8 @@ vpath initfini.c $(sysdirs) ---- glibc-20070331T1609/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20070331T1609-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20070416T2350/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20070416T2350-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; @@ -294,8 +302,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20070331T1609/debug/tst-chk1.c 24 Apr 2006 17:00:18 -0000 1.15 -+++ glibc-20070331T1609-fedora/debug/tst-chk1.c 24 Apr 2006 20:31:49 -0000 1.1.2.16 +--- glibc-20070416T2350/debug/tst-chk1.c 24 Apr 2006 17:00:18 -0000 1.15 ++++ glibc-20070416T2350-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. */ @@ -324,8 +332,8 @@ # define O 0 #else # define O 1 ---- glibc-20070331T1609/elf/ldconfig.c 3 Jan 2007 05:44:11 -0000 1.58 -+++ glibc-20070331T1609-fedora/elf/ldconfig.c 17 Jan 2007 10:42:36 -0000 1.47.2.13 +--- glibc-20070416T2350/elf/ldconfig.c 13 Apr 2007 19:53:20 -0000 1.59 ++++ glibc-20070416T2350-fedora/elf/ldconfig.c 16 Apr 2007 23:59:03 -0000 1.47.2.14 @@ -965,17 +965,19 @@ search_dirs (void) @@ -407,8 +415,8 @@ } search_dirs (); ---- glibc-20070331T1609/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20070331T1609-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20070416T2350/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20070416T2350-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; @@ -433,8 +441,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20070331T1609/iconv/iconvconfig.c 3 Jan 2007 05:44:11 -0000 1.27 -+++ glibc-20070331T1609-fedora/iconv/iconvconfig.c 17 Jan 2007 10:42:36 -0000 1.19.2.8 +--- glibc-20070416T2350/iconv/iconvconfig.c 3 Jan 2007 05:44:11 -0000 1.27 ++++ glibc-20070416T2350-fedora/iconv/iconvconfig.c 17 Jan 2007 10:42:36 -0000 1.19.2.8 @@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) @@ -511,8 +519,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20070331T1609/include/features.h 10 Dec 2006 01:54:13 -0000 1.45 -+++ glibc-20070331T1609-fedora/include/features.h 10 Dec 2006 10:38:54 -0000 1.35.2.14 +--- glibc-20070416T2350/include/features.h 10 Dec 2006 01:54:13 -0000 1.45 ++++ glibc-20070416T2350-fedora/include/features.h 10 Dec 2006 10:38:54 -0000 1.35.2.14 @@ -275,7 +275,13 @@ #endif @@ -528,16 +536,16 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20070331T1609/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20070331T1609-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20070416T2350/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20070416T2350-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20070331T1609/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20070331T1609-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20070416T2350/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20070416T2350-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20070331T1609/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20070331T1609-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20070416T2350/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20070416T2350-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 @@ -547,8 +555,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20070331T1609/libio/stdio.h 17 Feb 2007 18:26:15 -0000 1.89 -+++ glibc-20070331T1609-fedora/libio/stdio.h 21 Feb 2007 11:15:50 -0000 1.78.2.11 +--- glibc-20070416T2350/libio/stdio.h 17 Feb 2007 18:26:15 -0000 1.89 ++++ glibc-20070416T2350-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. */ @@ -562,8 +570,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20070331T1609/libio/bits/stdio2.h 17 Mar 2007 17:04:08 -0000 1.5 -+++ glibc-20070331T1609-fedora/libio/bits/stdio2.h 17 Mar 2007 21:52:49 -0000 1.1.2.7 +--- glibc-20070416T2350/libio/bits/stdio2.h 17 Mar 2007 17:04:08 -0000 1.5 ++++ glibc-20070416T2350-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); @@ -594,8 +602,8 @@ #endif ---- glibc-20070331T1609/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 -+++ glibc-20070331T1609-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 +--- glibc-20070416T2350/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 ++++ glibc-20070416T2350-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 !!! @@ -687,8 +695,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20070331T1609/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 -+++ glibc-20070331T1609-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 +--- glibc-20070416T2350/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20070416T2350-fedora/locale/programs/3level.h 19 Dec 2005 12:11:15 -0000 1.5.2.2 @@ -202,6 +202,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, } } @@ -732,8 +740,41 @@ #endif #ifndef NO_FINALIZE ---- glibc-20070331T1609/localedata/Makefile 14 Mar 2007 22:32:43 -0000 1.105 -+++ glibc-20070331T1609-fedora/localedata/Makefile 17 Mar 2007 21:52:52 -0000 1.101.2.5 +--- glibc-20070416T2350/locale/programs/locarchive.c 16 Apr 2007 23:30:58 -0000 1.24 ++++ glibc-20070416T2350-fedora/locale/programs/locarchive.c 16 Apr 2007 23:59:03 -0000 1.21.2.3 +@@ -221,9 +221,9 @@ oldlocrecentcmp (const void *a, const vo + /* forward decls for below */ + static uint32_t add_locale (struct locarhandle *ah, const char *name, + locale_data_t data, bool replace); +-static void add_alias (struct locarhandle *ah, const char *alias, +- bool replace, const char *oldname, +- uint32_t *locrec_offset_p); ++void add_alias (struct locarhandle *ah, const char *alias, ++ bool replace, const char *oldname, ++ uint32_t *locrec_offset_p); + + static void + enlarge_archive (struct locarhandle *ah, const struct locarhead *head) +@@ -541,7 +541,7 @@ close_archive (struct locarhandle *ah) + #include "../../intl/explodename.c" + #include "../../intl/l10nflist.c" + +-static struct namehashent * ++struct namehashent * + insert_name (struct locarhandle *ah, + const char *name, size_t name_len, bool replace) + { +@@ -599,7 +599,7 @@ insert_name (struct locarhandle *ah, + return &namehashtab[idx]; + } + +-static void ++void + add_alias (struct locarhandle *ah, const char *alias, bool replace, + const char *oldname, uint32_t *locrec_offset_p) + { +--- glibc-20070416T2350/localedata/Makefile 14 Mar 2007 22:32:43 -0000 1.105 ++++ glibc-20070416T2350-fedora/localedata/Makefile 17 Mar 2007 21:52:52 -0000 1.101.2.5 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -742,8 +783,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20070331T1609/localedata/SUPPORTED 18 Feb 2007 04:52:09 -0000 1.102 -+++ glibc-20070331T1609-fedora/localedata/SUPPORTED 21 Feb 2007 11:15:50 -0000 1.71.2.16 +--- glibc-20070416T2350/localedata/SUPPORTED 18 Feb 2007 04:52:09 -0000 1.102 ++++ glibc-20070416T2350-fedora/localedata/SUPPORTED 21 Feb 2007 11:15:50 -0000 1.71.2.16 @@ -78,6 +78,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -785,8 +826,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20070331T1609/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20070331T1609-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20070416T2350/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20070416T2350-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -801,8 +842,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20070331T1609/localedata/locales/en_GB 1 Oct 2006 16:18:33 -0000 1.14 -+++ glibc-20070331T1609-fedora/localedata/locales/en_GB 2 Oct 2006 19:02:41 -0000 1.10.2.4 +--- glibc-20070416T2350/localedata/locales/en_GB 1 Oct 2006 16:18:33 -0000 1.14 ++++ glibc-20070416T2350-fedora/localedata/locales/en_GB 2 Oct 2006 19:02:41 -0000 1.10.2.4 @@ -116,8 +116,8 @@ mon "" d_fmt "" @@ -814,8 +855,8 @@ date_fmt "/ / " ---- glibc-20070331T1609/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20070331T1609-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20070416T2350/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20070416T2350-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -886,8 +927,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20070331T1609/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20070331T1609-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20070416T2350/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20070416T2350-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -915,8 +956,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20070331T1609/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 -+++ glibc-20070331T1609-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 +--- glibc-20070416T2350/malloc/mcheck.c 8 Sep 2004 20:36:02 -0000 1.18 ++++ glibc-20070416T2350-fedora/malloc/mcheck.c 20 Dec 2005 10:59:21 -0000 1.18.2.1 @@ -24,9 +24,25 @@ # include # include @@ -992,8 +1033,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20070331T1609/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43 -+++ glibc-20070331T1609-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20070416T2350/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43 ++++ glibc-20070416T2350-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) @@ -1049,8 +1090,8 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20070331T1609/manual/libc.texinfo 12 Nov 2003 00:37:03 -0000 1.94 -+++ glibc-20070331T1609-fedora/manual/libc.texinfo 3 Nov 2006 16:31:21 -0000 1.94.2.1 +--- glibc-20070416T2350/manual/libc.texinfo 12 Nov 2003 00:37:03 -0000 1.94 ++++ glibc-20070416T2350-fedora/manual/libc.texinfo 3 Nov 2006 16:31:21 -0000 1.94.2.1 @@ -5,7 +5,7 @@ @setchapternewpage odd @@ -1060,17 +1101,17 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-20070331T1609/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20070331T1609-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20070416T2350/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20070416T2350-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-20070331T1609/nptl/ChangeLog 26 Mar 2007 20:12:19 -0000 1.956 -+++ glibc-20070331T1609-fedora/nptl/ChangeLog 31 Mar 2007 17:23:55 -0000 1.706.2.119 -@@ -1409,6 +1409,15 @@ +--- glibc-20070416T2350/nptl/ChangeLog 6 Apr 2007 22:19:54 -0000 1.957 ++++ glibc-20070416T2350-fedora/nptl/ChangeLog 16 Apr 2007 23:59:05 -0000 1.706.2.120 +@@ -1414,6 +1414,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1086,7 +1127,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -2145,6 +2154,11 @@ +@@ -2150,6 +2159,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -1098,7 +1139,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -4219,6 +4233,11 @@ +@@ -4224,6 +4238,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -1110,8 +1151,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20070331T1609/nptl/Makefile 8 Sep 2006 10:40:49 -0000 1.188 -+++ glibc-20070331T1609-fedora/nptl/Makefile 28 Nov 2006 11:18:18 -0000 1.157.2.29 +--- glibc-20070416T2350/nptl/Makefile 8 Sep 2006 10:40:49 -0000 1.188 ++++ glibc-20070416T2350-fedora/nptl/Makefile 28 Nov 2006 11:18:18 -0000 1.157.2.29 @@ -340,7 +340,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1144,8 +1185,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20070331T1609/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20070331T1609-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20070416T2350/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20070416T2350-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; @@ -1170,8 +1211,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20070331T1609/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20070331T1609-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20070416T2350/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20070416T2350-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 + @@ -1179,8 +1220,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20070331T1609/nscd/connections.c 1 Feb 2007 16:05:31 -0000 1.98 -+++ glibc-20070331T1609-fedora/nscd/connections.c 2 Feb 2007 09:48:23 -0000 1.55.2.28 +--- glibc-20070416T2350/nscd/connections.c 1 Feb 2007 16:05:31 -0000 1.98 ++++ glibc-20070416T2350-fedora/nscd/connections.c 2 Feb 2007 09:48:23 -0000 1.55.2.28 @@ -1947,3 +1947,21 @@ finish_drop_privileges (void) install_real_capabilities (new_caps); #endif @@ -1203,8 +1244,8 @@ + prune_cache (&dbs[hstdb], LONG_MAX, -1); +} + ---- glibc-20070331T1609/nscd/nscd.c 16 Feb 2007 19:14:58 -0000 1.57 -+++ glibc-20070331T1609-fedora/nscd/nscd.c 21 Feb 2007 11:15:53 -0000 1.38.2.16 +--- glibc-20070416T2350/nscd/nscd.c 16 Feb 2007 19:14:58 -0000 1.57 ++++ glibc-20070416T2350-fedora/nscd/nscd.c 21 Feb 2007 11:15:53 -0000 1.38.2.16 @@ -119,6 +119,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1223,8 +1264,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20070331T1609/nscd/nscd.conf 14 Jan 2007 05:24:04 -0000 1.14 -+++ glibc-20070331T1609-fedora/nscd/nscd.conf 17 Jan 2007 10:42:40 -0000 1.8.2.6 +--- glibc-20070416T2350/nscd/nscd.conf 14 Jan 2007 05:24:04 -0000 1.14 ++++ glibc-20070416T2350-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 @@ -1236,8 +1277,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20070331T1609/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 -+++ glibc-20070331T1609-fedora/nscd/nscd.init 5 Dec 2006 21:50:20 -0000 1.6.2.5 +--- glibc-20070416T2350/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 ++++ glibc-20070416T2350-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 @@ -1278,8 +1319,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20070331T1609/posix/Makefile 5 Feb 2007 15:22:40 -0000 1.195 -+++ glibc-20070331T1609-fedora/posix/Makefile 11 Feb 2007 16:21:43 -0000 1.171.2.23 +--- glibc-20070416T2350/posix/Makefile 3 Apr 2007 23:28:20 -0000 1.197 ++++ glibc-20070416T2350-fedora/posix/Makefile 16 Apr 2007 23:59:05 -0000 1.171.2.24 @@ -110,7 +110,7 @@ generated := $(addprefix wordexp-test-re tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ tst-pcre-mem tst-pcre.mtrace tst-boost-mem tst-boost.mtrace \ @@ -1312,8 +1353,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20070331T1609/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20070331T1609-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20070416T2350/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20070416T2350-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 = @@ -1330,8 +1371,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20070331T1609/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20070331T1609-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20070416T2350/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20070416T2350-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 @@ -1347,8 +1388,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-20070331T1609/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20 -+++ glibc-20070331T1609-fedora/sysdeps/i386/Makefile 30 Jun 2006 09:16:34 -0000 1.16.2.4 +--- glibc-20070416T2350/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20 ++++ glibc-20070416T2350-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))) @@ -1362,8 +1403,8 @@ +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS +CFLAGS-.oS += -mno-tls-direct-seg-refs endif ---- glibc-20070331T1609/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20070331T1609-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20070416T2350/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20070416T2350-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)) @@ -1375,8 +1416,8 @@ endif endif ---- glibc-20070331T1609/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20070331T1609-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20070416T2350/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20070416T2350-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. */ @@ -1728,8 +1769,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20070331T1609/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20070331T1609-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20070416T2350/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20070416T2350-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. @@ -1815,8 +1856,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20070331T1609/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 -+++ glibc-20070331T1609-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 +--- glibc-20070416T2350/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 ++++ glibc-20070416T2350-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 @@ -1825,8 +1866,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20070331T1609/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 -+++ glibc-20070331T1609-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 +--- glibc-20070416T2350/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 ++++ glibc-20070416T2350-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); } @@ -1841,8 +1882,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/check_pf.c 15 Mar 2007 20:02:24 -0000 1.9 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/check_pf.c 17 Mar 2007 21:53:00 -0000 1.3.2.6 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/check_pf.c 15 Mar 2007 20:02:24 -0000 1.9 ++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/check_pf.c 17 Mar 2007 21:53:00 -0000 1.3.2.6 @@ -27,13 +27,10 @@ #include #include @@ -1858,8 +1899,8 @@ #ifndef IFA_F_TEMPORARY # define IFA_F_TEMPORARY IFA_F_SECONDARY ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/dl-osinfo.h 1 Aug 2006 06:55:27 -0000 1.23 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 2 Aug 2006 16:57:42 -0000 1.14.2.9 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/dl-osinfo.h 1 Aug 2006 06:55:27 -0000 1.23 ++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 2 Aug 2006 16:57:42 -0000 1.14.2.9 @@ -18,11 +18,14 @@ 02111-1307 USA. */ @@ -1907,8 +1948,8 @@ + ret ^= stk; return ret; } ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20070416T2350-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; @@ -1951,8 +1992,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 ++++ glibc-20070416T2350-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 @@ -25,6 +25,24 @@ #include @@ -1978,8 +2019,8 @@ struct netlink_res { ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20070416T2350-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" @@ -1989,8 +2030,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20070416T2350-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; @@ -2036,8 +2077,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 ++++ glibc-20070416T2350-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 @@ -2056,8 +2097,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20070416T2350-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. @@ -2118,8 +2159,8 @@ + } while (0) + +#include_next ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20070416T2350-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) @@ -2152,29 +2193,29 @@ + } while (0) + #include_next ---- glibc-20070331T1609/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20070416T2350-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-20070331T1609/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20070416T2350-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-20070331T1609/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20070416T2350-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-20070331T1609/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 -+++ glibc-20070331T1609-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 +--- glibc-20070416T2350/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 ++++ glibc-20070416T2350-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 @@ -2193,30 +2234,3 @@ cfi_startproc; PSEUDO_END (BP_SYM (__clone)) ---- libc/sysdeps/unix/sysv/linux/sync_file_range.c 24 Apr 2006 17:07:53 -0000 1.2 -+++ libc/sysdeps/unix/sysv/linux/sync_file_range.c 31 Mar 2007 18:37:51 -0000 -@@ -1,5 +1,5 @@ - /* Selective file content synch'ing. -- Copyright (C) 2006 Free Software Foundation, Inc. -+ Copyright (C) 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 -@@ -27,7 +27,7 @@ - - #ifdef __NR_sync_file_range - int --sync_file_range (int fd, __off64_t from, __off64_t to, int flags) -+sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) - { - return INLINE_SYSCALL (sync_file_range, 6, fd, - __LONG_LONG_PAIR ((long) (from >> 32), (long) from), -@@ -36,7 +36,7 @@ sync_file_range (int fd, __off64_t from, - } - #else - int --sync_file_range (int fd, __off64_t from, __off64_t to, int flags) -+sync_file_range (int fd, __off64_t from, __off64_t to, unsigned int flags) - { - __set_errno (ENOSYS); - return -1; diff --git a/glibc.spec b/glibc.spec index ae0c65a..c56d322 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20070331T1609 +%define glibcdate 20070416T2350 %define glibcname glibc -%define glibcsrcdir glibc-20070331T1609 +%define glibcsrcdir glibc-20070416T2350 %define glibc_release_tarballs 0 %define glibcversion 2.5.90 -%define glibcrelease 20 +%define glibcrelease 21 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} @@ -36,10 +36,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-bz3427.patch -Patch3: glibc-fnmatch-speedup.patch -Patch4: glibc-bz3306.patch -Patch5: glibc-libio-__THROW.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 @@ -251,10 +247,6 @@ package or when debugging this package. %patch1 -p1 %endif %endif -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 # Hack till glibc-kernheaders get updated, argh mkdir -p override_headers/linux @@ -982,11 +974,6 @@ popd cd .. %endif -# compatibility hack: this locale has vanished from glibc, but some other -# programs are still using it. Normally we would handle it in the %pre -# section but with glibc that is simply not an option -mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/locale/ru_RU/LC_MESSAGES - # Remove the files we don't want to distribute rm -f $RPM_BUILD_ROOT%{_prefix}/%{_lib}/libNoVersion* rm -f $RPM_BUILD_ROOT/%{_lib}/libNoVersion* @@ -1064,7 +1051,19 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/include/rpcsvc/rquota.[hx] # Hardlink identical locale files together %ifnarch %{auxarches} gcc -O2 -o build-%{nptl_target_cpu}-linuxnptl/hardlink fedora/hardlink.c -build-%{nptl_target_cpu}-linuxnptl/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale +rm ${RPM_BUILD_ROOT}${_prefix}/lib/locale/locale-archive || : +olddir=`pwd` +pushd ${RPM_BUILD_ROOT}${_prefix}/lib/locale +# Intentionally we do not pass --alias-file=, aliases will be added +# by build-locale-archive. +$olddir/build-%{nptl_target_cpu}-linuxnptl/elf/ld.so \ + --library-path $olddir/build-%{nptl_target_cpu}-linuxnptl/ \ + $olddir/build-%{nptl_target_cpu}-linuxnptl/locale/localedef \ + --prefix ${RPM_BUILD_ROOT} --add-to-archive \ + *_* +rm -rf *_* +popd +#build-%{nptl_target_cpu}-linuxnptl/hardlink -vc $RPM_BUILD_ROOT%{_prefix}/lib/locale %endif rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss1-* @@ -1138,7 +1137,7 @@ grep -v '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist.full | grep -v 'nscd' > rpm.filelist grep '%{_prefix}/bin' < rpm.filelist >> common.filelist -grep '%{_prefix}/lib/locale' < rpm.filelist >> common.filelist +grep '%{_prefix}/lib/locale' < rpm.filelist | grep -v /locale-archive.tmpl >> common.filelist grep '%{_prefix}/libexec/pt_chown' < rpm.filelist >> common.filelist grep '%{_prefix}/sbin/[^gi]' < rpm.filelist >> common.filelist grep '%{_prefix}/share' < rpm.filelist \ @@ -1508,6 +1507,7 @@ rm -f *.filelist* %ifnarch %{auxarches} %files -f common.filelist common %defattr(-,root,root) +%attr(0644,root,root) %config(missingok) %{_prefix}/lib/locale/locale-archive.tmpl %attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive %dir %attr(755,root,root) /etc/default %verify(not md5 size mtime) %config(noreplace) /etc/default/nss @@ -1562,6 +1562,18 @@ rm -f *.filelist* %endif %changelog +* Mon Apr 16 2007 Jakub Jelinek 2.5.90-21 +- don't include individual locale files in glibc-common, + rather include prepared locale-archive template and let + build-locale-archive create locale-archive from the template + and any user supplied /usr/lib/locale/*_* directories, + then unlink the locale-archive template - this should save + > 80MB of glibc-common occupied disk space +- fix _XOPEN_VERSION (BZ#4364) +- fix printf with %g and values tiny bit smaller than 1.e-4 (#235864, + BZ#4362) +- fix NIS+ __nisfind_server (#235229) + * Sat Mar 31 2007 Jakub Jelinek 2.5.90-20 - assorted NIS+ speedups (#223467) - fix HAVE_LIBCAP configure detection (#178934) diff --git a/sources b/sources index 0928331..2b3b95e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -18892a96076bf9f99cf0d32111e3a088 glibc-20070331T1609.tar.bz2 -b2dbae683fefa2b5f40fed0f4b7d682f glibc-fedora-20070331T1609.tar.bz2 +21547b2c3508dd995804f0482e79b8ac glibc-20070416T2350.tar.bz2 +dd38de284d9b36cbe984dcc4684f4ca1 glibc-fedora-20070416T2350.tar.bz2