wok-next rev 21531

updated busybox (1.27.2 -> 1.31.1)
author Hans-G?nter Theisgen
date Sat Jun 20 17:14:40 2020 +0100 (2020-06-20)
parents 479f5c96e282
children 90e4058fa9c1
files busybox/receipt busybox/stuff/.config
line diff
     1.1 --- a/busybox/receipt	Sat Jun 20 16:57:29 2020 +0100
     1.2 +++ b/busybox/receipt	Sat Jun 20 17:14:40 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="busybox"
     1.7 -VERSION="1.27.2"
     1.8 +VERSION="1.31.1"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="Tiny versions of UNIX utilities"
    1.11  MAINTAINER="pascal.bellard@slitaz.org"
    1.12 @@ -11,18 +11,19 @@
    1.13  TARBALL="$PACKAGE-$VERSION.tar.bz2"
    1.14  WGET_URL="${WEB_SITE}downloads/$TARBALL"
    1.15  
    1.16 -BUILD_DEPENDS="patch bzip2 gettext-dev perl pam-dev libtirpc-dev" # uclibc-cross-compiler-i486 musl-libc-dev dietlibc
    1.17 +BUILD_DEPENDS="bzip2 gettext-dev libtirpc-dev patch pam-dev perl" # uclibc-cross-compiler-i486 musl-libc-dev dietlibc
    1.18  case "$ARCH" in
    1.19  	x86_64) SPLIT="$PACKAGE-pam:pam";;
    1.20  	*)      SPLIT="$PACKAGE-pam:pam ssfs-busybox:ssfs" # $PACKAGE-boot:boot $PACKAGE-static:static
    1.21  	        ;;
    1.22  esac
    1.23  
    1.24 -compile_rules() {
    1.25 +compile_rules()
    1.26 +{
    1.27  	export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libtirpc)"
    1.28  	case "$SET" in
    1.29  		'')
    1.30 -			cp $stuff/.config $src
    1.31 +			cp $stuff/.config	$src
    1.32  			make oldconfig &&
    1.33  			make &&
    1.34  			make install || return 1
    1.35 @@ -38,7 +39,8 @@
    1.36  				$src/docs/*.htm* \
    1.37  				$src/docs/cgi
    1.38  
    1.39 -			cp -a $src/_install/* $install; rm -rf $src/_install
    1.40 +			cp -a $src/_install/* $install
    1.41 +			rm -rf $src/_install
    1.42  
    1.43  			[ -e $install/sbin/ip ] && ln -s busybox $install/bin/ip
    1.44  			rm -f $install/bin/bbconfig $install/usr/bin/ar
    1.45 @@ -50,26 +52,28 @@
    1.46  				$install/etc/modprobe.d \
    1.47  				$install/usr/share/udhcpc
    1.48  
    1.49 -			# Busybox config files
    1.50 -			cp -a $stuff/etc/* $install/etc
    1.51 -			chown -R 0.0 $install/etc
    1.52 -			chmod 600 $install/etc/busybox.conf
    1.53 +			# Busybox configuration files
    1.54 +			cp -a $stuff/etc/*	$install/etc
    1.55 +			chown -R 0.0		$install/etc
    1.56 +			chmod 600		$install/etc/busybox.conf
    1.57  
    1.58  			# Daemon scripts
    1.59 -			cp $stuff/daemon $install/etc/init.d
    1.60 +			cp $stuff/daemon	$install/etc/init.d
    1.61  			for i in crond dnsd ftpd httpd inetd lpd klogd ntpd syslogd \
    1.62 -			         telnetd tftpd udhcpd zcip; do
    1.63 +			         telnetd tftpd udhcpd zcip
    1.64 +			  do
    1.65  				grep -qi "config_$i=y" $stuff/.config &&
    1.66  				ln -s daemon $install/etc/init.d/$i
    1.67 -			done
    1.68 -			rm $install/linuxrc
    1.69 +			  done
    1.70 +			rm			$install/linuxrc
    1.71  
    1.72  			# Udhcpc stuff
    1.73 -			install -m755 $stuff/udhcp.script $install/usr/share/udhcpc/default.script
    1.74 +			install -m755 $stuff/udhcp.script \
    1.75 +						$install/usr/share/udhcpc/default.script
    1.76  
    1.77  			# Httpd stuff (httphelper.sh found in slitaz-base-files package)
    1.78  			ln -s /usr/lib/slitaz/httphelper.sh $install/usr/bin/httpd_helper.sh
    1.79 -			cp -r $stuff/www $install/var
    1.80 +			cp -r $stuff/www	$install/var
    1.81  
    1.82  			# Update copyright year
    1.83  			grep -rl 'YEAR' $install/var/www | xargs sed -i "s|YEAR|$(date +%Y)|"
    1.84 @@ -85,8 +89,8 @@
    1.85  			mkdir -p \
    1.86  				$install/bin/ \
    1.87  				$install/etc/pam.d/
    1.88 -			cp -a $src/busybox $install/bin
    1.89 -			cp $stuff/login $install/etc/pam.d/
    1.90 +			cp -a $src/busybox	$install/bin
    1.91 +			cp $stuff/login		$install/etc/pam.d/
    1.92  			;;
    1.93  
    1.94  		ssfs)
    1.95 @@ -148,15 +152,17 @@
    1.96  }
    1.97  
    1.98  # Cross compilation check.
    1.99 -testsuite() {
   1.100 +testsuite()
   1.101 +{
   1.102  	readelf -h $WOK/busybox/install/bin/busybox
   1.103  }
   1.104  
   1.105 -genpkg_rules() {
   1.106 +genpkg_rules()
   1.107 +{
   1.108  	case $PACKAGE in
   1.109  		busybox)
   1.110  			copy @std *.mo
   1.111 -			DEPENDS="slitaz-base-files glibc-base ncurses libtirpc"
   1.112 +			DEPENDS="glibc-base libtirpc ncurses slitaz-base-files"
   1.113  			CONFIG_FILES="/etc/dnsd.conf /etc/inetd.conf /etc/udhcpd.conf \
   1.114  			/etc/resolv.conf /etc/httpd.conf"
   1.115  			;;
   1.116 @@ -187,14 +193,15 @@
   1.117  				$fs/usr/share/boot/dev
   1.118  
   1.119  			CHOICE='static'
   1.120 -			for i in uclibc musl diet; do
   1.121 +			for i in uclibc musl diet
   1.122 +			  do
   1.123  				[ -x "$src/busybox-$i" ] || continue
   1.124  				[ -x "$src/busybox-$CHOICE" ] &&
   1.125  					[ $(stat -c %s $src/busybox-$i) -ge \
   1.126  					  $(stat -c %s $src/busybox-$CHOICE) ] &&
   1.127  					continue
   1.128  				CHOICE="$i"
   1.129 -			done
   1.130 +			  done
   1.131  			cp -a $src/busybox-$CHOICE $fs/usr/share/boot/bin/busybox
   1.132  
   1.133  			chmod   4755 $fs/usr/share/boot/bin/busybox
   1.134 @@ -223,26 +230,29 @@
   1.135  			mkdir -p $fs/usr/share/boot
   1.136  
   1.137  			CHOICE='static'
   1.138 -			for i in uclibc musl diet; do
   1.139 +			for i in uclibc musl diet
   1.140 +			  do
   1.141  				[ -x "$src/busybox-$i" ] || continue
   1.142  				[ -x "$src/busybox-$CHOICE" ] &&
   1.143  					[ $(stat -c %s $src/busybox-$i) -ge \
   1.144  					  $(stat -c %s $src/busybox-$CHOICE) ] &&
   1.145  					continue
   1.146  				CHOICE="$i"
   1.147 -			done
   1.148 +			  done
   1.149  			cp -a $src/busybox-$CHOICE $fs/usr/share/boot/busybox-static
   1.150  			;;
   1.151  	esac
   1.152  }
   1.153  
   1.154  # GNU utils stuff.
   1.155 -pre_install_busybox() {
   1.156 +pre_install_busybox()
   1.157 +{
   1.158  	local i
   1.159  	[ -s $1/etc/resolv.conf ] &&
   1.160 -	cp -a $1/etc/resolv.conf $1/etc/resolv.conf-busybox-install
   1.161 +	cp -a $1/etc/resolv.conf	$1/etc/resolv.conf-busybox-install
   1.162  	answer=''
   1.163 -	for i in $(sed '/busybox$/d; /bin\//!d' "$1$INSTALLED/$PACKAGE/files.list"); do
   1.164 +	for i in $(sed '/busybox$/d; /bin\//!d' "$1$INSTALLED/$PACKAGE/files.list")
   1.165 +	  do
   1.166  		[ -f "$1$i" ] || continue
   1.167  		if [ -z "$answer" ]; then
   1.168  			echo
   1.169 @@ -250,29 +260,33 @@
   1.170  			answer='Y'
   1.171  		fi
   1.172  		cp -a "$1$i" "$1$i-busybox-install"
   1.173 -	done
   1.174 +	  done
   1.175  }
   1.176  
   1.177 -post_install_busybox() {
   1.178 +post_install_busybox()
   1.179 +{
   1.180  	local i
   1.181  	[ -f $1/etc/resolv.conf-busybox-install ] &&
   1.182  	mv -f $1/etc/resolv.conf-busybox-install $1/etc/resolv.conf
   1.183 -	for i in $($1/bin/busybox --list-full); do
   1.184 +	for i in $($1/bin/busybox --list-full)
   1.185 +	  do
   1.186  		[ -f "$1/$i-busybox-install" ] || continue
   1.187  		mv "$1/$i-busybox-install" "$1/$i"
   1.188 -	done
   1.189 +	  done
   1.190  	chmod 4755 "$1/bin/busybox"
   1.191  
   1.192  	touch "$1/etc/daemons.conf"
   1.193  	# /etc/daemons.conf (tftp + dnsd + httpd may not be present)
   1.194 -	if ! grep -q ^DNSD_OPTIONS "$1/etc/daemons.conf"; then
   1.195 +	if ! grep -q ^DNSD_OPTIONS "$1/etc/daemons.conf"
   1.196 +	  then
   1.197  		cat >> "$1/etc/daemons.conf" <<EOF
   1.198  # Domain name server options.
   1.199  DNSD_OPTIONS="-d"
   1.200  
   1.201  EOF
   1.202  	fi
   1.203 -	if ! grep -q ^TFTPD_OPTIONS $1/etc/daemons.conf; then
   1.204 +	if ! grep -q ^TFTPD_OPTIONS $1/etc/daemons.conf
   1.205 +	  then
   1.206  		cat >> "$1/etc/daemons.conf" <<EOF
   1.207  # Tftp daemon options.
   1.208  TFTPD_OPTIONS="-r /boot"
   1.209 @@ -282,11 +296,13 @@
   1.210  }
   1.211  
   1.212  # We can't remove this package!
   1.213 -pre_remove_busybox() {
   1.214 +pre_remove_busybox()
   1.215 +{
   1.216  	return 1
   1.217  }
   1.218  
   1.219 -pre_remove_busybox_pam() {
   1.220 +pre_remove_busybox_pam()
   1.221 +{
   1.222  	# We install non-pam busybox to replace busybox-pam.
   1.223  	tazpkg get-install busybox --forced
   1.224  
   1.225 @@ -297,10 +313,12 @@
   1.226  		-i /var/lib/tazpkg/installed/busybox-pam/files.list
   1.227  }
   1.228  
   1.229 -post_install_busybox_pam() {
   1.230 +post_install_busybox_pam()
   1.231 +{
   1.232  	chmod 4755 "$1/bin/busybox"
   1.233  }
   1.234  
   1.235 -post_install_busybox_static() {
   1.236 +post_install_busybox_static()
   1.237 +{
   1.238  	chmod 4755 "$1/usr/share/boot/busybox-static"
   1.239  }
     2.1 --- a/busybox/stuff/.config	Sat Jun 20 16:57:29 2020 +0100
     2.2 +++ b/busybox/stuff/.config	Sat Jun 20 17:14:40 2020 +0100
     2.3 @@ -1,40 +1,41 @@
     2.4  #
     2.5  # Automatically generated make config: don't edit
     2.6 -# Busybox version: 1.27.2
     2.7 -# Fri Sep 29 17:38:34 2017
     2.8 +# Busybox version: 1.31.1
     2.9 +# Sat Jun 20 16:49:30 2020
    2.10  #
    2.11  CONFIG_HAVE_DOT_CONFIG=y
    2.12  
    2.13  #
    2.14 -# Busybox Settings
    2.15 +# Settings
    2.16  #
    2.17  CONFIG_DESKTOP=y
    2.18  # CONFIG_EXTRA_COMPAT is not set
    2.19  # CONFIG_FEDORA_COMPAT is not set
    2.20  CONFIG_INCLUDE_SUSv2=y
    2.21 -# CONFIG_USE_PORTABLE_CODE is not set
    2.22 +CONFIG_LONG_OPTS=y
    2.23  CONFIG_SHOW_USAGE=y
    2.24  CONFIG_FEATURE_VERBOSE_USAGE=y
    2.25  CONFIG_FEATURE_COMPRESS_USAGE=y
    2.26 -CONFIG_BUSYBOX=y
    2.27 -CONFIG_FEATURE_INSTALLER=y
    2.28 -# CONFIG_INSTALL_NO_USR is not set
    2.29 +CONFIG_LFS=y
    2.30  # CONFIG_PAM is not set
    2.31 -CONFIG_LONG_OPTS=y
    2.32  CONFIG_FEATURE_DEVPTS=y
    2.33 -# CONFIG_FEATURE_CLEAN_UP is not set
    2.34  CONFIG_FEATURE_UTMP=y
    2.35  CONFIG_FEATURE_WTMP=y
    2.36  CONFIG_FEATURE_PIDFILE=y
    2.37  CONFIG_PID_FILE_PATH="/run"
    2.38 +CONFIG_BUSYBOX=y
    2.39 +CONFIG_FEATURE_SHOW_SCRIPT=y
    2.40 +CONFIG_FEATURE_INSTALLER=y
    2.41 +# CONFIG_INSTALL_NO_USR is not set
    2.42  CONFIG_FEATURE_SUID=y
    2.43  CONFIG_FEATURE_SUID_CONFIG=y
    2.44  # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
    2.45 -# CONFIG_SELINUX is not set
    2.46  # CONFIG_FEATURE_PREFER_APPLETS is not set
    2.47  CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
    2.48 +# CONFIG_SELINUX is not set
    2.49 +# CONFIG_FEATURE_CLEAN_UP is not set
    2.50 +CONFIG_FEATURE_SYSLOG_INFO=y
    2.51  CONFIG_FEATURE_SYSLOG=y
    2.52 -CONFIG_FEATURE_HAVE_RPC=y
    2.53  CONFIG_PLATFORM_LINUX=y
    2.54  
    2.55  #
    2.56 @@ -44,14 +45,16 @@
    2.57  # CONFIG_PIE is not set
    2.58  # CONFIG_NOMMU is not set
    2.59  # CONFIG_BUILD_LIBBUSYBOX is not set
    2.60 +# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set
    2.61  # CONFIG_FEATURE_INDIVIDUAL is not set
    2.62  # CONFIG_FEATURE_SHARED_BUSYBOX is not set
    2.63 -CONFIG_LFS=y
    2.64  CONFIG_CROSS_COMPILER_PREFIX=""
    2.65  CONFIG_SYSROOT=""
    2.66  CONFIG_EXTRA_CFLAGS=""
    2.67  CONFIG_EXTRA_LDFLAGS=""
    2.68  CONFIG_EXTRA_LDLIBS="tirpc"
    2.69 +# CONFIG_USE_PORTABLE_CODE is not set
    2.70 +CONFIG_STACK_OPTIMIZATION_386=y
    2.71  
    2.72  #
    2.73  # Installation Options ("make install" behavior)
    2.74 @@ -78,10 +81,12 @@
    2.75  # CONFIG_EFENCE is not set
    2.76  
    2.77  #
    2.78 -# Busybox Library Tuning
    2.79 +# Library Tuning
    2.80  #
    2.81  # CONFIG_FEATURE_USE_BSS_TAIL is not set
    2.82 +CONFIG_FLOAT_DURATION=y
    2.83  # CONFIG_FEATURE_RTMINMAX is not set
    2.84 +# CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS is not set
    2.85  CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
    2.86  # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
    2.87  # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
    2.88 @@ -90,6 +95,7 @@
    2.89  CONFIG_SHA3_SMALL=0
    2.90  CONFIG_FEATURE_FAST_TOP=y
    2.91  # CONFIG_FEATURE_ETC_NETWORKS is not set
    2.92 +# CONFIG_FEATURE_ETC_SERVICES is not set
    2.93  CONFIG_FEATURE_EDITING=y
    2.94  CONFIG_FEATURE_EDITING_MAX_LEN=1024
    2.95  # CONFIG_FEATURE_EDITING_VI is not set
    2.96 @@ -100,6 +106,7 @@
    2.97  CONFIG_FEATURE_TAB_COMPLETION=y
    2.98  # CONFIG_FEATURE_USERNAME_COMPLETION is not set
    2.99  CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
   2.100 +CONFIG_FEATURE_EDITING_WINCH=y
   2.101  CONFIG_FEATURE_EDITING_ASK_TERMINAL=y
   2.102  CONFIG_LOCALE_SUPPORT=y
   2.103  CONFIG_UNICODE_SUPPORT=y
   2.104 @@ -145,11 +152,11 @@
   2.105  CONFIG_UNLZMA=y
   2.106  CONFIG_LZCAT=y
   2.107  # CONFIG_LZMA is not set
   2.108 -CONFIG_FEATURE_LZMA_FAST=y
   2.109  CONFIG_UNXZ=y
   2.110  CONFIG_XZCAT=y
   2.111  # CONFIG_XZ is not set
   2.112  CONFIG_BZIP2=y
   2.113 +CONFIG_BZIP2_SMALL=8
   2.114  CONFIG_FEATURE_BZIP2_DECOMPRESS=y
   2.115  CONFIG_CPIO=y
   2.116  CONFIG_FEATURE_CPIO_O=y
   2.117 @@ -184,12 +191,14 @@
   2.118  CONFIG_FEATURE_UNZIP_BZIP2=y
   2.119  CONFIG_FEATURE_UNZIP_LZMA=y
   2.120  CONFIG_FEATURE_UNZIP_XZ=y
   2.121 +CONFIG_FEATURE_LZMA_FAST=y
   2.122  
   2.123  #
   2.124  # Coreutils
   2.125  #
   2.126  CONFIG_BASENAME=y
   2.127  CONFIG_CAT=y
   2.128 +CONFIG_FEATURE_CATN=y
   2.129  CONFIG_FEATURE_CATV=y
   2.130  CONFIG_CHGRP=y
   2.131  CONFIG_CHMOD=y
   2.132 @@ -200,6 +209,7 @@
   2.133  CONFIG_COMM=y
   2.134  CONFIG_CP=y
   2.135  CONFIG_FEATURE_CP_LONG_OPTIONS=y
   2.136 +CONFIG_FEATURE_CP_REFLINK=y
   2.137  CONFIG_CUT=y
   2.138  CONFIG_DATE=y
   2.139  CONFIG_FEATURE_DATE_ISOFMT=y
   2.140 @@ -220,17 +230,13 @@
   2.141  CONFIG_ECHO=y
   2.142  CONFIG_FEATURE_FANCY_ECHO=y
   2.143  CONFIG_ENV=y
   2.144 -CONFIG_FEATURE_ENV_LONG_OPTIONS=y
   2.145  CONFIG_EXPAND=y
   2.146 -CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
   2.147  CONFIG_UNEXPAND=y
   2.148 -CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
   2.149  CONFIG_EXPR=y
   2.150  # CONFIG_EXPR_MATH_SUPPORT_64 is not set
   2.151  # CONFIG_FACTOR is not set
   2.152  CONFIG_FALSE=y
   2.153  CONFIG_FOLD=y
   2.154 -CONFIG_FSYNC=y
   2.155  CONFIG_HEAD=y
   2.156  CONFIG_FEATURE_FANCY_HEAD=y
   2.157  CONFIG_HOSTID=y
   2.158 @@ -262,12 +268,10 @@
   2.159  #
   2.160  CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
   2.161  CONFIG_MKDIR=y
   2.162 -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
   2.163  CONFIG_MKFIFO=y
   2.164  CONFIG_MKNOD=y
   2.165  CONFIG_MKTEMP=y
   2.166  CONFIG_MV=y
   2.167 -CONFIG_FEATURE_MV_LONG_OPTIONS=y
   2.168  CONFIG_NICE=y
   2.169  CONFIG_NL=y
   2.170  CONFIG_NOHUP=y
   2.171 @@ -282,15 +286,14 @@
   2.172  CONFIG_REALPATH=y
   2.173  CONFIG_RM=y
   2.174  CONFIG_RMDIR=y
   2.175 -CONFIG_FEATURE_RMDIR_LONG_OPTIONS=y
   2.176  CONFIG_SEQ=y
   2.177  CONFIG_SHRED=y
   2.178  # CONFIG_SHUF is not set
   2.179  CONFIG_SLEEP=y
   2.180  CONFIG_FEATURE_FANCY_SLEEP=y
   2.181 -CONFIG_FEATURE_FLOAT_SLEEP=y
   2.182  CONFIG_SORT=y
   2.183  CONFIG_FEATURE_SORT_BIG=y
   2.184 +# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
   2.185  CONFIG_SPLIT=y
   2.186  CONFIG_FEATURE_SPLIT_FANCY=y
   2.187  CONFIG_STAT=y
   2.188 @@ -300,6 +303,7 @@
   2.189  CONFIG_SUM=y
   2.190  CONFIG_SYNC=y
   2.191  CONFIG_FEATURE_SYNC_FANCY=y
   2.192 +CONFIG_FSYNC=y
   2.193  CONFIG_TAC=y
   2.194  CONFIG_TAIL=y
   2.195  CONFIG_FEATURE_FANCY_TAIL=y
   2.196 @@ -321,6 +325,7 @@
   2.197  CONFIG_TTY=y
   2.198  CONFIG_UNAME=y
   2.199  CONFIG_UNAME_OSNAME="GNU/Linux"
   2.200 +CONFIG_BB_ARCH=y
   2.201  CONFIG_UNIQ=y
   2.202  # CONFIG_UNLINK is not set
   2.203  CONFIG_USLEEP=y
   2.204 @@ -393,6 +398,14 @@
   2.205  CONFIG_WHICH=y
   2.206  
   2.207  #
   2.208 +# klibc-utils
   2.209 +#
   2.210 +# CONFIG_MINIPS is not set
   2.211 +CONFIG_NUKE=y
   2.212 +CONFIG_RESUME=y
   2.213 +CONFIG_RUN_INIT=y
   2.214 +
   2.215 +#
   2.216  # Editors
   2.217  #
   2.218  CONFIG_AWK=y
   2.219 @@ -433,6 +446,7 @@
   2.220  CONFIG_FEATURE_FIND_MMIN=y
   2.221  CONFIG_FEATURE_FIND_PERM=y
   2.222  CONFIG_FEATURE_FIND_TYPE=y
   2.223 +CONFIG_FEATURE_FIND_EXECUTABLE=y
   2.224  CONFIG_FEATURE_FIND_XDEV=y
   2.225  CONFIG_FEATURE_FIND_MAXDEPTH=y
   2.226  CONFIG_FEATURE_FIND_NEWER=y
   2.227 @@ -446,6 +460,7 @@
   2.228  CONFIG_FEATURE_FIND_PAREN=y
   2.229  CONFIG_FEATURE_FIND_SIZE=y
   2.230  CONFIG_FEATURE_FIND_PRUNE=y
   2.231 +CONFIG_FEATURE_FIND_QUIT=y
   2.232  CONFIG_FEATURE_FIND_DELETE=y
   2.233  CONFIG_FEATURE_FIND_PATH=y
   2.234  CONFIG_FEATURE_FIND_REGEX=y
   2.235 @@ -461,6 +476,8 @@
   2.236  CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
   2.237  CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
   2.238  CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
   2.239 +CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
   2.240 +CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
   2.241  
   2.242  #
   2.243  # Init Utilities
   2.244 @@ -471,6 +488,7 @@
   2.245  CONFIG_HALT=y
   2.246  CONFIG_POWEROFF=y
   2.247  CONFIG_REBOOT=y
   2.248 +CONFIG_FEATURE_WAIT_FOR_INIT=y
   2.249  # CONFIG_FEATURE_CALL_TELINIT is not set
   2.250  CONFIG_TELINIT_PATH=""
   2.251  CONFIG_INIT=y
   2.252 @@ -496,10 +514,8 @@
   2.253  CONFIG_ADD_SHELL=y
   2.254  CONFIG_REMOVE_SHELL=y
   2.255  CONFIG_ADDGROUP=y
   2.256 -CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
   2.257  CONFIG_FEATURE_ADDUSER_TO_GROUP=y
   2.258  CONFIG_ADDUSER=y
   2.259 -CONFIG_FEATURE_ADDUSER_LONG_OPTIONS=y
   2.260  CONFIG_FEATURE_CHECK_NAMES=y
   2.261  CONFIG_LAST_ID=60000
   2.262  CONFIG_FIRST_SYSTEM_ID=100
   2.263 @@ -610,7 +626,6 @@
   2.264  CONFIG_HD=y
   2.265  CONFIG_XXD=y
   2.266  CONFIG_HWCLOCK=y
   2.267 -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
   2.268  CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
   2.269  CONFIG_IONICE=y
   2.270  CONFIG_IPCRM=y
   2.271 @@ -626,6 +641,7 @@
   2.272  # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
   2.273  # CONFIG_FEATURE_MDEV_EXEC is not set
   2.274  # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
   2.275 +# CONFIG_FEATURE_MDEV_DAEMON is not set
   2.276  CONFIG_MESG=y
   2.277  CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
   2.278  # CONFIG_MKE2FS is not set
   2.279 @@ -649,8 +665,9 @@
   2.280  CONFIG_FEATURE_MOUNT_FSTAB=y
   2.281  CONFIG_FEATURE_MOUNT_OTHERTAB=y
   2.282  CONFIG_MOUNTPOINT=y
   2.283 +CONFIG_NOLOGIN=y
   2.284 +CONFIG_NOLOGIN_DEPENDENCIES=y
   2.285  # CONFIG_NSENTER is not set
   2.286 -# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set
   2.287  # CONFIG_PIVOT_ROOT is not set
   2.288  CONFIG_RDATE=y
   2.289  CONFIG_RDEV=y
   2.290 @@ -660,16 +677,19 @@
   2.291  CONFIG_RTCWAKE=y
   2.292  CONFIG_SCRIPT=y
   2.293  CONFIG_SCRIPTREPLAY=y
   2.294 -CONFIG_SCRIPTREPLAY_HOTKEYS=y
   2.295  CONFIG_SETARCH=y
   2.296  CONFIG_LINUX32=y
   2.297  # CONFIG_LINUX64 is not set
   2.298  CONFIG_SETPRIV=y
   2.299 +CONFIG_FEATURE_SETPRIV_DUMP=y
   2.300 +CONFIG_FEATURE_SETPRIV_CAPABILITIES=y
   2.301 +CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES=y
   2.302  CONFIG_SETSID=y
   2.303  CONFIG_SWAPON=y
   2.304  CONFIG_FEATURE_SWAPON_DISCARD=y
   2.305  CONFIG_FEATURE_SWAPON_PRI=y
   2.306  CONFIG_SWAPOFF=y
   2.307 +CONFIG_FEATURE_SWAPONOFF_LABEL=y
   2.308  CONFIG_SWITCH_ROOT=y
   2.309  CONFIG_TASKSET=y
   2.310  CONFIG_FEATURE_TASKSET_FANCY=y
   2.311 @@ -700,9 +720,11 @@
   2.312  CONFIG_FEATURE_VOLUMEID_HFS=y
   2.313  CONFIG_FEATURE_VOLUMEID_ISO9660=y
   2.314  # CONFIG_FEATURE_VOLUMEID_JFS is not set
   2.315 +CONFIG_FEATURE_VOLUMEID_LFS=y
   2.316  CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
   2.317  CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
   2.318  CONFIG_FEATURE_VOLUMEID_LUKS=y
   2.319 +CONFIG_FEATURE_VOLUMEID_MINIX=y
   2.320  CONFIG_FEATURE_VOLUMEID_NILFS=y
   2.321  CONFIG_FEATURE_VOLUMEID_NTFS=y
   2.322  # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
   2.323 @@ -720,6 +742,12 @@
   2.324  CONFIG_ADJTIMEX=y
   2.325  CONFIG_BBCONFIG=y
   2.326  CONFIG_FEATURE_COMPRESS_BBCONFIG=y
   2.327 +CONFIG_BC=y
   2.328 +# CONFIG_DC is not set
   2.329 +CONFIG_FEATURE_DC_BIG=y
   2.330 +# CONFIG_FEATURE_DC_LIBM is not set
   2.331 +CONFIG_FEATURE_BC_INTERACTIVE=y
   2.332 +CONFIG_FEATURE_BC_LONG_OPTIONS=y
   2.333  CONFIG_BEEP=y
   2.334  CONFIG_FEATURE_BEEP_FREQ=4000
   2.335  CONFIG_FEATURE_BEEP_LENGTH_MS=30
   2.336 @@ -735,10 +763,9 @@
   2.337  CONFIG_CROND=y
   2.338  # CONFIG_FEATURE_CROND_D is not set
   2.339  # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
   2.340 +CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
   2.341  CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
   2.342  CONFIG_CRONTAB=y
   2.343 -# CONFIG_DC is not set
   2.344 -# CONFIG_FEATURE_DC_LIBM is not set
   2.345  # CONFIG_DEVFSD is not set
   2.346  # CONFIG_DEVFSD_MODLOAD is not set
   2.347  # CONFIG_DEVFSD_FG_NP is not set
   2.348 @@ -757,10 +784,12 @@
   2.349  # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
   2.350  # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
   2.351  CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
   2.352 +CONFIG_HEXEDIT=y
   2.353  CONFIG_I2CGET=y
   2.354  CONFIG_I2CSET=y
   2.355  CONFIG_I2CDUMP=y
   2.356  CONFIG_I2CDETECT=y
   2.357 +CONFIG_I2CTRANSFER=y
   2.358  CONFIG_INOTIFYD=y
   2.359  CONFIG_LESS=y
   2.360  CONFIG_FEATURE_LESS_MAXLINES=9999999
   2.361 @@ -773,6 +802,8 @@
   2.362  # CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
   2.363  # CONFIG_FEATURE_LESS_DASHCMD is not set
   2.364  # CONFIG_FEATURE_LESS_LINENUMS is not set
   2.365 +# CONFIG_FEATURE_LESS_RAW is not set
   2.366 +# CONFIG_FEATURE_LESS_ENV is not set
   2.367  CONFIG_LSSCSI=y
   2.368  CONFIG_MAKEDEVS=y
   2.369  # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
   2.370 @@ -788,9 +819,11 @@
   2.371  CONFIG_RFKILL=y
   2.372  # CONFIG_RUNLEVEL is not set
   2.373  # CONFIG_RX is not set
   2.374 +CONFIG_SETFATTR=y
   2.375  CONFIG_SETSERIAL=y
   2.376  CONFIG_STRINGS=y
   2.377  CONFIG_TIME=y
   2.378 +CONFIG_TS=y
   2.379  CONFIG_TTYSIZE=y
   2.380  CONFIG_UBIATTACH=y
   2.381  CONFIG_UBIDETACH=y
   2.382 @@ -809,6 +842,7 @@
   2.383  # CONFIG_FEATURE_UNIX_LOCAL is not set
   2.384  CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
   2.385  # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
   2.386 +# CONFIG_FEATURE_TLS_SHA1 is not set
   2.387  CONFIG_ARP=y
   2.388  CONFIG_ARPING=y
   2.389  CONFIG_BRCTL=y
   2.390 @@ -883,6 +917,7 @@
   2.391  # CONFIG_FEATURE_NAMEIF_EXTENDED is not set
   2.392  CONFIG_NBDCLIENT=y
   2.393  CONFIG_NC=y
   2.394 +# CONFIG_NETCAT is not set
   2.395  CONFIG_NC_SERVER=y
   2.396  CONFIG_NC_EXTRA=y
   2.397  CONFIG_NC_110_COMPAT=y
   2.398 @@ -890,9 +925,12 @@
   2.399  CONFIG_FEATURE_NETSTAT_WIDE=y
   2.400  CONFIG_FEATURE_NETSTAT_PRG=y
   2.401  CONFIG_NSLOOKUP=y
   2.402 +CONFIG_FEATURE_NSLOOKUP_BIG=y
   2.403 +CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS=y
   2.404  CONFIG_NTPD=y
   2.405  CONFIG_FEATURE_NTPD_SERVER=y
   2.406  CONFIG_FEATURE_NTPD_CONF=y
   2.407 +CONFIG_FEATURE_NTP_AUTH=y
   2.408  CONFIG_PING=y
   2.409  CONFIG_PING6=y
   2.410  CONFIG_FEATURE_FANCY_PING=y
   2.411 @@ -900,6 +938,8 @@
   2.412  CONFIG_ROUTE=y
   2.413  # CONFIG_SLATTACH is not set
   2.414  # CONFIG_SSL_CLIENT is not set
   2.415 +CONFIG_TC=y
   2.416 +CONFIG_FEATURE_TC_INGRESS=y
   2.417  # CONFIG_TCPSVD is not set
   2.418  # CONFIG_UDPSVD is not set
   2.419  CONFIG_TELNET=y
   2.420 @@ -910,16 +950,13 @@
   2.421  # CONFIG_FEATURE_TELNETD_STANDALONE is not set
   2.422  # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
   2.423  CONFIG_TFTP=y
   2.424 +CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
   2.425 +CONFIG_FEATURE_TFTP_HPA_COMPAT=y
   2.426  CONFIG_TFTPD=y
   2.427 -
   2.428 -#
   2.429 -# Common options for tftp/tftpd
   2.430 -#
   2.431  CONFIG_FEATURE_TFTPD_RIS=y
   2.432  CONFIG_FEATURE_TFTP_GET=y
   2.433  CONFIG_FEATURE_TFTP_PUT=y
   2.434  CONFIG_FEATURE_TFTP_BLOCKSIZE=y
   2.435 -CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
   2.436  # CONFIG_TFTP_DEBUG is not set
   2.437  CONFIG_TLS=y
   2.438  CONFIG_TRACEROUTE=y
   2.439 @@ -938,13 +975,9 @@
   2.440  CONFIG_FEATURE_WGET_OPENSSL=y
   2.441  CONFIG_WHOIS=y
   2.442  CONFIG_ZCIP=y
   2.443 -CONFIG_UDHCPC6=y
   2.444 -CONFIG_FEATURE_UDHCPC6_RFC3646=y
   2.445 -CONFIG_FEATURE_UDHCPC6_RFC4704=y
   2.446 -CONFIG_FEATURE_UDHCPC6_RFC4833=y
   2.447  CONFIG_UDHCPD=y
   2.448 +CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
   2.449  CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
   2.450 -CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
   2.451  CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
   2.452  CONFIG_DUMPLEASES=y
   2.453  CONFIG_DHCPRELAY=y
   2.454 @@ -952,11 +985,20 @@
   2.455  CONFIG_FEATURE_UDHCPC_ARPING=y
   2.456  CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
   2.457  CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
   2.458 +CONFIG_UDHCPC6=y
   2.459 +CONFIG_FEATURE_UDHCPC6_RFC3646=y
   2.460 +CONFIG_FEATURE_UDHCPC6_RFC4704=y
   2.461 +CONFIG_FEATURE_UDHCPC6_RFC4833=y
   2.462 +CONFIG_FEATURE_UDHCPC6_RFC5970=y
   2.463 +
   2.464 +#
   2.465 +# Common options for DHCP applets
   2.466 +#
   2.467  # CONFIG_FEATURE_UDHCP_PORT is not set
   2.468  CONFIG_UDHCP_DEBUG=0
   2.469 +CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
   2.470  CONFIG_FEATURE_UDHCP_RFC3397=y
   2.471  CONFIG_FEATURE_UDHCP_8021Q=y
   2.472 -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
   2.473  CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
   2.474  
   2.475  #
   2.476 @@ -1034,15 +1076,14 @@
   2.477  # CONFIG_SV is not set
   2.478  CONFIG_SV_DEFAULT_SERVICE_DIR=""
   2.479  # CONFIG_SVC is not set
   2.480 +CONFIG_SVOK=y
   2.481  # CONFIG_SVLOGD is not set
   2.482  # CONFIG_CHCON is not set
   2.483 -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
   2.484  # CONFIG_GETENFORCE is not set
   2.485  # CONFIG_GETSEBOOL is not set
   2.486  # CONFIG_LOAD_POLICY is not set
   2.487  # CONFIG_MATCHPATHCON is not set
   2.488  # CONFIG_RUNCON is not set
   2.489 -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
   2.490  # CONFIG_SELINUXENABLED is not set
   2.491  # CONFIG_SESTATUS is not set
   2.492  # CONFIG_SETENFORCE is not set
   2.493 @@ -1064,6 +1105,8 @@
   2.494  CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
   2.495  # CONFIG_ASH_INTERNAL_GLOB is not set
   2.496  CONFIG_ASH_BASH_COMPAT=y
   2.497 +# CONFIG_ASH_BASH_SOURCE_CURDIR is not set
   2.498 +CONFIG_ASH_BASH_NOT_FOUND_HOOK=y
   2.499  CONFIG_ASH_JOB_CONTROL=y
   2.500  CONFIG_ASH_ALIAS=y
   2.501  CONFIG_ASH_RANDOM_SUPPORT=y
   2.502 @@ -1080,6 +1123,8 @@
   2.503  # CONFIG_HUSH is not set
   2.504  # CONFIG_HUSH_BASH_COMPAT is not set
   2.505  # CONFIG_HUSH_BRACE_EXPANSION is not set
   2.506 +# CONFIG_HUSH_LINENO_VAR is not set
   2.507 +# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
   2.508  # CONFIG_HUSH_INTERACTIVE is not set
   2.509  # CONFIG_HUSH_SAVEHISTORY is not set
   2.510  # CONFIG_HUSH_JOB is not set
   2.511 @@ -1097,27 +1142,33 @@
   2.512  # CONFIG_HUSH_HELP is not set
   2.513  # CONFIG_HUSH_EXPORT is not set
   2.514  # CONFIG_HUSH_EXPORT_N is not set
   2.515 +# CONFIG_HUSH_READONLY is not set
   2.516  # CONFIG_HUSH_KILL is not set
   2.517  # CONFIG_HUSH_WAIT is not set
   2.518 +# CONFIG_HUSH_COMMAND is not set
   2.519  # CONFIG_HUSH_TRAP is not set
   2.520  # CONFIG_HUSH_TYPE is not set
   2.521 +# CONFIG_HUSH_TIMES is not set
   2.522  # CONFIG_HUSH_READ is not set
   2.523  # CONFIG_HUSH_SET is not set
   2.524  # CONFIG_HUSH_UNSET is not set
   2.525  # CONFIG_HUSH_ULIMIT is not set
   2.526  # CONFIG_HUSH_UMASK is not set
   2.527 +# CONFIG_HUSH_GETOPTS is not set
   2.528  # CONFIG_HUSH_MEMLEAK is not set
   2.529 -# CONFIG_MSH is not set
   2.530  
   2.531  #
   2.532  # Options common to all shells
   2.533  #
   2.534  CONFIG_FEATURE_SH_MATH=y
   2.535  # CONFIG_FEATURE_SH_MATH_64 is not set
   2.536 +CONFIG_FEATURE_SH_MATH_BASE=y
   2.537  CONFIG_FEATURE_SH_EXTRA_QUIET=y
   2.538  # CONFIG_FEATURE_SH_STANDALONE is not set
   2.539  # CONFIG_FEATURE_SH_NOFORK is not set
   2.540 +CONFIG_FEATURE_SH_READ_FRAC=y
   2.541  CONFIG_FEATURE_SH_HISTFILESIZE=y
   2.542 +CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
   2.543  
   2.544  #
   2.545  # System Logging Utilities