tar: Fix /bin/sh -> $PREFIX/bin/sh

Also depend on xz-utils for xz compression to work.

Fixes #410.

diff --git a/packages/tar/build.sh b/packages/tar/build.sh
index 30615ba4ded167004b7ed6f9b4e288e4991d336e..9d6046c6a2486c5f2b406dc4e4f72a5e4a9efc49 100644 (file)
--- a/packages/tar/build.sh
+++ b/packages/tar/build.sh
@@ -1,7 +1,10 @@
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/tar/
 TERMUX_PKG_DESCRIPTION="GNU tar for manipulating tar archives"
 TERMUX_PKG_VERSION=1.29
 TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/tar/
 TERMUX_PKG_DESCRIPTION="GNU tar for manipulating tar archives"
 TERMUX_PKG_VERSION=1.29

+TERMUX_PKG_BUILD_REVISION=1

 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/tar/tar-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SRCURL=http://ftp.gnu.org/gnu/tar/tar-${TERMUX_PKG_VERSION}.tar.xz

+# Allow xz compression (busybox only provides xz decompression):
+TERMUX_PKG_DEPENDS="xz-utils"

 # When cross-compiling configure guesses that d_ino in struct dirent only exists
 # if triplet matches linux*-gnu*, so we force set it explicitly:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="gl_cv_struct_dirent_d_ino=yes"
 # When cross-compiling configure guesses that d_ino in struct dirent only exists
 # if triplet matches linux*-gnu*, so we force set it explicitly:
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="gl_cv_struct_dirent_d_ino=yes"

diff --git a/packages/tar/src-system.c.patch b/packages/tar/src-system.c.patch
new file mode 100644 (file)
index 0000000..7dfd1f3
--- /dev/null
+++ b/packages/tar/src-system.c.patch
@@ -0,0 +1,27 @@
+diff -u -r ../tar-1.29/src/system.c ./src/system.c
+--- ../tar-1.29/src/system.c   2016-04-14 04:23:45.000000000 -0400
++++ ./src/system.c     2016-08-20 17:14:29.885111362 -0400
+@@ -29,12 +29,12 @@
+ {
+   char *argv[4];
+ 
+-  argv[0] = (char *) "/bin/sh";
++  argv[0] = (char *) "@TERMUX_PREFIX@/bin/sh";
+   argv[1] = (char *) "-c";
+   argv[2] = (char *) cmd;
+   argv[3] = NULL;
+ 
+-  execv ("/bin/sh", argv);
++  execv ("@TERMUX_PREFIX@/bin/sh", argv);
+   exec_fatal (cmd);
+ }
+ 
+@@ -203,7 +203,7 @@
+   pid_t child;
+   const char *shell = getenv ("SHELL");
+   if (! shell)
+-    shell = "/bin/sh";
++    shell = "@TERMUX_PREFIX@/bin/sh";
+   child = xfork ();
+   if (child == 0)
+     {