busybox: Update from 1.25.1 to 1.26.2

diff --git a/packages/busybox/ash.patch b/packages/busybox/ash.patch
deleted file mode 100644 (file)
index d5eebd4..0000000
--- a/packages/busybox/ash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r ../busybox-1.22.1/shell/ash.c ./shell/ash.c
---- ../busybox-1.22.1/shell/ash.c      2014-01-20 03:38:10.000000000 +0100
-+++ ./shell/ash.c      2014-01-20 08:47:37.000000000 +0100
-@@ -13225,7 +13225,7 @@
-               const char *hp;
- 
-               state = 1;
--              read_profile("/etc/profile");
-+              read_profile("@TERMUX_PREFIX@/etc/profile");
-  state1:
-               state = 2;
-               hp = lookupvar("HOME");

diff --git a/packages/busybox/build.sh b/packages/busybox/build.sh
index 51fecc3..cc256e6 100755 (executable)
--- a/packages/busybox/build.sh
+++ b/packages/busybox/build.sh
@@ -1,9 +1,9 @@
 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.25.1
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.26.2
 TERMUX_PKG_SRCURL=https://www.busybox.net/downloads/busybox-${TERMUX_PKG_VERSION}.tar.bz2
+TERMUX_PKG_SHA256=da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16
 TERMUX_PKG_BUILD_IN_SRC=yes
 # We replace env in the old coreutils package:
 TERMUX_PKG_CONFLICTS="coreutils (<< 8.25-4)"
@@ -32,9 +32,8 @@ termux_step_post_make_install () {
        cd $TERMUX_PREFIX/bin/applets
        for f in `cat $TERMUX_PKG_SRCDIR/busybox.links`; do ln -s ../busybox `basename $f`; done
 
-       # The 'ash' and 'env' applets are special in that they go into $PREFIX/bin:
+       # The 'env' applet is special in that it go into $PREFIX/bin:
        cd $TERMUX_PREFIX/bin
-       ln -f -s busybox ash
        ln -f -s busybox env
 
        # Install busybox man page

diff --git a/packages/busybox/busybox.config b/packages/busybox/busybox.config
index a31eea4..711f2f7 100644 (file)
--- a/packages/busybox/busybox.config
+++ b/packages/busybox/busybox.config
@@ -149,8 +149,9 @@ CONFIG_FEATURE_CPIO_P=y
 CONFIG_GZIP=y
 # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
 CONFIG_GZIP_FAST=0
-CONFIG_LZOP=y
-CONFIG_LZOP_COMPR_HIGH=y
+CONFIG_LZOP=n
+CONFIG_LZOP_COMPR_HIGH=n
+CONFIG_UNLZOP=n
 # CONFIG_RPM is not set
 # CONFIG_RPM2CPIO is not set
 CONFIG_TAR=y
@@ -181,6 +182,8 @@ CONFIG_ID=y
 # CONFIG_GROUPS is not set
 CONFIG_SHUF=y
 CONFIG_TEST=y
+CONFIG_TEST1=n
+CONFIG_TEST2=n
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
 # CONFIG_FEATURE_TOUCH_NODEREF is not set
@@ -244,6 +247,8 @@ CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
 CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
 # CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
+CONFIG_MKE2FS=n
+CONFIG_MKDOSFS=n
 CONFIG_MKFIFO=y
 CONFIG_MKNOD=y
 CONFIG_MV=y
@@ -257,6 +262,7 @@ CONFIG_PWD=y
 CONFIG_READLINK=y
 CONFIG_FEATURE_READLINK_FOLLOW=y
 CONFIG_REALPATH=y
+CONFIG_REBOOT=n
 CONFIG_RM=y
 CONFIG_RMDIR=y
 # CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
@@ -420,8 +426,9 @@ CONFIG_FEATURE_FIND_REGEX=y
 # CONFIG_FEATURE_FIND_CONTEXT is not set
 CONFIG_FEATURE_FIND_LINKS=y
 CONFIG_GREP=y
+CONFIG_EGREP=y
+CONFIG_FGREP=n
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
-# CONFIG_FEATURE_GREP_FGREP_ALIAS is not set
 CONFIG_FEATURE_GREP_CONTEXT=y
 CONFIG_XARGS=y
 CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y
@@ -605,7 +612,8 @@ CONFIG_MORE=y
 CONFIG_SCRIPT=y
 CONFIG_SCRIPTREPLAY=y
 # CONFIG_SETARCH is not set
-# CONFIG_SWAPONOFF is not set
+CONFIG_SWAPON=n
+CONFIG_SWAPOFF=n
 # CONFIG_FEATURE_SWAPON_DISCARD is not set
 # CONFIG_FEATURE_SWAPON_PRI is not set
 # CONFIG_SWITCH_ROOT is not set
@@ -753,13 +761,16 @@ CONFIG_ARP=y
 # CONFIG_BRCTL is not set
 # CONFIG_FEATURE_BRCTL_FANCY is not set
 # CONFIG_FEATURE_BRCTL_SHOW is not set
-# CONFIG_DNSD is not set
+CONFIG_DNSD=n
+CONFIG_DNSDOMAINNAME=n
 # CONFIG_ETHER_WAKE is not set
 # CONFIG_FAKEIDENTD is not set
 CONFIG_FTPD=y
 CONFIG_FEATURE_FTP_WRITE=y
+CONFIG_FEATURE_FTPD_WRITE=y
 CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST=y
 CONFIG_FEATURE_FTP_AUTHENTICATION=n
+CONFIG_FEATURE_FTPD_AUTHENTICATION=n
 CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
@@ -782,10 +793,10 @@ CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
 CONFIG_FEATURE_IFCONFIG_HW=y
 CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y
+CONFIG_IFUP=n
 # CONFIG_IFENSLAVE is not set
 # CONFIG_IFPLUGD is not set
-# CONFIG_IFUPDOWN is not set
-CONFIG_IFUPDOWN_IFSTATE_PATH=""
+CONFIG_IFDOWN=n
 # CONFIG_FEATURE_IFUPDOWN_IP is not set
 # CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set
 # CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
@@ -815,6 +826,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_IPRULE is not set
 CONFIG_IPCALC=y
 CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_IPNEIGH=n
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
 CONFIG_NETSTAT=y
 CONFIG_FEATURE_NETSTAT_WIDE=y
@@ -878,6 +890,11 @@ CONFIG_FEATURE_WGET_TIMEOUT=y
 CONFIG_FEATURE_WGET_OPENSSL=n
 CONFIG_FEATURE_WGET_SSL_HELPER=n
 # CONFIG_ZCIP is not set
+CONFIG_ZCAT=n
+CONFIG_BZCAT=n
+CONFIG_LZCAT=n
+CONFIG_XZCAT=n
+CONFIG_LZOPCAT=n
 
 #
 # Print Utilities
@@ -906,6 +923,7 @@ CONFIG_MPSTAT=y
 CONFIG_NMETER=y
 CONFIG_PMAP=y
 # CONFIG_POWERTOP is not set
+CONFIG_POWEROFF=n
 CONFIG_PSTREE=y
 CONFIG_PWDX=y
 CONFIG_SMEMCAP=y
@@ -946,6 +964,7 @@ CONFIG_RUNSV=y
 CONFIG_RUNSVDIR=y
 # CONFIG_FEATURE_RUNSVDIR_LOG is not set
 CONFIG_SV=y
+CONFIG_SVC=n
 CONFIG_SVLOGD=y
 CONFIG_CHPST=y
 CONFIG_SETUIDGID=y
@@ -971,51 +990,16 @@ CONFIG_SOFTLIMIT=y
 #
 # Shells
 #
-CONFIG_ASH=y
-CONFIG_ASH_BASH_COMPAT=y
-# CONFIG_ASH_IDLE_TIMEOUT is not set
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-# CONFIG_ASH_BUILTIN_ECHO is not set
-# CONFIG_ASH_BUILTIN_PRINTF is not set
-# CONFIG_ASH_BUILTIN_TEST is not set
-CONFIG_ASH_HELP=y
-# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_MAIL is not set
-# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
-CONFIG_ASH_RANDOM_SUPPORT=y
-# CONFIG_ASH_EXPAND_PRMT is not set
-CONFIG_CTTYHACK=y
-# CONFIG_HUSH is not set
-# CONFIG_HUSH_BASH_COMPAT is not set
-# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
-# CONFIG_HUSH_INTERACTIVE is not set
-# CONFIG_HUSH_SAVEHISTORY is not set
-# CONFIG_HUSH_JOB is not set
-# CONFIG_HUSH_TICK is not set
-# CONFIG_HUSH_IF is not set
-# CONFIG_HUSH_LOOPS is not set
-# CONFIG_HUSH_CASE is not set
-# CONFIG_HUSH_FUNCTIONS is not set
-# CONFIG_HUSH_LOCAL is not set
-# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
-# CONFIG_HUSH_MODE_X is not set
-# CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
-# CONFIG_FEATURE_SH_STANDALONE is not set
-# CONFIG_FEATURE_SH_NOFORK is not set
-# CONFIG_FEATURE_SH_HISTFILESIZE is not set
+CONFIG_ASH=n
+CONFIG_HUSH=n
+CONFIG_MSH=n
+CONFIG_SH_IS_ASH=n
+CONFIG_SH_IS_HUSH=n
+CONFIG_SH_IS_NONE=y
+CONFIG_BASH_IS_ASH=n
+CONFIG_BASH_IS_HUSH=n
+CONFIG_BASH_IS_NONE=y
+CONFIG_CTTYHACK=n
 
 #
 # System Logging Utilities
@@ -1049,6 +1033,8 @@ CONFIG_BUSYBOX=y
 CONFIG_DEBUG_SANITIZE=n
 CONFIG_FEATURE_USE_BSS_TAIL=n
 CONFIG_LINUXRC=n
+CONFIG_LINUX32=y
+CONFIG_LINUX64=y
 CONFIG_MKPASSWD=n
 CONFIG_BLKDISCARD=n
 CONFIG_NSENTER=n