From f99593848d0bb9b9c217bf51d36a46bce7d77d16 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 19 Dec 2005 13:06:57 +0000 Subject: [PATCH] auto-import glibc-2.3.90-19 on branch devel from glibc-2.3.90-19.src.rpm --- .cvsignore | 4 +- glibc-fedora.patch | 239 +++++++++++++++++++++------------------------ glibc.spec | 48 +++------ sources | 4 +- 4 files changed, 128 insertions(+), 167 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0d5b4ec..6a9c30c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -glibc-20051119T1959.tar.bz2 -glibc-fedora-20051119T1959.tar.bz2 +glibc-20051219T1003.tar.bz2 +glibc-fedora-20051219T1003.tar.bz2 diff --git a/glibc-fedora.patch b/glibc-fedora.patch index 52a6d9d..fb55bce 100644 --- a/glibc-fedora.patch +++ b/glibc-fedora.patch @@ -1,14 +1,6 @@ ---- glibc-20051119T1959/ChangeLog 19 Nov 2005 17:22:39 -0000 1.9697 -+++ glibc-20051119T1959-fedora/ChangeLog 19 Nov 2005 21:57:33 -0000 1.8782.2.134 -@@ -1,3 +1,7 @@ -+2005-11-19 Roland McGrath -+ -+ * elf/elf.h: Revert last change. -+ - 2005-11-19 Jakub Jelinek - - * sysdeps/unix/sysv/linux/ia64/bits/shm.h (shmatt_t): New type. -@@ -848,6 +852,11 @@ +--- glibc-20051219T1003/ChangeLog 19 Dec 2005 07:26:29 -0000 1.9768 ++++ glibc-20051219T1003-fedora/ChangeLog 19 Dec 2005 12:11:11 -0000 1.8782.2.135 +@@ -3040,6 +3040,11 @@ R_ARM_TLS_TPOFF32, R_ARM_TLS_GD32, R_ARM_TLS_LDM32, R_ARM_TLS_LDO32, R_ARM_TLS_IE32, R_ARM_TLS_LE32): New macros. @@ -20,7 +12,7 @@ 2005-10-03 Roland McGrath * sysdeps/powerpc/nofpu: Directory removed, saved in ports repository. -@@ -1842,6 +1851,12 @@ +@@ -4034,6 +4039,12 @@ * argp/argp-help.c (__argp_error): __asprintf -> vasprintf. (__argp_failure): Likewise. @@ -33,7 +25,7 @@ 2005-08-08 Ulrich Drepper * nscd/cache.c (cache_add): Commit hash table and header to disk. -@@ -1966,6 +1981,17 @@ +@@ -4158,6 +4169,17 @@ __syslog_chk. * misc/Versions: Export __syslog_chk and __vsyslog_chk. @@ -51,7 +43,7 @@ 2005-07-28 Thomas Schwinge [BZ #1137] -@@ -5026,6 +5052,18 @@ +@@ -7218,6 +7240,18 @@ * scripts/soversions.awk: Fix default version set handling. @@ -70,8 +62,8 @@ 2005-02-10 Roland McGrath [BZ #157] ---- glibc-20051119T1959/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 -+++ glibc-20051119T1959-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20051219T1003/ChangeLog.11 10 Nov 2000 03:31:36 -0000 1.1 ++++ glibc-20051219T1003-fedora/ChangeLog.11 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -1352,6 +1352,11 @@ * sysdeps/unix/sysv/linux/mips/sys/tas.h: Add missing .mips0 at the end of inline assembler code. @@ -121,8 +113,8 @@ * sysdeps/arm/bits/huge_val.h (HUGE_VAL, HUGE_VALF): Add __extension__ to hexadecimal floating constant notation. * sysdeps/i386/bits/huge_val.h (HUGE_VAL, HUGE_VALF, HUGE_VALL): ---- glibc-20051119T1959/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 -+++ glibc-20051119T1959-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 +--- glibc-20051219T1003/ChangeLog.12 16 Aug 2001 05:24:54 -0000 1.1 ++++ glibc-20051219T1003-fedora/ChangeLog.12 22 Sep 2004 21:20:47 -0000 1.1.4.1 @@ -7729,6 +7729,13 @@ * Versions.def [ld]: Add GLIBC_2.2.1. @@ -149,8 +141,8 @@ 2001-01-02 Franz Sirl * sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo. ---- glibc-20051119T1959/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 -+++ glibc-20051119T1959-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 +--- glibc-20051219T1003/ChangeLog.15 16 Feb 2005 07:34:17 -0000 1.1 ++++ glibc-20051219T1003-fedora/ChangeLog.15 3 Mar 2005 17:29:57 -0000 1.1.6.2 @@ -477,6 +477,14 @@ 2004-11-26 Jakub Jelinek @@ -231,8 +223,8 @@ 2004-08-30 Roland McGrath * scripts/extract-abilist.awk: If `lastversion' variable defined, omit ---- glibc-20051119T1959/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 -+++ glibc-20051119T1959-fedora/csu/elf-init.c 15 Nov 2005 09:54:10 -0000 1.3.2.6 +--- glibc-20051219T1003/csu/elf-init.c 5 Nov 2005 17:41:38 -0000 1.8 ++++ glibc-20051219T1003-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; @@ -257,8 +249,8 @@ /* These function symbols are provided for the .init/.fini section entry points automagically by the linker. */ ---- glibc-20051119T1959/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 -+++ glibc-20051119T1959-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 +--- glibc-20051219T1003/debug/tst-chk1.c 22 Aug 2005 15:12:34 -0000 1.14 ++++ glibc-20051219T1003-fedora/debug/tst-chk1.c 24 Aug 2005 07:23:26 -0000 1.1.2.15 @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ @@ -287,20 +279,9 @@ # define O 0 #else # define O 1 ---- glibc-20051119T1959/elf/elf.h 17 Nov 2005 23:02:17 -0000 1.152 -+++ glibc-20051119T1959-fedora/elf/elf.h 19 Nov 2005 21:57:34 -0000 1.141.2.11 -@@ -2031,7 +2031,7 @@ typedef Elf32_Addr Elf32_Conflict; - #define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO - #define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI - #define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA --#define R_PPC64_REL30 37 /* word30 (S + A - P) >> 2 */ -+#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2 */ - #define R_PPC64_ADDR64 38 /* doubleword64 S + A */ - #define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A) */ - #define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A) */ ---- glibc-20051119T1959/elf/ldconfig.c 7 Apr 2005 20:56:56 -0000 1.49 -+++ glibc-20051119T1959-fedora/elf/ldconfig.c 15 Apr 2005 09:32:44 -0000 1.47.2.3 -@@ -953,17 +953,19 @@ search_dirs (void) +--- glibc-20051219T1003/elf/ldconfig.c 7 Dec 2005 05:47:27 -0000 1.50 ++++ glibc-20051219T1003-fedora/elf/ldconfig.c 19 Dec 2005 12:11:14 -0000 1.47.2.4 +@@ -951,17 +951,19 @@ search_dirs (void) static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -322,7 +303,7 @@ if (do_chroot && opt_chroot) { -@@ -1024,7 +1026,14 @@ parse_conf (const char *filename, bool d +@@ -1022,7 +1024,14 @@ parse_conf (const char *filename, bool d cp += 8; while ((dir = strsep (&cp, " \t")) != NULL) if (dir[0] != '\0') @@ -338,7 +319,7 @@ } else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5])) { -@@ -1087,7 +1096,7 @@ parse_conf (const char *filename, bool d +@@ -1085,7 +1094,7 @@ parse_conf (const char *filename, bool d config files to read. */ static void parse_conf_include (const char *config_file, unsigned int lineno, @@ -347,7 +328,7 @@ { if (opt_chroot && pattern[0] != '/') error (EXIT_FAILURE, 0, -@@ -1117,7 +1126,7 @@ parse_conf_include (const char *config_f +@@ -1115,7 +1124,7 @@ parse_conf_include (const char *config_f { case 0: for (size_t i = 0; i < gl.gl_pathc; ++i) @@ -356,7 +337,7 @@ globfree64 (&gl); break; -@@ -1157,6 +1166,8 @@ main (int argc, char **argv) +@@ -1155,6 +1164,8 @@ main (int argc, char **argv) { int remaining; @@ -365,7 +346,7 @@ /* Parse and process arguments. */ argp_parse (&argp, argc, argv, 0, &remaining, NULL); -@@ -1269,12 +1280,14 @@ main (int argc, char **argv) +@@ -1267,12 +1278,14 @@ main (int argc, char **argv) if (!opt_only_cline) { @@ -381,8 +362,8 @@ } search_dirs (); ---- glibc-20051119T1959/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 -+++ glibc-20051119T1959-fedora/elf/tst-stackguard1.c 8 Aug 2005 21:24:27 -0000 1.1.2.3 +--- glibc-20051219T1003/elf/tst-stackguard1.c 26 Jun 2005 18:08:36 -0000 1.1 ++++ glibc-20051219T1003-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; @@ -407,9 +388,9 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20051119T1959/iconv/iconvconfig.c 3 Mar 2005 08:28:02 -0000 1.23 -+++ glibc-20051119T1959-fedora/iconv/iconvconfig.c 3 Mar 2005 14:03:15 -0000 1.19.2.4 -@@ -1013,6 +1013,34 @@ next_prime (uint32_t seed) +--- glibc-20051219T1003/iconv/iconvconfig.c 7 Dec 2005 05:47:27 -0000 1.24 ++++ glibc-20051219T1003-fedora/iconv/iconvconfig.c 19 Dec 2005 12:11:14 -0000 1.19.2.5 +@@ -1011,6 +1011,34 @@ next_prime (uint32_t seed) module name offset (following last entry with step count 0) */ @@ -444,7 +425,7 @@ static int write_output (void) { -@@ -1020,8 +1048,6 @@ write_output (void) +@@ -1018,8 +1046,6 @@ write_output (void) char *string_table; size_t string_table_size; struct gconvcache_header header; @@ -453,7 +434,7 @@ struct module_entry *module_table; char *extra_table; char *cur_extra_table; -@@ -1034,31 +1060,6 @@ write_output (void) +@@ -1032,31 +1058,6 @@ write_output (void) char tmpfname[(output_file == NULL ? sizeof finalname : output_file_len + 1) + strlen (".XXXXXX")]; @@ -485,8 +466,8 @@ /* Open the output file. */ if (output_file == NULL) { ---- glibc-20051119T1959/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 -+++ glibc-20051119T1959-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 +--- glibc-20051219T1003/include/features.h 14 Oct 2005 22:04:45 -0000 1.41 ++++ glibc-20051219T1003-fedora/include/features.h 20 Oct 2005 06:59:51 -0000 1.35.2.10 @@ -265,7 +265,13 @@ #endif @@ -502,8 +483,8 @@ # if _FORTIFY_SOURCE > 1 # define __USE_FORTIFY_LEVEL 2 # else ---- glibc-20051119T1959/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 -+++ glibc-20051119T1959-fedora/intl/locale.alias 22 Sep 2004 21:20:53 -0000 1.23.2.1 +--- glibc-20051219T1003/intl/locale.alias 4 Dec 2003 07:57:47 -0000 1.23 ++++ glibc-20051219T1003-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 @@ -513,8 +494,8 @@ norwegian nb_NO.ISO-8859-1 nynorsk nn_NO.ISO-8859-1 polish pl_PL.ISO-8859-2 ---- glibc-20051119T1959/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 -+++ glibc-20051119T1959-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 +--- glibc-20051219T1003/libio/stdio.h 11 Nov 2005 18:56:20 -0000 1.83 ++++ glibc-20051219T1003-fedora/libio/stdio.h 15 Nov 2005 08:21:55 -0000 1.78.2.6 @@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t; extern struct _IO_FILE *stdin; /* Standard input stream. */ extern struct _IO_FILE *stdout; /* Standard output stream. */ @@ -528,8 +509,8 @@ __BEGIN_NAMESPACE_STD /* Remove file FILENAME. */ ---- glibc-20051119T1959/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 -+++ glibc-20051119T1959-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 +--- glibc-20051219T1003/libio/bits/stdio2.h 19 Mar 2005 00:14:58 -0000 1.4 ++++ glibc-20051219T1003-fedora/libio/bits/stdio2.h 27 Jun 2005 13:04:16 -0000 1.1.2.6 @@ -61,14 +61,25 @@ extern int __vfprintf_chk (FILE *__restr extern int __vprintf_chk (int __flag, __const char *__restrict __format, _G_va_list __ap); @@ -560,8 +541,8 @@ #endif ---- glibc-20051119T1959/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 -+++ glibc-20051119T1959-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 +--- glibc-20051219T1003/locale/iso-4217.def 23 Sep 2005 19:07:54 -0000 1.18 ++++ glibc-20051219T1003-fedora/locale/iso-4217.def 3 Oct 2005 20:44:15 -0000 1.15.2.3 @@ -8,6 +8,7 @@ * * !!! The list has to be sorted !!! @@ -653,9 +634,9 @@ DEFINE_INT_CURR("PYG") /* Paraguay Guarani */ DEFINE_INT_CURR("QAR") /* Qatar Rial */ DEFINE_INT_CURR("ROL") /* Romanian Leu */ ---- glibc-20051119T1959/locale/programs/3level.h 13 Jun 2003 20:45:38 -0000 1.5 -+++ glibc-20051119T1959-fedora/locale/programs/3level.h 22 Sep 2004 21:20:58 -0000 1.5.2.1 -@@ -204,6 +204,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t, +--- glibc-20051219T1003/locale/programs/3level.h 7 Dec 2005 05:47:27 -0000 1.6 ++++ glibc-20051219T1003-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, } } } @@ -698,8 +679,8 @@ #endif #ifndef NO_FINALIZE ---- glibc-20051119T1959/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 -+++ glibc-20051119T1959-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 +--- glibc-20051219T1003/localedata/Makefile 25 Sep 2005 17:01:12 -0000 1.102 ++++ glibc-20051219T1003-fedora/localedata/Makefile 3 Oct 2005 20:44:15 -0000 1.101.2.2 @@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo echo -n '...'; \ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ @@ -708,8 +689,8 @@ -i locales/$$input -c -f charmaps/$$charset \ $(addprefix --prefix=,$(install_root)) $$locale; \ echo ' done'; \ ---- glibc-20051119T1959/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 -+++ glibc-20051119T1959-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 +--- glibc-20051219T1003/localedata/SUPPORTED 5 Nov 2005 16:25:49 -0000 1.87 ++++ glibc-20051219T1003-fedora/localedata/SUPPORTED 15 Nov 2005 08:21:56 -0000 1.71.2.8 @@ -69,6 +69,7 @@ cy_GB.UTF-8/UTF-8 \ cy_GB/ISO-8859-14 \ da_DK.UTF-8/UTF-8 \ @@ -751,8 +732,8 @@ ta_IN/UTF-8 \ te_IN/UTF-8 \ tg_TJ.UTF-8/UTF-8 \ ---- glibc-20051119T1959/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 -+++ glibc-20051119T1959-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 +--- glibc-20051219T1003/localedata/locales/cy_GB 28 Sep 2004 04:37:33 -0000 1.4 ++++ glibc-20051219T1003-fedora/localedata/locales/cy_GB 29 Sep 2004 08:48:23 -0000 1.3.2.2 @@ -248,8 +248,11 @@ mon "" d_fmt "" @@ -767,8 +748,8 @@ END LC_TIME LC_MESSAGES ---- glibc-20051119T1959/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 -+++ glibc-20051119T1959-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 +--- glibc-20051219T1003/localedata/locales/en_GB 31 Oct 2004 23:42:26 -0000 1.12 ++++ glibc-20051219T1003-fedora/localedata/locales/en_GB 2 Nov 2004 12:25:47 -0000 1.10.2.2 @@ -112,8 +112,8 @@ mon "" d_fmt "" @@ -780,8 +761,8 @@ date_fmt "/ / " ---- glibc-20051119T1959/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051119T1959-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 +--- glibc-20051219T1003/localedata/locales/no_NO 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051219T1003-fedora/localedata/locales/no_NO 22 Sep 2004 21:21:01 -0000 1.11.2.1 @@ -0,0 +1,69 @@ +escape_char / +comment_char % @@ -852,8 +833,8 @@ +LC_ADDRESS +copy "nb_NO" +END LC_ADDRESS ---- glibc-20051119T1959/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 -+++ glibc-20051119T1959-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 +--- glibc-20051219T1003/localedata/locales/zh_TW 31 Oct 2004 23:42:28 -0000 1.7 ++++ glibc-20051219T1003-fedora/localedata/locales/zh_TW 2 Nov 2004 12:25:57 -0000 1.5.2.2 @@ -1,7 +1,7 @@ comment_char % escape_char / @@ -881,9 +862,9 @@ revision "0.2" date "2000-08-02" % ---- glibc-20051119T1959/nptl/ChangeLog 16 Nov 2005 23:32:52 -0000 1.807 -+++ glibc-20051119T1959-fedora/nptl/ChangeLog 19 Nov 2005 20:05:09 -0000 1.706.2.63 -@@ -112,6 +112,15 @@ +--- glibc-20051219T1003/nptl/ChangeLog 18 Dec 2005 06:58:22 -0000 1.814 ++++ glibc-20051219T1003-fedora/nptl/ChangeLog 19 Dec 2005 12:11:22 -0000 1.706.2.64 +@@ -160,6 +160,15 @@ Use __sigfillset. Document that sigfillset does the right thing wrt to SIGSETXID. @@ -899,7 +880,7 @@ 2005-07-11 Jakub Jelinek [BZ #1102] -@@ -848,6 +857,11 @@ +@@ -896,6 +905,11 @@ Move definition inside libpthread, libc, librt check. Provide definition for rtld. @@ -911,7 +892,7 @@ 2004-09-02 Ulrich Drepper * sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp. -@@ -2922,6 +2936,11 @@ +@@ -2970,6 +2984,11 @@ * Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules). @@ -923,8 +904,8 @@ 2003-07-25 Jakub Jelinek * tst-cancel17.c (do_test): Check if aio_cancel failed. ---- glibc-20051119T1959/nptl/Makefile 16 Oct 2005 09:25:52 -0000 1.171 -+++ glibc-20051119T1959-fedora/nptl/Makefile 20 Oct 2005 06:59:53 -0000 1.157.2.13 +--- glibc-20051219T1003/nptl/Makefile 16 Oct 2005 09:25:52 -0000 1.171 ++++ glibc-20051219T1003-fedora/nptl/Makefile 20 Oct 2005 06:59:53 -0000 1.157.2.13 @@ -500,15 +500,19 @@ $(addprefix $(objpfx), \ $(tests) $(xtests) $(test-srcs))): $(objpfx)libpthread.so \ $(objpfx)libpthread_nonshared.a @@ -947,8 +928,8 @@ else $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ---- glibc-20051119T1959/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 -+++ glibc-20051119T1959-fedora/nptl/tst-stackguard1.c 8 Aug 2005 21:24:28 -0000 1.1.2.3 +--- glibc-20051219T1003/nptl/tst-stackguard1.c 26 Jun 2005 17:44:14 -0000 1.1 ++++ glibc-20051219T1003-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; @@ -973,8 +954,8 @@ { puts ("stack guard canaries are not randomized enough"); puts ("nor equal to the default canary value"); ---- glibc-20051119T1959/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051119T1959-fedora/nptl/sysdeps/unix/sysv/linux/kernel-features.h 22 Sep 2004 21:21:02 -0000 1.1.2.1 +--- glibc-20051219T1003/nptl/sysdeps/unix/sysv/linux/kernel-features.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051219T1003-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 + @@ -982,9 +963,9 @@ +#ifndef __ASSUME_CLONE_THREAD_FLAGS +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif ---- glibc-20051119T1959/nscd/connections.c 19 Nov 2005 17:14:47 -0000 1.78 -+++ glibc-20051119T1959-fedora/nscd/connections.c 19 Nov 2005 20:05:09 -0000 1.55.2.16 -@@ -1880,3 +1880,18 @@ finish_drop_privileges (void) +--- glibc-20051219T1003/nscd/connections.c 7 Dec 2005 05:47:27 -0000 1.80 ++++ glibc-20051219T1003-fedora/nscd/connections.c 19 Dec 2005 12:11:23 -0000 1.55.2.17 +@@ -1899,3 +1899,18 @@ finish_drop_privileges (void) exit (4); } } @@ -1003,9 +984,9 @@ + prune_cache (&dbs[hstdb], LONG_MAX); +} + ---- glibc-20051119T1959/nscd/nscd.c 24 Aug 2005 06:33:23 -0000 1.48 -+++ glibc-20051119T1959-fedora/nscd/nscd.c 24 Aug 2005 07:23:30 -0000 1.38.2.9 -@@ -122,6 +122,9 @@ static struct argp argp = +--- glibc-20051219T1003/nscd/nscd.c 7 Dec 2005 05:47:27 -0000 1.49 ++++ glibc-20051219T1003-fedora/nscd/nscd.c 19 Dec 2005 12:11:23 -0000 1.38.2.10 +@@ -120,6 +120,9 @@ static struct argp argp = options, parse_opt, NULL, doc, }; @@ -1015,7 +996,7 @@ /* True if only statistics are requested. */ static bool get_stats; -@@ -266,6 +269,7 @@ main (int argc, char **argv) +@@ -264,6 +267,7 @@ main (int argc, char **argv) signal (SIGINT, termination_handler); signal (SIGQUIT, termination_handler); signal (SIGTERM, termination_handler); @@ -1023,8 +1004,8 @@ signal (SIGPIPE, SIG_IGN); /* Cleanup files created by a previous 'bind'. */ ---- glibc-20051119T1959/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 -+++ glibc-20051119T1959-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 +--- glibc-20051219T1003/nscd/nscd.conf 23 Aug 2005 23:17:32 -0000 1.11 ++++ glibc-20051219T1003-fedora/nscd/nscd.conf 24 Aug 2005 07:23:30 -0000 1.8.2.3 @@ -32,8 +32,8 @@ # logfile /var/log/nscd.log # threads 6 @@ -1036,8 +1017,8 @@ debug-level 0 # reload-count 5 paranoia no ---- glibc-20051119T1959/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 -+++ glibc-20051119T1959-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 +--- glibc-20051219T1003/nscd/nscd.init 20 Jun 2005 15:47:52 -0000 1.9 ++++ glibc-20051219T1003-fedora/nscd/nscd.init 12 Sep 2005 12:53:20 -0000 1.6.2.4 @@ -9,6 +9,7 @@ # slow naming services like NIS, NIS+, LDAP, or hesiod. # processname: /usr/sbin/nscd @@ -1078,8 +1059,8 @@ RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/nscd ---- glibc-20051119T1959/nscd/selinux.c 20 Jun 2005 15:44:41 -0000 1.5 -+++ glibc-20051119T1959-fedora/nscd/selinux.c 3 Oct 2005 20:54:46 -0000 1.1.2.5 +--- glibc-20051219T1003/nscd/selinux.c 20 Jun 2005 15:44:41 -0000 1.5 ++++ glibc-20051219T1003-fedora/nscd/selinux.c 3 Oct 2005 20:54:46 -0000 1.1.2.5 @@ -127,7 +127,7 @@ audit_init (void) { audit_fd = audit_open (); @@ -1089,8 +1070,8 @@ } #endif /* HAVE_LIBAUDIT */ ---- glibc-20051119T1959/posix/Makefile 26 Sep 2005 21:13:27 -0000 1.186 -+++ glibc-20051119T1959-fedora/posix/Makefile 3 Oct 2005 20:44:16 -0000 1.171.2.14 +--- glibc-20051219T1003/posix/Makefile 26 Sep 2005 21:13:27 -0000 1.186 ++++ glibc-20051219T1003-fedora/posix/Makefile 3 Oct 2005 20:44:16 -0000 1.171.2.14 @@ -106,7 +106,8 @@ generated := $(addprefix wordexp-test-re bug-regex21-mem bug-regex21.mtrace \ tst-rxspencer-mem tst-rxspencer.mtrace tst-getconf.out \ @@ -1124,8 +1105,8 @@ + | sed -n -e '/START_OF_STRINGS/,$${/POSIX_V6_/{s/^[^"]*"//;s/".*$$//;p}}' \ + > $@.new + mv -f $@.new $@ ---- glibc-20051119T1959/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051119T1959-fedora/posix/getconf.speclist.h 13 Dec 2004 23:32:37 -0000 1.1.2.2 +--- glibc-20051219T1003/posix/getconf.speclist.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051219T1003-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 = @@ -1142,8 +1123,8 @@ +"POSIX_V6_LPBIG_OFFBIG" +#endif +""; ---- glibc-20051119T1959/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 -+++ glibc-20051119T1959-fedora/sysdeps/generic/dl-cache.h 22 Sep 2004 21:21:07 -0000 1.13.2.1 +--- glibc-20051219T1003/sysdeps/generic/dl-cache.h 25 Jun 2003 08:01:22 -0000 1.13 ++++ glibc-20051219T1003-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 @@ -1159,8 +1140,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-20051119T1959/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 -+++ glibc-20051119T1959-fedora/sysdeps/ia64/Makefile 22 Sep 2004 21:21:07 -0000 1.10.2.1 +--- glibc-20051219T1003/sysdeps/ia64/Makefile 16 Aug 2004 06:46:14 -0000 1.10 ++++ glibc-20051219T1003-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)) @@ -1172,8 +1153,8 @@ endif endif ---- glibc-20051119T1959/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 -+++ glibc-20051119T1959-fedora/sysdeps/ia64/ia64libgcc.S 22 Sep 2004 21:21:07 -0000 1.2.2.1 +--- glibc-20051219T1003/sysdeps/ia64/ia64libgcc.S 11 May 2002 05:12:35 -0000 1.2 ++++ glibc-20051219T1003-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. */ @@ -1525,8 +1506,8 @@ - .symver ___multi3, __multi3@GLIBC_2.2 - -#endif ---- glibc-20051119T1959/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051119T1959-fedora/sysdeps/ia64/libgcc-compat.c 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20051219T1003/sysdeps/ia64/libgcc-compat.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051219T1003-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. @@ -1612,8 +1593,8 @@ +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2); + +#endif ---- glibc-20051119T1959/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 -+++ glibc-20051119T1959-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 +--- glibc-20051219T1003/sysdeps/unix/nice.c 28 Sep 2002 19:13:13 -0000 1.6 ++++ glibc-20051219T1003-fedora/sysdeps/unix/nice.c 22 Sep 2004 21:21:08 -0000 1.6.2.1 @@ -41,7 +41,12 @@ nice (int incr) __set_errno (save); } @@ -1628,8 +1609,8 @@ if (result != -1) return getpriority (PRIO_PROCESS, 0); else ---- glibc-20051119T1959/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 -+++ glibc-20051119T1959-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 +--- glibc-20051219T1003/sysdeps/unix/sysv/linux/dl-osinfo.h 26 Jun 2005 18:14:09 -0000 1.21 ++++ glibc-20051219T1003-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h 8 Aug 2005 21:24:28 -0000 1.14.2.7 @@ -18,12 +18,15 @@ 02111-1307 USA. */ @@ -1678,8 +1659,8 @@ + ret ^= stk; return ret; } ---- glibc-20051119T1959/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 -+++ glibc-20051119T1959-fedora/sysdeps/unix/sysv/linux/paths.h 22 Sep 2004 21:21:08 -0000 1.11.4.1 +--- glibc-20051219T1003/sysdeps/unix/sysv/linux/paths.h 15 Nov 2000 23:06:47 -0000 1.11 ++++ glibc-20051219T1003-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" @@ -1689,8 +1670,8 @@ #define _PATH_WTMP "/var/log/wtmp" /* Provide trailing slash, since mostly used for building pathnames. */ ---- glibc-20051119T1959/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 -+++ glibc-20051119T1959-fedora/sysdeps/unix/sysv/linux/tcsetattr.c 22 Sep 2004 21:21:08 -0000 1.16.2.1 +--- glibc-20051219T1003/sysdeps/unix/sysv/linux/tcsetattr.c 10 Sep 2003 19:16:07 -0000 1.16 ++++ glibc-20051219T1003-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; @@ -1736,8 +1717,8 @@ + return retval; } libc_hidden_def (tcsetattr) ---- glibc-20051119T1959/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051119T1959-fedora/sysdeps/unix/sysv/linux/i386/dl-cache.h 22 Sep 2004 21:21:08 -0000 1.1.2.1 +--- glibc-20051219T1003/sysdeps/unix/sysv/linux/i386/dl-cache.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051219T1003-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. @@ -1798,8 +1779,8 @@ + } while (0) + +#include_next ---- glibc-20051119T1959/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 -+++ glibc-20051119T1959-fedora/sysdeps/unix/sysv/linux/ia64/dl-cache.h 22 Sep 2004 21:21:09 -0000 1.2.4.1 +--- glibc-20051219T1003/sysdeps/unix/sysv/linux/ia64/dl-cache.h 6 Jul 2001 04:56:17 -0000 1.2 ++++ glibc-20051219T1003-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) @@ -1832,24 +1813,24 @@ + } while (0) + #include_next ---- glibc-20051119T1959/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051119T1959-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20051219T1003/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051219T1003-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-20051119T1959/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 -+++ glibc-20051119T1959-fedora/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 22 Sep 2004 21:21:09 -0000 1.1.2.1 +--- glibc-20051219T1003/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h 1 Jan 1970 00:00:00 -0000 ++++ glibc-20051219T1003-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-20051119T1959/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 -+++ glibc-20051119T1959-fedora/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 22 Sep 2004 21:21:09 -0000 1.2.2.1 +--- glibc-20051219T1003/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed 17 Jan 2002 06:49:28 -0000 1.2 ++++ glibc-20051219T1003-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"_ diff --git a/glibc.spec b/glibc.spec index 8a2d645..1059b80 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,9 +1,9 @@ -%define glibcdate 20051119T1959 +%define glibcdate 20051219T1003 %define glibcname glibc -%define glibcsrcdir glibc-20051119T1959 +%define glibcsrcdir glibc-20051219T1003 %define glibc_release_tarballs 0 %define glibcversion 2.3.90 -%define glibcrelease 18.1 +%define glibcrelease 19 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define xenarches i686 athlon @@ -33,10 +33,9 @@ Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2 Patch0: %{glibcname}-fedora.patch Patch1: %{name}-ppc-assume.patch Patch2: %{name}-ia64-lib64.patch -Patch3: glibc-_Pragma-hack.patch Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers, -Obsoletes: gencat, locale, ldconfig, locale-ja +Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile Provides: ldconfig Autoreq: false Requires: glibc-common = %{version}-%{release} @@ -156,24 +155,6 @@ executables. Install glibc-headers if you are going to develop programs which will use the standard C libraries. -%package profile -Summary: The GNU libc libraries, including support for gprof profiling. -Group: Development/Libraries -Obsoletes: libc-profile -Autoreq: true - -%description profile -The glibc-profile package includes the GNU libc libraries and support -for profiling using the gprof program. Profiling is analyzing a -program's functions to see how much CPU time they use and determining -which functions are calling other functions during execution. To use -gprof to profile a program, your program needs to use the GNU libc -libraries included in glibc-profile (instead of the standard GNU libc -libraries included in the glibc package). - -If you are going to use the gprof program to profile a program, you'll -need to install the glibc-profile package. - %package common Summary: Common binaries and locale data for glibc Conflicts: %{name} < %{version} @@ -259,7 +240,6 @@ package or when debugging this package. %patch2 -p1 %endif %endif -%patch3 -p1 # Hack till glibc-kernheaders get updated, argh mkdir asm @@ -510,7 +490,8 @@ CC="$GCC" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \ --enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \ --with-headers=%{_prefix}/include --enable-bind-now \ --with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \ - --host %{nptl_target_cpu}-redhat-linux + --host %{nptl_target_cpu}-redhat-linux \ + --disable-profile make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s cd .. @@ -519,7 +500,6 @@ cd .. build_nptl linuxnptl %if %{buildxen} -EnableKernel="$EnableKernel --disable-profile" build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs %endif @@ -698,7 +678,6 @@ for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do chmod 755 $i; rm -f $i.tmp done -grep '%{_prefix}/%{_lib}/lib.*_p\.a' < rpm.filelist > profile.filelist || : grep '%{_infodir}' < rpm.filelist | grep -v '%{_infodir}/dir' > devel.filelist grep '%{_prefix}/include/gnu/stubs-[32164]\+\.h' < rpm.filelist >> devel.filelist || : @@ -941,7 +920,7 @@ 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([^)]*) //' \ - common.filelist devel.filelist headers.filelist profile.filelist \ + common.filelist devel.filelist headers.filelist \ utils.filelist nscd.filelist`; do [ -f "$RPM_BUILD_ROOT$i" ] && rm -f "$RPM_BUILD_ROOT$i" || : done @@ -1058,9 +1037,6 @@ rm -f *.filelist* %files -f headers.filelist headers %defattr(-,root,root) -%files -f profile.filelist profile -%defattr(-,root,root) - %files -f utils.filelist utils %defattr(-,root,root) @@ -1102,9 +1078,13 @@ rm -f *.filelist* %endif %changelog -* Mon Dec 19 2005 Jakub Jelinek 2.3.90-18.1 -- rebuilt with GCC 4.1 -- work around http://gcc.gnu.org/PR25240 +* Mon Dec 19 2005 Jakub Jelinek 2.3.90-19 +- update from CVS + - sysdeps/generic reorg + - setjmp/longjmp jump pointer mangling +- rebuilt with GCC 4.1-RH prerelease, worked around broken _Pragma () + handling in it +- remove glibc-profile subpackage * Sat Nov 19 2005 Jakub Jelinek 2.3.90-18 - update from CVS diff --git a/sources b/sources index 2dd0240..5c42ccf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -a740e03d79a6d27ee6e05006c0c58435 glibc-20051119T1959.tar.bz2 -7986096fc10a15f1ef2e95e96f65294a glibc-fedora-20051119T1959.tar.bz2 +5c4296bcdd5aec829651ed3997d2eadd glibc-20051219T1003.tar.bz2 +29470bf176acdf597e841399df5a41f6 glibc-fedora-20051219T1003.tar.bz2