strace: Update from 4.10 to 4.11

This commit is contained in:
Fredrik Fornwall 2015-12-25 22:22:44 -05:00
parent 9386416943
commit 60657c9dd0
4 changed files with 27 additions and 14 deletions

View File

@ -1,7 +1,6 @@
TERMUX_PKG_HOMEPAGE=http://sourceforge.net/projects/strace/
TERMUX_PKG_DESCRIPTION="Debugging utility to monitor the system calls used by a program and all the signals it receives"
TERMUX_PKG_VERSION=4.10
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_VERSION=4.11
TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/strace/strace/${TERMUX_PKG_VERSION}/strace-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_RM_AFTER_INSTALL=bin/strace-graph # This is a perl script

View File

@ -0,0 +1,13 @@
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 @@
break;
}
+#ifndef __ANDROID__
tprintf(", key=%u", (unsigned) msqid_ds.msg_perm.__key);
+#endif
printuid(", cuid=", msqid_ds.msg_perm.cuid);
printuid(", cgid=", msqid_ds.msg_perm.cgid);
tprints("}");

View File

@ -0,0 +1,13 @@
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 @@
break;
}
+#ifndef __ANDROID__
tprintf(", key=%u", (unsigned) shmid_ds.shm_perm.__key);
+#endif
printuid(", cuid=", shmid_ds.shm_perm.cuid);
printuid(", cgid=", shmid_ds.shm_perm.cgid);
tprints("}");

View File

@ -1,12 +0,0 @@
diff -u -r ../strace-4.9/signal.c ./signal.c
--- ../strace-4.9/signal.c 2014-08-15 01:29:09.000000000 +0200
+++ ./signal.c 2014-08-21 16:38:23.382852562 +0200
@@ -450,7 +456,7 @@
#ifdef SI_TIMER
case SI_TIMER:
tprintf(", si_timerid=%#x, si_overrun=%d",
- sip->si_timerid, sip->si_overrun);
+ sip->_sifields._timer._tid, sip->si_overrun);
printsigval(sip, verbose);
break;
#endif