From 14fc08f7a64043bc975155027a4e646ff87a98c6 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Mon, 8 Feb 2016 05:52:15 -0500 Subject: [PATCH] busybox: Fix 'diff' when for pipes/stdin --- packages/busybox/build.sh | 2 +- packages/busybox/editors-diff.c.patch | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/busybox/editors-diff.c.patch diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh index 5f73f847..643a52c2 100755 --- a/packages/busybox/build.sh +++ b/packages/busybox/build.sh @@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://www.busybox.net/ TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable" TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_VERSION=1.24.1 -TERMUX_PKG_BUILD_REVISION=1 +TERMUX_PKG_BUILD_REVISION=2 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_BUILD_IN_SRC=yes diff --git a/packages/busybox/editors-diff.c.patch b/packages/busybox/editors-diff.c.patch new file mode 100644 index 00000000..fd5023c7 --- /dev/null +++ b/packages/busybox/editors-diff.c.patch @@ -0,0 +1,12 @@ +diff -u -r ../busybox-1.24.1/editors/diff.c ./editors/diff.c +--- ../busybox-1.24.1/editors/diff.c 2015-10-11 09:31:50.000000000 -0400 ++++ ./editors/diff.c 2016-02-08 05:23:45.890302334 -0500 +@@ -734,7 +734,7 @@ + * When we meet non-seekable file, we must make a temp copy. + */ + if (lseek(fd, 0, SEEK_SET) == -1 && errno == ESPIPE) { +- char name[] = "/tmp/difXXXXXX"; ++ char name[] = "@TERMUX_PREFIX@/tmp/difXXXXXX"; + int fd_tmp = xmkstemp(name); + + unlink(name); -- 2.11.0