dev-util/systemtap: clean up patch

3 files changed, 59 insertions, 63 deletions

diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 57c6fb4f..e6d6fd91 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -1,4 +1,4 @@
-AUX systemtap-2.9-musl.patch 6271 SHA256 422497a92cda46722684a24385cd70a5481bc98f512c2eff45b1bd7bf7567138 SHA512 517efd2df46d6a99e07361ccfeece74bb0192194061c824328377f5618c0349a037c888e3cf8dd0738896b127d296aacb7c21fbdca4209301f9ba090d28c97b3 WHIRLPOOL cfea1024590bcefe5c1124ad8dd8c9c379fc18026a30f7962f3bd6e4d64365c5d3ef7b862af0fc849514d24e061702babd47ed326b5b0b094f38a6801d959703
+AUX systemtap-2.9-musl.patch 5996 SHA256 d7ee1720b3872153d5aad22e10149665997b83395b87a6bf591e76a99b63c657 SHA512 e6ed2cc7f4cea4fd1ca3ed0ad02a65ccc1a839f566d5f27b94c72c84c3ebde59c651a8973bf41ea121459851b81a53682599d9cd91652efe244579d380d56030 WHIRLPOOL 1d65b80d2f1fce8cd1df600ea9c42a4e69830bb8e8b31ec026c329c7707f9231c2a05046b8ae6deea72839b322b5f6c8feea07306563ac6f33c88315be3aaba1
 DIST systemtap-2.9.tar.gz 3258026 SHA256 04f2c607512f4867f345a3d173940e1023441c5d3560f2e580b4a82dfe4d6353 SHA512 00d24ad52d5634b540241a9fc64efbab7fa1d34d31a0254b43474101d3024f050ab7ec284aba0c082889066e1b4cf4c38799801910bff7516ca2e380684089dc WHIRLPOOL fa8d3978f0768091c5cc3bd1cd4b13b6ff9643e2e37ee8e8b59c1801fd7ddcad7029d06e4a1207dc5add5faf423de9ccdb9df677b7db88a5199b1fde731fcb3a
-EBUILD systemtap-2.9.ebuild 2141 SHA256 b6b66f98e01762f427b1934a6db85401665114b5e8ff51931c67d566b6b4f131 SHA512 f7833c45851fd70c774ad0559394dc0e4baad27154ff7aee2ac3c58e7326c5aae98c1c2b14a0c41b37aa2fc3437fae3d3f9dc857795cdc8377cde86bdc88f554 WHIRLPOOL 8d2d5353089f8c2c889587e77d4d418b25d1f1ddd73c616c4e47ef1cb3f52d2d717c498fe018da541f9e46498e58b91c93aca9223dab92439036fd34d320f4c6
+EBUILD systemtap-2.9.ebuild 2148 SHA256 cdf2ae79cce60ff5ff2441be9ab9f3a62600edb2d71fec3c3758d7103f8c3ad6 SHA512 b682250e96d374cee0cf1891dd20d0d6414429b4a6213f79326cf4b8217e4a2100f64ad2b856a67973612ff0718cc72db271189a1fea9fed0f5a6c53e9a0b2cf WHIRLPOOL 08308b7ea364e05724ff3ca5cde2b4abc7c61cf705a6e83e3177268c8ef4010d0e19be5769aa8b7dfe24673b6a1fdc86631c92795f4b9f6bbc9a4a697ab4410f
 MISC metadata.xml 217 SHA256 9db437db95b71c3fcf9d45c3532ffb53c60b29a58c537dfe6c6d416d13b7cab5 SHA512 c677e2bf2d79d816a1be0e24c81fb40077680049b86f2691d7f88e652c8e3f9583d80f0bfb4c30ed3884160d18e497c6e3430b85d5c00ea92dd4801619e57590 WHIRLPOOL 312f5414c35807bc495126a66930517724a6a45f6b2ba4148fd4205ab41d0e5e8ef05746e373b25f7d1df7649d9b49f06a87f58f0d12d68a671260127b05d7b4
diff --git a/dev-util/systemtap/files/systemtap-2.9-musl.patch b/dev-util/systemtap/files/systemtap-2.9-musl.patch
index 410e7824..c90804fa 100644
--- a/dev-util/systemtap/files/systemtap-2.9-musl.patch
+++ b/dev-util/systemtap/files/systemtap-2.9-musl.patch
@@ -1,6 +1,6 @@
-diff -Naurw systemtap-2.9.orig/buildrun.cxx systemtap-2.9/buildrun.cxx
---- systemtap-2.9.orig/buildrun.cxx	2016-02-03 17:29:35.158854189 -0800
-+++ systemtap-2.9/buildrun.cxx	2016-02-03 17:29:45.349853899 -0800
+diff -Naur systemtap-2.9.orig/buildrun.cxx systemtap-2.9/buildrun.cxx
+--- systemtap-2.9.orig/buildrun.cxx	2017-02-24 10:47:12.478787249 -0800
++++ systemtap-2.9/buildrun.cxx	2017-02-24 10:47:56.414162998 -0800
 @@ -788,13 +788,14 @@
    if (s.need_uprobes && !kernel_built_uprobes(s))
      {
@@ -17,9 +17,9 @@ diff -Naurw systemtap-2.9.orig/buildrun.cxx systemtap-2.9/buildrun.cxx
          }
        staprun_cmd.push_back(opt_u);
      }
-diff -Naurw systemtap-2.9.orig/configure.ac systemtap-2.9/configure.ac
---- systemtap-2.9.orig/configure.ac	2016-02-03 17:29:35.161854189 -0800
-+++ systemtap-2.9/configure.ac	2016-02-03 17:45:48.771826500 -0800
+diff -Naur systemtap-2.9.orig/configure.ac systemtap-2.9/configure.ac
+--- systemtap-2.9.orig/configure.ac	2017-02-24 10:47:12.480787266 -0800
++++ systemtap-2.9/configure.ac	2017-02-24 10:48:24.679405813 -0800
 @@ -443,6 +443,50 @@
    fi
  fi
@@ -71,9 +71,9 @@ diff -Naurw systemtap-2.9.orig/configure.ac systemtap-2.9/configure.ac
  AC_SUBST(stap_LIBS)
  AC_MSG_NOTICE([stap will link $stap_LIBS])
  
-diff -Naurw systemtap-2.9.orig/csclient.cxx systemtap-2.9/csclient.cxx
---- systemtap-2.9.orig/csclient.cxx	2016-02-03 17:29:35.161854189 -0800
-+++ systemtap-2.9/csclient.cxx	2016-02-03 17:29:45.353853899 -0800
+diff -Naur systemtap-2.9.orig/csclient.cxx systemtap-2.9/csclient.cxx
+--- systemtap-2.9.orig/csclient.cxx	2017-02-24 10:47:12.481787274 -0800
++++ systemtap-2.9/csclient.cxx	2017-02-24 10:48:59.261702894 -0800
 @@ -75,6 +75,10 @@
  
  #define MOK_PUBLIC_CERT_NAME "signing_key.x509"
@@ -94,43 +94,40 @@ diff -Naurw systemtap-2.9.orig/csclient.cxx systemtap-2.9/csclient.cxx
    if (! cpath)
      {
        // It can not be canonicalized. Use the name relative to
-diff -Naurw systemtap-2.9.orig/loc2c-test.c systemtap-2.9/loc2c-test.c
---- systemtap-2.9.orig/loc2c-test.c	2016-02-03 17:29:35.222854187 -0800
-+++ systemtap-2.9/loc2c-test.c	2016-02-03 17:29:45.354853899 -0800
-@@ -11,7 +11,8 @@
- #include <stdio_ext.h>
- #include <stdlib.h>
- #include <string.h>
--#include <error.h>
-+#include <err.h>
-+#define error err
- #if ENABLE_NLS
- #include <locale.h>
- #endif
-@@ -519,7 +520,7 @@
- 	    }
- 	  else
- 	    {
--	      error (2, 0, "Error, dwarf_entry_breakpoints returned an error( %s )\n",
-+	      error (2, 0, "Error, dwarf_entry_breakpoints returned an err( %s )\n",
- 		     dwarf_errmsg (result));
- 	    }
- 	}
-diff -Naurw systemtap-2.9.orig/loc2c.c systemtap-2.9/loc2c.c
---- systemtap-2.9.orig/loc2c.c	2016-02-03 17:29:35.222854187 -0800
-+++ systemtap-2.9/loc2c.c	2016-02-03 17:51:01.664817602 -0800
-@@ -12,7 +12,7 @@
- #include <obstack.h>
- #include <stdio.h>
- #include <stdlib.h>
--#include <error.h>
-+#include <err.h>
- #include <dwarf.h>
- #include <elfutils/libdw.h>
- #include <elfutils/version.h>
-diff -Naurw systemtap-2.9.orig/remote.cxx systemtap-2.9/remote.cxx
---- systemtap-2.9.orig/remote.cxx	2016-02-03 17:29:35.239854186 -0800
-+++ systemtap-2.9/remote.cxx	2016-02-03 17:29:45.359853899 -0800
+diff -Naur systemtap-2.9.orig/error.h systemtap-2.9/error.h
+--- systemtap-2.9.orig/error.h	1969-12-31 16:00:00.000000000 -0800
++++ systemtap-2.9/error.h	2017-02-24 10:49:03.823742085 -0800
+@@ -0,0 +1,27 @@
++#ifndef _ERROR_H_
++#define _ERROR_H_
++
++#include <stdarg.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <errno.h>
++
++static unsigned int error_message_count = 0;
++
++static inline void error(int status, int errnum, const char* format, ...)
++{
++	va_list ap;
++	fprintf(stderr, "%s: ", program_invocation_name);
++	va_start(ap, format);
++	vfprintf(stderr, format, ap);
++	va_end(ap);
++	if (errnum)
++		fprintf(stderr, ": %s", strerror(errnum));
++	fprintf(stderr, "\n");
++	error_message_count++;
++	if (status)
++		exit(status);
++}
++
++#endif	/* _ERROR_H_ */
+diff -Naur systemtap-2.9.orig/remote.cxx systemtap-2.9/remote.cxx
+--- systemtap-2.9.orig/remote.cxx	2017-02-24 10:47:12.532787709 -0800
++++ systemtap-2.9/remote.cxx	2017-02-24 10:49:25.245926113 -0800
 @@ -459,7 +459,8 @@
  
          if (!s->uprobes_path.empty())
@@ -141,9 +138,9 @@ diff -Naurw systemtap-2.9.orig/remote.cxx systemtap-2.9/remote.cxx
              if ((rc = send_file(s->uprobes_path, remoteuprobes)))
                return rc;
  
-diff -Naurw systemtap-2.9.orig/sdt_types.h systemtap-2.9/sdt_types.h
---- systemtap-2.9.orig/sdt_types.h	2016-02-03 17:29:35.301854185 -0800
-+++ systemtap-2.9/sdt_types.h	2016-02-03 17:29:45.360853899 -0800
+diff -Naur systemtap-2.9.orig/sdt_types.h systemtap-2.9/sdt_types.h
+--- systemtap-2.9.orig/sdt_types.h	2017-02-24 10:47:12.572788050 -0800
++++ systemtap-2.9/sdt_types.h	2017-02-24 10:49:42.865077472 -0800
 @@ -10,6 +10,13 @@
  #define UPROBE2_TYPE 0x32425055 /* "UPB2" */
  #define UPROBE3_TYPE 0x33425055 /* "UPB3" */
@@ -158,9 +155,9 @@ diff -Naurw systemtap-2.9.orig/sdt_types.h systemtap-2.9/sdt_types.h
  typedef enum
    {
      uprobe1_type = UPROBE1_TYPE,
-diff -Naurw systemtap-2.9.orig/session.cxx systemtap-2.9/session.cxx
---- systemtap-2.9.orig/session.cxx	2016-02-03 17:29:35.301854185 -0800
-+++ systemtap-2.9/session.cxx	2016-02-03 17:29:45.362853899 -0800
+diff -Naur systemtap-2.9.orig/session.cxx systemtap-2.9/session.cxx
+--- systemtap-2.9.orig/session.cxx	2017-02-24 10:47:12.572788050 -0800
++++ systemtap-2.9/session.cxx	2017-02-24 10:49:56.716196203 -0800
 @@ -1329,7 +1329,7 @@
  	      cerr << "ERROR: multiple --sysroot options not supported" << endl;
  	      return 1;
@@ -170,17 +167,16 @@ diff -Naurw systemtap-2.9.orig/session.cxx systemtap-2.9/session.cxx
  	      if (spath == NULL) {
  		  cerr << _F("ERROR: %s is an invalid directory for --sysroot", optarg) << endl;
  		  return 1;
-diff -Naurw systemtap-2.9.orig/staprun/staprun.h systemtap-2.9/staprun/staprun.h
---- systemtap-2.9.orig/staprun/staprun.h	2016-02-03 17:29:35.312854184 -0800
-+++ systemtap-2.9/staprun/staprun.h	2016-02-03 17:29:45.363853898 -0800
-@@ -48,6 +48,10 @@
+diff -Naur systemtap-2.9.orig/staprun/staprun.h systemtap-2.9/staprun/staprun.h
+--- systemtap-2.9.orig/staprun/staprun.h	2017-02-24 10:47:12.581788127 -0800
++++ systemtap-2.9/staprun/staprun.h	2017-02-24 10:50:18.951386526 -0800
+@@ -47,6 +47,9 @@
+ #include <locale.h>
  #endif
  
- 
 +#ifndef __off_t
 +#define __off_t off_t
 +#endif
-+
+ 
  /* define gettext options if NLS is set */
  #if ENABLE_NLS
- #define _(string) gettext(string)
diff --git a/dev-util/systemtap/systemtap-2.9.ebuild b/dev-util/systemtap/systemtap-2.9.ebuild
index 5d676e30..e741ea3e 100644
--- a/dev-util/systemtap/systemtap-2.9.ebuild
+++ b/dev-util/systemtap/systemtap-2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ SRC_URI="http://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142