Run all patches through renumbering and update

Signed-off-by: Alexey Neyman <stilor@att.net>
author: Alexey Neyman <stilor@att.net> 2017-12-02 20:44:39 (GMT)
committer: Alexey Neyman <stilor@att.net> 2017-12-02 20:44:39 (GMT)
commit: 98bc4decdeab1361bdc585c86591718fb08c8ffb (patch)
tree: 4e048ed57988306696efa3c5b81a80d48030e913 /packages/glibc/2.14.1
parent: 2a1935f3ad41d360dd3d96a1b0486083293651dd (diff)
46 files changed, 623 insertions, 614 deletions
diff --git a/packages/glibc/2.14.1/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.14.1/0000-respect-env-CPPFLAGS.patch
index 3798cb2..8bb8679 100644
--- a/packages/glibc/2.14.1/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.14.1/0000-respect-env-CPPFLAGS.patch
@@ -1,10 +1,13 @@
 Respect environment CPPFLAGS when we run ./configure so we can inject
 random -D things without having to set CFLAGS/ASFLAGS
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-05-09 23:57:56.000000000 +0200
-+++ glibc-2.13/Makeconfig	2009-11-13 00:49:41.000000000 +0100
-@@ -697,6 +697,7 @@
+---
+ Makeconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -699,6 +699,7 @@
  	   $(foreach lib,$(libof-$(basename $(@F))) \
  			 $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
  	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
diff --git a/packages/glibc/2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.14.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a..30a70a2 100644
--- a/packages/glibc/2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.14.1/0001-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
@@ -5,16 +5,13 @@ Subject: [PATCH] Suppress GCC 6 warning about ambiguous 'else' with
  -Wparentheses
 
 ---
- ChangeLog       |  5 +++++
- nis/nis_call.c  | 20 +++++++++++---------
- stdlib/setenv.c | 26 ++++++++++++++------------
- 3 files changed, 30 insertions(+), 21 deletions(-)
+ nis/nis_call.c  |   20 +++++++++++---------
+ stdlib/setenv.c |   24 +++++++++++++-----------
+ 2 files changed, 24 insertions(+), 20 deletions(-)
 
-diff --git a/nis/nis_call.c b/nis/nis_call.c
-index 3fa37e4..cb7839a 100644
 --- a/nis/nis_call.c
 +++ b/nis/nis_call.c
-@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent,
+@@ -682,16 +682,18 @@
    /* Choose which entry should be evicted from the cache.  */
    loc = &nis_server_cache[0];
    if (*loc != NULL)
@@ -42,11 +39,9 @@ index 3fa37e4..cb7839a 100644
    old = *loc;
    *loc = new;
  
-diff --git a/stdlib/setenv.c b/stdlib/setenv.c
-index da61ee0..e66045f 100644
 --- a/stdlib/setenv.c
 +++ b/stdlib/setenv.c
-@@ -278,18 +278,20 @@ unsetenv (const char *name)
+@@ -328,18 +328,20 @@
    ep = __environ;
    if (ep != NULL)
      while (*ep != NULL)
@@ -54,7 +49,12 @@ index da61ee0..e66045f 100644
 -	{
 -	  /* Found it.  Remove this pointer by moving later ones back.  */
 -	  char **dp = ep;
--
++      {
++	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
++	  {
++	    /* Found it.  Remove this pointer by moving later ones back.  */
++	    char **dp = ep;
+ 
 -	  do
 -	    dp[0] = dp[1];
 -	  while (*dp++);
@@ -62,12 +62,6 @@ index da61ee0..e66045f 100644
 -	}
 -      else
 -	++ep;
-+      {
-+	if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
-+	  {
-+	    /* Found it.  Remove this pointer by moving later ones back.  */
-+	    char **dp = ep;
-+
 +	    do
 +		dp[0] = dp[1];
 +	    while (*dp++);
@@ -79,6 +73,3 @@ index da61ee0..e66045f 100644
  
    UNLOCK;
  
--- 
-2.7.4
-
diff --git a/packages/glibc/2.14.1/102-fix-signed-shift-overlow.patch b/packages/glibc/2.14.1/0002-fix-signed-shift-overlow.patch
index ef49f83..5f76afe 100644
--- a/packages/glibc/2.14.1/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.14.1/0002-fix-signed-shift-overlow.patch
@@ -12,11 +12,16 @@ Date:   Tue Jul 21 22:50:29 2015 -0700
     * string/strchrnul.c (STRCHRNUL):
     Rewrite code to avoid issues with signed shift overflow.
 
-diff --git a/string/memrchr.c b/string/memrchr.c
-index 0c8fd84..86cd5b9 100644
+---
+ string/memrchr.c   |   11 ++---------
+ string/rawmemchr.c |   11 ++---------
+ string/strchr.c    |    9 ++-------
+ string/strchrnul.c |    9 ++-------
+ 4 files changed, 8 insertions(+), 32 deletions(-)
+
 --- a/string/memrchr.c
 +++ b/string/memrchr.c
-@@ -96,15 +96,8 @@ MEMRCHR
+@@ -98,15 +98,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -34,11 +39,9 @@ index 0c8fd84..86cd5b9 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/rawmemchr.c b/string/rawmemchr.c
-index 05b22be..228ca9d 100644
 --- a/string/rawmemchr.c
 +++ b/string/rawmemchr.c
-@@ -86,15 +86,8 @@ RAWMEMCHR (s, c_in)
+@@ -90,15 +90,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -56,11 +59,9 @@ index 05b22be..228ca9d 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchr.c b/string/strchr.c
-index 5f90075..f13b2b3 100644
 --- a/string/strchr.c
 +++ b/string/strchr.c
-@@ -60,13 +60,8 @@ strchr (const char *s, int c_in)
+@@ -65,13 +65,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
@@ -76,11 +77,9 @@ index 5f90075..f13b2b3 100644
  
    /* Set up a longword, each of whose bytes is C.  */
    charmask = c | (c << 8);
-diff --git a/string/strchrnul.c b/string/strchrnul.c
-index 2678f1d..daf0b3f 100644
 --- a/string/strchrnul.c
 +++ b/string/strchrnul.c
-@@ -66,13 +66,8 @@ STRCHRNUL (s, c_in)
+@@ -63,13 +63,8 @@
  
       The 1-bits make sure that carries propagate to the next 0-bit.
       The 0-bits provide holes for carries to fall into.  */
diff --git a/packages/glibc/2.14.1/103-dl-openat64-variadic.patch b/packages/glibc/2.14.1/0003-dl-openat64-variadic.patch
index fe94b96..e69bb17 100644
--- a/packages/glibc/2.14.1/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.14.1/0003-dl-openat64-variadic.patch
@@ -177,11 +177,13 @@ Date:   Tue Oct 20 11:54:09 2015 +0000
             * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
             * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
 
-diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
-index 7d100bb..7eea0ca 100644
+---
+ sysdeps/unix/sysv/linux/dl-openat64.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
 --- a/sysdeps/unix/sysv/linux/dl-openat64.c
 +++ b/sysdeps/unix/sysv/linux/dl-openat64.c
-@@ -23,10 +23,7 @@
+@@ -24,10 +24,7 @@
  
  
  int
diff --git a/packages/glibc/2.14.1/104-unused-variables.patch b/packages/glibc/2.14.1/0004-unused-variables.patch
index e063675..18adb17 100644
--- a/packages/glibc/2.14.1/104-unused-variables.patch
+++ b/packages/glibc/2.14.1/0004-unused-variables.patch
@@ -19,8 +19,18 @@ Date:   Fri Sep 18 20:27:20 2015 +0100
             * timezone/private.h (time_t_min): Likewise.  (time_t_max):
             Likewise.
 
-diff --git a/resolv/base64.c b/resolv/base64.c
-index ea584ed..519e5d2 100644
+---
+ resolv/base64.c                        |    4 ----
+ sysdeps/ieee754/dbl-64/atnat2.h        |    4 ----
+ sysdeps/ieee754/dbl-64/uexp.h          |    2 +-
+ sysdeps/ieee754/dbl-64/upow.h          |    2 --
+ sysdeps/ieee754/flt-32/e_log10f.c      |    6 ------
+ sysdeps/ieee754/flt-32/s_cosf.c        |    6 ------
+ sysdeps/ieee754/ldbl-128/e_lgammal_r.c |    1 -
+ sysdeps/ieee754/ldbl-128/s_erfl.c      |    1 -
+ sysdeps/ieee754/ldbl-128/s_log1pl.c    |    1 -
+ 9 files changed, 1 insertion(+), 26 deletions(-)
+
 --- a/resolv/base64.c
 +++ b/resolv/base64.c
 @@ -40,10 +40,6 @@
@@ -34,11 +44,9 @@ index ea584ed..519e5d2 100644
  #include <sys/types.h>
  #include <sys/param.h>
  #include <sys/socket.h>
-diff --git a/sysdeps/ieee754/dbl-64/atnat2.h b/sysdeps/ieee754/dbl-64/atnat2.h
-index e0d65af..82943f9 100644
 --- a/sysdeps/ieee754/dbl-64/atnat2.h
 +++ b/sysdeps/ieee754/dbl-64/atnat2.h
-@@ -65,10 +65,8 @@
+@@ -69,10 +69,8 @@
  /**/ hpi1           = {{0x3c91a626, 0x33145c07} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0xbff921fb, 0x54442d18} }, /* -pi/2         */
  /**/ qpi            = {{0x3fe921fb, 0x54442d18} }, /*  pi/4         */
@@ -49,7 +57,7 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0xc002d97c, 0x7f3321d2} }, /* -3pi/4        */
  /**/ u1             = {{0x3c314c2a, 0x00000000} }, /*  9.377e-19    */
  /**/ u2             = {{0x3bf955e4, 0x00000000} }, /*  8.584e-20    */
-@@ -129,10 +127,8 @@
+@@ -139,10 +137,8 @@
  /**/ hpi1           = {{0x33145c07, 0x3c91a626} }, /*  pi/2-hpi     */
  /**/ mhpi           = {{0x54442d18, 0xbff921fb} }, /* -pi/2         */
  /**/ qpi            = {{0x54442d18, 0x3fe921fb} }, /*  pi/4         */
@@ -60,11 +68,9 @@ index e0d65af..82943f9 100644
  /**/ mtqpi          = {{0x7f3321d2, 0xc002d97c} }, /* -3pi/4        */
  /**/ u1             = {{0x00000000, 0x3c314c2a} }, /*  9.377e-19    */
  /**/ u2             = {{0x00000000, 0x3bf955e4} }, /*  8.584e-20    */
-diff --git a/sysdeps/ieee754/dbl-64/uexp.h b/sysdeps/ieee754/dbl-64/uexp.h
-index 6817eaf..42b21f2 100644
 --- a/sysdeps/ieee754/dbl-64/uexp.h
 +++ b/sysdeps/ieee754/dbl-64/uexp.h
-@@ -29,7 +29,7 @@
+@@ -30,7 +30,7 @@
  
  #include "mydefs.h"
  
@@ -73,11 +79,9 @@ index 6817eaf..42b21f2 100644
  err_0 = 1.000014, err_1 = 0.000016;
  const static int4 bigint = 0x40862002,
               badint = 0x40876000,smallint = 0x3C8fffff;
-diff --git a/sysdeps/ieee754/dbl-64/upow.h b/sysdeps/ieee754/dbl-64/upow.h
-index c8569a9..b4911e5 100644
 --- a/sysdeps/ieee754/dbl-64/upow.h
 +++ b/sysdeps/ieee754/dbl-64/upow.h
-@@ -34,7 +34,6 @@
+@@ -36,7 +36,6 @@
  /**/ INF            = {{0x7ff00000, 0x00000000}}, /* INF           */
  /**/ nINF           = {{0xfff00000, 0x00000000}}, /* -INF          */
  /**/ NaNQ           = {{0x7ff80000, 0x00000000}}, /* NaNQ          */
@@ -85,7 +89,7 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0x3fe62e42, 0xfefa3800}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x3d2ef357, 0x93c76730}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0x4297ffff, 0xfffffd2c}}, /* 1.5*2**42 -724*2**-10  */
-@@ -48,7 +47,6 @@
+@@ -51,7 +50,6 @@
  /**/ INF            = {{0x00000000, 0x7ff00000}}, /* INF           */
  /**/ nINF           = {{0x00000000, 0xfff00000}}, /* -INF           */
  /**/ NaNQ           = {{0x00000000, 0x7ff80000}}, /* NaNQ          */
@@ -93,45 +97,39 @@ index c8569a9..b4911e5 100644
  /**/ ln2a           = {{0xfefa3800, 0x3fe62e42}}, /* ln(2) 43 bits */
  /**/ ln2b           = {{0x93c76730, 0x3d2ef357}}, /* ln(2)-ln2a    */
  /**/ bigu           = {{0xfffffd2c, 0x4297ffff}}, /* 1.5*2**42 -724*2**-10  */
-diff --git a/sysdeps/ieee754/flt-32/e_log10f.c b/sysdeps/ieee754/flt-32/e_log10f.c
-index 96f0e81..1daeef7 100644
 --- a/sysdeps/ieee754/flt-32/e_log10f.c
 +++ b/sysdeps/ieee754/flt-32/e_log10f.c
-@@ -22,12 +22,6 @@ ivln10     =  4.3429449201e-01, /* 0x3ede5bd9 */
- log10_2hi  =  3.0102920532e-01, /* 0x3e9a2080 */
+@@ -31,12 +31,6 @@
  log10_2lo  =  7.9034151668e-07; /* 0x355427db */
  
--#ifdef __STDC__
+ #ifdef __STDC__
 -static const float zero   =  0.0;
 -#else
 -static float zero   =  0.0;
 -#endif
 -
- #ifdef __STDC__
+-#ifdef __STDC__
  	float __ieee754_log10f(float x)
  #else
-diff --git a/sysdeps/ieee754/flt-32/s_cosf.c b/sysdeps/ieee754/flt-32/s_cosf.c
-index 864ab27..0affd40 100644
+ 	float __ieee754_log10f(x)
 --- a/sysdeps/ieee754/flt-32/s_cosf.c
 +++ b/sysdeps/ieee754/flt-32/s_cosf.c
-@@ -21,12 +21,6 @@ static char rcsid[] = "$NetBSD: s_cosf.c,v 1.4 1995/05/10 20:47:03 jtc Exp $";
- #include "math.h"
+@@ -22,12 +22,6 @@
  #include "math_private.h"
  
--#ifdef __STDC__
+ #ifdef __STDC__
 -static const float one=1.0;
 -#else
 -static float one=1.0;
 -#endif
 -
- #ifdef __STDC__
+-#ifdef __STDC__
  	float __cosf(float x)
  #else
-diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-index 500aacc..ab5a96e 100644
+ 	float __cosf(x)
 --- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
 +++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
-@@ -82,7 +82,6 @@ DIAG_IGNORE_NEEDS_COMMENT (4.6, "-Woverflow");
+@@ -74,7 +74,6 @@
  static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
  static const long double MAXLGM = 1.0485738685148938358098967157129705071571E4928L;
  static const long double one = 1.0L;
@@ -139,11 +137,9 @@ index 500aacc..ab5a96e 100644
  static const long double huge = 1.0e4000L;
  
  /* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
-diff --git a/sysdeps/ieee754/ldbl-128/s_erfl.c b/sysdeps/ieee754/ldbl-128/s_erfl.c
-index fa4609f..08c80a3 100644
 --- a/sysdeps/ieee754/ldbl-128/s_erfl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_erfl.c
-@@ -140,7 +140,6 @@ deval (long double x, const long double *p, int n)
+@@ -142,7 +142,6 @@
  static long double
  #endif
  tiny = 1e-4931L,
@@ -151,11 +147,9 @@ index fa4609f..08c80a3 100644
    one = 1.0L,
    two = 2.0L,
    /* 2/sqrt(pi) - 1 */
-diff --git a/sysdeps/ieee754/ldbl-128/s_log1pl.c b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-index ff759bc..9609550 100644
 --- a/sysdeps/ieee754/ldbl-128/s_log1pl.c
 +++ b/sysdeps/ieee754/ldbl-128/s_log1pl.c
-@@ -117,7 +117,6 @@ static const long double C2 = 1.428606820309417232121458176568075500134E-6L;
+@@ -116,7 +116,6 @@
  
  static const long double sqrth = 0.7071067811865475244008443621048490392848L;
  /* ln (2^16384 * (1 - 2^-113)) */
diff --git a/packages/glibc/2.14.1/105-misleading-indentation.patch b/packages/glibc/2.14.1/0005-misleading-indentation.patch
index 1dd8d85..35bcb1b 100644
--- a/packages/glibc/2.14.1/105-misleading-indentation.patch
+++ b/packages/glibc/2.14.1/0005-misleading-indentation.patch
@@ -7,11 +7,13 @@ Date:   Fri Dec 11 09:19:37 2015 -0800
             * sysdeps/ieee754/flt-32/k_rem_pio2f.c (__kernel_rem_pio2f):
             Fix indentation.
 
-diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-index 0c7685c..392afdb 100644
+---
+ sysdeps/ieee754/flt-32/k_rem_pio2f.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
 --- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c
 +++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c
-@@ -65,7 +65,9 @@ int __kernel_rem_pio2f(float *x, float *y, int e0, int nx, int prec, const int32
+@@ -82,7 +82,9 @@
  
      /* compute q[0],q[1],...q[jk] */
  	for (i=0;i<=jk;i++) {
diff --git a/packages/glibc/2.14.1/106-dl-open-array-bounds.patch b/packages/glibc/2.14.1/0006-dl-open-array-bounds.patch
index bdb5c19..a61f1a5 100644
--- a/packages/glibc/2.14.1/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.14.1/0006-dl-open-array-bounds.patch
@@ -4,11 +4,13 @@ Date:   Fri Apr 17 12:11:58 2015 -0700
 
     Fuller check for invalid NSID in _dl_open.
 
-diff --git a/elf/dl-open.c b/elf/dl-open.c
-index 0dbe07f..2d0e082 100644
+---
+ elf/dl-open.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
 --- a/elf/dl-open.c
 +++ b/elf/dl-open.c
-@@ -619,8 +619,14 @@ no more namespaces available for dlmopen()"));
+@@ -540,8 +540,14 @@
    /* Never allow loading a DSO in a namespace which is empty.  Such
       direct placements is only causing problems.  Also don't allow
       loading into a namespace used for auditing.  */
diff --git a/packages/glibc/2.14.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.14.1/0007-i386-x86_64-revert-clone-cfi.patch
index c7f6182..f872bac 100644
--- a/packages/glibc/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.14.1/0007-i386-x86_64-revert-clone-cfi.patch
@@ -4,16 +4,13 @@ elsewhere.  this cfi code does not gain us a whole lot anyways.
 
 http://gcc.gnu.org/ml/gcc/2006-12/msg00293.html
 
-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
-retrieving revision 1.26
-diff -u -p -r1.27 -r1.26
+---
+ sysdeps/unix/sysv/linux/i386/clone.S   |    4 ----
+ sysdeps/unix/sysv/linux/x86_64/clone.S |    4 ----
+ 2 files changed, 8 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/i386/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/i386/clone.S
++++ b/sysdeps/unix/sysv/linux/i386/clone.S
 @@ -120,9 +120,6 @@
  	ret
  
@@ -32,9 +29,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/i386/clone.S glibc-2.13/sysde
  
  	cfi_startproc
  PSEUDO_END (BP_SYM (__clone))
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/x86_64/clone.S	2006-12-04 00:12:36.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/x86_64/clone.S	2009-11-13 00:49:45.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/x86_64/clone.S
++++ b/sysdeps/unix/sysv/linux/x86_64/clone.S
 @@ -89,9 +89,6 @@
  	ret
  
diff --git a/packages/glibc/2.14.1/140-disable-ldconfig.patch b/packages/glibc/2.14.1/0008-disable-ldconfig.patch
index 378e1df..d60cb40 100644
--- a/packages/glibc/2.14.1/140-disable-ldconfig.patch
+++ b/packages/glibc/2.14.1/0008-disable-ldconfig.patch
@@ -3,9 +3,12 @@ file outside of the chroot.  doesnt matter anyways as we wont use the cache
 results (portage will rebuild cache), so running ldconfig is simply a waste
 of time.
 
-diff -durN glibc-2.13.orig/Makefile glibc-2.13/Makefile
---- glibc-2.13.orig/Makefile	2009-04-23 20:23:03.000000000 +0200
-+++ glibc-2.13/Makefile	2009-11-13 00:49:49.000000000 +0100
+---
+ Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Makefile
++++ b/Makefile
 @@ -116,6 +116,7 @@
  	rm -f $(symbolic-link-list)
  
diff --git a/packages/glibc/2.14.1/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.14.1/0009-Fix-combreloc-test-BSD-grep.patch
index d720d39..5e68aa3 100644
--- a/packages/glibc/2.14.1/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.14.1/0009-Fix-combreloc-test-BSD-grep.patch
@@ -13,15 +13,13 @@ by configure as "not found". As a result, support for "-z combreloc"
 
 Signed-off-by: Alexey Neyman <stilor@att.net>
 ---
- ChangeLog    | 5 +++++
- configure    | 2 +-
- configure.ac | 2 +-
- 3 files changed, 7 insertions(+), 2 deletions(-)
+ configure    |    2 +-
+ configure.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
---- glibc-2.14.1.orig/configure	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure	2017-03-08 21:06:36.000000000 -0800
-@@ -6377,7 +6377,7 @@ EOF
+--- a/configure
++++ b/configure
+@@ -6377,7 +6377,7 @@
    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    test $ac_status = 0; }; }
    then
@@ -30,10 +28,9 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
        libc_cv_z_combreloc=yes
      else
        libc_cv_z_combreloc=no
-diff -urpN glibc-2.14.1.orig/configure.in glibc-2.14.1/configure.in
---- glibc-2.14.1.orig/configure.in	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure.in	2017-03-08 21:06:50.000000000 -0800
-@@ -1655,7 +1655,7 @@ dnl cross-platform since the gcc used ca
+--- a/configure.in
++++ b/configure.in
+@@ -1655,7 +1655,7 @@
  dnl introducing new options this is not easily doable.  Instead use a tool
  dnl which always is cross-platform: readelf.  To detect whether -z combreloc
  dnl look for a section named .rel.dyn.
diff --git a/packages/glibc/2.14.1/150-queue-header-updates.patch b/packages/glibc/2.14.1/0010-queue-header-updates.patch
index 7cbe70e..f6515e2 100644
--- a/packages/glibc/2.14.1/150-queue-header-updates.patch
+++ b/packages/glibc/2.14.1/0010-queue-header-updates.patch
@@ -2,11 +2,12 @@ grab some updates from FreeBSD
 
 http://bugs.gentoo.org/201979
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
+---
+ misc/sys/queue.h |   36 ++++++++++++++++++++++++++++++++++++
+ 1 file changed, 36 insertions(+)
 
-diff -durN glibc-2.13.orig/misc/sys/queue.h glibc-2.13/misc/sys/queue.h
---- glibc-2.13.orig/misc/sys/queue.h	2008-03-05 06:50:30.000000000 +0100
-+++ glibc-2.13/misc/sys/queue.h	2009-11-13 00:49:51.000000000 +0100
+--- a/misc/sys/queue.h
++++ b/misc/sys/queue.h
 @@ -136,6 +136,11 @@
  		(var);							\
  		(var) = ((var)->field.le_next))
diff --git a/packages/glibc/2.14.1/160-manual-no-perl.patch b/packages/glibc/2.14.1/0011-manual-no-perl.patch
index 5e2b807..7e232aa 100644
--- a/packages/glibc/2.14.1/160-manual-no-perl.patch
+++ b/packages/glibc/2.14.1/0011-manual-no-perl.patch
@@ -4,10 +4,13 @@ deal, so just whine a little and continue on our merry way.
 
 http://bugs.gentoo.org/60132
 
-diff -durN glibc-2.13.orig/manual/Makefile glibc-2.13/manual/Makefile
---- glibc-2.13.orig/manual/Makefile	2006-01-08 07:43:47.000000000 +0100
-+++ glibc-2.13/manual/Makefile	2009-11-13 00:49:54.000000000 +0100
-@@ -104,9 +104,14 @@
+---
+ manual/Makefile |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/manual/Makefile
++++ b/manual/Makefile
+@@ -106,9 +106,14 @@
  libm-err.texi: stamp-libm-err
  stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
  						     $(dir)/libm-test-ulps))
diff --git a/packages/glibc/2.14.1/170-localedef-fix-trampoline.patch b/packages/glibc/2.14.1/0012-localedef-fix-trampoline.patch
index 3cc6559..3b8fd6e 100644
--- a/packages/glibc/2.14.1/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.14.1/0012-localedef-fix-trampoline.patch
@@ -5,9 +5,12 @@
 # DP: Upstream status: Unknown
 # DP: Status Details: Unknown
 # DP: Date: 2004-03-16
-diff -durN glibc-2.13.orig/locale/programs/3level.h glibc-2.13/locale/programs/3level.h
---- glibc-2.13.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
-+++ glibc-2.13/locale/programs/3level.h	2009-11-13 00:49:56.000000000 +0100
+---
+# locale/programs/3level.h |   36 ++++++++++++++++++++++++++++++++++++
+# 1 file changed, 36 insertions(+)
+#
+--- a/locale/programs/3level.h
++++ b/locale/programs/3level.h
 @@ -203,6 +203,42 @@
  	}
      }
diff --git a/packages/glibc/2.14.1/180-resolv-dynamic.patch b/packages/glibc/2.14.1/0013-resolv-dynamic.patch
index e916bce..fcc2f80 100644
--- a/packages/glibc/2.14.1/180-resolv-dynamic.patch
+++ b/packages/glibc/2.14.1/0013-resolv-dynamic.patch
@@ -5,9 +5,12 @@ already running get the updated information.
 
 http://bugs.gentoo.org/177416
 
-diff -durN glibc-2.13.orig/resolv/res_libc.c glibc-2.13/resolv/res_libc.c
---- glibc-2.13.orig/resolv/res_libc.c	2009-02-07 05:27:42.000000000 +0100
-+++ glibc-2.13/resolv/res_libc.c	2009-11-13 00:49:59.000000000 +0100
+---
+ resolv/res_libc.c |   15 +++++++++++++++
+ 1 file changed, 15 insertions(+)
+
+--- a/resolv/res_libc.c
++++ b/resolv/res_libc.c
 @@ -22,6 +22,7 @@
  #include <arpa/nameser.h>
  #include <resolv.h>
diff --git a/packages/glibc/2.14.1/190-localedef-mmap.patch b/packages/glibc/2.14.1/0014-localedef-mmap.patch
index f3914cd..74e586e 100644
--- a/packages/glibc/2.14.1/190-localedef-mmap.patch
+++ b/packages/glibc/2.14.1/0014-localedef-mmap.patch
@@ -7,9 +7,12 @@ http://bugs.gentoo.org/289615
 	used later with MMAP_FIXED | MMAP_SHARED to cope with different
 	alignment restrictions.
 
-diff -durN glibc-2.13.orig/locale/programs/locarchive.c glibc-2.13/locale/programs/locarchive.c
---- glibc-2.13.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200
-+++ glibc-2.13/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100
+---
+ locale/programs/locarchive.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/locale/programs/locarchive.c
++++ b/locale/programs/locarchive.c
 @@ -134,7 +134,7 @@
    size_t reserved = RESERVE_MMAP_SIZE;
    int xflags = 0;
diff --git a/packages/glibc/2.14.1/200-fadvise64_64.patch b/packages/glibc/2.14.1/0015-fadvise64_64.patch
index 71bca38..191d833 100644
--- a/packages/glibc/2.14.1/200-fadvise64_64.patch
+++ b/packages/glibc/2.14.1/0015-fadvise64_64.patch
@@ -3,9 +3,8 @@ ripped from Debian
  sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/posix_fadvise.c	2003-08-17 02:36:22.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/posix_fadvise.c	2009-11-13 00:50:03.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/posix_fadvise.c
++++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
 @@ -35,6 +35,19 @@
      return INTERNAL_SYSCALL_ERRNO (ret, err);
    return 0;
diff --git a/packages/glibc/2.14.1/220-section-comments.patch b/packages/glibc/2.14.1/0016-section-comments.patch
index d717829..4718f22 100644
--- a/packages/glibc/2.14.1/220-section-comments.patch
+++ b/packages/glibc/2.14.1/0016-section-comments.patch
@@ -3,10 +3,13 @@ http://sources.redhat.com/ml/binutils/2004-04/msg00665.html
 fixes building on some architectures (like m68k/arm/cris/etc...) because
 it does the right thing
 
-diff -durN glibc-2.13.orig/include/libc-symbols.h glibc-2.13/include/libc-symbols.h
---- glibc-2.13.orig/include/libc-symbols.h	2009-03-14 00:51:46.000000000 +0100
-+++ glibc-2.13/include/libc-symbols.h	2009-11-13 00:50:07.000000000 +0100
-@@ -239,12 +239,12 @@
+---
+ include/libc-symbols.h |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/include/libc-symbols.h
++++ b/include/libc-symbols.h
+@@ -240,12 +240,12 @@
  #  define __make_section_unallocated(section_string)
  # endif
  
diff --git a/packages/glibc/2.14.1/230-no-inline-gmon.patch b/packages/glibc/2.14.1/0017-no-inline-gmon.patch
index fa33c2b..ed02704 100644
--- a/packages/glibc/2.14.1/230-no-inline-gmon.patch
+++ b/packages/glibc/2.14.1/0017-no-inline-gmon.patch
@@ -19,12 +19,12 @@ Kazu Hirata
 	* sysdeps/generic/initfini.c (call_gmon_start): Add
 	__attribute__ ((noinline)).
 
-Index: sysdeps/generic/initfini.c
-===================================================================
+---
+ sysdeps/generic/initfini.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/sysdeps/generic/initfini.c glibc-2.13/sysdeps/generic/initfini.c
---- glibc-2.13.orig/sysdeps/generic/initfini.c	2007-06-17 20:02:40.000000000 +0200
-+++ glibc-2.13/sysdeps/generic/initfini.c	2009-11-13 00:50:09.000000000 +0100
+--- a/sysdeps/generic/initfini.c
++++ b/sysdeps/generic/initfini.c
 @@ -70,7 +70,7 @@
  /* The beginning of _init:  */
  asm ("\n/*@_init_PROLOG_BEGINS*/");
diff --git a/packages/glibc/2.14.1/260-assume-pipe2.patch b/packages/glibc/2.14.1/0018-assume-pipe2.patch
index 42e8f4e..0074ea6 100644
--- a/packages/glibc/2.14.1/260-assume-pipe2.patch
+++ b/packages/glibc/2.14.1/0018-assume-pipe2.patch
@@ -20,9 +20,12 @@ __have_sock_cloexec and __have_pipe2 to true.  but if glibc was built against
 older kernel headers where __NR_pipe2 does not exist, glibc will have a ENOSYS
 stub for it.  so popen() will always fail as glibc assumes pipe2() works.
 
-diff -durN glibc-2.13.orig/socket/have_sock_cloexec.c glibc-2.13/socket/have_sock_cloexec.c
---- glibc-2.13.orig/socket/have_sock_cloexec.c	2008-07-25 18:46:23.000000000 +0200
-+++ glibc-2.13/socket/have_sock_cloexec.c	2009-11-13 00:50:15.000000000 +0100
+---
+ socket/have_sock_cloexec.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/socket/have_sock_cloexec.c
++++ b/socket/have_sock_cloexec.c
 @@ -16,9 +16,14 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
diff --git a/packages/glibc/2.14.1/270-china.patch b/packages/glibc/2.14.1/0019-china.patch
index 41d7759..b323cf6 100644
--- a/packages/glibc/2.14.1/270-china.patch
+++ b/packages/glibc/2.14.1/0019-china.patch
@@ -1,8 +1,11 @@
 
 
-diff -durN glibc-2.13.orig/localedata/locales/zh_TW glibc-2.13/localedata/locales/zh_TW
---- glibc-2.13.orig/localedata/locales/zh_TW	2004-11-01 00:42:28.000000000 +0100
-+++ glibc-2.13/localedata/locales/zh_TW	2009-11-13 00:50:17.000000000 +0100
+---
+ localedata/locales/zh_TW |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/localedata/locales/zh_TW
++++ b/localedata/locales/zh_TW
 @@ -1,7 +1,7 @@
  comment_char %
  escape_char /
diff --git a/packages/glibc/2.14.1/280-new-valencian-locale.patch b/packages/glibc/2.14.1/0020-new-valencian-locale.patch
index 4cdd108..fab1ee3 100644
--- a/packages/glibc/2.14.1/280-new-valencian-locale.patch
+++ b/packages/glibc/2.14.1/0020-new-valencian-locale.patch
@@ -1,10 +1,14 @@
 http://bugs.gentoo.org/show_bug.cgi?id=131815
 http://sourceware.org/bugzilla/show_bug.cgi?id=2522
 
-diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
---- glibc-2.13.orig/localedata/SUPPORTED	2009-04-18 10:43:52.000000000 +0200
-+++ glibc-2.13/localedata/SUPPORTED	2009-11-13 00:50:20.000000000 +0100
-@@ -72,6 +72,8 @@
+---
+ localedata/SUPPORTED              |    2 
+ localedata/locales/ca_ES@valencia |   96 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 98 insertions(+)
+
+--- a/localedata/SUPPORTED
++++ b/localedata/SUPPORTED
+@@ -73,6 +73,8 @@
  ca_ES.UTF-8/UTF-8 \
  ca_ES/ISO-8859-1 \
  ca_ES@euro/ISO-8859-15 \
@@ -13,9 +17,8 @@ diff -durN glibc-2.13.orig/localedata/SUPPORTED glibc-2.13/localedata/SUPPORTED
  ca_FR.UTF-8/UTF-8 \
  ca_FR/ISO-8859-15 \
  ca_IT.UTF-8/UTF-8 \
-diff -durN glibc-2.13.orig/localedata/locales/ca_ES@valencia glibc-2.13/localedata/locales/ca_ES@valencia
---- glibc-2.13.orig/localedata/locales/ca_ES@valencia	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/localedata/locales/ca_ES@valencia	2009-11-13 00:50:20.000000000 +0100
+--- /dev/null
++++ b/localedata/locales/ca_ES@valencia
 @@ -0,0 +1,96 @@
 +comment_char %
 +escape_char  /
diff --git a/packages/glibc/2.14.1/300-macos-cross-rpcgen.patch b/packages/glibc/2.14.1/0021-macos-cross-rpcgen.patch
index e654644..b439b0f 100644
--- a/packages/glibc/2.14.1/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.14.1/0021-macos-cross-rpcgen.patch
@@ -14,11 +14,13 @@ Date:   Sat Sep 7 00:01:08 2013 +0800
     Signed-off-by: Jia Liu <proljc@gmail.com>
     Signed-off-by: Mike Frysinger <vapier@gentoo.org>
 
-diff --git a/sunrpc/rpc/types.h b/sunrpc/rpc/types.h
-index 3dca5c4..beded52 100644
+---
+ sunrpc/rpc/types.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
 --- a/sunrpc/rpc/types.h
 +++ b/sunrpc/rpc/types.h
-@@ -69,6 +69,11 @@ typedef unsigned long rpcport_t;
+@@ -69,6 +69,11 @@
  #include <sys/types.h>
  #endif
  
diff --git a/packages/glibc/2.14.1/300-nscd-one-fork.patch b/packages/glibc/2.14.1/0022-nscd-one-fork.patch
index adc9b3f..47217b3 100644
--- a/packages/glibc/2.14.1/300-nscd-one-fork.patch
+++ b/packages/glibc/2.14.1/0022-nscd-one-fork.patch
@@ -2,9 +2,12 @@ only fork one to assist in stop-start-daemon assumptions about daemon behavior
 
 http://bugs.gentoo.org/190785
 
-diff -durN glibc-2.13.orig/nscd/nscd.c glibc-2.13/nscd/nscd.c
---- glibc-2.13.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
-+++ glibc-2.13/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
+---
+ nscd/nscd.c |   12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+--- a/nscd/nscd.c
++++ b/nscd/nscd.c
 @@ -182,6 +182,9 @@
        if (pid != 0)
  	exit (0);
diff --git a/packages/glibc/2.14.1/310-hppa-nptl-carlos.patch b/packages/glibc/2.14.1/0023-hppa-nptl-carlos.patch
index 4c028b2..a385a6b 100644
--- a/packages/glibc/2.14.1/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.14.1/0023-hppa-nptl-carlos.patch
@@ -1,8 +1,17 @@
 
 
-diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
---- glibc-2.13.orig/elf/rtld.c	2009-04-17 02:00:08.000000000 +0200
-+++ glibc-2.13/elf/rtld.c	2009-11-13 00:50:26.000000000 +0100
+---
+ elf/rtld.c                    |   10 +++++-----
+ include/atomic.h              |   26 +++++++++++++-------------
+ nptl/Makefile                 |   35 ++++++++++++++++++++++++++++++++---
+ nptl/pthread_barrier_wait.c   |    2 +-
+ nptl/sysdeps/pthread/Makefile |    2 ++
+ stdio-common/Makefile         |    2 +-
+ sunrpc/clnt_udp.c             |    2 +-
+ 7 files changed, 55 insertions(+), 24 deletions(-)
+
+--- a/elf/rtld.c
++++ b/elf/rtld.c
 @@ -392,14 +392,14 @@
       know it is available.  We do not have to clear the memory if we
       do not have to use the temporary bootstrap_map.  Global variables
@@ -23,9 +32,8 @@ diff -durN glibc-2.13.orig/elf/rtld.c glibc-2.13/elf/rtld.c
  # endif
  # if USE___THREAD
    bootstrap_map.l_tls_modid = 0;
-diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
---- glibc-2.13.orig/include/atomic.h	2009-02-09 00:49:53.000000000 +0100
-+++ glibc-2.13/include/atomic.h	2009-11-13 00:50:26.000000000 +0100
+--- a/include/atomic.h
++++ b/include/atomic.h
 @@ -185,7 +185,7 @@
       __typeof (*(mem)) __atg5_value = (newvalue);			      \
  									      \
@@ -143,9 +151,8 @@ diff -durN glibc-2.13.orig/include/atomic.h glibc-2.13/include/atomic.h
       while (__builtin_expect						      \
  	    (atomic_compare_and_exchange_bool_acq (__atg19_memp,	      \
  						   __atg19_old | __atg19_mask,\
-diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
---- glibc-2.13.orig/nptl/Makefile	2008-11-12 14:38:23.000000000 +0100
-+++ glibc-2.13/nptl/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/Makefile
++++ b/nptl/Makefile
 @@ -265,9 +265,9 @@
  # Files which must not be linked with libpthread.
  tests-nolibpthread = tst-unload
@@ -195,9 +202,8 @@ diff -durN glibc-2.13.orig/nptl/Makefile glibc-2.13/nptl/Makefile
  CFLAGS-tst-align.c += $(stack-align-test-flags)
  CFLAGS-tst-align3.c += $(stack-align-test-flags)
  CFLAGS-tst-initializers1.c = -W -Wall -Werror
-diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_barrier_wait.c
---- glibc-2.13.orig/nptl/pthread_barrier_wait.c	2007-08-01 06:18:50.000000000 +0200
-+++ glibc-2.13/nptl/pthread_barrier_wait.c	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/pthread_barrier_wait.c
++++ b/nptl/pthread_barrier_wait.c
 @@ -64,7 +64,7 @@
        do
  	lll_futex_wait (&ibarrier->curr_event, event,
@@ -207,9 +213,8 @@ diff -durN glibc-2.13.orig/nptl/pthread_barrier_wait.c glibc-2.13/nptl/pthread_b
      }
  
    /* Make sure the init_count is stored locally or in a register.  */
-diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps/pthread/Makefile
---- glibc-2.13.orig/nptl/sysdeps/pthread/Makefile	2006-02-28 08:09:41.000000000 +0100
-+++ glibc-2.13/nptl/sysdeps/pthread/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/nptl/sysdeps/pthread/Makefile
++++ b/nptl/sysdeps/pthread/Makefile
 @@ -33,7 +33,9 @@
  
  ifeq ($(have-forced-unwind),yes)
@@ -220,9 +225,8 @@ diff -durN glibc-2.13.orig/nptl/sysdeps/pthread/Makefile glibc-2.13/nptl/sysdeps
  endif
  endif
  
-diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefile
---- glibc-2.13.orig/stdio-common/Makefile	2009-04-11 07:29:56.000000000 +0200
-+++ glibc-2.13/stdio-common/Makefile	2009-11-13 00:50:26.000000000 +0100
+--- a/stdio-common/Makefile
++++ b/stdio-common/Makefile
 @@ -82,7 +82,7 @@
  	$(SHELL) -e tst-printf.sh $(common-objpfx) '$(run-program-prefix)'
  endif
@@ -232,10 +236,9 @@ diff -durN glibc-2.13.orig/stdio-common/Makefile glibc-2.13/stdio-common/Makefil
  CFLAGS-vfwprintf.c = -Wno-uninitialized
  CFLAGS-tst-printf.c = -Wno-format
  CFLAGS-tstdiomisc.c = -Wno-format
-diff -durN glibc-2.13.orig/sunrpc/clnt_udp.c glibc-2.13/sunrpc/clnt_udp.c
---- glibc-2.13.orig/sunrpc/clnt_udp.c	2008-07-26 10:42:44.000000000 +0200
-+++ glibc-2.13/sunrpc/clnt_udp.c	2009-11-13 00:50:26.000000000 +0100
-@@ -456,7 +456,7 @@
+--- a/sunrpc/clnt_udp.c
++++ b/sunrpc/clnt_udp.c
+@@ -463,7 +463,7 @@
        while (inlen < 0 && errno == EINTR);
        if (inlen < 0)
  	{
diff --git a/packages/glibc/2.14.1/340-dl_execstack-PaX-support.patch b/packages/glibc/2.14.1/0024-dl_execstack-PaX-support.patch
index 2402af0..7b56549 100644
--- a/packages/glibc/2.14.1/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.14.1/0024-dl_execstack-PaX-support.patch
@@ -8,10 +8,14 @@
 
 	Patch also NPTL. Bug #116086. <kevquinn@gentoo.org> (20 Dec 2005).
 
-diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
---- glibc-2.13.orig/nptl/allocatestack.c	2009-01-29 21:34:16.000000000 +0100
-+++ glibc-2.13/nptl/allocatestack.c	2009-11-13 00:50:33.000000000 +0100
-@@ -329,7 +329,8 @@
+---
+ nptl/allocatestack.c                   |    3 ++-
+ sysdeps/unix/sysv/linux/dl-execstack.c |   19 ++++++++++++++++---
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+--- a/nptl/allocatestack.c
++++ b/nptl/allocatestack.c
+@@ -335,7 +335,8 @@
  # error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP"
  #endif
    if (mprotect (stack, len, PROT_READ | PROT_WRITE | PROT_EXEC) != 0)
@@ -21,9 +25,8 @@ diff -durN glibc-2.13.orig/nptl/allocatestack.c glibc-2.13/nptl/allocatestack.c
  
    return 0;
  }
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/dl-execstack.c	2006-01-08 09:21:15.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/dl-execstack.c	2009-11-13 00:50:33.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/dl-execstack.c
++++ b/sysdeps/unix/sysv/linux/dl-execstack.c
 @@ -63,7 +63,10 @@
        else
  # endif
diff --git a/packages/glibc/2.14.1/350-pre20040117-pt_pax.patch b/packages/glibc/2.14.1/0025-pre20040117-pt_pax.patch
index f8f6b83..ec17d24 100644
--- a/packages/glibc/2.14.1/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.14.1/0025-pre20040117-pt_pax.patch
@@ -1,8 +1,11 @@
 
 
-diff -durN glibc-2.13.orig/elf/elf.h glibc-2.13/elf/elf.h
---- glibc-2.13.orig/elf/elf.h	2009-04-15 02:15:54.000000000 +0200
-+++ glibc-2.13/elf/elf.h	2009-11-13 00:50:35.000000000 +0100
+---
+ elf/elf.h |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/elf/elf.h
++++ b/elf/elf.h
 @@ -580,6 +580,7 @@
  #define PT_GNU_EH_FRAME	0x6474e550	/* GCC .eh_frame_hdr segment */
  #define PT_GNU_STACK	0x6474e551	/* Indicates stack executability */
diff --git a/packages/glibc/2.14.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.14.1/0026-tests-sandbox-libdl-paths.patch
index 9f78c52..1c4ee59 100644
--- a/packages/glibc/2.14.1/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.14.1/0026-tests-sandbox-libdl-paths.patch
@@ -15,9 +15,23 @@ Fix by Wormo
 
 http://bugs.gentoo.org/56898
 
-diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
---- glibc-2.13.orig/grp/tst_fgetgrent.sh	2001-07-06 06:54:46.000000000 +0200
-+++ glibc-2.13/grp/tst_fgetgrent.sh	2009-11-13 00:50:37.000000000 +0100
+---
+ grp/tst_fgetgrent.sh        |    3 ++-
+ iconvdata/run-iconv-test.sh |    2 +-
+ iconvdata/tst-table.sh      |    5 ++++-
+ intl/tst-codeset.sh         |    3 +++
+ intl/tst-gettext.sh         |    5 ++++-
+ intl/tst-gettext2.sh        |    5 ++++-
+ intl/tst-translit.sh        |    5 ++++-
+ malloc/tst-mtrace.sh        |    5 ++++-
+ nptl/tst-tls6.sh            |    4 ++--
+ posix/globtest.sh           |    2 +-
+ posix/tst-getconf.sh        |    5 ++++-
+ posix/wordexp-tst.sh        |    5 ++++-
+ 12 files changed, 37 insertions(+), 12 deletions(-)
+
+--- a/grp/tst_fgetgrent.sh
++++ b/grp/tst_fgetgrent.sh
 @@ -24,7 +24,8 @@
  rtld_installed_name=$1; shift
  
@@ -28,9 +42,8 @@ diff -durN glibc-2.13.orig/grp/tst_fgetgrent.sh glibc-2.13/grp/tst_fgetgrent.sh
  
  result=0
  
-diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-iconv-test.sh
---- glibc-2.13.orig/iconvdata/run-iconv-test.sh	2008-05-15 03:59:44.000000000 +0200
-+++ glibc-2.13/iconvdata/run-iconv-test.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/run-iconv-test.sh
++++ b/iconvdata/run-iconv-test.sh
 @@ -34,7 +34,7 @@
  export GCONV_PATH
  
@@ -40,9 +53,8 @@ diff -durN glibc-2.13.orig/iconvdata/run-iconv-test.sh glibc-2.13/iconvdata/run-
  
  # How the start the iconv(1) program.
  ICONV='$codir/elf/ld.so --library-path $LIBPATH --inhibit-rpath ${from}.so \
-diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table.sh
---- glibc-2.13.orig/iconvdata/tst-table.sh	2002-04-24 23:39:35.000000000 +0200
-+++ glibc-2.13/iconvdata/tst-table.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/iconvdata/tst-table.sh
++++ b/iconvdata/tst-table.sh
 @@ -59,8 +59,11 @@
    irreversible=${charset}.irreversible
  fi
@@ -56,9 +68,8 @@ diff -durN glibc-2.13.orig/iconvdata/tst-table.sh glibc-2.13/iconvdata/tst-table
  ${objpfx}tst-table-from ${charset} \
    > ${objpfx}tst-${charset}.table
  
-diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
---- glibc-2.13.orig/intl/tst-codeset.sh	2005-04-06 04:18:35.000000000 +0200
-+++ glibc-2.13/intl/tst-codeset.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-codeset.sh
++++ b/intl/tst-codeset.sh
 @@ -37,6 +37,9 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -69,9 +80,8 @@ diff -durN glibc-2.13.orig/intl/tst-codeset.sh glibc-2.13/intl/tst-codeset.sh
  ${common_objpfx}elf/ld.so --library-path $common_objpfx \
  ${objpfx}tst-codeset > ${objpfx}tst-codeset.out
  
-diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
---- glibc-2.13.orig/intl/tst-gettext.sh	2004-08-15 21:28:18.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext.sh
++++ b/intl/tst-gettext.sh
 @@ -51,9 +51,12 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -86,9 +96,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext.sh glibc-2.13/intl/tst-gettext.sh
  ${objpfx}tst-gettext > ${objpfx}tst-gettext.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
---- glibc-2.13.orig/intl/tst-gettext2.sh	2005-05-04 19:54:48.000000000 +0200
-+++ glibc-2.13/intl/tst-gettext2.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-gettext2.sh
++++ b/intl/tst-gettext2.sh
 @@ -65,8 +65,11 @@
  LOCPATH=${objpfx}domaindir
  export LOCPATH
@@ -102,9 +111,8 @@ diff -durN glibc-2.13.orig/intl/tst-gettext2.sh glibc-2.13/intl/tst-gettext2.sh
  ${objpfx}tst-gettext2 > ${objpfx}tst-gettext2.out ${objpfx}domaindir &&
  cmp ${objpfx}tst-gettext2.out - <<EOF
  String1 - Lang1: 1st string
-diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
---- glibc-2.13.orig/intl/tst-translit.sh	2005-05-04 19:56:10.000000000 +0200
-+++ glibc-2.13/intl/tst-translit.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/intl/tst-translit.sh
++++ b/intl/tst-translit.sh
 @@ -36,7 +36,10 @@
  LOCPATH=${common_objpfx}localedata
  export LOCPATH
@@ -117,9 +125,8 @@ diff -durN glibc-2.13.orig/intl/tst-translit.sh glibc-2.13/intl/tst-translit.sh
  ${objpfx}tst-translit > ${objpfx}tst-translit.out ${objpfx}domaindir
  
  exit $?
-diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
---- glibc-2.13.orig/malloc/tst-mtrace.sh	2005-10-15 01:40:35.000000000 +0200
-+++ glibc-2.13/malloc/tst-mtrace.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/malloc/tst-mtrace.sh
++++ b/malloc/tst-mtrace.sh
 @@ -24,9 +24,12 @@
  status=0
  trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15
@@ -134,9 +141,8 @@ diff -durN glibc-2.13.orig/malloc/tst-mtrace.sh glibc-2.13/malloc/tst-mtrace.sh
    ${common_objpfx}malloc/tst-mtrace || status=1
  
  if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then
-diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
---- glibc-2.13.orig/nptl/tst-tls6.sh	2003-09-03 00:02:59.000000000 +0200
-+++ glibc-2.13/nptl/tst-tls6.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/nptl/tst-tls6.sh
++++ b/nptl/tst-tls6.sh
 @@ -5,8 +5,8 @@
  rtld_installed_name=$1; shift
  logfile=$common_objpfx/nptl/tst-tls6.out
@@ -148,9 +154,8 @@ diff -durN glibc-2.13.orig/nptl/tst-tls6.sh glibc-2.13/nptl/tst-tls6.sh
  tst_tls5="${elf_objpfx}${rtld_installed_name} --library-path ${library_path} \
  	  ${common_objpfx}/nptl/tst-tls5"
  
-diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
---- glibc-2.13.orig/posix/globtest.sh	2008-12-06 07:05:39.000000000 +0100
-+++ glibc-2.13/posix/globtest.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/globtest.sh
++++ b/posix/globtest.sh
 @@ -18,7 +18,7 @@
  esac
  
@@ -160,9 +165,8 @@ diff -durN glibc-2.13.orig/posix/globtest.sh glibc-2.13/posix/globtest.sh
  
  # Since we use `sort' we must make sure to use the same locale everywhere.
  LC_ALL=C
-diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
---- glibc-2.13.orig/posix/tst-getconf.sh	2002-09-01 13:11:25.000000000 +0200
-+++ glibc-2.13/posix/tst-getconf.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/tst-getconf.sh
++++ b/posix/tst-getconf.sh
 @@ -10,7 +10,10 @@
  else
    rtld_installed_name=$1; shift
@@ -175,9 +179,8 @@ diff -durN glibc-2.13.orig/posix/tst-getconf.sh glibc-2.13/posix/tst-getconf.sh
    }
  fi
  
-diff -durN glibc-2.13.orig/posix/wordexp-tst.sh glibc-2.13/posix/wordexp-tst.sh
---- glibc-2.13.orig/posix/wordexp-tst.sh	2000-10-20 18:23:30.000000000 +0200
-+++ glibc-2.13/posix/wordexp-tst.sh	2009-11-13 00:50:37.000000000 +0100
+--- a/posix/wordexp-tst.sh
++++ b/posix/wordexp-tst.sh
 @@ -19,8 +19,11 @@
  "
  export IFS
diff --git a/packages/glibc/2.14.1/380-dont-build-timezone.patch b/packages/glibc/2.14.1/0027-dont-build-timezone.patch
index 11c358e..9bbcde3 100644
--- a/packages/glibc/2.14.1/380-dont-build-timezone.patch
+++ b/packages/glibc/2.14.1/0027-dont-build-timezone.patch
@@ -1,9 +1,12 @@
 timezone data has been split into the package sys-libs/timezone-data
 
-diff -durN glibc-2.13.orig/Makeconfig glibc-2.13/Makeconfig
---- glibc-2.13.orig/Makeconfig	2009-11-13 00:50:13.000000000 +0100
-+++ glibc-2.13/Makeconfig	2009-11-13 00:50:41.000000000 +0100
-@@ -944,7 +944,7 @@
+---
+ Makeconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -946,7 +946,7 @@
  	      stdlib stdio-common libio malloc string wcsmbs time dirent    \
  	      grp pwd posix io termios resource misc socket sysvipc gmon    \
  	      gnulib iconv iconvdata wctype manual shadow gshadow po argp   \
diff --git a/packages/glibc/2.14.1/400-alpha-xstat.patch b/packages/glibc/2.14.1/0028-alpha-xstat.patch
index 6e4ab8f..4fa9517 100644
--- a/packages/glibc/2.14.1/400-alpha-xstat.patch
+++ b/packages/glibc/2.14.1/0028-alpha-xstat.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-05-09 08:54:20.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -386,6 +386,11 @@
  # define __ASSUME_GETDENTS32_D_TYPE	1
  #endif
diff --git a/packages/glibc/2.14.1/0029-alpha-creat.patch b/packages/glibc/2.14.1/0029-alpha-creat.patch
new file mode 100644
index 0000000..6ef5278
--- /dev/null
+++ b/packages/glibc/2.14.1/0029-alpha-creat.patch
@@ -0,0 +1,17 @@
+alpha does not have a __NR_creat
+
+http://bugs.gentoo.org/227275
+http://sourceware.org/bugzilla/show_bug.cgi?id=6650
+
+---
+ sysdeps/unix/sysv/linux/wordsize-64/creat64.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
++++ b/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
+@@ -1 +1,5 @@
+ /* Defined as alias for the syscall.  */
++#include <sysdep.h>
++#ifndef __NR_creat
++#include "../../../../../io/creat64.c"
++#endif
diff --git a/packages/glibc/2.14.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.14.1/0030-alpha_alpha-add-fdatasync-support.patch
index 372f34c..eeef22a 100644
--- a/packages/glibc/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.14.1/0030-alpha_alpha-add-fdatasync-support.patch
@@ -13,10 +13,9 @@
  sysdeps/unix/sysv/linux/syscalls.list     |    1 
  4 files changed, 76 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/unix/sysv/linux/Makefile
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile	2009-03-02 17:15:13.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/Makefile	2009-11-13 00:51:04.000000000 +0100
-@@ -20,6 +20,7 @@
+--- a/sysdeps/unix/sysv/linux/Makefile
++++ b/sysdeps/unix/sysv/linux/Makefile
+@@ -21,6 +21,7 @@
  		   setfsuid setfsgid makedev epoll_pwait signalfd \
  		   eventfd eventfd_read eventfd_write prlimit
  
@@ -24,9 +23,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/Makefile glibc-2.13/sysdeps/u
  CFLAGS-gethostid.c = -fexceptions
  
  sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/fdatasync.c	2009-11-13 00:51:04.000000000 +0100
+--- /dev/null
++++ b/sysdeps/unix/sysv/linux/fdatasync.c
 @@ -0,0 +1,69 @@
 +/* fdatasync -- synchronize at least the data part of a file with 
 +   the underlying media. Linux version. 
@@ -97,9 +95,8 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/fdatasync.c glibc-2.13/sysdep
 +
 +weak_alias (__fdatasync, fdatasync)
 +
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:50:45.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2009-11-13 00:51:04.000000000 +0100
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -459,6 +459,12 @@
  # define __ASSUME_FUTEX_LOCK_PI	1
  #endif
@@ -113,10 +110,9 @@ diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/kernel-features.h glibc-2.13/
  /* Support for utimensat syscall was added in 2.6.22, on SH
     only after 2.6.22-rc1.  */
  #if __LINUX_KERNEL_VERSION >= 0x020616 \
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/syscalls.list	2008-08-02 01:29:08.000000000 +0200
-+++ glibc-2.13/sysdeps/unix/sysv/linux/syscalls.list	2009-11-13 00:51:04.000000000 +0100
-@@ -11,7 +11,6 @@
+--- a/sysdeps/unix/sysv/linux/syscalls.list
++++ b/sysdeps/unix/sysv/linux/syscalls.list
+@@ -12,7 +12,6 @@
  epoll_create1	EXTRA	epoll_create1	i:i	epoll_create1
  epoll_ctl	EXTRA	epoll_ctl	i:iiip	epoll_ctl
  epoll_wait	EXTRA	epoll_wait	Ci:ipii	epoll_wait
diff --git a/packages/glibc/2.14.1/560-ppc-atomic.patch b/packages/glibc/2.14.1/0031-ppc-atomic.patch
index ee1cb90..a38c1c5 100644
--- a/packages/glibc/2.14.1/560-ppc-atomic.patch
+++ b/packages/glibc/2.14.1/0031-ppc-atomic.patch
@@ -1,14 +1,13 @@
 sniped from suse
 
-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           |   66 ++++++++++-----------
+ sysdeps/powerpc/powerpc32/bits/atomic.h |   16 ++---
+ sysdeps/powerpc/powerpc64/bits/atomic.h |   98 ++++++++++++++++----------------
+ 3 files changed, 90 insertions(+), 90 deletions(-)
 
-diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powerpc/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h	2007-03-26 22:15:28.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/bits/atomic.h
++++ b/sysdeps/powerpc/bits/atomic.h
 @@ -85,14 +85,14 @@
        __typeof (*(mem)) __tmp;						      \
        __typeof (mem)  __memp = (mem);					      \
@@ -151,9 +150,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/bits/atomic.h glibc-2.13/sysdeps/powe
  		       : "cr0", "memory");				      \
       __val;								      \
    })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h	2007-03-26 22:15:45.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc32/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc32/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc32/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp;							      \
@@ -192,9 +190,8 @@ diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc32/bits/atomic.h glibc-2.13/sy
  		    : "cr0", "memory");					      \
    __tmp != 0;								      \
  })
-diff -durN glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h
---- glibc-2.13.orig/sysdeps/powerpc/powerpc64/bits/atomic.h	2007-03-26 22:16:03.000000000 +0200
-+++ glibc-2.13/sysdeps/powerpc/powerpc64/bits/atomic.h	2009-11-13 00:51:19.000000000 +0100
+--- a/sysdeps/powerpc/powerpc64/bits/atomic.h
++++ b/sysdeps/powerpc/powerpc64/bits/atomic.h
 @@ -44,14 +44,14 @@
  ({									      \
    unsigned int __tmp, __tmp2;						      \
diff --git a/packages/glibc/2.14.1/630-mips_shn_undef-hack.patch b/packages/glibc/2.14.1/0032-mips_shn_undef-hack.patch
index 791d76c..a12c977 100644
--- a/packages/glibc/2.14.1/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.14.1/0032-mips_shn_undef-hack.patch
@@ -1,10 +1,13 @@
-diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
---- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
-+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
-@@ -301,6 +301,12 @@
+---
+ elf/dl-lookup.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/elf/dl-lookup.c
++++ b/elf/dl-lookup.c
+@@ -300,6 +300,12 @@
  	      /* FALLTHROUGH */
  	    case STB_GLOBAL:
-	    success:
+ 	    success:
 +#ifdef __mips__
 +	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
 +		 symbols, we skip them. */
diff --git a/packages/glibc/2.14.1/640-alpha-atfcts.patch b/packages/glibc/2.14.1/0033-alpha-atfcts.patch
index 7a8a94a..2eff918 100644
--- a/packages/glibc/2.14.1/640-alpha-atfcts.patch
+++ b/packages/glibc/2.14.1/0033-alpha-atfcts.patch
@@ -1,5 +1,9 @@
---- glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h	2010-07-27 14:34:39.000000000 +0300
-+++ glibc-2.13/sysdeps/unix/sysv/linux/kernel-features.h.new	2011-03-10 18:54:37.686795979 +0200
+---
+ sysdeps/unix/sysv/linux/kernel-features.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sysdeps/unix/sysv/linux/kernel-features.h
++++ b/sysdeps/unix/sysv/linux/kernel-features.h
 @@ -437,7 +437,8 @@
     the code.  On PPC they were introduced in 2.6.17-rc1,
     on SH in 2.6.19-rc1.  */
diff --git a/packages/glibc/2.14.1/650-syslog.patch b/packages/glibc/2.14.1/0034-syslog.patch
index c20cafc..a2d9722 100644
--- a/packages/glibc/2.14.1/650-syslog.patch
+++ b/packages/glibc/2.14.1/0034-syslog.patch
@@ -1,6 +1,9 @@
-diff -durN glibc-cvs-2.9.orig/misc/syslog.c glibc-cvs-2.9/misc/syslog.c
---- glibc-cvs-2.9.orig/misc/syslog.c	2009-06-01 10:16:50.000000000 +0200
-+++ glibc-cvs-2.9/misc/syslog.c	2009-06-01 10:17:20.000000000 +0200
+---
+ misc/syslog.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/misc/syslog.c
++++ b/misc/syslog.c
 @@ -152,7 +152,7 @@
  #define	INTERNALLOG	LOG_ERR|LOG_CONS|LOG_PERROR|LOG_PID
  	/* Check for invalid bits. */
diff --git a/packages/glibc/2.14.1/0035-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.14.1/0035-debug-readlink_chk-readklinkat_chk.patch
new file mode 100644
index 0000000..0b930f3
--- /dev/null
+++ b/packages/glibc/2.14.1/0035-debug-readlink_chk-readklinkat_chk.patch
@@ -0,0 +1,27 @@
+---
+ debug/readlink_chk.c   |    2 +-
+ debug/readlinkat_chk.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/debug/readlink_chk.c
++++ b/debug/readlink_chk.c
+@@ -25,7 +25,7 @@
+ 
+ 
+ ssize_t
+-__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
++__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
+ {
+   if (len > buflen)
+     __chk_fail ();
+--- a/debug/readlinkat_chk.c
++++ b/debug/readlinkat_chk.c
+@@ -21,7 +21,7 @@
+ 
+ 
+ ssize_t
+-__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
++__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
+ 		  size_t buflen)
+ {
+   if (len > buflen)
diff --git a/packages/glibc/2.14.1/900-cpuid-include.patch b/packages/glibc/2.14.1/0036-cpuid-include.patch
index 0b8db71..ac5c153 100644
--- a/packages/glibc/2.14.1/900-cpuid-include.patch
+++ b/packages/glibc/2.14.1/0036-cpuid-include.patch
@@ -17,9 +17,13 @@ Tested x86_64 (native).
 
 Origin: http://sourceware.org/ml/libc-alpha/2012-03/msg00177.html
 
-diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/configure
---- glibc-2.14.1.orig/sysdeps/i386/configure	2011-10-07 20:48:55.000000000 +1100
-+++ glibc-2.14.1/sysdeps/i386/configure	2012-07-25 01:23:11.799118927 +1000
+---
+ sysdeps/i386/configure    |  502 +---------------------------------------------
+ sysdeps/i386/configure.in |    5 
+ 2 files changed, 17 insertions(+), 490 deletions(-)
+
+--- a/sysdeps/i386/configure
++++ b/sysdeps/i386/configure
 @@ -16,23 +16,6 @@
    as_fn_set_status $1
    exit $1
@@ -610,9 +614,8 @@ diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure glibc-2.14.1/sysdeps/i386/con
    $as_echo_n "(cached) " >&6
  else
    if { ac_try='${CC-cc} -mno-vzeroupper -xc /dev/null -S -o /dev/null'
-diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/configure.in
---- glibc-2.14.1.orig/sysdeps/i386/configure.in	2011-10-07 20:48:55.000000000 +1100
-+++ glibc-2.14.1/sysdeps/i386/configure.in	2012-07-25 01:00:49.345025022 +1000
+--- a/sysdeps/i386/configure.in
++++ b/sysdeps/i386/configure.in
 @@ -1,8 +1,9 @@
  GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
  # Local configure fragment for sysdeps/i386.
@@ -625,4 +628,3 @@ diff -Nur glibc-2.14.1.orig/sysdeps/i386/configure.in glibc-2.14.1/sysdeps/i386/
  
  AC_CACHE_CHECK(if -g produces usable source locations for assembler-with-cpp,
  	       libc_cv_cpp_asm_debuginfo, [dnl
-
diff --git a/packages/glibc/2.14.1/910-asm-i686.patch b/packages/glibc/2.14.1/0037-asm-i686.patch
index b049887..ea3c88a 100644
--- a/packages/glibc/2.14.1/910-asm-i686.patch
+++ b/packages/glibc/2.14.1/0037-asm-i686.patch
@@ -18,9 +18,13 @@ Description:             Fixes the following build problem with GCC-4.5.0:
 ./sysdeps/i386/fpu/s_frexp.S:66: Error: junk `.get_pc_thunk.dx' after expression
 make[2]: *** [/mnt/lfs/sources/libc-build/math/s_frexp.os] Error 1
 
-diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/nptl/sysdeps/pthread/pt-initfini.c	2010-04-17 11:34:06.882681001 +0000
+---
+ nptl/sysdeps/pthread/pt-initfini.c    |    5 +++++
+ sysdeps/unix/sysv/linux/i386/sysdep.h |    4 ++++
+ 2 files changed, 9 insertions(+)
+
+--- a/nptl/sysdeps/pthread/pt-initfini.c
++++ b/nptl/sysdeps/pthread/pt-initfini.c
 @@ -45,6 +45,11 @@
  /* Embed an #include to pull in the alignment and .end directives. */
  asm ("\n#include \"defs.h\"");
@@ -33,9 +37,8 @@ diff -Naur glibc-2.11.1.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.11.1/npt
  /* The initial common code ends here. */
  asm ("\n/*@HEADER_ENDS*/");
  
-diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-12-08 20:10:20.000000000 +0000
-+++ glibc-2.11.1/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-04-17 11:34:06.882681001 +0000
+--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
++++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
 @@ -29,6 +29,10 @@
  #include <dl-sysdep.h>
  #include <tls.h>
@@ -47,4 +50,3 @@ diff -Naur glibc-2.11.1.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.11.1/
  
  /* For Linux we can use the system call table in the header file
  	/usr/include/asm/unistd.h
-
diff --git a/packages/glibc/2.14.1/920-fix-rpc_parse-format.patch b/packages/glibc/2.14.1/0038-fix-rpc_parse-format.patch
index 37e58da..341d541 100644
--- a/packages/glibc/2.14.1/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.14.1/0038-fix-rpc_parse-format.patch
@@ -45,11 +45,13 @@ Date:   Tue Nov 8 23:44:51 2016 +0000
             [$(run-built-tests) = yes] (tests-special): Add $(rpcgen-tests).
             [$(run-built-tests) = yes] ($(rpcgen-tests)): New rule.
 
-diff --git a/sunrpc/rpc_parse.c b/sunrpc/rpc_parse.c
-index 1a1df6d8c2..505a6554cf 100644
+---
+ sunrpc/rpc_parse.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/sunrpc/rpc_parse.c
 +++ b/sunrpc/rpc_parse.c
-@@ -521,7 +521,7 @@ static void
+@@ -521,7 +521,7 @@
  get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
  {
    token tok;
diff --git a/packages/glibc/2.14.1/940-nis-bogus-conditional.patch b/packages/glibc/2.14.1/0039-nis-bogus-conditional.patch
index 09b38cf..732b859 100644
--- a/packages/glibc/2.14.1/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.14.1/0039-nis-bogus-conditional.patch
@@ -47,11 +47,13 @@ Date:   Wed Dec 21 23:44:01 2016 +0000
             * nis/nss_nisplus/nisplus-alias.c (_nss_nisplus_getaliasbyname_r):
             Compare name == NULL, not name != NULL.
 
-diff --git a/nis/nss_nisplus/nisplus-alias.c b/nis/nss_nisplus/nisplus-alias.c
-index 7f698b4e6d..cb5acce01d 100644
+---
+ nis/nss_nisplus/nisplus-alias.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/nis/nss_nisplus/nisplus-alias.c
 +++ b/nis/nss_nisplus/nisplus-alias.c
-@@ -291,7 +291,7 @@ _nss_nisplus_getaliasbyname_r (const char *name, struct aliasent *alias,
+@@ -293,7 +293,7 @@
  	return status;
      }
  
diff --git a/packages/glibc/2.14.1/950-initfini-ppc64.patch b/packages/glibc/2.14.1/0040-initfini-ppc64.patch
index 87f8d23..247c103 100644
--- a/packages/glibc/2.14.1/950-initfini-ppc64.patch
+++ b/packages/glibc/2.14.1/0040-initfini-ppc64.patch
@@ -7,8 +7,12 @@ commit 1fe05ea95e1460e5e1cf1568a8ce3982f0f02de6
 Author: Ryan S. Arnold <rsa@us.ibm.com>
 Date: Tue May 3 17:26:17 2011 -0500
 
---- glibc.orig/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:06.713568781 -0800
-+++ glibc/sysdeps/powerpc/powerpc64/Makefile	2012-12-22 19:10:50.318605517 -0800
+---
+ sysdeps/powerpc/powerpc64/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sysdeps/powerpc/powerpc64/Makefile
++++ b/sysdeps/powerpc/powerpc64/Makefile
 @@ -31,7 +31,7 @@
  ifneq ($(elf),no)
  # The initfini generation code doesn't work in the presence of -fPIC, so
diff --git a/packages/glibc/2.14.1/996-obsolete-rpc.patch b/packages/glibc/2.14.1/0041-obsolete-rpc.patch
index 38cb521..eef16c7 100644
--- a/packages/glibc/2.14.1/996-obsolete-rpc.patch
+++ b/packages/glibc/2.14.1/0041-obsolete-rpc.patch
@@ -10,11 +10,68 @@ Date:   Thu May 10 20:16:53 2012 +0200
       after the TI-RPC library becomes fully sufficient for the needs of
       existing applications.
 
-diff --git a/config.h.in b/config.h.in
-index 787873b4c0..54952609ef 100644
+---
+ config.h.in            |    3 +++
+ config.make.in         |    1 +
+ configure              |   18 ++++++++++++++++++
+ configure.in           |   11 +++++++++++
+ include/libc-symbols.h |    7 ++++++-
+ nis/Makefile           |    6 ++++++
+ sunrpc/Makefile        |    6 ++++++
+ sunrpc/auth_des.c      |    4 ++--
+ sunrpc/auth_none.c     |    2 +-
+ sunrpc/auth_unix.c     |    4 ++--
+ sunrpc/authdes_prot.c  |    4 ++--
+ sunrpc/authuxprot.c    |    2 +-
+ sunrpc/clnt_gen.c      |    2 +-
+ sunrpc/clnt_perr.c     |   10 +++++-----
+ sunrpc/clnt_raw.c      |    2 +-
+ sunrpc/clnt_simp.c     |    2 +-
+ sunrpc/clnt_tcp.c      |    2 +-
+ sunrpc/clnt_udp.c      |    6 +++---
+ sunrpc/clnt_unix.c     |    2 +-
+ sunrpc/des_crypt.c     |    4 ++--
+ sunrpc/des_soft.c      |    2 +-
+ sunrpc/get_myaddr.c    |    2 +-
+ sunrpc/key_call.c      |   18 +++++++++---------
+ sunrpc/key_prot.c      |   20 ++++++++++----------
+ sunrpc/netname.c       |   10 +++++-----
+ sunrpc/pm_getmaps.c    |    2 +-
+ sunrpc/pm_getport.c    |    4 ++--
+ sunrpc/pmap_clnt.c     |    4 ++--
+ sunrpc/pmap_prot.c     |    2 +-
+ sunrpc/pmap_prot2.c    |    2 +-
+ sunrpc/pmap_rmt.c      |    8 ++++----
+ sunrpc/publickey.c     |    4 ++--
+ sunrpc/rpc_cmsg.c      |    2 +-
+ sunrpc/rpc_common.c    |    2 +-
+ sunrpc/rpc_dtable.c    |    2 +-
+ sunrpc/rpc_prot.c      |   14 +++++++-------
+ sunrpc/rpc_thread.c    |    8 ++++----
+ sunrpc/rtime.c         |    2 +-
+ sunrpc/svc.c           |   32 ++++++++++++++++----------------
+ sunrpc/svc_auth.c      |    2 +-
+ sunrpc/svc_raw.c       |    2 +-
+ sunrpc/svc_run.c       |    4 ++--
+ sunrpc/svc_tcp.c       |    4 ++--
+ sunrpc/svc_udp.c       |    6 +++---
+ sunrpc/svc_unix.c      |    4 ++--
+ sunrpc/svcauth_des.c   |    2 +-
+ sunrpc/xcrypt.c        |    4 ++--
+ sunrpc/xdr.c           |   44 ++++++++++++++++++++++----------------------
+ sunrpc/xdr_array.c     |    4 ++--
+ sunrpc/xdr_float.c     |    4 ++--
+ sunrpc/xdr_intXX_t.c   |   20 ++++++++++----------
+ sunrpc/xdr_mem.c       |    2 +-
+ sunrpc/xdr_rec.c       |    8 ++++----
+ sunrpc/xdr_ref.c       |    4 ++--
+ sunrpc/xdr_sizeof.c    |    2 +-
+ sunrpc/xdr_stdio.c     |    2 +-
+ 56 files changed, 203 insertions(+), 153 deletions(-)
+
 --- a/config.h.in
 +++ b/config.h.in
-@@ -178,6 +178,9 @@
+@@ -204,6 +204,9 @@
  /* Define if `.ctors' and `.dtors' sections shouldn't be used.  */
  #undef	NO_CTORS_DTORS_SECTIONS
  
@@ -24,11 +81,9 @@ index 787873b4c0..54952609ef 100644
  /*
   */
  
-diff --git a/config.make.in b/config.make.in
-index 5f6f9e281d..6c4d04ee33 100644
 --- a/config.make.in
 +++ b/config.make.in
-@@ -96,6 +96,7 @@ add-on-subdirs = @add_on_subdirs@
+@@ -102,6 +102,7 @@
  sysdeps-add-ons = @sysdeps_add_ons@
  cross-compiling = @cross_compiling@
  force-install = @force_install@
@@ -36,11 +91,9 @@ index 5f6f9e281d..6c4d04ee33 100644
  
  # Build tools.
  CC = @CC@
-diff --git a/configure b/configure
-index 1c5f4adbea..c7cb47d0c2 100755
 --- a/configure
 +++ b/configure
-@@ -687,6 +687,7 @@ multi_arch
+@@ -682,6 +682,7 @@
  base_machine
  add_on_subdirs
  add_ons
@@ -48,7 +101,7 @@ index 1c5f4adbea..c7cb47d0c2 100755
  libc_cv_nss_crypt
  experimental_malloc
  all_warnings
-@@ -779,6 +780,7 @@ enable_kernel
+@@ -784,6 +785,7 @@
  enable_multi_arch
  enable_experimental_malloc
  enable_nss_crypt
@@ -56,7 +109,7 @@ index 1c5f4adbea..c7cb47d0c2 100755
  with_cpu
  '
        ac_precious_vars='build_alias
-@@ -1434,6 +1436,8 @@ Optional Features:
+@@ -1444,6 +1446,8 @@
    --enable-experimental-malloc
                            enable experimental malloc features
    --enable-nss-crypt      enable libcrypt to use nss
@@ -65,7 +118,7 @@ index 1c5f4adbea..c7cb47d0c2 100755
  
  Optional Packages:
    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-@@ -3746,6 +3750,20 @@ else
+@@ -3823,6 +3827,20 @@
  fi
  
  
@@ -86,11 +139,9 @@ index 1c5f4adbea..c7cb47d0c2 100755
  # The way shlib-versions is used to generate soversions.mk uses a
  # fairly simplistic model for name recognition that can't distinguish
  # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
-diff --git a/configure.in b/configure.in
-index 19a2c1a0f0..4eb9277e8c 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -252,6 +252,17 @@ else
+@@ -316,6 +316,17 @@
  fi
  AC_SUBST(libc_cv_nss_crypt)
  
@@ -108,11 +159,9 @@ index 19a2c1a0f0..4eb9277e8c 100644
  # The way shlib-versions is used to generate soversions.mk uses a
  # fairly simplistic model for name recognition that can't distinguish
  # i486-pc-linux-gnu fully from i486-pc-gnu.  So we mutate a $host_os
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 951e46a6e3..0c3274e253 100644
 --- a/include/libc-symbols.h
 +++ b/include/libc-symbols.h
-@@ -556,7 +556,12 @@ for linking")
+@@ -635,7 +635,12 @@
  # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
  # define libc_hidden_def(name) hidden_def (name)
  # define libc_hidden_weak(name) hidden_weak (name)
@@ -126,11 +175,9 @@ index 951e46a6e3..0c3274e253 100644
  # define libc_hidden_ver(local, name) hidden_ver (local, name)
  # define libc_hidden_data_def(name) hidden_data_def (name)
  # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/nis/Makefile b/nis/Makefile
-index a48753f7a9..b412cee304 100644
 --- a/nis/Makefile
 +++ b/nis/Makefile
-@@ -23,6 +23,12 @@ subdir	:= nis
+@@ -23,6 +23,12 @@
  
  aux			:= nis_hash
  
@@ -143,11 +190,9 @@ index a48753f7a9..b412cee304 100644
  distribute		:= nss-nis.h nss-nisplus.h nis_intern.h Banner \
  			   nisplus-parser.h nis_xdr.h nss \
  			   $(wildcard rpcsvc/*.[hx])
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index e61efd02b3..3b79dcdb72 100644
 --- a/sunrpc/Makefile
 +++ b/sunrpc/Makefile
-@@ -60,6 +60,10 @@ generated-dirs := rpcsvc
+@@ -61,6 +61,10 @@
  
  include ../Makeconfig
  
@@ -158,7 +203,7 @@ index e61efd02b3..3b79dcdb72 100644
  ifeq ($(versioning),yes)
  need-export-routines := auth_des auth_unix clnt_gen clnt_perr clnt_tcp \
  			clnt_udp get_myaddr key_call netname pm_getport \
-@@ -73,9 +77,11 @@ routines := auth_none authuxprot bindrsvprt clnt_raw clnt_simp \
+@@ -74,9 +78,11 @@
  	    svc_simple xdr_float xdr_rec publickey authdes_prot \
  	    des_crypt des_impl des_soft key_prot openchild rtime svcauth_des \
  	    clnt_unix svc_unix create_xid $(need-export-routines)
@@ -170,11 +215,9 @@ index e61efd02b3..3b79dcdb72 100644
  
  # We do not build rpcinfo anymore.  It is not needed for a bootstrap
  # and not wanted on complete systems.
-diff --git a/sunrpc/auth_des.c b/sunrpc/auth_des.c
-index 96bbcfc328..0408d60826 100644
 --- a/sunrpc/auth_des.c
 +++ b/sunrpc/auth_des.c
-@@ -117,7 +117,7 @@ authdes_create (const char *servername, u_int window,
+@@ -117,7 +117,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (authdes_create)
  #else
@@ -183,7 +226,7 @@ index 96bbcfc328..0408d60826 100644
  #endif
  
  AUTH *
-@@ -211,7 +211,7 @@ failed:
+@@ -211,7 +211,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (authdes_pk_create)
  #else
@@ -192,11 +235,9 @@ index 96bbcfc328..0408d60826 100644
  #endif
  
  /*
-diff --git a/sunrpc/auth_none.c b/sunrpc/auth_none.c
-index 5f252a9544..3af5966794 100644
 --- a/sunrpc/auth_none.c
 +++ b/sunrpc/auth_none.c
-@@ -95,7 +95,7 @@ authnone_create (void)
+@@ -95,7 +95,7 @@
    __libc_once (authnone_private_guard, authnone_create_once);
    return &authnone_private.no_client;
  }
@@ -205,11 +246,9 @@ index 5f252a9544..3af5966794 100644
  
  static bool_t
  authnone_marshal (AUTH *client, XDR *xdrs)
-diff --git a/sunrpc/auth_unix.c b/sunrpc/auth_unix.c
-index d3b5dc7dee..68b42d7b1f 100644
 --- a/sunrpc/auth_unix.c
 +++ b/sunrpc/auth_unix.c
-@@ -149,7 +149,7 @@ no_memory:
+@@ -151,7 +151,7 @@
    marshal_new_auth (auth);
    return auth;
  }
@@ -218,7 +257,7 @@ index d3b5dc7dee..68b42d7b1f 100644
  
  /*
   * Returns an auth handle with parameters determined by doing lots of
-@@ -216,7 +216,7 @@ authunix_create_default (void)
+@@ -218,7 +218,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (authunix_create_default)
  #else
@@ -227,11 +266,9 @@ index d3b5dc7dee..68b42d7b1f 100644
  #endif
  
  /*
-diff --git a/sunrpc/authdes_prot.c b/sunrpc/authdes_prot.c
-index 0a25bac143..164c1223ca 100644
 --- a/sunrpc/authdes_prot.c
 +++ b/sunrpc/authdes_prot.c
-@@ -63,7 +63,7 @@ xdr_authdes_cred (XDR *xdrs, struct authdes_cred *cred)
+@@ -63,7 +63,7 @@
        return FALSE;
      }
  }
@@ -240,38 +277,32 @@ index 0a25bac143..164c1223ca 100644
  
  
  bool_t
-@@ -78,4 +78,4 @@ xdr_authdes_verf (register XDR *xdrs, register struct authdes_verf *verf)
+@@ -78,4 +78,4 @@
  		       sizeof (verf->adv_int_u)));
    return TRUE;
  }
 -libc_hidden_nolink (xdr_authdes_verf, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (xdr_authdes_verf, GLIBC_2_1)
-diff --git a/sunrpc/authuxprot.c b/sunrpc/authuxprot.c
-index 64da1799e0..d37faee0c7 100644
 --- a/sunrpc/authuxprot.c
 +++ b/sunrpc/authuxprot.c
-@@ -63,4 +63,4 @@ xdr_authunix_parms (XDR * xdrs, struct authunix_parms *p)
+@@ -63,4 +63,4 @@
      }
    return FALSE;
  }
 -libc_hidden_nolink (xdr_authunix_parms, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_authunix_parms, GLIBC_2_0)
-diff --git a/sunrpc/clnt_gen.c b/sunrpc/clnt_gen.c
-index 2b7096cf20..df34672d72 100644
 --- a/sunrpc/clnt_gen.c
 +++ b/sunrpc/clnt_gen.c
-@@ -175,5 +175,5 @@ clnt_create (const char *hostname, u_long prog, u_long vers,
+@@ -175,5 +175,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_create)
  #else
 -libc_hidden_nolink (clnt_create, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (clnt_create, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/clnt_perr.c b/sunrpc/clnt_perr.c
-index 175370ebfc..b4f84c92e8 100644
 --- a/sunrpc/clnt_perr.c
 +++ b/sunrpc/clnt_perr.c
-@@ -127,7 +127,7 @@ clnt_sperror (CLIENT * rpch, const char *msg)
+@@ -130,7 +130,7 @@
  
    return str;
  }
@@ -280,7 +311,7 @@ index 175370ebfc..b4f84c92e8 100644
  
  void
  clnt_perror (CLIENT * rpch, const char *msg)
-@@ -137,7 +137,7 @@ clnt_perror (CLIENT * rpch, const char *msg)
+@@ -140,7 +140,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_perror)
  #else
@@ -289,7 +320,7 @@ index 175370ebfc..b4f84c92e8 100644
  #endif
  
  
-@@ -270,7 +270,7 @@ clnt_perrno (enum clnt_stat num)
+@@ -273,7 +273,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_perrno)
  #else
@@ -298,7 +329,7 @@ index 175370ebfc..b4f84c92e8 100644
  #endif
  
  char *
-@@ -308,7 +308,7 @@ clnt_spcreateerror (const char *msg)
+@@ -311,7 +311,7 @@
  
    return str;
  }
@@ -307,7 +338,7 @@ index 175370ebfc..b4f84c92e8 100644
  
  void
  clnt_pcreateerror (const char *msg)
-@@ -318,7 +318,7 @@ clnt_pcreateerror (const char *msg)
+@@ -321,7 +321,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnt_pcreateerror)
  #else
@@ -316,11 +347,9 @@ index 175370ebfc..b4f84c92e8 100644
  #endif
  
  struct auth_errtab
-diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c
-index 95e3eae988..4004c6b6a8 100644
 --- a/sunrpc/clnt_raw.c
 +++ b/sunrpc/clnt_raw.c
-@@ -129,7 +129,7 @@ clntraw_create (u_long prog, u_long vers)
+@@ -129,7 +129,7 @@
    client->cl_auth = authnone_create ();
    return client;
  }
@@ -329,11 +358,9 @@ index 95e3eae988..4004c6b6a8 100644
  
  static enum clnt_stat
  clntraw_call (h, proc, xargs, argsp, xresults, resultsp, timeout)
-diff --git a/sunrpc/clnt_simp.c b/sunrpc/clnt_simp.c
-index d2dd3b307a..d612df09a0 100644
 --- a/sunrpc/clnt_simp.c
 +++ b/sunrpc/clnt_simp.c
-@@ -139,7 +139,7 @@ callrpc (const char *host, u_long prognum, u_long versnum, u_long procnum,
+@@ -139,7 +139,7 @@
      crp->valid = 0;
    return (int) clnt_stat;
  }
@@ -342,11 +369,9 @@ index d2dd3b307a..d612df09a0 100644
  
  #ifdef _RPC_THREAD_SAFE_
  void
-diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
-index d1fc43dbfd..6bd4c8c0cd 100644
 --- a/sunrpc/clnt_tcp.c
 +++ b/sunrpc/clnt_tcp.c
-@@ -220,7 +220,7 @@ fooy:
+@@ -222,7 +222,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clnttcp_create)
  #else
@@ -355,11 +380,9 @@ index d1fc43dbfd..6bd4c8c0cd 100644
  #endif
  
  static enum clnt_stat
-diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
-index 294e13a58c..7ecf2ef5a5 100644
 --- a/sunrpc/clnt_udp.c
 +++ b/sunrpc/clnt_udp.c
-@@ -239,7 +239,7 @@ fooy:
+@@ -240,7 +240,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__libc_clntudp_bufcreate)
  #else
@@ -368,7 +391,7 @@ index 294e13a58c..7ecf2ef5a5 100644
  #endif
  
  CLIENT *
-@@ -250,7 +250,7 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
+@@ -251,7 +251,7 @@
    return __libc_clntudp_bufcreate (raddr, program, version, wait,
  				   sockp, sendsz, recvsz, 0);
  }
@@ -377,7 +400,7 @@ index 294e13a58c..7ecf2ef5a5 100644
  
  CLIENT *
  clntudp_create (raddr, program, version, wait, sockp)
-@@ -266,7 +266,7 @@ clntudp_create (raddr, program, version, wait, sockp)
+@@ -267,7 +267,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (clntudp_create)
  #else
@@ -386,11 +409,9 @@ index 294e13a58c..7ecf2ef5a5 100644
  #endif
  
  static int
-diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
-index 282127bb8b..776ceab484 100644
 --- a/sunrpc/clnt_unix.c
 +++ b/sunrpc/clnt_unix.c
-@@ -200,7 +200,7 @@ fooy:
+@@ -202,7 +202,7 @@
    mem_free ((caddr_t) h, sizeof (CLIENT));
    return (CLIENT *) NULL;
  }
@@ -399,11 +420,9 @@ index 282127bb8b..776ceab484 100644
  
  static enum clnt_stat
  clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
-diff --git a/sunrpc/des_crypt.c b/sunrpc/des_crypt.c
-index 8745900b82..22a34b7f3a 100644
 --- a/sunrpc/des_crypt.c
 +++ b/sunrpc/des_crypt.c
-@@ -102,7 +102,7 @@ cbc_crypt (char *key, char *buf, unsigned int len, unsigned int mode,
+@@ -102,7 +102,7 @@
    COPY8 (dp.des_ivec, ivec);
    return err;
  }
@@ -412,38 +431,32 @@ index 8745900b82..22a34b7f3a 100644
  
  /*
   * ECB mode encryption
-@@ -115,4 +115,4 @@ ecb_crypt (char *key, char *buf, unsigned int len, unsigned int mode)
+@@ -115,4 +115,4 @@
    dp.des_mode = ECB;
    return common_crypt (key, buf, len, mode, &dp);
  }
 -libc_hidden_nolink (ecb_crypt, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (ecb_crypt, GLIBC_2_1)
-diff --git a/sunrpc/des_soft.c b/sunrpc/des_soft.c
-index 27d918c64d..cddef5d76b 100644
 --- a/sunrpc/des_soft.c
 +++ b/sunrpc/des_soft.c
-@@ -70,4 +70,4 @@ des_setparity (char *p)
+@@ -70,4 +70,4 @@
        p++;
      }
  }
 -libc_hidden_nolink (des_setparity, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (des_setparity, GLIBC_2_1)
-diff --git a/sunrpc/get_myaddr.c b/sunrpc/get_myaddr.c
-index def5b7a74a..24407b53ec 100644
 --- a/sunrpc/get_myaddr.c
 +++ b/sunrpc/get_myaddr.c
-@@ -99,5 +99,5 @@ get_myaddress (struct sockaddr_in *addr)
+@@ -99,5 +99,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (get_myaddress)
  #else
 -libc_hidden_nolink (get_myaddress, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (get_myaddress, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/key_call.c b/sunrpc/key_call.c
-index 6d08bf8e80..e0a076b47f 100644
 --- a/sunrpc/key_call.c
 +++ b/sunrpc/key_call.c
-@@ -80,7 +80,7 @@ key_setsecret (char *secretkey)
+@@ -80,7 +80,7 @@
      }
    return 0;
  }
@@ -452,7 +465,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  /* key_secretkey_is_set() returns 1 if the keyserver has a secret key
   * stored for the caller's effective uid; it returns 0 otherwise
-@@ -109,7 +109,7 @@ key_secretkey_is_set (void)
+@@ -109,7 +109,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (key_secretkey_is_set)
  #else
@@ -461,7 +474,7 @@ index 6d08bf8e80..e0a076b47f 100644
  #endif
  
  int
-@@ -133,7 +133,7 @@ key_encryptsession (char *remotename, des_block *deskey)
+@@ -133,7 +133,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -470,7 +483,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_decryptsession (char *remotename, des_block *deskey)
-@@ -155,7 +155,7 @@ key_decryptsession (char *remotename, des_block *deskey)
+@@ -155,7 +155,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -479,7 +492,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_encryptsession_pk (char *remotename, netobj *remotekey,
-@@ -180,7 +180,7 @@ key_encryptsession_pk (char *remotename, netobj *remotekey,
+@@ -180,7 +180,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -488,7 +501,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_decryptsession_pk (char *remotename, netobj *remotekey,
-@@ -205,7 +205,7 @@ key_decryptsession_pk (char *remotename, netobj *remotekey,
+@@ -205,7 +205,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -497,7 +510,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_gendes (des_block *key)
-@@ -239,7 +239,7 @@ key_gendes (des_block *key)
+@@ -239,7 +239,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (key_gendes)
  #else
@@ -506,7 +519,7 @@ index 6d08bf8e80..e0a076b47f 100644
  #endif
  
  int
-@@ -259,7 +259,7 @@ key_setnet (struct key_netstarg *arg)
+@@ -259,7 +259,7 @@
      }
    return 1;
  }
@@ -515,7 +528,7 @@ index 6d08bf8e80..e0a076b47f 100644
  
  int
  key_get_conv (char *pkey, des_block *deskey)
-@@ -278,7 +278,7 @@ key_get_conv (char *pkey, des_block *deskey)
+@@ -278,7 +278,7 @@
    *deskey = res.cryptkeyres_u.deskey;
    return 0;
  }
@@ -524,11 +537,9 @@ index 6d08bf8e80..e0a076b47f 100644
  
  /*
   * Hack to allow the keyserver to use AUTH_DES (for authenticated
-diff --git a/sunrpc/key_prot.c b/sunrpc/key_prot.c
-index dd73f5e3cb..2899c9a448 100644
 --- a/sunrpc/key_prot.c
 +++ b/sunrpc/key_prot.c
-@@ -38,7 +38,7 @@ xdr_keystatus (XDR * xdrs, keystatus * objp)
+@@ -38,7 +38,7 @@
  
    return TRUE;
  }
@@ -537,7 +548,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_keybuf (XDR * xdrs, keybuf objp)
-@@ -48,7 +48,7 @@ xdr_keybuf (XDR * xdrs, keybuf objp)
+@@ -48,7 +48,7 @@
  
    return TRUE;
  }
@@ -546,7 +557,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_netnamestr (XDR * xdrs, netnamestr * objp)
-@@ -58,7 +58,7 @@ xdr_netnamestr (XDR * xdrs, netnamestr * objp)
+@@ -58,7 +58,7 @@
  
    return TRUE;
  }
@@ -555,7 +566,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_cryptkeyarg (XDR * xdrs, cryptkeyarg * objp)
-@@ -71,7 +71,7 @@ xdr_cryptkeyarg (XDR * xdrs, cryptkeyarg * objp)
+@@ -71,7 +71,7 @@
  
    return TRUE;
  }
@@ -564,7 +575,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_cryptkeyarg2 (XDR * xdrs, cryptkeyarg2 * objp)
-@@ -84,7 +84,7 @@ xdr_cryptkeyarg2 (XDR * xdrs, cryptkeyarg2 * objp)
+@@ -84,7 +84,7 @@
      return FALSE;
    return TRUE;
  }
@@ -573,7 +584,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_cryptkeyres (XDR * xdrs, cryptkeyres * objp)
-@@ -102,7 +102,7 @@ xdr_cryptkeyres (XDR * xdrs, cryptkeyres * objp)
+@@ -102,7 +102,7 @@
      }
    return TRUE;
  }
@@ -582,7 +593,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_unixcred (XDR * xdrs, unixcred * objp)
-@@ -117,7 +117,7 @@ xdr_unixcred (XDR * xdrs, unixcred * objp)
+@@ -117,7 +117,7 @@
      return FALSE;
    return TRUE;
  }
@@ -591,7 +602,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_getcredres (XDR * xdrs, getcredres * objp)
-@@ -135,7 +135,7 @@ xdr_getcredres (XDR * xdrs, getcredres * objp)
+@@ -135,7 +135,7 @@
      }
    return TRUE;
  }
@@ -600,7 +611,7 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_key_netstarg (XDR * xdrs, key_netstarg * objp)
-@@ -148,7 +148,7 @@ xdr_key_netstarg (XDR * xdrs, key_netstarg * objp)
+@@ -148,7 +148,7 @@
      return FALSE;
    return TRUE;
  }
@@ -609,17 +620,15 @@ index dd73f5e3cb..2899c9a448 100644
  
  bool_t
  xdr_key_netstres (XDR * xdrs, key_netstres * objp)
-@@ -166,4 +166,4 @@ xdr_key_netstres (XDR * xdrs, key_netstres * objp)
+@@ -166,4 +166,4 @@
      }
    return TRUE;
  }
 -libc_hidden_nolink (xdr_key_netstres, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_key_netstres, GLIBC_2_0)
-diff --git a/sunrpc/netname.c b/sunrpc/netname.c
-index 0b4980074c..197d503eae 100644
 --- a/sunrpc/netname.c
 +++ b/sunrpc/netname.c
-@@ -54,7 +54,7 @@ user2netname (char netname[MAXNETNAMELEN + 1], const uid_t uid,
+@@ -55,7 +55,7 @@
      netname[i - 1] = '\0';
    return 1;
  }
@@ -628,7 +637,7 @@ index 0b4980074c..197d503eae 100644
  
  int
  host2netname (char netname[MAXNETNAMELEN + 1], const char *host,
-@@ -118,7 +118,7 @@ host2netname (char netname[MAXNETNAMELEN + 1], const char *host,
+@@ -119,7 +119,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (host2netname)
  #else
@@ -637,7 +646,7 @@ index 0b4980074c..197d503eae 100644
  #endif
  
  int
-@@ -134,7 +134,7 @@ getnetname (char name[MAXNETNAMELEN + 1])
+@@ -135,7 +135,7 @@
      dummy = user2netname (name, uid, NULL);
    return (dummy);
  }
@@ -646,7 +655,7 @@ index 0b4980074c..197d503eae 100644
  
  /* Type of the lookup function for netname2user.  */
  typedef int (*netname2user_function) (const char netname[MAXNETNAMELEN + 1],
-@@ -187,7 +187,7 @@ netname2user (const char netname[MAXNETNAMELEN + 1], uid_t * uidp, gid_t * gidp,
+@@ -188,7 +188,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (netname2user)
  #else
@@ -655,27 +664,23 @@ index 0b4980074c..197d503eae 100644
  #endif
  
  int
-@@ -214,4 +214,4 @@ netname2host (const char netname[MAXNETNAMELEN + 1], char *hostname,
+@@ -216,4 +216,4 @@
  
    return 1;
  }
 -libc_hidden_nolink (netname2host, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (netname2host, GLIBC_2_1)
-diff --git a/sunrpc/pm_getmaps.c b/sunrpc/pm_getmaps.c
-index 6b61d324f9..6f7ad10ef6 100644
 --- a/sunrpc/pm_getmaps.c
 +++ b/sunrpc/pm_getmaps.c
-@@ -84,4 +84,4 @@ pmap_getmaps (struct sockaddr_in *address)
+@@ -84,4 +84,4 @@
    address->sin_port = 0;
    return head;
  }
 -libc_hidden_nolink (pmap_getmaps, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (pmap_getmaps, GLIBC_2_0)
-diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
-index 58974a5661..f10f87250d 100644
 --- a/sunrpc/pm_getport.c
 +++ b/sunrpc/pm_getport.c
-@@ -142,7 +142,7 @@ __libc_rpc_getport (address, program, version, protocol, timeout_sec,
+@@ -142,7 +142,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__libc_rpc_getport)
  #else
@@ -684,17 +689,15 @@ index 58974a5661..f10f87250d 100644
  #endif
  
  
-@@ -160,4 +160,4 @@ pmap_getport (address, program, version, protocol)
+@@ -160,4 +160,4 @@
  {
    return __libc_rpc_getport (address, program, version, protocol, 5, 60);
  }
 -libc_hidden_nolink (pmap_getport, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (pmap_getport, GLIBC_2_0)
-diff --git a/sunrpc/pmap_clnt.c b/sunrpc/pmap_clnt.c
-index 36479f0e5c..5d7d185766 100644
 --- a/sunrpc/pmap_clnt.c
 +++ b/sunrpc/pmap_clnt.c
-@@ -131,7 +131,7 @@ pmap_set (u_long program, u_long version, int protocol, u_short port)
+@@ -131,7 +131,7 @@
    /* (void)close(socket); CLNT_DESTROY closes it */
    return rslt;
  }
@@ -703,37 +706,31 @@ index 36479f0e5c..5d7d185766 100644
  
  /*
   * Remove the mapping between program,version and port.
-@@ -162,4 +162,4 @@ pmap_unset (u_long program, u_long version)
+@@ -162,4 +162,4 @@
    /* (void)close(socket); CLNT_DESTROY already closed it */
    return rslt;
  }
 -libc_hidden_nolink (pmap_unset, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (pmap_unset, GLIBC_2_0)
-diff --git a/sunrpc/pmap_prot.c b/sunrpc/pmap_prot.c
-index 5a2e052728..8df41dc5f2 100644
 --- a/sunrpc/pmap_prot.c
 +++ b/sunrpc/pmap_prot.c
-@@ -49,4 +49,4 @@ xdr_pmap (xdrs, regs)
+@@ -49,4 +49,4 @@
      return xdr_u_long (xdrs, &regs->pm_port);
    return FALSE;
  }
 -libc_hidden_nolink (xdr_pmap, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_pmap, GLIBC_2_0)
-diff --git a/sunrpc/pmap_prot2.c b/sunrpc/pmap_prot2.c
-index 3213898ce8..57b0800178 100644
 --- a/sunrpc/pmap_prot2.c
 +++ b/sunrpc/pmap_prot2.c
-@@ -110,4 +110,4 @@ xdr_pmaplist (xdrs, rp)
+@@ -110,4 +110,4 @@
        rp = freeing ? &next : &((*rp)->pml_next);
      }
  }
 -libc_hidden_nolink (xdr_pmaplist, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_pmaplist, GLIBC_2_0)
-diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c
-index 16f322773e..fd8de85589 100644
 --- a/sunrpc/pmap_rmt.c
 +++ b/sunrpc/pmap_rmt.c
-@@ -104,7 +104,7 @@ pmap_rmtcall (addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_p
+@@ -104,7 +104,7 @@
    addr->sin_port = 0;
    return stat;
  }
@@ -742,7 +739,7 @@ index 16f322773e..fd8de85589 100644
  
  
  /*
-@@ -137,7 +137,7 @@ xdr_rmtcall_args (XDR *xdrs, struct rmtcallargs *cap)
+@@ -137,7 +137,7 @@
      }
    return FALSE;
  }
@@ -751,7 +748,7 @@ index 16f322773e..fd8de85589 100644
  
  /*
   * XDR remote call results
-@@ -160,7 +160,7 @@ xdr_rmtcallres (xdrs, crp)
+@@ -160,7 +160,7 @@
      }
    return FALSE;
  }
@@ -760,17 +757,15 @@ index 16f322773e..fd8de85589 100644
  
  
  /*
-@@ -388,4 +388,4 @@ done_broad:
+@@ -388,4 +388,4 @@
    AUTH_DESTROY (unix_auth);
    return stat;
  }
 -libc_hidden_nolink (clnt_broadcast, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (clnt_broadcast, GLIBC_2_0)
-diff --git a/sunrpc/publickey.c b/sunrpc/publickey.c
-index 4d0b09874c..089b544953 100644
 --- a/sunrpc/publickey.c
 +++ b/sunrpc/publickey.c
-@@ -75,7 +75,7 @@ getpublickey (const char *name, char *key)
+@@ -76,7 +76,7 @@
  
    return status == NSS_STATUS_SUCCESS;
  }
@@ -779,24 +774,20 @@ index 4d0b09874c..089b544953 100644
  
  
  int
-@@ -118,4 +118,4 @@ getsecretkey (const char *name, char *key, const char *passwd)
+@@ -119,4 +119,4 @@
  
    return status == NSS_STATUS_SUCCESS;
  }
 -libc_hidden_nolink (getsecretkey, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (getsecretkey, GLIBC_2_0)
-diff --git a/sunrpc/rpc_cmsg.c b/sunrpc/rpc_cmsg.c
-index ed70104b68..62d95fcc83 100644
 --- a/sunrpc/rpc_cmsg.c
 +++ b/sunrpc/rpc_cmsg.c
-@@ -194,4 +194,4 @@ xdr_callmsg (XDR *xdrs, struct rpc_msg *cmsg)
+@@ -194,4 +194,4 @@
      return xdr_opaque_auth (xdrs, &(cmsg->rm_call.cb_verf));
    return FALSE;
  }
 -libc_hidden_nolink (xdr_callmsg, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_callmsg, GLIBC_2_0)
-diff --git a/sunrpc/rpc_common.c b/sunrpc/rpc_common.c
-index 44b4b38f4d..710191163c 100644
 --- a/sunrpc/rpc_common.c
 +++ b/sunrpc/rpc_common.c
 @@ -45,7 +45,7 @@
@@ -808,21 +799,17 @@ index 44b4b38f4d..710191163c 100644
  fd_set svc_fdset;
  struct rpc_createerr rpc_createerr;
  struct pollfd *svc_pollfd;
-diff --git a/sunrpc/rpc_dtable.c b/sunrpc/rpc_dtable.c
-index 9bee215496..81ddf8f55a 100644
 --- a/sunrpc/rpc_dtable.c
 +++ b/sunrpc/rpc_dtable.c
-@@ -46,4 +46,4 @@ _rpc_dtablesize (void)
+@@ -46,4 +46,4 @@
  
    return size;
  }
 -libc_hidden_nolink (_rpc_dtablesize, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (_rpc_dtablesize, GLIBC_2_0)
-diff --git a/sunrpc/rpc_prot.c b/sunrpc/rpc_prot.c
-index 9a23cc1b02..dc24f3673b 100644
 --- a/sunrpc/rpc_prot.c
 +++ b/sunrpc/rpc_prot.c
-@@ -57,7 +57,7 @@ xdr_opaque_auth (XDR *xdrs, struct opaque_auth *ap)
+@@ -57,7 +57,7 @@
  		      &ap->oa_length, MAX_AUTH_BYTES);
    return FALSE;
  }
@@ -831,7 +818,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /*
   * XDR a DES block
-@@ -67,7 +67,7 @@ xdr_des_block (XDR *xdrs, des_block *blkp)
+@@ -67,7 +67,7 @@
  {
    return xdr_opaque (xdrs, (caddr_t) blkp, sizeof (des_block));
  }
@@ -840,7 +827,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /* * * * * * * * * * * * * * XDR RPC MESSAGE * * * * * * * * * * * * * * * */
  
-@@ -95,7 +95,7 @@ xdr_accepted_reply (XDR *xdrs, struct accepted_reply *ar)
+@@ -95,7 +95,7 @@
      }
    return TRUE;		/* TRUE => open ended set of problems */
  }
@@ -849,7 +836,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /*
   * XDR the MSG_DENIED part of a reply message union
-@@ -118,7 +118,7 @@ xdr_rejected_reply (XDR *xdrs, struct rejected_reply *rr)
+@@ -118,7 +118,7 @@
      }
    return FALSE;
  }
@@ -858,7 +845,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  static const struct xdr_discrim reply_dscrm[3] =
  {
-@@ -142,7 +142,7 @@ xdr_replymsg (xdrs, rmsg)
+@@ -142,7 +142,7 @@
  		      NULL_xdrproc_t);
    return FALSE;
  }
@@ -867,7 +854,7 @@ index 9a23cc1b02..dc24f3673b 100644
  
  
  /*
-@@ -167,7 +167,7 @@ xdr_callhdr (xdrs, cmsg)
+@@ -167,7 +167,7 @@
      return xdr_u_long (xdrs, &(cmsg->rm_call.cb_vers));
    return FALSE;
  }
@@ -876,17 +863,15 @@ index 9a23cc1b02..dc24f3673b 100644
  
  /* ************************** Client utility routine ************* */
  
-@@ -277,4 +277,4 @@ _seterr_reply (struct rpc_msg *msg,
+@@ -277,4 +277,4 @@
        break;
      }
  }
 -libc_hidden_nolink (_seterr_reply, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (_seterr_reply, GLIBC_2_0)
-diff --git a/sunrpc/rpc_thread.c b/sunrpc/rpc_thread.c
-index ac4c18fcee..94d9f1fd80 100644
 --- a/sunrpc/rpc_thread.c
 +++ b/sunrpc/rpc_thread.c
-@@ -97,7 +97,7 @@ __rpc_thread_svc_fdset (void)
+@@ -97,7 +97,7 @@
  		return &svc_fdset;
  	return &tvp->svc_fdset_s;
  }
@@ -895,7 +880,7 @@ index ac4c18fcee..94d9f1fd80 100644
  
  struct rpc_createerr *
  __rpc_thread_createerr (void)
-@@ -109,7 +109,7 @@ __rpc_thread_createerr (void)
+@@ -109,7 +109,7 @@
  		return &rpc_createerr;
  	return &tvp->rpc_createerr_s;
  }
@@ -904,7 +889,7 @@ index ac4c18fcee..94d9f1fd80 100644
  
  struct pollfd **
  __rpc_thread_svc_pollfd (void)
-@@ -124,7 +124,7 @@ __rpc_thread_svc_pollfd (void)
+@@ -124,7 +124,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__rpc_thread_svc_pollfd)
  #else
@@ -913,7 +898,7 @@ index ac4c18fcee..94d9f1fd80 100644
  #endif
  
  int *
-@@ -140,7 +140,7 @@ __rpc_thread_svc_max_pollfd (void)
+@@ -140,7 +140,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (__rpc_thread_svc_max_pollfd)
  #else
@@ -922,21 +907,17 @@ index ac4c18fcee..94d9f1fd80 100644
  #endif
  
  #endif /* _RPC_THREAD_SAFE_ */
-diff --git a/sunrpc/rtime.c b/sunrpc/rtime.c
-index 8506df554c..bcb280b48f 100644
 --- a/sunrpc/rtime.c
 +++ b/sunrpc/rtime.c
-@@ -140,4 +140,4 @@ rtime (struct sockaddr_in *addrp, struct rpc_timeval *timep,
+@@ -140,4 +140,4 @@
    timep->tv_usec = 0;
    return 0;
  }
 -libc_hidden_nolink (rtime, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (rtime, GLIBC_2_1)
-diff --git a/sunrpc/svc.c b/sunrpc/svc.c
-index e1f4a322e8..103770a42c 100644
 --- a/sunrpc/svc.c
 +++ b/sunrpc/svc.c
-@@ -115,7 +115,7 @@ xprt_register (SVCXPRT *xprt)
+@@ -115,7 +115,7 @@
  					       POLLRDNORM | POLLRDBAND);
      }
  }
@@ -945,7 +926,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* De-activate a transport handle. */
  void
-@@ -139,7 +139,7 @@ xprt_unregister (SVCXPRT *xprt)
+@@ -139,7 +139,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xprt_unregister)
  #else
@@ -954,7 +935,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  
-@@ -218,7 +218,7 @@ pmap_it:
+@@ -218,7 +218,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_register)
  #else
@@ -963,7 +944,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Remove a service program from the callout list. */
-@@ -242,7 +242,7 @@ svc_unregister (rpcprog_t prog, rpcvers_t vers)
+@@ -242,7 +242,7 @@
    if (! svc_is_mapped (prog, vers))
      pmap_unset (prog, vers);
  }
@@ -972,7 +953,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* ******************* REPLY GENERATION ROUTINES  ************ */
  
-@@ -264,7 +264,7 @@ svc_sendreply (register SVCXPRT *xprt, xdrproc_t xdr_results,
+@@ -264,7 +264,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_sendreply)
  #else
@@ -981,7 +962,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* No procedure error reply */
-@@ -282,7 +282,7 @@ svcerr_noproc (register SVCXPRT *xprt)
+@@ -282,7 +282,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcerr_noproc)
  #else
@@ -990,7 +971,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Can't decode args error reply */
-@@ -300,7 +300,7 @@ svcerr_decode (register SVCXPRT *xprt)
+@@ -300,7 +300,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcerr_decode)
  #else
@@ -999,7 +980,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Some system error */
-@@ -318,7 +318,7 @@ svcerr_systemerr (register SVCXPRT *xprt)
+@@ -318,7 +318,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcerr_systemerr)
  #else
@@ -1008,7 +989,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  /* Authentication error reply */
-@@ -333,7 +333,7 @@ svcerr_auth (SVCXPRT *xprt, enum auth_stat why)
+@@ -333,7 +333,7 @@
    rply.rjcted_rply.rj_why = why;
    SVC_REPLY (xprt, &rply);
  }
@@ -1017,7 +998,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* Auth too weak error reply */
  void
-@@ -341,7 +341,7 @@ svcerr_weakauth (SVCXPRT *xprt)
+@@ -341,7 +341,7 @@
  {
    svcerr_auth (xprt, AUTH_TOOWEAK);
  }
@@ -1026,7 +1007,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* Program unavailable error reply */
  void
-@@ -355,7 +355,7 @@ svcerr_noprog (register SVCXPRT *xprt)
+@@ -355,7 +355,7 @@
    rply.acpted_rply.ar_stat = PROG_UNAVAIL;
    SVC_REPLY (xprt, &rply);
  }
@@ -1035,7 +1016,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* Program version mismatch error reply */
  void
-@@ -372,7 +372,7 @@ svcerr_progvers (register SVCXPRT *xprt, rpcvers_t low_vers,
+@@ -372,7 +372,7 @@
    rply.acpted_rply.ar_vers.high = high_vers;
    SVC_REPLY (xprt, &rply);
  }
@@ -1044,7 +1025,7 @@ index e1f4a322e8..103770a42c 100644
  
  /* ******************* SERVER INPUT STUFF ******************* */
  
-@@ -401,7 +401,7 @@ svc_getreq (int rdfds)
+@@ -401,7 +401,7 @@
    readfds.fds_bits[0] = rdfds;
    svc_getreqset (&readfds);
  }
@@ -1053,7 +1034,7 @@ index e1f4a322e8..103770a42c 100644
  
  void
  svc_getreqset (fd_set *readfds)
-@@ -420,7 +420,7 @@ svc_getreqset (fd_set *readfds)
+@@ -420,7 +420,7 @@
      for (mask = *maskp++; (bit = ffsl (mask)); mask ^= (1L << (bit - 1)))
        svc_getreq_common (sock + bit - 1);
  }
@@ -1062,7 +1043,7 @@ index e1f4a322e8..103770a42c 100644
  
  void
  svc_getreq_poll (struct pollfd *pfdp, int pollretval)
-@@ -449,7 +449,7 @@ svc_getreq_poll (struct pollfd *pfdp, int pollretval)
+@@ -449,7 +449,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_getreq_poll)
  #else
@@ -1071,7 +1052,7 @@ index e1f4a322e8..103770a42c 100644
  #endif
  
  
-@@ -542,7 +542,7 @@ svc_getreq_common (const int fd)
+@@ -542,7 +542,7 @@
      }
    while (stat == XPRT_MOREREQS);
  }
@@ -1080,11 +1061,9 @@ index e1f4a322e8..103770a42c 100644
  
  #ifdef _RPC_THREAD_SAFE_
  
-diff --git a/sunrpc/svc_auth.c b/sunrpc/svc_auth.c
-index facbb13982..f33bda2f20 100644
 --- a/sunrpc/svc_auth.c
 +++ b/sunrpc/svc_auth.c
-@@ -105,7 +105,7 @@ _authenticate (register struct svc_req *rqst, struct rpc_msg *msg)
+@@ -105,7 +105,7 @@
  
    return AUTH_REJECTEDCRED;
  }
@@ -1093,11 +1072,9 @@ index facbb13982..f33bda2f20 100644
  
  static enum auth_stat
  _svcauth_null (struct svc_req *rqst, struct rpc_msg *msg)
-diff --git a/sunrpc/svc_raw.c b/sunrpc/svc_raw.c
-index 90f5d96e63..7d885574af 100644
 --- a/sunrpc/svc_raw.c
 +++ b/sunrpc/svc_raw.c
-@@ -88,7 +88,7 @@ svcraw_create (void)
+@@ -88,7 +88,7 @@
    xdrmem_create (&srp->xdr_stream, srp->_raw_buf, UDPMSGSIZE, XDR_FREE);
    return &srp->server;
  }
@@ -1106,11 +1083,9 @@ index 90f5d96e63..7d885574af 100644
  
  static enum xprt_stat
  svcraw_stat (SVCXPRT *xprt)
-diff --git a/sunrpc/svc_run.c b/sunrpc/svc_run.c
-index 09f40dd188..90dfc94056 100644
 --- a/sunrpc/svc_run.c
 +++ b/sunrpc/svc_run.c
-@@ -46,7 +46,7 @@ svc_exit (void)
+@@ -46,7 +46,7 @@
    svc_pollfd = NULL;
    svc_max_pollfd = 0;
  }
@@ -1119,18 +1094,16 @@ index 09f40dd188..90dfc94056 100644
  
  void
  svc_run (void)
-@@ -104,5 +104,5 @@ svc_run (void)
+@@ -104,5 +104,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svc_run)
  #else
 -libc_hidden_nolink (svc_run, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (svc_run, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/svc_tcp.c b/sunrpc/svc_tcp.c
-index e0515322a5..eb615494d8 100644
 --- a/sunrpc/svc_tcp.c
 +++ b/sunrpc/svc_tcp.c
-@@ -187,7 +187,7 @@ svctcp_create (int sock, u_int sendsize, u_int recvsize)
+@@ -189,7 +189,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svctcp_create)
  #else
@@ -1139,7 +1112,7 @@ index e0515322a5..eb615494d8 100644
  #endif
  
  /*
-@@ -199,7 +199,7 @@ svcfd_create (int fd, u_int sendsize, u_int recvsize)
+@@ -201,7 +201,7 @@
  {
    return makefd_xprt (fd, sendsize, recvsize);
  }
@@ -1148,11 +1121,9 @@ index e0515322a5..eb615494d8 100644
  
  static SVCXPRT *
  internal_function
-diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
-index 04c8407e64..6c4d75a814 100644
 --- a/sunrpc/svc_udp.c
 +++ b/sunrpc/svc_udp.c
-@@ -184,7 +184,7 @@ svcudp_create: xp_pad is too small for IP_PKTINFO\n"));
+@@ -186,7 +186,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcudp_bufcreate)
  #else
@@ -1161,7 +1132,7 @@ index 04c8407e64..6c4d75a814 100644
  #endif
  
  SVCXPRT *
-@@ -196,7 +196,7 @@ svcudp_create (sock)
+@@ -198,7 +198,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (svcudp_create)
  #else
@@ -1170,7 +1141,7 @@ index 04c8407e64..6c4d75a814 100644
  #endif
  
  static enum xprt_stat
-@@ -500,7 +500,7 @@ svcudp_enablecache (SVCXPRT *transp, u_long size)
+@@ -502,7 +502,7 @@
    su->su_cache = (char *) uc;
    return 1;
  }
@@ -1179,11 +1150,9 @@ index 04c8407e64..6c4d75a814 100644
  
  
  /*
-diff --git a/sunrpc/svc_unix.c b/sunrpc/svc_unix.c
-index 2b02682e72..94507b2403 100644
 --- a/sunrpc/svc_unix.c
 +++ b/sunrpc/svc_unix.c
-@@ -184,7 +184,7 @@ svcunix_create (int sock, u_int sendsize, u_int recvsize, char *path)
+@@ -187,7 +187,7 @@
    xprt_register (xprt);
    return xprt;
  }
@@ -1192,7 +1161,7 @@ index 2b02682e72..94507b2403 100644
  
  /*
   * Like svunix_create(), except the routine takes any *open* UNIX file
-@@ -195,7 +195,7 @@ svcunixfd_create (int fd, u_int sendsize, u_int recvsize)
+@@ -198,7 +198,7 @@
  {
    return makefd_xprt (fd, sendsize, recvsize);
  }
@@ -1201,11 +1170,9 @@ index 2b02682e72..94507b2403 100644
  
  static SVCXPRT *
  internal_function
-diff --git a/sunrpc/svcauth_des.c b/sunrpc/svcauth_des.c
-index b9656e25da..9609734960 100644
 --- a/sunrpc/svcauth_des.c
 +++ b/sunrpc/svcauth_des.c
-@@ -583,7 +583,7 @@ authdes_getucred (const struct authdes_cred *adc, uid_t * uid, gid_t * gid,
+@@ -583,7 +583,7 @@
      groups[i] = cred->groups[i];
    return 1;
  }
@@ -1214,11 +1181,9 @@ index b9656e25da..9609734960 100644
  
  static void
  internal_function
-diff --git a/sunrpc/xcrypt.c b/sunrpc/xcrypt.c
-index 8b7642b503..2e53f2d9e9 100644
 --- a/sunrpc/xcrypt.c
 +++ b/sunrpc/xcrypt.c
-@@ -127,7 +127,7 @@ xencrypt (char *secret, char *passwd)
+@@ -127,7 +127,7 @@
    free (buf);
    return 1;
  }
@@ -1227,7 +1192,7 @@ index 8b7642b503..2e53f2d9e9 100644
  
  /*
   * Decrypt secret key using passwd
-@@ -163,7 +163,7 @@ xdecrypt (char *secret, char *passwd)
+@@ -163,7 +163,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdecrypt)
  #else
@@ -1236,11 +1201,9 @@ index 8b7642b503..2e53f2d9e9 100644
  #endif
  
  /*
-diff --git a/sunrpc/xdr.c b/sunrpc/xdr.c
-index 4dd82ff044..7eac2d40f0 100644
 --- a/sunrpc/xdr.c
 +++ b/sunrpc/xdr.c
-@@ -72,7 +72,7 @@ xdr_free (xdrproc_t proc, char *objp)
+@@ -74,7 +74,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_free)
  #else
@@ -1249,7 +1212,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -86,7 +86,7 @@ xdr_void (void)
+@@ -88,7 +88,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_void)
  #else
@@ -1258,7 +1221,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -126,7 +126,7 @@ xdr_int (XDR *xdrs, int *ip)
+@@ -128,7 +128,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_int)
  #else
@@ -1267,7 +1230,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -165,7 +165,7 @@ xdr_u_int (XDR *xdrs, u_int *up)
+@@ -167,7 +167,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_int)
  #else
@@ -1276,7 +1239,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -193,7 +193,7 @@ xdr_long (XDR *xdrs, long *lp)
+@@ -195,7 +195,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_long)
  #else
@@ -1285,7 +1248,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -232,7 +232,7 @@ xdr_u_long (XDR *xdrs, u_long *ulp)
+@@ -234,7 +234,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_long)
  #else
@@ -1294,7 +1257,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -268,7 +268,7 @@ xdr_hyper (XDR *xdrs, quad_t *llp)
+@@ -270,7 +270,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_hyper)
  #else
@@ -1303,7 +1266,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -304,7 +304,7 @@ xdr_u_hyper (XDR *xdrs, u_quad_t *ullp)
+@@ -306,7 +306,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_hyper)
  #else
@@ -1312,7 +1275,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  bool_t
-@@ -315,7 +315,7 @@ xdr_longlong_t (XDR *xdrs, quad_t *llp)
+@@ -317,7 +317,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_longlong_t)
  #else
@@ -1321,7 +1284,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  bool_t
-@@ -326,7 +326,7 @@ xdr_u_longlong_t (XDR *xdrs, u_quad_t *ullp)
+@@ -328,7 +328,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_longlong_t)
  #else
@@ -1330,7 +1293,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -359,7 +359,7 @@ xdr_short (XDR *xdrs, short *sp)
+@@ -361,7 +361,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_short)
  #else
@@ -1339,7 +1302,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -392,7 +392,7 @@ xdr_u_short (XDR *xdrs, u_short *usp)
+@@ -394,7 +394,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_short)
  #else
@@ -1348,7 +1311,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  
-@@ -415,7 +415,7 @@ xdr_char (XDR *xdrs, char *cp)
+@@ -417,7 +417,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_char)
  #else
@@ -1357,7 +1320,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -437,7 +437,7 @@ xdr_u_char (XDR *xdrs, u_char *cp)
+@@ -439,7 +439,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_u_char)
  #else
@@ -1366,7 +1329,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -470,7 +470,7 @@ xdr_bool (XDR *xdrs, bool_t *bp)
+@@ -472,7 +472,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_bool)
  #else
@@ -1375,7 +1338,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -525,7 +525,7 @@ xdr_enum (XDR *xdrs, enum_t *ep)
+@@ -527,7 +527,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_enum)
  #else
@@ -1384,7 +1347,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -580,7 +580,7 @@ xdr_opaque (XDR *xdrs, caddr_t cp, u_int cnt)
+@@ -582,7 +582,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_opaque)
  #else
@@ -1393,7 +1356,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -648,7 +648,7 @@ xdr_bytes (xdrs, cpp, sizep, maxsize)
+@@ -650,7 +650,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_bytes)
  #else
@@ -1402,7 +1365,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -665,7 +665,7 @@ xdr_netobj (xdrs, np)
+@@ -667,7 +667,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_netobj)
  #else
@@ -1411,7 +1374,7 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -714,7 +714,7 @@ xdr_union (xdrs, dscmp, unp, choices, dfault)
+@@ -716,7 +716,7 @@
    return ((dfault == NULL_xdrproc_t) ? FALSE :
  	  (*dfault) (xdrs, unp, LASTUNSIGNED));
  }
@@ -1420,7 +1383,7 @@ index 4dd82ff044..7eac2d40f0 100644
  
  
  /*
-@@ -806,7 +806,7 @@ xdr_string (xdrs, cpp, maxsize)
+@@ -808,7 +808,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_string)
  #else
@@ -1429,18 +1392,16 @@ index 4dd82ff044..7eac2d40f0 100644
  #endif
  
  /*
-@@ -827,5 +827,5 @@ xdr_wrapstring (xdrs, cpp)
+@@ -829,5 +829,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_wrapstring)
  #else
 -libc_hidden_nolink (xdr_wrapstring, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_wrapstring, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
-index b832078342..a634861278 100644
 --- a/sunrpc/xdr_array.c
 +++ b/sunrpc/xdr_array.c
-@@ -127,7 +127,7 @@ xdr_array (xdrs, addrp, sizep, maxsize, elsize, elproc)
+@@ -130,7 +130,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_array)
  #else
@@ -1449,17 +1410,15 @@ index b832078342..a634861278 100644
  #endif
  
  /*
-@@ -162,4 +162,4 @@ xdr_vector (xdrs, basep, nelem, elemsize, xdr_elem)
+@@ -165,4 +165,4 @@
      }
    return TRUE;
  }
 -libc_hidden_nolink (xdr_vector, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_vector, GLIBC_2_0)
-diff --git a/sunrpc/xdr_float.c b/sunrpc/xdr_float.c
-index 1a9c260617..78e8f3bd2d 100644
 --- a/sunrpc/xdr_float.c
 +++ b/sunrpc/xdr_float.c
-@@ -158,7 +158,7 @@ xdr_float(xdrs, fp)
+@@ -158,7 +158,7 @@
  	}
  	return (FALSE);
  }
@@ -1468,17 +1427,15 @@ index 1a9c260617..78e8f3bd2d 100644
  
  /*
   * This routine works on Suns (Sky / 68000's) and Vaxen.
-@@ -300,4 +300,4 @@ xdr_double(xdrs, dp)
+@@ -300,4 +300,4 @@
  	}
  	return (FALSE);
  }
 -libc_hidden_nolink (xdr_double, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_double, GLIBC_2_0)
-diff --git a/sunrpc/xdr_intXX_t.c b/sunrpc/xdr_intXX_t.c
-index fe06f45df3..02a0c09b5b 100644
 --- a/sunrpc/xdr_intXX_t.c
 +++ b/sunrpc/xdr_intXX_t.c
-@@ -46,14 +46,14 @@ xdr_int64_t (XDR *xdrs, int64_t *ip)
+@@ -47,14 +47,14 @@
        return FALSE;
      }
  }
@@ -1495,7 +1452,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 64bit unsigned integers */
  bool_t
-@@ -82,14 +82,14 @@ xdr_uint64_t (XDR *xdrs, uint64_t *uip)
+@@ -83,14 +83,14 @@
        return FALSE;
      }
  }
@@ -1512,7 +1469,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 32bit integers */
  bool_t
-@@ -107,7 +107,7 @@ xdr_int32_t (XDR *xdrs, int32_t *lp)
+@@ -108,7 +108,7 @@
        return FALSE;
      }
  }
@@ -1521,7 +1478,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 32bit unsigned integers */
  bool_t
-@@ -128,7 +128,7 @@ xdr_uint32_t (XDR *xdrs, uint32_t *ulp)
+@@ -129,7 +129,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_uint32_t)
  #else
@@ -1530,7 +1487,7 @@ index fe06f45df3..02a0c09b5b 100644
  #endif
  
  /* XDR 16bit integers */
-@@ -153,7 +153,7 @@ xdr_int16_t (XDR *xdrs, int16_t *ip)
+@@ -154,7 +154,7 @@
        return FALSE;
      }
  }
@@ -1539,7 +1496,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 16bit unsigned integers */
  bool_t
-@@ -177,7 +177,7 @@ xdr_uint16_t (XDR *xdrs, uint16_t *uip)
+@@ -178,7 +178,7 @@
        return FALSE;
      }
  }
@@ -1548,7 +1505,7 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 8bit integers */
  bool_t
-@@ -201,7 +201,7 @@ xdr_int8_t (XDR *xdrs, int8_t *ip)
+@@ -202,7 +202,7 @@
        return FALSE;
      }
  }
@@ -1557,17 +1514,15 @@ index fe06f45df3..02a0c09b5b 100644
  
  /* XDR 8bit unsigned integers */
  bool_t
-@@ -225,4 +225,4 @@ xdr_uint8_t (XDR *xdrs, uint8_t *uip)
+@@ -226,4 +226,4 @@
        return FALSE;
      }
  }
 -libc_hidden_nolink (xdr_uint8_t, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (xdr_uint8_t, GLIBC_2_1)
-diff --git a/sunrpc/xdr_mem.c b/sunrpc/xdr_mem.c
-index 093a718739..ba7661aa54 100644
 --- a/sunrpc/xdr_mem.c
 +++ b/sunrpc/xdr_mem.c
-@@ -81,7 +81,7 @@ xdrmem_create (XDR *xdrs, const caddr_t addr, u_int size, enum xdr_op op)
+@@ -81,7 +81,7 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdrmem_create)
  #else
@@ -1576,11 +1531,9 @@ index 093a718739..ba7661aa54 100644
  #endif
  
  /*
-diff --git a/sunrpc/xdr_rec.c b/sunrpc/xdr_rec.c
-index 556c6c4bc0..f5d6ef2af9 100644
 --- a/sunrpc/xdr_rec.c
 +++ b/sunrpc/xdr_rec.c
-@@ -189,7 +189,7 @@ xdrrec_create (XDR *xdrs, u_int sendsize,
+@@ -192,7 +192,7 @@
    rstrm->fbtbc = 0;
    rstrm->last_frag = TRUE;
  }
@@ -1589,7 +1542,7 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  
  /*
-@@ -477,7 +477,7 @@ xdrrec_skiprecord (XDR *xdrs)
+@@ -480,7 +480,7 @@
    rstrm->last_frag = FALSE;
    return TRUE;
  }
@@ -1598,7 +1551,7 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  /*
   * Lookahead function.
-@@ -501,7 +501,7 @@ xdrrec_eof (XDR *xdrs)
+@@ -504,7 +504,7 @@
      return TRUE;
    return FALSE;
  }
@@ -1607,7 +1560,7 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  /*
   * The client must tell the package when an end-of-record has occurred.
-@@ -528,7 +528,7 @@ xdrrec_endofrecord (XDR *xdrs, bool_t sendnow)
+@@ -531,7 +531,7 @@
    rstrm->out_finger += BYTES_PER_XDR_UNIT;
    return TRUE;
  }
@@ -1616,11 +1569,9 @@ index 556c6c4bc0..f5d6ef2af9 100644
  
  
  /*
-diff --git a/sunrpc/xdr_ref.c b/sunrpc/xdr_ref.c
-index 7510bed873..8fb4584a75 100644
 --- a/sunrpc/xdr_ref.c
 +++ b/sunrpc/xdr_ref.c
-@@ -90,7 +90,7 @@ xdr_reference (xdrs, pp, size, proc)
+@@ -93,7 +93,7 @@
      }
    return stat;
  }
@@ -1629,29 +1580,25 @@ index 7510bed873..8fb4584a75 100644
  
  
  /*
-@@ -137,5 +137,5 @@ xdr_pointer (xdrs, objpp, obj_size, xdr_obj)
+@@ -140,5 +140,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_pointer)
  #else
 -libc_hidden_nolink (xdr_pointer, GLIBC_2_0)
 +libc_hidden_nolink_sunrpc (xdr_pointer, GLIBC_2_0)
  #endif
-diff --git a/sunrpc/xdr_sizeof.c b/sunrpc/xdr_sizeof.c
-index 0119486c3d..56e870a455 100644
 --- a/sunrpc/xdr_sizeof.c
 +++ b/sunrpc/xdr_sizeof.c
-@@ -161,5 +161,5 @@ xdr_sizeof (xdrproc_t func, void *data)
+@@ -161,5 +161,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdr_sizeof)
  #else
 -libc_hidden_nolink (xdr_sizeof, GLIBC_2_1)
 +libc_hidden_nolink_sunrpc (xdr_sizeof, GLIBC_2_1)
  #endif
-diff --git a/sunrpc/xdr_stdio.c b/sunrpc/xdr_stdio.c
-index d9866063f9..667515e0a6 100644
 --- a/sunrpc/xdr_stdio.c
 +++ b/sunrpc/xdr_stdio.c
-@@ -191,5 +191,5 @@ xdrstdio_putint32 (XDR *xdrs, const int32_t *ip)
+@@ -193,5 +193,5 @@
  #ifdef EXPORT_RPC_SYMBOLS
  libc_hidden_def (xdrstdio_create)
  #else
diff --git a/packages/glibc/2.14.1/998-obstack-common.patch b/packages/glibc/2.14.1/0042-obstack-common.patch
index 4b95f06..1993be2 100644
--- a/packages/glibc/2.14.1/998-obstack-common.patch
+++ b/packages/glibc/2.14.1/0042-obstack-common.patch
@@ -15,11 +15,13 @@ Date:   Wed May 15 20:28:08 2013 +0200
             * malloc/obstack.c (_obstack_compat): Add initializer.
     -
 
-diff --git a/malloc/obstack.c b/malloc/obstack.c
-index 25a90514f7..c3c7db4a96 100644
+---
+ malloc/obstack.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/malloc/obstack.c
 +++ b/malloc/obstack.c
-@@ -115,7 +115,7 @@ int obstack_exit_failure = EXIT_FAILURE;
+@@ -117,7 +117,7 @@
  /* A looong time ago (before 1994, anyway; we're not sure) this global variable
     was used by non-GNU-C macros to avoid multiple evaluation.  The GNU C
     library still exports it because somebody might use it.  */
diff --git a/packages/glibc/2.14.1/999-new-tools.patch b/packages/glibc/2.14.1/0043-new-tools.patch
index f335a54..2d89a0f 100644
--- a/packages/glibc/2.14.1/999-new-tools.patch
+++ b/packages/glibc/2.14.1/0043-new-tools.patch
@@ -1,7 +1,11 @@
-diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
---- glibc-2.14.1.orig/configure	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure	2017-02-08 00:38:43.765952352 -0800
-@@ -4939,7 +4939,7 @@ $as_echo_n "checking version of $CC... "
+---
+ configure    |    8 ++++----
+ configure.in |    8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -4957,7 +4957,7 @@
    ac_prog_version=`$CC -v 2>&1 | sed -n 's/^.*version \([egcygnustpi-]*[0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -10,7 +14,7 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5002,7 +5002,7 @@ $as_echo_n "checking version of $MAKE...
+@@ -5020,7 +5020,7 @@
    ac_prog_version=`$MAKE --version 2>&1 | sed -n 's/^.*GNU Make[^0-9]*\([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -19,7 +23,7 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5129,7 +5129,7 @@ $as_echo_n "checking version of $MAKEINF
+@@ -5147,7 +5147,7 @@
    ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
@@ -28,7 +32,7 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5189,7 +5189,7 @@ else
+@@ -5207,7 +5207,7 @@
    # Found it, now check the version.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $SED" >&5
  $as_echo_n "checking version of $SED... " >&6; }
@@ -37,10 +41,9 @@ diff -urpN glibc-2.14.1.orig/configure glibc-2.14.1/configure
    case $ac_prog_version in
      '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
      3.0[2-9]*|3.[1-9]*|[4-9]*)
-diff -urpN glibc-2.14.1.orig/configure.in glibc-2.14.1/configure.in
---- glibc-2.14.1.orig/configure.in	2011-10-07 02:48:55.000000000 -0700
-+++ glibc-2.14.1/configure.in	2017-02-08 00:30:13.660439376 -0800
-@@ -1026,11 +1026,11 @@ fi
+--- a/configure.in
++++ b/configure.in
+@@ -1037,11 +1037,11 @@
  # These programs are version sensitive.
  AC_CHECK_TOOL_PREFIX
  AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
@@ -54,7 +57,7 @@ diff -urpN glibc-2.14.1.orig/configure.in glibc-2.14.1/configure.in
  
  AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
    [GNU gettext.* \([0-9]*\.[0-9.]*\)],
-@@ -1038,10 +1038,10 @@ AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsg
+@@ -1049,10 +1049,10 @@
    MSGFMT=: aux_missing="$aux_missing msgfmt")
  AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
    [GNU texinfo.* \([0-9][0-9.]*\)],
diff --git a/packages/glibc/2.14.1/430-alpha-creat.patch b/packages/glibc/2.14.1/430-alpha-creat.patch
deleted file mode 100644
index da6ddda..0000000
--- a/packages/glibc/2.14.1/430-alpha-creat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-alpha does not have a __NR_creat
-
-http://bugs.gentoo.org/227275
-http://sourceware.org/bugzilla/show_bug.cgi?id=6650
-
-diff -durN glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c
---- glibc-2.13.orig/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2007-11-10 20:34:26.000000000 +0100
-+++ glibc-2.13/sysdeps/unix/sysv/linux/wordsize-64/creat64.c	2009-11-13 00:50:51.000000000 +0100
-@@ -1 +1,5 @@
- /* Defined as alias for the syscall.  */
-+#include <sysdep.h>
-+#ifndef __NR_creat
-+#include "../../../../../io/creat64.c"
-+#endif
diff --git a/packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
deleted file mode 100644
index a5a7052..0000000
--- a/packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -dur glibc-cvs-2.9.orig/debug/readlink_chk.c glibc-cvs-2.9/debug/readlink_chk.c
---- glibc-cvs-2.9.orig/debug/readlink_chk.c	2005-03-01 01:41:15.000000000 +0100
-+++ glibc-cvs-2.9/debug/readlink_chk.c	2009-06-01 10:59:37.000000000 +0200
-@@ -25,7 +25,7 @@
- 
- 
- ssize_t
--__readlink_chk (const char *path, void *buf, size_t len, size_t buflen)
-+__readlink_chk (const char *path, char *buf, size_t len, size_t buflen)
- {
-   if (len > buflen)
-     __chk_fail ();
-diff -dur glibc-cvs-2.9.orig/debug/readlinkat_chk.c glibc-cvs-2.9/debug/readlinkat_chk.c
---- glibc-cvs-2.9.orig/debug/readlinkat_chk.c	2006-04-24 18:56:12.000000000 +0200
-+++ glibc-cvs-2.9/debug/readlinkat_chk.c	2009-06-01 11:07:26.000000000 +0200
-@@ -21,7 +21,7 @@
- 
- 
- ssize_t
--__readlinkat_chk (int fd, const char *path, void *buf, size_t len,
-+__readlinkat_chk (int fd, const char *path, char *buf, size_t len,
- 		  size_t buflen)
- {
-   if (len > buflen)
author	Alexey Neyman <stilor@att.net>	2017-12-02 20:44:39 (GMT)
committer	Alexey Neyman <stilor@att.net>	2017-12-02 20:44:39 (GMT)
commit	98bc4decdeab1361bdc585c86591718fb08c8ffb (patch)
tree	4e048ed57988306696efa3c5b81a80d48030e913 /packages/glibc/2.14.1
parent	2a1935f3ad41d360dd3d96a1b0486083293651dd (diff)