busybox: update to 1.26.2

Refresh patches, delete patches that have been applied upstream.

Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name> [fix defaults]

1 files changed, 283 insertions, 318 deletions

diff --git a/package/utils/busybox/config/miscutils/Config.in b/package/utils/busybox/config/miscutils/Config.in
index 3465df40ab..817a514b75 100644
--- a/package/utils/busybox/config/miscutils/Config.in
+++ b/package/utils/busybox/config/miscutils/Config.in
@@ -6,259 +6,6 @@
 
 menu "Miscellaneous Utilities"
 
-config BUSYBOX_CONFIG_CONSPY
-	bool "conspy"
-	default BUSYBOX_DEFAULT_CONSPY
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  A text-mode VNC like program for Linux virtual terminals.
-	  example:  conspy NUM      shared access to console num
-	  or        conspy -nd NUM  screenshot of console num
-	  or        conspy -cs NUM  poor man's GNU screen like
-config BUSYBOX_CONFIG_CROND
-	bool "crond"
-	default BUSYBOX_DEFAULT_CROND
-	select BUSYBOX_CONFIG_FEATURE_SYSLOG
-	help
-	  Crond is a background daemon that parses individual crontab
-	  files and executes commands on behalf of the users in question.
-	  This is a port of dcron from slackware. It uses files of the
-	  format /var/spool/cron/crontabs/<username> files, for example:
-	      $ cat /var/spool/cron/crontabs/root
-	      # Run daily cron jobs at 4:40 every day:
-	      40 4 * * * /etc/cron/daily > /dev/null 2>&1
-
-config BUSYBOX_CONFIG_FEATURE_CROND_D
-	bool "Support option -d to redirect output to stderr"
-	depends on BUSYBOX_CONFIG_CROND
-	default BUSYBOX_DEFAULT_FEATURE_CROND_D
-	help
-	  -d N sets loglevel (0:most verbose) and directs all output to stderr.
-
-config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL
-	bool "Report command output via email (using sendmail)"
-	default BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL
-	depends on BUSYBOX_CONFIG_CROND
-	help
-	  Command output will be sent to corresponding user via email.
-
-config BUSYBOX_CONFIG_FEATURE_CROND_DIR
-	string "crond spool directory"
-	default BUSYBOX_DEFAULT_FEATURE_CROND_DIR
-	depends on BUSYBOX_CONFIG_CROND || BUSYBOX_CONFIG_CRONTAB
-	help
-	  Location of crond spool.
-config BUSYBOX_CONFIG_I2CGET
-	bool "i2cget"
-	default BUSYBOX_DEFAULT_I2CGET
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Read from I2C/SMBus chip registers.
-
-config BUSYBOX_CONFIG_I2CSET
-	bool "i2cset"
-	default BUSYBOX_DEFAULT_I2CSET
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Set I2C registers.
-
-config BUSYBOX_CONFIG_I2CDUMP
-	bool "i2cdump"
-	default BUSYBOX_DEFAULT_I2CDUMP
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Examine I2C registers.
-
-config BUSYBOX_CONFIG_I2CDETECT
-	bool "i2cdetect"
-	default BUSYBOX_DEFAULT_I2CDETECT
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Detect I2C chips.
-
-config BUSYBOX_CONFIG_LESS
-	bool "less"
-	default BUSYBOX_DEFAULT_LESS
-	help
-	  'less' is a pager, meaning that it displays text files. It possesses
-	  a wide array of features, and is an improvement over 'more'.
-
-config BUSYBOX_CONFIG_FEATURE_LESS_MAXLINES
-	int "Max number of input lines less will try to eat"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_MAXLINES
-	depends on BUSYBOX_CONFIG_LESS
-
-config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS
-	bool "Enable bracket searching"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_BRACKETS
-	depends on BUSYBOX_CONFIG_LESS
-	help
-	  This option adds the capability to search for matching left and right
-	  brackets, facilitating programming.
-
-config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS
-	bool "Enable -m/-M"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_FLAGS
-	depends on BUSYBOX_CONFIG_LESS
-	help
-	  The -M/-m flag enables a more sophisticated status line.
-
-config BUSYBOX_CONFIG_FEATURE_LESS_TRUNCATE
-	bool "Enable -S"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_TRUNCATE
-	depends on BUSYBOX_CONFIG_LESS
-	help
-	  The -S flag causes long lines to be truncated rather than
-	  wrapped.
-
-config BUSYBOX_CONFIG_FEATURE_LESS_MARKS
-	bool "Enable marks"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_MARKS
-	depends on BUSYBOX_CONFIG_LESS
-	help
-	  Marks enable positions in a file to be stored for easy reference.
-
-config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP
-	bool "Enable regular expressions"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_REGEXP
-	depends on BUSYBOX_CONFIG_LESS
-	help
-	  Enable regular expressions, allowing complex file searches.
-
-config BUSYBOX_CONFIG_FEATURE_LESS_WINCH
-	bool "Enable automatic resizing on window size changes"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_WINCH
-	depends on BUSYBOX_CONFIG_LESS
-	help
-	  Makes less track window size changes.
-
-config BUSYBOX_CONFIG_FEATURE_LESS_ASK_TERMINAL
-	bool "Use 'tell me cursor position' ESC sequence to measure window"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_ASK_TERMINAL
-	depends on BUSYBOX_CONFIG_FEATURE_LESS_WINCH
-	help
-	  Makes less track window size changes.
-	  If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
-	  this option makes less perform a last-ditch effort to find it:
-	  position cursor to 999,999 and ask terminal to report real
-	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
-
-	  This is not clean but helps a lot on serial lines and such.
-
-config BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
-	bool "Enable flag changes ('-' command)"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_DASHCMD
-	depends on BUSYBOX_CONFIG_LESS
-	help
-	  This enables the ability to change command-line flags within
-	  less itself ('-' keyboard command).
-
-config BUSYBOX_CONFIG_FEATURE_LESS_LINENUMS
-	bool "Enable dynamic switching of line numbers"
-	default BUSYBOX_DEFAULT_FEATURE_LESS_LINENUMS
-	depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
-	help
-	  Enables "-N" command.
-config BUSYBOX_CONFIG_NANDWRITE
-	bool "nandwrite"
-	default BUSYBOX_DEFAULT_NANDWRITE
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Write to the specified MTD device, with bad blocks awareness
-
-config BUSYBOX_CONFIG_NANDDUMP
-	bool "nanddump"
-	default BUSYBOX_DEFAULT_NANDDUMP
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Dump the content of raw NAND chip
-config BUSYBOX_CONFIG_RFKILL
-	bool "rfkill"
-	default BUSYBOX_DEFAULT_RFKILL # doesn't build on Ubuntu 9.04
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Enable/disable wireless devices.
-
-	  rfkill list : list all wireless devices
-	  rfkill list bluetooth : list all bluetooth devices
-	  rfkill list 1 : list device corresponding to the given index
-	  rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
-
-config BUSYBOX_CONFIG_SETSERIAL
-	bool "setserial"
-	default BUSYBOX_DEFAULT_SETSERIAL
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Retrieve or set Linux serial port.
-config BUSYBOX_CONFIG_TASKSET
-	bool "taskset"
-	default BUSYBOX_DEFAULT_TASKSET  # doesn't build on some non-x86 targets (m68k)
-	help
-	  Retrieve or set a processes's CPU affinity.
-	  This requires sched_{g,s}etaffinity support in your libc.
-
-config BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY
-	bool "Fancy output"
-	default BUSYBOX_DEFAULT_FEATURE_TASKSET_FANCY
-	depends on BUSYBOX_CONFIG_TASKSET
-	help
-	  Add code for fancy output. This merely silences a compiler-warning
-	  and adds about 135 Bytes. May be needed for machines with alot
-	  of CPUs.
-config BUSYBOX_CONFIG_UBIATTACH
-	bool "ubiattach"
-	default BUSYBOX_DEFAULT_UBIATTACH
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Attach MTD device to an UBI device.
-
-config BUSYBOX_CONFIG_UBIDETACH
-	bool "ubidetach"
-	default BUSYBOX_DEFAULT_UBIDETACH
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Detach MTD device from an UBI device.
-
-config BUSYBOX_CONFIG_UBIMKVOL
-	bool "ubimkvol"
-	default BUSYBOX_DEFAULT_UBIMKVOL
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Create a UBI volume.
-
-config BUSYBOX_CONFIG_UBIRMVOL
-	bool "ubirmvol"
-	default BUSYBOX_DEFAULT_UBIRMVOL
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Delete a UBI volume.
-
-config BUSYBOX_CONFIG_UBIRSVOL
-	bool "ubirsvol"
-	default BUSYBOX_DEFAULT_UBIRSVOL
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Resize a UBI volume.
-
-config BUSYBOX_CONFIG_UBIUPDATEVOL
-	bool "ubiupdatevol"
-	default BUSYBOX_DEFAULT_UBIUPDATEVOL
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Update a UBI volume.
-config BUSYBOX_CONFIG_UBIRENAME
-	bool "ubirename"
-	default BUSYBOX_DEFAULT_UBIRENAME
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Utility to rename UBI volumes
-config BUSYBOX_CONFIG_WALL
-	bool "wall"
-	default BUSYBOX_DEFAULT_WALL
-	depends on BUSYBOX_CONFIG_FEATURE_UTMP
-	help
-	  Write a message to all users that are logged in.
-
 config BUSYBOX_CONFIG_ADJTIMEX
 	bool "adjtimex"
 	default BUSYBOX_DEFAULT_ADJTIMEX
@@ -266,7 +13,6 @@ config BUSYBOX_CONFIG_ADJTIMEX
 	help
 	  Adjtimex reads and optionally sets adjustment parameters for
 	  the Linux clock adjustment algorithm.
-
 config BUSYBOX_CONFIG_BBCONFIG
 	bool "bbconfig"
 	default BUSYBOX_DEFAULT_BBCONFIG
@@ -287,7 +33,6 @@ config BUSYBOX_CONFIG_FEATURE_COMPRESS_BBCONFIG
 	  be noticeable. Also, if you run executables directly from ROM
 	  and have very little memory, this might not be a win. Otherwise,
 	  you probably want this.
-
 config BUSYBOX_CONFIG_BEEP
 	bool "beep"
 	default BUSYBOX_DEFAULT_BEEP
@@ -310,7 +55,6 @@ config BUSYBOX_CONFIG_FEATURE_BEEP_LENGTH_MS
 	depends on BUSYBOX_CONFIG_BEEP
 	help
 	  Length in ms for default beep.
-
 config BUSYBOX_CONFIG_CHAT
 	bool "chat"
 	default BUSYBOX_DEFAULT_CHAT
@@ -377,14 +121,54 @@ config BUSYBOX_CONFIG_FEATURE_CHAT_CLR_ABORT
 	default BUSYBOX_DEFAULT_FEATURE_CHAT_CLR_ABORT
 	help
 	  Support CLR_ABORT directive.
-
 config BUSYBOX_CONFIG_CHRT
 	bool "chrt"
 	default BUSYBOX_DEFAULT_CHRT
 	help
 	  manipulate real-time attributes of a process.
 	  This requires sched_{g,s}etparam support in your libc.
+config BUSYBOX_CONFIG_CONSPY
+	bool "conspy"
+	default BUSYBOX_DEFAULT_CONSPY
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  A text-mode VNC like program for Linux virtual terminals.
+	  example:  conspy NUM      shared access to console num
+	  or        conspy -nd NUM  screenshot of console num
+	  or        conspy -cs NUM  poor man's GNU screen like
+config BUSYBOX_CONFIG_CROND
+	bool "crond"
+	default BUSYBOX_DEFAULT_CROND
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	  Crond is a background daemon that parses individual crontab
+	  files and executes commands on behalf of the users in question.
+	  This is a port of dcron from slackware. It uses files of the
+	  format /var/spool/cron/crontabs/<username> files, for example:
+	      $ cat /var/spool/cron/crontabs/root
+	      # Run daily cron jobs at 4:40 every day:
+	      40 4 * * * /etc/cron/daily > /dev/null 2>&1
 
+config BUSYBOX_CONFIG_FEATURE_CROND_D
+	bool "Support option -d to redirect output to stderr"
+	depends on BUSYBOX_CONFIG_CROND
+	default BUSYBOX_DEFAULT_FEATURE_CROND_D
+	help
+	  -d N sets loglevel (0:most verbose) and directs all output to stderr.
+
+config BUSYBOX_CONFIG_FEATURE_CROND_CALL_SENDMAIL
+	bool "Report command output via email (using sendmail)"
+	default BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL
+	depends on BUSYBOX_CONFIG_CROND
+	help
+	  Command output will be sent to corresponding user via email.
+
+config BUSYBOX_CONFIG_FEATURE_CROND_DIR
+	string "crond spool directory"
+	default BUSYBOX_DEFAULT_FEATURE_CROND_DIR
+	depends on BUSYBOX_CONFIG_CROND || BUSYBOX_CONFIG_CRONTAB
+	help
+	  Location of crond spool.
 config BUSYBOX_CONFIG_CRONTAB
 	bool "crontab"
 	default BUSYBOX_DEFAULT_CRONTAB
@@ -393,7 +177,6 @@ config BUSYBOX_CONFIG_CRONTAB
 	  the superuser may specify a different user and/or crontab directory.
 	  Note that Busybox binary must be setuid root for this applet to
 	  work properly.
-
 config BUSYBOX_CONFIG_DC
 	bool "dc"
 	default BUSYBOX_DEFAULT_DC
@@ -408,7 +191,6 @@ config BUSYBOX_CONFIG_FEATURE_DC_LIBM
 	help
 	  Enable power and exp functions.
 	  NOTE: This will require libm to be present for linking.
-
 config BUSYBOX_CONFIG_DEVFSD
 	bool "devfsd (obsolete)"
 	default BUSYBOX_DEFAULT_DEVFSD
@@ -465,14 +247,12 @@ config BUSYBOX_CONFIG_FEATURE_DEVFS
 	  tells busybox to look for names like /dev/loop/0 instead of
 	  /dev/loop0. If your /dev directory has normal names instead of
 	  devfs names, you don't want this.
-
 config BUSYBOX_CONFIG_DEVMEM
 	bool "devmem"
 	default BUSYBOX_DEFAULT_DEVMEM
 	help
 	  devmem is a small program that reads and writes from physical
 	  memory using /dev/mem.
-
 config BUSYBOX_CONFIG_EJECT
 	bool "eject"
 	default BUSYBOX_DEFAULT_EJECT
@@ -487,7 +267,6 @@ config BUSYBOX_CONFIG_FEATURE_EJECT_SCSI
 	help
 	  Add the -s option to eject, this allows to eject SCSI-Devices and
 	  usb-storage devices.
-
 config BUSYBOX_CONFIG_FBSPLASH
 	bool "fbsplash"
 	default BUSYBOX_DEFAULT_FBSPLASH
@@ -509,14 +288,12 @@ config BUSYBOX_CONFIG_FBSPLASH
 	  - commands for fifo:
 	    "NN" (ASCII decimal number) - percentage to show on progress bar
 	    "exit" - well you guessed it
-
-config BUSYBOX_CONFIG_FLASHCP
-	bool "flashcp"
-	default BUSYBOX_DEFAULT_FLASHCP  # doesn't build on Ubuntu 8.04
+config BUSYBOX_CONFIG_FLASH_ERASEALL
+	bool "flash_eraseall"
+	default BUSYBOX_DEFAULT_FLASH_ERASEALL  # doesn't build on Ubuntu 8.04
 	help
-	  The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
-	  This utility is used to copy images into a MTD device.
-
+	  The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
+	  This utility is used to erase the whole MTD device.
 config BUSYBOX_CONFIG_FLASH_LOCK
 	bool "flash_lock"
 	default BUSYBOX_DEFAULT_FLASH_LOCK  # doesn't build on Ubuntu 8.04
@@ -530,44 +307,12 @@ config BUSYBOX_CONFIG_FLASH_UNLOCK
 	help
 	  The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
 	  utility unlocks part or all of the flash device.
-
-config BUSYBOX_CONFIG_FLASH_ERASEALL
-	bool "flash_eraseall"
-	default BUSYBOX_DEFAULT_FLASH_ERASEALL  # doesn't build on Ubuntu 8.04
-	help
-	  The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
-	  This utility is used to erase the whole MTD device.
-
-config BUSYBOX_CONFIG_IONICE
-	bool "ionice"
-	default BUSYBOX_DEFAULT_IONICE
-	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Set/set program io scheduling class and priority
-	  Requires kernel >= 2.6.13
-
-config BUSYBOX_CONFIG_INOTIFYD
-	bool "inotifyd"
-	default BUSYBOX_DEFAULT_INOTIFYD  # doesn't build on Knoppix 5
-	help
-	  Simple inotify daemon. Reports filesystem changes. Requires
-	  kernel >= 2.6.13
-
-config BUSYBOX_CONFIG_LAST
-	bool "last"
-	default BUSYBOX_DEFAULT_LAST
-	depends on BUSYBOX_CONFIG_FEATURE_WTMP
-	help
-	  'last' displays a list of the last users that logged into the system.
-
-config BUSYBOX_CONFIG_FEATURE_LAST_FANCY
-	bool "Turn on output of extra information"
-	default BUSYBOX_DEFAULT_FEATURE_LAST_FANCY
-	depends on BUSYBOX_CONFIG_LAST
+config BUSYBOX_CONFIG_FLASHCP
+	bool "flashcp"
+	default BUSYBOX_DEFAULT_FLASHCP  # doesn't build on Ubuntu 8.04
 	help
-	  'last' displays detailed information about the last users that
-	  logged into the system (mimics sysvinit last). +900 bytes.
-
+	  The flashcp binary, inspired by mtd-utils as of git head 5eceb74f7.
+	  This utility is used to copy images into a MTD device.
 config BUSYBOX_CONFIG_HDPARM
 	bool "hdparm"
 	default BUSYBOX_DEFAULT_HDPARM
@@ -626,13 +371,149 @@ config BUSYBOX_CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA
 	depends on BUSYBOX_CONFIG_HDPARM
 	help
 	  Enables the 'hdparm -d' option to get/set using_dma flag.
+config BUSYBOX_CONFIG_I2CGET
+	bool "i2cget"
+	default BUSYBOX_DEFAULT_I2CGET
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Read from I2C/SMBus chip registers.
+
+config BUSYBOX_CONFIG_I2CSET
+	bool "i2cset"
+	default BUSYBOX_DEFAULT_I2CSET
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Set I2C registers.
+
+config BUSYBOX_CONFIG_I2CDUMP
+	bool "i2cdump"
+	default BUSYBOX_DEFAULT_I2CDUMP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Examine I2C registers.
+
+config BUSYBOX_CONFIG_I2CDETECT
+	bool "i2cdetect"
+	default BUSYBOX_DEFAULT_I2CDETECT
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Detect I2C chips.
+
+config BUSYBOX_CONFIG_INOTIFYD
+	bool "inotifyd"
+	default BUSYBOX_DEFAULT_INOTIFYD  # doesn't build on Knoppix 5
+	help
+	  Simple inotify daemon. Reports filesystem changes. Requires
+	  kernel >= 2.6.13
+config BUSYBOX_CONFIG_IONICE
+	bool "ionice"
+	default BUSYBOX_DEFAULT_IONICE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Set/set program io scheduling class and priority
+	  Requires kernel >= 2.6.13
+config BUSYBOX_CONFIG_LAST
+	bool "last"
+	default BUSYBOX_DEFAULT_LAST
+	depends on BUSYBOX_CONFIG_FEATURE_WTMP
+	help
+	  'last' displays a list of the last users that logged into the system.
+
+config BUSYBOX_CONFIG_FEATURE_LAST_FANCY
+	bool "Turn on output of extra information"
+	default BUSYBOX_DEFAULT_FEATURE_LAST_FANCY
+	depends on BUSYBOX_CONFIG_LAST
+	help
+	  'last' displays detailed information about the last users that
+	  logged into the system (mimics sysvinit last). +900 bytes.
+config BUSYBOX_CONFIG_LESS
+	bool "less"
+	default BUSYBOX_DEFAULT_LESS
+	help
+	  'less' is a pager, meaning that it displays text files. It possesses
+	  a wide array of features, and is an improvement over 'more'.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_MAXLINES
+	int "Max number of input lines less will try to eat"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_MAXLINES
+	depends on BUSYBOX_CONFIG_LESS
+
+config BUSYBOX_CONFIG_FEATURE_LESS_BRACKETS
+	bool "Enable bracket searching"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_BRACKETS
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  This option adds the capability to search for matching left and right
+	  brackets, facilitating programming.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_FLAGS
+	bool "Enable -m/-M"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_FLAGS
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  The -M/-m flag enables a more sophisticated status line.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_TRUNCATE
+	bool "Enable -S"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_TRUNCATE
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  The -S flag causes long lines to be truncated rather than
+	  wrapped.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_MARKS
+	bool "Enable marks"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_MARKS
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  Marks enable positions in a file to be stored for easy reference.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_REGEXP
+	bool "Enable regular expressions"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_REGEXP
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  Enable regular expressions, allowing complex file searches.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_WINCH
+	bool "Enable automatic resizing on window size changes"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_WINCH
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  Makes less track window size changes.
+
+config BUSYBOX_CONFIG_FEATURE_LESS_ASK_TERMINAL
+	bool "Use 'tell me cursor position' ESC sequence to measure window"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_ASK_TERMINAL
+	depends on BUSYBOX_CONFIG_FEATURE_LESS_WINCH
+	help
+	  Makes less track window size changes.
+	  If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+	  this option makes less perform a last-ditch effort to find it:
+	  position cursor to 999,999 and ask terminal to report real
+	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
+
+	  This is not clean but helps a lot on serial lines and such.
 
+config BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
+	bool "Enable flag changes ('-' command)"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_DASHCMD
+	depends on BUSYBOX_CONFIG_LESS
+	help
+	  This enables the ability to change command-line flags within
+	  less itself ('-' keyboard command).
+
+config BUSYBOX_CONFIG_FEATURE_LESS_LINENUMS
+	bool "Enable dynamic switching of line numbers"
+	default BUSYBOX_DEFAULT_FEATURE_LESS_LINENUMS
+	depends on BUSYBOX_CONFIG_FEATURE_LESS_DASHCMD
+	help
+	  Enables "-N" command.
 config BUSYBOX_CONFIG_LOCK
 	bool "lock"
 	default BUSYBOX_DEFAULT_LOCK
 	help
 	  Small utility for using locks in scripts
-
 config BUSYBOX_CONFIG_MAKEDEVS
 	bool "makedevs"
 	default BUSYBOX_DEFAULT_MAKEDEVS
@@ -664,25 +545,21 @@ config BUSYBOX_CONFIG_FEATURE_MAKEDEVS_TABLE
 	bool "table"
 
 endchoice
-
 config BUSYBOX_CONFIG_MAN
 	bool "man"
 	default BUSYBOX_DEFAULT_MAN
 	help
 	  Format and display manual pages.
-
 config BUSYBOX_CONFIG_MICROCOM
 	bool "microcom"
 	default BUSYBOX_DEFAULT_MICROCOM
 	help
 	  The poor man's minicom utility for chatting with serial port devices.
-
 config BUSYBOX_CONFIG_MOUNTPOINT
 	bool "mountpoint"
 	default BUSYBOX_DEFAULT_MOUNTPOINT
 	help
 	  mountpoint checks if the directory is a mountpoint.
-
 config BUSYBOX_CONFIG_MT
 	bool "mt"
 	default BUSYBOX_DEFAULT_MT
@@ -690,7 +567,19 @@ config BUSYBOX_CONFIG_MT
 	  mt is used to control tape devices. You can use the mt utility
 	  to advance or rewind a tape past a specified number of archive
 	  files on the tape.
+config BUSYBOX_CONFIG_NANDWRITE
+	bool "nandwrite"
+	default BUSYBOX_DEFAULT_NANDWRITE
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Write to the specified MTD device, with bad blocks awareness
 
+config BUSYBOX_CONFIG_NANDDUMP
+	bool "nanddump"
+	default BUSYBOX_DEFAULT_NANDDUMP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Dump the content of raw NAND chip
 config BUSYBOX_CONFIG_RAIDAUTORUN
 	bool "raidautorun"
 	default BUSYBOX_DEFAULT_RAIDAUTORUN
@@ -698,7 +587,6 @@ config BUSYBOX_CONFIG_RAIDAUTORUN
 	help
 	  raidautorun tells the kernel md driver to
 	  search and start RAID arrays.
-
 config BUSYBOX_CONFIG_READAHEAD
 	bool "readahead"
 	default BUSYBOX_DEFAULT_READAHEAD
@@ -716,6 +604,17 @@ config BUSYBOX_CONFIG_READAHEAD
 
 	  As readahead(2) blocks until each file has been read, it is best to
 	  run this applet as a background job.
+config BUSYBOX_CONFIG_RFKILL
+	bool "rfkill"
+	default BUSYBOX_DEFAULT_RFKILL # doesn't build on Ubuntu 9.04
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Enable/disable wireless devices.
+
+	  rfkill list : list all wireless devices
+	  rfkill list bluetooth : list all bluetooth devices
+	  rfkill list 1 : list device corresponding to the given index
+	  rfkill block|unblock wlan : block/unblock all wlan(wifi) devices
 
 config BUSYBOX_CONFIG_RUNLEVEL
 	bool "runlevel"
@@ -726,27 +625,44 @@ config BUSYBOX_CONFIG_RUNLEVEL
 
 	  This applet uses utmp but does not rely on busybox supporing
 	  utmp on purpose. It is used by e.g. emdebian via /etc/init.d/rc.
-
 config BUSYBOX_CONFIG_RX
 	bool "rx"
 	default BUSYBOX_DEFAULT_RX
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	  Receive files using the Xmodem protocol.
-
+config BUSYBOX_CONFIG_SETSERIAL
+	bool "setserial"
+	default BUSYBOX_DEFAULT_SETSERIAL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Retrieve or set Linux serial port.
 config BUSYBOX_CONFIG_SETSID
 	bool "setsid"
 	default BUSYBOX_DEFAULT_SETSID
 	help
 	  setsid runs a program in a new session
-
 config BUSYBOX_CONFIG_STRINGS
 	bool "strings"
 	default BUSYBOX_DEFAULT_STRINGS
 	help
 	  strings prints the printable character sequences for each file
 	  specified.
+config BUSYBOX_CONFIG_TASKSET
+	bool "taskset"
+	default BUSYBOX_DEFAULT_TASKSET  # doesn't build on some non-x86 targets (m68k)
+	help
+	  Retrieve or set a processes's CPU affinity.
+	  This requires sched_{g,s}etaffinity support in your libc.
 
+config BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY
+	bool "Fancy output"
+	default BUSYBOX_DEFAULT_FEATURE_TASKSET_FANCY
+	depends on BUSYBOX_CONFIG_TASKSET
+	help
+	  Add code for fancy output. This merely silences a compiler-warning
+	  and adds about 135 Bytes. May be needed for machines with alot
+	  of CPUs.
 config BUSYBOX_CONFIG_TIME
 	bool "time"
 	default BUSYBOX_DEFAULT_TIME
@@ -754,14 +670,12 @@ config BUSYBOX_CONFIG_TIME
 	  The time command runs the specified program with the given arguments.
 	  When the command finishes, time writes a message to standard output
 	  giving timing statistics about this program run.
-
 config BUSYBOX_CONFIG_TIMEOUT
 	bool "timeout"
 	default BUSYBOX_DEFAULT_TIMEOUT
 	help
 	  Runs a program and watches it. If it does not terminate in
 	  specified number of seconds, it is sent a signal.
-
 config BUSYBOX_CONFIG_TTYSIZE
 	bool "ttysize"
 	default BUSYBOX_DEFAULT_TTYSIZE
@@ -770,13 +684,64 @@ config BUSYBOX_CONFIG_TTYSIZE
 	  only height, or both, in any order. It also does not complain on
 	  error, but returns default 80x24.
 	  Usage in shell scripts: width=`ttysize w`.
+config BUSYBOX_CONFIG_UBIATTACH
+	bool "ubiattach"
+	default BUSYBOX_DEFAULT_UBIATTACH
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Attach MTD device to an UBI device.
 
+config BUSYBOX_CONFIG_UBIDETACH
+	bool "ubidetach"
+	default BUSYBOX_DEFAULT_UBIDETACH
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Detach MTD device from an UBI device.
+
+config BUSYBOX_CONFIG_UBIMKVOL
+	bool "ubimkvol"
+	default BUSYBOX_DEFAULT_UBIMKVOL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Create a UBI volume.
+
+config BUSYBOX_CONFIG_UBIRMVOL
+	bool "ubirmvol"
+	default BUSYBOX_DEFAULT_UBIRMVOL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Delete a UBI volume.
+
+config BUSYBOX_CONFIG_UBIRSVOL
+	bool "ubirsvol"
+	default BUSYBOX_DEFAULT_UBIRSVOL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Resize a UBI volume.
+
+config BUSYBOX_CONFIG_UBIUPDATEVOL
+	bool "ubiupdatevol"
+	default BUSYBOX_DEFAULT_UBIUPDATEVOL
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Update a UBI volume.
+config BUSYBOX_CONFIG_UBIRENAME
+	bool "ubirename"
+	default BUSYBOX_DEFAULT_UBIRENAME
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
+	help
+	  Utility to rename UBI volumes
 config BUSYBOX_CONFIG_VOLNAME
 	bool "volname"
 	default BUSYBOX_DEFAULT_VOLNAME
 	help
 	  Prints a CD-ROM volume name.
-
+config BUSYBOX_CONFIG_WALL
+	bool "wall"
+	default BUSYBOX_DEFAULT_WALL
+	depends on BUSYBOX_CONFIG_FEATURE_UTMP
+	help
+	  Write a message to all users that are logged in.
 config BUSYBOX_CONFIG_WATCHDOG
 	bool "watchdog"
 	default BUSYBOX_DEFAULT_WATCHDOG