From 53c06e732331a648263912f809267f1e09d4f3ef Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 26 Dec 2014 23:34:23 +0100 Subject: [PATCH] busybox: update to busybox-1.23.0 Signed-off-by: Stephan Raue --- .../sysutils/busybox/config/busybox-host.conf | 40 ++++++++++++++----- .../sysutils/busybox/config/busybox-init.conf | 40 ++++++++++++++----- .../busybox/config/busybox-target.conf | 40 ++++++++++++++----- packages/sysutils/busybox/package.mk | 2 +- ...box-02_silence-crond-startup-logging.patch | 18 ++++----- .../busybox/patches/busybox-1.22.1-ash.patch | 20 ---------- .../busybox/patches/busybox-1.22.1-date.patch | 30 -------------- .../patches/busybox-1.22.1-iplink.patch | 19 --------- .../busybox/patches/busybox-1.22.1-nc.patch | 15 ------- 9 files changed, 98 insertions(+), 126 deletions(-) delete mode 100644 packages/sysutils/busybox/patches/busybox-1.22.1-ash.patch delete mode 100644 packages/sysutils/busybox/patches/busybox-1.22.1-date.patch delete mode 100644 packages/sysutils/busybox/patches/busybox-1.22.1-iplink.patch delete mode 100644 packages/sysutils/busybox/patches/busybox-1.22.1-nc.patch diff --git a/packages/sysutils/busybox/config/busybox-host.conf b/packages/sysutils/busybox/config/busybox-host.conf index 8ec923fac5..dd93110068 100644 --- a/packages/sysutils/busybox/config/busybox-host.conf +++ b/packages/sysutils/busybox/config/busybox-host.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.22.0 -# Wed Jan 1 15:36:04 2014 +# Busybox version: 1.23.0 +# Fri Dec 26 23:15:35 2014 # CONFIG_HAVE_DOT_CONFIG=y @@ -36,6 +36,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y # CONFIG_LONG_OPTS is not set # CONFIG_FEATURE_DEVPTS is not set # CONFIG_FEATURE_CLEAN_UP is not set @@ -73,6 +75,7 @@ CONFIG_EXTRA_LDLIBS="" # # CONFIG_DEBUG is not set # CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set @@ -183,6 +186,7 @@ CONFIG_GZIP_FAST=0 # CONFIG_HOSTID is not set # CONFIG_ID is not set # CONFIG_GROUPS is not set +# CONFIG_SHUF is not set # CONFIG_TEST is not set # CONFIG_FEATURE_TEST_64 is not set # CONFIG_TOUCH is not set @@ -191,6 +195,7 @@ CONFIG_GZIP_FAST=0 # CONFIG_TR is not set # CONFIG_FEATURE_TR_CLASSES is not set # CONFIG_FEATURE_TR_EQUIV is not set +# CONFIG_UNLINK is not set # CONFIG_BASE64 is not set # CONFIG_WHO is not set # CONFIG_USERS is not set @@ -297,6 +302,11 @@ CONFIG_GZIP_FAST=0 # CONFIG_FEATURE_WC_LARGE is not set # CONFIG_WHOAMI is not set # CONFIG_YES is not set + +# +# Common options +# +# CONFIG_FEATURE_VERBOSE is not set # CONFIG_FEATURE_PRESERVE_HARDLINKS is not set # CONFIG_FEATURE_AUTOWIDTH is not set # CONFIG_FEATURE_HUMAN_READABLE is not set @@ -368,6 +378,9 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_VI_SET is not set # CONFIG_FEATURE_VI_WIN_RESIZE is not set # CONFIG_FEATURE_VI_ASK_TERMINAL is not set +# CONFIG_FEATURE_VI_UNDO is not set +# CONFIG_FEATURE_VI_UNDO_QUEUE is not set +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 # CONFIG_FEATURE_ALLOW_EXEC is not set # @@ -384,6 +397,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set # CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_FEATURE_FIND_EXEC_PLUS is not set # CONFIG_FEATURE_FIND_USER is not set # CONFIG_FEATURE_FIND_GROUP is not set # CONFIG_FEATURE_FIND_NOT is not set @@ -405,6 +419,7 @@ CONFIG_FEATURE_VI_MAX_LEN=0 # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set # CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +# CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR is not set # # Init Utilities @@ -441,6 +456,7 @@ CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_ADDUSER is not set # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=0 CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 # CONFIG_ADDGROUP is not set @@ -452,7 +468,6 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_GETTY is not set # CONFIG_LOGIN is not set # CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set @@ -510,6 +525,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # Linux System Utilities # # CONFIG_BLOCKDEV is not set +# CONFIG_FATATTR is not set # CONFIG_FSTRIM is not set # CONFIG_MDEV is not set # CONFIG_FEATURE_MDEV_CONF is not set @@ -581,6 +597,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # CONFIG_SCRIPTREPLAY is not set # CONFIG_SETARCH is not set # CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_DISCARD is not set # CONFIG_FEATURE_SWAPON_PRI is not set # CONFIG_SWITCH_ROOT is not set # CONFIG_UMOUNT is not set @@ -615,6 +632,10 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # Miscellaneous Utilities # # 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_DIR="" # CONFIG_LESS is not set CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_LESS_BRACKETS is not set @@ -629,6 +650,8 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_NANDDUMP is not set # CONFIG_RFKILL is not set # CONFIG_SETSERIAL is not set +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set @@ -651,10 +674,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set # CONFIG_CHRT 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_DIR="" # CONFIG_CRONTAB is not set # CONFIG_DC is not set # CONFIG_FEATURE_DC_LIBM is not set @@ -696,8 +715,6 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_RX is not set # CONFIG_SETSID is not set # CONFIG_STRINGS is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_TIME is not set # CONFIG_TIMEOUT is not set # CONFIG_TTYSIZE is not set @@ -733,13 +750,13 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_FTPD is not set # CONFIG_FEATURE_FTP_WRITE is not set # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FEATURE_FTP_AUTHENTICATION is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set # CONFIG_HOSTNAME is not set # CONFIG_HTTPD is not set # CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set @@ -796,6 +813,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_NSLOOKUP is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set +# CONFIG_FEATURE_NTPD_CONF is not set # CONFIG_PSCAN is not set # CONFIG_ROUTE is not set # CONFIG_SLATTACH is not set @@ -829,6 +847,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" CONFIG_DHCPD_LEASES_FILE="" # CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set @@ -947,6 +966,7 @@ CONFIG_SV_DEFAULT_SERVICE_DIR="" # CONFIG_ASH_BUILTIN_ECHO is not set # CONFIG_ASH_BUILTIN_PRINTF is not set # CONFIG_ASH_BUILTIN_TEST is not set +# CONFIG_ASH_HELP is not set # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set diff --git a/packages/sysutils/busybox/config/busybox-init.conf b/packages/sysutils/busybox/config/busybox-init.conf index 221b7875f6..18bc410c9a 100644 --- a/packages/sysutils/busybox/config/busybox-init.conf +++ b/packages/sysutils/busybox/config/busybox-init.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.22.1 -# Sun Nov 23 18:41:18 2014 +# Busybox version: 1.23.0 +# Fri Dec 26 23:16:14 2014 # CONFIG_HAVE_DOT_CONFIG=y @@ -36,6 +36,8 @@ CONFIG_LAST_SUPPORTED_WCHAR=767 # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y # CONFIG_LONG_OPTS is not set CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set @@ -73,6 +75,7 @@ CONFIG_EXTRA_LDLIBS="" # # CONFIG_DEBUG is not set # CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set @@ -183,6 +186,7 @@ CONFIG_CAT=y # CONFIG_HOSTID is not set # CONFIG_ID is not set # CONFIG_GROUPS is not set +# CONFIG_SHUF is not set # CONFIG_TEST is not set CONFIG_FEATURE_TEST_64=y # CONFIG_TOUCH is not set @@ -191,6 +195,7 @@ CONFIG_FEATURE_TEST_64=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y +# CONFIG_UNLINK is not set # CONFIG_BASE64 is not set # CONFIG_WHO is not set # CONFIG_USERS is not set @@ -298,6 +303,11 @@ CONFIG_USLEEP=y # CONFIG_WHOAMI is not set # CONFIG_YES is not set +# +# Common options +# +# CONFIG_FEATURE_VERBOSE is not set + # # Common options for cp and mv # @@ -384,6 +394,9 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 CONFIG_FEATURE_ALLOW_EXEC=y # @@ -400,6 +413,7 @@ CONFIG_FEATURE_ALLOW_EXEC=y # CONFIG_FEATURE_FIND_NEWER is not set # CONFIG_FEATURE_FIND_INUM is not set # CONFIG_FEATURE_FIND_EXEC is not set +# CONFIG_FEATURE_FIND_EXEC_PLUS is not set # CONFIG_FEATURE_FIND_USER is not set # CONFIG_FEATURE_FIND_GROUP is not set # CONFIG_FEATURE_FIND_NOT is not set @@ -421,6 +435,7 @@ CONFIG_FEATURE_GREP_CONTEXT=y # CONFIG_FEATURE_XARGS_SUPPORT_QUOTES is not set # CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT is not set # CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM is not set +# CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR is not set # # Init Utilities @@ -457,6 +472,7 @@ CONFIG_INIT_TERMINAL_TYPE="" # CONFIG_ADDUSER is not set # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=0 CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 # CONFIG_ADDGROUP is not set @@ -468,7 +484,6 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_GETTY is not set # CONFIG_LOGIN is not set # CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_PAM is not set # CONFIG_LOGIN_SCRIPTS is not set # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set @@ -526,6 +541,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # Linux System Utilities # # CONFIG_BLOCKDEV is not set +# CONFIG_FATATTR is not set CONFIG_FSTRIM=y # CONFIG_MDEV is not set # CONFIG_FEATURE_MDEV_CONF is not set @@ -597,6 +613,7 @@ CONFIG_PIVOT_ROOT=y # CONFIG_SCRIPTREPLAY is not set # CONFIG_SETARCH is not set # CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_DISCARD is not set # CONFIG_FEATURE_SWAPON_PRI is not set CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y @@ -639,6 +656,10 @@ CONFIG_FEATURE_VOLUMEID_XFS=y # Miscellaneous Utilities # # 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_DIR="" # CONFIG_LESS is not set CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_FEATURE_LESS_BRACKETS is not set @@ -653,6 +674,8 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_NANDDUMP is not set # CONFIG_RFKILL is not set # CONFIG_SETSERIAL is not set +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set @@ -675,10 +698,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set # CONFIG_CHRT 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_DIR="" # CONFIG_CRONTAB is not set # CONFIG_DC is not set # CONFIG_FEATURE_DC_LIBM is not set @@ -720,8 +739,6 @@ CONFIG_MOUNTPOINT=y # CONFIG_RX is not set # CONFIG_SETSID is not set # CONFIG_STRINGS is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_TIME is not set # CONFIG_TIMEOUT is not set # CONFIG_TTYSIZE is not set @@ -757,13 +774,13 @@ CONFIG_ETHER_WAKE=y # CONFIG_FTPD is not set # CONFIG_FEATURE_FTP_WRITE is not set # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FEATURE_FTP_AUTHENTICATION is not set # CONFIG_FTPGET is not set # CONFIG_FTPPUT is not set # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set # CONFIG_HOSTNAME is not set # CONFIG_HTTPD is not set # CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set # CONFIG_FEATURE_HTTPD_SETUID is not set # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set # CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set @@ -820,6 +837,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" # CONFIG_NSLOOKUP is not set # CONFIG_NTPD is not set # CONFIG_FEATURE_NTPD_SERVER is not set +# CONFIG_FEATURE_NTPD_CONF is not set # CONFIG_PSCAN is not set # CONFIG_ROUTE is not set # CONFIG_SLATTACH is not set @@ -853,6 +871,7 @@ CONFIG_IFUPDOWN_IFSTATE_PATH="" CONFIG_DHCPD_LEASES_FILE="" # CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set @@ -971,6 +990,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_BUILTIN_ECHO=y # CONFIG_ASH_BUILTIN_PRINTF is not set CONFIG_ASH_BUILTIN_TEST=y +# CONFIG_ASH_HELP is not set # CONFIG_ASH_CMDCMD is not set # CONFIG_ASH_MAIL is not set # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf index 09a194432c..6597e19a64 100644 --- a/packages/sysutils/busybox/config/busybox-target.conf +++ b/packages/sysutils/busybox/config/busybox-target.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.22.1 -# Sat Aug 16 12:24:52 2014 +# Busybox version: 1.23.0 +# Fri Dec 26 23:17:00 2014 # CONFIG_HAVE_DOT_CONFIG=y @@ -36,6 +36,8 @@ CONFIG_UNICODE_WIDE_WCHARS=y # CONFIG_UNICODE_BIDI_SUPPORT is not set # CONFIG_UNICODE_NEUTRAL_TABLE is not set # CONFIG_UNICODE_PRESERVE_BROKEN is not set +# CONFIG_PAM is not set +CONFIG_FEATURE_USE_SENDFILE=y CONFIG_LONG_OPTS=y CONFIG_FEATURE_DEVPTS=y # CONFIG_FEATURE_CLEAN_UP is not set @@ -73,6 +75,7 @@ CONFIG_EXTRA_LDLIBS="" # # CONFIG_DEBUG is not set # CONFIG_DEBUG_PESSIMIZE is not set +# CONFIG_UNIT_TEST is not set # CONFIG_WERROR is not set CONFIG_NO_DEBUG_LIB=y # CONFIG_DMALLOC is not set @@ -183,6 +186,7 @@ CONFIG_FEATURE_DATE_COMPAT=y # CONFIG_HOSTID is not set CONFIG_ID=y CONFIG_GROUPS=y +# CONFIG_SHUF is not set # CONFIG_TEST is not set CONFIG_FEATURE_TEST_64=y CONFIG_TOUCH=y @@ -191,6 +195,7 @@ CONFIG_FEATURE_TOUCH_SUSV3=y CONFIG_TR=y CONFIG_FEATURE_TR_CLASSES=y CONFIG_FEATURE_TR_EQUIV=y +# CONFIG_UNLINK is not set # CONFIG_BASE64 is not set # CONFIG_WHO is not set # CONFIG_USERS is not set @@ -298,6 +303,11 @@ CONFIG_FEATURE_WC_LARGE=y CONFIG_WHOAMI=y # CONFIG_YES is not set +# +# Common options +# +CONFIG_FEATURE_VERBOSE=y + # # Common options for cp and mv # @@ -384,6 +394,9 @@ CONFIG_FEATURE_VI_SETOPTS=y CONFIG_FEATURE_VI_SET=y CONFIG_FEATURE_VI_WIN_RESIZE=y CONFIG_FEATURE_VI_ASK_TERMINAL=y +CONFIG_FEATURE_VI_UNDO=y +CONFIG_FEATURE_VI_UNDO_QUEUE=y +CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 CONFIG_FEATURE_ALLOW_EXEC=y # @@ -400,6 +413,7 @@ CONFIG_FEATURE_FIND_TYPE=y CONFIG_FEATURE_FIND_NEWER=y # CONFIG_FEATURE_FIND_INUM is not set CONFIG_FEATURE_FIND_EXEC=y +CONFIG_FEATURE_FIND_EXEC_PLUS=y # CONFIG_FEATURE_FIND_USER is not set # CONFIG_FEATURE_FIND_GROUP is not set CONFIG_FEATURE_FIND_NOT=y @@ -421,6 +435,7 @@ CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION=y 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 # # Init Utilities @@ -457,6 +472,7 @@ CONFIG_USE_BB_CRYPT_SHA=y # CONFIG_ADDUSER is not set # CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set # CONFIG_FEATURE_CHECK_NAMES is not set +CONFIG_LAST_ID=0 CONFIG_FIRST_SYSTEM_ID=0 CONFIG_LAST_SYSTEM_ID=0 # CONFIG_ADDGROUP is not set @@ -468,7 +484,6 @@ CONFIG_LAST_SYSTEM_ID=0 # CONFIG_GETTY is not set CONFIG_LOGIN=y # CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_PAM is not set CONFIG_LOGIN_SCRIPTS=y # CONFIG_FEATURE_NOLOGIN is not set # CONFIG_FEATURE_SECURETTY is not set @@ -526,6 +541,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # Linux System Utilities # # CONFIG_BLOCKDEV is not set +# CONFIG_FATATTR is not set CONFIG_FSTRIM=y # CONFIG_MDEV is not set # CONFIG_FEATURE_MDEV_CONF is not set @@ -597,6 +613,7 @@ CONFIG_RDATE=y # CONFIG_SCRIPTREPLAY is not set # CONFIG_SETARCH is not set # CONFIG_SWAPONOFF is not set +# CONFIG_FEATURE_SWAPON_DISCARD is not set # CONFIG_FEATURE_SWAPON_PRI is not set CONFIG_SWITCH_ROOT=y CONFIG_UMOUNT=y @@ -639,6 +656,10 @@ CONFIG_FEATURE_VOLUMEID_XFS=y # Miscellaneous Utilities # # CONFIG_CONSPY is not set +CONFIG_CROND=y +CONFIG_FEATURE_CROND_D=y +# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set +CONFIG_FEATURE_CROND_DIR="/storage/.cache/cron" CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 CONFIG_FEATURE_LESS_BRACKETS=y @@ -653,6 +674,8 @@ CONFIG_FEATURE_LESS_LINENUMS=y # CONFIG_NANDDUMP is not set # CONFIG_RFKILL is not set CONFIG_SETSERIAL=y +# CONFIG_TASKSET is not set +# CONFIG_FEATURE_TASKSET_FANCY is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set # CONFIG_UBIMKVOL is not set @@ -675,10 +698,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0 # CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set # CONFIG_FEATURE_CHAT_CLR_ABORT is not set # CONFIG_CHRT is not set -CONFIG_CROND=y -CONFIG_FEATURE_CROND_D=y -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="/storage/.cache/cron" CONFIG_CRONTAB=y # CONFIG_DC is not set # CONFIG_FEATURE_DC_LIBM is not set @@ -720,8 +739,6 @@ CONFIG_MOUNTPOINT=y # CONFIG_RX is not set # CONFIG_SETSID is not set # CONFIG_STRINGS is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set CONFIG_TIME=y # CONFIG_TIMEOUT is not set CONFIG_TTYSIZE=y @@ -757,13 +774,13 @@ CONFIG_ARP=y # CONFIG_FTPD is not set # CONFIG_FEATURE_FTP_WRITE is not set # CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set +# CONFIG_FEATURE_FTP_AUTHENTICATION is not set CONFIG_FTPGET=y CONFIG_FTPPUT=y CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS=y CONFIG_HOSTNAME=y CONFIG_HTTPD=y CONFIG_FEATURE_HTTPD_RANGES=y -CONFIG_FEATURE_HTTPD_USE_SENDFILE=y CONFIG_FEATURE_HTTPD_SETUID=y CONFIG_FEATURE_HTTPD_BASIC_AUTH=y CONFIG_FEATURE_HTTPD_AUTH_MD5=y @@ -820,6 +837,7 @@ CONFIG_FEATURE_NETSTAT_PRG=y CONFIG_NSLOOKUP=y CONFIG_NTPD=y # CONFIG_FEATURE_NTPD_SERVER is not set +CONFIG_FEATURE_NTPD_CONF=y # CONFIG_PSCAN is not set CONFIG_ROUTE=y # CONFIG_SLATTACH is not set @@ -853,6 +871,7 @@ CONFIG_FEATURE_TRACEROUTE_VERBOSE=y CONFIG_DHCPD_LEASES_FILE="" # CONFIG_UDHCPC is not set # CONFIG_FEATURE_UDHCPC_ARPING is not set +# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set # CONFIG_FEATURE_UDHCP_PORT is not set CONFIG_UDHCP_DEBUG=0 # CONFIG_FEATURE_UDHCP_RFC3397 is not set @@ -971,6 +990,7 @@ CONFIG_ASH_GETOPTS=y CONFIG_ASH_BUILTIN_ECHO=y CONFIG_ASH_BUILTIN_PRINTF=y CONFIG_ASH_BUILTIN_TEST=y +CONFIG_ASH_HELP=y CONFIG_ASH_CMDCMD=y # CONFIG_ASH_MAIL is not set # CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 9e5118bf2c..a83d47c9da 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="busybox" -PKG_VERSION="1.22.1" +PKG_VERSION="1.23.0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/sysutils/busybox/patches/busybox-02_silence-crond-startup-logging.patch b/packages/sysutils/busybox/patches/busybox-02_silence-crond-startup-logging.patch index 456ec1c487..21c0a8fa25 100644 --- a/packages/sysutils/busybox/patches/busybox-02_silence-crond-startup-logging.patch +++ b/packages/sysutils/busybox/patches/busybox-02_silence-crond-startup-logging.patch @@ -7,18 +7,14 @@ Subject: [PATCH] silence crond startup logging miscutils/crond.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) -diff --git a/miscutils/crond.c b/miscutils/crond.c -index 582dc99..71514e3 100644 ---- a/miscutils/crond.c -+++ b/miscutils/crond.c -@@ -883,7 +883,6 @@ int crond_main(int argc UNUSED_PARAM, char **argv) +diff -Naur busybox-1.23.0/miscutils/crond.c busybox-1.23.0.patch/miscutils/crond.c +--- busybox-1.23.0/miscutils/crond.c 2014-10-04 22:35:59.000000000 +0200 ++++ busybox-1.23.0.patch/miscutils/crond.c 2014-12-26 23:07:53.386118290 +0100 +@@ -945,7 +945,6 @@ + + reopen_logfile_to_stderr(); xchdir(G.crontab_dir_name); - //signal(SIGHUP, SIG_IGN); /* ? original crond dies on HUP... */ - xsetenv("SHELL", DEFAULT_SHELL); /* once, for all future children */ -- crondlog(LVL8 "crond (busybox "BB_VER") started, log level %d", G.log_level); +- log8("crond (busybox "BB_VER") started, log level %d", G.log_level); rescan_crontab_dir(); write_pidfile(CONFIG_PID_FILE_PATH "/crond.pid"); --- -1.7.2.5 - diff --git a/packages/sysutils/busybox/patches/busybox-1.22.1-ash.patch b/packages/sysutils/busybox/patches/busybox-1.22.1-ash.patch deleted file mode 100644 index 767c3a8c11..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.22.1-ash.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- busybox-1.22.1/procps/top.c -+++ busybox-1.22.1-ash/procps/top.c -@@ -917,17 +917,12 @@ enum { - #if ENABLE_FEATURE_USE_TERMIOS - static unsigned handle_input(unsigned scan_mask, unsigned interval) - { -- struct pollfd pfd[1]; -- - if (option_mask32 & OPT_EOF) { - /* EOF on stdin ("top tm_year, -+ if (strchr(date_str, '-') -+ /* Why strchr('-') check? -+ * sscanf below will trash ptm->tm_year, this breaks -+ * if parse_str is "10101010" (iow, "MMddhhmm" form) -+ * because we destroy year. Do these sscanf -+ * only if we saw a dash in parse_str. -+ */ -+ /* yyyy-mm-dd HH */ -+ && (sscanf(date_str, "%u-%u-%u %u%c", &ptm->tm_year, - &ptm->tm_mon, &ptm->tm_mday, - &ptm->tm_hour, - &end) >= 4 -- /* yyyy-mm-dd */ -- || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, -+ /* yyyy-mm-dd */ -+ || sscanf(date_str, "%u-%u-%u%c", &ptm->tm_year, - &ptm->tm_mon, &ptm->tm_mday, - &end) >= 3 -+ ) - ) { - ptm->tm_year -= 1900; /* Adjust years */ - ptm->tm_mon -= 1; /* Adjust month from 1-12 to 0-11 */ diff --git a/packages/sysutils/busybox/patches/busybox-1.22.1-iplink.patch b/packages/sysutils/busybox/patches/busybox-1.22.1-iplink.patch deleted file mode 100644 index dbd76c5749..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.22.1-iplink.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- busybox-1.22.1/networking/libiproute/iplink.c -+++ busybox-1.22.1-iplink/networking/libiproute/iplink.c -@@ -31,6 +31,16 @@ - #ifndef IFLA_LINKINFO - # define IFLA_LINKINFO 18 - # define IFLA_INFO_KIND 1 -+# define IFLA_INFO_DATA 2 -+#endif -+ -+#ifndef IFLA_VLAN_MAX -+# define IFLA_VLAN_ID 1 -+# define IFLA_VLAN_FLAGS 2 -+struct ifla_vlan_flags { -+ uint32_t flags; -+ uint32_t mask; -+}; - #endif - - /* taken from linux/sockios.h */ diff --git a/packages/sysutils/busybox/patches/busybox-1.22.1-nc.patch b/packages/sysutils/busybox/patches/busybox-1.22.1-nc.patch deleted file mode 100644 index 1ddb4834bd..0000000000 --- a/packages/sysutils/busybox/patches/busybox-1.22.1-nc.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- busybox-1.22.1/networking/nc_bloaty.c -+++ busybox-1.22.1-nc/networking/nc_bloaty.c -@@ -175,9 +175,9 @@ enum { - OPT_w = (1 << 5), - OPT_l = (1 << 6) * ENABLE_NC_SERVER, - OPT_k = (1 << 7) * ENABLE_NC_SERVER, -- OPT_i = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, -- OPT_o = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, -- OPT_z = (1 << (9+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, -+ OPT_i = (1 << (6+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, -+ OPT_o = (1 << (7+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, -+ OPT_z = (1 << (8+2*ENABLE_NC_SERVER)) * ENABLE_NC_EXTRA, - }; - - #define o_nflag (option_mask32 & OPT_n)