--- glibc-20050808T2126/ChangeLog	8 Aug 2005 21:04:02 -0000	1.9483

+++ glibc-20050808T2126-fedora/ChangeLog	8 Aug 2005 21:34:17 -0000	1.8782.2.122

@@ -1,3 +1,9 @@

+2005-08-08  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/unix/sysv/linux/dl-osinfo.h (_dl_setup_stack_chk_guard):

+	Shift marked &errno down on big-endian instead of up.

+	* elf/tst-stackguard1.c (do_test): Fix a typo.

+

 2005-08-08  Ulrich Drepper  <drepper@redhat.com>

 	* nscd/cache.c (cache_add): Commit hash table and header to disk.

@@ -120,6 +126,17 @@

 	__syslog_chk.

 	* misc/Versions: Export __syslog_chk and __vsyslog_chk.

+2005-07-29  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/unix/sysv/linux/dl-osinfo.h: Include errno.h, hp-timing.h,

+	endian.h.

+	(_dl_setup_stack_chk_guard): Even without

+	--enable-stackguard-randomization attempt to do some guard

+	randomization using hp-timing (if available) and kernel stack and

+	mmap randomization.

+	* elf/tst-stackguard1.c (do_test): Don't fail if the poor man's

+	randomization doesn't work well enough.

+

 2005-07-28  Thomas Schwinge  <schwinge@nic-nac-project.de>

 	[BZ #1137]

@@ -3171,6 +3188,18 @@

 	* scripts/soversions.awk: Fix default version set handling.

+2005-02-09  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/unix/sysv/linux/bits/termios.h (CMSPAR): Define.

+	* sysdeps/unix/sysv/linux/alpha/bits/termios.h: Add __USE_MISC

+	and __USE_XOPEN guards to match linux/bits/termios.h.

+	(CMSPAR): Define.

+	* sysdeps/unix/sysv/linux/powerpc/bits/termios.h: Add __USE_MISC

+	and __USE_XOPEN guards to match linux/bits/termios.h.

+	(CMSPAR): Define.

+	* sysdeps/unix/sysv/linux/sparc/bits/termios.h: Add __USE_MISC

+	and __USE_XOPEN guards to match linux/bits/termios.h.

+

 2005-02-10  Roland McGrath  <roland@redhat.com>

 	[BZ #157]

--- glibc-20050808T2126/ChangeLog.11	10 Nov 2000 03:31:36 -0000	1.1

+++ glibc-20050808T2126-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.

+2000-10-02  Jakub Jelinek  <jakub@redhat.com>

+

+	* sunrpc/svc_udp.c (svcudp_recv): Set msg_controllen to all

+	remaining xp_pad space.

+

 2000-10-02  Ulrich Drepper  <drepper@redhat.com>

 	* include/features.h [__USE_FILE_OFFSET && !__REDIRECT]: Define

@@ -9280,6 +9285,12 @@

 	syscall.

 	* sysdeps/unix/sysv/linux/mips/truncate64.c: Likewise.

+2000-05-30  Jakub Jelinek  <jakub@redhat.com>

+

+	* resolv/res_query.c (res_nsearch): Remove unused variable

+	root_on_list. If dots >= statp->ndots and as is querydomain

+	fails, keep searching.

+

 2000-05-30  Ulrich Drepper  <drepper@redhat.com>

 	* sysdeps/unix/sysv/linux/alpha/oldglob.c (__old_glob): Loose __P.

@@ -9480,6 +9491,11 @@

 	* sysdeps/i386/fpu/bits/mathinline.h: Define expm1 inline only if

 	__FAST_MATH__ is defined.

+2000-05-22  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/i386/fpu/bits/mathinline.h (__expm1_code): Avoid using ?:

+	with omitted middle operand.

+

 2000-05-22  Andreas Jaeger  <aj@suse.de>

 	* math/Makefile: Add -D__FAST_MATH__ to CFLAGS-test-ifloat.c,

@@ -9720,6 +9736,11 @@

 2000-05-17  Jakub Jelinek  <jakub@redhat.com>

+	* inet/rcmd.c (rcmd_af): If *ahost cannot be resolved, include

+	unresolved hostname in the message.

+

+2000-05-17  Jakub Jelinek  <jakub@redhat.com>

+

 	* 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-20050808T2126/ChangeLog.12	16 Aug 2001 05:24:54 -0000	1.1

+++ glibc-20050808T2126-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.

+2001-01-10  Jakub Jelinek  <jakub@redhat.com>

+

+	* malloc/memusage.c (me): If not SUID/SGID, allow creating new

+	$MEMUSAGE_OUTPUT file.

+	* sysdeps/generic/segfault.c (segfault.c): If not SUID/SGID, allow

+	creating new $SEGFAULT_OUTPUT_NAME file.

+

 2001-01-10  H.J. Lu  <hjl@gnu.org>

 	* elf/dl-libc.c (do_dlopen): Call DL_STATIC_INIT for static binaries.

@@ -8130,6 +8137,11 @@

 	* sysdeps/powerpc/soft-fp/Versions: Likewise.

 	* sysdeps/sparc/sparc64/soft-fp/Versions: Likewise.

+2001-01-02  Jakub Jelinek  <jakub@redhat.com>

+

+	* locale/setlocale.c (setlocale): Don't allocate/free category name

+	unnecessarily.

+

 2001-01-02  Franz Sirl	<Franz.Sirl-kernel@lauterbach.com>

 	* sysdeps/powerpc/dl-machine.c (__process_machine_rela): Fix typo.

--- glibc-20050808T2126/ChangeLog.15	16 Feb 2005 07:34:17 -0000	1.1

+++ glibc-20050808T2126-fedora/ChangeLog.15	3 Mar 2005 17:29:57 -0000	1.1.6.2

@@ -477,6 +477,14 @@

 2004-11-26  Jakub Jelinek  <jakub@redhat.com>

+	* posix/Makefile (generated: Add getconf.speclist.

+	($(inst_libexecdir)/getconf): Use getconf.speclist instead of

+	getconf output.

+	($(objpfx)getconf.speclist): New rule.

+	* posix/getconf.speclist.h: New file.

+

+2004-11-26  Jakub Jelinek  <jakub@redhat.com>

+

 	* sysdeps/generic/unsecvars.h (UNSECURE_ENVVARS): Add GETCONF_DIR.

 2004-11-26  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

@@ -1103,6 +1111,16 @@

 	* sysdeps/generic/tempname.c (__path_search): Add missing argument

 	TRY_TMPDIR.

+2004-11-02  Jakub Jelinek  <jakub@redhat.com>

+

+	* include/features.h (__USE_FORTIFY_LEVEL): Also set for Red Hat

+	GCC 3.4.x-RH >= 3.4.2-8.

+	* libio/bits/features.h (printf, fprintf, vprintf, vfprintf): For

+	GCC 3.4.x-RH use __builtin___{,v}{,f}printf_chk instead of

+	__{,v}{,f}printf_chk.

+	* debug/tst-chk1.c (do_test): Deal with GCC 3.4.x-RH not

+	being able to recognize subobjects.

+

 2004-10-31  Mariusz Mazur <mmazur@kernel.pl>

 	* sysdeps/unix/sysv/linux/alpha/setregid.c: New file.

@@ -1398,6 +1416,11 @@

 	* posix/execvp.c (execvp): Also ignore ENODEV and ETIMEDOUT errno

 	values.

+2004-10-20  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/unix/sysv/linux/readonly-area.c (__readonly_area): If /proc

+	is not mounted, return 1.

+

 2004-10-20  Roland McGrath  <roland@redhat.com>

 	* Makeconfig ($(common-objpfx)shlib-versions.v.i): Check also

@@ -1443,6 +1466,11 @@

 	* sysdeps/generic/readonly-area.c (__readonly_str): Renamed to ...

 	(__readonly_area): ... this.

+2004-10-19  Jakub Jelinek  <jakub@redhat.com>

+

+	* include/features.h (__USE_FORTIFY_LEVEL): Enable even with

+	Red Hat gcc4 4.0.0 and above.

+

 2004-10-18  Jakub Jelinek  <jakub@redhat.com>

 	* sysdeps/generic/strcpy_chk.c (__strcpy_chk): Speed up by checking

@@ -3182,6 +3210,23 @@

 	before return type.

 	* locale/localename.c (__current_locale_name): Likewise.

+2004-08-31  Jakub Jelinek  <jakub@redhat.com>

+

+	* elf/ldconfig.c (parse_conf): Add prefix argument, prepend it

+	before arguments to add_dir and pass to parse_conf_include.

+	(parse_conf_include): Add prefix argument, pass it down to

+	parse_conf.

+	(main): Call arch_startup.  Adjust parse_conf caller.

+	Call add_arch_dirs.

+	* sysdeps/generic/dl-cache.h (arch_startup, add_arch_dirs): Define.

+	* sysdeps/unix/sysv/linux/i386/dl-cache.h: New file.

+	* sysdeps/unix/sysv/linux/ia64/dl-cache.h (EMUL_HACK, arch_startup,

+	add_arch_dirs): Define.

+	* sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed: Prepend

+	/emul/ia32-linux before the 32-bit ld.so pathname.

+	* sysdeps/unix/sysv/linux/ia64/dl-procinfo.c: New file.

+	* sysdeps/unix/sysv/linux/ia64/dl-procinfo.h: New file.

+

 2004-08-30  Roland McGrath  <roland@frob.com>

 	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit

--- glibc-20050808T2126/csu/elf-init.c	7 Jul 2005 22:56:11 -0000	1.7

+++ glibc-20050808T2126-fedora/csu/elf-init.c	8 Jul 2005 09:09:45 -0000	1.3.2.4

@@ -48,6 +48,24 @@ extern void (*__init_array_end []) (int,

   attribute_hidden;

 extern void (*__fini_array_start []) (void) attribute_hidden;

 extern void (*__fini_array_end []) (void) attribute_hidden;

+

+# if defined HAVE_VISIBILITY_ATTRIBUTE \

+     && (defined SHARED || defined LIBC_NONSHARED)

+#  define hidden_undef_2(x) #x

+#  define hidden_undef_1(x) hidden_undef_2 (x)

+#  define hidden_undef(x) \

+  __asm (hidden_undef_1 (ASM_GLOBAL_DIRECTIVE) " " #x); \

+  __asm (".hidden " #x);

+# else

+#  define hidden_undef(x)

+# endif

+

+hidden_undef (__preinit_array_start)

+hidden_undef (__preinit_array_end)

+hidden_undef (__init_array_start)

+hidden_undef (__init_array_end)

+hidden_undef (__fini_array_start)

+hidden_undef (__fini_array_end)

 #endif

 /* These function symbols are provided for the .init/.fini section entry

--- glibc-20050808T2126/debug/tst-chk1.c	21 Jul 2005 16:22:32 -0000	1.12

+++ glibc-20050808T2126-fedora/debug/tst-chk1.c	21 Jul 2005 09:33:53 -0000	1.1.2.13

@@ -17,6 +17,9 @@

    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA

    02111-1307 USA.  */

+/* Hack: make sure GCC doesn't know __chk_fail () will not return.  */

+#define __noreturn__

+

 #include <fcntl.h>

 #include <locale.h>

 #include <paths.h>

@@ -231,7 +234,7 @@ do_test (void)

   if (memcmp (a.buf1, "aabcdabcjj", 10))

     FAIL ();

-#if __USE_FORTIFY_LEVEL < 2

+#if __USE_FORTIFY_LEVEL < 2 || !__GNUC_PREREQ (4, 0)

   /* 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.  */

@@ -336,7 +339,7 @@ do_test (void)

   memset (a.buf1 + 9, 'j', l0 + 2);

   CHK_FAIL_END

-#if __USE_FORTIFY_LEVEL >= 2

+#if __USE_FORTIFY_LEVEL >= 2 && __GNUC_PREREQ (4, 0)

 # define O 0

 #else

 # define O 1

--- glibc-20050808T2126/elf/ldconfig.c	7 Apr 2005 20:56:56 -0000	1.49

+++ glibc-20050808T2126-fedora/elf/ldconfig.c	15 Apr 2005 09:32:44 -0000	1.47.2.3

@@ -953,17 +953,19 @@ search_dirs (void)

 static void parse_conf_include (const char *config_file, unsigned int lineno,

-				bool do_chroot, const char *pattern);

+				const char *prefix, bool do_chroot,

+				const char *pattern);

 /* Parse configuration file.  */

 static void

-parse_conf (const char *filename, bool do_chroot)

+parse_conf (const char *filename, const char *prefix, bool do_chroot)

 {

   FILE *file = NULL;

   char *line = NULL;

   const char *canon;

   size_t len = 0;

   unsigned int lineno;

+  size_t prefix_len = prefix ? strlen (prefix) : 0;

   if (do_chroot && opt_chroot)

     {

@@ -1024,7 +1026,14 @@ parse_conf (const char *filename, bool d

 	  cp += 8;

 	  while ((dir = strsep (&cp, " \t")) != NULL)

 	    if (dir[0] != '\0')

-	      parse_conf_include (filename, lineno, do_chroot, dir);

+	      parse_conf_include (filename, lineno, prefix, do_chroot, dir);

+	}

+      else if (prefix != NULL)

+	{

+	  size_t cp_len = strlen (cp);

+	  char new_cp [prefix_len + cp_len + 1];

+	  memcpy (mempcpy (new_cp, prefix, prefix_len), cp, cp_len + 1);

+	  add_dir (new_cp);

 	}

       else if (!strncasecmp (cp, "hwcap", 5) && isblank (cp[5]))

 	{

@@ -1087,7 +1096,7 @@ parse_conf (const char *filename, bool d

    config files to read.  */

 static void

 parse_conf_include (const char *config_file, unsigned int lineno,

-		    bool do_chroot, const char *pattern)

+		    const char *prefix, bool do_chroot, const char *pattern)

 {

   if (opt_chroot && pattern[0] != '/')

     error (EXIT_FAILURE, 0,

@@ -1117,7 +1126,7 @@ parse_conf_include (const char *config_f

     {

     case 0:

       for (size_t i = 0; i < gl.gl_pathc; ++i)

-	parse_conf (gl.gl_pathv[i], false);

+	parse_conf (gl.gl_pathv[i], prefix, false);

       globfree64 (&gl);

       break;

@@ -1157,6 +1166,8 @@ main (int argc, char **argv)

 {

   int remaining;

+  arch_startup (argc, argv);

+

   /* Parse and process arguments.  */

   argp_parse (&argp, argc, argv, 0, &remaining, NULL);

@@ -1269,12 +1280,14 @@ main (int argc, char **argv)

   if (!opt_only_cline)

     {

-      parse_conf (config_file, true);

+      parse_conf (config_file, NULL, true);

       /* Always add the standard search paths.  */

       add_system_dir (SLIBDIR);

       if (strcmp (SLIBDIR, LIBDIR))

 	add_system_dir (LIBDIR);

+

+      add_arch_dirs (config_file);

     }

   search_dirs ();

--- glibc-20050808T2126/elf/tst-stackguard1.c	26 Jun 2005 18:08:36 -0000	1.1

+++ glibc-20050808T2126-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;

   int ndefaults = 0;

+  int npartlyrandomized = 0;

   for (i = 0; i < N; ++i) 

     {

       if (child_stack_chk_guards[i] != child_stack_chk_guards[i+1])

 	ndifferences++;

       else if (child_stack_chk_guards[i] == default_guard)

 	ndefaults++;

+      else if (*(char *) &child_stack_chk_guards[i] == 0)

+	npartlyrandomized++;

     }

-  printf ("differences %d defaults %d\n", ndifferences, ndefaults);

+  printf ("differences %d defaults %d partly randomized %d\n",

+	  ndifferences, ndefaults, npartlyrandomized);

-  if (ndifferences < N / 2 && ndefaults < N / 2)

+  if ((ndifferences + ndefaults + npartlyrandomized) < 3 * N / 4)

     {

       puts ("stack guard canaries are not randomized enough");

       puts ("nor equal to the default canary value");

--- glibc-20050808T2126/iconv/iconvconfig.c	3 Mar 2005 08:28:02 -0000	1.23

+++ glibc-20050808T2126-fedora/iconv/iconvconfig.c	3 Mar 2005 14:03:15 -0000	1.19.2.4

@@ -1013,6 +1013,34 @@ next_prime (uint32_t seed)

                               module name offset

                          (following last entry with step count 0)

 */

+

+static struct hash_entry *hash_table;

+static size_t hash_size;

+

+/* Function to insert the names.  */

+static void name_insert (const void *nodep, VISIT value, int level)

+{

+  struct name *name;

+  unsigned int idx;

+  unsigned int hval2;

+

+  if (value != leaf && value != postorder)

+    return;

+

+  name = *(struct name **) nodep;

+  idx = name->hashval % hash_size;

+  hval2 = 1 + name->hashval % (hash_size - 2);

+

+  while (hash_table[idx].string_offset != 0)

+    if ((idx += hval2) >= hash_size)

+      idx -= hash_size;

+

+  hash_table[idx].string_offset = strtaboffset (name->strent);

+

+  assert (name->module_idx != -1);

+  hash_table[idx].module_idx = name->module_idx;

+}

+

 static int

 write_output (void)

 {

@@ -1020,8 +1048,6 @@ write_output (void)

   char *string_table;

   size_t string_table_size;

   struct gconvcache_header header;

-  struct hash_entry *hash_table;

-  size_t hash_size;

   struct module_entry *module_table;

   char *extra_table;

   char *cur_extra_table;

@@ -1034,31 +1060,6 @@ write_output (void)

   char tmpfname[(output_file == NULL ? sizeof finalname : output_file_len + 1)

 		+ strlen (".XXXXXX")];

-  /* Function to insert the names.  */

-  auto void

-  name_insert (const void *nodep, VISIT value, int level)

-    {

-      struct name *name;

-      unsigned int idx;

-      unsigned int hval2;

-

-      if (value != leaf && value != postorder)

-	return;

-

-      name = *(struct name **) nodep;

-      idx = name->hashval % hash_size;

-      hval2 = 1 + name->hashval % (hash_size - 2);

-

-      while (hash_table[idx].string_offset != 0)

-	if ((idx += hval2) >= hash_size)

-	  idx -= hash_size;

-

-      hash_table[idx].string_offset = strtaboffset (name->strent);

-

-      assert (name->module_idx != -1);

-      hash_table[idx].module_idx = name->module_idx;

-    }

-

   /* Open the output file.  */

   if (output_file == NULL)

     {

--- glibc-20050808T2126/include/features.h	17 Feb 2005 01:10:58 -0000	1.38

+++ glibc-20050808T2126-fedora/include/features.h	27 Jun 2005 13:04:16 -0000	1.35.2.8

@@ -262,7 +262,13 @@

 # define __USE_REENTRANT	1

 #endif

-#if _FORTIFY_SOURCE > 0 && __GNUC_PREREQ (4, 1) && __OPTIMIZE__ > 0

+#if _FORTIFY_SOURCE > 0 && __OPTIMIZE__ > 0 \

+    && (__GNUC_PREREQ (4, 1) \

+        || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \

+        || (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \

+            && __GNUC_MINOR__ == 4 \

+            && (__GNUC_PATCHLEVEL__ > 2 \

+                || (__GNUC_PATCHLEVEL__ == 2 && __GNUC_RH_RELEASE__ >= 8))))

 # if _FORTIFY_SOURCE == 1

 #  define __USE_FORTIFY_LEVEL 1

 # elif _FORTIFY_SOURCE > 1

--- glibc-20050808T2126/intl/locale.alias	4 Dec 2003 07:57:47 -0000	1.23

+++ glibc-20050808T2126-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

 lithuanian      lt_LT.ISO-8859-13

-no_NO		nb_NO.ISO-8859-1

-no_NO.ISO-8859-1 nb_NO.ISO-8859-1

 norwegian       nb_NO.ISO-8859-1

 nynorsk		nn_NO.ISO-8859-1

 polish          pl_PL.ISO-8859-2

--- glibc-20050808T2126/libio/stdio.h	7 Jan 2005 19:30:00 -0000	1.81

+++ glibc-20050808T2126-fedora/libio/stdio.h	8 Feb 2005 10:04:09 -0000	1.78.2.4

@@ -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.  */

 extern struct _IO_FILE *stderr;		/* Standard error output stream.  */

+#ifdef __STDC__

 /* C89/C99 say they're macros.  Make them happy.  */

 #define stdin stdin

 #define stdout stdout

 #define stderr stderr

+#endif

 __BEGIN_NAMESPACE_STD

 /* Remove file FILENAME.  */

--- glibc-20050808T2126/libio/bits/stdio2.h	19 Mar 2005 00:14:58 -0000	1.4

+++ glibc-20050808T2126-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);

-# define printf(...) \

+# if __GNUC_PREREQ (4, 0)

+#  define printf(...) \

   __printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)

-# define fprintf(stream, ...) \

+#  define fprintf(stream, ...) \

   __fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)

-# define vprintf(format, ap) \

+#  define vprintf(format, ap) \

   __vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap)

-# define vfprintf(stream, format, ap) \

+#  define vfprintf(stream, format, ap) \

   __vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap)

+# else

+#  define printf(...) \

+  __builtin___printf_chk (__USE_FORTIFY_LEVEL - 1, __VA_ARGS__)

+#  define fprintf(stream, ...) \

+  __builtin___fprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, __VA_ARGS__)

+#  define vprintf(format, ap) \

+  __builtin___vprintf_chk (__USE_FORTIFY_LEVEL - 1, format, ap)

+#  define vfprintf(stream, format, ap) \

+  __builtin___vfprintf_chk (stream, __USE_FORTIFY_LEVEL - 1, format, ap)

+# endif

 #endif

--- glibc-20050808T2126/locale/iso-4217.def	20 Mar 2005 04:14:36 -0000	1.16

+++ glibc-20050808T2126-fedora/locale/iso-4217.def	24 Mar 2005 08:19:03 -0000	1.15.2.2

@@ -8,6 +8,7 @@

  *

  * !!! The list has to be sorted !!!

  */

+DEFINE_INT_CURR("ADP")		/* Andorran Peseta -> EUR  */

 DEFINE_INT_CURR("AED")		/* United Arab Emirates Dirham  */

 DEFINE_INT_CURR("AFA")		/* Afghanistan Afgani  */

 DEFINE_INT_CURR("ALL")		/* Albanian Lek  */

@@ -15,12 +16,14 @@ DEFINE_INT_CURR("AMD")		/* Armenia Dram 

 DEFINE_INT_CURR("ANG")		/* Netherlands Antilles  */

 DEFINE_INT_CURR("AOA")		/* Angolan Kwanza  */

 DEFINE_INT_CURR("ARS")		/* Argentine Peso  */

+DEFINE_INT_CURR("ATS")		/* Austrian Schilling -> EUR  */

 DEFINE_INT_CURR("AUD")		/* Australian Dollar  */

 DEFINE_INT_CURR("AWG")		/* Aruba Guilder  */

 DEFINE_INT_CURR("AZM")		/* Azerbaijan Manat  */

 DEFINE_INT_CURR("BAK")		/* Bosnian and Herzegovina Convertible Mark  */

 DEFINE_INT_CURR("BBD")		/* Barbados Dollar  */

 DEFINE_INT_CURR("BDT")		/* Bangladesh Taka  */

+DEFINE_INT_CURR("BEF")		/* Belgian Franc -> EUR  */

 DEFINE_INT_CURR("BGL")		/* Bulgarian Lev  */

 DEFINE_INT_CURR("BHD")		/* Bahraini Dinar  */

 DEFINE_INT_CURR("BIF")		/* Burundi Franc  */

@@ -45,6 +48,7 @@ DEFINE_INT_CURR("CUP")		/* Cuban Peso  *

 DEFINE_INT_CURR("CVE")		/* Cape Verde Escudo  */

 DEFINE_INT_CURR("CYP")		/* Cypriot Pound  */

 DEFINE_INT_CURR("CZK")		/* Czech Koruna  */

+DEFINE_INT_CURR("DEM")		/* German Mark -> EUR  */

 DEFINE_INT_CURR("DJF")		/* Djibouti Franc  */

 DEFINE_INT_CURR("DKK")		/* Danish Krone (Faroe Islands, Greenland)  */

 DEFINE_INT_CURR("DOP")		/* Dominican Republic  */

@@ -52,16 +56,20 @@ DEFINE_INT_CURR("DZD")		/* Algerian Dina

 DEFINE_INT_CURR("EEK")		/* Estonian Kroon  */

 DEFINE_INT_CURR("EGP")		/* Egyptian Pound  */

 DEFINE_INT_CURR("ERN")		/* Eritrean Nakfa  */

+DEFINE_INT_CURR("ESP")		/* Spanish Peseta -> EUR  */

 DEFINE_INT_CURR("ETB")		/* Ethiopian Birr  */

 DEFINE_INT_CURR("EUR")		/* European Union Euro  */

+DEFINE_INT_CURR("FIM")		/* Finnish Markka -> EUR  */

 DEFINE_INT_CURR("FJD")		/* Fiji Dollar  */

 DEFINE_INT_CURR("FKP")		/* Falkland Islands Pound (Malvinas)  */

+DEFINE_INT_CURR("FRF")		/* French Franc -> EUR  */

 DEFINE_INT_CURR("GBP")		/* British Pound  */

 DEFINE_INT_CURR("GEL")		/* Georgia Lari  */

 DEFINE_INT_CURR("GHC")		/* Ghana Cedi  */

 DEFINE_INT_CURR("GIP")		/* Gibraltar Pound  */

 DEFINE_INT_CURR("GMD")		/* Gambian Dalasi  */

 DEFINE_INT_CURR("GNF")		/* Guinea Franc  */

+DEFINE_INT_CURR("GRD")		/* Greek Drachma -> EUR  */

 DEFINE_INT_CURR("GTQ")		/* Guatemala Quetzal  */

 DEFINE_INT_CURR("GYD")		/* Guyana Dollar  */

 DEFINE_INT_CURR("HKD")		/* Hong Kong Dollar  */

@@ -70,12 +78,14 @@ DEFINE_INT_CURR("HRK")		/* Croatia Kuna 

 DEFINE_INT_CURR("HTG")		/* Haiti Gourde  */

 DEFINE_INT_CURR("HUF")		/* Hungarian Forint  */

 DEFINE_INT_CURR("IDR")		/* Indonesia Rupiah  */

+DEFINE_INT_CURR("IEP")		/* Irish Pound -> EUR  */

 DEFINE_INT_CURR("ILS")		/* Israeli Shekel  */

 DEFINE_INT_CURR("IMP")		/* Isle of Man Pounds  */

 DEFINE_INT_CURR("INR")		/* Indian Rupee (Bhutan)  */

 DEFINE_INT_CURR("IQD")		/* Iraqi Dinar  */

 DEFINE_INT_CURR("IRR")		/* Iranian Rial  */

 DEFINE_INT_CURR("ISK")		/* Iceland Krona  */

+DEFINE_INT_CURR("ITL")		/* Italian Lira -> EUR  */

 DEFINE_INT_CURR("JMD")		/* Jamaican Dollar  */

 DEFINE_INT_CURR("JOD")		/* Jordanian Dinar  */

 DEFINE_INT_CURR("JPY")		/* Japanese Yen  */

@@ -94,6 +104,7 @@ DEFINE_INT_CURR("LKR")		/* Sri Lankan Ru

 DEFINE_INT_CURR("LRD")		/* Liberian Dollar  */

 DEFINE_INT_CURR("LSL")		/* Lesotho Maloti  */

 DEFINE_INT_CURR("LTL")		/* Lithuanian Litas  */

+DEFINE_INT_CURR("LUF")		/* Luxembourg Franc -> EUR  */

 DEFINE_INT_CURR("LVL")		/* Latvia Lat  */

 DEFINE_INT_CURR("LYD")		/* Libyan Arab Jamahiriya Dinar  */

 DEFINE_INT_CURR("MAD")		/* Moroccan Dirham  */

@@ -114,6 +125,7 @@ DEFINE_INT_CURR("MZM")		/* Mozambique Me

 DEFINE_INT_CURR("NAD")		/* Namibia Dollar  */

 DEFINE_INT_CURR("NGN")		/* Nigeria Naira  */

 DEFINE_INT_CURR("NIO")		/* Nicaragua Cordoba Oro  */

+DEFINE_INT_CURR("NLG")		/* Netherlands Guilder -> EUR  */

 DEFINE_INT_CURR("NOK")		/* Norwegian Krone  */

 DEFINE_INT_CURR("NPR")		/* Nepalese Rupee  */

 DEFINE_INT_CURR("NZD")		/* New Zealand Dollar  */

@@ -124,6 +136,7 @@ DEFINE_INT_CURR("PGK")		/* Papau New Gui

 DEFINE_INT_CURR("PHP")		/* Philippines Peso  */

 DEFINE_INT_CURR("PKR")		/* Pakistan Rupee  */

 DEFINE_INT_CURR("PLN")		/* Polish Zloty  */

+DEFINE_INT_CURR("PTE")		/* Portugese Escudo -> EUR  */

 DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */

 DEFINE_INT_CURR("QAR")		/* Qatar Rial  */

 DEFINE_INT_CURR("ROL")		/* Romanian Leu  */

--- glibc-20050808T2126/locale/programs/3level.h	13 Jun 2003 20:45:38 -0000	1.5

+++ glibc-20050808T2126-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,

 	}

     }

 }

+

+/* GCC ATM seems to do a poor job with pointers to nested functions passed

+   to inlined functions.  Help it a little bit with this hack.  */

+#define wchead_table_iterate(tp, fn) \

+do									      \

+  {									      \

+    struct wchead_table *t = (tp);					      \

+    uint32_t index1;							      \

+    for (index1 = 0; index1 < t->level1_size; index1++)			      \

+      {									      \

+	uint32_t lookup1 = t->level1[index1];				      \

+	if (lookup1 != ((uint32_t) ~0))					      \

+	  {								      \

+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \

+	    uint32_t index2;						      \

+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \

+	      {								      \

+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \

+		if (lookup2 != ((uint32_t) ~0))				      \

+		  {							      \

+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \

+		    uint32_t index3;					      \

+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \

+		      {							      \

+			struct element_t *lookup3			      \

+			  = t->level3[index3 + lookup2_shifted];	      \

+			if (lookup3 != NULL)				      \

+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \

+			      lookup3);					      \

+		      }							      \

+		  }							      \

+	      }								      \

+	  }								      \

+      }									      \

+  } while (0)

+

 #endif

 #ifndef NO_FINALIZE

--- glibc-20050808T2126/localedata/Makefile	7 Aug 2004 23:38:13 -0000	1.101

+++ glibc-20050808T2126-fedora/localedata/Makefile	22 Sep 2004 21:20:58 -0000	1.101.2.1

@@ -222,6 +222,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo

 	echo -n '...'; \

 	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \

 	$(LOCALEDEF) --alias-file=../intl/locale.alias \

+		     --no-archive \

 		     -i locales/$$input -c -f charmaps/$$charset \

 		     $(addprefix --prefix=,$(install_root)) $$locale; \

 	echo ' done'; \

--- glibc-20050808T2126/localedata/SUPPORTED	28 Apr 2005 14:21:30 -0000	1.75

+++ glibc-20050808T2126-fedora/localedata/SUPPORTED	3 May 2005 09:28:25 -0000	1.71.2.5

@@ -68,6 +68,7 @@ cy_GB.UTF-8/UTF-8 \

 cy_GB/ISO-8859-14 \

 da_DK.UTF-8/UTF-8 \

 da_DK/ISO-8859-1 \

+da_DK.ISO-8859-15/ISO-8859-15 \

 de_AT.UTF-8/UTF-8 \

 de_AT/ISO-8859-1 \

 de_AT@euro/ISO-8859-15 \

@@ -94,6 +95,7 @@ en_DK.UTF-8/UTF-8 \

 en_DK/ISO-8859-1 \

 en_GB.UTF-8/UTF-8 \

 en_GB/ISO-8859-1 \

+en_GB.ISO-8859-15/ISO-8859-15 \

 en_HK.UTF-8/UTF-8 \

 en_HK/ISO-8859-1 \

 en_IE.UTF-8/UTF-8 \

@@ -108,6 +110,7 @@ en_SG.UTF-8/UTF-8 \

 en_SG/ISO-8859-1 \

 en_US.UTF-8/UTF-8 \

 en_US/ISO-8859-1 \

+en_US.ISO-8859-15/ISO-8859-15 \

 en_ZA.UTF-8/UTF-8 \

 en_ZA/ISO-8859-1 \

 en_ZW.UTF-8/UTF-8 \

@@ -253,6 +256,8 @@ nl_NL/ISO-8859-1 \

 nl_NL@euro/ISO-8859-15 \

 nn_NO.UTF-8/UTF-8 \

 nn_NO/ISO-8859-1 \

+no_NO.UTF-8/UTF-8 \

+no_NO/ISO-8859-1 \

 oc_FR.UTF-8/UTF-8 \

 oc_FR/ISO-8859-1 \

 om_ET/UTF-8 \

@@ -297,6 +302,7 @@ sv_FI/ISO-8859-1 \

 sv_FI@euro/ISO-8859-15 \

 sv_SE.UTF-8/UTF-8 \

 sv_SE/ISO-8859-1 \