Attachment 205580 Details for Bug 238915 – Busybox update (v2)

[patch] Busybox update (v2)

bb.patch (text/plain), 37.54 KB, created by Oleksii Samorukov on 2019-07-08 08:40:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Oleksii Samorukov

Created: 2019-07-08 08:40:47 UTC

Size: 37.54 KB

patch

obsolete

>diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
>index 8b3a351eb06c..7bc77e21a1d0 100644
>--- a/sysutils/busybox/Makefile
>+++ b/sysutils/busybox/Makefile
>@@ -1,8 +1,8 @@
> # Created by: luigi@FreeBSD.org
>-# $FreeBSD$
>+# $FreeBSD: head/sysutils/busybox/Makefile 473019 2018-06-22 08:04:38Z yuri $
> 
> PORTNAME=	busybox
>-PORTVERSION=	1.26.2
>+PORTVERSION=	1.30.1
> CATEGORIES=	sysutils misc shells
> MASTER_SITES=	https://busybox.net/downloads/
> 
>@@ -16,17 +16,21 @@ BUILD_DEPENDS=	gsed:textproc/gsed
> USES=		cpe gmake perl5 tar:bzip2
> USE_PERL5=	build
> 
>-CFLAGS+=	-fno-builtin-mempcpy	# avoid -Wshadow warnings
>+OPTIONS_DEFINE=	DOCS STATIC
>+STATIC_LDFLAGS=	-static
>+
> CONFLICTS_INSTALL=	busybox-unstable-*
>+.include <bsd.port.options.mk>
>+# fix ash crash on arm, see shell/ash.c
>+.if ${ARCH} == "armv6"
>+CFLAGS+=	-DBB_GLOBAL_CONST=''
>+.endif
> MAKE_ARGS=	CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}" \
>+		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
> 		SKIP_STRIP=y V=1
> PLIST_FILES=	bin/busybox man/man1/busybox.1.gz
> PORTDOCS=	*
> 
>-OPTIONS_DEFINE=	DOCS STATIC
>-
>-STATIC_LDFLAGS=	-static
>-
> post-patch:
> 	@${REINPLACE_CMD} -e \
> 		's|$[[:<:]]$sed$[[:blank:]]-n$|\1gsed\2|' \
>@@ -35,6 +39,9 @@ post-patch:
> 		${REINPLACE_CMD} -e \
> 		's|<alloca.h>|<stdlib.h>| ; \
> 		 s|<malloc.h>|<stdlib.h>|'
>+	@${FIND} ${WRKSRC} -name "*.[ch]" -print0 | ${XARGS} -0 \
>+		${REINPLACE_CMD} -e \
>+		's|/proc|/compat/linux/proc|'
> 
> do-configure:
> 	@${CP} ${FILESDIR}/data-.config ${WRKSRC}/.config
>diff --git a/sysutils/busybox/distinfo b/sysutils/busybox/distinfo
>index 9b1f29799b6a..337e51dc2b0d 100644
>--- a/sysutils/busybox/distinfo
>+++ b/sysutils/busybox/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1494502184
>-SHA256 (busybox-1.26.2.tar.bz2) = da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16
>-SIZE (busybox-1.26.2.tar.bz2) = 2120931
>+TIMESTAMP = 1561964361
>+SHA256 (busybox-1.30.1.tar.bz2) = 3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc
>+SIZE (busybox-1.30.1.tar.bz2) = 7793781
>diff --git a/sysutils/busybox/files/data-.config b/sysutils/busybox/files/data-.config
>index 55c47eab3bd9..6dd756cc5f63 100644
>--- a/sysutils/busybox/files/data-.config
>+++ b/sysutils/busybox/files/data-.config
>@@ -1,40 +1,41 @@
> #
> # Automatically generated make config: don't edit
>-# Busybox version: 1.26.2
>-# Thu May 11 19:48:55 2017
>+# Busybox version: 1.30.1
>+# Mon Jul  1 13:24:57 2019
> #
> CONFIG_HAVE_DOT_CONFIG=y
> 
> #
>-# Busybox Settings
>+# Settings
> #
> # CONFIG_DESKTOP is not set
> # CONFIG_EXTRA_COMPAT is not set
>+# CONFIG_FEDORA_COMPAT is not set
> CONFIG_INCLUDE_SUSv2=y
>-CONFIG_USE_PORTABLE_CODE=y
>-CONFIG_PLATFORM_LINUX=y
>+CONFIG_LONG_OPTS=y
> CONFIG_SHOW_USAGE=y
> CONFIG_FEATURE_VERBOSE_USAGE=y
> CONFIG_FEATURE_COMPRESS_USAGE=y
>-# CONFIG_BUSYBOX is not set
>-# CONFIG_FEATURE_INSTALLER is not set
>-# CONFIG_INSTALL_NO_USR is not set
>+CONFIG_LFS=y
> # CONFIG_PAM is not set
>-CONFIG_LONG_OPTS=y
> CONFIG_FEATURE_DEVPTS=y
>-# CONFIG_FEATURE_CLEAN_UP is not set
> # CONFIG_FEATURE_UTMP is not set
> # CONFIG_FEATURE_WTMP is not set
> CONFIG_FEATURE_PIDFILE=y
> CONFIG_PID_FILE_PATH="/var/run"
>+CONFIG_BUSYBOX=y
>+# CONFIG_FEATURE_SHOW_SCRIPT is not set
>+# CONFIG_FEATURE_INSTALLER is not set
>+# CONFIG_INSTALL_NO_USR is not set
> CONFIG_FEATURE_SUID=y
> CONFIG_FEATURE_SUID_CONFIG=y
> CONFIG_FEATURE_SUID_CONFIG_QUIET=y
>-# CONFIG_SELINUX is not set
> # CONFIG_FEATURE_PREFER_APPLETS is not set
> CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
>+# CONFIG_SELINUX is not set
>+# CONFIG_FEATURE_CLEAN_UP is not set
> CONFIG_FEATURE_SYSLOG=y
>-# CONFIG_FEATURE_HAVE_RPC is not set
>+CONFIG_PLATFORM_LINUX=y
> 
> #
> # Build Options
>@@ -43,14 +44,16 @@ CONFIG_FEATURE_SYSLOG=y
> # CONFIG_PIE is not set
> # CONFIG_NOMMU is not set
> # CONFIG_BUILD_LIBBUSYBOX is not set
>+# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set
> # CONFIG_FEATURE_INDIVIDUAL is not set
> # CONFIG_FEATURE_SHARED_BUSYBOX is not set
>-CONFIG_LFS=y
> CONFIG_CROSS_COMPILER_PREFIX=""
> CONFIG_SYSROOT=""
> CONFIG_EXTRA_CFLAGS=""
> CONFIG_EXTRA_LDFLAGS=""
> CONFIG_EXTRA_LDLIBS=""
>+CONFIG_USE_PORTABLE_CODE=y
>+# CONFIG_STACK_OPTIMIZATION_386 is not set
> 
> #
> # Installation Options ("make install" behavior)
>@@ -77,10 +80,12 @@ CONFIG_NO_DEBUG_LIB=y
> # CONFIG_EFENCE is not set
> 
> #
>-# Busybox Library Tuning
>+# Library Tuning
> #
> # CONFIG_FEATURE_USE_BSS_TAIL is not set
>+CONFIG_FLOAT_DURATION=y
> CONFIG_FEATURE_RTMINMAX=y
>+CONFIG_FEATURE_RTMINMAX_USE_LIBC_DEFINITIONS=y
> CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
> # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
> # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
>@@ -89,7 +94,7 @@ CONFIG_MD5_SMALL=1
> CONFIG_SHA3_SMALL=1
> CONFIG_FEATURE_FAST_TOP=y
> # CONFIG_FEATURE_ETC_NETWORKS is not set
>-CONFIG_FEATURE_USE_TERMIOS=y
>+# CONFIG_FEATURE_ETC_SERVICES is not set
> CONFIG_FEATURE_EDITING=y
> CONFIG_FEATURE_EDITING_MAX_LEN=1024
> # CONFIG_FEATURE_EDITING_VI is not set
>@@ -100,6 +105,7 @@ CONFIG_FEATURE_EDITING_HISTORY=30
> CONFIG_FEATURE_TAB_COMPLETION=y
> # CONFIG_FEATURE_USERNAME_COMPLETION is not set
> # CONFIG_FEATURE_EDITING_FANCY_PROMPT is not set
>+CONFIG_FEATURE_EDITING_WINCH=y
> # CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set
> CONFIG_LOCALE_SUPPORT=y
> CONFIG_UNICODE_SUPPORT=y
>@@ -138,27 +144,29 @@ CONFIG_FEATURE_AR_LONG_FILENAMES=y
> CONFIG_FEATURE_AR_CREATE=y
> CONFIG_UNCOMPRESS=y
> CONFIG_GUNZIP=y
>-# CONFIG_ZCAT is not set
>+CONFIG_ZCAT=y
> # CONFIG_FEATURE_GUNZIP_LONG_OPTIONS is not set
> CONFIG_BUNZIP2=y
>-# CONFIG_BZCAT is not set
>+CONFIG_BZCAT=y
> CONFIG_UNLZMA=y
>-# CONFIG_LZCAT is not set
>+CONFIG_LZCAT=y
> CONFIG_LZMA=y
>-CONFIG_FEATURE_LZMA_FAST=y
> CONFIG_UNXZ=y
>-# CONFIG_XZCAT is not set
>+CONFIG_XZCAT=y
> CONFIG_XZ=y
> CONFIG_BZIP2=y
>+CONFIG_BZIP2_SMALL=8
>+CONFIG_FEATURE_BZIP2_DECOMPRESS=y
> CONFIG_CPIO=y
> # CONFIG_FEATURE_CPIO_O is not set
> # CONFIG_FEATURE_CPIO_P is not set
>-# CONFIG_DPKG is not set
>-# CONFIG_DPKG_DEB is not set
>+CONFIG_DPKG=y
>+CONFIG_DPKG_DEB=y
> CONFIG_GZIP=y
> CONFIG_FEATURE_GZIP_LONG_OPTIONS=y
> CONFIG_GZIP_FAST=0
>-# CONFIG_FEATURE_GZIP_LEVELS is not set
>+CONFIG_FEATURE_GZIP_LEVELS=y
>+CONFIG_FEATURE_GZIP_DECOMPRESS=y
> CONFIG_LZOP=y
> # CONFIG_UNLZOP is not set
> # CONFIG_LZOPCAT is not set
>@@ -166,26 +174,31 @@ CONFIG_LZOP=y
> CONFIG_RPM=y
> CONFIG_RPM2CPIO=y
> CONFIG_TAR=y
>+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
> CONFIG_FEATURE_TAR_CREATE=y
> CONFIG_FEATURE_TAR_AUTODETECT=y
> CONFIG_FEATURE_TAR_FROM=y
> CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
> CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
> CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
>-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
> CONFIG_FEATURE_TAR_TO_COMMAND=y
> # CONFIG_FEATURE_TAR_UNAME_GNAME is not set
> CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
> # CONFIG_FEATURE_TAR_SELINUX is not set
> CONFIG_UNZIP=y
>+CONFIG_FEATURE_UNZIP_CDF=y
>+# CONFIG_FEATURE_UNZIP_BZIP2 is not set
>+# CONFIG_FEATURE_UNZIP_LZMA is not set
>+# CONFIG_FEATURE_UNZIP_XZ is not set
>+CONFIG_FEATURE_LZMA_FAST=y
> 
> #
> # Coreutils
> #
> CONFIG_BASENAME=y
>-CONFIG_CAL=y
> CONFIG_CAT=y
>-CONFIG_CATV=y
>+CONFIG_FEATURE_CATN=y
>+CONFIG_FEATURE_CATV=y
> CONFIG_CHGRP=y
> CONFIG_CHMOD=y
> CONFIG_CHOWN=y
>@@ -195,6 +208,7 @@ CONFIG_CKSUM=y
> CONFIG_COMM=y
> CONFIG_CP=y
> CONFIG_FEATURE_CP_LONG_OPTIONS=y
>+CONFIG_FEATURE_CP_REFLINK=y
> CONFIG_CUT=y
> # CONFIG_DATE is not set
> # CONFIG_FEATURE_DATE_ISOFMT is not set
>@@ -215,13 +229,11 @@ CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y
> CONFIG_ECHO=y
> CONFIG_FEATURE_FANCY_ECHO=y
> CONFIG_ENV=y
>-CONFIG_FEATURE_ENV_LONG_OPTIONS=y
> CONFIG_EXPAND=y
>-CONFIG_FEATURE_EXPAND_LONG_OPTIONS=y
> CONFIG_UNEXPAND=y
>-CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS=y
> CONFIG_EXPR=y
> CONFIG_EXPR_MATH_SUPPORT_64=y
>+CONFIG_FACTOR=y
> CONFIG_FALSE=y
> CONFIG_FOLD=y
> CONFIG_FSYNC=y
>@@ -232,12 +244,14 @@ CONFIG_ID=y
> CONFIG_GROUPS=y
> CONFIG_INSTALL=y
> CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
>+CONFIG_LINK=y
> CONFIG_LN=y
> CONFIG_LOGNAME=y
> CONFIG_LS=y
> CONFIG_FEATURE_LS_FILETYPES=y
> CONFIG_FEATURE_LS_FOLLOWLINKS=y
> CONFIG_FEATURE_LS_RECURSIVE=y
>+CONFIG_FEATURE_LS_WIDTH=y
> CONFIG_FEATURE_LS_SORTFILES=y
> CONFIG_FEATURE_LS_TIMESTAMPS=y
> CONFIG_FEATURE_LS_USERNAME=y
>@@ -254,14 +268,16 @@ CONFIG_SHA3SUM=y
> #
> CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
> CONFIG_MKDIR=y
>-CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
> CONFIG_MKFIFO=y
>-# CONFIG_MKNOD is not set
>+CONFIG_MKNOD=y
>+CONFIG_MKTEMP=y
> CONFIG_MV=y
>-CONFIG_FEATURE_MV_LONG_OPTIONS=y
> CONFIG_NICE=y
>+CONFIG_NL=y
> CONFIG_NOHUP=y
>+# CONFIG_NPROC is not set
> CONFIG_OD=y
>+CONFIG_PASTE=y
> CONFIG_PRINTENV=y
> CONFIG_PRINTF=y
> CONFIG_PWD=y
>@@ -270,20 +286,20 @@ CONFIG_FEATURE_READLINK_FOLLOW=y
> CONFIG_REALPATH=y
> CONFIG_RM=y
> CONFIG_RMDIR=y
>-# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
> CONFIG_SEQ=y
>+CONFIG_SHRED=y
> CONFIG_SHUF=y
> CONFIG_SLEEP=y
> CONFIG_FEATURE_FANCY_SLEEP=y
>-CONFIG_FEATURE_FLOAT_SLEEP=y
> CONFIG_SORT=y
> CONFIG_FEATURE_SORT_BIG=y
>+# CONFIG_FEATURE_SORT_OPTIMIZE_MEMORY is not set
> CONFIG_SPLIT=y
> CONFIG_FEATURE_SPLIT_FANCY=y
>-# CONFIG_STAT is not set
>+CONFIG_STAT=y
> # CONFIG_FEATURE_STAT_FORMAT is not set
> # CONFIG_FEATURE_STAT_FILESYSTEM is not set
>-# CONFIG_STTY is not set
>+CONFIG_STTY=y
> CONFIG_SUM=y
> CONFIG_SYNC=y
> # CONFIG_FEATURE_SYNC_FANCY is not set
>@@ -296,6 +312,7 @@ CONFIG_TEST=y
> # CONFIG_TEST1 is not set
> # CONFIG_TEST2 is not set
> CONFIG_FEATURE_TEST_64=y
>+CONFIG_TIMEOUT=y
> CONFIG_TOUCH=y
> CONFIG_FEATURE_TOUCH_NODEREF=y
> CONFIG_FEATURE_TOUCH_SUSV3=y
>@@ -307,15 +324,17 @@ CONFIG_TRUNCATE=y
> CONFIG_TTY=y
> CONFIG_UNAME=y
> CONFIG_UNAME_OSNAME="FreeBSD"
>+CONFIG_BB_ARCH=y
> CONFIG_UNIQ=y
> CONFIG_UNLINK=y
> CONFIG_USLEEP=y
> CONFIG_UUDECODE=y
>-# CONFIG_BASE64 is not set
>+CONFIG_BASE64=y
> CONFIG_UUENCODE=y
> CONFIG_WC=y
> CONFIG_FEATURE_WC_LARGE=y
> # CONFIG_WHO is not set
>+# CONFIG_W is not set
> # CONFIG_USERS is not set
> CONFIG_WHOAMI=y
> CONFIG_YES=y
>@@ -330,11 +349,6 @@ CONFIG_FEATURE_VERBOSE=y
> #
> CONFIG_FEATURE_PRESERVE_HARDLINKS=y
> 
>-#
>-# Common options for ls, more and telnet
>-#
>-CONFIG_FEATURE_AUTOWIDTH=y
>-
> #
> # Common options for df, du, ls
> #
>@@ -369,16 +383,23 @@ CONFIG_FEATURE_RESIZE_PRINT=y
> #
> # Debian Utilities
> #
>-CONFIG_MKTEMP=y
> CONFIG_PIPE_PROGRESS=y
> CONFIG_RUN_PARTS=y
> CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
> CONFIG_FEATURE_RUN_PARTS_FANCY=y
> # CONFIG_START_STOP_DAEMON is not set
>-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
> # CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
>+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
> CONFIG_WHICH=y
> 
>+#
>+# klibc-utils
>+#
>+# CONFIG_MINIPS is not set
>+CONFIG_NUKE=y
>+CONFIG_RESUME=y
>+# CONFIG_RUN_INIT is not set
>+
> #
> # Editors
> #
>@@ -420,6 +441,7 @@ CONFIG_FEATURE_FIND_MTIME=y
> CONFIG_FEATURE_FIND_MMIN=y
> CONFIG_FEATURE_FIND_PERM=y
> CONFIG_FEATURE_FIND_TYPE=y
>+CONFIG_FEATURE_FIND_EXECUTABLE=y
> CONFIG_FEATURE_FIND_XDEV=y
> CONFIG_FEATURE_FIND_MAXDEPTH=y
> CONFIG_FEATURE_FIND_NEWER=y
>@@ -433,6 +455,7 @@ CONFIG_FEATURE_FIND_DEPTH=y
> CONFIG_FEATURE_FIND_PAREN=y
> CONFIG_FEATURE_FIND_SIZE=y
> CONFIG_FEATURE_FIND_PRUNE=y
>+CONFIG_FEATURE_FIND_QUIT=y
> CONFIG_FEATURE_FIND_DELETE=y
> CONFIG_FEATURE_FIND_PATH=y
> CONFIG_FEATURE_FIND_REGEX=y
>@@ -448,6 +471,8 @@ CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y
> CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y
> CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y
> CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
>+CONFIG_FEATURE_XARGS_SUPPORT_PARALLEL=y
>+CONFIG_FEATURE_XARGS_SUPPORT_ARGS_FILE=y
> 
> #
> # Init Utilities
>@@ -456,8 +481,9 @@ CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
> # CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set
> # CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set
> # CONFIG_HALT is not set
>-# CONFIG_POWEROFF is not set
>-# CONFIG_REBOOT is not set
>+CONFIG_POWEROFF=y
>+CONFIG_REBOOT=y
>+# CONFIG_FEATURE_WAIT_FOR_INIT is not set
> # CONFIG_FEATURE_CALL_TELINIT is not set
> CONFIG_TELINIT_PATH=""
> # CONFIG_INIT is not set
>@@ -467,12 +493,10 @@ CONFIG_TELINIT_PATH=""
> CONFIG_FEATURE_KILL_DELAY=0
> # CONFIG_FEATURE_INIT_SCTTY is not set
> # CONFIG_FEATURE_INIT_SYSLOG is not set
>-# CONFIG_FEATURE_EXTRA_QUIET is not set
>+# CONFIG_FEATURE_INIT_QUIET is not set
> # CONFIG_FEATURE_INIT_COREDUMPS is not set
> CONFIG_INIT_TERMINAL_TYPE=""
> # CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set
>-# CONFIG_MESG is not set
>-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
> 
> #
> # Login/Password Management Utilities
>@@ -485,10 +509,8 @@ CONFIG_USE_BB_PWD_GRP=y
> # CONFIG_ADD_SHELL is not set
> # CONFIG_REMOVE_SHELL is not set
> CONFIG_ADDGROUP=y
>-CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS=y
> CONFIG_FEATURE_ADDUSER_TO_GROUP=y
> # CONFIG_ADDUSER is not set
>-# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set
> # CONFIG_FEATURE_CHECK_NAMES is not set
> CONFIG_LAST_ID=60000
> CONFIG_FIRST_SYSTEM_ID=100
>@@ -508,16 +530,17 @@ CONFIG_FEATURE_DEL_USER_FROM_GROUP=y
> # CONFIG_FEATURE_SECURETTY is not set
> # CONFIG_PASSWD is not set
> # CONFIG_FEATURE_PASSWD_WEAK_CHECK is not set
>-# CONFIG_SU is not set
>-# CONFIG_FEATURE_SU_SYSLOG is not set
>-# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
>-# CONFIG_SULOGIN is not set
>+CONFIG_SU=y
>+CONFIG_FEATURE_SU_SYSLOG=y
>+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
>+# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set
>+CONFIG_SULOGIN=y
> # CONFIG_VLOCK is not set
> 
> #
> # Linux Ext2 FS Progs
> #
>-CONFIG_CHATTR=y
>+# CONFIG_CHATTR is not set
> # CONFIG_FSCK is not set
> # CONFIG_LSATTR is not set
> # CONFIG_TUNE2FS is not set
>@@ -531,8 +554,6 @@ CONFIG_CHATTR=y
> # CONFIG_LSMOD is not set
> # CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
> # CONFIG_MODINFO is not set
>-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
>-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
> # CONFIG_MODPROBE is not set
> # CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
> # CONFIG_RMMOD is not set
>@@ -540,14 +561,16 @@ CONFIG_CHATTR=y
> #
> # Options common to multiple modutils
> #
>+# CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS is not set
>+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
> # CONFIG_FEATURE_2_4_MODULES is not set
>-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
> # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
> # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
> # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
> # CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
> # CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
> # CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
>+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
> # CONFIG_FEATURE_MODUTILS_ALIAS is not set
> # CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
> CONFIG_DEFAULT_MODULES_DIR=""
>@@ -562,8 +585,13 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
> # CONFIG_BLKID is not set
> # CONFIG_FEATURE_BLKID_TYPE is not set
> # CONFIG_BLOCKDEV is not set
>+CONFIG_CAL=y
>+# CONFIG_CHRT is not set
> # CONFIG_DMESG is not set
> # CONFIG_FEATURE_DMESG_PRETTY is not set
>+# CONFIG_EJECT is not set
>+# CONFIG_FEATURE_EJECT_SCSI is not set
>+CONFIG_FALLOCATE=y
> CONFIG_FATATTR=y
> # CONFIG_FBSET is not set
> # CONFIG_FEATURE_FBSET_FANCY is not set
>@@ -583,26 +611,32 @@ CONFIG_FLOCK=y
> # CONFIG_FDFLUSH is not set
> # CONFIG_FREERAMDISK is not set
> # CONFIG_FSCK_MINIX is not set
>+# CONFIG_FSFREEZE is not set
> # CONFIG_FSTRIM is not set
> CONFIG_GETOPT=y
> CONFIG_FEATURE_GETOPT_LONG=y
> CONFIG_HEXDUMP=y
> # CONFIG_FEATURE_HEXDUMP_REVERSE is not set
> CONFIG_HD=y
>+CONFIG_XXD=y
> # CONFIG_HWCLOCK is not set
>-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
> # CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
>+# CONFIG_IONICE is not set
> # CONFIG_IPCRM is not set
> # CONFIG_IPCS is not set
>+# CONFIG_LAST is not set
>+# CONFIG_FEATURE_LAST_FANCY is not set
> # CONFIG_LOSETUP is not set
>-CONFIG_LSPCI=y
>-CONFIG_LSUSB=y
>+# CONFIG_LSPCI is not set
>+# CONFIG_LSUSB is not set
> # CONFIG_MDEV is not set
> # CONFIG_FEATURE_MDEV_CONF is not set
> # CONFIG_FEATURE_MDEV_RENAME is not set
> # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
> # CONFIG_FEATURE_MDEV_EXEC is not set
> # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
>+# CONFIG_MESG is not set
>+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
> # CONFIG_MKE2FS is not set
> # CONFIG_MKFS_EXT2 is not set
> # CONFIG_MKFS_MINIX is not set
>@@ -623,12 +657,15 @@ CONFIG_MORE=y
> # CONFIG_FEATURE_MOUNT_FLAGS is not set
> # CONFIG_FEATURE_MOUNT_FSTAB is not set
> # CONFIG_FEATURE_MOUNT_OTHERTAB is not set
>+# CONFIG_MOUNTPOINT is not set
>+CONFIG_NOLOGIN=y
>+CONFIG_NOLOGIN_DEPENDENCIES=y
> # CONFIG_NSENTER is not set
>-# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set
> # CONFIG_PIVOT_ROOT is not set
> # CONFIG_RDATE is not set
> # CONFIG_RDEV is not set
> CONFIG_READPROFILE=y
>+CONFIG_RENICE=y
> CONFIG_REV=y
> # CONFIG_RTCWAKE is not set
> # CONFIG_SCRIPT is not set
>@@ -636,15 +673,24 @@ CONFIG_SCRIPTREPLAY=y
> # CONFIG_SETARCH is not set
> # CONFIG_LINUX32 is not set
> # CONFIG_LINUX64 is not set
>+# CONFIG_SETPRIV is not set
>+# CONFIG_FEATURE_SETPRIV_DUMP is not set
>+# CONFIG_FEATURE_SETPRIV_CAPABILITIES is not set
>+# CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES is not set
>+CONFIG_SETSID=y
> # CONFIG_SWAPON is not set
> # CONFIG_FEATURE_SWAPON_DISCARD is not set
> # CONFIG_FEATURE_SWAPON_PRI is not set
> # CONFIG_SWAPOFF is not set
>+# CONFIG_FEATURE_SWAPONOFF_LABEL is not set
> # CONFIG_SWITCH_ROOT is not set
>+# CONFIG_TASKSET is not set
>+# CONFIG_FEATURE_TASKSET_FANCY is not set
> # CONFIG_UEVENT is not set
> # CONFIG_UMOUNT is not set
> # CONFIG_FEATURE_UMOUNT_ALL is not set
> # CONFIG_UNSHARE is not set
>+# CONFIG_WALL is not set
> # CONFIG_FEATURE_MOUNT_LOOP is not set
> # CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
> # CONFIG_FEATURE_MTAB_SUPPORT is not set
>@@ -659,9 +705,11 @@ CONFIG_SCRIPTREPLAY=y
> # CONFIG_FEATURE_VOLUMEID_HFS is not set
> # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
> # CONFIG_FEATURE_VOLUMEID_JFS is not set
>+# CONFIG_FEATURE_VOLUMEID_LFS is not set
> # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
> # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
> # CONFIG_FEATURE_VOLUMEID_LUKS is not set
>+# CONFIG_FEATURE_VOLUMEID_MINIX is not set
> # CONFIG_FEATURE_VOLUMEID_NILFS is not set
> # CONFIG_FEATURE_VOLUMEID_NTFS is not set
> # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
>@@ -679,6 +727,12 @@ CONFIG_SCRIPTREPLAY=y
> # CONFIG_ADJTIMEX is not set
> # CONFIG_BBCONFIG is not set
> # CONFIG_FEATURE_COMPRESS_BBCONFIG is not set
>+CONFIG_BC=y
>+CONFIG_DC=y
>+CONFIG_FEATURE_DC_BIG=y
>+# CONFIG_FEATURE_DC_LIBM is not set
>+CONFIG_FEATURE_BC_INTERACTIVE=y
>+CONFIG_FEATURE_BC_LONG_OPTIONS=y
> # CONFIG_BEEP is not set
> CONFIG_FEATURE_BEEP_FREQ=0
> CONFIG_FEATURE_BEEP_LENGTH_MS=0
>@@ -690,23 +744,19 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
> # CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
> # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
> # CONFIG_FEATURE_CHAT_CLR_ABORT is not set
>-CONFIG_CHRT=y
> # CONFIG_CONSPY is not set
> # CONFIG_CROND is not set
> # CONFIG_FEATURE_CROND_D is not set
> # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
>+# CONFIG_FEATURE_CROND_SPECIAL_TIMES is not set
> CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
> CONFIG_CRONTAB=y
>-CONFIG_DC=y
>-CONFIG_FEATURE_DC_LIBM=y
> # CONFIG_DEVFSD is not set
> # CONFIG_DEVFSD_MODLOAD is not set
> # CONFIG_DEVFSD_FG_NP is not set
> # CONFIG_DEVFSD_VERBOSE is not set
> # CONFIG_FEATURE_DEVFS is not set
> # CONFIG_DEVMEM is not set
>-# CONFIG_EJECT is not set
>-# CONFIG_FEATURE_EJECT_SCSI is not set
> # CONFIG_FBSPLASH is not set
> # CONFIG_FLASH_ERASEALL is not set
> # CONFIG_FLASH_LOCK is not set
>@@ -719,14 +769,12 @@ CONFIG_FEATURE_DC_LIBM=y
> # CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set
> # CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set
> # CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set
>+CONFIG_HEXEDIT=y
> # CONFIG_I2CGET is not set
> # CONFIG_I2CSET is not set
> # CONFIG_I2CDUMP is not set
> # CONFIG_I2CDETECT is not set
> # CONFIG_INOTIFYD is not set
>-# CONFIG_IONICE is not set
>-# CONFIG_LAST is not set
>-# CONFIG_FEATURE_LAST_FANCY is not set
> CONFIG_LESS=y
> CONFIG_FEATURE_LESS_MAXLINES=9999999
> CONFIG_FEATURE_LESS_BRACKETS=y
>@@ -734,31 +782,31 @@ CONFIG_FEATURE_LESS_FLAGS=y
> CONFIG_FEATURE_LESS_TRUNCATE=y
> CONFIG_FEATURE_LESS_MARKS=y
> CONFIG_FEATURE_LESS_REGEXP=y
>-# CONFIG_FEATURE_LESS_WINCH is not set
>-# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
>-# CONFIG_FEATURE_LESS_DASHCMD is not set
>-# CONFIG_FEATURE_LESS_LINENUMS is not set
>+CONFIG_FEATURE_LESS_WINCH=y
>+CONFIG_FEATURE_LESS_ASK_TERMINAL=y
>+CONFIG_FEATURE_LESS_DASHCMD=y
>+CONFIG_FEATURE_LESS_LINENUMS=y
>+CONFIG_FEATURE_LESS_RAW=y
>+CONFIG_FEATURE_LESS_ENV=y
>+# CONFIG_LSSCSI is not set
> # CONFIG_MAKEDEVS is not set
> # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
> # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
>-# CONFIG_MAN is not set
>+CONFIG_MAN=y
> CONFIG_MICROCOM=y
>-# CONFIG_MOUNTPOINT is not set
> # CONFIG_MT is not set
> # CONFIG_NANDWRITE is not set
> # CONFIG_NANDDUMP is not set
>+# CONFIG_PARTPROBE is not set
> # CONFIG_RAIDAUTORUN is not set
> # CONFIG_READAHEAD is not set
> # CONFIG_RFKILL is not set
> # CONFIG_RUNLEVEL is not set
> # CONFIG_RX is not set
>+# CONFIG_SETFATTR is not set
> # CONFIG_SETSERIAL is not set
>-CONFIG_SETSID=y
> CONFIG_STRINGS=y
>-# CONFIG_TASKSET is not set
>-# CONFIG_FEATURE_TASKSET_FANCY is not set
> # CONFIG_TIME is not set
>-CONFIG_TIMEOUT=y
> CONFIG_TTYSIZE=y
> # CONFIG_UBIATTACH is not set
> # CONFIG_UBIDETACH is not set
>@@ -768,16 +816,16 @@ CONFIG_TTYSIZE=y
> # CONFIG_UBIUPDATEVOL is not set
> # CONFIG_UBIRENAME is not set
> CONFIG_VOLNAME=y
>-# CONFIG_WALL is not set
> # CONFIG_WATCHDOG is not set
> 
> #
> # Networking Utilities
> #
>-# CONFIG_FEATURE_IPV6 is not set
>+CONFIG_FEATURE_IPV6=y
> # CONFIG_FEATURE_UNIX_LOCAL is not set
>-# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
>+CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y
> # CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
>+# CONFIG_FEATURE_TLS_SHA1 is not set
> # CONFIG_ARP is not set
> # CONFIG_ARPING is not set
> # CONFIG_BRCTL is not set
>@@ -822,12 +870,12 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
> # CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
> # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
> # CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
>-# CONFIG_INETD is not set
>-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set
>-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set
>-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set
>-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set
>-# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
>+CONFIG_INETD=y
>+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
>+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
>+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
>+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
>+CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
> # CONFIG_FEATURE_INETD_RPC is not set
> # CONFIG_IP is not set
> # CONFIG_IPADDR is not set
>@@ -845,80 +893,89 @@ CONFIG_FEATURE_IP_ROUTE_DIR=""
> # CONFIG_FEATURE_IP_NEIGH is not set
> # CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
> CONFIG_IPCALC=y
>-CONFIG_FEATURE_IPCALC_FANCY=y
> CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
>+CONFIG_FEATURE_IPCALC_FANCY=y
> CONFIG_FAKEIDENTD=y
> # CONFIG_NAMEIF is not set
> # CONFIG_FEATURE_NAMEIF_EXTENDED is not set
> # CONFIG_NBDCLIENT is not set
> CONFIG_NC=y
>-# CONFIG_NC_SERVER is not set
>-# CONFIG_NC_EXTRA is not set
>-# CONFIG_NC_110_COMPAT is not set
>+# CONFIG_NETCAT is not set
>+CONFIG_NC_SERVER=y
>+CONFIG_NC_EXTRA=y
>+CONFIG_NC_110_COMPAT=y
> # CONFIG_NETSTAT is not set
> # CONFIG_FEATURE_NETSTAT_WIDE is not set
> # CONFIG_FEATURE_NETSTAT_PRG is not set
> # CONFIG_NSLOOKUP is not set
>+# CONFIG_FEATURE_NSLOOKUP_BIG is not set
>+# CONFIG_FEATURE_NSLOOKUP_LONG_OPTIONS is not set
> # CONFIG_NTPD is not set
> # CONFIG_FEATURE_NTPD_SERVER is not set
> # CONFIG_FEATURE_NTPD_CONF is not set
>+# CONFIG_FEATURE_NTP_AUTH is not set
> # CONFIG_PING is not set
> # CONFIG_PING6 is not set
> # CONFIG_FEATURE_FANCY_PING is not set
> CONFIG_PSCAN=y
> # CONFIG_ROUTE is not set
> # CONFIG_SLATTACH is not set
>+CONFIG_SSL_CLIENT=y
>+# CONFIG_TC is not set
>+# CONFIG_FEATURE_TC_INGRESS is not set
> # CONFIG_TCPSVD is not set
> # CONFIG_UDPSVD is not set
> CONFIG_TELNET=y
> CONFIG_FEATURE_TELNET_TTYPE=y
> CONFIG_FEATURE_TELNET_AUTOLOGIN=y
>+CONFIG_FEATURE_TELNET_WIDTH=y
> CONFIG_TELNETD=y
> CONFIG_FEATURE_TELNETD_STANDALONE=y
> CONFIG_FEATURE_TELNETD_INETD_WAIT=y
> CONFIG_TFTP=y
>+CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
> CONFIG_TFTPD=y
>-
>-#
>-# Common options for tftp/tftpd
>-#
> CONFIG_FEATURE_TFTP_GET=y
> CONFIG_FEATURE_TFTP_PUT=y
> CONFIG_FEATURE_TFTP_BLOCKSIZE=y
>-CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
> # CONFIG_TFTP_DEBUG is not set
>-# CONFIG_TRACEROUTE is not set
>-# CONFIG_TRACEROUTE6 is not set
>-# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
>-# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
>+CONFIG_TLS=y
>+CONFIG_TRACEROUTE=y
>+CONFIG_TRACEROUTE6=y
>+CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
>+CONFIG_FEATURE_TRACEROUTE_USE_ICMP=y
> # CONFIG_TUNCTL is not set
> # CONFIG_FEATURE_TUNCTL_UG is not set
> # CONFIG_VCONFIG is not set
> CONFIG_WGET=y
>+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
> CONFIG_FEATURE_WGET_STATUSBAR=y
> CONFIG_FEATURE_WGET_AUTHENTICATION=y
>-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
> CONFIG_FEATURE_WGET_TIMEOUT=y
>+CONFIG_FEATURE_WGET_HTTPS=y
> CONFIG_FEATURE_WGET_OPENSSL=y
>-CONFIG_FEATURE_WGET_SSL_HELPER=y
> # CONFIG_WHOIS is not set
> # CONFIG_ZCIP is not set
>-# CONFIG_UDHCPC6 is not set
> # CONFIG_UDHCPD is not set
>-# CONFIG_DHCPRELAY is not set
>-# CONFIG_DUMPLEASES is not set
>-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
> # CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
>+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
> CONFIG_DHCPD_LEASES_FILE=""
>+# CONFIG_DUMPLEASES is not set
>+# CONFIG_DHCPRELAY is not set
> # CONFIG_UDHCPC is not set
> # CONFIG_FEATURE_UDHCPC_ARPING is not set
> # CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
>+CONFIG_UDHCPC_DEFAULT_SCRIPT=""
>+# CONFIG_UDHCPC6 is not set
>+# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
>+# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
>+# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
>+# CONFIG_FEATURE_UDHCPC6_RFC5970 is not set
> # CONFIG_FEATURE_UDHCP_PORT is not set
> CONFIG_UDHCP_DEBUG=0
>+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
> # CONFIG_FEATURE_UDHCP_RFC3397 is not set
> # CONFIG_FEATURE_UDHCP_8021Q is not set
>-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
>-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
> CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
> 
> #
>@@ -948,34 +1005,35 @@ CONFIG_IOSTAT=y
> CONFIG_KILL=y
> CONFIG_KILLALL=y
> CONFIG_KILLALL5=y
>-CONFIG_LSOF=y
>+# CONFIG_LSOF is not set
> CONFIG_MPSTAT=y
>-# CONFIG_NMETER is not set
>+CONFIG_NMETER=y
> CONFIG_PGREP=y
> CONFIG_PKILL=y
>-# CONFIG_PIDOF is not set
>-# CONFIG_FEATURE_PIDOF_SINGLE is not set
>-# CONFIG_FEATURE_PIDOF_OMIT is not set
>+CONFIG_PIDOF=y
>+CONFIG_FEATURE_PIDOF_SINGLE=y
>+CONFIG_FEATURE_PIDOF_OMIT=y
> CONFIG_PMAP=y
>-CONFIG_POWERTOP=y
>+# CONFIG_POWERTOP is not set
>+# CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set
> CONFIG_PS=y
> CONFIG_FEATURE_PS_WIDE=y
> CONFIG_FEATURE_PS_LONG=y
> # CONFIG_FEATURE_PS_TIME is not set
>-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
> # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
>-CONFIG_PSTREE=y
>+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
>+# CONFIG_PSTREE is not set
> CONFIG_PWDX=y
>-CONFIG_RENICE=y
> CONFIG_SMEMCAP=y
>-CONFIG_BB_SYSCTL=y
>-# CONFIG_TOP is not set
>-# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
>-# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
>-# CONFIG_FEATURE_TOP_SMP_CPU is not set
>-# CONFIG_FEATURE_TOP_DECIMALS is not set
>-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
>-# CONFIG_FEATURE_TOPMEM is not set
>+# CONFIG_BB_SYSCTL is not set
>+CONFIG_TOP=y
>+CONFIG_FEATURE_TOP_INTERACTIVE=y
>+CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
>+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
>+CONFIG_FEATURE_TOP_SMP_CPU=y
>+CONFIG_FEATURE_TOP_DECIMALS=y
>+CONFIG_FEATURE_TOP_SMP_PROCESS=y
>+CONFIG_FEATURE_TOPMEM=y
> # CONFIG_UPTIME is not set
> # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
> CONFIG_WATCH=y
>@@ -995,15 +1053,14 @@ CONFIG_FEATURE_SHOW_THREADS=y
> # CONFIG_SV is not set
> CONFIG_SV_DEFAULT_SERVICE_DIR=""
> # CONFIG_SVC is not set
>+CONFIG_SVOK=y
> # CONFIG_SVLOGD is not set
> # CONFIG_CHCON is not set
>-# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
> # CONFIG_GETENFORCE is not set
> # CONFIG_GETSEBOOL is not set
> # CONFIG_LOAD_POLICY is not set
> # CONFIG_MATCHPATHCON is not set
> # CONFIG_RUNCON is not set
>-# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
> # CONFIG_SELINUXENABLED is not set
> # CONFIG_SESTATUS is not set
> # CONFIG_SETENFORCE is not set
>@@ -1022,26 +1079,29 @@ CONFIG_SH_IS_ASH=y
> # CONFIG_BASH_IS_HUSH is not set
> CONFIG_BASH_IS_NONE=y
> CONFIG_ASH=y
>-# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
>-# CONFIG_ASH_INTERNAL_GLOB is not set
>-# CONFIG_ASH_RANDOM_SUPPORT is not set
>-# CONFIG_ASH_EXPAND_PRMT is not set
>-# CONFIG_ASH_BASH_COMPAT is not set
>-# CONFIG_ASH_IDLE_TIMEOUT is not set
>-# CONFIG_ASH_JOB_CONTROL is not set
>-# CONFIG_ASH_ALIAS is not set
>-# CONFIG_ASH_GETOPTS is not set
>-# CONFIG_ASH_BUILTIN_ECHO is not set
>-# CONFIG_ASH_BUILTIN_PRINTF is not set
>-# CONFIG_ASH_BUILTIN_TEST is not set
>+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
>+CONFIG_ASH_INTERNAL_GLOB=y
>+CONFIG_ASH_BASH_COMPAT=y
>+# CONFIG_ASH_BASH_SOURCE_CURDIR is not set
>+CONFIG_ASH_BASH_NOT_FOUND_HOOK=y
>+CONFIG_ASH_JOB_CONTROL=y
>+CONFIG_ASH_ALIAS=y
>+CONFIG_ASH_RANDOM_SUPPORT=y
>+CONFIG_ASH_EXPAND_PRMT=y
>+CONFIG_ASH_IDLE_TIMEOUT=y
>+CONFIG_ASH_MAIL=y
>+CONFIG_ASH_ECHO=y
>+CONFIG_ASH_PRINTF=y
>+CONFIG_ASH_TEST=y
> CONFIG_ASH_HELP=y
>-# CONFIG_ASH_CMDCMD is not set
>-# CONFIG_ASH_MAIL is not set
>-# CONFIG_CTTYHACK is not set
>+CONFIG_ASH_GETOPTS=y
>+CONFIG_ASH_CMDCMD=y
>+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_LINENO_VAR is not set
>+# CONFIG_HUSH_BASH_SOURCE_CURDIR is not set
> # CONFIG_HUSH_INTERACTIVE is not set
> # CONFIG_HUSH_SAVEHISTORY is not set
> # CONFIG_HUSH_JOB is not set
>@@ -1052,15 +1112,39 @@ CONFIG_ASH_HELP=y
> # 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_MATH is not set
>-# CONFIG_FEATURE_SH_MATH_64 is not set
>-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
>+# CONFIG_HUSH_ECHO is not set
>+# CONFIG_HUSH_PRINTF is not set
>+# CONFIG_HUSH_TEST is not set
>+# CONFIG_HUSH_HELP is not set
>+# CONFIG_HUSH_EXPORT is not set
>+# CONFIG_HUSH_EXPORT_N is not set
>+# CONFIG_HUSH_READONLY is not set
>+# CONFIG_HUSH_KILL is not set
>+# CONFIG_HUSH_WAIT is not set
>+# CONFIG_HUSH_COMMAND is not set
>+# CONFIG_HUSH_TRAP is not set
>+# CONFIG_HUSH_TYPE is not set
>+# CONFIG_HUSH_TIMES is not set
>+# CONFIG_HUSH_READ is not set
>+# CONFIG_HUSH_SET is not set
>+# CONFIG_HUSH_UNSET is not set
>+# CONFIG_HUSH_ULIMIT is not set
>+# CONFIG_HUSH_UMASK is not set
>+# CONFIG_HUSH_GETOPTS is not set
>+# CONFIG_HUSH_MEMLEAK is not set
>+
>+#
>+# Options common to all shells
>+#
>+CONFIG_FEATURE_SH_MATH=y
>+CONFIG_FEATURE_SH_MATH_64=y
>+CONFIG_FEATURE_SH_EXTRA_QUIET=y
> # CONFIG_FEATURE_SH_STANDALONE is not set
> # CONFIG_FEATURE_SH_NOFORK is not set
>+CONFIG_FEATURE_SH_READ_FRAC=y
> CONFIG_FEATURE_SH_HISTFILESIZE=y
>+CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS=y
> 
> #
> # System Logging Utilities
>diff --git a/sysutils/busybox/files/patch-Makefile.flags b/sysutils/busybox/files/patch-Makefile.flags
>new file mode 100644
>index 000000000000..0ca15453d19a
>--- /dev/null
>+++ b/sysutils/busybox/files/patch-Makefile.flags
>@@ -0,0 +1,17 @@
>+--- Makefile.flags.orig	2018-12-05 14:44:34 UTC
>++++ Makefile.flags
>+@@ -47,12 +47,11 @@ endif
>+ # gcc 3.x emits bogus "old style proto" warning on find.c:alloc_action()
>+ CFLAGS += $(call cc-ifversion, -ge, 0400, -Wold-style-definition)
>+ 
>+-CFLAGS += $(call cc-option,-fno-builtin-strlen -finline-limit=0 -fomit-frame-pointer -ffunction-sections -fdata-sections,)
>++CFLAGS += $(call cc-option,-fno-builtin-strlen -fomit-frame-pointer -ffunction-sections -fdata-sections,)
>+ # -fno-guess-branch-probability: prohibit pseudo-random guessing
>+ # of branch probabilities (hopefully makes bloatcheck more stable):
>+ CFLAGS += $(call cc-option,-fno-guess-branch-probability,)
>+-CFLAGS += $(call cc-option,-funsigned-char -static-libgcc,)
>+-CFLAGS += $(call cc-option,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,)
>++CFLAGS += $(call cc-option,-funsigned-char,)
>+ # Defeat .eh_frame bloat (gcc 4.6.3 x86-32 defconfig: 20% smaller busybox binary):
>+ CFLAGS += $(call cc-option,-fno-unwind-tables,)
>+ CFLAGS += $(call cc-option,-fno-asynchronous-unwind-tables,)
>diff --git a/sysutils/busybox/files/patch-coreutils_mknod.c b/sysutils/busybox/files/patch-coreutils_mknod.c
>new file mode 100644
>index 000000000000..a480d2fdf999
>--- /dev/null
>+++ b/sysutils/busybox/files/patch-coreutils_mknod.c
>@@ -0,0 +1,12 @@
>+--- coreutils/mknod.c.orig	2018-12-30 15:14:20 UTC
>++++ coreutils/mknod.c
>+@@ -36,7 +36,8 @@
>+ //usage:       "$ mknod /dev/fd0 b 2 0\n"
>+ //usage:       "$ mknod -m 644 /tmp/pipe p\n"
>+ 
>+-#include <sys/sysmacros.h>  // For makedev
>++// #include <sys/sysmacros.h>  // For makedev
>++#include <sys/types.h>
>+ 
>+ #include "libbb.h"
>+ #include "libcoreutils/coreutils.h"
>diff --git a/sysutils/busybox/files/patch-include_libbb.h b/sysutils/busybox/files/patch-include_libbb.h
>index 960508031b0c..5e097d1bb3b7 100644
>--- a/sysutils/busybox/files/patch-include_libbb.h
>+++ b/sysutils/busybox/files/patch-include_libbb.h
>@@ -1,22 +1,52 @@
>---- include/libbb.h.orig	2016-03-17 20:35:49 UTC
>+--- include/libbb.h.orig	2019-02-14 13:31:15 UTC
> +++ include/libbb.h
>-@@ -51,6 +51,9 @@
>+@@ -53,6 +53,9 @@
>  #include <termios.h>
>  #include <time.h>
>  #include <sys/param.h>
> +#ifndef HAVE_XTABS
>-+# define XTABS OXTABS
>++# define XTABS TAB3
> +#endif
>  #include <pwd.h>
>  #include <grp.h>
>  #if ENABLE_FEATURE_SHADOWPASSWDS
>-@@ -152,9 +155,6 @@
>+@@ -160,9 +163,6 @@
>  #ifndef HAVE_FDATASYNC
>  # define fdatasync fsync
>  #endif
> -#ifndef HAVE_XTABS
> -# define XTABS TAB3
> -#endif
>+ /*
>+  * Use '%m' to append error string on platforms that support it,
>+  * '%s' and strerror() on those that don't.
>+@@ -1872,7 +1872,7 @@ typedef struct procps_status_t {
>+ 	struct smaprec smaps;
>+ #endif
>+ 	char state[4];
>+-	/* basename of executable in exec(2), read from /proc/N/stat
>++	/* basename of executable in exec(2), read from /compat/linux/proc/N/stat
>+ 	 * (if executable is symlink or script, it is NOT replaced
>+ 	 * by link target or interpreter name) */
>+ 	char comm[COMM_LEN];
>+@@ -1913,7 +1913,7 @@ enum {
>+ 	PSSCAN_RUIDGID  = (1 << 21) * ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS,
>+ 	PSSCAN_TASKS	= (1 << 22) * ENABLE_FEATURE_SHOW_THREADS,
>+ };
>+-//procps_status_t* alloc_procps_scan(void) FAST_FUNC;
>++//compat/linux/procps_status_t* alloc_procps_scan(void) FAST_FUNC;
>+ void free_procps_scan(procps_status_t* sp) FAST_FUNC;
>+ procps_status_t* procps_scan(procps_status_t* sp, int flags) FAST_FUNC;
>+ /* Format cmdline (up to col chars) into char buf[size] */
>+@@ -2053,9 +2053,9 @@ extern const char bb_hexdigits_upcase[] 
>+ 
>+ extern const char bb_path_wtmp_file[] ALIGN1;
>  
>+-/* Busybox mount uses either /proc/mounts or /etc/mtab to
>++/* Busybox mount uses either /compat/linux/proc/mounts or /etc/mtab to
>+  * get the list of currently mounted filesystems */
>+-#define bb_path_mtab_file IF_FEATURE_MTAB_SUPPORT("/etc/mtab")IF_NOT_FEATURE_MTAB_SUPPORT("/proc/mounts")
>++#define bb_path_mtab_file IF_FEATURE_MTAB_SUPPORT("/etc/mtab")IF_NOT_FEATURE_MTAB_SUPPORT("/compat/linux/proc/mounts")
>  
>- /* Some libc's forget to declare these, do it ourself */
>+ #define bb_path_passwd_file  _PATH_PASSWD
>+ #define bb_path_group_file   _PATH_GROUP
>diff --git a/sysutils/busybox/files/patch-libbb_pw__encrypt.c b/sysutils/busybox/files/patch-libbb_pw__encrypt.c
>new file mode 100644
>index 000000000000..a1bcc3517408
>--- /dev/null
>+++ b/sysutils/busybox/files/patch-libbb_pw__encrypt.c
>@@ -0,0 +1,11 @@
>+--- libbb/pw_encrypt.c.orig	2018-12-05 14:44:34 UTC
>++++ libbb/pw_encrypt.c
>+@@ -6,7 +6,7 @@
>+  *
>+  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
>+  */
>+-#include <crypt.h>
>++#include <unistd.h>
>+ #include "libbb.h"
>+ 
>+ /* static const uint8_t ascii64[] ALIGN1 =
>diff --git a/sysutils/busybox/files/patch-miscutils_man.c b/sysutils/busybox/files/patch-miscutils_man.c
>new file mode 100644
>index 000000000000..e7e2153aa5ea
>--- /dev/null
>+++ b/sysutils/busybox/files/patch-miscutils_man.c
>@@ -0,0 +1,11 @@
>+--- miscutils/man.c.orig	2018-12-30 15:14:20 UTC
>++++ miscutils/man.c
>+@@ -265,7 +265,7 @@ int man_main(int argc UNUSED_PARAM, char
>+ 	if (!man_path_list) {
>+ 		/* default, may be overridden by /etc/man.conf */
>+ 		man_path_list = xzalloc(2 * sizeof(man_path_list[0]));
>+-		man_path_list[0] = (char*)"/usr/man";
>++		man_path_list[0] = (char*)"/usr/share/man";
>+ 		/* count_mp stays 0.
>+ 		 * Thus, man.conf will overwrite man_path_list[0]
>+ 		 * if a path is defined there.
>diff --git a/sysutils/busybox/files/patch-networking_httpd.c b/sysutils/busybox/files/patch-networking_httpd.c
>new file mode 100644
>index 000000000000..e43d9dced43e
>--- /dev/null
>+++ b/sysutils/busybox/files/patch-networking_httpd.c
>@@ -0,0 +1,17 @@
>+--- networking/httpd.c.orig	2018-12-05 14:44:34 UTC
>++++ networking/httpd.c
>+@@ -2109,10 +2109,10 @@ static void handle_incoming_and_exit(con
>+ 	}
>+ #if ENABLE_FEATURE_IPV6
>+ 	if (fromAddr->u.sa.sa_family == AF_INET6
>+-	 && fromAddr->u.sin6.sin6_addr.s6_addr32[0] == 0
>+-	 && fromAddr->u.sin6.sin6_addr.s6_addr32[1] == 0
>+-	 && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[2]) == 0xffff)
>+-		rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr32[3]);
>++	 && fromAddr->u.sin6.sin6_addr.s6_addr[0] == 0
>++	 && fromAddr->u.sin6.sin6_addr.s6_addr[1] == 0
>++	 && ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[2]) == 0xffff)
>++		rmt_ip = ntohl(fromAddr->u.sin6.sin6_addr.s6_addr[3]);
>+ #endif
>+ 	if (ENABLE_FEATURE_HTTPD_CGI || DEBUG || verbose) {
>+ 		/* NB: can be NULL (user runs httpd -i by hand?) */
>diff --git a/sysutils/busybox/files/patch-networking_traceroute.c b/sysutils/busybox/files/patch-networking_traceroute.c
>new file mode 100644
>index 000000000000..34dae6e92f49
>--- /dev/null
>+++ b/sysutils/busybox/files/patch-networking_traceroute.c
>@@ -0,0 +1,20 @@
>+--- networking/traceroute.c.orig	2018-12-30 15:14:20 UTC
>++++ networking/traceroute.c
>+@@ -635,7 +635,7 @@ packet4_ok(int read_len, const struct so
>+ // but defer it to kernel, we can't set source port,
>+ // and thus can't check it here in the reply
>+ 			/* && up->source == htons(ident) */
>+-			 && up->dest == htons(port + seq)
>++			 && up->uh_dport == htons(port + seq)
>+ 			) {
>+ 				return (type == ICMP_TIMXCEED ? -1 : code + 1);
>+ 			}
>+@@ -933,7 +933,7 @@ common_traceroute_main(int op, char **ar
>+ 
>+ #if ENABLE_TRACEROUTE6
>+ 	if (af == AF_INET6) {
>+-		if (setsockopt_int(rcvsock, SOL_RAW, IPV6_CHECKSUM, 2) != 0)
>++		if (setsockopt_int(rcvsock, SOL_IPV6, IPV6_CHECKSUM, 2) != 0)
>+ 			bb_perror_msg_and_die("setsockopt(%s)", "IPV6_CHECKSUM");
>+ 		xmove_fd(xsocket(af, SOCK_DGRAM, 0), sndsock);
>+ 	} else

Actions: View | Diff

Attachments on bug 238915: 205456 | 205580 | 205728 | 205752 | 205753