strace: Update from 5.7 to 5.8

This commit is contained in:
Fredrik Fornwall 2020-08-09 00:39:52 +02:00
parent dd4ca01609
commit c2f338cba5
4 changed files with 14 additions and 29 deletions

View File

@ -1,10 +1,9 @@
TERMUX_PKG_HOMEPAGE=https://strace.io/ TERMUX_PKG_HOMEPAGE=https://strace.io/
TERMUX_PKG_DESCRIPTION="Debugging utility to monitor system calls and signals received" TERMUX_PKG_DESCRIPTION="Debugging utility to monitor system calls and signals received"
TERMUX_PKG_LICENSE="BSD" TERMUX_PKG_LICENSE="BSD"
TERMUX_PKG_VERSION=5.7 TERMUX_PKG_VERSION=5.8
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/strace/strace/releases/download/v$TERMUX_PKG_VERSION/strace-$TERMUX_PKG_VERSION.tar.xz 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" TERMUX_PKG_DEPENDS="libdw"
# Without st_cv_m32_mpers=no the build fails if gawk is installed. # Without st_cv_m32_mpers=no the build fails if gawk is installed.

View File

@ -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("}");

View File

@ -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("}");

View File

@ -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");