busybox: version bump 1.20.2 -> 1.21.0

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

19 files changed, 145 insertions, 317 deletions

diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index c5ad60002..8cf459da7 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -310,7 +310,18 @@ config BUSYBOX_FEATURE_PIDFILE
 	default y
 	help
 	  This option makes some applets (e.g. crond, syslogd, inetd) write
-	  a pidfile in /var/run. Some applications rely on them.
+	  a pidfile at the configured PID_FILE_PATH.  It has no effect
+	  on applets which require pidfiles to run.
+
+config BUSYBOX_PID_FILE_PATH
+	string "Path to directory for pidfile"
+	default "/var/run"
+	depends on BUSYBOX_FEATURE_PIDFILE
+	help
+	  This is the default path where pidfiles are created.  Applets which
+	  allow you to set the pidfile path on the command line will override
+	  this value.  The option has no effect on applets that require you to
+	  specify a pidfile path.
 
 config BUSYBOX_FEATURE_SUID
 	bool "Support for SUID/SGID handling"
@@ -321,7 +332,7 @@ config BUSYBOX_FEATURE_SUID
 	  root-level operations even when run by ordinary users
 	  (for example, mounting of user mounts in fstab needs this).
 
-	  Busybox will automatically drop priviledges for applets
+	  Busybox will automatically drop privileges for applets
 	  that don't need root access.
 
 	  If you are really paranoid and don't want to do this, build two
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index 6393c1c14..36e51e043 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -651,6 +651,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 +909,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/config/busybox/editors/Config.in b/config/busybox/editors/Config.in
index 39a1e0cc8..a3840d4a2 100644
--- a/config/busybox/editors/Config.in
+++ b/config/busybox/editors/Config.in
@@ -127,14 +127,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/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
index 032d746b1..cfa483935 100644
--- a/config/busybox/libbb/Config.in
+++ b/config/busybox/libbb/Config.in
@@ -42,6 +42,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/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index f62356774..7e6cc25fe 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -175,12 +175,12 @@ config BUSYBOX_FEATURE_BRCTL_FANCY
 	  This adds about 600 bytes.
 
 config BUSYBOX_FEATURE_BRCTL_SHOW
-	bool "Support show, showmac and showstp"
+	bool "Support show"
 	default y
 	depends on BUSYBOX_BRCTL && BUSYBOX_FEATURE_BRCTL_FANCY
 	help
 	  Add support for option which prints the current config:
-	    showmacs, showstp, show
+	    show
 
 config BUSYBOX_DNSD
 	bool "dnsd"
@@ -1038,8 +1038,8 @@ config BUSYBOX_WGET
 	bool "wget"
 	default y
 	help
-	  wget is a utility for non-interactive download of files from HTTP,
-	  HTTPS, and FTP servers.
+	  wget is a utility for non-interactive download of files from HTTP
+	  and FTP servers.
 
 config BUSYBOX_FEATURE_WGET_STATUSBAR
 	bool "Enable a nifty process meter (+2k)"
diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in
index 6ece73097..58a7d48d5 100644
--- a/config/busybox/networking/udhcp/Config.in
+++ b/config/busybox/networking/udhcp/Config.in
@@ -5,10 +5,11 @@
 #
 
 config BUSYBOX_UDHCPC6
-       bool "udhcp client for DHCPv6 (udhcpc6)"
-       default n  # not yet ready
-       help
-         udhcpc6 is a DHCPv6 client
+	bool "udhcp client for DHCPv6 (udhcpc6)"
+	default n  # not yet ready
+	depends on BUSYBOX_FEATURE_IPV6
+	help
+	  udhcpc6 is a DHCPv6 client
 
 config BUSYBOX_UDHCPD
 	bool "udhcp server (udhcpd)"
diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
index 2e11bd0ef..56b915059 100644
--- a/config/busybox/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -53,6 +53,59 @@ config BUSYBOX_SMEMCAP
 	help
 	  smemcap is a tool for capturing process data for smem,
 	  a memory usage statistic tool.
+config BUSYBOX_TOP
+	bool "top"
+	default y
+	help
+	  The top program provides a dynamic real-time view of a running
+	  system.
+
+config BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	bool "Show CPU per-process usage percentage"
+	default y
+	depends on BUSYBOX_TOP
+	help
+	  Make top display CPU usage for each process.
+	  This adds about 2k.
+
+config BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+	bool "Show CPU global usage percentage"
+	default y
+	depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	help
+	  Makes top display "CPU: NN% usr NN% sys..." line.
+	  This adds about 0.5k.
+
+config BUSYBOX_FEATURE_TOP_SMP_CPU
+	bool "SMP CPU usage display ('c' key)"
+	default y
+	depends on BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+	help
+	  Allow 'c' key to switch between individual/cumulative CPU stats
+	  This adds about 0.5k.
+
+config BUSYBOX_FEATURE_TOP_DECIMALS
+	bool "Show 1/10th of a percent in CPU/mem statistics"
+	default y
+	depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+	help
+	  Show 1/10th of a percent in CPU/mem statistics.
+	  This adds about 0.3k.
+
+config BUSYBOX_FEATURE_TOP_SMP_PROCESS
+	bool "Show CPU process runs on ('j' field)"
+	default y
+	depends on BUSYBOX_TOP
+	help
+	  Show CPU where process was last found running on.
+	  This is the 'j' field.
+
+config BUSYBOX_FEATURE_TOPMEM
+	bool "Topmem command ('s' key)"
+	default y
+	depends on BUSYBOX_TOP
+	help
+	  Enable 's' in top (gives lots of memory info).
 config BUSYBOX_UPTIME
 	bool "uptime"
 	default y
@@ -202,60 +255,6 @@ config BUSYBOX_BB_SYSCTL
 	help
 	  Configure kernel parameters at runtime.
 
-config BUSYBOX_TOP
-	bool "top"
-	default y
-	help
-	  The top program provides a dynamic real-time view of a running
-	  system.
-
-config BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
-	bool "Show CPU per-process usage percentage"
-	default y
-	depends on BUSYBOX_TOP
-	help
-	  Make top display CPU usage for each process.
-	  This adds about 2k.
-
-config BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
-	bool "Show CPU global usage percentage"
-	default y
-	depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
-	help
-	  Makes top display "CPU: NN% usr NN% sys..." line.
-	  This adds about 0.5k.
-
-config BUSYBOX_FEATURE_TOP_SMP_CPU
-	bool "SMP CPU usage display ('c' key)"
-	default y
-	depends on BUSYBOX_FEATURE_TOP_CPU_GLOBAL_PERCENTS
-	help
-	  Allow 'c' key to switch between individual/cumulative CPU stats
-	  This adds about 0.5k.
-
-config BUSYBOX_FEATURE_TOP_DECIMALS
-	bool "Show 1/10th of a percent in CPU/mem statistics"
-	default y
-	depends on BUSYBOX_FEATURE_TOP_CPU_USAGE_PERCENTAGE
-	help
-	  Show 1/10th of a percent in CPU/mem statistics.
-	  This adds about 0.3k.
-
-config BUSYBOX_FEATURE_TOP_SMP_PROCESS
-	bool "Show CPU process runs on ('j' field)"
-	default y
-	depends on BUSYBOX_TOP
-	help
-	  Show CPU where process was last found running on.
-	  This is the 'j' field.
-
-config BUSYBOX_FEATURE_TOPMEM
-	bool "Topmem command ('s' key)"
-	default y
-	depends on BUSYBOX_TOP
-	help
-	  Enable 's' in top (gives lots of memory info).
-
 config BUSYBOX_FEATURE_SHOW_THREADS
 	bool "Support for showing threads in ps/pstree/top"
 	default y
diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in
index 13c9dce2c..e6e9cbb30 100644
--- a/config/busybox/sysklogd/Config.in
+++ b/config/busybox/sysklogd/Config.in
@@ -113,6 +113,19 @@ config BUSYBOX_FEATURE_LOGREAD_REDUCED_LOCKING
 	  from circular buffer, minimizing semaphore
 	  contention at some minor memory expense.
 
+config BUSYBOX_FEATURE_KMSG_SYSLOG
+	bool "Linux kernel printk buffer support"
+	default y
+	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_KLOGD
 	bool "klogd"
 	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/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index e865b6b0c..87d7d3c3f 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -801,6 +801,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
@@ -829,6 +838,13 @@ config BUSYBOX_FEATURE_VOLUMEID_XFS
 	help
 	  TODO
 
+config BUSYBOX_FEATURE_VOLUMEID_NILFS
+	bool "nilfs filesystem"
+	default y
+	depends on BUSYBOX_VOLUMEID
+	help
+	  TODO
+
 config BUSYBOX_FEATURE_VOLUMEID_NTFS
 	bool "ntfs filesystem"
 	default y
@@ -892,6 +908,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
diff --git a/patches/busybox-1.20.2/0001-include-sys-resource.h-where-needed.patch b/patches/busybox-1.20.2/0001-include-sys-resource.h-where-needed.patch
deleted file mode 100644
index 1f9431fd2..000000000
--- a/patches/busybox-1.20.2/0001-include-sys-resource.h-where-needed.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 5 Jul 2012 23:19:09 -0400
-Subject: [PATCH] include sys/resource.h where needed
-
-We use functions from sys/resource.h in misc applets, but don't include
-the header.  This breaks building with newer glibc versions, so add the
-include where needed.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- loginutils/passwd.c      |    1 +
- miscutils/time.c         |    1 +
- networking/inetd.c       |    1 +
- networking/ntpd.c        |    1 +
- networking/ntpd_simple.c |    1 +
- runit/chpst.c            |    1 +
- shell/shell_common.c     |    1 +
- 7 files changed, 7 insertions(+)
-
-diff --git a/loginutils/passwd.c b/loginutils/passwd.c
-index b83db00..a7006f0 100644
---- a/loginutils/passwd.c
-+++ b/loginutils/passwd.c
-@@ -15,6 +15,7 @@
- 
- #include "libbb.h"
- #include <syslog.h>
-+#include <sys/resource.h> /* setrlimit */
- 
- static void nuke_str(char *str)
- {
-diff --git a/miscutils/time.c b/miscutils/time.c
-index 945f15f..ffed386 100644
---- a/miscutils/time.c
-+++ b/miscutils/time.c
-@@ -16,6 +16,7 @@
- //usage:     "\n	-v	Verbose"
- 
- #include "libbb.h"
-+#include <sys/resource.h> /* getrusage */
- 
- /* Information on the resources used by a child process.  */
- typedef struct {
-diff --git a/networking/inetd.c b/networking/inetd.c
-index 26b6699..a872ee7 100644
---- a/networking/inetd.c
-+++ b/networking/inetd.c
-@@ -165,6 +165,7 @@
- //usage:     "\n		(default: 0 - disabled)"
- 
- #include <syslog.h>
-+#include <sys/resource.h> /* setrlimit */
- #include <sys/un.h>
- 
- #include "libbb.h"
-diff --git a/networking/ntpd.c b/networking/ntpd.c
-index 603801e..b885215 100644
---- a/networking/ntpd.c
-+++ b/networking/ntpd.c
-@@ -46,6 +46,7 @@
- #include "libbb.h"
- #include <math.h>
- #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
-+#include <sys/resource.h> /* setpriority */
- #include <sys/timex.h>
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
-diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
-index 4ad44e4..1b7c66b 100644
---- a/networking/ntpd_simple.c
-+++ b/networking/ntpd_simple.c
-@@ -7,6 +7,7 @@
-  */
- #include "libbb.h"
- #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
-+#include <sys/resource.h> /* setpriority */
- #ifndef IPTOS_LOWDELAY
- # define IPTOS_LOWDELAY 0x10
- #endif
-diff --git a/runit/chpst.c b/runit/chpst.c
-index ac296ba..ed72c8b 100644
---- a/runit/chpst.c
-+++ b/runit/chpst.c
-@@ -91,6 +91,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- //usage:     "\n			a SIGXCPU after N seconds"
- 
- #include "libbb.h"
-+#include <sys/resource.h> /* getrlimit */
- 
- /*
- Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.
-diff --git a/shell/shell_common.c b/shell/shell_common.c
-index 51c92d6..780e27e 100644
---- a/shell/shell_common.c
-+++ b/shell/shell_common.c
-@@ -18,6 +18,7 @@
-  */
- #include "libbb.h"
- #include "shell_common.h"
-+#include <sys/resource.h> /* getrlimit */
- 
- const char defifsvar[] ALIGN1 = "IFS= \t\n";
- 
diff --git a/patches/busybox-1.20.2/0002-build-system-use-pkg-config-to-look-up-selinux-libs.patch b/patches/busybox-1.20.2/0002-build-system-use-pkg-config-to-look-up-selinux-libs.patch
deleted file mode 100644
index 6dd977d2c..000000000
--- a/patches/busybox-1.20.2/0002-build-system-use-pkg-config-to-look-up-selinux-libs.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sat, 20 Oct 2012 15:01:26 -0400
-Subject: [PATCH] build system: use pkg-config to look up selinux libs
-
-Newer versions of libselinux has started linking against more libs.
-Rather than continuing hardcoding things, switch to using pkg-config
-to query for its dependencies.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- Makefile       |    1 +
- Makefile.flags |   12 +++++++++++-
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index fccde4a..3a0a5e1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -297,6 +297,7 @@ NM		= $(CROSS_COMPILE)nm
- STRIP		= $(CROSS_COMPILE)strip
- OBJCOPY		= $(CROSS_COMPILE)objcopy
- OBJDUMP		= $(CROSS_COMPILE)objdump
-+PKG_CONFIG	?= $(CROSS_COMPILE)pkg-config
- AWK		= awk
- GENKSYMS	= scripts/genksyms/genksyms
- DEPMOD		= /sbin/depmod
-diff --git a/Makefile.flags b/Makefile.flags
-index c43c8dc..15dcc1f 100644
---- a/Makefile.flags
-+++ b/Makefile.flags
-@@ -74,6 +74,12 @@ ARCH_FPIC ?= -fpic
- ARCH_FPIE ?= -fpie
- ARCH_PIE ?= -pie
- 
-+# Usage: $(eval $(call pkg_check_modules,VARIABLE-PREFIX,MODULES))
-+define pkg_check_modules
-+$(1)_CFLAGS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --cflags $(2))
-+$(1)_LIBS := $(shell $(PKG_CONFIG) $(PKG_CONFIG_FLAGS) --libs $(2))
-+endef
-+
- ifeq ($(CONFIG_BUILD_LIBBUSYBOX),y)
- # on i386: 14% smaller libbusybox.so
- # (code itself is 9% bigger, we save on relocs/PLT/GOT)
-@@ -85,6 +91,7 @@ endif
- 
- ifeq ($(CONFIG_STATIC),y)
- CFLAGS_busybox += -static
-+PKG_CONFIG_FLAGS += --static
- endif
- 
- ifeq ($(CONFIG_PIE),y)
-@@ -127,7 +134,10 @@ LDLIBS += pam pam_misc pthread
- endif
- 
- ifeq ($(CONFIG_SELINUX),y)
--LDLIBS += selinux sepol
-+SELINUX_PC_MODULES = libselinux libsepol
-+$(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
-+CPPFLAGS += $(SELINUX_CFLAGS)
-+LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%))
- endif
- 
- ifeq ($(CONFIG_EFENCE),y)
diff --git a/patches/busybox-1.20.2/0100-Fix-compilation-on-Darwin.patch b/patches/busybox-1.20.2/0100-Fix-compilation-on-Darwin.patch
deleted file mode 100644
index a6a6d7808..000000000
--- a/patches/busybox-1.20.2/0100-Fix-compilation-on-Darwin.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Bernhard Walle <bernhard@bwalle.de>
-Date: Wed, 13 Jun 2012 21:44:46 +0200
-Subject: [PATCH] Fix compilation on Darwin
-
-Upstream commit b83c9704128dd106071184e4b00335a3b8486857 [1] broke it.
-
-Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
-
-[1] http://git.busybox.net/busybox/commit/?id=b83c9704128dd106071184e4b00335a3b8486857
----
- scripts/kconfig/mconf.c |    1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
-index d3f69f8..322fc89 100644
---- a/scripts/kconfig/mconf.c
-+++ b/scripts/kconfig/mconf.c
-@@ -9,6 +9,7 @@
-  */
- 
- #define _XOPEN_SOURCE 700
-+#define _DARWIN_C_SOURCE /* for SIGWINCH */
- 
- #include <sys/ioctl.h>
- #include <sys/wait.h>
diff --git a/patches/busybox-1.20.2/0101-get_linux_version_code-don-t-fail-on-Linux-version-s.patch b/patches/busybox-1.20.2/0101-get_linux_version_code-don-t-fail-on-Linux-version-s.patch
deleted file mode 100644
index dca55058c..000000000
--- a/patches/busybox-1.20.2/0101-get_linux_version_code-don-t-fail-on-Linux-version-s.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Andreas Oberritter <obi@opendreambox.org>
-Date: Sat, 5 May 2012 17:47:23 +0200
-Subject: [PATCH] get_linux_version_code: don't fail on Linux version strints
- like "3.0-foo"
-
-Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- libbb/kernel_version.c |   11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
-index a168a1e..738ed02 100644
---- a/libbb/kernel_version.c
-+++ b/libbb/kernel_version.c
-@@ -20,18 +20,15 @@
- int FAST_FUNC get_linux_version_code(void)
- {
- 	struct utsname name;
--	char *s;
-+	char *s, *t;
- 	int i, r;
- 
--	if (uname(&name) == -1) {
--		bb_perror_msg("can't get system information");
--		return 0;
--	}
--
-+	uname(&name); /* never fails */
- 	s = name.release;
- 	r = 0;
- 	for (i = 0; i < 3; i++) {
--		r = r * 256 + atoi(strtok(s, "."));
-+		t = strtok(s, ".");
-+		r = r * 256 + (t ? atoi(t) : 0);
- 		s = NULL;
- 	}
- 	return r;
diff --git a/patches/busybox-1.20.2/0200-reactivate-check-for-tty.patch b/patches/busybox-1.21.0/0200-reactivate-check-for-tty.patch
index a44f6b6f9..5ed2bf0bc 100644
--- a/patches/busybox-1.20.2/0200-reactivate-check-for-tty.patch
+++ b/patches/busybox-1.21.0/0200-reactivate-check-for-tty.patch
@@ -10,7 +10,7 @@ This patch reactivates this feature.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- scripts/kconfig/conf.c |    2 +-
+ scripts/kconfig/conf.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
diff --git a/patches/busybox-1.20.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch b/patches/busybox-1.21.0/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
index 1622f1014..67cd9bee0 100644
--- a/patches/busybox-1.20.2/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
+++ b/patches/busybox-1.21.0/0201-Fix-the-format-warning-when-building-applets-usage_p.patch
@@ -12,7 +12,7 @@ applets/usage_pod.c:74:3: warning: format not a string literal and no format arg
 
 Signed-off-by: Dinny Wu <dinny.wu@gmail.com>
 ---
- applets/usage_pod.c |    2 +-
+ applets/usage_pod.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/applets/usage_pod.c b/applets/usage_pod.c
diff --git a/patches/busybox-1.20.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch b/patches/busybox-1.21.0/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
index 681aec55d..257e62db1 100644
--- a/patches/busybox-1.20.2/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
+++ b/patches/busybox-1.21.0/0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
@@ -6,14 +6,14 @@ The busybox make system will fail otherwise.
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- Makefile.flags |    1 +
+ Makefile.flags | 1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile.flags b/Makefile.flags
-index 15dcc1f..7b04b89 100644
+index 307afa7..d68c9c4 100644
 --- a/Makefile.flags
 +++ b/Makefile.flags
-@@ -137,6 +137,7 @@ ifeq ($(CONFIG_SELINUX),y)
+@@ -141,6 +141,7 @@ ifeq ($(CONFIG_SELINUX),y)
  SELINUX_PC_MODULES = libselinux libsepol
  $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES)))
  CPPFLAGS += $(SELINUX_CFLAGS)
diff --git a/patches/busybox-1.20.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch b/patches/busybox-1.21.0/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
index ebd9790a2..5ebcdd54d 100644
--- a/patches/busybox-1.20.2/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
+++ b/patches/busybox-1.21.0/0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] scripts/trylink: honour SKIP_STRIP and don't strip if
 
 Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
 ---
- scripts/trylink |   17 ++++++++++++++---
+ scripts/trylink | 17 ++++++++++++++---
  1 file changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/scripts/trylink b/scripts/trylink
diff --git a/patches/busybox-1.20.2/series b/patches/busybox-1.21.0/series
index dcf9b4a5c..84c80aa6e 100644
--- a/patches/busybox-1.20.2/series
+++ b/patches/busybox-1.21.0/series
@@ -1,14 +1,10 @@
 # generated by git-ptx-patches
 #tag:base --start-number 1
 #tag:upstream-stable --start-number 1
-0001-include-sys-resource.h-where-needed.patch
-0002-build-system-use-pkg-config-to-look-up-selinux-libs.patch
 #tag:upstream-master --start-number 100
-0100-Fix-compilation-on-Darwin.patch
-0101-get_linux_version_code-don-t-fail-on-Linux-version-s.patch
 #tag:ptx --start-number 200
 0200-reactivate-check-for-tty.patch
 0201-Fix-the-format-warning-when-building-applets-usage_p.patch
 0202-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
 0203-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
-# 2544a24a902f6d5ec4e021d62cdce8eb  - git-ptx-patches magic
+# 0036b420b1a49106a872780e90251289  - git-ptx-patches magic
diff --git a/rules/busybox.make b/rules/busybox.make
index 203aa5293..31ef1eeb1 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BUSYBOX) += busybox
 #
 # Paths and names
 #
-BUSYBOX_VERSION	:= 1.20.2
-BUSYBOX_MD5	:= e025414bc6cd79579cc7a32a45d3ae1c
+BUSYBOX_VERSION	:= 1.21.0
+BUSYBOX_MD5	:= d613f2e4b580305c1de8691f7b84285e
 BUSYBOX		:= busybox-$(BUSYBOX_VERSION)
 BUSYBOX_SUFFIX	:= tar.bz2
 BUSYBOX_URL	:= http://www.busybox.net/downloads/$(BUSYBOX).$(BUSYBOX_SUFFIX)