diff options
| -rw-r--r-- | system/strace/APKBUILD | 12 | ||||
| -rw-r--r-- | system/strace/disable-fortify.patch | 39 | ||||
| -rw-r--r-- | system/strace/fix-ppc-pt-regs-collision.patch | 28 | ||||
| -rw-r--r-- | system/strace/nlattr-fix.patch | 4 |
4 files changed, 21 insertions, 62 deletions
diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD index 4cf79f0f7..040754adc 100644 --- a/system/strace/APKBUILD +++ b/system/strace/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=strace -pkgver=4.26 +pkgver=5.2 pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="https://strace.io/" @@ -10,8 +10,7 @@ license="LGPL-2.1+" depends="" makedepends="linux-headers autoconf automake" subpackages="$pkgname-doc" -source="https://github.com/strace/strace/releases/download/v4.26/strace-4.26.tar.xz - disable-fortify.patch +source="https://github.com/strace/strace/releases/download/v$pkgver/strace-$pkgver.tar.xz fix-ppc-pt-regs-collision.patch nlattr-fix.patch " @@ -52,7 +51,6 @@ package() { make -j1 DESTDIR="$pkgdir" install } -sha512sums="cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290 strace-4.26.tar.xz -273b92ebf0069f19bef7ec26c7860e2af7ef01e782255c70ded1ae5e967f8f6bf031ecba96612c6083bf58f46278ba4ab3ec0fb35b08c8c8d668191f97adee52 disable-fortify.patch -b70cee89dd49a2b5a69dc2a56c3a11169d3306e1a73981155188b574486965c034aa52b4ac1c6edff5ef55c9d52f27750acb242fac095a8a9f69689b51b3fad1 fix-ppc-pt-regs-collision.patch -44b1872cf996caa4970fa6c2875a3a2cffe4a38455e328d968bd7855ef9a05cf41190794dc137bc8667576635f5271057cf0e6cde9a6c7aee66afd1dba9bdba0 nlattr-fix.patch" +sha512sums="41bea20215fa80ad90a5d49c41944e02774e715efda5e563b3714e5800933a5fca4a2392634193cf49c0752321a39e0c185bdbc9cfb8ee053b09a6bd5723da35 strace-5.2.tar.xz +64bcd5a335d8117bf6d6eb1e47b47ef5d3df5bdc6e4c52379e0e8b099fd06e5d4fa362b3b88fbacec350783f65de589f2fb562d9df04e2895c8a74c8198e6cea fix-ppc-pt-regs-collision.patch +6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c nlattr-fix.patch" diff --git a/system/strace/disable-fortify.patch b/system/strace/disable-fortify.patch deleted file mode 100644 index 26b2978c5..000000000 --- a/system/strace/disable-fortify.patch +++ /dev/null @@ -1,39 +0,0 @@ -Subject: [PATCH] don't use fortify-headers on netlink test sources -From: A. Wilcox <AWilcox@Wilcox-Tech.com> - -We can't use fortify-headers on netlink tests because it tests what happens -when a buffer overrun occurs. - ---- strace-4.18/tests/netlink_protocol.c.old 2017-07-05 07:08:09.000000000 +0000 -+++ strace-4.18/tests/netlink_protocol.c 2017-08-17 01:09:45.822502012 +0000 -@@ -28,6 +28,8 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#define _FORTIFY_SOURCE 0 -+ - #include "tests.h" - - #ifdef HAVE_SYS_XATTR_H ---- strace-4.18/tests/netlink_sock_diag.c.old 2017-07-05 07:08:09.000000000 +0000 -+++ strace-4.18/tests/netlink_sock_diag.c 2017-08-17 01:10:00.935807300 +0000 -@@ -27,6 +27,8 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#define _FORTIFY_SOURCE 0 -+ - #include "tests.h" - #include <stdio.h> - #include <string.h> ---- strace-4.18/tests/nlattr.c.old 2017-07-05 07:08:09.000000000 +0000 -+++ strace-4.18/tests/nlattr.c 2017-08-17 01:10:11.862453682 +0000 -@@ -28,6 +28,8 @@ - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#define _FORTIFY_SOURCE 0 -+ - #include "tests.h" - - #include <stdio.h> diff --git a/system/strace/fix-ppc-pt-regs-collision.patch b/system/strace/fix-ppc-pt-regs-collision.patch index 6de0fcdd6..27d601b34 100644 --- a/system/strace/fix-ppc-pt-regs-collision.patch +++ b/system/strace/fix-ppc-pt-regs-collision.patch @@ -1,19 +1,19 @@ --- a/ptrace.h +++ b/ptrace.h -@@ -48,7 +48,15 @@ - # define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args - #endif +@@ -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 +-# 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 + # ifdef HAVE_STRUCT_IA64_FPREG + # undef ia64_fpreg diff --git a/system/strace/nlattr-fix.patch b/system/strace/nlattr-fix.patch index 6d480fabb..c0bb90062 100644 --- a/system/strace/nlattr-fix.patch +++ b/system/strace/nlattr-fix.patch @@ -1,6 +1,6 @@ --- strace-4.18/tests/nlattr.c.old 2017-07-05 07:08:09.000000000 +0000 +++ strace-4.18/tests/nlattr.c 2017-08-17 00:25:26.734218699 +0000 -@@ -61,7 +61,7 @@ +@@ -41,7 +41,7 @@ }; struct msg *msg; struct nlattr *nla; @@ -9,7 +9,7 @@ long rc; /* fetch fail: len < sizeof(struct nlattr) */ -@@ -259,7 +259,7 @@ +@@ -246,7 +246,7 @@ }; struct msg *msg; struct nlattr *nla; |