busybox: update to v1.14.4 (closes: #5619)

SVN-Revision: 17782

24 files changed, 100 insertions, 119 deletions

diff --git a/package/busybox/patches/001-init_avoid_loop_opening_tty.patch b/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
index ed790d807b..8cc9ca2c89 100644
--- a/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
+++ b/package/busybox/patches/001-init_avoid_loop_opening_tty.patch
@@ -1,20 +1,15 @@
 --- a/init/init.c
 +++ b/init/init.c
-@@ -497,12 +497,11 @@ static void run_actions(int action_type)
- 	for (a = init_action_list; a; a = tmp) {
- 		tmp = a->next;
- 		if (a->action_type & action_type) {
--			// Pointless: run() will error out if open of device fails.
--			///* a->terminal of "" means "init's console" */
--			//if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
--			//	//message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
--			//	delete_init_action(a);
--			//} else
-+			/* a->terminal of "" means "init's console" */
-+			if (a->terminal[0] && access(a->terminal, R_OK | W_OK)) {
-+				//message(L_LOG | L_CONSOLE, "Device %s cannot be opened in RW mode", a->terminal /*, strerror(errno)*/);
-+				delete_init_action(a);
-+			} else
- 			if (a->action_type & (SYSINIT | WAIT | CTRLALTDEL | SHUTDOWN | RESTART)) {
- 				waitfor(run(a));
- 				delete_init_action(a);
+@@ -451,8 +451,11 @@ static void run_actions(int action_type)
+ 			/* Only run stuff with pid == 0. If pid != 0,
+ 			 * it is already running
+ 			 */
+-			if (a->pid == 0)
++			if (a->pid == 0) {
++				if (a->terminal && access(a->terminal, R_OK | W_OK))
++					continue;
+ 				a->pid = run(a);
++			}
+ 		}
+ 	}
+ }
diff --git a/package/busybox/patches/003-brctl_show_fix.patch b/package/busybox/patches/003-brctl_show_fix.patch
index 51b0cf709d..f3fc402880 100644
--- a/package/busybox/patches/003-brctl_show_fix.patch
+++ b/package/busybox/patches/003-brctl_show_fix.patch
@@ -1,6 +1,6 @@
 --- a/networking/brctl.c
 +++ b/networking/brctl.c
-@@ -90,7 +90,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
+@@ -104,7 +104,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
  		"setageing\0" "setfd\0" "sethello\0" "setmaxage\0"
  		"setpathcost\0" "setportprio\0" "setbridgeprio\0"
  	)
@@ -9,7 +9,7 @@
  
  	enum { ARG_addbr = 0, ARG_delbr, ARG_addif, ARG_delif
  		USE_FEATURE_BRCTL_FANCY(,
-@@ -98,7 +98,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
+@@ -112,7 +112,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
  		   ARG_setageing, ARG_setfd, ARG_sethello, ARG_setmaxage,
  		   ARG_setpathcost, ARG_setportprio, ARG_setbridgeprio
  		)
diff --git a/package/busybox/patches/110-wget_getopt_fix.patch b/package/busybox/patches/110-wget_getopt_fix.patch
index 187603d059..abb03d49f5 100644
--- a/package/busybox/patches/110-wget_getopt_fix.patch
+++ b/package/busybox/patches/110-wget_getopt_fix.patch
@@ -1,11 +1,11 @@
 --- a/networking/wget.c
 +++ b/networking/wget.c
-@@ -443,7 +443,7 @@ int wget_main(int argc UNUSED_PARAM, cha
+@@ -485,7 +485,7 @@ int wget_main(int argc UNUSED_PARAM, cha
  		// "tries\0"            Required_argument "t"
  		// "timeout\0"          Required_argument "T"
  		/* Ignored (we always use PASV): */
 -		"passive-ftp\0"      No_argument       "\xff"
 +		"passive-ftp\0"      No_argument       "\xfd"
  		"header\0"           Required_argument "\xfe"
+ 		"post-data\0"        Required_argument "\xfd"
  		;
- #endif
diff --git a/package/busybox/patches/200-etc_crontabs.patch b/package/busybox/patches/200-etc_crontabs.patch
index bc3010ee2a..936ef7ef81 100644
--- a/package/busybox/patches/200-etc_crontabs.patch
+++ b/package/busybox/patches/200-etc_crontabs.patch
@@ -3,20 +3,20 @@
 @@ -24,7 +24,7 @@
  
  
- #ifndef CRONTABS
--#define CRONTABS        "/var/spool/cron/crontabs"
+ #define TMPDIR          CONFIG_FEATURE_CROND_DIR
+-#define CRONTABS        CONFIG_FEATURE_CROND_DIR "/crontabs"
 +#define CRONTABS        "/etc/crontabs"
+ #ifndef SENDMAIL
+ #define SENDMAIL        "sendmail"
  #endif
- #ifndef TMPDIR
- #define TMPDIR          "/var/spool/cron"
 --- a/miscutils/crontab.c
 +++ b/miscutils/crontab.c
-@@ -13,7 +13,7 @@
+@@ -12,7 +12,7 @@
+ 
  #include "libbb.h"
  
- #ifndef CRONTABS
--#define CRONTABS        "/var/spool/cron/crontabs"
+-#define CRONTABS        CONFIG_FEATURE_CROND_DIR "/crontabs"
 +#define CRONTABS        "/etc/crontabs"
- #endif
  #ifndef CRONUPDATE
  #define CRONUPDATE      "cron.update"
+ #endif
diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/busybox/patches/240-udhcpc_retries.patch
index be452c076a..81f120d8e6 100644
--- a/package/busybox/patches/240-udhcpc_retries.patch
+++ b/package/busybox/patches/240-udhcpc_retries.patch
@@ -1,6 +1,6 @@
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c
-@@ -353,7 +353,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+@@ -363,7 +363,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
  
  			switch (state) {
  			case INIT_SELECTING:
@@ -9,7 +9,7 @@
  					if (packet_num == 0)
  						xid = random_xid();
  
-@@ -384,7 +384,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+@@ -394,7 +394,7 @@ int udhcpc_main(int argc UNUSED_PARAM, c
  				continue;
  			case RENEW_REQUESTED:
  			case REQUESTING:
diff --git a/package/busybox/patches/241-udhcpc-oversized_packets.patch b/package/busybox/patches/241-udhcpc-oversized_packets.patch
index 6019297b24..405a7a52ea 100644
--- a/package/busybox/patches/241-udhcpc-oversized_packets.patch
+++ b/package/busybox/patches/241-udhcpc-oversized_packets.patch
@@ -1,6 +1,6 @@
 --- a/networking/udhcp/packet.c
 +++ b/networking/udhcp/packet.c
-@@ -114,6 +114,10 @@ uint16_t FAST_FUNC udhcp_checksum(void *
+@@ -120,6 +120,10 @@ uint16_t FAST_FUNC udhcp_checksum(void *
  	return ~sum;
  }
  
@@ -11,7 +11,7 @@
  
  /* Construct a ip/udp header for a packet, send packet */
  int FAST_FUNC udhcp_send_raw_packet(struct dhcpMessage *payload,
-@@ -126,11 +130,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru
+@@ -132,11 +136,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru
  	int fd;
  	int result = -1;
  	const char *msg;
@@ -24,7 +24,7 @@
  
  	fd = socket(PF_PACKET, SOCK_DGRAM, htons(ETH_P_IP));
  	if (fd < 0) {
-@@ -140,7 +140,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru
+@@ -146,7 +146,7 @@ int FAST_FUNC udhcp_send_raw_packet(stru
  
  	memset(&dest, 0, sizeof(dest));
  	memset(&packet, 0, sizeof(packet));
@@ -33,7 +33,7 @@
  
  	dest.sll_family = AF_PACKET;
  	dest.sll_protocol = htons(ETH_P_IP);
-@@ -157,23 +157,18 @@ int FAST_FUNC udhcp_send_raw_packet(stru
+@@ -163,23 +163,18 @@ int FAST_FUNC udhcp_send_raw_packet(stru
  	packet.ip.daddr = dest_ip;
  	packet.udp.source = htons(source_port);
  	packet.udp.dest = htons(dest_port);
@@ -63,7 +63,7 @@
  				(struct sockaddr *) &dest, sizeof(dest));
  	msg = "sendto";
   ret_close:
-@@ -225,8 +220,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s
+@@ -231,8 +226,7 @@ int FAST_FUNC udhcp_send_kernel_packet(s
  		goto ret_close;
  	}
  
diff --git a/package/busybox/patches/243-udhcpc_changed_ifindex.patch b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
index 29727556d1..f0ab34d26a 100644
--- a/package/busybox/patches/243-udhcpc_changed_ifindex.patch
+++ b/package/busybox/patches/243-udhcpc_changed_ifindex.patch
@@ -1,8 +1,8 @@
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c
-@@ -320,6 +320,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
- 	for (;;) {
- 		unsigned timestamp_before_wait;
+@@ -327,6 +327,12 @@ int udhcpc_main(int argc UNUSED_PARAM, c
+ 		/* silence "uninitialized!" warning */
+ 		unsigned timestamp_before_wait = timestamp_before_wait;
  
 +		/* When running on a bridge, the ifindex may have changed (e.g. if
 +		 * member interfaces were added/removed or if the status of the
@@ -10,6 +10,6 @@
 +		 * Workaround: refresh it here before processing the next packet */
 +		udhcp_read_interface(client_config.interface, &client_config.ifindex, NULL, client_config.arp);
 +
- 		if (listen_mode != LISTEN_NONE && sockfd < 0) {
- 			if (listen_mode == LISTEN_KERNEL)
- 				sockfd = udhcp_listen_socket(/*INADDR_ANY,*/ CLIENT_PORT, client_config.interface);
+ 		//bb_error_msg("sockfd:%d, listen_mode:%d", sockfd, listen_mode);
+ 
+ 		/* Was opening raw or udp socket here
diff --git a/package/busybox/patches/244-udhcpc_cidrroute.patch b/package/busybox/patches/244-udhcpc_cidrroute.patch
index 7267750358..29313ae79d 100644
--- a/package/busybox/patches/244-udhcpc_cidrroute.patch
+++ b/package/busybox/patches/244-udhcpc_cidrroute.patch
@@ -1,6 +1,6 @@
 --- a/networking/udhcp/options.c
 +++ b/networking/udhcp/options.c
-@@ -46,6 +46,7 @@ const struct dhcp_option dhcp_options[] 
+@@ -48,6 +48,7 @@ const struct dhcp_option dhcp_options[] 
  #if ENABLE_FEATURE_UDHCP_RFC3397
  	{ OPTION_STR1035 | OPTION_LIST            , 0x77 }, /* search             */
  #endif
@@ -8,7 +8,7 @@
  	/* MSIE's "Web Proxy Autodiscovery Protocol" support */
  	{ OPTION_STRING                           , 0xfc }, /* wpad               */
  
-@@ -95,6 +96,7 @@ const char dhcp_option_strings[] ALIGN1 
+@@ -97,6 +98,7 @@ const char dhcp_option_strings[] ALIGN1 
  #if ENABLE_FEATURE_UDHCP_RFC3397
  	"search" "\0"
  #endif
diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/busybox/patches/250-ash_export-n.patch
index 71697b116e..f11cb8f799 100644
--- a/package/busybox/patches/250-ash_export-n.patch
+++ b/package/busybox/patches/250-ash_export-n.patch
@@ -1,6 +1,6 @@
 --- a/shell/ash.c
 +++ b/shell/ash.c
-@@ -12159,8 +12159,17 @@ exportcmd(int argc UNUSED_PARAM, char **
+@@ -12273,8 +12273,17 @@ exportcmd(int argc UNUSED_PARAM, char **
  	const char *p;
  	char **aptr;
  	int flag = argv[0][0] == 'r' ? VREADONLY : VEXPORT;
@@ -19,7 +19,7 @@
  		aptr = argptr;
  		name = *aptr;
  		if (name) {
-@@ -12172,10 +12181,12 @@ exportcmd(int argc UNUSED_PARAM, char **
+@@ -12286,10 +12295,12 @@ exportcmd(int argc UNUSED_PARAM, char **
  					vp = *findvar(hashvar(name), name);
  					if (vp) {
  						vp->flags |= flag;
diff --git a/package/busybox/patches/300-netmsg.patch b/package/busybox/patches/300-netmsg.patch
index 575f5873c1..641449eca1 100644
--- a/package/busybox/patches/300-netmsg.patch
+++ b/package/busybox/patches/300-netmsg.patch
@@ -1,6 +1,6 @@
 --- a/include/applets.h
 +++ b/include/applets.h
-@@ -263,6 +263,7 @@ USE_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_
+@@ -271,6 +271,7 @@ USE_MT(APPLET(mt, _BB_DIR_BIN, _BB_SUID_
  USE_MV(APPLET(mv, _BB_DIR_BIN, _BB_SUID_NEVER))
  USE_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_NEVER))
  USE_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
@@ -10,7 +10,7 @@
  USE_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_NEVER))
 --- a/include/usage.h
 +++ b/include/usage.h
-@@ -2849,6 +2849,9 @@
+@@ -3010,6 +3010,9 @@
  
  #endif
  
@@ -22,7 +22,7 @@
  #define netstat_full_usage "\n\n" \
 --- a/networking/Config.in
 +++ b/networking/Config.in
-@@ -603,6 +603,12 @@ config NC
+@@ -600,6 +600,12 @@ config NC
  	  A simple Unix utility which reads and writes data across network
  	  connections.
  
@@ -37,7 +37,7 @@
  	default n
 --- a/networking/Kbuild
 +++ b/networking/Kbuild
-@@ -23,6 +23,7 @@ lib-$(CONFIG_IP)           += ip.o
+@@ -24,6 +24,7 @@ lib-$(CONFIG_IP)           += ip.o
  lib-$(CONFIG_IPCALC)       += ipcalc.o
  lib-$(CONFIG_NAMEIF)       += nameif.o
  lib-$(CONFIG_NC)           += nc.o
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/busybox/patches/310-passwd_access.patch
index f90c840baf..6ab6d4b8c4 100644
--- a/package/busybox/patches/310-passwd_access.patch
+++ b/package/busybox/patches/310-passwd_access.patch
@@ -3,7 +3,7 @@
 
 --- a/networking/httpd.c
 +++ b/networking/httpd.c
-@@ -1713,21 +1713,32 @@ static int check_user_passwd(const char 
+@@ -1699,21 +1699,32 @@ static int check_user_passwd(const char 
  
  		if (ENABLE_FEATURE_HTTPD_AUTH_MD5) {
  			char *md5_passwd;
diff --git a/package/busybox/patches/340-lock_util.patch b/package/busybox/patches/340-lock_util.patch
index d5f8ac849b..fc235b3e7c 100644
--- a/package/busybox/patches/340-lock_util.patch
+++ b/package/busybox/patches/340-lock_util.patch
@@ -1,6 +1,6 @@
 --- a/include/applets.h
 +++ b/include/applets.h
-@@ -223,6 +223,7 @@ USE_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN
+@@ -228,6 +228,7 @@ USE_LN(APPLET_NOEXEC(ln, ln, _BB_DIR_BIN
  USE_LOAD_POLICY(APPLET(load_policy, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
  USE_LOADFONT(APPLET(loadfont, _BB_DIR_USR_SBIN, _BB_SUID_NEVER))
  USE_LOADKMAP(APPLET(loadkmap, _BB_DIR_SBIN, _BB_SUID_NEVER))
@@ -10,7 +10,7 @@
  USE_LOGNAME(APPLET_NOFORK(logname, logname, _BB_DIR_USR_BIN, _BB_SUID_NEVER, logname))
 --- a/include/usage.h
 +++ b/include/usage.h
-@@ -2150,6 +2150,9 @@
+@@ -2246,6 +2246,9 @@
  #define loadkmap_example_usage \
         "$ loadkmap < /etc/i18n/lang-keymap\n"
  
@@ -22,9 +22,9 @@
  #define logger_full_usage "\n\n" \
 --- a/miscutils/Config.in
 +++ b/miscutils/Config.in
-@@ -395,6 +395,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
+@@ -420,6 +420,12 @@ config FEATURE_HDPARM_HDIO_GETSET_DMA
+ 	help
  	  Enables the 'hdparm -d' option to get/set using_dma flag.
- 	  This is dangerous stuff, so you should probably say N.
  
 +config LOCK
 +	bool "lock"
@@ -37,7 +37,7 @@
  	default n
 --- a/miscutils/Kbuild
 +++ b/miscutils/Kbuild
-@@ -21,6 +21,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o
+@@ -23,6 +23,7 @@ lib-$(CONFIG_INOTIFYD)    += inotifyd.o
  lib-$(CONFIG_FEATURE_LAST_SMALL)+= last.o
  lib-$(CONFIG_FEATURE_LAST_FANCY)+= last_fancy.o
  lib-$(CONFIG_LESS)        += less.o
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch
index da2fab695d..912cb6d497 100644
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -1,6 +1,6 @@
 --- a/include/usage.h
 +++ b/include/usage.h
-@@ -1558,7 +1558,8 @@
+@@ -1638,7 +1638,8 @@
  	USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \
  	USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
         " [-h home]" \
@@ -10,7 +10,7 @@
  #define httpd_full_usage "\n\n" \
         "Listen for incoming HTTP requests\n" \
       "\nOptions:" \
-@@ -1576,6 +1577,8 @@
+@@ -1656,6 +1657,8 @@
       "\n	-h HOME		Home directory (default .)" \
       "\n	-e STRING	HTML encode STRING" \
       "\n	-d STRING	URL decode STRING" \
@@ -30,7 +30,7 @@
  	Htaccess_IP *ip_a_d;    /* config allow/deny lines */
  
  	USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
-@@ -295,6 +297,8 @@ struct globals {
+@@ -294,6 +296,8 @@ struct globals {
  #define index_page        (G.index_page       )
  #define found_mime_type   (G.found_mime_type  )
  #define found_moved_temporarily (G.found_moved_temporarily)
@@ -39,7 +39,7 @@
  #define last_mod          (G.last_mod         )
  #define ip_a_d            (G.ip_a_d           )
  #define g_realm           (G.g_realm          )
-@@ -1003,8 +1007,11 @@ static void send_headers(int responseNum
+@@ -993,8 +997,11 @@ static void send_headers(int responseNum
  	}
  #endif
  	if (responseNum == HTTP_MOVED_TEMPORARILY) {
@@ -52,7 +52,7 @@
  				(g_query ? "?" : ""),
  				(g_query ? g_query : ""));
  	}
-@@ -1939,8 +1946,12 @@ static void handle_incoming_and_exit(con
+@@ -1924,8 +1931,12 @@ static void handle_incoming_and_exit(con
  	} while (*++tptr);
  	*++urlp = '\0';       /* terminate after last character */
  
@@ -66,8 +66,8 @@
  		if (is_directory(urlcopy + 1, 1, &sb)) {
  			found_moved_temporarily = urlcopy;
  		}
-@@ -2293,7 +2304,9 @@ static void sighup_handler(int sig)
- #endif
+@@ -2266,7 +2277,9 @@ static void sighup_handler(int sig UNUSE
+ }
  
  enum {
 -	c_opt_config_file = 0,
@@ -77,7 +77,7 @@
  	d_opt_decode_url,
  	h_opt_home_httpd,
  	USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
-@@ -2342,12 +2355,13 @@ int httpd_main(int argc UNUSED_PARAM, ch
+@@ -2315,12 +2328,13 @@ int httpd_main(int argc UNUSED_PARAM, ch
  	/* We do not "absolutize" path given by -h (home) opt.
  	 * If user gives relative path in -h,
  	 * $SCRIPT_FILENAME will not be set. */
@@ -89,6 +89,6 @@
  			USE_FEATURE_HTTPD_SETUID("u:")
  			"p:ifv",
 +			&redirect_path, &redirect_host,
- 			&configFile, &url_for_decode, &home_httpd
+ 			&opt_c_configFile, &url_for_decode, &home_httpd
  			USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
  			USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
diff --git a/package/busybox/patches/410-httpd_cgi_headers.patch b/package/busybox/patches/410-httpd_cgi_headers.patch
index 4339462a80..2f464608f1 100644
--- a/package/busybox/patches/410-httpd_cgi_headers.patch
+++ b/package/busybox/patches/410-httpd_cgi_headers.patch
@@ -1,6 +1,6 @@
 --- a/networking/httpd.c
 +++ b/networking/httpd.c
-@@ -1259,10 +1259,10 @@ static NOINLINE void cgi_io_loop_and_exi
+@@ -1250,10 +1250,10 @@ static NOINLINE void cgi_io_loop_and_exi
  						if (full_write(STDOUT_FILENO, HTTP_200, sizeof(HTTP_200)-1) != sizeof(HTTP_200)-1)
  							break;
  					}
diff --git a/package/busybox/patches/440-httpd_chdir.patch b/package/busybox/patches/440-httpd_chdir.patch
index 0d5769651b..0abea5dc3b 100644
--- a/package/busybox/patches/440-httpd_chdir.patch
+++ b/package/busybox/patches/440-httpd_chdir.patch
@@ -1,6 +1,6 @@
 --- a/networking/httpd.c
 +++ b/networking/httpd.c
-@@ -1824,6 +1824,7 @@ static void handle_incoming_and_exit(con
+@@ -1810,6 +1810,7 @@ static void handle_incoming_and_exit(con
  	char *header_ptr = header_ptr;
  	Htaccess_Proxy *proxy_entry;
  #endif
diff --git a/package/busybox/patches/470-insmod_search.patch b/package/busybox/patches/470-insmod_search.patch
index 5825dac9f2..cc7ca79ce0 100644
--- a/package/busybox/patches/470-insmod_search.patch
+++ b/package/busybox/patches/470-insmod_search.patch
@@ -100,7 +100,7 @@
  
  int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int insmod_main(int argc UNUSED_PARAM, char **argv)
-@@ -25,9 +118,14 @@ int insmod_main(int argc UNUSED_PARAM, c
+@@ -33,9 +126,15 @@ int insmod_main(int argc UNUSED_PARAM, c
  	if (!filename)
  		bb_show_usage();
  
@@ -111,9 +111,20 @@
 +
 +	rc = bb_init_module(g_filename, parse_cmdline_module_options(argv));
  	if (rc)
- 		bb_error_msg("cannot insert '%s': %s", filename, moderror(rc));
--
+ 		bb_error_msg("can't insert '%s': %s", filename, moderror(rc));
 +	free (g_filename);
+ 
 +done:
  	return rc;
  }
+--- a/modutils/Config.in
++++ b/modutils/Config.in
+@@ -211,7 +211,7 @@ config FEATURE_MODUTILS_SYMBOLS
+ config DEFAULT_MODULES_DIR
+ 	string "Default directory containing modules"
+ 	default "/lib/modules"
+-	depends on DEPMOD || MODPROBE || MODPROBE_SMALL
++	depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL
+ 	help
+ 	  Directory that contains kernel modules.
+ 	  Defaults to "/lib/modules"
diff --git a/package/busybox/patches/480-mount_union.patch b/package/busybox/patches/480-mount_union.patch
index 7585d68ddd..2a22322aee 100644
--- a/package/busybox/patches/480-mount_union.patch
+++ b/package/busybox/patches/480-mount_union.patch
@@ -1,7 +1,7 @@
 --- a/util-linux/mount.c
 +++ b/util-linux/mount.c
 @@ -42,6 +42,10 @@
- #define MS_DIRSYNC      128     /* Directory modifications are synchronous */
+ #define MS_DIRSYNC      128     // Directory modifications are synchronous
  #endif
  
 +#ifndef MS_UNION
@@ -10,8 +10,8 @@
 +
  
  #if defined(__dietlibc__)
- /* 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
-@@ -152,6 +156,7 @@
+ // 16.12.2006, Sampo Kellomaki (sampo@iki.fi)
+@@ -152,6 +156,7 @@ static const int32_t mount_options[] = {
  		/* "rslave"      */ MS_SLAVE|MS_RECURSIVE,
  		/* "rprivate"    */ MS_SLAVE|MS_RECURSIVE,
  		/* "runbindable" */ MS_UNBINDABLE|MS_RECURSIVE,
@@ -19,10 +19,10 @@
  	)
  
  	// Always understood.
-@@ -206,6 +211,7 @@
- 		"rslave" "\0"
- 		"rprivate" "\0"
- 		"runbindable" "\0"
+@@ -206,6 +211,7 @@ static const char mount_option_str[] =
+ 		"rslave\0"
+ 		"rprivate\0"
+ 		"runbindable\0"
 +		"union" "\0"
  	)
  
diff --git a/package/busybox/patches/510-awk_include.patch b/package/busybox/patches/510-awk_include.patch
index 7284bbcac6..50f6cc549a 100644
--- a/package/busybox/patches/510-awk_include.patch
+++ b/package/busybox/patches/510-awk_include.patch
@@ -15,7 +15,7 @@
  } func;
  
  /* I/O stream */
-@@ -1423,7 +1428,8 @@ static void parse_program(char *p)
+@@ -1420,7 +1425,8 @@ static void parse_program(char *p)
  			next_token(TC_FUNCTION);
  			g_pos++;
  			f = newfunc(t_string);
@@ -25,7 +25,7 @@
  			f->nargs = 0;
  			while (next_token(TC_VARIABLE | TC_SEQTERM) & TC_VARIABLE) {
  				v = findvar(ahash, t_string);
-@@ -1432,7 +1438,7 @@ static void parse_program(char *p)
+@@ -1429,7 +1435,7 @@ static void parse_program(char *p)
  				if (next_token(TC_COMMA | TC_SEQTERM) & TC_SEQTERM)
  					break;
  			}
@@ -34,7 +34,7 @@
  			chain_group();
  			clear_array(ahash);
  
-@@ -2397,7 +2403,8 @@ static var *evaluate(node *op, var *res)
+@@ -2408,7 +2414,8 @@ static var *evaluate(node *op, var *res)
  			break;
  
  		case XC( OC_FUNC ):
@@ -44,7 +44,7 @@
  				syntax_error(EMSG_UNDEF_FUNC);
  
  			X.v = R.v = nvalloc(op->r.f->nargs+1);
-@@ -2414,7 +2421,10 @@ static var *evaluate(node *op, var *res)
+@@ -2425,7 +2432,10 @@ static var *evaluate(node *op, var *res)
  			fnargs = X.v;
  
  			L.s = g_progname;
@@ -56,7 +56,7 @@
  			g_progname = L.s;
  
  			nvfree(fnargs);
-@@ -2777,6 +2787,143 @@ static rstream *next_input_file(void)
+@@ -2788,6 +2798,143 @@ static rstream *next_input_file(void)
  #undef files_happen
  }
  
@@ -200,7 +200,7 @@
  int awk_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
  int awk_main(int argc, char **argv)
  {
-@@ -2842,6 +2989,9 @@ int awk_main(int argc, char **argv)
+@@ -2853,6 +3000,9 @@ int awk_main(int argc, char **argv)
  			*s1 = '=';
  		}
  	}
diff --git a/package/busybox/patches/524-udhcpc_renew.patch b/package/busybox/patches/524-udhcpc_renew.patch
index 02bafaa97c..0a43b8fe32 100644
--- a/package/busybox/patches/524-udhcpc_renew.patch
+++ b/package/busybox/patches/524-udhcpc_renew.patch
@@ -1,6 +1,6 @@
 --- a/networking/udhcp/dhcpc.c
 +++ b/networking/udhcp/dhcpc.c
-@@ -63,7 +63,6 @@ static void perform_renew(void)
+@@ -69,7 +69,6 @@ static void perform_renew(void)
  		state = RENEW_REQUESTED;
  		break;
  	case RENEW_REQUESTED: /* impatient are we? fine, square 1 */
diff --git a/package/busybox/patches/530-watchdog_fix.patch b/package/busybox/patches/530-watchdog_fix.patch
index 64e6dd5fd1..e69de29bb2 100644
--- a/package/busybox/patches/530-watchdog_fix.patch
+++ b/package/busybox/patches/530-watchdog_fix.patch
@@ -1,12 +0,0 @@
---- a/miscutils/watchdog.c
-+++ b/miscutils/watchdog.c
-@@ -10,7 +10,8 @@
-  */
- 
- #include "libbb.h"
--#include "linux/watchdog.h"
-+#include <linux/types.h>
-+#include <linux/watchdog.h>
- 
- #define OPT_FOREGROUND  (1 << 0)
- #define OPT_STIMER      (1 << 1)
diff --git a/package/busybox/patches/801-brctl_zero_time.patch b/package/busybox/patches/801-brctl_zero_time.patch
index e083f9f71f..52e5623e64 100644
--- a/package/busybox/patches/801-brctl_zero_time.patch
+++ b/package/busybox/patches/801-brctl_zero_time.patch
@@ -1,6 +1,6 @@
 --- a/networking/brctl.c
 +++ b/networking/brctl.c
-@@ -34,8 +34,9 @@ static ALWAYS_INLINE void strtotimeval(s
+@@ -48,8 +48,9 @@ static ALWAYS_INLINE void strtotimeval(s
  {
  	double secs;
  #if BRCTL_USE_INTERNAL
diff --git a/package/busybox/patches/802-brctl_linux24.patch b/package/busybox/patches/802-brctl_linux24.patch
index 84321e0c72..9081e5adc4 100644
--- a/package/busybox/patches/802-brctl_linux24.patch
+++ b/package/busybox/patches/802-brctl_linux24.patch
@@ -1,6 +1,6 @@
 --- a/networking/brctl.c
 +++ b/networking/brctl.c
-@@ -18,7 +18,7 @@
+@@ -32,7 +32,7 @@
  
  /* Maximum number of ports supported per bridge interface.  */
  #ifndef MAX_PORTS
@@ -9,7 +9,7 @@
  #endif
  
  /* Use internal number parsing and not the "exact" conversion.  */
-@@ -155,6 +155,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
+@@ -169,6 +169,7 @@ int brctl_main(int argc UNUSED_PARAM, ch
  				printf(bi.stp_enabled ? "\tyes" : "\tno");
  
  				/* print interface list */
@@ -17,7 +17,7 @@
  				arm_ioctl(args, BRCTL_GET_PORT_LIST,
  							(unsigned long) ifidx, MAX_PORTS);
  				xioctl(fd, SIOCDEVPRIVATE, &ifr);
-@@ -183,9 +184,19 @@ int brctl_main(int argc UNUSED_PARAM, ch
+@@ -197,9 +198,19 @@ int brctl_main(int argc UNUSED_PARAM, ch
  		br = *argv++;
  
  		if (key == ARG_addbr || key == ARG_delbr) { /* addbr or delbr */
@@ -40,9 +40,9 @@
  			goto done;
  		}
  
-@@ -194,14 +205,27 @@ int brctl_main(int argc UNUSED_PARAM, ch
+@@ -208,14 +219,27 @@ int brctl_main(int argc UNUSED_PARAM, ch
  
- 		strncpy(ifr.ifr_name, br, IFNAMSIZ);
+ 		strncpy_IFNAMSIZ(ifr.ifr_name, br);
  		if (key == ARG_addif || key == ARG_delif) { /* addif or delif */
 +			int ret;
 +			int if_index;
diff --git a/package/busybox/patches/803-id_getgrouplist.patch b/package/busybox/patches/803-id_getgrouplist.patch
index ddc89f269b..dd2dee66f6 100644
--- a/package/busybox/patches/803-id_getgrouplist.patch
+++ b/package/busybox/patches/803-id_getgrouplist.patch
@@ -19,7 +19,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
  #endif
  #endif
  #endif
-@@ -86,7 +88,11 @@ static int get_groups(const char *userna
+@@ -82,7 +84,11 @@ static int get_groups(const char *userna
  		/* If the user is a member of more than
  		 * *n groups, then -1 is returned. Otherwise >= 0.
  		 * (and no defined way of detecting errors?!) */
@@ -31,7 +31,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
  		/* I guess *n < 0 might indicate error. Anyway,
  		 * malloc'ing -1 bytes won't be good, so: */
  		//if (*n < 0)
-@@ -160,6 +166,7 @@ int id_main(int argc UNUSED_PARAM, char 
+@@ -154,6 +160,7 @@ int id_main(int argc UNUSED_PARAM, char 
  			if (egid != rgid)
  				status |= print_group(egid, " ");
  		}
@@ -39,7 +39,7 @@ Signed-off-by: Nicolas Thill <nico@openwrt.org>
  		/* We are supplying largish buffer, trying
  		 * to not run get_groups() twice. That might be slow
  		 * ("user database in remote SQL server" case) */
-@@ -187,6 +194,7 @@ int id_main(int argc UNUSED_PARAM, char 
+@@ -181,6 +188,7 @@ int id_main(int argc UNUSED_PARAM, char 
  		}
  		if (ENABLE_FEATURE_CLEAN_UP)
  			free(groups);
diff --git a/package/busybox/patches/901-df_human_readable.patch b/package/busybox/patches/901-df_human_readable.patch
index 1dadbac0e2..e69de29bb2 100644
--- a/package/busybox/patches/901-df_human_readable.patch
+++ b/package/busybox/patches/901-df_human_readable.patch
@@ -1,13 +0,0 @@
---- a/coreutils/df.c
-+++ b/coreutils/df.c
-@@ -53,8 +53,8 @@ int df_main(int argc, char **argv)
- 		OPT_ALL   = (1 << 2) * ENABLE_FEATURE_DF_FANCY,
- 		OPT_INODE = (1 << 3) * ENABLE_FEATURE_DF_FANCY,
- 		OPT_BSIZE = (1 << 4) * ENABLE_FEATURE_DF_FANCY,
--		OPT_HUMAN = (1 << 5) * ENABLE_FEATURE_HUMAN_READABLE,
--		OPT_MEGA  = (1 << 6) * ENABLE_FEATURE_HUMAN_READABLE,
-+		OPT_HUMAN = (1 << (2 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
-+		OPT_MEGA  = (1 << (3 + 3*ENABLE_FEATURE_DF_FANCY)) * ENABLE_FEATURE_HUMAN_READABLE,
- 	};
- 	const char *disp_units_hdr = NULL;
- 	char *chp;