From 35b77f97b8b6ea12684c6d9f1f58066e5ddfddc0966b9849989f1051ccb2d2cb Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Mon, 16 Nov 2009 08:54:19 +0000
Subject: [PATCH] Accepting request 24314 from Base:System

Copy from Base:System/glibc based on submit request 24314 from user pbaudis

OBS-URL: https://build.opensuse.org/request/show/24314
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=13
---
 crypt_blowfish-1.0-suse.diff             |  23 ++--
 getaddrinfo-ipv6-sanity.diff             |   4 +-
 glibc-2.10-mcheck-free-race.diff         |   8 +-
 glibc-2.10-nscd-nostack.diff             |   8 +-
 glibc-2.10.99-ia64-include.diff          |   6 +-
 glibc-2.2-sunrpc.diff                    |  11 +-
 glibc-2.3-SuSE.diff                      |  28 +++--
 glibc-2.3-regcomp.diff                   |   8 +-
 glibc-2.3.1.localedef.diff               |  21 ++--
 glibc-2.3.2-revert_tcsetattr.diff        |  12 +-
 glibc-2.3.2.no_archive.diff              |  14 ++-
 glibc-2.3.3-amd64-s_ceil.diff            |  21 ++--
 glibc-2.3.3-amd64-string.diff            |  46 +++----
 glibc-2.3.3-execstack.diff               |   8 +-
 glibc-2.3.3-nscd-db-path.diff            |   8 +-
 glibc-2.3.4-gb18030-big5hkscs.diff.bz2   |   4 +-
 glibc-2.3.5-nscd-zeronegtimeout.diff     |   2 +-
 glibc-2.3.90-bindresvport.blacklist.diff |  14 ++-
 glibc-2.3.90-fnmatch.diff                |  18 +--
 glibc-2.3.90-langpackdir.diff            |   7 +-
 glibc-2.3.90-ld.so-madvise.diff          |  12 +-
 glibc-2.3.90-noversion.diff              |   8 +-
 glibc-2.3.locales.diff.bz2               |   4 +-
 glibc-2.4-china.diff                     |  10 +-
 glibc-2.4.90-no_NO.diff                  |  22 ++--
 glibc-2.4.90-nscd.diff                   |  10 +-
 glibc-2.4.90-revert-only-euro.diff       |  20 +--
 glibc-2.5-ppc-llrintl.diff               |   9 +-
 glibc-2.6-configure.diff                 |  24 ++--
 glibc-2.8-clone.diff                     |  22 ++--
 glibc-2.8-getconf.diff                   |   8 +-
 glibc-check-native-missing-include.diff  |   4 +-
 glibc-compiled-binaries.diff             |  48 ++++---
 glibc-cpusetsize.diff                    |  14 +--
 glibc-nis-splitgroups.diff               |  35 +++---
 glibc-nptl-2.4-nofixsyscallnr.diff       |   8 +-
 glibc-nscd-assert.diff                   |  63 +++++-----
 glibc-nscd-prune-ret.diff                |   9 +-
 glibc-nss-deepbind.diff                  |   2 +-
 glibc-selinux.diff                       |  12 +-
 glibc-suse-note.diff                     |   6 +-
 glibc-utmp-timeout-raise.diff            |   8 +-
 glibc-version.diff                       |  13 +-
 glibc.changes                            |   5 +
 glibc.spec                               |   2 +-
 libm-x86-64-exceptions.diff              | 152 +++++++++++++----------
 libm-x86-64.diff.bz2                     |   4 +-
 ppc-atomic.diff                          |  21 +---
 resolv.dynamic.diff                      |  12 +-
 49 files changed, 448 insertions(+), 390 deletions(-)

diff --git a/crypt_blowfish-1.0-suse.diff b/crypt_blowfish-1.0-suse.diff
index 3f16758..f290e6a 100644
--- a/crypt_blowfish-1.0-suse.diff
+++ b/crypt_blowfish-1.0-suse.diff
@@ -1,6 +1,7 @@
-diff -ruN crypt-/crypt_blowfish.c crypt/crypt_blowfish.c
---- crypt-/crypt_blowfish.c	1970-01-01 01:00:00.000000000 +0100
-+++ crypt/crypt_blowfish.c	2006-09-20 20:56:59.000000000 +0200
+Index: crypt/crypt_blowfish.c
+===================================================================
+--- /dev/null
++++ crypt/crypt_blowfish.c
 @@ -0,0 +1,743 @@
 +/*
 + * This code comes from John the Ripper password cracker, with reentrant
@@ -745,9 +746,9 @@ diff -ruN crypt-/crypt_blowfish.c crypt/crypt_blowfish.c
 +
 +	return output;
 +}
-diff --git a/crypt/Makefile b/crypt/Makefile
-index b9c8797..6c51263 100644
---- crypt/Makefile
+Index: crypt/Makefile
+===================================================================
+--- crypt/Makefile.orig
 +++ crypt/Makefile
 @@ -27,7 +27,7 @@ extra-libs := libcrypt
  extra-libs-others := $(extra-libs)
@@ -758,11 +759,11 @@ index b9c8797..6c51263 100644
  
  tests := cert md5c-test sha256c-test sha512c-test
  
-diff --git a/crypt/crypt-entry.c b/crypt/crypt-entry.c
-index fdddad2..6e6ba58 100644
---- crypt/crypt-entry.c
+Index: crypt/crypt-entry.c
+===================================================================
+--- crypt/crypt-entry.c.orig
 +++ crypt/crypt-entry.c
-@@ -61,6 +61,8 @@ extern char *__sha256_crypt (const char *key, const char *salt);
+@@ -61,6 +61,8 @@ extern char *__sha256_crypt (const char
  extern char *__sha512_crypt_r (const char *key, const char *salt,
  			       char *buffer, int buflen);
  extern char *__sha512_crypt (const char *key, const char *salt);
@@ -771,7 +772,7 @@ index fdddad2..6e6ba58 100644
  #endif
  
  /* Define our magic string to mark salt for MD5 encryption
-@@ -74,6 +76,9 @@ static const char sha256_salt_prefix[] = "$5$";
+@@ -74,6 +76,9 @@ static const char sha256_salt_prefix[] =
  /* Magic string for SHA512 encryption.  */
  static const char sha512_salt_prefix[] = "$6$";
  
diff --git a/getaddrinfo-ipv6-sanity.diff b/getaddrinfo-ipv6-sanity.diff
index 5b5ad8b..c982e8b 100644
--- a/getaddrinfo-ipv6-sanity.diff
+++ b/getaddrinfo-ipv6-sanity.diff
@@ -13,7 +13,7 @@ Index: sysdeps/posix/getaddrinfo.c
  {
    const struct gaih_typeproto *tp = gaih_inet_typeproto;
    struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
-@@ -762,7 +762,7 @@ gaih_inet (const char *name, const struc
+@@ -766,7 +766,7 @@ gaih_inet (const char *name, const struc
  		  if (fct != NULL)
  		    {
  		      if (req->ai_family == AF_INET6
@@ -22,7 +22,7 @@ Index: sysdeps/posix/getaddrinfo.c
  			{
  			  gethosts (AF_INET6, struct in6_addr);
  			  no_inet6_data = no_data;
-@@ -2151,7 +2151,7 @@ getaddrinfo (const char *name, const cha
+@@ -2157,7 +2157,7 @@ getaddrinfo (const char *name, const cha
    if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET
        || hints->ai_family == AF_INET6)
      {
diff --git a/glibc-2.10-mcheck-free-race.diff b/glibc-2.10-mcheck-free-race.diff
index f5087ea..23bb78f 100644
--- a/glibc-2.10-mcheck-free-race.diff
+++ b/glibc-2.10-mcheck-free-race.diff
@@ -3,11 +3,11 @@
 	* malloc/hooks.c (free_check): Do not invoke mem2chunk_check()
 	without main_arena mutex held.
 
-diff --git a/malloc/hooks.c b/malloc/hooks.c
-index 622a815..47d3c85 100644
---- malloc/hooks.c
+Index: malloc/hooks.c
+===================================================================
+--- malloc/hooks.c.orig
 +++ malloc/hooks.c
-@@ -276,25 +276,33 @@ free_check(mem, caller) Void_t* mem; const Void_t *caller;
+@@ -276,25 +276,33 @@ free_check(mem, caller) Void_t* mem; con
    mchunkptr p;
  
    if(!mem) return;
diff --git a/glibc-2.10-nscd-nostack.diff b/glibc-2.10-nscd-nostack.diff
index 27fb9aa..0e778ef 100644
--- a/glibc-2.10-nscd-nostack.diff
+++ b/glibc-2.10-nscd-nostack.diff
@@ -1,6 +1,8 @@
---- nscd/nscd.h~	2009-01-21 02:14:55.875774000 +0100
-+++ nscd/nscd.h	2009-01-21 02:15:58.519066000 +0100
-@@ -60,7 +60,12 @@
+Index: nscd/nscd.h
+===================================================================
+--- nscd/nscd.h.orig
++++ nscd/nscd.h
+@@ -59,7 +59,12 @@ typedef enum
  
  /* Maximum size of stack frames we allow the thread to use.  We use
     80% of the thread stack size.  */
diff --git a/glibc-2.10.99-ia64-include.diff b/glibc-2.10.99-ia64-include.diff
index 6ca38b9..ae5d2f6 100644
--- a/glibc-2.10.99-ia64-include.diff
+++ b/glibc-2.10.99-ia64-include.diff
@@ -1,6 +1,6 @@
-diff --git a/sysdeps/ia64/elf/start.S b/sysdeps/ia64/elf/start.S
-index 1c41a65..60e42e9 100644
---- sysdeps/ia64/elf/start.S
+Index: sysdeps/ia64/elf/start.S
+===================================================================
+--- sysdeps/ia64/elf/start.S.orig
 +++ sysdeps/ia64/elf/start.S
 @@ -37,6 +37,7 @@
  #include <sysdep.h>
diff --git a/glibc-2.2-sunrpc.diff b/glibc-2.2-sunrpc.diff
index 523f0b4..885c339 100644
--- a/glibc-2.2-sunrpc.diff
+++ b/glibc-2.2-sunrpc.diff
@@ -1,7 +1,8 @@
-diff -urN glibc-2.2.4/sunrpc/clnt_udp.c glibc-2.2.4.new/sunrpc/clnt_udp.c
---- sunrpc/clnt_udp.c	Tue Aug 24 11:34:36 2004
-+++ sunrpc/clnt_udp.c	Tue Aug 24 11:35:19 2004
-@@ -272,6 +272,7 @@
+Index: sunrpc/clnt_udp.c
+===================================================================
+--- sunrpc/clnt_udp.c.orig
++++ sunrpc/clnt_udp.c
+@@ -301,6 +301,7 @@ clntudp_call (cl, proc, xargs, argsp, xr
    XDR *xdrs;
    int outlen = 0;
    int inlen;
@@ -9,7 +10,7 @@ diff -urN glibc-2.2.4/sunrpc/clnt_udp.c glibc-2.2.4.new/sunrpc/clnt_udp.c
    socklen_t fromlen;
    struct pollfd fd;
    int milliseconds = (cu->cu_wait.tv_sec * 1000) +
-@@ -342,37 +343,36 @@
+@@ -371,37 +372,36 @@ send_again:
    anyup = 0;
    for (;;)
      {
diff --git a/glibc-2.3-SuSE.diff b/glibc-2.3-SuSE.diff
index 01107dc..62a1ff2 100644
--- a/glibc-2.3-SuSE.diff
+++ b/glibc-2.3-SuSE.diff
@@ -1,17 +1,21 @@
---- io/Makefile
-+++ io/Makefile	2003/02/24 12:15:52
-@@ -56,7 +56,7 @@
+Index: io/Makefile
+===================================================================
+--- io/Makefile.orig
++++ io/Makefile
+@@ -64,7 +64,7 @@ static-only-routines = stat fstat lstat
  
  others		:= pwd
  test-srcs	:= ftwtest
 -tests		:= test-utime test-stat test-stat2 test-lfs tst-getcwd \
 +tests		:= test-utime test-stat test-stat2 tst-getcwd \
  		   tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3 bug-ftw4 tst-statvfs \
- 		   tst-openat tst-unlinkat tst-fstatat tst-futimesat \ 
- distribute	:= ftwtest-sh
---- libio/stdio.h	23 Apr 2003 10:13:22 -0000	1.1.1.14
-+++ libio/stdio.h	23 Apr 2003 10:27:07 -0000	1.10
-@@ -142,10 +142,12 @@ typedef _G_fpos64_t fpos64_t;
+ 		   tst-openat tst-unlinkat tst-fstatat tst-futimesat \
+ 		   tst-renameat tst-fchownat tst-fchmodat tst-faccessat \
+Index: libio/stdio.h
+===================================================================
+--- libio/stdio.h.orig
++++ libio/stdio.h
+@@ -145,10 +145,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.  */
@@ -24,9 +28,11 @@
  
  __BEGIN_NAMESPACE_STD
  /* Remove file FILENAME.  */
---- stdio-common/Makefile
-+++ stdio-common/Makefile	2005/12/05 11:13:59
-@@ -48,7 +48,7 @@
+Index: stdio-common/Makefile
+===================================================================
+--- stdio-common/Makefile.orig
++++ stdio-common/Makefile
+@@ -52,7 +52,7 @@ tests := tstscanf test_rdwr test-popen t
  	 temptest tst-fileno test-fwrite tst-ungetc tst-ferror \
  	 xbug errnobug \
  	 bug1 bug2 bug3 bug4 bug5 bug6 bug7 bug8 bug9 bug10 bug11 bug12 bug13 \
diff --git a/glibc-2.3-regcomp.diff b/glibc-2.3-regcomp.diff
index eaa62e2..8340d83 100644
--- a/glibc-2.3-regcomp.diff
+++ b/glibc-2.3-regcomp.diff
@@ -1,6 +1,8 @@
---- posix/regcomp.c	2003-11-26 08:54:28.000000000 +0100
-+++ posix/regcomp.c	2003-11-27 11:41:00.000000000 +0100
-@@ -2191,6 +2191,8 @@
+Index: posix/regcomp.c
+===================================================================
+--- posix/regcomp.c.orig
++++ posix/regcomp.c
+@@ -2254,6 +2254,8 @@ parse_expression (re_string_t *regexp, r
        else if (syntax & RE_CONTEXT_INDEP_OPS)
  	{
  	  fetch_token (token, regexp, syntax);
diff --git a/glibc-2.3.1.localedef.diff b/glibc-2.3.1.localedef.diff
index a4dca05..787ac54 100644
--- a/glibc-2.3.1.localedef.diff
+++ b/glibc-2.3.1.localedef.diff
@@ -3,10 +3,12 @@ Mon Oct 21 17:20:04 CEST 2002 - schwab@suse.de
 
 - Fix alignment in locale-archive.
 
---- locale/programs/locarchive.c	2002-10-18 11:14:16.000000000 +0200
-+++ locale/programs/locarchive.c	2002-10-21 13:28:27.000000000 +0200
-@@ -72,6 +72,9 @@ static const char *locnames[] =
- #define INITIAL_NUM_SUMS	2000
+Index: locale/programs/locarchive.c
+===================================================================
+--- locale/programs/locarchive.c.orig
++++ locale/programs/locarchive.c
+@@ -75,6 +75,9 @@ static const char *locnames[] =
+ #define RESERVE_MMAP_SIZE	512 * 1024 * 1024
  
  
 +#define ALIGN(offset, alignment) \
@@ -15,8 +17,7 @@ Mon Oct 21 17:20:04 CEST 2002 - schwab@suse.de
  static void
  create_archive (const char *archivefname, struct locarhandle *ah)
  {
-@@ -90,8 +93,9 @@ create_archive (const char *archivefname
- 
+@@ -94,7 +97,8 @@ create_archive (const char *archivefname
    /* Create the initial content of the archive.  */
    head.magic = AR_MAGIC;
    head.serial = 0;
@@ -26,7 +27,7 @@ Mon Oct 21 17:20:04 CEST 2002 - schwab@suse.de
    head.namehash_used = 0;
    head.namehash_size = next_prime (INITIAL_NUM_NAMES);
  
-@@ -99,12 +103,15 @@ create_archive (const char *archivefname
+@@ -103,12 +107,15 @@ create_archive (const char *archivefname
    head.string_used = 0;
    head.string_size = INITIAL_SIZE_STRINGS;
  
@@ -45,9 +46,9 @@ Mon Oct 21 17:20:04 CEST 2002 - schwab@suse.de
    head.sumhash_used = 0;
    head.sumhash_size = next_prime (INITIAL_NUM_SUMS);
  
-@@ -274,13 +281,16 @@ enlarge_archive (struct locarhandle *ah,
- 			      * sizeof (struct namehashent)));
-   newhead.string_size = MAX (2 * newhead.string_used, newhead.string_size);
+@@ -356,13 +363,16 @@ enlarge_archive (struct locarhandle *ah,
+   newhead.string_size = MAX ((2 * newhead.string_used + 3) & -4,
+ 			     newhead.string_size);
  
 -  newhead.locrectab_offset = newhead.string_offset + newhead.string_size;
 +  newhead.locrectab_offset = ALIGN (newhead.string_offset
diff --git a/glibc-2.3.2-revert_tcsetattr.diff b/glibc-2.3.2-revert_tcsetattr.diff
index f660306..f17f80f 100644
--- a/glibc-2.3.2-revert_tcsetattr.diff
+++ b/glibc-2.3.2-revert_tcsetattr.diff
@@ -1,12 +1,8 @@
 Index: sysdeps/unix/sysv/linux/tcsetattr.c
 ===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/tcsetattr.c,v
-retrieving revision 1.14
-retrieving revision 1.13
-diff -u -r1.14 -r1.13
---- sysdeps/unix/sysv/linux/tcsetattr.c	21 Feb 2003 00:09:04 -0000	1.14
-+++ sysdeps/unix/sysv/linux/tcsetattr.c	17 Feb 2003 19:48:44 -0000	1.13
-@@ -56,6 +56,7 @@
+--- sysdeps/unix/sysv/linux/tcsetattr.c.orig
++++ sysdeps/unix/sysv/linux/tcsetattr.c
+@@ -49,6 +49,7 @@ tcsetattr (fd, optional_actions, termios
  {
    struct __kernel_termios k_termios;
    unsigned long int cmd;
@@ -14,7 +10,7 @@ diff -u -r1.14 -r1.13
  
    switch (optional_actions)
      {
-@@ -87,6 +88,35 @@
+@@ -80,6 +81,35 @@ tcsetattr (fd, optional_actions, termios
    memcpy (&k_termios.c_cc[0], &termios_p->c_cc[0],
  	  __KERNEL_NCCS * sizeof (cc_t));
  
diff --git a/glibc-2.3.2.no_archive.diff b/glibc-2.3.2.no_archive.diff
index 52f4e69..da3351d 100644
--- a/glibc-2.3.2.no_archive.diff
+++ b/glibc-2.3.2.no_archive.diff
@@ -3,9 +3,11 @@ Wed Jun  4 14:29:07 CEST 2003 - kukuk@suse.de
 
 - Make --no-archive default for localedef
 
---- locale/programs/localedef.c
-+++ locale/programs/localedef.c	2003/06/04 11:03:28
-@@ -83,7 +83,7 @@
+Index: locale/programs/localedef.c
+===================================================================
+--- locale/programs/localedef.c.orig
++++ locale/programs/localedef.c
+@@ -82,7 +82,7 @@ const char *alias_file;
  static struct localedef_t *locales;
  
  /* If true don't add locale data to archive.  */
@@ -14,7 +16,7 @@ Wed Jun  4 14:29:07 CEST 2003 - kukuk@suse.de
  
  /* If true add named locales to archive.  */
  static bool add_to_archive;
-@@ -114,6 +114,7 @@
+@@ -113,6 +113,7 @@ void (*argp_program_version_hook) (FILE
  #define OPT_REPLACE 307
  #define OPT_DELETE_FROM_ARCHIVE 308
  #define OPT_LIST_ARCHIVE 309
@@ -22,7 +24,7 @@ Wed Jun  4 14:29:07 CEST 2003 - kukuk@suse.de
  
  /* Definitions of arguments for argp functions.  */
  static const struct argp_option options[] =
-@@ -135,6 +136,8 @@
+@@ -134,6 +135,8 @@ static const struct argp_option options[
      N_("Suppress warnings and information messages") },
    { "verbose", 'v', NULL, 0, N_("Print more messages") },
    { NULL, 0, NULL, 0, N_("Archive control:") },
@@ -31,7 +33,7 @@ Wed Jun  4 14:29:07 CEST 2003 - kukuk@suse.de
    { "no-archive", OPT_NO_ARCHIVE, NULL, 0,
      N_("Don't add new data to archive") },
    { "add-to-archive", OPT_ADD_TO_ARCHIVE, NULL, 0,
-@@ -315,6 +318,9 @@
+@@ -314,6 +317,9 @@ parse_opt (int key, char *arg, struct ar
      case OPT_PREFIX:
        output_prefix = arg;
        break;
diff --git a/glibc-2.3.3-amd64-s_ceil.diff b/glibc-2.3.3-amd64-s_ceil.diff
index 36f8b0d..f04a03b 100644
--- a/glibc-2.3.3-amd64-s_ceil.diff
+++ b/glibc-2.3.3-amd64-s_ceil.diff
@@ -1,9 +1,11 @@
 
 This fixes ceil (x) for -1.0 < x < 0.
 
---- sysdeps/x86_64/fpu/s_ceil.c	2003-11-26 15:25:50.000000000 +0100
-+++ sysdeps/x86_64/fpu/s_ceil.c	2003-11-27 13:57:35.000000000 +0100
-@@ -34,7 +34,11 @@
+Index: sysdeps/x86_64/fpu/s_ceil.c
+===================================================================
+--- sysdeps/x86_64/fpu/s_ceil.c.orig
++++ sysdeps/x86_64/fpu/s_ceil.c
+@@ -34,7 +34,11 @@ double __ceil(double x)
          /* x is +zero or -zero; return the same zero */
            return x;
        else if (xneg) /* x < 0.0 */
@@ -16,9 +18,11 @@ This fixes ceil (x) for -1.0 < x < 0.
        else
          return 1.0;
      }
---- sysdeps/x86_64/fpu/s_ceilf.c	2003-11-26 15:25:50.000000000 +0100
-+++ sysdeps/x86_64/fpu/s_ceilf.c	2003-11-27 13:57:35.000000000 +0100
-@@ -34,7 +34,11 @@
+Index: sysdeps/x86_64/fpu/s_ceilf.c
+===================================================================
+--- sysdeps/x86_64/fpu/s_ceilf.c.orig
++++ sysdeps/x86_64/fpu/s_ceilf.c
+@@ -34,7 +34,11 @@ float __ceilf(float x)
          /* x is +zero or -zero; return the same zero */
          return x;
        else if (xneg) /* x < 0.0 */
@@ -31,8 +35,3 @@ This fixes ceil (x) for -1.0 < x < 0.
        else
          return 1.0F;
      }
-
--- 
- Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
-  SuSE Linux AG, Deutschherrnstr. 15-19, 90429 Nürnberg, Germany
-   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126
diff --git a/glibc-2.3.3-amd64-string.diff b/glibc-2.3.3-amd64-string.diff
index ccfb162..89179f1 100644
--- a/glibc-2.3.3-amd64-string.diff
+++ b/glibc-2.3.3-amd64-string.diff
@@ -1,8 +1,8 @@
 ============================================================
 Index: sysdeps/x86_64/strlen.S
 ===================================================================
---- sysdeps/x86_64/strlen.S.orig	2003-04-30 00:47:18.000000000 +0200
-+++ sysdeps/x86_64/strlen.S	2009-03-23 16:32:42.000000000 +0100
+--- sysdeps/x86_64/strlen.S.orig
++++ sysdeps/x86_64/strlen.S
 @@ -1,54 +1,405 @@
 -/* strlen(str) -- determine the length of the string STR.
 -   Copyright (C) 2009 Free Software Foundation, Inc.
@@ -459,12 +459,12 @@ Index: sysdeps/x86_64/strlen.S
 +        lea     (%rdi, %rsi), %rax
 +        ret
 +
- END (strlen)
+ END(strlen)
  libc_hidden_builtin_def (strlen)
 Index: sysdeps/x86_64/dl-machine.h
 ===================================================================
---- sysdeps/x86_64/dl-machine.h.orig	2008-11-14 16:42:29.000000000 +0100
-+++ sysdeps/x86_64/dl-machine.h	2009-03-23 16:32:42.000000000 +0100
+--- sysdeps/x86_64/dl-machine.h.orig
++++ sysdeps/x86_64/dl-machine.h
 @@ -226,6 +226,40 @@ dl_platform_init (void)
    if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0')
      /* Avoid an empty string which would disturb us.  */
@@ -508,8 +508,8 @@ Index: sysdeps/x86_64/dl-machine.h
  static inline Elf64_Addr
 Index: sysdeps/x86_64/Makefile
 ===================================================================
---- sysdeps/x86_64/Makefile.orig	2008-11-14 16:42:29.000000000 +0100
-+++ sysdeps/x86_64/Makefile	2009-03-23 16:32:42.000000000 +0100
+--- sysdeps/x86_64/Makefile.orig
++++ sysdeps/x86_64/Makefile
 @@ -4,6 +4,9 @@ long-double-fcts = yes
  ifeq ($(subdir),csu)
  sysdep_routines += hp-timing
@@ -522,8 +522,8 @@ Index: sysdeps/x86_64/Makefile
  ifeq ($(subdir),gmon)
 Index: sysdeps/x86_64/strcpy.S
 ===================================================================
---- sysdeps/x86_64/strcpy.S.orig	2003-04-30 00:47:18.000000000 +0200
-+++ sysdeps/x86_64/strcpy.S	2009-03-23 16:32:42.000000000 +0100
+--- sysdeps/x86_64/strcpy.S.orig
++++ sysdeps/x86_64/strcpy.S
 @@ -1,159 +1,833 @@
 -/* strcpy/stpcpy implementation for x86-64.
 -   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -1506,8 +1506,8 @@ Index: sysdeps/x86_64/strcpy.S
  #endif
 Index: sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
 ===================================================================
---- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c.orig	2005-12-14 09:09:28.000000000 +0100
-+++ sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c	2009-03-23 16:32:42.000000000 +0100
+--- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c.orig
++++ sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
 @@ -1,5 +1,5 @@
  #ifdef IS_IN_ldconfig
  # include <sysdeps/i386/dl-procinfo.c>
@@ -1517,8 +1517,8 @@ Index: sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
  #endif
 Index: sysdeps/x86_64/dl-procinfo.c
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sysdeps/x86_64/dl-procinfo.c	2009-03-23 16:32:42.000000000 +0100
+--- /dev/null
++++ sysdeps/x86_64/dl-procinfo.c
 @@ -0,0 +1,108 @@
 +/* Data for x86-64 version of processor capability information.
 +   Copyright (C) 2004 Free Software Foundation, Inc.
@@ -1630,8 +1630,8 @@ Index: sysdeps/x86_64/dl-procinfo.c
 +#undef PROCINFO_CLASS
 Index: sysdeps/x86_64/elf/rtld-global-offsets.sym
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sysdeps/x86_64/elf/rtld-global-offsets.sym	2009-03-23 16:32:42.000000000 +0100
+--- /dev/null
++++ sysdeps/x86_64/elf/rtld-global-offsets.sym
 @@ -0,0 +1,10 @@
 +#define SHARED 1
 +
@@ -1645,8 +1645,8 @@ Index: sysdeps/x86_64/elf/rtld-global-offsets.sym
 +RTLD_GLOBAL_DL_CACHE2SIZEHALF	rtdl_global_offsetof (_dl_cache2sizehalf)
 Index: sysdeps/x86_64/memcmp.S
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sysdeps/x86_64/memcmp.S	2009-03-23 16:32:42.000000000 +0100
+--- /dev/null
++++ sysdeps/x86_64/memcmp.S
 @@ -0,0 +1,443 @@
 +# $Header: /K8_Projects/Glibc/amd64memcmp.S 4     10/06/03 10:57 Emenezes $
 +
@@ -2093,8 +2093,8 @@ Index: sysdeps/x86_64/memcmp.S
 +libc_hidden_builtin_def (memcmp)
 Index: sysdeps/x86_64/strncmp.S
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ sysdeps/x86_64/strncmp.S	2009-03-23 16:32:42.000000000 +0100
+--- /dev/null
++++ sysdeps/x86_64/strncmp.S
 @@ -0,0 +1,15 @@
 +# $Header: /K8_Projects/Glibc/amd64strncpy.S 1     8/29/03 16:37 Emenezes $
 +
@@ -2113,8 +2113,8 @@ Index: sysdeps/x86_64/strncmp.S
 +libc_hidden_builtin_def (strncmp)
 Index: sysdeps/x86_64/strcmp.S
 ===================================================================
---- sysdeps/x86_64/strcmp.S.orig	2005-03-31 12:00:13.000000000 +0200
-+++ sysdeps/x86_64/strcmp.S	2009-03-23 16:32:42.000000000 +0100
+--- sysdeps/x86_64/strcmp.S.orig
++++ sysdeps/x86_64/strcmp.S
 @@ -1,45 +1,487 @@
 -/* Highly optimized version for x86-64.
 -   Copyright (C) 1999, 2000, 2002, 2003, 2005 Free Software Foundation, Inc.
@@ -2647,8 +2647,8 @@ Index: sysdeps/x86_64/strcmp.S
  libc_hidden_builtin_def (strcmp)
 Index: sysdeps/x86_64/memcpy.S
 ===================================================================
---- sysdeps/x86_64/memcpy.S.orig	2007-11-06 03:49:38.000000000 +0100
-+++ sysdeps/x86_64/memcpy.S	2009-03-23 16:32:42.000000000 +0100
+--- sysdeps/x86_64/memcpy.S.orig
++++ sysdeps/x86_64/memcpy.S
 @@ -39,7 +39,7 @@
  
          .text
diff --git a/glibc-2.3.3-execstack.diff b/glibc-2.3.3-execstack.diff
index 16436db..054e33e 100644
--- a/glibc-2.3.3-execstack.diff
+++ b/glibc-2.3.3-execstack.diff
@@ -1,6 +1,8 @@
---- locale/programs/3level.h
-+++ locale/programs/3level.h	2004/09/26 06:58:48
-@@ -204,6 +204,42 @@
+Index: locale/programs/3level.h
+===================================================================
+--- locale/programs/3level.h.orig
++++ locale/programs/3level.h
+@@ -203,6 +203,42 @@ CONCAT(TABLE,_iterate) (struct TABLE *t,
  	}
      }
  }
diff --git a/glibc-2.3.3-nscd-db-path.diff b/glibc-2.3.3-nscd-db-path.diff
index 4ce88be..c0ec50b 100644
--- a/glibc-2.3.3-nscd-db-path.diff
+++ b/glibc-2.3.3-nscd-db-path.diff
@@ -2,9 +2,11 @@
 
 	* nscd/nscd.h: Move persistent storage back to /var/run/nscd
 
---- nscd/nscd.h
-+++ nscd/nscd.h	2004/12/09 13:17:35
-@@ -87,10 +87,10 @@
+Index: nscd/nscd.h
+===================================================================
+--- nscd/nscd.h.orig
++++ nscd/nscd.h
+@@ -105,10 +105,10 @@ struct database_dyn
  
  
  /* Paths of the file for the persistent storage.  */
diff --git a/glibc-2.3.4-gb18030-big5hkscs.diff.bz2 b/glibc-2.3.4-gb18030-big5hkscs.diff.bz2
index 818e0b9..939c711 100644
--- a/glibc-2.3.4-gb18030-big5hkscs.diff.bz2
+++ b/glibc-2.3.4-gb18030-big5hkscs.diff.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:901fe715360fd55d2d83ceab113bacca58a2b9cba3673d80b184760976236ffd
-size 1036487
+oid sha256:b9ad9e58edeea033b1e06ae3648f6adfce0dbf3f3e84b6ec77dda9fa5cf3a58d
+size 1034566
diff --git a/glibc-2.3.5-nscd-zeronegtimeout.diff b/glibc-2.3.5-nscd-zeronegtimeout.diff
index dbab3d3..3081be5 100644
--- a/glibc-2.3.5-nscd-zeronegtimeout.diff
+++ b/glibc-2.3.5-nscd-zeronegtimeout.diff
@@ -2,7 +2,7 @@ Index: nscd/aicache.c
 ===================================================================
 --- nscd/aicache.c.orig
 +++ nscd/aicache.c
-@@ -515,9 +515,15 @@ next_nip:
+@@ -504,9 +504,15 @@ next_nip:
        if (fd != -1)
  	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
  
diff --git a/glibc-2.3.90-bindresvport.blacklist.diff b/glibc-2.3.90-bindresvport.blacklist.diff
index 3e8a581..11ea6df 100644
--- a/glibc-2.3.90-bindresvport.blacklist.diff
+++ b/glibc-2.3.90-bindresvport.blacklist.diff
@@ -1,7 +1,9 @@
---- sunrpc/bindrsvprt.c
-+++ sunrpc/bindrsvprt.c	2005/11/23 13:36:23
-@@ -30,28 +30,108 @@
-  * Copyright (c) 1987 by Sun Microsystems, Inc.
+Index: sunrpc/bindrsvprt.c
+===================================================================
+--- sunrpc/bindrsvprt.c.orig
++++ sunrpc/bindrsvprt.c
+@@ -29,28 +29,108 @@
+  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
 +#include <stdio.h>
@@ -114,7 +116,7 @@
  
    if (sin == (struct sockaddr_in *) 0)
      {
-@@ -70,6 +148,7 @@
+@@ -69,6 +149,7 @@ bindresvport (int sd, struct sockaddr_in
        port = (__getpid () % NPORTS) + STARTPORT;
      }
  
@@ -122,7 +124,7 @@
    /* Initialize to make gcc happy.  */
    int res = -1;
  
-@@ -78,12 +157,22 @@
+@@ -77,12 +158,22 @@ bindresvport (int sd, struct sockaddr_in
   again:
    for (i = 0; i < nports; ++i)
      {
diff --git a/glibc-2.3.90-fnmatch.diff b/glibc-2.3.90-fnmatch.diff
index 8ada08b..d34864b 100644
--- a/glibc-2.3.90-fnmatch.diff
+++ b/glibc-2.3.90-fnmatch.diff
@@ -10,9 +10,9 @@ Andreas.
 
 Index: posix/fnmatch.c
 ===================================================================
---- posix/fnmatch.c.orig	2007-05-18 10:40:34.000000000 +0200
-+++ posix/fnmatch.c	2007-05-18 13:21:47.199478000 +0200
-@@ -327,6 +327,7 @@
+--- posix/fnmatch.c.orig
++++ posix/fnmatch.c
+@@ -327,6 +327,7 @@ fnmatch (pattern, string, flags)
  # if HANDLE_MULTIBYTE
    if (__builtin_expect (MB_CUR_MAX, 1) != 1)
      {
@@ -20,7 +20,7 @@ Index: posix/fnmatch.c
        mbstate_t ps;
        size_t n;
        const char *p;
-@@ -378,10 +379,8 @@
+@@ -382,10 +383,8 @@ fnmatch (pattern, string, flags)
  	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
  	  n = mbsrtowcs (wstring, &p, n + 1, &ps);
  	  if (__builtin_expect (n == (size_t) -1, 0))
@@ -31,10 +31,10 @@ Index: posix/fnmatch.c
 +	    /* Something wrong.  Fall back to single byte matching.  */
 +	    goto try_singlebyte;
  	  if (p)
- 	    memset (&ps, '\0', sizeof (ps));
- 	}
-@@ -389,10 +388,8 @@
- 	{
+ 	    {
+ 	      memset (&ps, '\0', sizeof (ps));
+@@ -397,10 +396,8 @@ fnmatch (pattern, string, flags)
+ 	prepare_wstring:
  	  n = mbsrtowcs (NULL, &string, 0, &ps);
  	  if (__builtin_expect (n == (size_t) -1, 0))
 -	    /* Something wrong.
@@ -46,7 +46,7 @@ Index: posix/fnmatch.c
  	  wstring = (wchar_t *) alloca ((n + 1) * sizeof (wchar_t));
  	  assert (mbsinit (&ps));
  	  (void) mbsrtowcs (wstring, &string, n + 1, &ps);
-@@ -400,6 +397,9 @@
+@@ -408,6 +405,9 @@ fnmatch (pattern, string, flags)
  
        return internal_fnwmatch (wpattern, wstring, wstring + n,
  				flags & FNM_PERIOD, flags, NULL);
diff --git a/glibc-2.3.90-langpackdir.diff b/glibc-2.3.90-langpackdir.diff
index 6231d5a..013b862 100644
--- a/glibc-2.3.90-langpackdir.diff
+++ b/glibc-2.3.90-langpackdir.diff
@@ -1,10 +1,7 @@
 Index: intl/loadmsgcat.c
 ===================================================================
-RCS file: /cvs/glibc/libc/intl/loadmsgcat.c,v
-retrieving revision 1.57
-diff -u -p -r1.57 loadmsgcat.c
---- intl/loadmsgcat.c	28 Jul 2007 20:34:43 -0000	1.57
-+++ intl/loadmsgcat.c	31 Aug 2007 15:36:40 -0000
+--- intl/loadmsgcat.c.orig
++++ intl/loadmsgcat.c
 @@ -806,8 +806,52 @@ _nl_load_domain (domain_file, domainbind
    if (domain_file->filename == NULL)
      goto out;
diff --git a/glibc-2.3.90-ld.so-madvise.diff b/glibc-2.3.90-ld.so-madvise.diff
index 9f661e9..44ed621 100644
--- a/glibc-2.3.90-ld.so-madvise.diff
+++ b/glibc-2.3.90-ld.so-madvise.diff
@@ -2,7 +2,7 @@ Index: elf/dl-load.c
 ===================================================================
 --- elf/dl-load.c.orig
 +++ elf/dl-load.c
-@@ -1219,6 +1219,9 @@ cannot allocate TLS data structures for 
+@@ -1204,6 +1204,9 @@ cannot allocate TLS data structures for
  	    goto call_lose_errno;
  	  }
  
@@ -16,7 +16,7 @@ Index: elf/dl-support.c
 ===================================================================
 --- elf/dl-support.c.orig
 +++ elf/dl-support.c
-@@ -41,6 +41,7 @@ size_t _dl_platformlen;
+@@ -42,6 +42,7 @@ size_t _dl_platformlen;
  
  int _dl_debug_mask;
  int _dl_lazy;
@@ -24,7 +24,7 @@ Index: elf/dl-support.c
  ElfW(Addr) _dl_use_load_bias = -2;
  int _dl_dynamic_weak;
  
-@@ -240,6 +241,8 @@ _dl_non_dynamic_init (void)
+@@ -254,6 +255,8 @@ _dl_non_dynamic_init (void)
  
    _dl_lazy = *(getenv ("LD_BIND_NOW") ?: "") == '\0';
  
@@ -37,7 +37,7 @@ Index: elf/rtld.c
 ===================================================================
 --- elf/rtld.c.orig
 +++ elf/rtld.c
-@@ -152,6 +152,7 @@ struct rtld_global_ro _rtld_global_ro at
+@@ -153,6 +153,7 @@ struct rtld_global_ro _rtld_global_ro at
      ._dl_lazy = 1,
      ._dl_fpu_control = _FPU_DEFAULT,
      ._dl_pointer_guard = 1,
@@ -45,7 +45,7 @@ Index: elf/rtld.c
  
      /* Function pointers.  */
      ._dl_debug_printf = _dl_debug_printf,
-@@ -2619,6 +2620,14 @@ process_envvars (enum mode *modep)
+@@ -2607,6 +2608,14 @@ process_envvars (enum mode *modep)
  	  break;
  
  	case 9:
@@ -64,7 +64,7 @@ Index: sysdeps/generic/ldsodefs.h
 ===================================================================
 --- sysdeps/generic/ldsodefs.h.orig
 +++ sysdeps/generic/ldsodefs.h
-@@ -567,6 +567,9 @@ struct rtld_global_ro
+@@ -561,6 +561,9 @@ struct rtld_global_ro
    /* Do we do lazy relocations?  */
    EXTERN int _dl_lazy;
  
diff --git a/glibc-2.3.90-noversion.diff b/glibc-2.3.90-noversion.diff
index f4cedd4..ae8b861 100644
--- a/glibc-2.3.90-noversion.diff
+++ b/glibc-2.3.90-noversion.diff
@@ -1,6 +1,8 @@
---- elf/rtld.c
-+++ elf/rtld.c	2005/04/12 10:05:38
-@@ -1672,6 +1672,53 @@
+Index: elf/rtld.c
+===================================================================
+--- elf/rtld.c.orig
++++ elf/rtld.c
+@@ -1756,6 +1756,53 @@ ERROR: ld.so: object '%s' cannot be load
  	}
      }
  
diff --git a/glibc-2.3.locales.diff.bz2 b/glibc-2.3.locales.diff.bz2
index 710a1d4..0b1e480 100644
--- a/glibc-2.3.locales.diff.bz2
+++ b/glibc-2.3.locales.diff.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0b02688b3e712aac40c8ef77b2ef2e2996abe86350d1827458571ba2cbeeed08
-size 330830
+oid sha256:308f75f9daa64b97485a53420215656b001cc25a9337c34887d2c279efe32bc9
+size 328632
diff --git a/glibc-2.4-china.diff b/glibc-2.4-china.diff
index ef7f0c9..c0b68b6 100644
--- a/glibc-2.4-china.diff
+++ b/glibc-2.4-china.diff
@@ -1,5 +1,7 @@
---- localedata/locales/zh_TW
-+++ localedata/locales/zh_TW	2006/04/24 09:55:16
+Index: localedata/locales/zh_TW
+===================================================================
+--- localedata/locales/zh_TW.orig
++++ localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
@@ -9,7 +11,7 @@
  % charmap: BIG5-CP950
  %
  % Original Author:
-@@ -17,7 +17,7 @@
+@@ -17,7 +17,7 @@ escape_char /
  % Reference:	http://wwwold.dkuug.dk/JTC1/SC22/WG20/docs/n690.pdf
  
  LC_IDENTIFICATION
@@ -18,7 +20,7 @@
  source     ""
  address    ""
  contact    ""
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ email      "bug-glibc-locales@gnu.org"
  tel        ""
  fax        ""
  language   "Chinese"
diff --git a/glibc-2.4.90-no_NO.diff b/glibc-2.4.90-no_NO.diff
index ddac96a..b38803f 100644
--- a/glibc-2.4.90-no_NO.diff
+++ b/glibc-2.4.90-no_NO.diff
@@ -1,6 +1,8 @@
---- intl/locale.alias
-+++ intl/locale.alias	2006/06/03 15:26:29
-@@ -58,8 +58,6 @@
+Index: intl/locale.alias
+===================================================================
+--- intl/locale.alias.orig
++++ 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
@@ -9,8 +11,10 @@
  norwegian       nb_NO.ISO-8859-1
  nynorsk		nn_NO.ISO-8859-1
  polish          pl_PL.ISO-8859-2
---- localedata/locales/no_NO
-+++ localedata/locales/no_NO	2006/06/03 15:26:29
+Index: localedata/locales/no_NO
+===================================================================
+--- /dev/null
++++ localedata/locales/no_NO
 @@ -0,0 +1,69 @@
 +escape_char	/
 +comment_char    %
@@ -81,9 +85,11 @@
 +LC_ADDRESS
 +copy "nb_NO"
 +END LC_ADDRESS
---- localedata/SUPPORTED
-+++ localedata/SUPPORTED	2006/06/03 15:27:01
-@@ -274,6 +274,8 @@
+Index: localedata/SUPPORTED
+===================================================================
+--- localedata/SUPPORTED.orig
++++ localedata/SUPPORTED
+@@ -303,6 +303,8 @@ nl_NL/ISO-8859-1 \
  nl_NL@euro/ISO-8859-15 \
  nn_NO.UTF-8/UTF-8 \
  nn_NO/ISO-8859-1 \
diff --git a/glibc-2.4.90-nscd.diff b/glibc-2.4.90-nscd.diff
index 115e684..3c5fa26 100644
--- a/glibc-2.4.90-nscd.diff
+++ b/glibc-2.4.90-nscd.diff
@@ -2,7 +2,7 @@ Index: nscd/cache.c
 ===================================================================
 --- nscd/cache.c.orig
 +++ nscd/cache.c
-@@ -277,28 +277,31 @@ prune_cache (struct database_dyn *table,
+@@ -267,28 +267,31 @@ prune_cache (struct database_dyn *table,
    if (table->inotify_descr < 0 && table->check_file && now != LONG_MAX)
      {
        struct stat64 st;
@@ -49,7 +49,7 @@ Index: nscd/connections.c
 ===================================================================
 --- nscd/connections.c.orig
 +++ nscd/connections.c
-@@ -118,6 +118,7 @@ struct database_dyn dbs[lastdb] =
+@@ -119,6 +119,7 @@ struct database_dyn dbs[lastdb] =
      .suggested_module = DEFAULT_SUGGESTED_MODULE,
     .reset_res = 0,
      .filename = "/etc/passwd",
@@ -57,7 +57,7 @@ Index: nscd/connections.c
      .db_filename = _PATH_NSCD_PASSWD_DB,
      .disabled_iov = &pwd_iov_disabled,
      .postimeout = 3600,
-@@ -138,6 +139,7 @@ struct database_dyn dbs[lastdb] =
+@@ -140,6 +141,7 @@ struct database_dyn dbs[lastdb] =
      .suggested_module = DEFAULT_SUGGESTED_MODULE,
      .reset_res = 0,
      .filename = "/etc/group",
@@ -65,7 +65,7 @@ Index: nscd/connections.c
      .db_filename = _PATH_NSCD_GROUP_DB,
      .disabled_iov = &grp_iov_disabled,
      .postimeout = 3600,
-@@ -158,6 +160,7 @@ struct database_dyn dbs[lastdb] =
+@@ -161,6 +163,7 @@ struct database_dyn dbs[lastdb] =
      .suggested_module = DEFAULT_SUGGESTED_MODULE,
      .reset_res = 1,
      .filename = "/etc/hosts",
@@ -73,7 +73,7 @@ Index: nscd/connections.c
      .db_filename = _PATH_NSCD_HOSTS_DB,
      .disabled_iov = &hst_iov_disabled,
      .postimeout = 3600,
-@@ -852,15 +855,9 @@ cannot set socket to close on exec: %s;
+@@ -855,15 +858,9 @@ cannot set socket to close on exec: %s;
  		/* We need the modification date of the file.  */
  		struct stat64 st;
  
diff --git a/glibc-2.4.90-revert-only-euro.diff b/glibc-2.4.90-revert-only-euro.diff
index 2cddb1a..13dd342 100644
--- a/glibc-2.4.90-revert-only-euro.diff
+++ b/glibc-2.4.90-revert-only-euro.diff
@@ -1,5 +1,7 @@
---- locale/iso-4217.def
-+++ locale/iso-4217.def	2006/06/03 15:19:50
+Index: locale/iso-4217.def
+===================================================================
+--- locale/iso-4217.def.orig
++++ locale/iso-4217.def
 @@ -8,6 +8,7 @@
   *
   * !!! The list has to be sorted !!!
@@ -8,7 +10,7 @@
  DEFINE_INT_CURR("AED")		/* United Arab Emirates Dirham  */
  DEFINE_INT_CURR("AFN")		/* Afghanistan Afgani  */
  DEFINE_INT_CURR("ALL")		/* Albanian Lek  */
-@@ -15,12 +16,14 @@
+@@ -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  */
@@ -23,7 +25,7 @@
  DEFINE_INT_CURR("BGN")		/* Bulgarian Lev  */
  DEFINE_INT_CURR("BHD")		/* Bahraini Dinar  */
  DEFINE_INT_CURR("BIF")		/* Burundi Franc  */
-@@ -45,6 +48,7 @@
+@@ -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  */
@@ -31,7 +33,7 @@
  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 @@
+@@ -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  */
@@ -52,7 +54,7 @@
  DEFINE_INT_CURR("GTQ")		/* Guatemala Quetzal  */
  DEFINE_INT_CURR("GYD")		/* Guyana Dollar  */
  DEFINE_INT_CURR("HKD")		/* Hong Kong Dollar  */
-@@ -70,12 +78,14 @@
+@@ -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  */
@@ -67,7 +69,7 @@
  DEFINE_INT_CURR("JEP")		/* Jersey Pound  */
  DEFINE_INT_CURR("JMD")		/* Jamaican Dollar  */
  DEFINE_INT_CURR("JOD")		/* Jordanian Dinar  */
-@@ -95,6 +105,7 @@
+@@ -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  */
@@ -75,7 +77,7 @@
  DEFINE_INT_CURR("LVL")		/* Latvia Lat  */
  DEFINE_INT_CURR("LYD")		/* Libyan Arab Jamahiriya Dinar  */
  DEFINE_INT_CURR("MAD")		/* Moroccan Dirham  */
-@@ -115,6 +126,7 @@
+@@ -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  */
@@ -83,7 +85,7 @@
  DEFINE_INT_CURR("NOK")		/* Norwegian Krone  */
  DEFINE_INT_CURR("NPR")		/* Nepalese Rupee  */
  DEFINE_INT_CURR("NZD")		/* New Zealand Dollar  */
-@@ -125,6 +137,7 @@
+@@ -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  */
diff --git a/glibc-2.5-ppc-llrintl.diff b/glibc-2.5-ppc-llrintl.diff
index 08fc47f..3a65665 100644
--- a/glibc-2.5-ppc-llrintl.diff
+++ b/glibc-2.5-ppc-llrintl.diff
@@ -1,6 +1,7 @@
-diff -urN dummy-cpu/powerpc-cpu-v0.05/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S libc25/powerpc-cpu/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S
---- powerpc-cpu-v0.05/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S	2006-04-06 10:50:35.000000000 -0500
-+++ powerpc-cpu/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S	2007-03-14 14:55:19.113013712 -0500
+Index: powerpc-cpu/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S
+===================================================================
+--- powerpc-cpu/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S.orig
++++ powerpc-cpu/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_llrint.S
 @@ -18,6 +18,7 @@
     02110-1301 USA.  */
  
@@ -9,7 +10,7 @@ diff -urN dummy-cpu/powerpc-cpu-v0.05/sysdeps/powerpc/powerpc32/powerpc64/fpu/s_
  
  /* long long int[r3, r4] __llrint (double x[fp1])  */
  ENTRY (__llrint)	
-@@ -41,3 +42,6 @@
+@@ -41,3 +42,6 @@ weak_alias (__llrint, llrint)
  strong_alias (__llrint, __llrintl)
  weak_alias (__llrint, llrintl)
  #endif
diff --git a/glibc-2.6-configure.diff b/glibc-2.6-configure.diff
index 906b29e..a0b405b 100644
--- a/glibc-2.6-configure.diff
+++ b/glibc-2.6-configure.diff
@@ -1,11 +1,8 @@
 Index: configure.in
 ===================================================================
-RCS file: /cvs/glibc/libc/configure.in,v
-retrieving revision 1.469
-diff -u -a -p -u -p -a -r1.469 configure.in
---- configure.in	20 Mar 2007 12:11:23 -0000	1.469
-+++ configure.in	13 Jul 2007 13:40:20 -0000
-@@ -1278,7 +1278,7 @@ EOF
+--- configure.in.orig
++++ configure.in
+@@ -1360,7 +1360,7 @@ EOF
  		      fi
  		    fi
  		  fi
@@ -14,7 +11,7 @@ diff -u -a -p -u -p -a -r1.469 configure.in
  		 ])
      if test $libc_cv_visibility_attribute != yes; then
        AC_MSG_ERROR(compiler support for visibility attribute is required)
-@@ -1294,7 +1294,7 @@ EOF
+@@ -1376,7 +1376,7 @@ EOF
  		  int bar (int x) { return x; }
  EOF
  		  libc_cv_broken_visibility_attribute=yes
@@ -25,12 +22,9 @@ diff -u -a -p -u -p -a -r1.469 configure.in
  changequote([,])dnl
 Index: configure
 ===================================================================
-RCS file: /cvs/glibc/libc/configure,v
-retrieving revision 1.459
-diff -u -a -p -u -p -a -r1.459 configure
---- configure	20 Mar 2007 12:11:23 -0000	1.459
-+++ configure	13 Jul 2007 13:41:41 -0000
-@@ -5371,7 +5371,7 @@ EOF
+--- configure.orig
++++ configure
+@@ -6221,7 +6221,7 @@ EOF
  		      fi
  		    fi
  		  fi
@@ -38,8 +32,8 @@ diff -u -a -p -u -p -a -r1.459 configure
 +		  rm -f conftest*
  
  fi
- echo "$as_me:$LINENO: result: $libc_cv_visibility_attribute" >&5
-@@ -5395,7 +5395,7 @@ else
+ { $as_echo "$as_me:$LINENO: result: $libc_cv_visibility_attribute" >&5
+@@ -6245,7 +6245,7 @@ else
  		  int bar (int x) { return x; }
  EOF
  		  libc_cv_broken_visibility_attribute=yes
diff --git a/glibc-2.8-clone.diff b/glibc-2.8-clone.diff
index 7922b44..1bccb5d 100644
--- a/glibc-2.8-clone.diff
+++ b/glibc-2.8-clone.diff
@@ -2,12 +2,9 @@ http://sources.redhat.com/bugzilla/show_bug.cgi?id=6693
 
 Index: sysdeps/unix/sysv/linux/x86_64/clone.S
 ===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/x86_64/clone.S,v
-retrieving revision 1.7
-diff -u -r1.7 clone.S
---- sysdeps/unix/sysv/linux/x86_64/clone.S	3 Dec 2006 23:12:36 -0000	1.7
-+++ sysdeps/unix/sysv/linux/x86_64/clone.S	25 Jun 2008 11:26:15 -0000
-@@ -89,9 +89,6 @@
+--- sysdeps/unix/sysv/linux/x86_64/clone.S.orig
++++ sysdeps/unix/sysv/linux/x86_64/clone.S
+@@ -89,9 +89,6 @@ L(pseudo_end):
  	ret
  
  L(thread_start):
@@ -17,7 +14,7 @@ diff -u -r1.7 clone.S
  	/* Clear the frame pointer.  The ABI suggests this be done, to mark
  	   the outermost frame obviously.  */
  	xorl	%ebp, %ebp
-@@ -116,7 +113,6 @@
+@@ -116,7 +113,6 @@ L(thread_start):
  	/* Call exit with return value from function call. */
  	movq	%rax, %rdi
  	call	HIDDEN_JUMPTARGET (_exit)
@@ -27,12 +24,9 @@ diff -u -r1.7 clone.S
  PSEUDO_END (BP_SYM (__clone))
 Index: sysdeps/unix/sysv/linux/i386/clone.S
 ===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-diff -u -r1.27 clone.S
---- sysdeps/unix/sysv/linux/i386/clone.S	3 Dec 2006 23:12:36 -0000	1.27
-+++ sysdeps/unix/sysv/linux/i386/clone.S	25 Jun 2008 11:26:16 -0000
-@@ -120,9 +120,6 @@
+--- sysdeps/unix/sysv/linux/i386/clone.S.orig
++++ sysdeps/unix/sysv/linux/i386/clone.S
+@@ -120,9 +120,6 @@ L(pseudo_end):
  	ret
  
  L(thread_start):
@@ -42,7 +36,7 @@ diff -u -r1.27 clone.S
  	/* Note: %esi is zero.  */
  	movl	%esi,%ebp	/* terminate the stack frame */
  #ifdef RESET_PID
-@@ -155,7 +152,6 @@
+@@ -155,7 +152,6 @@ L(nomoregetpid):
  	jmp	L(haspid)
  	.previous
  #endif
diff --git a/glibc-2.8-getconf.diff b/glibc-2.8-getconf.diff
index a75a57e..9c0879e 100644
--- a/glibc-2.8-getconf.diff
+++ b/glibc-2.8-getconf.diff
@@ -1,8 +1,10 @@
 This is required for too noisy rpmlint.
 
---- posix/Makefile~	2007-11-21 05:40:26.234633000 +0100
-+++ posix/Makefile	2007-11-21 05:41:02.043775000 +0100
-@@ -296,8 +296,7 @@
+Index: posix/Makefile
+===================================================================
+--- posix/Makefile.orig
++++ posix/Makefile
+@@ -298,8 +298,7 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	$(addprefix $(..)./scripts/mkinstalldirs ,\
  		    $(filter-out $(wildcard $@),$@))
  	while read spec; do \
diff --git a/glibc-check-native-missing-include.diff b/glibc-check-native-missing-include.diff
index c1783d3..e881c4b 100644
--- a/glibc-check-native-missing-include.diff
+++ b/glibc-check-native-missing-include.diff
@@ -1,4 +1,6 @@
---- sysdeps/unix/sysv/linux/check_native.c
+Index: sysdeps/unix/sysv/linux/check_native.c
+===================================================================
+--- sysdeps/unix/sysv/linux/check_native.c.orig
 +++ sysdeps/unix/sysv/linux/check_native.c
 @@ -23,6 +23,7 @@
  #include <stddef.h>
diff --git a/glibc-compiled-binaries.diff b/glibc-compiled-binaries.diff
index a66c7ca..17072c8 100644
--- a/glibc-compiled-binaries.diff
+++ b/glibc-compiled-binaries.diff
@@ -7,9 +7,11 @@
  timezone/Makefile |    2 +-
  6 files changed, 20 insertions(+), 4 deletions(-)
 
---- config.make.in
+Index: config.make.in
+===================================================================
+--- config.make.in.orig
 +++ config.make.in
-@@ -90,6 +90,7 @@ add-ons = @add_ons@
+@@ -96,6 +96,7 @@ add-ons = @add_ons@
  add-on-subdirs = @add_on_subdirs@
  sysdeps-add-ons = @sysdeps_add_ons@
  cross-compiling = @cross_compiling@
@@ -17,9 +19,11 @@
  force-install = @force_install@
  
  # Build tools.
---- configure
+Index: configure
+===================================================================
+--- configure.orig
 +++ configure
-@@ -590,6 +590,7 @@ ac_clean_files=
+@@ -589,6 +589,7 @@ ac_clean_files=
  ac_config_libobj_dir=.
  LIBOBJS=
  cross_compiling=no
@@ -27,7 +31,7 @@
  subdirs=
  MFLAGS=
  MAKEFLAGS=
-@@ -745,6 +746,7 @@ ac_ct_CC
+@@ -741,6 +742,7 @@ CXXFLAGS
  CXX
  CPP
  cross_compiling
@@ -35,7 +39,7 @@
  BUILD_CC
  OBJEXT
  ac_ct_CC
-@@ -1280,6 +1282,13 @@ do
+@@ -1291,6 +1293,13 @@ do
     { (exit 1); exit 1; }; }
  done
  
@@ -49,7 +53,7 @@
  # There might be people who depend on the old broken behavior: `$host'
  # used to hold the argument of --host etc.
  # FIXME: To remove some day.
-@@ -1195,6 +1204,7 @@ if test "x$host_alias" != x; then
+@@ -1306,6 +1315,7 @@ if test "x$host_alias" != x; then
      If a cross compiler is detected then cross compile mode will be used." >&2
    elif test "x$build_alias" != "x$host_alias"; then
      cross_compiling=yes
@@ -57,9 +61,9 @@
    fi
  fi
  
-@@ -1381,6 +1391,9 @@ Optional Features:
-                           VERSION
-   --enable-all-warnings   enable all useful warnings gcc can issue
+@@ -1498,6 +1508,9 @@ Optional Features:
+                           enable experimental malloc features
+   --enable-nss-crypt      enable libcrypt to use nss
  
 +  --enable-runbinaries    the compiled binaries should run on the buildhost because
 +                          it happens to have a compatible cpu
@@ -67,9 +71,11 @@
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
---- configure.in
+Index: configure.in
+===================================================================
+--- configure.in.orig
 +++ configure.in
-@@ -835,6 +835,7 @@ if test $host != $build; then
+@@ -13,6 +13,7 @@ if test $host != $build; then
    AC_CHECK_PROGS(BUILD_CC, gcc cc)
  fi
  AC_SUBST(cross_compiling)
@@ -77,18 +83,22 @@
  AC_PROG_CPP
  # We need the C++ compiler only for testing.
  AC_PROG_CXX
---- posix/Makefile
+Index: posix/Makefile
+===================================================================
+--- posix/Makefile.orig
 +++ posix/Makefile
-@@ -301,7 +301,7 @@ $(inst_libexecdir)/getconf: $(inst_bindi
+@@ -302,7 +302,7 @@ $(inst_libexecdir)/getconf: $(inst_bindi
  	done < $(objpfx)getconf.speclist
  
  $(objpfx)getconf.speclist: $(objpfx)getconf
 -ifeq (no,$(cross-compiling))
 +ifeq (yes,$(compiled-binaries-can-run-on-buildhost))
  	LC_ALL=C GETCONF_DIR=/dev/null \
- 	$(run-program-prefix) $< _POSIX_V6_WIDTH_RESTRICTED_ENVS > $@.new
- else
---- sunrpc/Makefile
+ 	$(run-program-prefix) $< _POSIX_V7_WIDTH_RESTRICTED_ENVS > $@.new
+ 	LC_ALL=C GETCONF_DIR=/dev/null \
+Index: sunrpc/Makefile
+===================================================================
+--- sunrpc/Makefile.orig
 +++ sunrpc/Makefile
 @@ -98,7 +98,7 @@ otherlibs += $(nssobjdir)/libnss_files.a
  	     $(resolvobjdir)/libresolv.a
@@ -99,7 +109,9 @@
  # We can only build this library if we can run the rpcgen we build.
  headers += $(rpcsvc:%.x=rpcsvc/%.h)
  extra-libs := librpcsvc
---- timezone/Makefile
+Index: timezone/Makefile
+===================================================================
+--- timezone/Makefile.orig
 +++ timezone/Makefile
 @@ -69,7 +69,7 @@ installed-posixrules-file := $(firstword
  					 $(addprefix $(inst_zonedir)/, \
diff --git a/glibc-cpusetsize.diff b/glibc-cpusetsize.diff
index 0829942..4e67f90 100644
--- a/glibc-cpusetsize.diff
+++ b/glibc-cpusetsize.diff
@@ -1,7 +1,7 @@
-Index: glibc-2.4/bits/sched.h
+Index: bits/sched.h
 ===================================================================
---- bits/sched.h	2007-08-22 08:02:57.124247019 -0500
-+++ bits/sched.h	2007-08-22 08:03:36.149061686 -0500
+--- bits/sched.h.orig
++++ bits/sched.h
 @@ -38,7 +38,7 @@ struct sched_param
  #if defined _SCHED_H && !defined __cpu_set_t_defined
  # define __cpu_set_t_defined
@@ -11,11 +11,11 @@ Index: glibc-2.4/bits/sched.h
  # define __NCPUBITS	(8 * sizeof (__cpu_mask))
  
  /* Type for array elements in 'cpu_set'.  */
-Index: glibc-2.4/sysdeps/unix/sysv/linux/bits/sched.h
+Index: sysdeps/unix/sysv/linux/bits/sched.h
 ===================================================================
---- sysdeps/unix/sysv/linux/bits/sched.h	2006-02-08 13:09:06.000000000 -0600
-+++ sysdeps/unix/sysv/linux/bits/sched.h	2007-08-22 08:04:00.988126075 -0500
-@@ -97,7 +97,7 @@ struct __sched_param
+--- sysdeps/unix/sysv/linux/bits/sched.h.orig
++++ sysdeps/unix/sysv/linux/bits/sched.h
+@@ -106,7 +106,7 @@ struct __sched_param
  #if defined _SCHED_H && !defined __cpu_set_t_defined
  # define __cpu_set_t_defined
  /* Size definition for CPU sets.  */
diff --git a/glibc-nis-splitgroups.diff b/glibc-nis-splitgroups.diff
index 3254728..2a2f286 100644
--- a/glibc-nis-splitgroups.diff
+++ b/glibc-nis-splitgroups.diff
@@ -8,11 +8,11 @@
 	* nss_compat/compat-initgroups.c: Do not use initgroups_dyn
 	  in case NSS_FLAG_SPLIT_GROUPS is set.
 
-diff --git a/nis/Makefile b/nis/Makefile
-index 8083ee8..9814fce 100644
---- nis/Makefile
+Index: nis/Makefile
+===================================================================
+--- nis/Makefile.orig
 +++ nis/Makefile
-@@ -56,7 +56,8 @@ libnsl-routines = yp_xdr ypclnt ypupdate_xdr \
+@@ -56,7 +56,8 @@ libnsl-routines = yp_xdr ypclnt ypupdate
  		  nis_findserv nis_callback nis_clone_dir nis_clone_obj\
  		  nis_clone_res nss-default
  
@@ -22,9 +22,9 @@ index 8083ee8..9814fce 100644
  libnss_compat-inhibit-o	= $(filter-out .os,$(object-suffixes))
  
  libnss_nis-routines	:= $(addprefix nis-,$(databases)) nis-initgroups \
-diff --git a/nis/libnsl.h b/nis/libnsl.h
-index c6ceb32..77c34ef 100644
---- nis/libnsl.h
+Index: nis/libnsl.h
+===================================================================
+--- nis/libnsl.h.orig
 +++ nis/libnsl.h
 @@ -21,6 +21,7 @@
  #define NSS_FLAG_NETID_AUTHORITATIVE	1
@@ -34,9 +34,9 @@ index c6ceb32..77c34ef 100644
  
  
  /* Get current set of default flags.  */
-diff --git a/nis/nss b/nis/nss
-index aab40ab..4715ab5 100644
---- nis/nss
+Index: nis/nss
+===================================================================
+--- nis/nss.orig
 +++ nis/nss
 @@ -1,7 +1,7 @@
  # /etc/default/nss
@@ -59,11 +59,12 @@ index aab40ab..4715ab5 100644
 +#   with same gid, a practice used to overcome entry length limitations.
 +#   The downside is a certain performance degradation.
 +#SPLIT_GROUPS=TRUE
-diff --git a/nis/nss-default.c b/nis/nss-default.c
-index 046ddfe..d6141b9 100644
---- nis/nss-default.c
+Index: nis/nss-default.c
+===================================================================
+--- nis/nss-default.c.orig
 +++ nis/nss-default.c
-@@ -48,6 +48,7 @@ static const struct
+@@ -47,7 +47,8 @@ static const struct
+ #define STRNLEN(s) s, sizeof (s) - 1
      { STRNLEN ("NETID_AUTHORITATIVE"), NSS_FLAG_NETID_AUTHORITATIVE },
      { STRNLEN ("SERVICES_AUTHORITATIVE"), NSS_FLAG_SERVICES_AUTHORITATIVE },
 -    { STRNLEN ("SETENT_BATCH_READ"), NSS_FLAG_SETENT_BATCH_READ }
@@ -72,9 +73,9 @@ index 046ddfe..d6141b9 100644
    };
  #define nvars (sizeof (vars) / sizeof (vars[0]))
  
-diff --git a/nis/nss_compat/compat-initgroups.c b/nis/nss_compat/compat-initgroups.c
-index 76ca95d..14b0aac 100644
---- nis/nss_compat/compat-initgroups.c
+Index: nis/nss_compat/compat-initgroups.c
+===================================================================
+--- nis/nss_compat/compat-initgroups.c.orig
 +++ nis/nss_compat/compat-initgroups.c
 @@ -32,6 +32,9 @@
  #include <bits/libc-lock.h>
diff --git a/glibc-nptl-2.4-nofixsyscallnr.diff b/glibc-nptl-2.4-nofixsyscallnr.diff
index 3b20885..7a44a4a 100644
--- a/glibc-nptl-2.4-nofixsyscallnr.diff
+++ b/glibc-nptl-2.4-nofixsyscallnr.diff
@@ -1,6 +1,8 @@
---- nptl/pthreadP.h
-+++ nptl/pthreadP.h	2006/04/07 09:38:46
-@@ -510,15 +510,4 @@
+Index: nptl/pthreadP.h
+===================================================================
+--- nptl/pthreadP.h.orig
++++ nptl/pthreadP.h
+@@ -575,15 +575,4 @@ extern void __wait_lookup_done (void) at
  # define PTHREAD_STATIC_FN_REQUIRE(name) __asm (".globl " #name);
  #endif
  
diff --git a/glibc-nscd-assert.diff b/glibc-nscd-assert.diff
index 8b781bc..2c35900 100644
--- a/glibc-nscd-assert.diff
+++ b/glibc-nscd-assert.diff
@@ -7,10 +7,11 @@
 	* nscd/initgrcache.c: Likewise.
 	* nscd/pwdcache.c: Likewise.
 
-diff -ur glibc-2.4.orig/nscd/aicache.c glibc-2.4/nscd/aicache.c
---- nscd/aicache.c	2009-06-18 14:20:53.000000000 +0200
-+++ nscd/aicache.c	2009-06-18 14:21:20.000000000 +0200
-@@ -450,6 +450,6 @@
+Index: nscd/aicache.c
+===================================================================
+--- nscd/aicache.c.orig
++++ nscd/aicache.c
+@@ -453,13 +453,13 @@ addhstaiX (struct database_dyn *db, int
  	    {
  	      assert (db->wr_fd != -1);
  	      assert ((char *) &dataset->resp > (char *) db->data);
@@ -18,27 +19,28 @@ diff -ur glibc-2.4.orig/nscd/aicache.c glibc-2.4/nscd/aicache.c
 +	      assert ((char *) dataset - (char *) db->head + total
  		      <= (sizeof (struct database_pers_head)
  			  + db->head->module * sizeof (ref_t)
-@@ -458,6 +458,6 @@
+ 			  + db->head->data_size));
  	      ssize_t written;
  	      written = sendfileall (fd, db->wr_fd, (char *) &dataset->resp
 -				     - (char *) db->head, total);
 +				     - (char *) db->head, dataset->head.recsize);
  # ifndef __ASSUME_SENDFILE
- 		      if (written == -1 && errno == ENOSYS)
- 			goto use_write;
-@@ -469,7 +469,7 @@
- 		  use_write:
+ 	      if (written == -1 && errno == ENOSYS)
+ 		goto use_write;
+@@ -470,7 +470,7 @@ addhstaiX (struct database_dyn *db, int
+ 	  use_write:
  # endif
  #endif
 -	    writeall (fd, &dataset->resp, total);
 +	    writeall (fd, &dataset->resp, dataset->head.recsize);
  	}
  
- 	      goto out;
-diff -ur glibc-2.4.orig/nscd/grpcache.c glibc-2.4/nscd/grpcache.c
---- nscd/grpcache.c	2009-06-18 14:20:53.000000000 +0200
-+++ nscd/grpcache.c	2009-06-18 14:21:20.000000000 +0200
-@@ -317,14 +317,14 @@
+       goto out;
+Index: nscd/grpcache.c
+===================================================================
+--- nscd/grpcache.c.orig
++++ nscd/grpcache.c
+@@ -299,14 +299,14 @@ cache_addgr (struct database_dyn *db, in
  	    {
  	      assert (db->wr_fd != -1);
  	      assert ((char *) &dataset->resp > (char *) db->data);
@@ -55,7 +57,7 @@ diff -ur glibc-2.4.orig/nscd/grpcache.c glibc-2.4/nscd/grpcache.c
  # ifndef __ASSUME_SENDFILE
  	      if (written == -1 && errno == ENOSYS)
  		goto use_write;
-@@ -335,7 +335,7 @@
+@@ -317,7 +317,7 @@ cache_addgr (struct database_dyn *db, in
  	  use_write:
  # endif
  #endif
@@ -64,10 +66,11 @@ diff -ur glibc-2.4.orig/nscd/grpcache.c glibc-2.4/nscd/grpcache.c
  	}
  
        /* Add the record to the database.  But only if it has not been
-diff -ur glibc-2.4.orig/nscd/hstcache.c glibc-2.4/nscd/hstcache.c
---- nscd/hstcache.c	2009-06-18 14:20:53.000000000 +0200
-+++ nscd/hstcache.c	2009-06-18 14:22:22.000000000 +0200
-@@ -365,7 +365,7 @@
+Index: nscd/hstcache.c
+===================================================================
+--- nscd/hstcache.c.orig
++++ nscd/hstcache.c
+@@ -341,7 +341,7 @@ cache_addhst (struct database_dyn *db, i
  	    {
  	      assert (db->wr_fd != -1);
  	      assert ((char *) &dataset->resp > (char *) db->data);
@@ -76,10 +79,11 @@ diff -ur glibc-2.4.orig/nscd/hstcache.c glibc-2.4/nscd/hstcache.c
  		      + total
  		      <= (sizeof (struct database_pers_head)
  			  + db->head->module * sizeof (ref_t)
-diff -ur glibc-2.4.orig/nscd/initgrcache.c glibc-2.4/nscd/initgrcache.c
---- nscd/initgrcache.c	2009-06-18 14:20:53.000000000 +0200
-+++ nscd/initgrcache.c	2009-06-18 14:21:20.000000000 +0200
-@@ -367,14 +367,14 @@
+Index: nscd/initgrcache.c
+===================================================================
+--- nscd/initgrcache.c.orig
++++ nscd/initgrcache.c
+@@ -354,14 +354,14 @@ addinitgroupsX (struct database_dyn *db,
  	    {
  	      assert (db->wr_fd != -1);
  	      assert ((char *) &dataset->resp > (char *) db->data);
@@ -96,7 +100,7 @@ diff -ur glibc-2.4.orig/nscd/initgrcache.c glibc-2.4/nscd/initgrcache.c
  # ifndef __ASSUME_SENDFILE
  	      if (written == -1 && errno == ENOSYS)
  		goto use_write;
-@@ -385,7 +385,7 @@
+@@ -372,7 +372,7 @@ addinitgroupsX (struct database_dyn *db,
  	  use_write:
  # endif
  #endif
@@ -105,10 +109,11 @@ diff -ur glibc-2.4.orig/nscd/initgrcache.c glibc-2.4/nscd/initgrcache.c
  	}
  
  
-diff -ur glibc-2.4.orig/nscd/pwdcache.c glibc-2.4/nscd/pwdcache.c
---- nscd/pwdcache.c	2009-06-18 14:20:53.000000000 +0200
-+++ nscd/pwdcache.c	2009-06-18 14:21:20.000000000 +0200
-@@ -311,14 +311,14 @@
+Index: nscd/pwdcache.c
+===================================================================
+--- nscd/pwdcache.c.orig
++++ nscd/pwdcache.c
+@@ -294,14 +294,14 @@ cache_addpw (struct database_dyn *db, in
  	    {
  	      assert (db->wr_fd != -1);
  	      assert ((char *) &dataset->resp > (char *) db->data);
@@ -125,7 +130,7 @@ diff -ur glibc-2.4.orig/nscd/pwdcache.c glibc-2.4/nscd/pwdcache.c
  # ifndef __ASSUME_SENDFILE
  	      if (written == -1 && errno == ENOSYS)
  		goto use_write;
-@@ -329,7 +329,7 @@
+@@ -312,7 +312,7 @@ cache_addpw (struct database_dyn *db, in
  	  use_write:
  # endif
  #endif
diff --git a/glibc-nscd-prune-ret.diff b/glibc-nscd-prune-ret.diff
index 697a449..6e183ba 100644
--- a/glibc-nscd-prune-ret.diff
+++ b/glibc-nscd-prune-ret.diff
@@ -1,7 +1,8 @@
-diff -urp nscd.mm/cache.c nscd/cache.c
---- nscd.mm/cache.c	2008-10-13 13:09:35.120009000 +0000
-+++ nscd/cache.c	2008-10-13 15:11:17.629844982 +0000
-@@ -300,7 +300,7 @@ prune_cache (struct database_dyn *table,
+Index: nscd/cache.c
+===================================================================
+--- nscd/cache.c.orig
++++ nscd/cache.c
+@@ -290,7 +290,7 @@ prune_cache (struct database_dyn *table,
  
    /* now == 0 means just check for changed files */
    if (now == (time_t)0)
diff --git a/glibc-nss-deepbind.diff b/glibc-nss-deepbind.diff
index 4cdcce0..671f52f 100644
--- a/glibc-nss-deepbind.diff
+++ b/glibc-nss-deepbind.diff
@@ -13,7 +13,7 @@ Index: nss/nsswitch.c
 ===================================================================
 --- nss/nsswitch.c.orig
 +++ nss/nsswitch.c
-@@ -358,7 +358,9 @@ __nss_lookup_function (service_user *ni,
+@@ -361,7 +361,9 @@ __nss_lookup_function (service_user *ni,
  				  ".so"),
  			__nss_shlib_revision);
  
diff --git a/glibc-selinux.diff b/glibc-selinux.diff
index c7e22b7..460cd4f 100644
--- a/glibc-selinux.diff
+++ b/glibc-selinux.diff
@@ -1,6 +1,8 @@
---- Makerules
+Index: Makerules
+===================================================================
+--- Makerules.orig
 +++ Makerules
-@@ -349,7 +349,7 @@
+@@ -349,7 +349,7 @@ endif # $(versioning) = yes
  endif # sysd-sorted-done
  
  # Generate .dT files as we compile.
@@ -9,9 +11,11 @@
  compile-command.S = $(compile.S) $(OUTPUT_OPTION) $(compile-mkdep-flags)
  compile-command.s = $(COMPILE.s) $< $(OUTPUT_OPTION) $(compile-mkdep-flags)
  compile-command.c = $(compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags)
---- nscd/Makefile
+Index: nscd/Makefile
+===================================================================
+--- nscd/Makefile.orig
 +++ nscd/Makefile
-@@ -124,6 +124,8 @@
+@@ -123,6 +123,8 @@ CFLAGS-getsrvbynm_r.c += $(nscd-cflags)
  CFLAGS-getsrvbypt_r.c += $(nscd-cflags)
  CFLAGS-res_hconf.c += $(nscd-cflags)
  
diff --git a/glibc-suse-note.diff b/glibc-suse-note.diff
index b039ddd..5e85769 100644
--- a/glibc-suse-note.diff
+++ b/glibc-suse-note.diff
@@ -6,7 +6,7 @@ Index: Makerules
 ===================================================================
 --- Makerules.orig
 +++ Makerules
-@@ -489,6 +489,7 @@ $(common-objpfx)shlib.lds: $(common-objp
+@@ -475,6 +475,7 @@ $(common-objpfx)shlib.lds: $(common-objp
  	      -e '/^=========/,/^=========/!d;/^=========/d' \
  	      $(if $(filter yes,$(have-hash-style)), \
  		   -e 's/^.*\.gnu\.hash[ 	]*:.*$$/  .note.ABI-tag : { *(.note.ABI-tag) } &/' \
@@ -14,7 +14,7 @@ Index: Makerules
  		   -e '/^[ 	]*\.hash[ 	]*:.*$$/{h;d;}' \
  		   -e '/DATA_SEGMENT_ALIGN/{H;g}' \
  		, \
-@@ -514,7 +515,7 @@ common-generated += shlib.lds
+@@ -500,7 +501,7 @@ common-generated += shlib.lds
  
  define build-shlib
  $(build-shlib-helper) -o $@ -T $(common-objpfx)shlib.lds \
@@ -23,7 +23,7 @@ Index: Makerules
  endef
  else
  ifneq (,$(findstring aix,$(config-os)))
-@@ -556,7 +557,7 @@ ifeq (yes,$(elf))
+@@ -542,7 +543,7 @@ ifeq (yes,$(elf))
  # not for shared objects
  define build-module
  $(build-module-helper) -o $@ -T $(common-objpfx)shlib.lds \
diff --git a/glibc-utmp-timeout-raise.diff b/glibc-utmp-timeout-raise.diff
index 26972f9..24f90fb 100644
--- a/glibc-utmp-timeout-raise.diff
+++ b/glibc-utmp-timeout-raise.diff
@@ -3,9 +3,11 @@ entries may not appear in the utmp log. With 30s login delay, the system
 should still stay usable for repair in case the utmp locking somehow breaks
 down.
 
---- login/utmp_file.c~	2009-06-16 12:36:31.000000000 +0200
-+++ login/utmp_file.c	2009-06-16 12:36:33.000000000 +0200
-@@ -42,7 +42,7 @@
+Index: login/utmp_file.c
+===================================================================
+--- login/utmp_file.c.orig
++++ login/utmp_file.c
+@@ -45,7 +45,7 @@ static struct utmp last_entry;
  
  /* Locking timeout.  */
  #ifndef TIMEOUT
diff --git a/glibc-version.diff b/glibc-version.diff
index 052c3ba..684dbda 100644
--- a/glibc-version.diff
+++ b/glibc-version.diff
@@ -1,6 +1,8 @@
---- csu/version.c
-+++ csu/version.c	2003/06/25 07:01:44
-@@ -24,11 +24,12 @@
+Index: csu/version.c
+===================================================================
+--- csu/version.c.orig
++++ csu/version.c
+@@ -24,16 +24,20 @@ static const char __libc_release[] = REL
  static const char __libc_version[] = VERSION;
  
  static const char banner[] =
@@ -14,14 +16,11 @@
  Compiled by GNU CC version "__VERSION__".\n"
  #include "version-info.h"
  #ifdef GLIBC_OLDEST_ABI
-@@ -37,6 +38,9 @@
- #ifdef USE_TLS
- "Thread-local storage support included.\n"
+ "The oldest ABI supported: " GLIBC_OLDEST_ABI ".\n"
  #endif
 +#ifdef FLOATING_STACKS
 +"pthread library is compiled with floating stack support enabled.\n"
 +#endif
  "For bug reporting instructions, please see:\n\
  <http://www.gnu.org/software/libc/bugs.html>.\n";
-
  
diff --git a/glibc.changes b/glibc.changes
index bcdf3c8..084a9e8 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 13 20:18:27 CET 2009 - pbaudis@suse.cz
+
+- Rediff patches to apply with fuzz 0
+
 -------------------------------------------------------------------
 Sat Sep 19 14:13:43 CEST 2009 - pbaudis@suse.cz
 
diff --git a/glibc.spec b/glibc.spec
index 006e6c3..f0094ed 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -70,7 +70,7 @@ Obsoletes:      glibc-32bit
 Provides:       rtld(GNU_HASH)
 AutoReqProv:    on
 Version:        2.10.1
-Release:        9
+Release:        10
 Url:            http://www.gnu.org/software/libc/libc.html
 PreReq:         filesystem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/libm-x86-64-exceptions.diff b/libm-x86-64-exceptions.diff
index 6559e8e..df76b2e 100644
--- a/libm-x86-64-exceptions.diff
+++ b/libm-x86-64-exceptions.diff
@@ -1,6 +1,7 @@
-diff -u sysdeps/x86_64/fpu/libm_inlines_amd.h fpu_new/libm_inlines_amd.h
---- sysdeps/x86_64/fpu/libm_inlines_amd.h	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/libm_inlines_amd.h	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/libm_inlines_amd.h
+===================================================================
+--- sysdeps/x86_64/fpu/libm_inlines_amd.h.orig
++++ sysdeps/x86_64/fpu/libm_inlines_amd.h
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -12,7 +13,7 @@ diff -u sysdeps/x86_64/fpu/libm_inlines_amd.h fpu_new/libm_inlines_amd.h
      THIS LIBRARY**
  */
  
-@@ -254,6 +254,33 @@
+@@ -254,6 +254,33 @@ static inline void clear_fpsw_flags(int
  
  
  #if defined(USE_RAISE_FPSW_FLAGS)
@@ -46,7 +47,7 @@ diff -u sysdeps/x86_64/fpu/libm_inlines_amd.h fpu_new/libm_inlines_amd.h
  /* Raises floating-point status flags. The argument should be
     the bitwise or of the flags to be raised, from the
     list above, e.g.
-@@ -269,11 +296,7 @@
+@@ -269,11 +296,7 @@ static inline void raise_fpsw_flags(int
    /* Put the floating-point environment back */
    __asm fldenv fenv;
  #elif defined(linux)
@@ -59,10 +60,10 @@ diff -u sysdeps/x86_64/fpu/libm_inlines_amd.h fpu_new/libm_inlines_amd.h
  #else
  #error Unknown machine
  #endif
-Only in sysdeps/x86_64/fpu/: LICENSE
-diff -u sysdeps/x86_64/fpu/s_atan2.c fpu_new/s_atan2.c
---- sysdeps/x86_64/fpu/s_atan2.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/s_atan2.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/s_atan2.c
+===================================================================
+--- sysdeps/x86_64/fpu/s_atan2.c.orig
++++ sysdeps/x86_64/fpu/s_atan2.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -74,7 +75,7 @@ diff -u sysdeps/x86_64/fpu/s_atan2.c fpu_new/s_atan2.c
      THIS LIBRARY**
  */
  
-@@ -595,6 +595,14 @@
+@@ -595,6 +595,14 @@ double __atan2(double y, double x)
        if (yneg) return val_with_flags(-piby2,AMD_F_INEXACT);
        else val_with_flags(piby2,AMD_F_INEXACT);
      }
@@ -89,9 +90,10 @@ diff -u sysdeps/x86_64/fpu/s_atan2.c fpu_new/s_atan2.c
  
    /* Scale up both x and y if they are both below 1/4.
       This avoids any possible later denormalised arithmetic. */
-diff -u sysdeps/x86_64/fpu/s_atan2f.c fpu_new/s_atan2f.c
---- sysdeps/x86_64/fpu/s_atan2f.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/s_atan2f.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/s_atan2f.c
+===================================================================
+--- sysdeps/x86_64/fpu/s_atan2f.c.orig
++++ sysdeps/x86_64/fpu/s_atan2f.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -103,7 +105,7 @@ diff -u sysdeps/x86_64/fpu/s_atan2f.c fpu_new/s_atan2f.c
      THIS LIBRARY**
  */
  
-@@ -349,6 +349,14 @@
+@@ -349,6 +349,14 @@ float __atan2f(float fy, float fx)
        if (yneg) return val_with_flags(-piby2,AMD_F_INEXACT);
        else val_with_flags(piby2,AMD_F_INEXACT);
      }
@@ -118,9 +120,10 @@ diff -u sysdeps/x86_64/fpu/s_atan2f.c fpu_new/s_atan2f.c
  
    if (diffexp > 26)
      { /* abs(y)/abs(x) > 2^26 => arctan(x/y) 
-diff -u sysdeps/x86_64/fpu/s_atan.c fpu_new/s_atan.c
---- sysdeps/x86_64/fpu/s_atan.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/s_atan.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/s_atan.c
+===================================================================
+--- sysdeps/x86_64/fpu/s_atan.c.orig
++++ sysdeps/x86_64/fpu/s_atan.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc.
@@ -132,7 +135,7 @@ diff -u sysdeps/x86_64/fpu/s_atan.c fpu_new/s_atan.c
      THIS LIBRARY**
  */
  
-@@ -67,7 +67,7 @@
+@@ -67,7 +67,7 @@ double __atan (double x)
        if (aux == 0)  /* if x=0, then result is precise */
            return x;
        else
@@ -141,9 +144,10 @@ diff -u sysdeps/x86_64/fpu/s_atan.c fpu_new/s_atan.c
    }
  
    /* Argument reduction to range [-7/16,7/16] */
-diff -u sysdeps/x86_64/fpu/s_atanf.c fpu_new/s_atanf.c
---- sysdeps/x86_64/fpu/s_atanf.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/s_atanf.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/s_atanf.c
+===================================================================
+--- sysdeps/x86_64/fpu/s_atanf.c.orig
++++ sysdeps/x86_64/fpu/s_atanf.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc.
@@ -155,7 +159,7 @@ diff -u sysdeps/x86_64/fpu/s_atanf.c fpu_new/s_atanf.c
      THIS LIBRARY**
  */
  
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ float __atanf (float fx)
        if (aux == 0)  /* if x=0, then result is precise */
            return fx;
        else
@@ -164,9 +168,10 @@ diff -u sysdeps/x86_64/fpu/s_atanf.c fpu_new/s_atanf.c
    }
  
    v = x;
-diff -u sysdeps/x86_64/fpu/s_sincos.c fpu_new/s_sincos.c
---- sysdeps/x86_64/fpu/s_sincos.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/s_sincos.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/s_sincos.c
+===================================================================
+--- sysdeps/x86_64/fpu/s_sincos.c.orig
++++ sysdeps/x86_64/fpu/s_sincos.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -180,7 +185,7 @@ diff -u sysdeps/x86_64/fpu/s_sincos.c fpu_new/s_sincos.c
      THIS LIBRARY**
  */
  
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@ void __sincos(double x, double *s, doubl
                  }
                else
                  {
@@ -189,9 +194,10 @@ diff -u sysdeps/x86_64/fpu/s_sincos.c fpu_new/s_sincos.c
                    *c = val_with_flags(1.0, AMD_F_INEXACT);
                  }
  	    }
-diff -u sysdeps/x86_64/fpu/s_sincosf.c fpu_new/s_sincosf.c
---- sysdeps/x86_64/fpu/s_sincosf.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/s_sincosf.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/s_sincosf.c
+===================================================================
+--- sysdeps/x86_64/fpu/s_sincosf.c.orig
++++ sysdeps/x86_64/fpu/s_sincosf.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -205,9 +211,10 @@ diff -u sysdeps/x86_64/fpu/s_sincosf.c fpu_new/s_sincosf.c
      THIS LIBRARY**
  */
  
-diff -u sysdeps/x86_64/fpu/s_tanf.c fpu_new/s_tanf.c
---- sysdeps/x86_64/fpu/s_tanf.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/s_tanf.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/s_tanf.c
+===================================================================
+--- sysdeps/x86_64/fpu/s_tanf.c.orig
++++ sysdeps/x86_64/fpu/s_tanf.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -230,9 +237,10 @@ diff -u sysdeps/x86_64/fpu/s_tanf.c fpu_new/s_tanf.c
     If recip is true return -1/tan(x) instead. */
  static inline double tanf_piby4(double x, int recip)
  {
-diff -u sysdeps/x86_64/fpu/w_asin.c fpu_new/w_asin.c
---- sysdeps/x86_64/fpu/w_asin.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/w_asin.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/w_asin.c
+===================================================================
+--- sysdeps/x86_64/fpu/w_asin.c.orig
++++ sysdeps/x86_64/fpu/w_asin.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -244,7 +252,7 @@ diff -u sysdeps/x86_64/fpu/w_asin.c fpu_new/w_asin.c
      THIS LIBRARY**
  */
  
-@@ -76,7 +76,8 @@
+@@ -76,7 +76,8 @@ double __asin(double x)
  
    if (xexp < -28)
      { /* y small enough that arcsin(x) = x */
@@ -254,9 +262,10 @@ diff -u sysdeps/x86_64/fpu/w_asin.c fpu_new/w_asin.c
      }
    else if (xnan) return x + x;
    else if (xexp >= 0) 
-diff -u sysdeps/x86_64/fpu/w_asinf.c fpu_new/w_asinf.c
---- sysdeps/x86_64/fpu/w_asinf.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/w_asinf.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/w_asinf.c
+===================================================================
+--- sysdeps/x86_64/fpu/w_asinf.c.orig
++++ sysdeps/x86_64/fpu/w_asinf.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -268,7 +277,7 @@ diff -u sysdeps/x86_64/fpu/w_asinf.c fpu_new/w_asinf.c
      THIS LIBRARY**
  */
  
-@@ -75,8 +75,11 @@
+@@ -75,8 +75,11 @@ float __asinf(float x)
    /* Special cases */
  
    if (xexp < -14)
@@ -281,9 +290,10 @@ diff -u sysdeps/x86_64/fpu/w_asinf.c fpu_new/w_asinf.c
    else if (xnan) return x + x;
    else if (xexp >= 0) 
      {
-diff -u sysdeps/x86_64/fpu/w_hypotf.c fpu_new/w_hypotf.c
---- sysdeps/x86_64/fpu/w_hypotf.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/w_hypotf.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/w_hypotf.c
+===================================================================
+--- sysdeps/x86_64/fpu/w_hypotf.c.orig
++++ sysdeps/x86_64/fpu/w_hypotf.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -295,7 +305,7 @@ diff -u sysdeps/x86_64/fpu/w_hypotf.c fpu_new/w_hypotf.c
      THIS LIBRARY**
  */
  
-@@ -79,6 +79,20 @@
+@@ -79,6 +79,20 @@ float __hypotf(float x, float y)
          return retval;
      }
  
@@ -316,9 +326,10 @@ diff -u sysdeps/x86_64/fpu/w_hypotf.c fpu_new/w_hypotf.c
      dr = (dx*dx + dy*dy);
  
  #if USE_SOFTWARE_SQRT
-diff -u sysdeps/x86_64/fpu/w_pow.c fpu_new/w_pow.c
---- sysdeps/x86_64/fpu/w_pow.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/w_pow.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/w_pow.c
+===================================================================
+--- sysdeps/x86_64/fpu/w_pow.c.orig
++++ sysdeps/x86_64/fpu/w_pow.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -330,7 +341,7 @@ diff -u sysdeps/x86_64/fpu/w_pow.c fpu_new/w_pow.c
      THIS LIBRARY**
  */
  
-@@ -364,8 +364,20 @@
+@@ -364,8 +364,20 @@ double __pow(double x, double y)
          {
            /* y is -ve */
            if (ax == 0)
@@ -353,9 +364,10 @@ diff -u sysdeps/x86_64/fpu/w_pow.c fpu_new/w_pow.c
            else if (ax < 0x3ff0000000000000)
              {
              /* abs(x) < 1.0; return +infinity. */
-diff -u sysdeps/x86_64/fpu/w_powf.c fpu_new/w_powf.c
---- sysdeps/x86_64/fpu/w_powf.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/w_powf.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/w_powf.c
+===================================================================
+--- sysdeps/x86_64/fpu/w_powf.c.orig
++++ sysdeps/x86_64/fpu/w_powf.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -367,7 +379,7 @@ diff -u sysdeps/x86_64/fpu/w_powf.c fpu_new/w_powf.c
      THIS LIBRARY**
  */
  
-@@ -175,8 +175,20 @@
+@@ -175,8 +175,20 @@ float __powf(float x, float y)
          {
            /* y is -ve */
            if (ax == 0)
@@ -390,9 +402,10 @@ diff -u sysdeps/x86_64/fpu/w_powf.c fpu_new/w_powf.c
            else if (ax < 0x3f800000)
  	    {
              /* abs(x) < 1.0; return +infinity. */
-diff -u sysdeps/x86_64/fpu/w_remainder.c fpu_new/w_remainder.c
---- sysdeps/x86_64/fpu/w_remainder.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/w_remainder.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/w_remainder.c
+===================================================================
+--- sysdeps/x86_64/fpu/w_remainder.c.orig
++++ sysdeps/x86_64/fpu/w_remainder.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -404,7 +417,7 @@ diff -u sysdeps/x86_64/fpu/w_remainder.c fpu_new/w_remainder.c
      THIS LIBRARY**
  */
  
-@@ -69,11 +69,31 @@
+@@ -69,11 +69,31 @@ double __remainder(double x, double y)
          {
            /* x is NaN or infinity */
            if (ux & MANTBITS_DP64)
@@ -440,9 +453,10 @@ diff -u sysdeps/x86_64/fpu/w_remainder.c fpu_new/w_remainder.c
          }
        else if (yexp > BIASEDEMAX_DP64)
          {
-diff -u sysdeps/x86_64/fpu/w_remainderf.c fpu_new/w_remainderf.c
---- sysdeps/x86_64/fpu/w_remainderf.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/w_remainderf.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/w_remainderf.c
+===================================================================
+--- sysdeps/x86_64/fpu/w_remainderf.c.orig
++++ sysdeps/x86_64/fpu/w_remainderf.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -454,7 +468,7 @@ diff -u sysdeps/x86_64/fpu/w_remainderf.c fpu_new/w_remainderf.c
      THIS LIBRARY**
  */
  
-@@ -50,11 +50,31 @@
+@@ -50,11 +50,31 @@ float __remainderf(float x, float y)
          {
            /* x is NaN or infinity */
            if (ux & MANTBITS_DP64)
@@ -490,9 +504,10 @@ diff -u sysdeps/x86_64/fpu/w_remainderf.c fpu_new/w_remainderf.c
          }
        else if (yexp > BIASEDEMAX_DP64)
          {
-diff -u sysdeps/x86_64/fpu/w_sinh.c fpu_new/w_sinh.c
---- sysdeps/x86_64/fpu/w_sinh.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/w_sinh.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/w_sinh.c
+===================================================================
+--- sysdeps/x86_64/fpu/w_sinh.c.orig
++++ sysdeps/x86_64/fpu/w_sinh.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -504,7 +519,7 @@ diff -u sysdeps/x86_64/fpu/w_sinh.c fpu_new/w_sinh.c
      THIS LIBRARY**
  */
  
-@@ -249,7 +249,7 @@
+@@ -249,7 +249,7 @@ double __sinh(double x)
          /* with no inexact */
          return x;
        else
@@ -513,9 +528,10 @@ diff -u sysdeps/x86_64/fpu/w_sinh.c fpu_new/w_sinh.c
      }
    else if (aux >= 0x7ff0000000000000) /* |x| is NaN or Inf */
      return x + x;
-diff -u sysdeps/x86_64/fpu/w_sinhf.c fpu_new/w_sinhf.c
---- sysdeps/x86_64/fpu/w_sinhf.c	2009-09-11 14:26:54.000000000 -0500
-+++ sysdeps/x86_64/fpu/w_sinhf.c	2009-09-11 15:36:54.000000000 -0500
+Index: sysdeps/x86_64/fpu/w_sinhf.c
+===================================================================
+--- sysdeps/x86_64/fpu/w_sinhf.c.orig
++++ sysdeps/x86_64/fpu/w_sinhf.c
 @@ -1,8 +1,8 @@
  /*
 -(C) 2002 Advanced Micro Devices, Inc. 
@@ -541,7 +557,7 @@ diff -u sysdeps/x86_64/fpu/w_sinhf.c fpu_new/w_sinhf.c
  
  /* Deal with errno for out-of-range result */
  #include "libm_errno_amd.h"
-@@ -166,7 +168,8 @@
+@@ -166,7 +168,8 @@ float __sinhf(float fx)
    if (aux < 0x3f10000000000000) /* |x| small enough that sinh(x) = x */
      {
        if (aux == 0) return x; /* with no inexact */
diff --git a/libm-x86-64.diff.bz2 b/libm-x86-64.diff.bz2
index 38fc85a..4eb2049 100644
--- a/libm-x86-64.diff.bz2
+++ b/libm-x86-64.diff.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8f65b9076eee071c181fb4a81621adda554b9e247ff97dbe487322b2a03fa3c
-size 76941
+oid sha256:349cdc0d042ccd828d6906a0e2498bdacfa89e2a3df0e706fc429756caa39895
+size 76349
diff --git a/ppc-atomic.diff b/ppc-atomic.diff
index 9a3538e..89e8224 100644
--- a/ppc-atomic.diff
+++ b/ppc-atomic.diff
@@ -1,10 +1,7 @@
 Index: sysdeps/powerpc/bits/atomic.h
 ===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/bits/atomic.h,v
-retrieving revision 1.17
-diff -u -a -p -r1.17 atomic.h
---- sysdeps/powerpc/bits/atomic.h	26 Mar 2007 20:15:28 -0000	1.17
-+++ sysdeps/powerpc/bits/atomic.h	31 May 2008 08:50:56 -0000
+--- sysdeps/powerpc/bits/atomic.h.orig
++++ sysdeps/powerpc/bits/atomic.h
 @@ -85,14 +85,14 @@ typedef uintmax_t uatomic_max_t;
        __typeof (*(mem)) __tmp;						      \
        __typeof (mem)  __memp = (mem);					      \
@@ -149,11 +146,8 @@ diff -u -a -p -r1.17 atomic.h
    })
 Index: sysdeps/powerpc/powerpc32/bits/atomic.h
 ===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/powerpc32/bits/atomic.h,v
-retrieving revision 1.6
-diff -u -a -p -r1.6 atomic.h
---- sysdeps/powerpc/powerpc32/bits/atomic.h	26 Mar 2007 20:15:45 -0000	1.6
-+++ sysdeps/powerpc/powerpc32/bits/atomic.h	31 May 2008 08:50:56 -0000
+--- sysdeps/powerpc/powerpc32/bits/atomic.h.orig
++++ sysdeps/powerpc/powerpc32/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp;							      \
@@ -194,11 +188,8 @@ diff -u -a -p -r1.6 atomic.h
  })
 Index: sysdeps/powerpc/powerpc64/bits/atomic.h
 ===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/powerpc/powerpc64/bits/atomic.h,v
-retrieving revision 1.8
-diff -u -a -p -r1.8 atomic.h
---- sysdeps/powerpc/powerpc64/bits/atomic.h	26 Mar 2007 20:16:03 -0000	1.8
-+++ sysdeps/powerpc/powerpc64/bits/atomic.h	31 May 2008 08:50:56 -0000
+--- sysdeps/powerpc/powerpc64/bits/atomic.h.orig
++++ sysdeps/powerpc/powerpc64/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp, __tmp2;						      \
diff --git a/resolv.dynamic.diff b/resolv.dynamic.diff
index e35b313..f9c45e7 100644
--- a/resolv.dynamic.diff
+++ b/resolv.dynamic.diff
@@ -1,5 +1,7 @@
---- resolv/res_libc.c.orig	2005-04-07 14:26:57.181526898 +0200
-+++ resolv/res_libc.c	2005-04-07 18:38:56.718340309 +0200
+Index: resolv/res_libc.c
+===================================================================
+--- resolv/res_libc.c.orig
++++ resolv/res_libc.c
 @@ -22,6 +22,7 @@
  #include <arpa/nameser.h>
  #include <resolv.h>
@@ -8,7 +10,7 @@
  
  
  /* The following bit is copied from res_data.c (where it is #ifdef'ed
-@@ -101,6 +102,20 @@
+@@ -95,6 +96,20 @@ int
  __res_maybe_init (res_state resp, int preinit)
  {
  	if (resp->options & RES_INIT) {
@@ -27,5 +29,5 @@
 +			}
 +		}
  		if (__res_initstamp != resp->_u._ext.initstamp) {
- 			if (resp->nscount > 0) {
- 				__res_nclose (resp);
+ 			if (resp->nscount > 0)
+ 				__res_iclose (resp, true);