Run all patches through renumbering and update

Signed-off-by: Alexey Neyman <stilor@att.net>

8 files changed, 63 insertions, 49 deletions

diff --git a/packages/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.12.2/0000-Fix-combreloc-test-BSD-grep.patch
index 530d4ff..0f85a50 100644
--- a/packages/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.12.2/0000-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.12.2.orig/configure glibc-2.12.2/configure
---- glibc-2.12.2.orig/configure	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure	2017-03-08 21:18:07.000000000 -0800
-@@ -6710,7 +6710,7 @@ EOF
+--- a/configure
++++ b/configure
+@@ -6710,7 +6710,7 @@
    $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }
    then
@@ -30,10 +28,9 @@ diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
        libc_cv_z_combreloc=yes
      else
        libc_cv_z_combreloc=no
-diff -urpN glibc-2.12.2.orig/configure.in glibc-2.12.2/configure.in
---- glibc-2.12.2.orig/configure.in	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure.in	2017-03-08 21:18:17.000000000 -0800
-@@ -1671,7 +1671,7 @@ dnl cross-platform since the gcc used ca
+--- a/configure.in
++++ b/configure.in
+@@ -1671,7 +1671,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.12.2/300-macos-cross-rpcgen.patch b/packages/glibc/2.12.2/0001-macos-cross-rpcgen.patch
index e654644..155b4f5 100644
--- a/packages/glibc/2.12.2/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.12.2/0001-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;
+@@ -68,6 +68,11 @@
  #include <sys/types.h>
  #endif
  
diff --git a/packages/glibc/2.12.2/900-march-i686.patch b/packages/glibc/2.12.2/0002-march-i686.patch
index 6030de9..e5ad2e0 100644
--- a/packages/glibc/2.12.2/900-march-i686.patch
+++ b/packages/glibc/2.12.2/0002-march-i686.patch
@@ -3,9 +3,13 @@
        * sysdeps/unix/sysv/linux/i386/sysdep.h: Re-define __i686.
        * nptl/sysdeps/pthread/pt-initfini.c: Ditto.
 
-diff -urN glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c
---- glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.2/nptl/sysdeps/pthread/pt-initfini.c	2010-12-30 11:36:19.858708534 +0100
+---
+ 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\"");
@@ -18,9 +22,8 @@ diff -urN glibc-2.12.2.orig/nptl/sysdeps/pthread/pt-initfini.c glibc-2.12.2/nptl
  /* The initial common code ends here. */
  asm ("\n/*@HEADER_ENDS*/");
  
-diff -urN glibc-2.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h
---- glibc-2.12.2.orig/sysdeps/unix/sysv/linux/i386/sysdep.h	2009-10-30 18:17:08.000000000 +0100
-+++ glibc-2.12.2/sysdeps/unix/sysv/linux/i386/sysdep.h	2010-12-30 11:36:19.858708534 +0100
+--- 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>
diff --git a/packages/glibc/2.12.2/910-typedef-caddr.patch b/packages/glibc/2.12.2/0003-typedef-caddr.patch
index 4bc75cb..5139bbd 100644
--- a/packages/glibc/2.12.2/910-typedef-caddr.patch
+++ b/packages/glibc/2.12.2/0003-typedef-caddr.patch
@@ -1,6 +1,10 @@
-diff -urN glibc-2.12.2-orig/posix/sys/types.h glibc-2.12.2/posix/sys/types.h
---- glibc-2.12.2-orig/posix/sys/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.2/posix/sys/types.h	2011-03-29 14:16:00.374064708 +0200
+---
+ posix/sys/types.h  |    3 +++
+ sunrpc/rpc/types.h |    3 +++
+ 2 files changed, 6 insertions(+)
+
+--- a/posix/sys/types.h
++++ b/posix/sys/types.h
 @@ -114,7 +114,10 @@
  #ifdef	__USE_BSD
  # ifndef __daddr_t_defined
@@ -12,10 +16,9 @@ diff -urN glibc-2.12.2-orig/posix/sys/types.h glibc-2.12.2/posix/sys/types.h
  #  define __daddr_t_defined
  # endif
  #endif
-diff -urN glibc-2.12.2-orig/sunrpc/rpc/types.h glibc-2.12.2/sunrpc/rpc/types.h
---- glibc-2.12.2-orig/sunrpc/rpc/types.h	2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.2/sunrpc/rpc/types.h	2011-03-29 14:16:32.988910439 +0200
-@@ -80,7 +80,10 @@
+--- a/sunrpc/rpc/types.h
++++ b/sunrpc/rpc/types.h
+@@ -85,7 +85,10 @@
  #endif
  #ifndef __daddr_t_defined
  typedef __daddr_t daddr_t;
diff --git a/packages/glibc/2.12.2/920-fix-rpc_parse-format.patch b/packages/glibc/2.12.2/0004-fix-rpc_parse-format.patch
index 37e58da..906fb70 100644
--- a/packages/glibc/2.12.2/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.12.2/0004-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
+@@ -520,7 +520,7 @@
  get_prog_declaration (declaration * dec, defkind dkind, int num /* arg number */ )
  {
    token tok;
diff --git a/packages/glibc/2.12.2/940-nis-bogus-conditional.patch b/packages/glibc/2.12.2/0005-nis-bogus-conditional.patch
index 09b38cf..732b859 100644
--- a/packages/glibc/2.12.2/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.12.2/0005-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.12.2/998-obstack-common.patch b/packages/glibc/2.12.2/0006-obstack-common.patch
index 4b95f06..1993be2 100644
--- a/packages/glibc/2.12.2/998-obstack-common.patch
+++ b/packages/glibc/2.12.2/0006-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.12.2/999-new-tools.patch b/packages/glibc/2.12.2/0007-new-tools.patch
index e2f7b1d..816a01c 100644
--- a/packages/glibc/2.12.2/999-new-tools.patch
+++ b/packages/glibc/2.12.2/0007-new-tools.patch
@@ -1,7 +1,11 @@
-diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/configure
---- glibc-2.12.2.orig/configure	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure	2017-02-08 00:38:10.249617723 -0800
-@@ -5189,7 +5189,7 @@ $as_echo_n "checking version of $CC... "
+---
+ configure    |    8 ++++----
+ configure.in |    8 ++++----
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/configure
++++ b/configure
+@@ -5189,7 +5189,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.12.2.orig/configure glibc-2.12.2/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5252,7 +5252,7 @@ $as_echo_n "checking version of $MAKE...
+@@ -5252,7 +5252,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.12.2.orig/configure glibc-2.12.2/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5379,7 +5379,7 @@ $as_echo_n "checking version of $MAKEINF
+@@ -5379,7 +5379,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.12.2.orig/configure glibc-2.12.2/configure
         ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
      *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
  
-@@ -5439,7 +5439,7 @@ else
+@@ -5439,7 +5439,7 @@
    # Found it, now check the version.
    { $as_echo "$as_me:$LINENO: checking version of $SED" >&5
  $as_echo_n "checking version of $SED... " >&6; }
@@ -37,10 +41,9 @@ diff -urpN glibc-2.12.2.orig/configure glibc-2.12.2/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.12.2.orig/configure.in glibc-2.12.2/configure.in
---- glibc-2.12.2.orig/configure.in	2010-12-13 02:47:26.000000000 -0800
-+++ glibc-2.12.2/configure.in	2017-02-08 00:29:52.484183611 -0800
-@@ -1026,11 +1026,11 @@ fi
+--- a/configure.in
++++ b/configure.in
+@@ -1026,11 +1026,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.12.2.orig/configure.in glibc-2.12.2/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
+@@ -1038,10 +1038,10 @@
    MSGFMT=: aux_missing="$aux_missing msgfmt")
  AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version,
    [GNU texinfo.* \([0-9][0-9.]*\)],