From 8b0aa3371606d3b45c1fd06baa6bcafc51a47678 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@fedoraproject.org>
Date: Apr 24 2009 20:08:34 +0000
Subject: 2.9.90-21


---

diff --git a/.cvsignore b/.cvsignore
index 70af3da..dcae08d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-glibc-20090424T0747.tar.bz2
-glibc-fedora-20090424T0747.tar.bz2
+glibc-20090424T1908.tar.bz2
+glibc-fedora-20090424T1908.tar.bz2
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 66c3431..3f9485d 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -2090,3 +2090,27 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
+--- libc/fedora/build-locale-archive.c	24 May 2007 10:33:02 -0000	1.1.2.4
++++ libc/fedora/build-locale-archive.c	24 Apr 2009 20:06:55 -0000
+@@ -112,15 +112,16 @@ open_tmpl_archive (struct locarhandle *a
+     error (EXIT_FAILURE, errno, "cannot read archive header");
+ 
+   ah->fd = fd;
+-  ah->len = (head.sumhash_offset
+-	     + head.sumhash_size * sizeof (struct sumhashent));
+-  if (ah->len > st.st_size)
++  ah->mmaped = (head.sumhash_offset
++		+ head.sumhash_size * sizeof (struct sumhashent));
++  if (ah->mmaped > st.st_size)
+     error (EXIT_FAILURE, 0, "locale archite template file truncated");
+-  ah->len = st.st_size;
++  ah->mmaped = st.st_size;
++  ah->reserved = st.st_size;
+ 
+   /* Now we know how large the administrative information part is.
+      Map all of it.  */
+-  ah->addr = mmap64 (NULL, ah->len, PROT_READ, MAP_SHARED, fd, 0);
++  ah->addr = mmap64 (NULL, ah->mmaped, PROT_READ, MAP_SHARED, fd, 0);
+   if (ah->addr == MAP_FAILED)
+     error (EXIT_FAILURE, errno, "cannot map archive header");
+ }
diff --git a/glibc.spec b/glibc.spec
index 96ea525..8ef2507 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,6 +1,6 @@
-%define glibcdate 20090424T0747
+%define glibcdate 20090424T1908
 %define glibcname glibc
-%define glibcsrcdir glibc-20090424T0747
+%define glibcsrcdir glibc-20090424T1908
 %define glibc_release_tarballs 0
 %define run_glibc_tests 1
 %define auxarches i686 athlon sparcv9v sparc64v alphaev6
@@ -23,7 +23,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: 2.9.90
-Release: 20
+Release: 21
 # 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
@@ -1013,6 +1013,12 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Apr 24 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-21
+- update from trunk
+  - fix localedef
+  - fix SHIFT_JIS iconv EILSEQ handling (#497267)
+  - misc fixes (BZ#10093, BZ#10100)
+
 * Fri Apr 24 2009 Jakub Jelinek <jakub@redhat.com> 2.9.90-20
 - update from trunk
   - fix p{read,write}v{,64} (#497429, #497434)
diff --git a/import.log b/import.log
index 02879bf..53648b5 100644
--- a/import.log
+++ b/import.log
@@ -16,3 +16,4 @@ glibc-2_9_90-17:F-11:glibc-2.9.90-17.src.rpm:1239814311
 glibc-2_9_90-18:F-11:glibc-2.9.90-18.src.rpm:1239866900
 glibc-2_9_90-19:F-11:glibc-2.9.90-19.src.rpm:1239900585
 glibc-2_9_90-20:F-11:glibc-2.9.90-20.src.rpm:1240561264
+glibc-2_9_90-21:F-11:glibc-2.9.90-21.src.rpm:1240601486
diff --git a/sources b/sources
index 1bd2484..6fefe90 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-8b30be7e6d3debdd00c2dc995545a639  glibc-20090424T0747.tar.bz2
-99d6e57ab755b5b6aab7da0fc14772a4  glibc-fedora-20090424T0747.tar.bz2
+cceafa33a1c308f37cd679c0558f06de  glibc-20090424T1908.tar.bz2
+2e888704ea9f0d5f61cb1e8259dc9ab6  glibc-fedora-20090424T1908.tar.bz2