From c2f338cba5a91f0795bf1694d58f6c2776a905c2 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 9 Aug 2020 00:39:52 +0200
Subject: [PATCH] strace: Update from 5.7 to 5.8

---
 packages/strace/build.sh                     |  5 ++---
 packages/strace/ipc_msgctl.c.patch           | 13 -------------
 packages/strace/ipc_shmctl.c.patch           | 13 -------------
 packages/strace/xlat-faccessat_flags.h.patch | 12 ++++++++++++
 4 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 packages/strace/ipc_msgctl.c.patch
 delete mode 100644 packages/strace/ipc_shmctl.c.patch
 create mode 100644 packages/strace/xlat-faccessat_flags.h.patch

diff --git a/packages/strace/build.sh b/packages/strace/build.sh
index fc11aca15..2bfce750a 100644
--- a/packages/strace/build.sh
+++ b/packages/strace/build.sh
@@ -1,10 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://strace.io/
 TERMUX_PKG_DESCRIPTION="Debugging utility to monitor system calls and signals received"
 TERMUX_PKG_LICENSE="BSD"
-TERMUX_PKG_VERSION=5.7
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_VERSION=5.8
 TERMUX_PKG_SRCURL=https://github.com/strace/strace/releases/download/v$TERMUX_PKG_VERSION/strace-$TERMUX_PKG_VERSION.tar.xz
-TERMUX_PKG_SHA256=b284b59f9bcd95b9728cea5bd5c0edc5ebe360af73dc76fbf6334f11c777ccd8
+TERMUX_PKG_SHA256=df4a669f7fff9cc302784085bd4b72fab216a426a3f72c892b28a537b71e7aa9
 TERMUX_PKG_DEPENDS="libdw"
 
 # Without st_cv_m32_mpers=no the build fails if gawk is installed.
diff --git a/packages/strace/ipc_msgctl.c.patch b/packages/strace/ipc_msgctl.c.patch
deleted file mode 100644
index a99432572..000000000
--- a/packages/strace/ipc_msgctl.c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- strace-5.5/ipc_msgctl.c	2020-02-06 17:16:17.000000000 +0200
-+++ strace-5.5.mod/ipc_msgctl.c	2020-02-10 14:43:26.826877446 +0200
-@@ -48,8 +48,10 @@
- 			break;
- 		}
- 
-+#ifndef __ANDROID__
- 		tprintf(", key=%u",
- 			(unsigned) msqid_ds.msg_perm.NAME_OF_STRUCT_IPC_PERM_KEY);
-+#endif
- 		printuid(", cuid=", msqid_ds.msg_perm.cuid);
- 		printuid(", cgid=", msqid_ds.msg_perm.cgid);
- 		tprints("}");
diff --git a/packages/strace/ipc_shmctl.c.patch b/packages/strace/ipc_shmctl.c.patch
deleted file mode 100644
index 8ec47f924..000000000
--- a/packages/strace/ipc_shmctl.c.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- strace-5.5/ipc_shmctl.c	2020-02-06 17:16:17.000000000 +0200
-+++ strace-5.5.mod/ipc_shmctl.c	2020-02-10 14:45:51.122622049 +0200
-@@ -48,8 +48,10 @@
- 			break;
- 		}
- 
-+#ifndef __ANDROID__
- 		tprintf(", key=%u",
- 			(unsigned) shmid_ds.shm_perm.NAME_OF_STRUCT_IPC_PERM_KEY);
-+#endif
- 		printuid(", cuid=", shmid_ds.shm_perm.cuid);
- 		printuid(", cgid=", shmid_ds.shm_perm.cgid);
- 		tprints("}");
diff --git a/packages/strace/xlat-faccessat_flags.h.patch b/packages/strace/xlat-faccessat_flags.h.patch
new file mode 100644
index 000000000..2e12fe492
--- /dev/null
+++ b/packages/strace/xlat-faccessat_flags.h.patch
@@ -0,0 +1,12 @@
+diff -u -r ../strace-5.8/xlat/faccessat_flags.h ./xlat/faccessat_flags.h
+--- ../strace-5.8/xlat/faccessat_flags.h	2020-08-06 15:17:00.000000000 +0000
++++ ./xlat/faccessat_flags.h	2020-08-08 22:33:14.973327911 +0000
+@@ -3,6 +3,8 @@
+ #include "gcc_compat.h"
+ #include "static_assert.h"
+ 
++#undef AT_EACCESS
++
+ #if defined(AT_SYMLINK_NOFOLLOW) || (defined(HAVE_DECL_AT_SYMLINK_NOFOLLOW) && HAVE_DECL_AT_SYMLINK_NOFOLLOW)
+ DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE
+ static_assert((AT_SYMLINK_NOFOLLOW) == (0x100), "AT_SYMLINK_NOFOLLOW != 0x100");