--- glibc-2.12-2-gc4ccff1/ChangeLog

+++ glibc-2.12-1/ChangeLog

@@ -241,6 +241,12 @@

 	* Makerules (libc-abis): Fix search for libc-abis in add-ons.

+2010-04-06  Ulrich Drepper  <drepper@redhat.com>

+

+	* sysdeps/posix/getaddrinfo.c (default_scopes): Assign global

+	scope to RFC 1918 addresses.

+	* posix/gai.conf: Document difference from RFC 3484.

+

 2010-04-05  Thomas Schwinge  <thomas@schwinge.name>

 	* sysdeps/gnu/unwind-resume.c: New, moved from nptl/sysdeps/pthread/.

@@ -995,6 +1001,19 @@

 	* sysdeps/x86_64/fpu/fegetenv.c: Likewise

 	* sysdeps/s390/fpu/fegetenv.c: Likewise.  Remove unused headers.

+2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>

+

+	[BZ #10855]

+	* locale/programs/locarchive.c: use MMAP_SHARED to reserve memory

+	used later with MMAP_FIXED | MMAP_SHARED to cope with different

+	alignment restrictions.

+

+2010-02-08  Andreas Schwab  <schwab@redhat.com>

+

+	[BZ #11155]

+	* sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c: Include i386

+	version.

+

 2010-02-05  H.J. Lu  <hongjiu.lu@intel.com>

 	[BZ #11230]

@@ -2938,6 +2957,11 @@ d2009-10-30  Ulrich Drepper  

 	* sysdeps/generic/ldsodefs.h (struct rtld_global): The map element in

 	the unique symbol hash table should not be const.

+2009-07-22  Jakub Jelinek  <jakub@redhat.com>

+

+	* Makeconfig (ASFLAGS): Append $(sysdep-ASFLAGS).

+	* sysdeps/i386/Makefile (sysdep-ASFLAGS): Add -U__i686.

+

 2009-07-21  Ulrich Drepper  <drepper@redhat.com>

 	* sysdeps/x86_64/multiarch/strstr.c: Minor cleanups.  Remove

@@ -3203,6 +3227,11 @@ d2009-10-30  Ulrich Drepper  

 	out common code into new function get_common_indeces. Determine

 	extended family and model for Intel processors.

+2009-06-26  Andreas Schwab  <aschwab@redhat.com>

+

+	* timezone/zic.c (stringzone): Don't try to generate a POSIX TZ

+	string when the timezone ends in DST.

+

 2009-06-26  Ulrich Drepper  <drepper@redhat.com>

 	* resolv/resolv.h: Define RES_SNGLKUPREOP.

@@ -11896,6 +11925,10 @@ d2009-10-30  Ulrich Drepper  

 	[BZ #4368]

 	* stdlib/stdlib.h: Remove obsolete part of comment for realpath.

+2007-04-16  Jakub Jelinek  <jakub@redhat.com>

+

+	* locale/programs/locarchive.c (add_alias, insert_name): Remove static.

+

 2007-04-16  Ulrich Drepper  <drepper@redhat.com>

 	[BZ #4364]

@@ -13153,6 +13186,15 @@ d2009-10-30  Ulrich Drepper  

 	separators also if no non-zero digits found.

 	* stdlib/Makefile (tests): Add tst-strtod3.

+2006-12-10  Jakub Jelinek  <jakub@redhat.com>

+

+	* sysdeps/unix/sysv/linux/netlinkaccess.h: Include linux/if_addr.h

+	if IFA_MAX is not defined.

+	(IFA_RTA, IFA_PAYLOAD, IFLA_RTA, IFLA_PAYLOAD): Define if not

+	defined.

+	* sysdeps/unix/sysv/linux/check_pf.c: Include netlinkaccess.h

+	instead of asm/types.h, linux/netlink.h and linux/rtnetlink.h.

+

 2006-12-09  Ulrich Drepper  <drepper@redhat.com>

 	[BZ #3632]

--- glibc-2.12-2-gc4ccff1/ChangeLog.15

+++ glibc-2.12-1/ChangeLog.15

@@ -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,13 @@

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

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

@@ -1443,6 +1458,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 +3202,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-2.12-2-gc4ccff1/ChangeLog.16

+++ glibc-2.12-1/ChangeLog.16

@@ -2042,6 +2042,9 @@

 	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT

 	followed by __THROW.

+	* sysdeps/unix/sysv/linux/futimesat.c (futimesat): If

+	file == NULL, use __futimes unconditionally.

+

 2006-02-02  Ulrich Drepper  <drepper@redhat.com>

 	* sysdeps/unix/sysv/linux/futimesat.c [__NR_futimesat]

@@ -2101,6 +2104,11 @@

 	* sysdeps/ieee754/ldbl-128/s_llrintl.c (__llrintl): Fix a typo.

 	* sysdeps/s390/fpu/libm-test-ulps: Remove llrint ulps.

+2006-01-30  Jakub Jelinek  <jakub@redhat.com>

+

+	* include/bits/stdlib-ldbl.h: New file.

+	* include/bits/wchar-ldbl.h: New file.

+

 2006-01-19  Thomas Schwinge  <tschwinge@gnu.org>

 	* libio/genops.c: Include <stdbool.h>.

@@ -8922,6 +8930,12 @@

 	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.

 	(__argp_failure): Likewise.

+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.

@@ -9046,6 +9060,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]

--- glibc-2.12-2-gc4ccff1/Makeconfig

+++ glibc-2.12-1/Makeconfig

@@ -789,12 +789,12 @@ endif

 # The assembler can generate debug information too.

 ifndef ASFLAGS

 ifeq ($(have-cpp-asm-debuginfo),yes)

-ASFLAGS := $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))

+ASFLAGS = $(filter -g% -fdebug-prefix-map=%,$(CFLAGS))

 else

-ASFLAGS :=

+ASFLAGS =

 endif

 endif

-ASFLAGS += $(ASFLAGS-config) $(asflags-cpu)

+ASFLAGS += $(ASFLAGS-config) $(asflags-cpu) $(sysdep-ASFLAGS)

 ifndef BUILD_CC

 BUILD_CC = $(CC)

--- glibc-2.12-2-gc4ccff1/csu/Makefile

+++ glibc-2.12-1/csu/Makefile

@@ -93,7 +93,8 @@ omit-deps += $(crtstuff)

 $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h

 	$(compile.S) -g0 $(ASFLAGS-.os) -o $@

-CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time)

+CFLAGS-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time) \

+		    -fno-asynchronous-unwind-tables

 vpath initfini.c $(sysdirs)

--- glibc-2.12-2-gc4ccff1/csu/elf-init.c

+++ glibc-2.12-1/csu/elf-init.c

@@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int,

 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)

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

    points automagically by the linker.  */

--- glibc-2.12-2-gc4ccff1/debug/tst-chk1.c

+++ glibc-2.12-1/debug/tst-chk1.c

@@ -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 <assert.h>

 #include <fcntl.h>

 #include <locale.h>

@@ -242,7 +245,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.  */

@@ -357,7 +360,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-2.12-2-gc4ccff1/elf/ldconfig.c

+++ glibc-2.12-1/elf/ldconfig.c

@@ -1031,17 +1031,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)

     {

@@ -1102,7 +1104,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]))

 	{

@@ -1165,7 +1174,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,

@@ -1197,7 +1206,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;

@@ -1240,6 +1249,8 @@ main (int argc, char **argv)

   /* Set the text message domain.  */

   textdomain (_libc_intl_domainname);

+  arch_startup (argc, argv);

+

   /* Parse and process arguments.  */

   int remaining;

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

@@ -1349,12 +1360,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);

     }

   char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;

--- glibc-2.12-2-gc4ccff1/elf/tst-stackguard1.c

+++ glibc-2.12-1/elf/tst-stackguard1.c

@@ -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-2.12-2-gc4ccff1/include/bits/stdlib-ldbl.h

+++ glibc-2.12-1/include/bits/stdlib-ldbl.h

@@ -0,0 +1 @@

+#include <stdlib/bits/stdlib-ldbl.h>

--- glibc-2.12-2-gc4ccff1/include/bits/wchar-ldbl.h

+++ glibc-2.12-1/include/bits/wchar-ldbl.h

@@ -0,0 +1 @@

+#include <wcsmbs/bits/wchar-ldbl.h>

--- glibc-2.12-2-gc4ccff1/include/features.h

+++ glibc-2.12-1/include/features.h

@@ -308,8 +308,13 @@

 #endif

 #if defined _FORTIFY_SOURCE && _FORTIFY_SOURCE > 0 \

-    && __GNUC_PREREQ (4, 1) && defined __OPTIMIZE__ && __OPTIMIZE__ > 0

-# if _FORTIFY_SOURCE > 1

+    && defined __OPTIMIZE__ && __OPTIMIZE__ > 0

+# if !__GNUC_PREREQ (4, 1)

+#  ifdef __GNUC_RH_RELEASE__

+#   warning _FORTIFY_SOURCE supported only with GCC 4.1 and later

+#  endif

+#  define __USE_FORTIFY_LEVEL 0

+# elif _FORTIFY_SOURCE > 1

 #  define __USE_FORTIFY_LEVEL 2

 # else

 #  define __USE_FORTIFY_LEVEL 1

--- glibc-2.12-2-gc4ccff1/intl/locale.alias

+++ glibc-2.12-1/intl/locale.alias

@@ -57,8 +57,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-2.12-2-gc4ccff1/libio/stdio.h

+++ glibc-2.12-1/libio/stdio.h

@@ -165,10 +165,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-2.12-2-gc4ccff1/locale/iso-4217.def

+++ glibc-2.12-1/locale/iso-4217.def

@@ -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("AFN")		/* 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("BAM")		/* 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("BGN")		/* Bulgarian Lev  */

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

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

@@ -44,6 +47,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  */

@@ -51,16 +55,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  */

@@ -69,12 +77,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("JEP")		/* Jersey Pound  */

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

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

@@ -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-2.12-2-gc4ccff1/locale/programs/locarchive.c

+++ glibc-2.12-1/locale/programs/locarchive.c

@@ -134,7 +134,7 @@ create_archive (const char *archivefname

   size_t reserved = RESERVE_MMAP_SIZE;

   int xflags = 0;

   if (total < reserved

-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,

+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,

 		       -1, 0)) != MAP_FAILED))

     xflags = MAP_FIXED;

   else

@@ -241,9 +241,9 @@ oldlocrecentcmp (const void *a, const vo

 /* forward decls for below */

 static uint32_t add_locale (struct locarhandle *ah, const char *name,

 			    locale_data_t data, bool replace);

-static void add_alias (struct locarhandle *ah, const char *alias,

-		       bool replace, const char *oldname,

-		       uint32_t *locrec_offset_p);

+void add_alias (struct locarhandle *ah, const char *alias,

+		bool replace, const char *oldname,

+		uint32_t *locrec_offset_p);

 static bool

@@ -396,7 +396,7 @@ enlarge_archive (struct locarhandle *ah,

   size_t reserved = RESERVE_MMAP_SIZE;

   int xflags = 0;

   if (total < reserved

-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,

+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,

 		       -1, 0)) != MAP_FAILED))

     xflags = MAP_FIXED;

   else

@@ -614,7 +614,7 @@ open_archive (struct locarhandle *ah, bo

   int xflags = 0;

   void *p;

   if (st.st_size < reserved

-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,

+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,

 		       -1, 0)) != MAP_FAILED))

     xflags = MAP_FIXED;

   else

@@ -649,7 +649,7 @@ close_archive (struct locarhandle *ah)

 #include "../../intl/explodename.c"

 #include "../../intl/l10nflist.c"

-static struct namehashent *

+struct namehashent *

 insert_name (struct locarhandle *ah,

 	     const char *name, size_t name_len, bool replace)

 {

@@ -707,7 +707,7 @@ insert_name (struct locarhandle *ah,

   return &namehashtab[idx];

 }

-static void

+void

 add_alias (struct locarhandle *ah, const char *alias, bool replace,

 	   const char *oldname, uint32_t *locrec_offset_p)

 {

--- glibc-2.12-2-gc4ccff1/localedata/Makefile

+++ glibc-2.12-1/localedata/Makefile

@@ -227,6 +227,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-2.12-2-gc4ccff1/localedata/SUPPORTED

+++ glibc-2.12-1/localedata/SUPPORTED

@@ -85,6 +85,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 \

@@ -116,6 +117,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 \

@@ -131,6 +133,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 \

@@ -307,6 +310,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 \

 nr_ZA/UTF-8 \

 nso_ZA/UTF-8 \

 oc_FR.UTF-8/UTF-8 \

@@ -367,6 +372,7 @@ sv_FI/ISO-8859-1 \

 sv_FI@euro/ISO-8859-15 \

 sv_SE.UTF-8/UTF-8 \

 sv_SE/ISO-8859-1 \

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

 ta_IN/UTF-8 \

 te_IN/UTF-8 \

 tg_TJ.UTF-8/UTF-8 \

--- glibc-2.12-2-gc4ccff1/localedata/locales/cy_GB

+++ glibc-2.12-1/localedata/locales/cy_GB

@@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E>

 d_t_fmt     "<U0044><U0079><U0064><U0064><U0020><U0025><U0041><U0020><U0025><U0064><U0020><U006d><U0069><U0073><U0020><U0025><U0042><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"

 d_fmt       "<U0025><U0064><U002E><U0025><U006D><U002E><U0025><U0079>"

 t_fmt       "<U0025><U0054>"

-am_pm       "";""

-t_fmt_ampm  ""

+am_pm       "<U0041><U004D>";"<U0050><U004D>"

+t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"

+date_fmt    "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/

+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/

+<U0025><U005A><U0020><U0025><U0059>"

 END LC_TIME

 LC_MESSAGES

--- glibc-2.12-2-gc4ccff1/localedata/locales/en_GB

+++ glibc-2.12-1/localedata/locales/en_GB

@@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E>

 d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"

 d_fmt       "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"

 t_fmt       "<U0025><U0054>"

-am_pm       "";""

-t_fmt_ampm  ""

+am_pm       "<U0041><U004D>";"<U0050><U004D>"

+t_fmt_ampm  "<U0025><U006C><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0050><U0020><U0025><U005A>"

 date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/

 <U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/

 <U0025><U005A><U0020><U0025><U0059>"

--- glibc-2.12-2-gc4ccff1/localedata/locales/no_NO

+++ glibc-2.12-1/localedata/locales/no_NO

@@ -0,0 +1,69 @@

+escape_char	/

+comment_char    %

+

+% Norwegian language locale for Norway

+% Source: Norsk Standardiseringsforbund

+% Address: University Library,

+%   Drammensveien 41, N-9242 Oslo, Norge

+% Contact: Kolbjoern Aamboe

+% Tel: +47 - 22859109

+% Fax: +47 - 22434497

+% Email: kolbjorn.aambo@usit.uio.no

+% Language: no

+% Territory: NO

+% Revision: 4.3

+% Date: 1996-10-15

+% Application: general

+% Users: general

+% Repertoiremap: mnemonic.ds

+% Charset: ISO-8859-1

+% Distribution and use is free, also

+% for commercial purposes.

+

+LC_IDENTIFICATION

+copy "nb_NO"

+END LC_IDENTIFICATION

+