diff --git a/.cvsignore b/.cvsignore
index 5b47910..a028f23 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
-glibc-2.12-52-g48b42dd-fedora.tar.bz2
-glibc-2.12-52-g48b42dd.tar.bz2
+glibc-2.12-62-gb08c89d-fedora.tar.bz2
+glibc-2.12-62-gb08c89d.tar.bz2
+glibc-ports-2.12-12-g71feaf7.tar.bz2
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index 4d0e0cc..8f57c62 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -1,6 +1,6 @@
---- glibc-2.12-52-g48b42dd/ChangeLog
-+++ glibc-2.12.90-4/ChangeLog
-@@ -103,6 +103,32 @@
+--- glibc-2.12-62-gb08c89d/ChangeLog
++++ glibc-2.12.90-5/ChangeLog
+@@ -128,6 +128,32 @@
  	call returning > 0 value.
  	* sysdeps/unix/sysv/linux/getlogin.c (getlogin): Likewise.
  
@@ -33,7 +33,7 @@
  2010-06-07  Andreas Schwab  <schwab@redhat.com>
  
  	* dlfcn/Makefile: Remove explicit dependencies on libc.so and
-@@ -155,10 +181,35 @@
+@@ -180,6 +206,24 @@
  	* hurd/hurd/fd.h (__file_name_lookup_at): Update comment.
  	* sysdeps/mach/hurd/linkat.c (linkat): Pass O_NOLINK in FLAGS.
  
@@ -58,19 +58,8 @@
  2010-05-28  Luis Machado  <luisgpm@br.ibm.com>
  
  	* sysdeps/powerpc/powerpc32/power7/memcpy.S: Exchange srdi for srwi.
- 
-+2010-05-27  Andreas Schwab  <schwab@redhat.com>
-+
-+	* elf/Makefile ($(objpfx)tst-tls10): Depend on
-+	$(objpfx)tst-tlsmod7.so.
-+	($(objpfx)tst-tls11): Depend on $(objpfx)tst-tlsmod9.so.
-+	($(objpfx)tst-tls12): Depend on $(objpfx)tst-tlsmod11.so.
-+
- 2010-05-26  H.J. Lu  <hongjiu.lu@intel.com>
- 
- 	[BZ #11640]
---- glibc-2.12-52-g48b42dd/ChangeLog.15
-+++ glibc-2.12.90-4/ChangeLog.15
+--- glibc-2.12-62-gb08c89d/ChangeLog.15
++++ glibc-2.12.90-5/ChangeLog.15
 @@ -477,6 +477,14 @@
  
  2004-11-26  Jakub Jelinek  <jakub@redhat.com>
@@ -136,8 +125,8 @@
  2004-08-30  Roland McGrath  <roland@frob.com>
  
  	* scripts/extract-abilist.awk: If `lastversion' variable defined, omit
---- glibc-2.12-52-g48b42dd/ChangeLog.16
-+++ glibc-2.12.90-4/ChangeLog.16
+--- glibc-2.12-62-gb08c89d/ChangeLog.16
++++ glibc-2.12.90-5/ChangeLog.16
 @@ -2042,6 +2042,9 @@
  	(__MATHDECL_2): Use __REDIRECT_NTH instead of __REDIRECT
  	followed by __THROW.
@@ -191,8 +180,8 @@
  2005-07-28  Thomas Schwinge  <schwinge@nic-nac-project.de>
  
  	[BZ #1137]
---- glibc-2.12-52-g48b42dd/ChangeLog.17
-+++ glibc-2.12.90-4/ChangeLog.17
+--- glibc-2.12-62-gb08c89d/ChangeLog.17
++++ glibc-2.12.90-5/ChangeLog.17
 @@ -256,6 +256,12 @@
  
  	* Makerules (libc-abis): Fix search for libc-abis in add-ons.
@@ -277,8 +266,8 @@
  2006-12-09  Ulrich Drepper  <drepper@redhat.com>
  
  	[BZ #3632]
---- glibc-2.12-52-g48b42dd/Makeconfig
-+++ glibc-2.12.90-4/Makeconfig
+--- glibc-2.12-62-gb08c89d/Makeconfig
++++ glibc-2.12.90-5/Makeconfig
 @@ -789,12 +789,12 @@ endif
  # The assembler can generate debug information too.
  ifndef ASFLAGS
@@ -295,8 +284,8 @@
  
  ifndef BUILD_CC
  BUILD_CC = $(CC)
---- glibc-2.12-52-g48b42dd/csu/Makefile
-+++ glibc-2.12.90-4/csu/Makefile
+--- glibc-2.12-62-gb08c89d/csu/Makefile
++++ glibc-2.12.90-5/csu/Makefile
 @@ -93,7 +93,8 @@ omit-deps += $(crtstuff)
  $(crtstuff:%=$(objpfx)%.o): %.o: %.S $(objpfx)defs.h
  	$(compile.S) -g0 $(ASFLAGS-.os) -o $@
@@ -307,8 +296,8 @@
  
  vpath initfini.c $(sysdirs)
  
---- glibc-2.12-52-g48b42dd/csu/elf-init.c
-+++ glibc-2.12.90-4/csu/elf-init.c
+--- glibc-2.12-62-gb08c89d/csu/elf-init.c
++++ glibc-2.12.90-5/csu/elf-init.c
 @@ -63,6 +63,23 @@ extern void (*__init_array_end []) (int, char **, char **)
  extern void (*__fini_array_start []) (void) attribute_hidden;
  extern void (*__fini_array_end []) (void) attribute_hidden;
@@ -333,8 +322,8 @@
  
  /* These function symbols are provided for the .init/.fini section entry
     points automagically by the linker.  */
---- glibc-2.12-52-g48b42dd/debug/tst-chk1.c
-+++ glibc-2.12.90-4/debug/tst-chk1.c
+--- glibc-2.12-62-gb08c89d/debug/tst-chk1.c
++++ glibc-2.12.90-5/debug/tst-chk1.c
 @@ -17,6 +17,9 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -363,8 +352,8 @@
  #  define O 0
  # else
  #  define O 1
---- glibc-2.12-52-g48b42dd/elf/Makefile
-+++ glibc-2.12.90-4/elf/Makefile
+--- glibc-2.12-62-gb08c89d/elf/Makefile
++++ glibc-2.12.90-5/elf/Makefile
 @@ -89,6 +89,7 @@ distribute	:= rtld-Rules \
  		   unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \
  		   unload6mod1.c unload6mod2.c unload6mod3.c \
@@ -408,21 +397,6 @@
  
  LDFLAGS-tst-tlsmod5.so = -nostdlib
  LDFLAGS-tst-tlsmod6.so = -nostdlib
-@@ -759,11 +765,11 @@ $(objpfx)tst-tls8.out: $(objpfx)tst-tlsmod3.so $(objpfx)tst-tlsmod4.so
- $(objpfx)tst-tls9: $(libdl)
- $(objpfx)tst-tls9.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
- 
--$(objpfx)tst-tls10: $(objpfx)tst-tlsmod8.so
-+$(objpfx)tst-tls10: $(objpfx)tst-tlsmod8.so $(objpfx)tst-tlsmod7.so
- 
--$(objpfx)tst-tls11: $(objpfx)tst-tlsmod10.so
-+$(objpfx)tst-tls11: $(objpfx)tst-tlsmod10.so $(objpfx)tst-tlsmod9.so
- 
--$(objpfx)tst-tls12: $(objpfx)tst-tlsmod12.so
-+$(objpfx)tst-tls12: $(objpfx)tst-tlsmod12.so $(objpfx)tst-tlsmod11.so
- 
- $(objpfx)tst-tls13: $(libdl)
- $(objpfx)tst-tls13.out: $(objpfx)tst-tlsmod13a.so
 @@ -822,6 +828,9 @@ $(objpfx)unload7: $(libdl)
  $(objpfx)unload7.out: $(objpfx)unload7mod1.so $(objpfx)unload7mod2.so
  unload7-ENV = MALLOC_PERTURB_=85
@@ -433,8 +407,8 @@
  ifdef libdl
  $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
  $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
---- glibc-2.12-52-g48b42dd/elf/dl-close.c
-+++ glibc-2.12.90-4/elf/dl-close.c
+--- glibc-2.12-62-gb08c89d/elf/dl-close.c
++++ glibc-2.12.90-5/elf/dl-close.c
 @@ -421,6 +421,13 @@ _dl_close_worker (struct link_map *map)
  
  	      imap->l_scope_max = new_size;
@@ -449,8 +423,8 @@
  
  	  /* The loader is gone, so mark the object as not having one.
  	     Note: l_idx != IDX_STILL_USED -> object will be removed.  */
---- glibc-2.12-52-g48b42dd/elf/dl-init.c
-+++ glibc-2.12.90-4/elf/dl-init.c
+--- glibc-2.12-62-gb08c89d/elf/dl-init.c
++++ glibc-2.12.90-5/elf/dl-init.c
 @@ -24,11 +24,9 @@
  /* Type of the initializer.  */
  typedef void (*init_t) (int, char **, char **);
@@ -473,8 +447,8 @@
 -#endif
  }
  INTDEF (_dl_init)
---- glibc-2.12-52-g48b42dd/elf/dl-support.c
-+++ glibc-2.12.90-4/elf/dl-support.c
+--- glibc-2.12-62-gb08c89d/elf/dl-support.c
++++ glibc-2.12.90-5/elf/dl-support.c
 @@ -80,10 +80,8 @@ unsigned long long _dl_load_adds;
     create a fake scope containing nothing.  */
  struct r_scope_elem _dl_initial_searchlist;
@@ -486,8 +460,8 @@
  
  /* Random data provided by the kernel.  */
  void *_dl_random;
---- glibc-2.12-52-g48b42dd/elf/ldconfig.c
-+++ glibc-2.12.90-4/elf/ldconfig.c
+--- glibc-2.12-62-gb08c89d/elf/ldconfig.c
++++ glibc-2.12.90-5/elf/ldconfig.c
 @@ -1031,17 +1031,19 @@ search_dirs (void)
  
  
@@ -569,8 +543,8 @@
      }
  
    const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
---- glibc-2.12-52-g48b42dd/elf/rtld.c
-+++ glibc-2.12.90-4/elf/rtld.c
+--- glibc-2.12-62-gb08c89d/elf/rtld.c
++++ glibc-2.12.90-5/elf/rtld.c
 @@ -106,7 +106,6 @@ static struct audit_list
    struct audit_list *next;
  } *audit_list;
@@ -598,8 +572,8 @@
  
    if (*user_entry == (ElfW(Addr)) ENTRY_POINT)
      {
---- glibc-2.12-52-g48b42dd/elf/tst-stackguard1.c
-+++ glibc-2.12.90-4/elf/tst-stackguard1.c
+--- glibc-2.12-62-gb08c89d/elf/tst-stackguard1.c
++++ glibc-2.12.90-5/elf/tst-stackguard1.c
 @@ -160,17 +160,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -624,8 +598,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.12-52-g48b42dd/elf/unload8.c
-+++ glibc-2.12.90-4/elf/unload8.c
+--- glibc-2.12-62-gb08c89d/elf/unload8.c
++++ glibc-2.12.90-5/elf/unload8.c
 @@ -0,0 +1,33 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@@ -660,8 +634,8 @@
 +
 +  return 0;
 +}
---- glibc-2.12-52-g48b42dd/elf/unload8mod1.c
-+++ glibc-2.12.90-4/elf/unload8mod1.c
+--- glibc-2.12-62-gb08c89d/elf/unload8mod1.c
++++ glibc-2.12.90-5/elf/unload8mod1.c
 @@ -0,0 +1,7 @@
 +extern void mod2 (void);
 +
@@ -670,12 +644,12 @@
 +{
 +  mod2 ();
 +}
---- glibc-2.12-52-g48b42dd/elf/unload8mod1x.c
-+++ glibc-2.12.90-4/elf/unload8mod1x.c
+--- glibc-2.12-62-gb08c89d/elf/unload8mod1x.c
++++ glibc-2.12.90-5/elf/unload8mod1x.c
 @@ -0,0 +1 @@
 +int mod1x;
---- glibc-2.12-52-g48b42dd/elf/unload8mod2.c
-+++ glibc-2.12.90-4/elf/unload8mod2.c
+--- glibc-2.12-62-gb08c89d/elf/unload8mod2.c
++++ glibc-2.12.90-5/elf/unload8mod2.c
 @@ -0,0 +1,7 @@
 +extern void mod3 (void);
 +
@@ -684,8 +658,8 @@
 +{
 +  mod3 ();
 +}
---- glibc-2.12-52-g48b42dd/elf/unload8mod3.c
-+++ glibc-2.12.90-4/elf/unload8mod3.c
+--- glibc-2.12-62-gb08c89d/elf/unload8mod3.c
++++ glibc-2.12.90-5/elf/unload8mod3.c
 @@ -0,0 +1,27 @@
 +#include <dlfcn.h>
 +#include <stdio.h>
@@ -714,16 +688,16 @@
 +
 +  atexit (mod3_fini);
 +}
---- glibc-2.12-52-g48b42dd/include/bits/stdlib-ldbl.h
-+++ glibc-2.12.90-4/include/bits/stdlib-ldbl.h
+--- glibc-2.12-62-gb08c89d/include/bits/stdlib-ldbl.h
++++ glibc-2.12.90-5/include/bits/stdlib-ldbl.h
 @@ -0,0 +1 @@
 +#include <stdlib/bits/stdlib-ldbl.h>
---- glibc-2.12-52-g48b42dd/include/bits/wchar-ldbl.h
-+++ glibc-2.12.90-4/include/bits/wchar-ldbl.h
+--- glibc-2.12-62-gb08c89d/include/bits/wchar-ldbl.h
++++ glibc-2.12.90-5/include/bits/wchar-ldbl.h
 @@ -0,0 +1 @@
 +#include <wcsmbs/bits/wchar-ldbl.h>
---- glibc-2.12-52-g48b42dd/include/features.h
-+++ glibc-2.12.90-4/include/features.h
+--- glibc-2.12-62-gb08c89d/include/features.h
++++ glibc-2.12.90-5/include/features.h
 @@ -308,8 +308,13 @@
  #endif
  
@@ -740,16 +714,16 @@
  #  define __USE_FORTIFY_LEVEL 2
  # else
  #  define __USE_FORTIFY_LEVEL 1
---- glibc-2.12-52-g48b42dd/include/sys/resource.h
-+++ glibc-2.12.90-4/include/sys/resource.h
+--- glibc-2.12-62-gb08c89d/include/sys/resource.h
++++ glibc-2.12.90-5/include/sys/resource.h
 @@ -12,4 +12,5 @@ extern int __getrusage (enum __rusage_who __who, struct rusage *__usage)
  
  extern int __setrlimit (enum __rlimit_resource __resource,
  			const struct rlimit *__rlimits);
 +libc_hidden_proto (__getrlimit)
  #endif
---- glibc-2.12-52-g48b42dd/inet/Makefile
-+++ glibc-2.12.90-4/inet/Makefile
+--- glibc-2.12-62-gb08c89d/inet/Makefile
++++ glibc-2.12.90-5/inet/Makefile
 @@ -57,6 +57,8 @@ tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network \
  
  include ../Rules
@@ -759,8 +733,8 @@
  ifeq ($(have-thread-library),yes)
  
  CFLAGS-gethstbyad_r.c = -DUSE_NSCD=1 -fexceptions
---- glibc-2.12-52-g48b42dd/intl/locale.alias
-+++ glibc-2.12.90-4/intl/locale.alias
+--- glibc-2.12-62-gb08c89d/intl/locale.alias
++++ glibc-2.12.90-5/intl/locale.alias
 @@ -57,8 +57,6 @@ korean		ko_KR.eucKR
  korean.euc 	ko_KR.eucKR
  ko_KR		ko_KR.eucKR
@@ -770,8 +744,8 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- glibc-2.12-52-g48b42dd/libio/stdio.h
-+++ glibc-2.12.90-4/libio/stdio.h
+--- glibc-2.12-62-gb08c89d/libio/stdio.h
++++ glibc-2.12.90-5/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.  */
@@ -785,8 +759,8 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- glibc-2.12-52-g48b42dd/locale/iso-4217.def
-+++ glibc-2.12.90-4/locale/iso-4217.def
+--- glibc-2.12-62-gb08c89d/locale/iso-4217.def
++++ glibc-2.12.90-5/locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -878,8 +852,8 @@
  DEFINE_INT_CURR("PYG")		/* Paraguay Guarani  */
  DEFINE_INT_CURR("QAR")		/* Qatar Rial  */
  DEFINE_INT_CURR("ROL")		/* Romanian Leu  */
---- glibc-2.12-52-g48b42dd/locale/programs/locarchive.c
-+++ glibc-2.12.90-4/locale/programs/locarchive.c
+--- glibc-2.12-62-gb08c89d/locale/programs/locarchive.c
++++ glibc-2.12.90-5/locale/programs/locarchive.c
 @@ -134,7 +134,7 @@ create_archive (const char *archivefname, struct locarhandle *ah)
    size_t reserved = RESERVE_MMAP_SIZE;
    int xflags = 0;
@@ -938,8 +912,8 @@
  add_alias (struct locarhandle *ah, const char *alias, bool replace,
  	   const char *oldname, uint32_t *locrec_offset_p)
  {
---- glibc-2.12-52-g48b42dd/localedata/Makefile
-+++ glibc-2.12.90-4/localedata/Makefile
+--- glibc-2.12-62-gb08c89d/localedata/Makefile
++++ glibc-2.12.90-5/localedata/Makefile
 @@ -227,6 +227,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
@@ -948,8 +922,8 @@
  		     -i locales/$$input -c -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale; \
  	echo ' done'; \
---- glibc-2.12-52-g48b42dd/localedata/SUPPORTED
-+++ glibc-2.12.90-4/localedata/SUPPORTED
+--- glibc-2.12-62-gb08c89d/localedata/SUPPORTED
++++ glibc-2.12.90-5/localedata/SUPPORTED
 @@ -85,6 +85,7 @@ cy_GB.UTF-8/UTF-8 \
  cy_GB/ISO-8859-14 \
  da_DK.UTF-8/UTF-8 \
@@ -991,8 +965,8 @@
  ta_IN/UTF-8 \
  te_IN/UTF-8 \
  tg_TJ.UTF-8/UTF-8 \
---- glibc-2.12-52-g48b42dd/localedata/locales/cy_GB
-+++ glibc-2.12.90-4/localedata/locales/cy_GB
+--- glibc-2.12-62-gb08c89d/localedata/locales/cy_GB
++++ glibc-2.12.90-5/localedata/locales/cy_GB
 @@ -248,8 +248,11 @@ mon         "<U0049><U006F><U006E><U0061><U0077><U0072>";/
  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>"
@@ -1007,8 +981,8 @@
  END LC_TIME
  
  LC_MESSAGES
---- glibc-2.12-52-g48b42dd/localedata/locales/en_GB
-+++ glibc-2.12.90-4/localedata/locales/en_GB
+--- glibc-2.12-62-gb08c89d/localedata/locales/en_GB
++++ glibc-2.12.90-5/localedata/locales/en_GB
 @@ -116,8 +116,8 @@ mon         "<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
  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>"
@@ -1020,8 +994,8 @@
  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-52-g48b42dd/localedata/locales/no_NO
-+++ glibc-2.12.90-4/localedata/locales/no_NO
+--- glibc-2.12-62-gb08c89d/localedata/locales/no_NO
++++ glibc-2.12.90-5/localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -1092,8 +1066,8 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- glibc-2.12-52-g48b42dd/localedata/locales/zh_TW
-+++ glibc-2.12.90-4/localedata/locales/zh_TW
+--- glibc-2.12-62-gb08c89d/localedata/locales/zh_TW
++++ glibc-2.12.90-5/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -1121,8 +1095,8 @@
  revision   "0.2"
  date       "2000-08-02"
  %
---- glibc-2.12-52-g48b42dd/malloc/mcheck.c
-+++ glibc-2.12.90-4/malloc/mcheck.c
+--- glibc-2.12-62-gb08c89d/malloc/mcheck.c
++++ glibc-2.12.90-5/malloc/mcheck.c
 @@ -24,9 +24,25 @@
  # include <mcheck.h>
  # include <stdint.h>
@@ -1198,8 +1172,8 @@
  
        old_free_hook = __free_hook;
        __free_hook = freehook;
---- glibc-2.12-52-g48b42dd/manual/libc.texinfo
-+++ glibc-2.12.90-4/manual/libc.texinfo
+--- glibc-2.12-62-gb08c89d/manual/libc.texinfo
++++ glibc-2.12.90-5/manual/libc.texinfo
 @@ -5,7 +5,7 @@
  @c setchapternewpage odd
  
@@ -1209,8 +1183,8 @@
  @direntry
  * Libc: (libc).                 C library.
  @end direntry
---- glibc-2.12-52-g48b42dd/misc/sys/cdefs.h
-+++ glibc-2.12.90-4/misc/sys/cdefs.h
+--- glibc-2.12-62-gb08c89d/misc/sys/cdefs.h
++++ glibc-2.12.90-5/misc/sys/cdefs.h
 @@ -132,7 +132,10 @@
  #define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
  #define __bos0(ptr) __builtin_object_size (ptr, 0)
@@ -1254,8 +1228,8 @@
  # define __va_arg_pack() __builtin_va_arg_pack ()
  # define __va_arg_pack_len() __builtin_va_arg_pack_len ()
  #endif
---- glibc-2.12-52-g48b42dd/nis/Makefile
-+++ glibc-2.12.90-4/nis/Makefile
+--- glibc-2.12-62-gb08c89d/nis/Makefile
++++ glibc-2.12.90-5/nis/Makefile
 @@ -69,6 +69,8 @@ libnss_nisplus-inhibit-o = $(filter-out .os,$(object-suffixes))
  
  include ../Rules
@@ -1265,8 +1239,8 @@
  
  $(objpfx)libnss_compat.so: $(objpfx)libnsl.so$(libnsl.so-version)
  $(objpfx)libnss_nis.so: $(objpfx)libnsl.so$(libnsl.so-version) \
---- glibc-2.12-52-g48b42dd/nis/nss
-+++ glibc-2.12.90-4/nis/nss
+--- glibc-2.12-62-gb08c89d/nis/nss
++++ glibc-2.12.90-5/nis/nss
 @@ -25,7 +25,7 @@
  #  memory with every getXXent() call.  Otherwise each getXXent() call
  #  might result into a network communication with the server to get
@@ -1276,9 +1250,9 @@
  #
  # ADJUNCT_AS_SHADOW
  #  If set to TRUE, the passwd routines in the NIS NSS module will not
---- glibc-2.12-52-g48b42dd/nptl/ChangeLog
-+++ glibc-2.12.90-4/nptl/ChangeLog
-@@ -3913,6 +3913,15 @@
+--- glibc-2.12-62-gb08c89d/nptl/ChangeLog
++++ glibc-2.12.90-5/nptl/ChangeLog
+@@ -3926,6 +3926,15 @@
  	Use __sigfillset.  Document that sigfillset does the right thing wrt
  	to SIGSETXID.
  
@@ -1294,7 +1268,7 @@
  2005-07-11  Jakub Jelinek  <jakub@redhat.com>
  
  	[BZ #1102]
-@@ -4649,6 +4658,11 @@
+@@ -4662,6 +4671,11 @@
  	Move definition inside libpthread, libc, librt check.  Provide
  	definition for rtld.
  
@@ -1306,7 +1280,7 @@
  2004-09-02  Ulrich Drepper  <drepper@redhat.com>
  
  	* sysdeps/alpha/jmpbuf-unwind.h: Define __libc_unwind_longjmp.
-@@ -6723,6 +6737,11 @@
+@@ -6736,6 +6750,11 @@
  
  	* Makefile [$(build-shared) = yes] (tests): Depend on $(test-modules).
  
@@ -1318,8 +1292,8 @@
  2003-07-25  Jakub Jelinek  <jakub@redhat.com>
  
  	* tst-cancel17.c (do_test): Check if aio_cancel failed.
---- glibc-2.12-52-g48b42dd/nptl/Makefile
-+++ glibc-2.12.90-4/nptl/Makefile
+--- glibc-2.12-62-gb08c89d/nptl/Makefile
++++ glibc-2.12.90-5/nptl/Makefile
 @@ -342,7 +342,8 @@ endif
  extra-objs += $(crti-objs) $(crtn-objs)
  omit-deps += crti crtn
@@ -1352,8 +1326,8 @@
  else
  $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a
  endif
---- glibc-2.12-52-g48b42dd/nptl/Versions
-+++ glibc-2.12.90-4/nptl/Versions
+--- glibc-2.12-62-gb08c89d/nptl/Versions
++++ glibc-2.12.90-5/nptl/Versions
 @@ -29,6 +29,7 @@ libc {
    GLIBC_PRIVATE {
      # Internal libc interface to libpthread
@@ -1362,8 +1336,8 @@
    }
  }
  
---- glibc-2.12-52-g48b42dd/nptl/allocatestack.c
-+++ glibc-2.12.90-4/nptl/allocatestack.c
+--- glibc-2.12-62-gb08c89d/nptl/allocatestack.c
++++ glibc-2.12.90-5/nptl/allocatestack.c
 @@ -994,7 +994,16 @@ setxid_mark_thread (struct xid_command *cmdp, struct pthread *t)
  
        /* If the thread is exiting right now, ignore it.  */
@@ -1382,8 +1356,8 @@
      }
    while (atomic_compare_and_exchange_bool_acq (&t->cancelhandling,
  					       ch | SETXID_BITMASK, ch));
---- glibc-2.12-52-g48b42dd/nptl/nptl-init.c
-+++ glibc-2.12.90-4/nptl/nptl-init.c
+--- glibc-2.12-62-gb08c89d/nptl/nptl-init.c
++++ glibc-2.12.90-5/nptl/nptl-init.c
 @@ -396,7 +396,7 @@ __pthread_initialize_minimal_internal (void)
    /* Determine the default allowed stack size.  This is the size used
       in case the user does not specify one.  */
@@ -1393,8 +1367,8 @@
        || limit.rlim_cur == RLIM_INFINITY)
      /* The system limit is not usable.  Use an architecture-specific
         default.  */
---- glibc-2.12-52-g48b42dd/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
-+++ glibc-2.12.90-4/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
+--- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
++++ glibc-2.12.90-5/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h
 @@ -189,4 +189,7 @@
  /* Typed memory objects are not available.  */
  #define _POSIX_TYPED_MEMORY_OBJECTS	-1
@@ -1403,8 +1377,8 @@
 +#define _XOPEN_STREAMS	-1
 +
  #endif /* bits/posix_opt.h */
---- glibc-2.12-52-g48b42dd/nptl/sysdeps/unix/sysv/linux/i386/Versions
-+++ glibc-2.12.90-4/nptl/sysdeps/unix/sysv/linux/i386/Versions
+--- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/i386/Versions
++++ glibc-2.12.90-5/nptl/sysdeps/unix/sysv/linux/i386/Versions
 @@ -0,0 +1,6 @@
 +libc {
 +  GLIBC_PRIVATE {
@@ -1412,8 +1386,8 @@
 +    __uname;
 +  }
 +}
---- glibc-2.12-52-g48b42dd/nptl/sysdeps/unix/sysv/linux/i386/smp.h
-+++ glibc-2.12.90-4/nptl/sysdeps/unix/sysv/linux/i386/smp.h
+--- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/i386/smp.h
++++ glibc-2.12.90-5/nptl/sysdeps/unix/sysv/linux/i386/smp.h
 @@ -37,7 +37,7 @@ is_smp_system (void)
    char *cp;
  
@@ -1423,8 +1397,8 @@
      cp = u.uts.version;
    else
      {
---- glibc-2.12-52-g48b42dd/nptl/sysdeps/unix/sysv/linux/kernel-features.h
-+++ glibc-2.12.90-4/nptl/sysdeps/unix/sysv/linux/kernel-features.h
+--- glibc-2.12-62-gb08c89d/nptl/sysdeps/unix/sysv/linux/kernel-features.h
++++ glibc-2.12.90-5/nptl/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -0,0 +1,6 @@
 +#include_next <kernel-features.h>
 +
@@ -1432,8 +1406,8 @@
 +#ifndef __ASSUME_CLONE_THREAD_FLAGS
 +# define __ASSUME_CLONE_THREAD_FLAGS	1
 +#endif
---- glibc-2.12-52-g48b42dd/nptl/tst-stackguard1.c
-+++ glibc-2.12.90-4/nptl/tst-stackguard1.c
+--- glibc-2.12-62-gb08c89d/nptl/tst-stackguard1.c
++++ glibc-2.12.90-5/nptl/tst-stackguard1.c
 @@ -190,17 +190,21 @@ do_test (void)
       the 16 runs, something is very wrong.  */
    int ndifferences = 0;
@@ -1458,8 +1432,8 @@
      {
        puts ("stack guard canaries are not randomized enough");
        puts ("nor equal to the default canary value");
---- glibc-2.12-52-g48b42dd/nscd/nscd.conf
-+++ glibc-2.12.90-4/nscd/nscd.conf
+--- glibc-2.12-62-gb08c89d/nscd/nscd.conf
++++ glibc-2.12.90-5/nscd/nscd.conf
 @@ -33,7 +33,7 @@
  #	logfile			/var/log/nscd.log
  #	threads			4
@@ -1469,8 +1443,8 @@
  #	stat-user		somebody
  	debug-level		0
  #	reload-count		5
---- glibc-2.12-52-g48b42dd/nscd/nscd.init
-+++ glibc-2.12.90-4/nscd/nscd.init
+--- glibc-2.12-62-gb08c89d/nscd/nscd.init
++++ glibc-2.12.90-5/nscd/nscd.init
 @@ -9,6 +9,7 @@
  #		slow naming services like NIS, NIS+, LDAP, or hesiod.
  # processname: /usr/sbin/nscd
@@ -1547,8 +1521,8 @@
  	;;
      *)
  	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
---- glibc-2.12-52-g48b42dd/nss/Makefile
-+++ glibc-2.12.90-4/nss/Makefile
+--- glibc-2.12-62-gb08c89d/nss/Makefile
++++ glibc-2.12.90-5/nss/Makefile
 @@ -74,6 +74,7 @@ endif
  
  include ../Rules
@@ -1557,8 +1531,8 @@
  
  ifeq (yes,$(build-static-nss))
  $(objpfx)getent: $(objpfx)libnss_files.a
---- glibc-2.12-52-g48b42dd/posix/Makefile
-+++ glibc-2.12.90-4/posix/Makefile
+--- glibc-2.12-62-gb08c89d/posix/Makefile
++++ glibc-2.12.90-5/posix/Makefile
 @@ -305,15 +305,8 @@ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
  	  mv -f $@/$$spec.new $@/$$spec; \
  	done < $(objpfx)getconf.speclist
@@ -1579,8 +1553,8 @@
 +	  | sed -n -e '/START_OF_STRINGS/,$${/\(POSIX_V[67]\|_XBS5\)_/{s/^[^"]*"//;s/".*$$//;p}}' \
 +	  > $@.new
  	mv -f $@.new $@
---- glibc-2.12-52-g48b42dd/posix/gai.conf
-+++ glibc-2.12.90-4/posix/gai.conf
+--- glibc-2.12-62-gb08c89d/posix/gai.conf
++++ glibc-2.12.90-5/posix/gai.conf
 @@ -41,7 +41,7 @@
  #
  # precedence  <mask>   <value>
@@ -1605,8 +1579,8 @@
  #scopev4 ::ffff:0.0.0.0/96       14
 +#
 +#    This is what the Red Hat setting currently uses.
---- glibc-2.12-52-g48b42dd/posix/getconf.speclist.h
-+++ glibc-2.12.90-4/posix/getconf.speclist.h
+--- glibc-2.12-62-gb08c89d/posix/getconf.speclist.h
++++ glibc-2.12.90-5/posix/getconf.speclist.h
 @@ -0,0 +1,39 @@
 +#include <unistd.h>
 +const char *START_OF_STRINGS =
@@ -1647,8 +1621,8 @@
 +"XBS5_LPBIG_OFFBIG"
 +#endif
 +"";
---- glibc-2.12-52-g48b42dd/resolv/Makefile
-+++ glibc-2.12.90-4/resolv/Makefile
+--- glibc-2.12-62-gb08c89d/resolv/Makefile
++++ glibc-2.12.90-5/resolv/Makefile
 @@ -77,6 +77,7 @@ CPPFLAGS += -Dgethostbyname=res_gethostbyname \
  	    -Dgetnetbyaddr=res_getnetbyaddr
  
@@ -1657,8 +1631,8 @@
  
  # The BIND code elicits some harmless warnings.
  +cflags += -Wno-strict-prototypes -Wno-write-strings
---- glibc-2.12-52-g48b42dd/resource/getrlimit.c
-+++ glibc-2.12.90-4/resource/getrlimit.c
+--- glibc-2.12-62-gb08c89d/resource/getrlimit.c
++++ glibc-2.12.90-5/resource/getrlimit.c
 @@ -28,6 +28,7 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
    __set_errno (ENOSYS);
    return -1;
@@ -1667,8 +1641,8 @@
  weak_alias (__getrlimit, getrlimit)
  
  stub_warning (getrlimit)
---- glibc-2.12-52-g48b42dd/streams/Makefile
-+++ glibc-2.12.90-4/streams/Makefile
+--- glibc-2.12-62-gb08c89d/streams/Makefile
++++ glibc-2.12.90-5/streams/Makefile
 @@ -21,7 +21,7 @@
  #
  subdir	:= streams
@@ -1678,8 +1652,8 @@
  routines	= isastream getmsg getpmsg putmsg putpmsg fattach fdetach
  
  include ../Rules
---- glibc-2.12-52-g48b42dd/sunrpc/Makefile
-+++ glibc-2.12.90-4/sunrpc/Makefile
+--- glibc-2.12-62-gb08c89d/sunrpc/Makefile
++++ glibc-2.12.90-5/sunrpc/Makefile
 @@ -129,6 +129,10 @@ CFLAGS-openchild.c = -fexceptions
  
  CPPFLAGS += -D_RPC_THREAD_SAFE_
@@ -1691,8 +1665,8 @@
  include ../Rules
  
  $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
---- glibc-2.12-52-g48b42dd/sysdeps/generic/dl-cache.h
-+++ glibc-2.12.90-4/sysdeps/generic/dl-cache.h
+--- glibc-2.12-62-gb08c89d/sysdeps/generic/dl-cache.h
++++ glibc-2.12.90-5/sysdeps/generic/dl-cache.h
 @@ -36,6 +36,14 @@
  # define add_system_dir(dir) add_dir (dir)
  #endif
@@ -1708,8 +1682,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-2.12-52-g48b42dd/sysdeps/i386/Makefile
-+++ glibc-2.12.90-4/sysdeps/i386/Makefile
+--- glibc-2.12-62-gb08c89d/sysdeps/i386/Makefile
++++ glibc-2.12.90-5/sysdeps/i386/Makefile
 @@ -2,6 +2,8 @@
  # Every i386 port in use uses gas syntax (I think).
  asm-CPPFLAGS += -DGAS_SYNTAX
@@ -1734,8 +1708,8 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.12-52-g48b42dd/sysdeps/i386/i686/Makefile
-+++ glibc-2.12.90-4/sysdeps/i386/i686/Makefile
+--- glibc-2.12-62-gb08c89d/sysdeps/i386/i686/Makefile
++++ glibc-2.12.90-5/sysdeps/i386/i686/Makefile
 @@ -9,19 +9,3 @@ stack-align-test-flags += -msse
  ifeq ($(subdir),string)
  sysdep_routines += cacheinfo
@@ -1756,8 +1730,8 @@
 -ASFLAGS-.ob += -Wa,-mtune=i686
 -ASFLAGS-.oS += -Wa,-mtune=i686
 -endif
---- glibc-2.12-52-g48b42dd/sysdeps/ia64/Makefile
-+++ glibc-2.12.90-4/sysdeps/ia64/Makefile
+--- glibc-2.12-62-gb08c89d/sysdeps/ia64/Makefile
++++ glibc-2.12.90-5/sysdeps/ia64/Makefile
 @@ -12,8 +12,8 @@ elide-routines.os += hp-timing
  
  ifeq (yes,$(build-shared))
@@ -1769,8 +1743,8 @@
  endif
  endif
  
---- glibc-2.12-52-g48b42dd/sysdeps/ia64/ia64libgcc.S
-+++ glibc-2.12.90-4/sysdeps/ia64/ia64libgcc.S
+--- glibc-2.12-62-gb08c89d/sysdeps/ia64/ia64libgcc.S
++++ glibc-2.12.90-5/sysdeps/ia64/ia64libgcc.S
 @@ -1,350 +0,0 @@
 -/* From the Intel IA-64 Optimization Guide, choose the minimum latency
 -   alternative.  */
@@ -2122,8 +2096,8 @@
 -	.symver	___multi3, __multi3@GLIBC_2.2
 -
 -#endif
---- glibc-2.12-52-g48b42dd/sysdeps/ia64/libgcc-compat.c
-+++ glibc-2.12.90-4/sysdeps/ia64/libgcc-compat.c
+--- glibc-2.12-62-gb08c89d/sysdeps/ia64/libgcc-compat.c
++++ glibc-2.12.90-5/sysdeps/ia64/libgcc-compat.c
 @@ -0,0 +1,84 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -2209,16 +2183,16 @@
 +symbol_version (INTUSE (__multi3), __multi3, GLIBC_2.2);
 +
 +#endif
---- glibc-2.12-52-g48b42dd/sysdeps/mach/hurd/getrlimit.c
-+++ glibc-2.12.90-4/sysdeps/mach/hurd/getrlimit.c
+--- glibc-2.12-62-gb08c89d/sysdeps/mach/hurd/getrlimit.c
++++ glibc-2.12.90-5/sysdeps/mach/hurd/getrlimit.c
 @@ -44,4 +44,5 @@ __getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
  
    return 0;
  }
 +libc_hidden_def (__getrlimit)
  weak_alias (__getrlimit, getrlimit)
---- glibc-2.12-52-g48b42dd/sysdeps/posix/getaddrinfo.c
-+++ glibc-2.12.90-4/sysdeps/posix/getaddrinfo.c
+--- glibc-2.12-62-gb08c89d/sysdeps/posix/getaddrinfo.c
++++ glibc-2.12.90-5/sysdeps/posix/getaddrinfo.c
 @@ -1099,10 +1099,12 @@ static const struct scopeentry
      /* Link-local addresses: scope 2.  */
      { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
@@ -2232,8 +2206,8 @@
      /* Default: scope 14.  */
      { { { 0, 0, 0, 0 } }, htonl_c (0x00000000), 14 }
    };
---- glibc-2.12-52-g48b42dd/sysdeps/powerpc/powerpc64/Makefile
-+++ glibc-2.12.90-4/sysdeps/powerpc/powerpc64/Makefile
+--- glibc-2.12-62-gb08c89d/sysdeps/powerpc/powerpc64/Makefile
++++ glibc-2.12.90-5/sysdeps/powerpc/powerpc64/Makefile
 @@ -30,6 +30,7 @@ ifneq ($(elf),no)
  # we use -fpic instead which is much better.
  CFLAGS-initfini.s += -fpic -O1
@@ -2242,16 +2216,16 @@
  endif
  
  ifeq ($(subdir),elf)
---- glibc-2.12-52-g48b42dd/sysdeps/powerpc/powerpc64/elf/Makefile
-+++ glibc-2.12.90-4/sysdeps/powerpc/powerpc64/elf/Makefile
+--- glibc-2.12-62-gb08c89d/sysdeps/powerpc/powerpc64/elf/Makefile
++++ glibc-2.12.90-5/sysdeps/powerpc/powerpc64/elf/Makefile
 @@ -9,3 +9,5 @@ CFLAGS-rtld-mempcpy.os = $(no-special-regs)
  CFLAGS-rtld-memmove.os = $(no-special-regs)
  CFLAGS-rtld-memchr.os = $(no-special-regs)
  CFLAGS-rtld-strnlen.os = $(no-special-regs)
 +
 +CFLAGS-gmon-start.c = -fno-strict-aliasing
---- glibc-2.12-52-g48b42dd/sysdeps/unix/nice.c
-+++ glibc-2.12.90-4/sysdeps/unix/nice.c
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/nice.c
++++ glibc-2.12.90-5/sysdeps/unix/nice.c
 @@ -42,7 +42,12 @@ nice (int incr)
  	__set_errno (save);
      }
@@ -2266,8 +2240,8 @@
    if (result == -1)
      {
        if (errno == EACCES)
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/check_pf.c
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/check_pf.c
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/check_pf.c
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/check_pf.c
 @@ -27,13 +27,10 @@
  #include <unistd.h>
  #include <sys/socket.h>
@@ -2283,8 +2257,8 @@
  
  #ifndef IFA_F_HOMEADDRESS
  # define IFA_F_HOMEADDRESS 0
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/dl-osinfo.h
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/dl-osinfo.h
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/dl-osinfo.h
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/dl-osinfo.h
 @@ -17,10 +17,13 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -2332,8 +2306,8 @@
      }
    else
  #endif
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/futimesat.c
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/futimesat.c
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/futimesat.c
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/futimesat.c
 @@ -37,14 +37,14 @@ futimesat (fd, file, tvp)
  {
    int result;
@@ -2376,8 +2350,8 @@
      {
        size_t filelen = strlen (file);
        if (__builtin_expect (filelen == 0, 0))
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/getpagesize.c
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/getpagesize.c
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/getpagesize.c
 @@ -28,7 +28,7 @@
  int
  __getpagesize ()
@@ -2387,8 +2361,8 @@
    assert (GLRO(dl_pagesize) != 0);
    return GLRO(dl_pagesize);
  #else
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/i386/dl-cache.h
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/i386/dl-cache.h
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/i386/dl-cache.h
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/i386/dl-cache.h
 @@ -0,0 +1,59 @@
 +/* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -2449,16 +2423,16 @@
 +  } while (0)
 +
 +#include_next <dl-cache.h>
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/i386/getrlimit.c
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/i386/getrlimit.c
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/i386/getrlimit.c
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/i386/getrlimit.c
 @@ -79,4 +79,5 @@ __new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
  }
  
  weak_alias (__new_getrlimit, __getrlimit);
 +libc_hidden_weak (__getrlimit)
  versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/ia64/dl-cache.h
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/ia64/dl-cache.h
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/dl-cache.h
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/ia64/dl-cache.h
 @@ -22,4 +22,31 @@
  #define _dl_cache_check_flags(flags) \
    ((flags) == _DL_CACHE_DEFAULT_ID)
@@ -2491,29 +2465,29 @@
 +  } while (0)
 +
  #include_next <dl-cache.h>
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.c
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/i386/dl-procinfo.c>
 +#else
 +#include <sysdeps/generic/dl-procinfo.c>
 +#endif
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/ia64/dl-procinfo.h
 @@ -0,0 +1,5 @@
 +#ifdef IS_IN_ldconfig
 +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h>
 +#else
 +#include <sysdeps/generic/dl-procinfo.h>
 +#endif
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed
 @@ -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-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/netlinkaccess.h
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/netlinkaccess.h
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/netlinkaccess.h
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/netlinkaccess.h
 @@ -25,6 +25,24 @@
  
  #include <kernel-features.h>
@@ -2539,8 +2513,8 @@
  
  struct netlink_res
  {
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/paths.h
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/paths.h
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/paths.h
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/paths.h
 @@ -62,7 +62,7 @@
  #define	_PATH_TTY	"/dev/tty"
  #define	_PATH_UNIX	"/boot/vmlinux"
@@ -2550,13 +2524,13 @@
  #define _PATH_WTMP	"/var/log/wtmp"
  
  /* Provide trailing slash, since mostly used for building pathnames. */
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/sparc/sparc64/fxstat.c
 @@ -1 +1 @@
 -#include "../../fxstat.c"
 +#include "../../i386/fxstat.c"
---- glibc-2.12-52-g48b42dd/sysdeps/unix/sysv/linux/tcsetattr.c
-+++ glibc-2.12.90-4/sysdeps/unix/sysv/linux/tcsetattr.c
+--- glibc-2.12-62-gb08c89d/sysdeps/unix/sysv/linux/tcsetattr.c
++++ glibc-2.12.90-5/sysdeps/unix/sysv/linux/tcsetattr.c
 @@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios_p)
  {
    struct __kernel_termios k_termios;
@@ -2602,8 +2576,8 @@
 +  return retval;
  }
  libc_hidden_def (tcsetattr)
---- glibc-2.12-52-g48b42dd/timezone/zic.c
-+++ glibc-2.12.90-4/timezone/zic.c
+--- glibc-2.12-62-gb08c89d/timezone/zic.c
++++ glibc-2.12.90-5/timezone/zic.c
 @@ -1921,7 +1921,7 @@ const int			zonecount;
  		if (stdrp != NULL && stdrp->r_hiyear == 2037)
  			return;
diff --git a/glibc.spec b/glibc.spec
index caeea46..8047359 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,5 +1,6 @@
-%define glibcsrcdir glibc-2.12-52-g48b42dd
+%define glibcsrcdir glibc-2.12-62-gb08c89d
 %define glibcversion 2.12.90
+%define glibcportsdir glibc-ports-2.12-12-g71feaf7
 ### glibc.spec.in follows:
 %define run_glibc_tests 1
 %define auxarches athlon sparcv9v sparc64v alphaev6
@@ -23,7 +24,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 4
+Release: 5
 # 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
@@ -31,9 +32,10 @@ Release: 4
 # libraries without restrictions.
 License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
 Group: System Environment/Libraries
-URL: http://sources.redhat.com/glibc/
+URL: http://www.gnu.org/software/glibc/
 Source0: %{?glibc_release_url}%{glibcsrcdir}.tar.bz2
-Source1: %{glibcsrcdir}-fedora.tar.bz2
+Source1: %{?glibc_release_url}%{glibcportsdir}.tar.bz2
+Source2: %{glibcsrcdir}-fedora.tar.bz2
 Patch0: %{name}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -239,7 +241,8 @@ package or when debugging this package.
 %endif
 
 %prep
-%setup -q -n %{glibcsrcdir} -b1
+rm -rf %{glibcportsdir}
+%setup -q -n %{glibcsrcdir} -b1 -b2
 %patch0 -E -p1
 %ifarch ia64
 %if "%{_lib}" == "lib64"
@@ -341,8 +344,8 @@ mkdir $builddir ; cd $builddir
 build_CFLAGS="$BuildFlags -g -O3 $*"
 ../configure CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLAGS" \
 	--prefix=%{_prefix} \
-	--enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \
-	--with-headers=%{_prefix}/include --enable-bind-now \
+	--enable-add-ons=../%{glibcportsdir},nptl$AddOns \
+	--with-headers=%{_prefix}/include $EnableKernel --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
 	--host %{nptl_target_cpu}-redhat-linux \
 %ifarch %{multiarcharches}
@@ -1032,6 +1035,12 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Jul 12 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-5
+- Update from master
+  - Don't pass NULL occation to dl_signal_cerror
+  - Implement _PC_PIPE_BUF.
+- Add glibc-ports tarball
+
 * Fri Jul  2 2010 Andreas Schwab <schwab@redhat.com> - 2.12.90-4
 - Update from master
   - Work around kernel rejecting valid absolute timestamps
diff --git a/import.log b/import.log
index cb4d02d..baed58e 100644
--- a/import.log
+++ b/import.log
@@ -48,3 +48,4 @@ glibc-2_12_90-1:HEAD:glibc-2.12.90-1.src.rpm:1274269675
 glibc-2_12_90-2:HEAD:glibc-2.12.90-2.src.rpm:1275317456
 glibc-2_12_90-3:HEAD:glibc-2.12.90-3.src.rpm:1276590910
 glibc-2_12_90-4:HEAD:glibc-2.12.90-4.src.rpm:1278074148
+glibc-2_12_90-5:HEAD:glibc-2.12.90-5.src.rpm:1278934623
diff --git a/sources b/sources
index 77a16e6..4c67676 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-88b5f243cbbe5cd96411c3ef36a9d418  glibc-2.12-52-g48b42dd-fedora.tar.bz2
-ad5234de109f3cd6decf954ff4c43d4e  glibc-2.12-52-g48b42dd.tar.bz2
+07c477bee234e27d025eda134e61effb  glibc-2.12-62-gb08c89d-fedora.tar.bz2
+1de506da02712be11f3e0f926564ac18  glibc-2.12-62-gb08c89d.tar.bz2
+fcec0c50709b63dc101ec3894fa97602  glibc-ports-2.12-12-g71feaf7.tar.bz2