busybox: Fix 'diff' when for pipes/stdin
authorFredrik Fornwall <fredrik@fornwall.net>
Mon, 8 Feb 2016 10:52:15 +0000 (05:52 -0500)
committerFredrik Fornwall <fredrik@fornwall.net>
Mon, 8 Feb 2016 10:52:15 +0000 (05:52 -0500)
packages/busybox/build.sh
packages/busybox/editors-diff.c.patch [new file with mode: 0644]

index 5f73f84..643a52c 100755 (executable)
@@ -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 (file)
index 0000000..fd5023c
--- /dev/null
@@ -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);