From bcaf2dc7c02360f7075d66726339cba8410f3833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Fri, 18 Dec 2015 12:31:44 +0000 Subject: main/strace: upgrade to 4.10 fixes #4925 --- main/strace/APKBUILD | 22 ++++----- main/strace/arm.patch | 13 ----- main/strace/fix-includes.patch | 107 +++++++++++++++++++++++++++++++++++++++++ main/strace/sysinfo.patch | 12 ----- 4 files changed, 116 insertions(+), 38 deletions(-) delete mode 100644 main/strace/arm.patch create mode 100644 main/strace/fix-includes.patch delete mode 100644 main/strace/sysinfo.patch diff --git a/main/strace/APKBUILD b/main/strace/APKBUILD index 16190e5e71..160d043807 100644 --- a/main/strace/APKBUILD +++ b/main/strace/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=strace -pkgver=4.9 -pkgrel=1 +pkgver=4.10 +pkgrel=0 pkgdesc="A useful diagnositic, instructional, and debugging tool" url="http://sourceforge.net/projects/strace/" arch="all" @@ -10,8 +10,7 @@ depends= makedepends="linux-headers" subpackages="$pkgname-doc" source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz - sysinfo.patch - arm.patch + fix-includes.patch " _builddir="$srcdir/$pkgname-$pkgver" @@ -44,12 +43,9 @@ package() { cd "$srcdir/$pkgname-$pkgver" make -j1 DESTDIR="$pkgdir" install } -md5sums="885eafadb10f6c60464a266d3929a2a4 strace-4.9.tar.xz -ed853f7bc7b87cc598f1a2c65ca09165 sysinfo.patch -26c267d25d7f706749773d6acfd0cd3f arm.patch" -sha256sums="095bfea5c540b91d297ccac73b21b92fd54a24599fd70395db87ff9eb7fd6f65 strace-4.9.tar.xz -727b2d56ebf4941726c21ea77bbde5b841581f4a5bde8c2954937032ee05b93b sysinfo.patch -71391bea26114bd260e2bbab1b4248cf061a9a6f0cce53f4cb320e88cd8fd122 arm.patch" -sha512sums="70d03b74067ad03940cda72dc057a44a8a33fc55790a8a3bfffb1c4d7442c2de7f3e975a01dc7c7b0430342e492579b2f3a007242d13c8a0feba1a1989f42b7b strace-4.9.tar.xz -d0da5ed3eb1cee04d07297253445725c86abb55f0f4b80e3e1b7587c581a8c252e895dd7d8a32f410e457c5382194d1b27682215d0304e1dd7ebc8d69cb8e4e7 sysinfo.patch -3fc4cc562ec26c664c2e7134d3148044a8b71683a670f9f50f900cc87fd627edb5146aed424fe7f232d7b6022bc56f76752c5964354728b9847d5f77da54c541 arm.patch" +md5sums="107a5be455493861189e9b57a3a51912 strace-4.10.tar.xz +574c38b9f5554b16af5ca94cf59e34e0 fix-includes.patch" +sha256sums="e6180d866ef9e76586b96e2ece2bfeeb3aa23f5cc88153f76e9caedd65e40ee2 strace-4.10.tar.xz +cfdff493a11b70369299e05f97a0efd0f096cf0ad7ea32619ac27a2ad3e53970 fix-includes.patch" +sha512sums="53d55b749224927cfcc9783db57eb8a057fc1329b2f5da2f54299dab17d530f5d1359480f03bea307fb72f6f372e50a0dbf0bd25d36a57a77632d9c1f690fc1d strace-4.10.tar.xz +b084efed235fe781f997f5f2c1763fd45137340f4a8f832c44642946cfb7bcf1cabb7439f61aff4bdb91d0d0369e07bcad5c7e6fd27cd1110b90db8829f17d45 fix-includes.patch" diff --git a/main/strace/arm.patch b/main/strace/arm.patch deleted file mode 100644 index f615f8fbcd..0000000000 --- a/main/strace/arm.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- strace-4.9.orig/defs.h -+++ strace-4.9/defs.h -@@ -159,6 +159,10 @@ - # include - #endif - -+#if defined(ARM) -+# include -+#endif -+ - #if defined(POWERPC) - # include - #endif diff --git a/main/strace/fix-includes.patch b/main/strace/fix-includes.patch new file mode 100644 index 0000000000..9cf6a10120 --- /dev/null +++ b/main/strace/fix-includes.patch @@ -0,0 +1,107 @@ +Upstream: yes + +From d34e00b293942b1012ddc49ed3ab379a32337611 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 28 Mar 2015 18:21:09 +0100 +Subject: [PATCH] Include for S_I* macros + +Fix a compilation failure with musl libc. + +* mknod.c: Include . +* printmode.c: Likewise. + +Reported-by: Dima Krasner +Acked-by: Mike Frysinger +--- + mknod.c | 1 + + printmode.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/mknod.c b/mknod.c +index 07e9a45..1463232 100644 +--- a/mknod.c ++++ b/mknod.c +@@ -1,6 +1,7 @@ + #include "defs.h" + + #include ++#include + + #ifdef MAJOR_IN_SYSMACROS + # include +diff --git a/printmode.c b/printmode.c +index 4df1b9f..a721936 100644 +--- a/printmode.c ++++ b/printmode.c +@@ -1,6 +1,7 @@ + #include "defs.h" + + #include ++#include + + #include "xlat/modetypes.h" + +-- +1.9.1 + +From 3460dc486d333231998de0f19918204aacee9ae3 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sat, 28 Mar 2015 18:40:13 +0100 +Subject: [PATCH] Include for _IOC_* macros + +Fix a compilation failure with musl libc. + +* evdev.c: Include . +* ioctl.c: Include instead of . +* ioctlsort.c: Likewise. + +Reported-by: Dima Krasner +Acked-by: Mike Frysinger +--- + evdev.c | 2 ++ + ioctl.c | 2 +- + ioctlsort.c | 2 +- + 3 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/evdev.c b/evdev.c +index 9a7430d..e06f9c1 100644 +--- a/evdev.c ++++ b/evdev.c +@@ -28,6 +28,8 @@ + + #include "defs.h" + ++#include ++ + #ifdef HAVE_LINUX_INPUT_H + #include + #include "xlat/evdev_abs.h" +diff --git a/ioctl.c b/ioctl.c +index 46f8334..c67d048 100644 +--- a/ioctl.c ++++ b/ioctl.c +@@ -29,7 +29,7 @@ + */ + + #include "defs.h" +-#include ++#include + #include "xlat/ioctl_dirs.h" + + #ifdef HAVE_LINUX_INPUT_H +diff --git a/ioctlsort.c b/ioctlsort.c +index 333556c..9c31691 100644 +--- a/ioctlsort.c ++++ b/ioctlsort.c +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + + struct ioctlent { + const char *info; +-- +1.9.1 + diff --git a/main/strace/sysinfo.patch b/main/strace/sysinfo.patch deleted file mode 100644 index 1a655d629c..0000000000 --- a/main/strace/sysinfo.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/resource.c b/resource.c -index 12e218f..2b72ee2 100644 ---- a/resource.c -+++ b/resource.c -@@ -31,6 +31,7 @@ - #include "defs.h" - #include - #include -+#include - #include - - #include "xlat/resources.h" -- cgit v1.2.3