busybox: Handle ash as symlink and re-enable wget

diff --git a/ndk_patches/pwd.patch b/ndk_patches/pwd.patch
index 219ae30e692fd7915b198637df38ae536e59d1c8..4cbc750dafc72ebcfc33ec112e3d4102e8d65b2f 100644 (file)
--- a/ndk_patches/pwd.patch
+++ b/ndk_patches/pwd.patch
@@ -24,7 +24,7 @@ diff -u -r /home/fornwall/lib/android-ndk/platforms/android-21/arch-arm/usr/incl
 +              if (access(bash_path, X_OK) != -1) pw->pw_shell = (char*) bash_path;
 +              else pw->pw_shell = "@TERMUX_PREFIX@/bin/ash";
 +       } else {
 +              if (access(bash_path, X_OK) != -1) pw->pw_shell = (char*) bash_path;
 +              else pw->pw_shell = "@TERMUX_PREFIX@/bin/ash";
 +       } else {

-+               pw->pw_shell = realpath_buffer;
++               pw->pw_shell = strcmp(realpath_buffer, "@TERMUX_PREFIX@/bin/busybox") == 0 ? "@TERMUX_PREFIX@/bin/ash" : realpath_buffer;

 +       }
 +       pw->pw_dir = "@TERMUX_HOME@";
 +       pw->pw_passwd = "*";
 +       }
 +       pw->pw_dir = "@TERMUX_HOME@";
 +       pw->pw_passwd = "*";

diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index 3ec683309fa702d3cb4ac2bdb8f56cb3a52cfb7f..ddd28637b7f0cdcb5906f04c7a63e7c7643fc8a2 100755 (executable)
--- 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.23.2
 TERMUX_PKG_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
 TERMUX_PKG_ESSENTIAL=yes
 TERMUX_PKG_VERSION=1.23.2

-TERMUX_PKG_BUILD_REVISION=5
+TERMUX_PKG_BUILD_REVISION=6

 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 TERMUX_PKG_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_BUILD_IN_SRC=yes
 


@@ -33,9 +33,7 @@ termux_step_post_make_install () {
 
        cd $TERMUX_PREFIX/bin
        rm -f ash
 
        cd $TERMUX_PREFIX/bin
        rm -f ash

-       # Wasteful with a copy, but need to update pwd.h patch before fixing:
-       cp busybox ash
-       chmod +x ash
+       ln -s busybox ash

 
        # Install busybox man page
        mkdir -p $TERMUX_PREFIX/share/man/man1
 
        # Install busybox man page
        mkdir -p $TERMUX_PREFIX/share/man/man1

diff --git a/packages/busybox/busybox.config b/packages/busybox/busybox.config
index e3ab8b85330934a8e5b0ad7ef0c2003e4b7244c0..c9fe958f7cd346886878d8fa4200d61d4a1efb6b 100644 (file)
--- a/packages/busybox/busybox.config
+++ b/packages/busybox/busybox.config
@@ -868,7 +868,7 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 CONFIG_UDPSVD=y
 # CONFIG_VCONFIG is not set
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 CONFIG_UDPSVD=y
 # CONFIG_VCONFIG is not set

-CONFIG_WGET=n
+CONFIG_WGET=y

 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set

diff --git a/packages/openssh/build.sh b/packages/openssh/build.sh
index 96be49a5e8c73a68d7ba87d792596d955889dcd9..4882901d82c863b778c2a7df8769f32f703e33d4 100755 (executable)
--- a/packages/openssh/build.sh
+++ b/packages/openssh/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=http://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_VERSION=6.9
 TERMUX_PKG_HOMEPAGE=http://www.openssh.com/
 TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
 TERMUX_PKG_VERSION=6.9

-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3

 TERMUX_PKG_SRCURL=http://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}p1.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl"
 # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:
 TERMUX_PKG_SRCURL=http://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}p1.tar.gz
 TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl"
 # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:

diff --git a/packages/tmux/build.sh b/packages/tmux/build.sh
index 4bbfbee6db90514a92e1f74438fc3c4b6421e7cc..714ab224e0c19ce4b67bc789c42cc614ccbe6e66 100755 (executable)
--- a/packages/tmux/build.sh
+++ b/packages/tmux/build.sh
@@ -2,7 +2,7 @@ TERMUX_PKG_HOMEPAGE=http://tmux.github.io/
 TERMUX_PKG_DESCRIPTION="Terminal multiplexer implementing switching between several programs in one terminal, detaching them and reattaching them to a different terminal"
 TERMUX_PKG_DEPENDS="ncurses, libevent"
 TERMUX_PKG_VERSION=2.0
 TERMUX_PKG_DESCRIPTION="Terminal multiplexer implementing switching between several programs in one terminal, detaching them and reattaching them to a different terminal"
 TERMUX_PKG_DEPENDS="ncurses, libevent"
 TERMUX_PKG_VERSION=2.0

-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3

 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tmux/tmux/tmux-${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes
 
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/tmux/tmux/tmux-${TERMUX_PKG_VERSION}/tmux-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_BUILD_IN_SRC=yes