busybox: update to 1.26.2

6 files changed, 20 insertions, 168 deletions

diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index 42224adec..686b625c9 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
-PKG_VERSION:=		1.26.0
+PKG_VERSION:=		1.26.2
 PKG_RELEASE:=		1
-PKG_HASH:=		3ad227375ee870d529007f6ce83f173b8bd5a37df624ecb460295554261c0f4c
+PKG_HASH:=		da3e44913fc1a9c9b7c5337ea5292da518683cbff32be630777f565d6036af16
 PKG_DESCR:=		core utilities for embedded systems
 PKG_SECTION:=		base/apps
 PKG_URL:=		http://www.busybox.net/
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index cedbc4482..c7022d8e4 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -496,21 +496,6 @@ config BUSYBOX_FEATURE_IFUPDOWN_IP
 	  Use the iproute "ip" command to implement "ifup" and "ifdown", rather
 	  than the default of using the older 'ifconfig' and 'route' utilities.
 
-config BUSYBOX_FEATURE_IFUPDOWN_IP_BUILTIN
-	bool "Use busybox ip applet"
-	default y if !BUSYBOX_DISABLE_IP
-	depends on BUSYBOX_FEATURE_IFUPDOWN_IP
-	select BUSYBOX_PLATFORM_LINUX
-	select BUSYBOX_IP
-	select BUSYBOX_FEATURE_IP_ADDRESS
-	select BUSYBOX_FEATURE_IP_LINK
-	select BUSYBOX_FEATURE_IP_ROUTE
-	help
-	  Use the busybox iproute "ip" applet to implement "ifupdown".
-
-	  If left disabled, you must install the full-blown iproute2
-	  utility or the  "ifup" and "ifdown" applets will not work.
-
 config BUSYBOX_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
 	bool "Use busybox ifconfig and route applets"
 	default n
@@ -675,21 +660,6 @@ config BUSYBOX_FEATURE_IP_NEIGH
 	help
 	  Add support for neighbor commands to "ip".
 
-config BUSYBOX_FEATURE_IP_SHORT_FORMS
-	bool "Support short forms of ip commands"
-	default n
-	depends on BUSYBOX_IP
-	help
-	  Also support short-form of ip <OBJECT> commands:
-	  ip addr   -> ipaddr
-	  ip link   -> iplink
-	  ip route  -> iproute
-	  ip tunnel -> iptunnel
-	  ip rule   -> iprule
-
-	  Say N unless you desparately need the short form of the ip
-	  object commands.
-
 config BUSYBOX_FEATURE_IP_RARE_PROTOCOLS
 	bool "Support displaying rarely used link types"
 	default n
@@ -703,27 +673,26 @@ config BUSYBOX_FEATURE_IP_RARE_PROTOCOLS
 config BUSYBOX_IPADDR
 	bool
 	default n
-	depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_ADDRESS
 
 config BUSYBOX_IPLINK
 	bool
 	default n
-	depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_LINK
 
 config BUSYBOX_IPROUTE
 	bool
 	default n
-	depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_ROUTE
 
 config BUSYBOX_IPTUNNEL
 	bool
 	default n
-	depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_TUNNEL
 
 config BUSYBOX_IPRULE
 	bool
 	default n
-	depends on BUSYBOX_FEATURE_IP_SHORT_FORMS && BUSYBOX_FEATURE_IP_RULE
+
+config BUSYBOX_IPNEIGH
+	bool
+	default n
 
 config BUSYBOX_IPCALC
 	bool "ipcalc"
diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/busybox/config/networking/udhcp/Config.in
index aec0fd62f..02e56c3ef 100644
--- a/package/busybox/config/networking/udhcp/Config.in
+++ b/package/busybox/config/networking/udhcp/Config.in
@@ -20,8 +20,7 @@ config BUSYBOX_UDHCPD
 
 config BUSYBOX_DHCPRELAY
 	bool "dhcprelay"
-	default y
-	depends on BUSYBOX_UDHCPD
+	default n
 	help
 	  dhcprelay listens for dhcp requests on one or more interfaces
 	  and forwards these requests to a different interface or dhcp
@@ -29,8 +28,7 @@ config BUSYBOX_DHCPRELAY
 
 config BUSYBOX_DUMPLEASES
 	bool "Lease display utility (dumpleases)"
-	default y
-	depends on BUSYBOX_UDHCPD
+	default n
 	help
 	  dumpleases displays the leases written out by the udhcpd server.
 	  Lease times are stored in the file by time remaining in lease, or
diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index 019b3e600..09a46edad 100644
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -166,6 +166,7 @@ config BUSYBOX_CTTYHACK
 	  Starting getty on a controlling tty from a shell script:
 
 	  # getty 115200 $(cttyhack)
+
 config BUSYBOX_HUSH
 	bool "hush"
 	default y if ADK_TARGET_UCLINUX
@@ -302,62 +303,34 @@ config BUSYBOX_MSH
 	help
 	  msh is deprecated and will be removed, please migrate to hush.
 
-
-
 choice
-	prompt "Choose which shell is aliased to 'sh' name"
-	default FEATURE_SH_IS_NONE
-	help
-	  Choose which shell you want to be executed by 'sh' alias.
-	  The ash shell is the most bash compatible and full featured one.
+prompt "Choose which shell is aliased to 'sh' name"
 
-# note: cannot use "select ASH" here, it breaks "make allnoconfig"
-config BUSYBOX_FEATURE_SH_IS_ASH
-	depends on BUSYBOX_ASH
+config BUSYBOX_SH_IS_NONE
+	bool "none"
+
+config BUSYBOX_SH_IS_ASH
 	bool "ash"
-	depends on !BUSYBOX_NOMMU
 
-config BUSYBOX_FEATURE_SH_IS_HUSH
-	depends on BUSYBOX_HUSH
+config BUSYBOX_SH_IS_HUSH
 	bool "hush"
 
-config BUSYBOX_FEATURE_SH_IS_NONE
-	bool "none"
-
 endchoice
 
 choice
-	prompt "Choose which shell is aliased to 'bash' name"
-	default FEATURE_BASH_IS_NONE
-	help
-	  Choose which shell you want to be executed by 'bash' alias.
-	  The ash shell is the most bash compatible and full featured one.
-
-	  Note that selecting this option does not switch on any bash
-	  compatibility code. It merely makes it possible to install
-	  /bin/bash (sym)link and run scripts which start with
-	  #!/bin/bash line.
+prompt "Choose which shell is aliased to 'bash' name"
 
-	  Many systems use it in scripts which use bash-specific features,
-	  even simple ones like $RANDOM. Without this option, busybox
-	  can't be used for running them because it won't recongnize
-	  "bash" as a supported applet name.
+config BUSYBOX_BASH_IS_NONE
+	bool "none"
 
-config BUSYBOX_FEATURE_BASH_IS_ASH
-	depends on BUSYBOX_ASH
+config BUSYBOX_BASH_IS_ASH
 	bool "ash"
-	depends on !BUSYBOX_NOMMU
 
-config BUSYBOX_FEATURE_BASH_IS_HUSH
-	depends on BUSYBOX_HUSH
+config BUSYBOX_BASH_IS_HUSH
 	bool "hush"
 
-config BUSYBOX_FEATURE_BASH_IS_NONE
-	bool "none"
-
 endchoice
 
-
 config BUSYBOX_SH_MATH_SUPPORT
 	bool "POSIX math support"
 	default y
diff --git a/package/busybox/patches/009-modutils.patch b/package/busybox/patches/009-modutils.patch
deleted file mode 100644
index 49ccb8ff4..000000000
--- a/package/busybox/patches/009-modutils.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 7cf41b6e281c42fb7f2117927a8ff7f476103e76 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <wbx@openadk.org>
-Date: Sun, 25 Dec 2016 16:53:32 +0100
-Subject: [PATCH] modutils: remove special handling of uClibc
-
-Commit 3a45b87ac36f (modutils: support finit_module syscall) introduced
-macro finit_module. But it is not defined for uClibc.
-
-The compilation for busybox fails for MIPS with:
-With uClibc, we get following build errors:
-
-  modutils/lib.a(modutils.o): In function `bb_init_module':
-  modutils.c:(.text.bb_init_module+0x94): undefined reference to `finit_module'
-  modutils.c:(.text.bb_init_module+0xa0): undefined reference to `finit_module'
-
-We can just use syscall() without any need for the
-uClibc wrappers.
-
-Newer versions of uClibc-ng (>1.0.20) will remove the
-module syscall wrappers.
-
-Found via Buildroot autobuilders:
-http://autobuild.buildroot.net/results/556/55655daef23788fb3967f801ec8b79e9bed7122b/build-end.log
-
-Reported-by: Rahul Bedarkar <rahul.bedarkar@imgtec.com>
-Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
----
- modutils/modprobe-small.c |  4 ++--
- modutils/modutils.c       | 15 +++++----------
- 2 files changed, 7 insertions(+), 12 deletions(-)
-
-diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
-index 652ff4d..0fc9ea4 100644
---- a/modutils/modprobe-small.c
-+++ b/modutils/modprobe-small.c
-@@ -39,8 +39,8 @@
- #include <fnmatch.h>
- #include <sys/syscall.h>
- 
--extern int init_module(void *module, unsigned long len, const char *options);
--extern int delete_module(const char *module, unsigned flags);
-+#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
-+#define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
- #ifdef __NR_finit_module
- # define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
- #endif
-diff --git a/modutils/modutils.c b/modutils/modutils.c
-index d36caaf..d56bfc8 100644
---- a/modutils/modutils.c
-+++ b/modutils/modutils.c
-@@ -7,17 +7,12 @@
-  */
- #include "modutils.h"
- 
--#ifdef __UCLIBC__
--extern int init_module(void *module, unsigned long len, const char *options);
--extern int delete_module(const char *module, unsigned int flags);
--#else
--# include <sys/syscall.h>
--# define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
--# if defined(__NR_finit_module)
--#  define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
--# endif
--# define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
-+#include <sys/syscall.h>
-+#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
-+#if defined(__NR_finit_module)
-+# define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
- #endif
-+#define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
- 
- static module_entry *helper_get_module(module_db *db, const char *module, int create)
- {
--- 
-2.1.4
-
diff --git a/package/busybox/patches/010-ifup-hotfix.patch b/package/busybox/patches/010-ifup-hotfix.patch
deleted file mode 100644
index 3060b986c..000000000
--- a/package/busybox/patches/010-ifup-hotfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur busybox-1.26.0.orig/networking/Config.src busybox-1.26.0/networking/Config.src
---- busybox-1.26.0.orig/networking/Config.src	2016-12-12 08:46:14.000000000 +0100
-+++ busybox-1.26.0/networking/Config.src	2016-12-25 09:39:42.715064866 +0100
-@@ -53,7 +53,7 @@
- config IFUPDOWN_UDHCPC_CMD_OPTIONS
- 	string "ifup udhcpc command line options"
- 	default "-R -n"
--	depends on IFUPDOWN && UDHCPC
-+	depends on IFUP && UDHCPC
- 	help
- 	  Command line options to pass to udhcpc from ifup.
- 	  Intended to alter options not available in /etc/network/interfaces.