From ffc48ada46093e7a35440bbfe0c62afb32b0118f Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mar 05 2008 10:32:39 +0000 Subject: 2.7.90-8 --- diff --git a/.cvsignore b/.cvsignore index 85c3b5b..221a07c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20080216T1726.tar.bz2 -glibc-fedora-20080216T1726.tar.bz2 +glibc-20080305T0857.tar.bz2 +glibc-fedora-20080305T0857.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index ad41575..592dfb5 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,6 +1,6 @@ ---- glibc-20080216T1726/ChangeLog 15 Feb 2008 15:49:15 -0000 1.11078 -+++ glibc-20080216T1726-fedora/ChangeLog 16 Feb 2008 17:31:43 -0000 1.8782.2.288 -@@ -3759,6 +3759,13 @@ +--- glibc-20080305T0857/ChangeLog 5 Mar 2008 07:05:13 -0000 1.11088 ++++ glibc-20080305T0857-fedora/ChangeLog 5 Mar 2008 09:37:39 -0000 1.8782.2.289 +@@ -3857,6 +3857,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 -@@ -4054,6 +4061,10 @@ +@@ -4152,6 +4159,10 @@ [BZ #4368] * stdlib/stdlib.h: Remove obsolete part of comment for realpath. @@ -25,7 +25,7 @@ 2007-04-16 Ulrich Drepper [BZ #4364] -@@ -5311,6 +5322,15 @@ +@@ -5409,6 +5420,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-20080216T1726/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20080216T1726-fedora/ChangeLog.15 19 Dec 2006 19:05:40 -0000 1.1.6.3 +--- glibc-20080305T0857/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20080305T0857-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-20080216T1726/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 -+++ glibc-20080216T1726-fedora/ChangeLog.16 5 May 2006 06:11:52 -0000 1.1.2.1 +--- glibc-20080305T0857/ChangeLog.16 4 May 2006 16:05:24 -0000 1.1 ++++ glibc-20080305T0857-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-20080216T1726/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 -+++ glibc-20080216T1726-fedora/csu/Makefile 30 Nov 2006 17:07:37 -0000 1.74.2.6 +--- glibc-20080305T0857/csu/Makefile 1 Mar 2006 10:35:47 -0000 1.79 ++++ glibc-20080305T0857-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-20080216T1726/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20080216T1726-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20080305T0857/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20080305T0857-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-20080216T1726/debug/tst-chk1.c 26 Sep 2007 20:45:09 -0000 1.18 -+++ glibc-20080216T1726-fedora/debug/tst-chk1.c 29 Sep 2007 19:10:47 -0000 1.1.2.18 +--- glibc-20080305T0857/debug/tst-chk1.c 5 Mar 2008 06:51:37 -0000 1.19 ++++ glibc-20080305T0857-fedora/debug/tst-chk1.c 5 Mar 2008 09:37:40 -0000 1.1.2.19 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -331,7 +331,7 @@ #include #include #include -@@ -238,7 +241,7 @@ do_test (void) +@@ -242,7 +245,7 @@ do_test (void) if (memcmp (a.buf1, "aabcdabcjj", 10)) FAIL (); @@ -340,7 +340,7 @@ /* The following tests are supposed to crash with -D_FORTIFY_SOURCE=2 and sufficient GCC support, as the string operations overflow from a.buf1 into a.buf2. */ -@@ -353,7 +356,7 @@ do_test (void) +@@ -357,7 +360,7 @@ do_test (void) memset (a.buf1 + 9, 'j', l0 + 2); CHK_FAIL_END @@ -349,8 +349,8 @@ # define O 0 # else # define O 1 ---- glibc-20080216T1726/elf/ldconfig.c 2 Jan 2008 19:25:22 -0000 1.62 -+++ glibc-20080216T1726-fedora/elf/ldconfig.c 3 Jan 2008 20:20:40 -0000 1.47.2.17 +--- glibc-20080305T0857/elf/ldconfig.c 2 Jan 2008 19:25:22 -0000 1.62 ++++ glibc-20080305T0857-fedora/elf/ldconfig.c 3 Jan 2008 20:20:40 -0000 1.47.2.17 @@ -1000,17 +1000,19 @@ search_dirs (void) @@ -432,8 +432,8 @@ } if (! opt_ignore_aux_cache) ---- glibc-20080216T1726/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20080216T1726-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20080305T0857/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20080305T0857-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-20080216T1726/include/features.h 17 Oct 2007 20:26:55 -0000 1.49 -+++ glibc-20080216T1726-fedora/include/features.h 17 Oct 2007 20:33:39 -0000 1.35.2.19 +--- glibc-20080305T0857/include/features.h 17 Oct 2007 20:26:55 -0000 1.49 ++++ glibc-20080305T0857-fedora/include/features.h 17 Oct 2007 20:33:39 -0000 1.35.2.19 @@ -282,8 +282,13 @@ #endif @@ -476,16 +476,16 @@ # define __USE_FORTIFY_LEVEL 2 # else # define __USE_FORTIFY_LEVEL 1 ---- glibc-20080216T1726/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20080305T0857/include/bits/stdlib-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/include/bits/stdlib-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20080216T1726/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 +--- glibc-20080305T0857/include/bits/wchar-ldbl.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/include/bits/wchar-ldbl.h 1 Feb 2006 09:30:43 -0000 1.1.2.1 @@ -0,0 +1 @@ +#include ---- glibc-20080216T1726/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 -+++ glibc-20080216T1726-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 +--- glibc-20080305T0857/intl/locale.alias 28 Oct 2007 01:39:54 -0000 1.24 ++++ glibc-20080305T0857-fedora/intl/locale.alias 12 Dec 2007 18:13:23 -0000 1.23.2.2 @@ -57,8 +57,6 @@ korean ko_KR.eucKR korean.euc ko_KR.eucKR ko_KR ko_KR.eucKR @@ -495,8 +495,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20080216T1726/libio/stdio.h 8 Jan 2008 01:18:40 -0000 1.92 -+++ glibc-20080216T1726-fedora/libio/stdio.h 11 Jan 2008 07:45:13 -0000 1.78.2.13 +--- glibc-20080305T0857/libio/stdio.h 8 Jan 2008 01:18:40 -0000 1.92 ++++ glibc-20080305T0857-fedora/libio/stdio.h 11 Jan 2008 07:45:13 -0000 1.78.2.13 @@ -145,10 +145,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -510,8 +510,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20080216T1726/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 -+++ glibc-20080216T1726-fedora/locale/iso-4217.def 21 Feb 2007 11:15:50 -0000 1.15.2.5 +--- glibc-20080305T0857/locale/iso-4217.def 17 Feb 2007 07:46:20 -0000 1.20 ++++ glibc-20080305T0857-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 !!! @@ -603,8 +603,8 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20080216T1726/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 -+++ glibc-20080216T1726-fedora/locale/programs/locarchive.c 31 Jul 2007 17:45:53 -0000 1.21.2.4 +--- glibc-20080305T0857/locale/programs/locarchive.c 16 Jul 2007 00:54:59 -0000 1.25 ++++ glibc-20080305T0857-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, @@ -636,8 +636,8 @@ add_alias (struct locarhandle *ah, const char *alias, bool replace, const char *oldname, uint32_t *locrec_offset_p) { ---- glibc-20080216T1726/localedata/Makefile 2 Oct 2007 17:19:40 -0000 1.107 -+++ glibc-20080216T1726-fedora/localedata/Makefile 3 Oct 2007 19:32:27 -0000 1.101.2.7 +--- glibc-20080305T0857/localedata/Makefile 2 Oct 2007 17:19:40 -0000 1.107 ++++ glibc-20080305T0857-fedora/localedata/Makefile 3 Oct 2007 19:32:27 -0000 1.101.2.7 @@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -646,8 +646,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20080216T1726/localedata/SUPPORTED 6 Nov 2007 18:26:22 -0000 1.108 -+++ glibc-20080216T1726-fedora/localedata/SUPPORTED 12 Dec 2007 18:13:23 -0000 1.71.2.20 +--- glibc-20080305T0857/localedata/SUPPORTED 4 Mar 2008 22:10:33 -0000 1.109 ++++ glibc-20080305T0857-fedora/localedata/SUPPORTED 5 Mar 2008 09:37:42 -0000 1.71.2.21 @@ -84,6 +84,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -681,7 +681,7 @@ nr_ZA/UTF-8 \ nso_ZA/UTF-8 \ oc_FR.UTF-8/UTF-8 \ -@@ -351,6 +356,7 @@ sv_FI/ISO-8859-1 \ +@@ -352,6 +357,7 @@ sv_FI/ISO-8859-1 \ sv_FI@euro/ISO-8859-15 \ sv_SE.UTF-8/UTF-8 \ sv_SE/ISO-8859-1 \ @@ -689,8 +689,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20080216T1726/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20080216T1726-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20080305T0857/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20080305T0857-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -705,8 +705,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20080216T1726/localedata/locales/en_GB 30 Sep 2007 18:24:20 -0000 1.15 -+++ glibc-20080216T1726-fedora/localedata/locales/en_GB 3 Oct 2007 19:32:28 -0000 1.10.2.5 +--- glibc-20080305T0857/localedata/locales/en_GB 30 Sep 2007 18:24:20 -0000 1.15 ++++ glibc-20080305T0857-fedora/localedata/locales/en_GB 3 Oct 2007 19:32:28 -0000 1.10.2.5 @@ -116,8 +116,8 @@ mon "" d_fmt "" @@ -718,8 +718,8 @@ date_fmt "/ / " ---- glibc-20080216T1726/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20080305T0857/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -790,8 +790,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20080216T1726/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20080216T1726-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20080305T0857/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20080305T0857-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -819,8 +819,8 @@ revision "0.2" date "2000-08-02" % ---- glibc-20080216T1726/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 -+++ glibc-20080216T1726-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 +--- glibc-20080305T0857/malloc/mcheck.c 19 May 2007 04:27:20 -0000 1.20 ++++ glibc-20080305T0857-fedora/malloc/mcheck.c 21 May 2007 20:01:08 -0000 1.18.2.2 @@ -24,9 +24,25 @@ # include # include @@ -896,8 +896,8 @@ old_free_hook = __free_hook; __free_hook = freehook; ---- glibc-20080216T1726/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43 -+++ glibc-20080216T1726-fedora/malloc/mtrace.c 20 Dec 2005 10:59:21 -0000 1.41.2.1 +--- glibc-20080305T0857/malloc/mtrace.c 25 Jan 2007 00:43:38 -0000 1.43 ++++ glibc-20080305T0857-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) @@ -953,8 +953,8 @@ __memalign_hook = tr_memalignhook; __malloc_hook = tr_mallochook; ---- glibc-20080216T1726/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 -+++ glibc-20080216T1726-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 +--- glibc-20080305T0857/manual/libc.texinfo 31 Jan 2008 01:43:04 -0000 1.98 ++++ glibc-20080305T0857-fedora/manual/libc.texinfo 31 Jan 2008 08:43:19 -0000 1.94.2.4 @@ -5,7 +5,7 @@ @c setchapternewpage odd @@ -964,8 +964,8 @@ @direntry * Libc: (libc). C library. @end direntry ---- glibc-20080216T1726/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 -+++ glibc-20080216T1726-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 +--- glibc-20080305T0857/misc/sys/cdefs.h 3 Oct 2007 18:27:02 -0000 1.73 ++++ glibc-20080305T0857-fedora/misc/sys/cdefs.h 3 Oct 2007 19:32:28 -0000 1.58.2.10 @@ -132,7 +132,10 @@ #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1) #define __bos0(ptr) __builtin_object_size (ptr, 0) @@ -1009,16 +1009,16 @@ # define __va_arg_pack() __builtin_va_arg_pack () # define __va_arg_pack_len() __builtin_va_arg_pack_len () #endif ---- glibc-20080216T1726/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 -+++ glibc-20080216T1726-fedora/nis/nss 1 May 2006 08:02:53 -0000 1.2.2.2 +--- glibc-20080305T0857/nis/nss 28 Apr 2006 21:02:23 -0000 1.3 ++++ glibc-20080305T0857-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-20080216T1726/nptl/ChangeLog 1 Feb 2008 00:01:32 -0000 1.1056 -+++ glibc-20080216T1726-fedora/nptl/ChangeLog 1 Feb 2008 10:19:38 -0000 1.706.2.147 +--- glibc-20080305T0857/nptl/ChangeLog 1 Feb 2008 00:01:32 -0000 1.1056 ++++ glibc-20080305T0857-fedora/nptl/ChangeLog 1 Feb 2008 10:19:38 -0000 1.706.2.147 @@ -3107,6 +3107,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -1059,8 +1059,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20080216T1726/nptl/Makefile 1 Feb 2008 00:01:18 -0000 1.193 -+++ glibc-20080216T1726-fedora/nptl/Makefile 1 Feb 2008 10:19:38 -0000 1.157.2.35 +--- glibc-20080305T0857/nptl/Makefile 1 Feb 2008 00:01:18 -0000 1.193 ++++ glibc-20080305T0857-fedora/nptl/Makefile 1 Feb 2008 10:19:38 -0000 1.157.2.35 @@ -339,7 +339,8 @@ endif extra-objs += $(crti-objs) $(crtn-objs) omit-deps += crti crtn @@ -1093,8 +1093,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20080216T1726/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20080216T1726-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20080305T0857/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20080305T0857-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; @@ -1119,8 +1119,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20080216T1726/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20080305T0857/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-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 + @@ -1128,8 +1128,8 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20080216T1726/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 -+++ glibc-20080216T1726-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 +--- glibc-20080305T0857/nscd/nscd.conf 6 Nov 2007 00:50:48 -0000 1.16 ++++ glibc-20080305T0857-fedora/nscd/nscd.conf 12 Dec 2007 18:13:28 -0000 1.8.2.7 @@ -33,7 +33,7 @@ # logfile /var/log/nscd.log # threads 4 @@ -1139,8 +1139,8 @@ # stat-user somebody debug-level 0 # reload-count 5 ---- glibc-20080216T1726/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 -+++ glibc-20080216T1726-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 +--- glibc-20080305T0857/nscd/nscd.init 1 Dec 2006 20:12:45 -0000 1.10 ++++ glibc-20080305T0857-fedora/nscd/nscd.init 12 Dec 2007 18:13:28 -0000 1.6.2.6 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1197,8 +1197,8 @@ ;; *) echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" ---- glibc-20080216T1726/posix/Makefile 20 Nov 2007 00:41:16 -0000 1.203 -+++ glibc-20080216T1726-fedora/posix/Makefile 12 Dec 2007 18:13:30 -0000 1.171.2.27 +--- glibc-20080305T0857/posix/Makefile 20 Nov 2007 00:41:16 -0000 1.203 ++++ glibc-20080305T0857-fedora/posix/Makefile 12 Dec 2007 18:13:30 -0000 1.171.2.27 @@ -301,11 +301,8 @@ $(inst_libexecdir)/getconf: $(inst_bindi mv -f $@/$$spec.new $@/$$spec; \ done < $(objpfx)getconf.speclist @@ -1215,8 +1215,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new mv -f $@.new $@ ---- glibc-20080216T1726/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20080305T0857/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-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 = @@ -1233,8 +1233,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20080216T1726/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20080216T1726-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20080305T0857/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20080305T0857-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 @@ -1250,8 +1250,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-20080216T1726/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20 -+++ glibc-20080216T1726-fedora/sysdeps/i386/Makefile 30 Jun 2006 09:16:34 -0000 1.16.2.4 +--- glibc-20080305T0857/sysdeps/i386/Makefile 6 Mar 2005 00:18:16 -0000 1.20 ++++ glibc-20080305T0857-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))) @@ -1265,8 +1265,8 @@ +CPPFLAGS-.oS += -DNO_TLS_DIRECT_SEG_REFS +CFLAGS-.oS += -mno-tls-direct-seg-refs endif ---- glibc-20080216T1726/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20080216T1726-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20080305T0857/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20080305T0857-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)) @@ -1278,8 +1278,8 @@ endif endif ---- glibc-20080216T1726/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20080216T1726-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20080305T0857/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20080305T0857-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. */ @@ -1631,8 +1631,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20080216T1726/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20080305T0857/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-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. @@ -1718,8 +1718,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20080216T1726/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 -+++ glibc-20080216T1726-fedora/sysdeps/powerpc/powerpc64/Makefile 30 Nov 2006 17:07:38 -0000 1.4.2.5 +--- glibc-20080305T0857/sysdeps/powerpc/powerpc64/Makefile 2 Feb 2006 08:23:44 -0000 1.8 ++++ glibc-20080305T0857-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 @@ -1728,8 +1728,8 @@ endif ifeq ($(subdir),elf) ---- glibc-20080216T1726/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 -+++ glibc-20080216T1726-fedora/sysdeps/unix/nice.c 15 Aug 2006 05:53:50 -0000 1.6.2.2 +--- glibc-20080305T0857/sysdeps/unix/nice.c 15 Aug 2006 05:24:45 -0000 1.7 ++++ glibc-20080305T0857-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); } @@ -1744,8 +1744,8 @@ if (result == -1) { if (errno == EACCES) ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 00:24:52 -0000 1.15 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/check_pf.c 3 Jan 2008 20:20:42 -0000 1.3.2.11 @@ -27,13 +27,10 @@ #include #include @@ -1761,8 +1761,8 @@ #ifndef IFA_F_HOMEADDRESS # define IFA_F_HOMEADDRESS 0 ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/configure 28 Oct 2006 06:42:16 -0000 1.93 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/configure 12 Dec 2007 23:01:37 -0000 1.88.2.4 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/configure 28 Oct 2006 06:42:16 -0000 1.93 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/configure 12 Dec 2007 23:01:37 -0000 1.88.2.4 @@ -22,23 +22,170 @@ if test -n "$sysheaders"; then fi @@ -2000,8 +2000,8 @@ fi fi ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/dl-osinfo.h 15 Sep 2007 22:54:08 -0000 1.26 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 18 Sep 2007 19:57:21 -0000 1.14.2.12 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/dl-osinfo.h 15 Sep 2007 22:54:08 -0000 1.26 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 18 Sep 2007 19:57:21 -0000 1.14.2.12 @@ -19,11 +19,14 @@ 02111-1307 USA. */ @@ -2049,8 +2049,8 @@ + ret ^= stk; return ret; } ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 09:43:55 -0000 1.1.2.7 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/futimesat.c 3 Feb 2006 05:26:34 -0000 1.6 ++++ glibc-20080305T0857-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; @@ -2093,8 +2093,8 @@ { size_t filelen = strlen (file); static const char procfd[] = "/proc/self/fd/%d/%s"; ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/netlinkaccess.h 8 Jan 2006 08:21:15 -0000 1.3 ++++ glibc-20080305T0857-fedora/sysdeps/unix/sysv/linux/netlinkaccess.h 10 Dec 2006 10:51:12 -0000 1.1.2.3 @@ -25,6 +25,24 @@ #include @@ -2120,8 +2120,8 @@ struct netlink_res { ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20080305T0857-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" @@ -2131,8 +2131,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20080305T0857-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; @@ -2178,8 +2178,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/i386/clone.S 14 Dec 2006 09:06:34 -0000 1.22.2.6 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/i386/clone.S 3 Dec 2006 23:12:36 -0000 1.27 ++++ glibc-20080305T0857-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 @@ -2198,8 +2198,8 @@ cfi_startproc PSEUDO_END (BP_SYM (__clone)) ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-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. @@ -2260,8 +2260,8 @@ + } while (0) + +#include_next ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20080305T0857-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) @@ -2294,29 +2294,29 @@ + } while (0) + #include_next ---- glibc-20080216T1726/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-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-20080216T1726/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20080305T0857-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-20080216T1726/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20080305T0857-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-20080216T1726/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 -+++ glibc-20080216T1726-fedora/sysdeps/unix/sysv/linux/x86_64/clone.S 14 Dec 2006 09:06:34 -0000 1.4.2.4 +--- glibc-20080305T0857/sysdeps/unix/sysv/linux/x86_64/clone.S 3 Dec 2006 23:12:36 -0000 1.7 ++++ glibc-20080305T0857-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.spec b/glibc.spec index 53c998f..f58ca3c 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,7 @@ -%define glibcdate 20080216T1726 +%define glibcdate 20080305T0857 %define glibcname glibc -%define glibcsrcdir glibc-20080216T1726 +%define glibcsrcdir glibc-20080305T0857 %define glibc_release_tarballs 0 -%define glibcversion 2.7.90 -%define glibcrelease 7 %define run_glibc_tests 1 %define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6 %define xenarches i686 athlon @@ -22,10 +20,10 @@ %define rtkaioarches %{ix86} x86_64 ia64 ppc ppc64 s390 s390x %define debuginfocommonarches %{ix86} alpha alphaev6 sparc sparcv9 sparcv9v sparc64 sparc64v %define _unpackaged_files_terminate_build 0 -Summary: The GNU libc libraries. +Summary: The GNU libc libraries Name: glibc -Version: %{glibcversion} -Release: %{glibcrelease} +Version: 2.7.90 +Release: 8 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries. # Things that are linked directly into dynamically linked programs # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional @@ -33,6 +31,7 @@ Release: %{glibcrelease} # libraries without restrictions. License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ Group: System Environment/Libraries +URL: http://sources.redhat.com/glibc/ Source0: %{glibcsrcdir}.tar.bz2 %if %{glibc_release_tarballs} Source1: %(echo %{glibcsrcdir} | sed s/glibc-/glibc-linuxthreads-/).tar.bz2 @@ -42,39 +41,22 @@ 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 -Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root -Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, -Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Obsoletes: glibc-profile < 2.4 Provides: ldconfig # The dynamic linker supports DT_GNU_HASH Provides: rtld(GNU_HASH) -Autoreq: false Requires: glibc-common = %{version}-%{release} -%ifarch sparc -Obsoletes: libc -%endif # Require libgcc in case some program calls pthread_cancel in its %%post -Prereq: basesystem, libgcc +Requires(pre): basesystem, libgcc # This is for building auxiliary programs like memusage, nscd # For initial glibc bootstraps it can be commented out -BuildPreReq: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3 -BuildPreReq: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext -BuildPreReq: /bin/ps, /bin/kill, /bin/awk +BuildRequires: gd-devel libpng-devel zlib-devel texinfo, libselinux-devel >= 1.33.4-3 +BuildRequires: audit-libs-devel >= 1.1.3, sed >= 3.95, libcap-devel, gettext +BuildRequires: /bin/ps, /bin/kill, /bin/awk # This is to ensure that __frame_state_for is exported by glibc # will be compatible with egcs 1.x.y -BuildPreReq: gcc >= 3.2 -Conflicts: rpm <= 4.0-0.65 -Conflicts: glibc-devel < 2.2.3 -Conflicts: gcc4 <= 4.0.0-0.6 -%ifarch x86_64 %{ix86} -# Need gdb that understands DW_CFA_val_expression -Conflicts: gdb < 6.3.0.0-1.111 -%endif -# Earlier shadow-utils packages had too restrictive permissions on -# /etc/default -Conflicts: shadow-utils < 2:4.0.3-20 -Conflicts: nscd < 2.3.3-52 -Conflicts: kernel < 2.6.9 +BuildRequires: gcc >= 3.2 %define enablekernel 2.6.9 %ifarch i386 %define nptl_target_cpu i486 @@ -89,8 +71,8 @@ BuildRequires: gcc >= 3.2.1-5 BuildRequires: gcc >= 4.1.0-0.17 %endif %if "%{_enable_debug_packages}" == "1" -BuildPreReq: elfutils >= 0.72 -BuildPreReq: rpm >= 4.2-0.56 +BuildRequires: elfutils >= 0.72 +BuildRequires: rpm >= 4.2-0.56 %endif %define __find_provides %{_builddir}/%{glibcsrcdir}/find_provides.sh %define _filter_GLIBC_PRIVATE 1 @@ -121,20 +103,9 @@ Install glibc-xen if you might run your system under the Xen hypervisor. %package devel Summary: Object files for development using standard C libraries. Group: Development/Libraries -Conflicts: texinfo < 3.11 -# Need AS_NEEDED directive -Conflicts: binutils < 2.15.94.0.2-1 -Prereq: /sbin/install-info -Obsoletes: libc-debug, libc-headers, libc-devel, linuxthreads-devel -Obsoletes: glibc-debug, nptl-devel -Prereq: %{name}-headers -Requires: %{name}-headers = %{version}-%{release}, %{name} = %{version}-%{release} -%ifarch %{ix86} -# Earlier gcc's had atexit reference in crtendS.o, which does not -# work with this glibc where atexit is in libc_nonshared.a -Conflicts: gcc < 2.96-79 -%endif -Autoreq: true +Requires(pre): /sbin/install-info +Requires(pre): %{name}-headers = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel The glibc-devel package contains the object files necessary @@ -156,11 +127,9 @@ Provides: %{name}-headers(%{_target_cpu}) # have to be installed, not i386 ones. Obsoletes: %{name}-headers(i386) %endif -Obsoletes: libc-debug, libc-headers, libc-devel -Prereq: kernel-headers +Requires(pre): kernel-headers Requires: kernel-headers >= 2.2.1, %{name} = %{version}-%{release} BuildRequires: kernel-headers >= 2.6.22 -Autoreq: true %description headers The glibc-headers package contains the header files necessary @@ -175,9 +144,7 @@ use the standard C libraries. %package common Summary: Common binaries and locale data for glibc -Conflicts: %{name} < %{version} -Conflicts: %{name} > %{version} -Autoreq: false +Requires: %{name}-%{version}-%{release} Requires: tzdata >= 2003a Group: System Environment/Base @@ -188,11 +155,8 @@ libraries, as well as national language (locale) support. %package -n nscd Summary: A Name Service Caching Daemon (nscd). Group: System Environment/Daemons -Conflicts: kernel < 2.2.0 Requires: libselinux >= 1.17.10-1, audit-libs >= 1.1.3 -Conflicts: selinux-policy-targeted < 1.17.30-2.2 -Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils -Autoreq: true +Requires(pre): /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils %description -n nscd Nscd caches name service lookups and can dramatically improve @@ -201,7 +165,7 @@ performance with NIS+, and may help with DNS as well. %package utils Summary: Development utilities from GNU C library Group: Development/Tools -Requires: glibc = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description utils The glibc-utils package contains memusage, a memory usage profiler, @@ -377,14 +341,14 @@ build_nptl linuxnptl-power6 cd build-%{nptl_target_cpu}-linuxnptl $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_target_cpu} \ - -DNO_SIZE_OPTIMIZATION \ + -DNO_SIZE_OPTIMIZATION \ %ifarch i386 - -DARCH_386 \ + -DARCH_386 \ %endif - '-DLIBTLS="/%{_lib}/tls/"' \ - '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \ - '-DLD_SO_CONF="/etc/ld.so.conf"' \ - '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"' + '-DLIBTLS="/%{_lib}/tls/"' \ + '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \ + '-DLD_SO_CONF="/etc/ld.so.conf"' \ + '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"' cd .. %install @@ -395,8 +359,8 @@ mkdir -p $RPM_BUILD_ROOT make -j1 install_root=$RPM_BUILD_ROOT install -C build-%{nptl_target_cpu}-linuxnptl PARALLELMFLAGS=-s %ifnarch %{auxarches} cd build-%{nptl_target_cpu}-linuxnptl && \ - make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ - cd .. + make %{?_smp_mflags} install_root=$RPM_BUILD_ROOT install-locales -C ../localedata objdir=`pwd` && \ + cd .. %endif librtso=`basename $RPM_BUILD_ROOT/%{_lib}/librt.so.*` @@ -479,9 +443,9 @@ cp -a bits/stdio-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/stdio-lock.h cp -a fedora/libc-lock.h $RPM_BUILD_ROOT%{_prefix}/include/bits/libc-lock.h if [ -d $RPM_BUILD_ROOT%{_prefix}/info -a "%{_infodir}" != "%{_prefix}/info" ]; then - mkdir -p $RPM_BUILD_ROOT%{_infodir} - mv -f $RPM_BUILD_ROOT%{_prefix}/info/* $RPM_BUILD_ROOT%{_infodir} - rm -rf $RPM_BUILD_ROOT%{_prefix}/info + mkdir -p $RPM_BUILD_ROOT%{_infodir} + mv -f $RPM_BUILD_ROOT%{_prefix}/info/* $RPM_BUILD_ROOT%{_infodir} + rm -rf $RPM_BUILD_ROOT%{_prefix}/info fi gzip -9nvf $RPM_BUILD_ROOT%{_infodir}/libc* @@ -574,15 +538,15 @@ rm -f $RPM_BUILD_ROOT%{_sbindir}/rpcinfo # BUILD THE FILE LIST find $RPM_BUILD_ROOT -type f -or -type l | - sed -e 's|.*/etc|%config &|' \ - -e 's|.*/gconv/gconv-modules$|%verify(not md5 size mtime) %config(noreplace) &|' \ - -e 's|.*/gconv/gconv-modules.cache|%verify(not md5 size mtime) &|' \ - -e '/lib\/debug/d' > rpm.filelist.in + sed -e 's|.*/etc|%config &|' \ + -e 's|.*/gconv/gconv-modules$|%verify(not md5 size mtime) %config(noreplace) &|' \ + -e 's|.*/gconv/gconv-modules.cache|%verify(not md5 size mtime) &|' \ + -e '/lib\/debug/d' > rpm.filelist.in for n in %{_prefix}/share %{_prefix}/include %{_prefix}/lib/locale; do - find ${RPM_BUILD_ROOT}${n} -type d | \ - grep -v '%{_prefix}/share$' | \ - grep -v '%{_infodir}' | \ - sed "s/^/%dir /" >> rpm.filelist.in + find ${RPM_BUILD_ROOT}${n} -type d | \ + grep -v '%{_prefix}/share$' | \ + grep -v '%{_infodir}' | \ + sed "s/^/%dir /" >> rpm.filelist.in done # primary filelist @@ -592,10 +556,10 @@ LIB_LANG='s|.*/lib/locale/\([^/_]\+\)|%lang(\1) &|' # languages very well, temporarily disable LIB_LANG='' sed -e "s|$RPM_BUILD_ROOT||" -e "$LIB_LANG" -e "$SHARE_LANG" < rpm.filelist.in | - grep -v '/etc/\(localtime\|nsswitch.conf\|ld.so.conf\|ld.so.cache\|default\)' | \ - grep -v '/%{_lib}/lib\(pcprofile\|memusage\).so' | \ - grep -v 'bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\)' | \ - sort > rpm.filelist + grep -v '/etc/\(localtime\|nsswitch.conf\|ld.so.conf\|ld.so.cache\|default\)' | \ + grep -v '/%{_lib}/lib\(pcprofile\|memusage\).so' | \ + grep -v 'bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\)' | \ + sort > rpm.filelist mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_lib} mv -f $RPM_BUILD_ROOT/%{_lib}/lib{pcprofile,memusage}.so $RPM_BUILD_ROOT%{_prefix}/%{_lib} @@ -613,12 +577,12 @@ grep '%{_infodir}' < rpm.filelist | grep -v '%{_infodir}/dir' > devel.filelist grep '%{_prefix}/include/gnu/stubs-[32164]\+\.h' < rpm.filelist >> devel.filelist || : grep '%{_prefix}/include' < rpm.filelist | - egrep -v '%{_prefix}/include/(linuxthreads|gnu/stubs-[32164]+\.h)' \ - > headers.filelist + egrep -v '%{_prefix}/include/(linuxthreads|gnu/stubs-[32164]+\.h)' \ + > headers.filelist mv rpm.filelist rpm.filelist.full grep -v '%{_prefix}/%{_lib}/lib.*_p.a' rpm.filelist.full | - egrep -v "(%{_prefix}/include)|(%{_infodir})" > rpm.filelist + egrep -v "(%{_prefix}/include)|(%{_infodir})" > rpm.filelist grep '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist >> devel.filelist grep '%{_prefix}/%{_lib}/.*\.o' < rpm.filelist >> devel.filelist @@ -626,24 +590,24 @@ grep '%{_prefix}/%{_lib}/lib.*\.so' < rpm.filelist >> devel.filelist mv rpm.filelist rpm.filelist.full grep -v '%{_prefix}/%{_lib}/lib.*\.a' < rpm.filelist.full | - grep -v '%{_prefix}/%{_lib}/.*\.o' | - grep -v '%{_prefix}/%{_lib}/lib.*\.so'| - grep -v '%{_prefix}/%{_lib}/linuxthreads' | - grep -v 'nscd' > rpm.filelist + grep -v '%{_prefix}/%{_lib}/.*\.o' | + grep -v '%{_prefix}/%{_lib}/lib.*\.so'| + grep -v '%{_prefix}/%{_lib}/linuxthreads' | + grep -v 'nscd' > rpm.filelist grep '%{_prefix}/bin' < 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 \ - | grep -v '%{_prefix}/share/zoneinfo' >> common.filelist +grep '%{_prefix}/share' < rpm.filelist | \ + grep -v '%{_prefix}/share/zoneinfo' >> common.filelist mv rpm.filelist rpm.filelist.full grep -v '%{_prefix}/bin' < rpm.filelist.full | - grep -v '%{_prefix}/lib/locale' | - grep -v '%{_prefix}/libexec/pt_chown' | - grep -v '%{_prefix}/sbin/[^gi]' | - grep -v '%{_prefix}/share' > rpm.filelist + grep -v '%{_prefix}/lib/locale' | + grep -v '%{_prefix}/libexec/pt_chown' | + grep -v '%{_prefix}/sbin/[^gi]' | + grep -v '%{_prefix}/share' > rpm.filelist > nosegneg.filelist %if %{xenpackage} @@ -816,7 +780,7 @@ auxarches_debugsources=\ egrep "$auxarches_debugsources" debuginfocommon.sources >> debuginfo.filelist egrep -v "$auxarches_debugsources" \ - debuginfocommon.sources >> debuginfocommon.filelist + debuginfocommon.sources >> debuginfocommon.filelist %ifarch %{auxarches} %else # non-aux arches when there is a debuginfo-common @@ -841,7 +805,7 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir echo Cutting down the list of unpackaged files >> debuginfocommon.filelist sed -e '/%%dir/d;/%%config/d;/%%verify/d;s/%%lang([^)]*) //;s#^/*##' \ - common.filelist devel.filelist headers.filelist \ + common.filelist devel.filelist headers.filelist \ utils.filelist nscd.filelist debuginfocommon.filelist | (cd $RPM_BUILD_ROOT; xargs --no-run-if-empty rm -f 2> /dev/null || :) @@ -873,12 +837,12 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/ldconfig %pre headers # this used to be a link and it is causing nightmares now if [ -L %{_prefix}/include/scsi ] ; then - rm -f %{_prefix}/include/scsi + rm -f %{_prefix}/include/scsi fi %preun devel if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/libc.info.gz %{_infodir}/dir || : + /sbin/install-info --delete %{_infodir}/libc.info.gz %{_infodir}/dir || : fi %post utils -p /sbin/ldconfig @@ -887,23 +851,23 @@ fi %pre -n nscd /usr/sbin/useradd -M -o -r -d / -s /sbin/nologin \ - -c "NSCD Daemon" -u 28 nscd > /dev/null 2>&1 || : + -c "NSCD Daemon" -u 28 nscd > /dev/null 2>&1 || : %post -n nscd /sbin/chkconfig --add nscd %preun -n nscd if [ $1 = 0 ] ; then - service nscd stop > /dev/null 2>&1 - /sbin/chkconfig --del nscd + service nscd stop > /dev/null 2>&1 + /sbin/chkconfig --del nscd fi %postun -n nscd if [ $1 = 0 ] ; then - /usr/sbin/userdel nscd > /dev/null 2>&1 || : + /usr/sbin/userdel nscd > /dev/null 2>&1 || : fi if [ "$1" -ge "1" ]; then - service nscd condrestart > /dev/null 2>&1 || : + service nscd condrestart > /dev/null 2>&1 || : fi %if %{xenpackage} @@ -1016,6 +980,14 @@ rm -f *.filelist* %endif %changelog +* Wed Mar 5 2008 Jakub Jelinek 2.7.90-8 +- update to trunk + - {,v}{as,d}printf and obstack_{,v}printf fortification (#435905) + - fix getnameinfo/gethostbyaddr (#428067, BZ#5790) + - fix yp_order (#435519, BZ#5854) + - misc fixes (BZ#5779, BZ#5736, BZ#5627, BZ#5818, BZ#5012) +- merge review cleanup (Tom Callaway, #225806) + * Sat Feb 16 2008 Jakub Jelinek 2.7.90-7 - update to trunk - make NI_MAXHOST and NI_MAXSERV available even in BSDish diff --git a/sources b/sources index 8237b44..544db4d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ae813ad20cc570e7f7014f61ddcbdfd6 glibc-20080216T1726.tar.bz2 -91cb1481dfa1a9ff6bcde016f120c86d glibc-fedora-20080216T1726.tar.bz2 +ff459ea32a78605fe34138cdb4cd3226 glibc-20080305T0857.tar.bz2 +9780da910ede69450840a97775a63523 glibc-fedora-20080305T0857.tar.bz2