From 0e3343457518906bdb2b038e0de898b6e02c8494 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 26 Sep 2019 00:47:34 +0200 Subject: [PATCH] strace: Update from 5.2 to 5.3 --- packages/strace/build.sh | 5 ++-- packages/strace/no-fputs-unlocked.patch | 32 ------------------------- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 packages/strace/no-fputs-unlocked.patch diff --git a/packages/strace/build.sh b/packages/strace/build.sh index be0117855..215c901df 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.2 +TERMUX_PKG_VERSION=5.3 TERMUX_PKG_SRCURL=https://github.com/strace/strace/releases/download/v$TERMUX_PKG_VERSION/strace-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=d513bc085609a9afd64faf2ce71deb95b96faf46cd7bc86048bc655e4e4c24d2 - +TERMUX_PKG_SHA256=6c131198749656401fe3efd6b4b16a07ea867e8f530867ceae8930bbc937a047 TERMUX_PKG_RM_AFTER_INSTALL=bin/strace-graph # This is a perl script # Without st_cv_m32_mpers=no the build fails if gawk is installed. TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" diff --git a/packages/strace/no-fputs-unlocked.patch b/packages/strace/no-fputs-unlocked.patch deleted file mode 100644 index d8015b941..000000000 --- a/packages/strace/no-fputs-unlocked.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -uNr strace-5.2/stage_output.c strace-5.2.mod/stage_output.c ---- strace-5.2/stage_output.c 2019-07-10 19:12:44.000000000 +0300 -+++ strace-5.2.mod/stage_output.c 2019-07-14 20:45:29.066735864 +0300 -@@ -54,7 +54,7 @@ - tcp->real_outf = NULL; - if (tcp->memfptr) { - if (publish) -- fputs_unlocked(tcp->memfptr, tcp->outf); -+ fputs(tcp->memfptr, tcp->outf); - else - debug_msg("syscall output dropped: %s", tcp->memfptr); - free(tcp->memfptr); -diff -uNr strace-5.2/strace.c strace-5.2.mod/strace.c ---- strace-5.2/strace.c 2019-07-10 19:12:44.000000000 +0300 -+++ strace-5.2.mod/strace.c 2019-07-14 20:45:05.963303029 +0300 -@@ -525,15 +525,11 @@ - va_end(args); - } - --#ifndef HAVE_FPUTS_UNLOCKED --# define fputs_unlocked fputs --#endif -- - void - tprints(const char *str) - { - if (current_tcp) { -- int n = fputs_unlocked(str, current_tcp->outf); -+ int n = fputs(str, current_tcp->outf); - if (n >= 0) { - current_tcp->curcol += strlen(str); - return;