update busybox to latest upstream

6 files changed, 73 insertions, 11 deletions

diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index 6393c1c14..8c1eeb317 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -13,12 +13,14 @@ config BUSYBOX_BASENAME
 	  basename is used to strip the directory and suffix from filenames,
 	  leaving just the filename itself. Enable this option if you wish
 	  to enable the 'basename' utility.
+
 config BUSYBOX_CAT
 	bool "cat"
 	default y
 	help
 	  cat is used to concatenate files and print them to the standard
 	  output. Enable this option if you wish to enable the 'cat' utility.
+
 config BUSYBOX_DATE
 	bool "date"
 	default y
@@ -651,6 +653,12 @@ config BUSYBOX_SHA512SUM
 	help
 	  Compute and check SHA512 message digest
 
+config BUSYBOX_SHA3SUM
+       bool "sha3sum"
+       default y
+       help
+         Compute and check SHA3 (512-bit) message digest
+
 config BUSYBOX_SLEEP
 	bool "sleep"
 	default y
@@ -903,13 +911,13 @@ config BUSYBOX_FEATURE_HUMAN_READABLE
 	help
 	  Allow df, du, and ls to have human readable output.
 
-comment "Common options for md5sum, sha1sum, sha256sum, sha512sum"
-	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM
+comment "Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum"
+	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
 
 config BUSYBOX_FEATURE_MD5_SHA1_SUM_CHECK
 	bool "Enable -c, -s and -w options"
 	default y
-	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM
+	depends on BUSYBOX_MD5SUM || BUSYBOX_SHA1SUM || BUSYBOX_SHA256SUM || BUSYBOX_SHA512SUM || BUSYBOX_SHA3SUM
 	help
 	  Enabling the -c options allows files to be checked
 	  against pre-calculated hash values.
diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index 21aaa090d..cb16bbe34 100644
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -129,14 +129,6 @@ config BUSYBOX_FEATURE_VI_ASK_TERMINAL
 
 	  This is not clean but helps a lot on serial lines and such.
 
-config BUSYBOX_FEATURE_VI_OPTIMIZE_CURSOR
-	bool "Optimize cursor movement"
-	default y
-	depends on BUSYBOX_VI
-	help
-	  This will make the cursor movement faster, but requires more memory
-	  and it makes the applet a tiny bit larger.
-
 config BUSYBOX_AWK
 	bool "awk"
 	default y
diff --git a/package/busybox/config/libbb/Config.in b/package/busybox/config/libbb/Config.in
index ff06540cc..9205677e2 100644
--- a/package/busybox/config/libbb/Config.in
+++ b/package/busybox/config/libbb/Config.in
@@ -14,6 +14,7 @@ config BUSYBOX_FEATURE_SYSTEMD
 	  are controlled by systemd, enable this option.
 	  If you don't use systemd, it is still safe to enable it,
 	  but the downside is increased code size.
+
 config BUSYBOX_FEATURE_RTMINMAX
 	bool "Support RTMIN[+n] and RTMAX[-n] signal names"
 	default y
@@ -42,6 +43,16 @@ config BUSYBOX_MD5_SMALL
 	  2                   3.0                5088
 	  3 (smallest)        5.1                4912
 
+config BUSYBOX_SHA3_SMALL
+       int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
+       default 1
+       range 0 1
+       help
+         Trade binary size versus speed for the sha3sum algorithm.
+         SHA3_SMALL=0 compared to SHA3_SMALL=1 (approximate):
+         64-bit x86: +270 bytes of code, 45% faster
+         32-bit x86: +450 bytes of code, 75% faster
+
 config BUSYBOX_FEATURE_FAST_TOP
 	bool "Faster /proc scanning code (+100 bytes)"
 	default y
diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in
index 66d18a0f9..b63391bb3 100644
--- a/package/busybox/config/procps/Config.in
+++ b/package/busybox/config/procps/Config.in
@@ -11,48 +11,57 @@ config BUSYBOX_IOSTAT
 	default y
 	help
 	  Report CPU and I/O statistics
+
 config BUSYBOX_LSOF
 	bool "lsof"
 	default y
 	help
 	  Show open files in the format of:
 	  PID <TAB> /path/to/executable <TAB> /path/to/opened/file
+
 config BUSYBOX_MPSTAT
 	bool "mpstat"
 	default n
 	help
 	  Per-processor statistics
+
 config BUSYBOX_NMETER
 	bool "nmeter"
 	default n
 	help
 	  Prints selected system stats continuously, one line per update.
+
 config BUSYBOX_PMAP
        bool "pmap"
        default y
        help
          Display processes' memory mappings.
+
 config BUSYBOX_POWERTOP
 	bool "powertop"
 	default n
 	help
 	  Analyze power consumption on Intel-based laptops
+
 config BUSYBOX_PSTREE
 	bool "pstree"
 	default y
 	help
 	  Display a tree of processes.
+
 config BUSYBOX_PWDX
 	bool "pwdx"
 	default n
 	help
 	  Report current working directory of a process
+
 config BUSYBOX_SMEMCAP
 	bool "smemcap"
 	default n
 	help
 	  smemcap is a tool for capturing process data for smem,
 	  a memory usage statistic tool.
+
 config BUSYBOX_UPTIME
 	bool "uptime"
 	default y
diff --git a/package/busybox/config/sysklogd/Config.in b/package/busybox/config/sysklogd/Config.in
index 8d999c8e9..6df10efde 100644
--- a/package/busybox/config/sysklogd/Config.in
+++ b/package/busybox/config/sysklogd/Config.in
@@ -92,6 +92,19 @@ config BUSYBOX_FEATURE_IPC_SYSLOG_BUFFER_SIZE
 	  This option sets the size of the circular buffer
 	  used to record system log messages.
 
+config BUSYBOX_FEATURE_KMSG_SYSLOG
+       bool "Linux kernel printk buffer support"
+       default n
+       depends on BUSYBOX_SYSLOGD
+       select BUSYBOX_PLATFORM_LINUX
+       help
+         When you enable this feature, the syslogd utility will
+         write system log message to the Linux kernel's printk buffer.
+         This can be used as a smaller alternative to the syslogd IPC
+         support, as klogd and logread aren't needed.
+
+         NOTICE: Syslog facilities in log entries needs kernel 3.5+.
+
 config BUSYBOX_LOGREAD
 	bool "logread"
 	default y
@@ -123,6 +136,9 @@ config BUSYBOX_KLOGD
 	  you wish to record the messages produced by the kernel,
 	  you should enable this option.
 
+comment "klogd should not be used together with syslog to kernel printk buffer"
+       depends on BUSYBOX_KLOGD && BUSYBOX_FEATURE_KMSG_SYSLOG
+
 config BUSYBOX_FEATURE_KLOGD_KLOGCTL
 	bool "Use the klogctl() interface"
 	default y
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index c3c297492..baf6beb26 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -806,6 +806,15 @@ config BUSYBOX_FEATURE_VOLUMEID_FAT
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_EXFAT
+       bool "exFAT filesystem"
+       default y
+       depends on BUSYBOX_VOLUMEID
+       help
+         exFAT (extended FAT) is a proprietary file system designed especially
+         for flash drives. It has many features from NTFS, but with less
+         overhead. exFAT is used on most SDXC cards for consumer electronics.
+
 config BUSYBOX_FEATURE_VOLUMEID_HFS
 	bool "hfs filesystem"
 	default y
@@ -813,6 +822,13 @@ config BUSYBOX_FEATURE_VOLUMEID_HFS
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_NILFS
+       bool "nilfs filesystem"
+       default y
+       depends on BUSYBOX_VOLUMEID
+       help
+         TODO
+
 config BUSYBOX_FEATURE_VOLUMEID_JFS
 	bool "jfs filesystem"
 	default y
@@ -897,6 +913,16 @@ config BUSYBOX_FEATURE_VOLUMEID_ROMFS
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_SQUASHFS
+       bool "SquashFS filesystem"
+       default y
+       depends on BUSYBOX_VOLUMEID && BUSYBOX_FEATURE_BLKID_TYPE
+       help
+         Squashfs is a compressed read-only filesystem for Linux. Squashfs is
+         intended for general read-only filesystem use and in constrained block
+         device/memory systems (e.g. embedded systems) where low overhead is
+         needed.
+
 config BUSYBOX_FEATURE_VOLUMEID_SYSV
 	bool "sysv filesystem"
 	default y