summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-22 23:55:12 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-12-23 00:34:15 +0000
commit6041e747c0dffde281df068b67d0a46f12a5c767 (patch)
treec21280e3652b580098283b55d07e8990a20f7c67
parent40e8660efe10534e98bbe343845d7470176e6e67 (diff)
downloadpackages-6041e747c0dffde281df068b67d0a46f12a5c767.tar.gz
packages-6041e747c0dffde281df068b67d0a46f12a5c767.tar.bz2
packages-6041e747c0dffde281df068b67d0a46f12a5c767.tar.xz
packages-6041e747c0dffde281df068b67d0a46f12a5c767.zip
system/strace: bump to 5.4, remove unnecessary PPC patch
-rw-r--r--system/strace/APKBUILD6
-rw-r--r--system/strace/fix-ppc-pt-regs-collision.patch19
2 files changed, 2 insertions, 23 deletions
diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD
index 1c6bcc854..e0cbb71fa 100644
--- a/system/strace/APKBUILD
+++ b/system/strace/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=strace
-pkgver=5.3
+pkgver=5.4
pkgrel=0
pkgdesc="A useful diagnositic, instructional, and debugging tool"
url="https://strace.io/"
@@ -11,7 +11,6 @@ depends=""
makedepends="linux-headers autoconf automake"
subpackages="$pkgname-doc"
source="https://github.com/strace/strace/releases/download/v$pkgver/strace-$pkgver.tar.xz
- fix-ppc-pt-regs-collision.patch
nlattr-fix.patch
"
@@ -51,6 +50,5 @@ package() {
make -j1 DESTDIR="$pkgdir" install
}
-sha512sums="02b80a8abedb14e40235709733953005210cd328daba59cb594745e7ed3851d155546ccccdb3e43835aa75eee89f023324e542e15154bbc3269e37fd23433e2a strace-5.3.tar.xz
-64bcd5a335d8117bf6d6eb1e47b47ef5d3df5bdc6e4c52379e0e8b099fd06e5d4fa362b3b88fbacec350783f65de589f2fb562d9df04e2895c8a74c8198e6cea fix-ppc-pt-regs-collision.patch
+sha512sums="4ddba2ec4457a2257c18b26dca851e49a275813c4eb3069379a93fcc60228f9b63a3dee9e3719ae606a7cc61d55ab21ce147327223903c302c061e381097a8d7 strace-5.4.tar.xz
6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c nlattr-fix.patch"
diff --git a/system/strace/fix-ppc-pt-regs-collision.patch b/system/strace/fix-ppc-pt-regs-collision.patch
deleted file mode 100644
index 27d601b34..000000000
--- a/system/strace/fix-ppc-pt-regs-collision.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/ptrace.h
-+++ b/ptrace.h
-@@ -30,7 +30,15 @@
- # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
- # endif
-
--# include <linux/ptrace.h>
-+# if defined(__powerpc__) || defined(__powerpc64__)
-+# include <linux/types.h>
-+# define __ASSEMBLY__
-+# include <linux/ptrace.h>
-+# undef __ASSEMBLY__
-+# else
-+# include <linux/ptrace.h>
-+# endif
-+
-
- # ifdef HAVE_STRUCT_IA64_FPREG
- # undef ia64_fpreg