From 16866b73890b5e64152a84df580a8ba930aa5caf Mon Sep 17 00:00:00 2001
From: Leonid Plyushch <leonid.plyushch@gmail.com>
Date: Wed, 3 Oct 2018 01:17:03 +0300
Subject: [PATCH] strace: fix crash on Android 9 (Pie)

Disables setreuid() and similar calls that are disallowed
by seccomp.
---
 packages/strace/build.sh           |  1 +
 packages/strace/ipc_msgctl.c.patch |  8 +++---
 packages/strace/ipc_shmctl.c.patch |  8 +++---
 packages/strace/strace.c.patch     | 42 ++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 8 deletions(-)
 create mode 100644 packages/strace/strace.c.patch

diff --git a/packages/strace/build.sh b/packages/strace/build.sh
index 16bd8f714..4b5dbb4d7 100755
--- a/packages/strace/build.sh
+++ b/packages/strace/build.sh
@@ -1,6 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://strace.io/
 TERMUX_PKG_DESCRIPTION="Debugging utility to monitor system calls and signals received"
 TERMUX_PKG_VERSION=4.24
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SHA256=1f4e59fc1edfa2bfb4adf2a748623dc25b105ec79713dd84404199f91b0b0634
 TERMUX_PKG_SRCURL=https://strace.io/files/$TERMUX_PKG_VERSION/strace-$TERMUX_PKG_VERSION.tar.xz
 TERMUX_PKG_RM_AFTER_INSTALL=bin/strace-graph # This is a perl script
diff --git a/packages/strace/ipc_msgctl.c.patch b/packages/strace/ipc_msgctl.c.patch
index ba8d449cc..480d03dab 100644
--- a/packages/strace/ipc_msgctl.c.patch
+++ b/packages/strace/ipc_msgctl.c.patch
@@ -1,7 +1,7 @@
-diff -u -r ../strace-4.11/ipc_msgctl.c ./ipc_msgctl.c
---- ../strace-4.11/ipc_msgctl.c	2015-11-25 20:36:58.000000000 -0500
-+++ ./ipc_msgctl.c	2015-12-25 22:20:18.904846632 -0500
-@@ -74,7 +74,9 @@
+diff -uNr strace-4.24/ipc_msgctl.c strace-4.24.mod/ipc_msgctl.c
+--- strace-4.24/ipc_msgctl.c	2017-05-22 20:33:51.000000000 +0300
++++ strace-4.24.mod/ipc_msgctl.c	2018-10-03 01:14:05.344818748 +0300
+@@ -75,7 +75,9 @@
  			break;
  		}
  
diff --git a/packages/strace/ipc_shmctl.c.patch b/packages/strace/ipc_shmctl.c.patch
index 891f755cf..bd3f91ef5 100644
--- a/packages/strace/ipc_shmctl.c.patch
+++ b/packages/strace/ipc_shmctl.c.patch
@@ -1,7 +1,7 @@
-diff -u -r ../strace-4.11/ipc_shmctl.c ./ipc_shmctl.c
---- ../strace-4.11/ipc_shmctl.c	2015-11-25 20:36:58.000000000 -0500
-+++ ./ipc_shmctl.c	2015-12-25 22:21:12.944165532 -0500
-@@ -74,7 +74,9 @@
+diff -uNr strace-4.24/ipc_shmctl.c strace-4.24.mod/ipc_shmctl.c
+--- strace-4.24/ipc_shmctl.c	2017-05-22 20:33:51.000000000 +0300
++++ strace-4.24.mod/ipc_shmctl.c	2018-10-03 01:14:05.348152107 +0300
+@@ -75,7 +75,9 @@
  			break;
  		}
  
diff --git a/packages/strace/strace.c.patch b/packages/strace/strace.c.patch
new file mode 100644
index 000000000..3862a9ac5
--- /dev/null
+++ b/packages/strace/strace.c.patch
@@ -0,0 +1,42 @@
+diff -uNr strace-4.24/strace.c strace-4.24.mod/strace.c
+--- strace-4.24/strace.c	2018-07-11 03:00:57.000000000 +0300
++++ strace-4.24.mod/strace.c	2018-10-03 01:15:15.105370170 +0300
+@@ -442,11 +442,7 @@
+ static void
+ swap_uid(void)
+ {
+-	int euid = geteuid(), uid = getuid();
+-
+-	if (euid != uid && setreuid(euid, uid) < 0) {
+-		perror_msg_and_die("setreuid");
+-	}
++    return;
+ }
+ 
+ static FILE *
+@@ -1182,25 +1178,6 @@
+ 		}
+ 	}
+ 
+-	if (username != NULL) {
+-		/*
+-		 * It is important to set groups before we
+-		 * lose privileges on setuid.
+-		 */
+-		if (initgroups(username, run_gid) < 0) {
+-			perror_msg_and_die("initgroups");
+-		}
+-		if (setregid(run_gid, params->run_egid) < 0) {
+-			perror_msg_and_die("setregid");
+-		}
+-		if (setreuid(run_uid, params->run_euid) < 0) {
+-			perror_msg_and_die("setreuid");
+-		}
+-	} else if (geteuid() != 0)
+-		if (setreuid(run_uid, run_uid) < 0) {
+-			perror_msg_and_die("setreuid");
+-		}
+-
+ 	if (!daemonized_tracer) {
+ 		/*
+ 		 * Induce a ptrace stop. Tracer (our parent)