sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

busybox: Handle ash as symlink and re-enable wget

Browse Source
This commit is contained in:
Fredrik Fornwall 2015-08-11 21:09:58 -04:00
parent 7229a71022
commit 4b74af2c3b
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ndk_patches/pwd.patch
View File

@ -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; + 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 = "@TERMUX_PREFIX@/bin/ash";
+ } else { + } 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_dir = "@TERMUX_HOME@";
+ pw->pw_passwd = "*"; + pw->pw_passwd = "*";

6
packages/busybox/build.sh
View File

@ -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_DESCRIPTION="Tiny versions of many common UNIX utilities into a single small executable"
TERMUX_PKG_ESSENTIAL=yes TERMUX_PKG_ESSENTIAL=yes
TERMUX_PKG_VERSION=1.23.2 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_SRCURL=http://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_BUILD_IN_SRC=yes TERMUX_PKG_BUILD_IN_SRC=yes
@ -33,9 +33,7 @@ termux_step_post_make_install () {
cd $TERMUX_PREFIX/bin cd $TERMUX_PREFIX/bin
rm -f ash rm -f ash
# Wasteful with a copy, but need to update pwd.h patch before fixing: ln -s busybox ash
cp busybox ash
chmod +x ash
# Install busybox man page # Install busybox man page
mkdir -p $TERMUX_PREFIX/share/man/man1 mkdir -p $TERMUX_PREFIX/share/man/man1

2
packages/busybox/busybox.config
View File

@ -868,7 +868,7 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="" CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
CONFIG_UDPSVD=y CONFIG_UDPSVD=y
# CONFIG_VCONFIG is not set # CONFIG_VCONFIG is not set
CONFIG_WGET=n CONFIG_WGET=y
CONFIG_FEATURE_WGET_STATUSBAR=y CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y CONFIG_FEATURE_WGET_AUTHENTICATION=y
# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set

2
packages/openssh/build.sh
View File

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=http://www.openssh.com/ TERMUX_PKG_HOMEPAGE=http://www.openssh.com/
TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine" TERMUX_PKG_DESCRIPTION="Secure shell for logging into a remote machine"
TERMUX_PKG_VERSION=6.9 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_SRCURL=http://ftp.eu.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${TERMUX_PKG_VERSION}p1.tar.gz
TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl" TERMUX_PKG_DEPENDS="libandroid-support, ldns, openssl"
# --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries: # --disable-strip to prevent host "install" command to use "-s", which won't work for target binaries:

2
packages/tmux/build.sh
View File

@ -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_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_DEPENDS="ncurses, libevent"
TERMUX_PKG_VERSION=2.0 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_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_BUILD_IN_SRC=yes