core/busybox: upgrade to 1.14.1

7 files changed, 282 insertions, 67 deletions

diff --git a/core/busybox/APKBUILD b/core/busybox/APKBUILD
index a6ad2e1937..56b6a2a9e1 100644
--- a/core/busybox/APKBUILD
+++ b/core/busybox/APKBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.13.4
-pkgrel=2
+pkgver=1.14.1
+pkgrel=0
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 license=GPL-2
-depends=uclibc
+depends=
 install="$pkgname.post-install $pkgname.post-upgrade"
 source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	$pkgname-1.12.1-vi-path.patch
 	$pkgname-1.11.1-bb.patch
-	busybox-1.13.2-modprobe-errormsg.patch
-	busybox-1.13.2-depmod2.patch
+	busybox-1.14.1-ftpd.patch
+	busybox-1.14.1-modprobe.patch
+	busybox-1.14.1-telnetd.patch
 	bb-tar-numeric-owner.patch
 	$install
 	busyboxconfig"
@@ -42,12 +43,13 @@ build() {
 	ln -s /bin/busybox "$pkgdir"/bin/sh
 }
 
-md5sums="8a5eb7f15d4077d18fa97bda7a4e5412  busybox-1.13.4.tar.bz2
+md5sums="d5186821d4f4cf6017452c7c8730cf19  busybox-1.14.1.tar.bz2
 f5a8ae3145aa249868c1a1abc319c228  busybox-1.12.1-vi-path.patch
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
-a743ec04f378b8456a725c7270b0be8b  busybox-1.13.2-modprobe-errormsg.patch
-3c43008545e069749d2d653532e1feb3  busybox-1.13.2-depmod2.patch
+b49e33a98d7be2a52d772f3600c4aa78  busybox-1.14.1-ftpd.patch
+11877bde19afe1f6e1f55d9b5c9ee900  busybox-1.14.1-modprobe.patch
+9020600467cdb1a1df7df41a1ba0c6e9  busybox-1.14.1-telnetd.patch
 0b5b2d7db201f90cd08f4a3164ee29a1  bb-tar-numeric-owner.patch
 56b78c358797cd15fb64719a48939267  busybox.post-install
 56b78c358797cd15fb64719a48939267  busybox.post-upgrade
-2ecfd91c98b347be6834a9c0f3a42f52  busyboxconfig"
+6d9cd13b546d9c6063d36c0d3d963887  busyboxconfig"
diff --git a/core/busybox/busybox-1.13.2-depmod2.patch b/core/busybox/busybox-1.13.2-depmod2.patch
deleted file mode 100644
index 8261fc8890..0000000000
--- a/core/busybox/busybox-1.13.2-depmod2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- busybox-1.13.2/modutils/depmod.c.orig	2009-02-25 11:54:02.000000000 +0000
-+++ busybox-1.13.2/modutils/depmod.c	2009-02-25 11:57:33.000000000 +0000
-@@ -36,7 +36,8 @@
- 	ARG_b = (1<<2), /* base directory when modules are in staging area */
- 	ARG_e = (1<<3), /* with -F, print unresolved symbols */
- 	ARG_F = (1<<4), /* System.map that contains the symbols */
--	ARG_n = (1<<5)  /* dry-run, print to stdout only */
-+	ARG_n = (1<<5), /* dry-run, print to stdout only */
-+	ARG_r = (1<<6)  /* Compat dummy. Linux Makefile uses it */
- };
- 
- static int FAST_FUNC parse_module(const char *fname, struct stat *sb,
-@@ -138,7 +139,7 @@
- 	struct utsname uts;
- 	int tmp;
- 
--	getopt32(argv, "aAb:eF:n", &moddir_base, NULL);
-+	getopt32(argv, "aAb:eF:nr", &moddir_base, NULL);
- 	argv += optind;
- 
- 	/* goto modules location */
diff --git a/core/busybox/busybox-1.13.2-modprobe-errormsg.patch b/core/busybox/busybox-1.13.2-modprobe-errormsg.patch
deleted file mode 100644
index c2a7ee5b95..0000000000
--- a/core/busybox/busybox-1.13.2-modprobe-errormsg.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- busybox-1.13.2/modutils/modprobe.c	2008-11-09 19:28:03.000000000 +0200
-+++ busybox/modutils/modprobe.c	2009-02-25 13:19:07.000000000 +0200
-@@ -193,7 +193,7 @@
- 	if (ENABLE_FEATURE_CLEAN_UP)
- 		RELEASE_CONFIG_BUFFER(modname);
- 	if (rc > 0 && !(option_mask32 & INSMOD_OPT_SILENT))
--		bb_error_msg("Failed to %sload module %s: %s.",
-+		bb_error_msg("failed to %sload module %s: %s",
- 			     (option_mask32 & MODPROBE_OPT_REMOVE) ? "un" : "",
- 			     module, moderror(rc));
- 	return rc;
-@@ -270,7 +270,7 @@
- 			    check_blacklist(conf, conf->probename)) {
- 				rc = do_modprobe(conf, conf->probename);
- 				if (rc < 0 && !(opt & INSMOD_OPT_SILENT))
--					bb_error_msg("Module %s not found.", arg);
-+					bb_error_msg("module %s not found", arg);
- 			}
- 		} else {
- 			/* Probe all aliases */
diff --git a/core/busybox/busybox-1.14.1-ftpd.patch b/core/busybox/busybox-1.14.1-ftpd.patch
new file mode 100644
index 0000000000..d33977ff67
--- /dev/null
+++ b/core/busybox/busybox-1.14.1-ftpd.patch
@@ -0,0 +1,22 @@
+diff -urpN busybox-1.14.1/networking/ftpd.c busybox-1.14.1-ftpd/networking/ftpd.c
+--- busybox-1.14.1/networking/ftpd.c	2009-05-27 18:00:23.000000000 +0200
++++ busybox-1.14.1-ftpd/networking/ftpd.c	2009-06-04 18:59:49.000000000 +0200
+@@ -1320,6 +1320,8 @@ int ftpd_main(int argc UNUSED_PARAM, cha
+ 				handle_appe();
+ 			else if (cmdval == const_STOU) /* "store unique" */
+ 				handle_stou();
++			else
++				goto bad_cmd;
+ 		}
+ #endif
+ #if 0
+@@ -1340,6 +1342,9 @@ int ftpd_main(int argc UNUSED_PARAM, cha
+ 			 * (doesn't necessarily mean "we must support them")
+ 			 * foo 1.2.3: XXXX - comment
+ 			 */
++#if ENABLE_FEATURE_FTP_WRITE
++ bad_cmd:
++#endif
+ 			cmdio_write_raw(STR(FTP_BADCMD)" Unknown command\r\n");
+ 		}
+ 	}
diff --git a/core/busybox/busybox-1.14.1-modprobe.patch b/core/busybox/busybox-1.14.1-modprobe.patch
new file mode 100644
index 0000000000..96901250f3
--- /dev/null
+++ b/core/busybox/busybox-1.14.1-modprobe.patch
@@ -0,0 +1,132 @@
+diff -urpN busybox-1.14.1/modutils/modprobe.c busybox-1.14.1-modprobe/modutils/modprobe.c
+--- busybox-1.14.1/modutils/modprobe.c	2009-05-27 18:01:37.000000000 +0200
++++ busybox-1.14.1-modprobe/modutils/modprobe.c	2009-06-04 19:01:04.000000000 +0200
+@@ -8,12 +8,17 @@
+  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+  */
+ 
++/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
++ * we expect the full dependency list to be specified in modules.dep.  Older
++ * versions would only export the direct dependency list.
++ */
++
+ #include "libbb.h"
+ #include "modutils.h"
+ #include <sys/utsname.h>
+ #include <fnmatch.h>
+ 
+-//#define DBG(...) bb_error_msg(__VA_ARGS__)
++//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
+ #define DBG(...) ((void)0)
+ 
+ #define MODULE_FLAG_LOADED		0x0001
+@@ -116,6 +121,7 @@ static void add_probe(const char *name)
+ 		return;
+ 	}
+ 
++	DBG("queuing %s", name);
+ 	m->probed_name = name;
+ 	m->flags |= MODULE_FLAG_NEED_DEPS;
+ 	llist_add_to_end(&G.probes, m);
+@@ -205,9 +211,10 @@ static int read_config(const char *path)
+ 
+ static int do_modprobe(struct module_entry *m)
+ {
+-	struct module_entry *m2;
++	struct module_entry *m2 = m2; /* for compiler */
+ 	char *fn, *options;
+-	int rc = -1;
++	int rc, first;
++	llist_t *l;
+ 
+ 	if (!(m->flags & MODULE_FLAG_FOUND_IN_MODDEP)) {
+ 		DBG("skipping %s, not found in modules.dep", m->modname);
+@@ -218,13 +225,25 @@ static int do_modprobe(struct module_ent
+ 	if (!(option_mask32 & MODPROBE_OPT_REMOVE))
+ 		m->deps = llist_rev(m->deps);
+ 
++	for (l = m->deps; l != NULL; l = l->link)
++		DBG("dep: %s", l->data);
++
++	first = 1;
+ 	rc = 0;
+ 	while (m->deps && rc == 0) {
+ 		fn = llist_pop(&m->deps);
+ 		m2 = get_or_add_modentry(fn);
+ 		if (option_mask32 & MODPROBE_OPT_REMOVE) {
+-			if (bb_delete_module(m->modname, O_EXCL) != 0)
+-				rc = errno;
++			if (m2->flags & MODULE_FLAG_LOADED) {
++				if (bb_delete_module(m2->modname, O_EXCL) != 0) {
++					if (first)
++						rc = errno;
++				} else {
++					m2->flags &= ~MODULE_FLAG_LOADED;
++				}
++			}
++			/* do not error out if *deps* fail to unload */
++			first = 0;
+ 		} else if (!(m2->flags & MODULE_FLAG_LOADED)) {
+ 			options = m2->options;
+ 			m2->options = NULL;
+@@ -242,11 +261,10 @@ static int do_modprobe(struct module_ent
+ 		free(fn);
+ 	}
+ 
+-//FIXME: what if rc < 0?
+-	if (rc > 0 && !(option_mask32 & INSMOD_OPT_SILENT)) {
++	if (rc && !(option_mask32 & INSMOD_OPT_SILENT)) {
+ 		bb_error_msg("failed to %sload module %s: %s",
+ 			(option_mask32 & MODPROBE_OPT_REMOVE) ? "un" : "",
+-			m->probed_name ? m->probed_name : m->modname,
++			m2->probed_name ? m2->probed_name : m2->modname,
+ 			moderror(rc)
+ 		);
+ 	}
+@@ -294,7 +312,8 @@ static void load_modules_dep(void)
+ 			llist_add_to(&m->deps, xstrdup(tokens[0]));
+ 			if (tokens[1])
+ 				string_to_llist(tokens[1], &m->deps, " ");
+-		}
++		} else
++			DBG("skipping dep line");
+ 	}
+ 	config_close(p);
+ }
+@@ -344,10 +363,12 @@ int modprobe_main(int argc UNUSED_PARAM,
+ 	if (opt & (MODPROBE_OPT_INSERT_ALL | MODPROBE_OPT_REMOVE)) {
+ 		/* Each argument is a module name */
+ 		do {
++			DBG("adding module %s", *argv);
+ 			add_probe(*argv++);
+ 		} while (*argv);
+ 	} else {
+ 		/* First argument is module name, rest are parameters */
++		DBG("probing just module %s", *argv);
+ 		add_probe(argv[0]);
+ 		G.cmdline_mopts = parse_cmdline_module_options(argv);
+ 	}
+diff -urpN busybox-1.14.1/modutils/modprobe-small.c busybox-1.14.1-modprobe/modutils/modprobe-small.c
+--- busybox-1.14.1/modutils/modprobe-small.c	2009-05-27 18:00:23.000000000 +0200
++++ busybox-1.14.1-modprobe/modutils/modprobe-small.c	2009-06-04 19:01:28.000000000 +0200
+@@ -656,7 +656,7 @@ depmod -[aA] [-n -e -v -q -V -r -u]
+       [-b basedirectory] [forced_version]
+ depmod [-n -e -v -q -r -u] [-F kernelsyms] module1.ko module2.ko ...
+ If no arguments (except options) are given, "depmod -a" is assumed.
+-depmod will output a dependancy list suitable for the modprobe utility.
++depmod will output a dependency list suitable for the modprobe utility.
+ Options:
+     -a, --all           Probe all modules
+     -A, --quick         Only does the work if there's a new module
+diff -urpN busybox-1.14.1/modutils/modutils.c busybox-1.14.1-modprobe/modutils/modutils.c
+--- busybox-1.14.1/modutils/modutils.c	2009-05-27 18:00:23.000000000 +0200
++++ busybox-1.14.1-modprobe/modutils/modutils.c	2009-06-03 12:50:48.000000000 +0200
+@@ -57,7 +57,7 @@ char * FAST_FUNC filename2modname(const 
+ 	from = bb_get_last_path_component_nostrip(filename);
+ 	for (i = 0; i < (MODULE_NAME_LEN-1) && from[i] != '\0' && from[i] != '.'; i++)
+ 		modname[i] = (from[i] == '-') ? '_' : from[i];
+-	modname[i] = 0;
++	modname[i] = '\0';
+ 
+ 	return modname;
+ }
diff --git a/core/busybox/busybox-1.14.1-telnetd.patch b/core/busybox/busybox-1.14.1-telnetd.patch
new file mode 100644
index 0000000000..099e5eb839
--- /dev/null
+++ b/core/busybox/busybox-1.14.1-telnetd.patch
@@ -0,0 +1,85 @@
+diff -urpN busybox-1.14.1/networking/telnetd.c busybox-1.14.1-telnetd/networking/telnetd.c
+--- busybox-1.14.1/networking/telnetd.c	2009-05-27 18:00:23.000000000 +0200
++++ busybox-1.14.1-telnetd/networking/telnetd.c	2009-06-09 22:54:06.000000000 +0200
+@@ -199,9 +199,17 @@ static size_t iac_safe_write(int fd, con
+ 	return total + rc;
+ }
+ 
++/* Must match getopt32 string */
++enum {
++	OPT_WATCHCHILD = (1 << 2), /* -K */
++	OPT_INETD      = (1 << 3) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -i */
++	OPT_PORT       = (1 << 4) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -p */
++	OPT_FOREGROUND = (1 << 6) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -F */
++};
++
+ static struct tsession *
+ make_new_session(
+-		USE_FEATURE_TELNETD_STANDALONE(int sock)
++		USE_FEATURE_TELNETD_STANDALONE(int master_fd, int sock)
+ 		SKIP_FEATURE_TELNETD_STANDALONE(void)
+ ) {
+ 	const char *login_argv[2];
+@@ -288,9 +296,29 @@ make_new_session(
+ 	/* Restore default signal handling ASAP */
+ 	bb_signals((1 << SIGCHLD) + (1 << SIGPIPE), SIG_DFL);
+ 
++#if ENABLE_FEATURE_TELNETD_STANDALONE
++	if (!(option_mask32 & OPT_INETD)) {
++		struct tsession *tp = sessions;
++		while (tp) {
++			close(tp->ptyfd);
++			close(tp->sockfd_read);
++			/* sockfd_write == sockfd_read for standalone telnetd */
++			/*close(tp->sockfd_write);*/
++			tp = tp->next;
++		}
++	}
++#endif
++
+ 	/* Make new session and process group */
+ 	setsid();
+ 
++	close(fd);
++#if ENABLE_FEATURE_TELNETD_STANDALONE
++	close(sock);
++	if (master_fd >= 0)
++		close(master_fd);
++#endif
++
+ 	/* Open the child's side of the tty. */
+ 	/* NB: setsid() disconnects from any previous ctty's. Therefore
+ 	 * we must open child's side of the tty AFTER setsid! */
+@@ -329,14 +357,6 @@ make_new_session(
+ 	_exit(EXIT_FAILURE); /*bb_perror_msg_and_die("execv %s", loginpath);*/
+ }
+ 
+-/* Must match getopt32 string */
+-enum {
+-	OPT_WATCHCHILD = (1 << 2), /* -K */
+-	OPT_INETD      = (1 << 3) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -i */
+-	OPT_PORT       = (1 << 4) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -p */
+-	OPT_FOREGROUND = (1 << 6) * ENABLE_FEATURE_TELNETD_STANDALONE, /* -F */
+-};
+-
+ #if ENABLE_FEATURE_TELNETD_STANDALONE
+ 
+ static void
+@@ -465,7 +485,7 @@ int telnetd_main(int argc UNUSED_PARAM, 
+ 
+ #if ENABLE_FEATURE_TELNETD_STANDALONE
+ 	if (IS_INETD) {
+-		sessions = make_new_session(0);
++		sessions = make_new_session(-1, 0);
+ 		if (!sessions) /* pty opening or vfork problem, exit */
+ 			return 1; /* make_new_session prints error message */
+ 	} else {
+@@ -553,7 +573,7 @@ int telnetd_main(int argc UNUSED_PARAM, 
+ 		if (fd < 0)
+ 			goto again;
+ 		/* Create a new session and link it into our active list */
+-		new_ts = make_new_session(fd);
++		new_ts = make_new_session(master_fd, fd);
+ 		if (new_ts) {
+ 			new_ts->next = sessions;
+ 			sessions = new_ts;
diff --git a/core/busybox/busyboxconfig b/core/busybox/busyboxconfig
index 696ff9a2ac..514886170e 100644
--- a/core/busybox/busyboxconfig
+++ b/core/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.13.4
-# Tue May 26 06:17:14 2009
+# Busybox version: 1.14.1
+# Fri Jun 12 06:14:14 2009
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -47,6 +47,7 @@ CONFIG_PIE=y
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_LFS=y
 CONFIG_CROSS_COMPILER_PREFIX=""
+CONFIG_EXTRA_CFLAGS=""
 
 #
 # Debugging Options
@@ -70,7 +71,7 @@ CONFIG_INSTALL_APPLET_DONT=y
 # CONFIG_INSTALL_SH_APPLET_SYMLINK is not set
 # CONFIG_INSTALL_SH_APPLET_HARDLINK is not set
 # CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set
-CONFIG_PREFIX="../../pkg/busybox"
+CONFIG_PREFIX="/home/ncopa/aports/core/busybox/pkg/busybox"
 
 #
 # Busybox Library Tuning
@@ -110,6 +111,7 @@ CONFIG_BUNZIP2=y
 CONFIG_BZIP2=y
 CONFIG_CPIO=y
 CONFIG_FEATURE_CPIO_O=y
+CONFIG_FEATURE_CPIO_P=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
@@ -207,6 +209,8 @@ CONFIG_RMDIR=y
 # CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
 CONFIG_SEQ=y
 CONFIG_SHA1SUM=y
+CONFIG_SHA256SUM=y
+CONFIG_SHA512SUM=y
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -296,9 +300,9 @@ CONFIG_PIPE_PROGRESS=y
 CONFIG_RUN_PARTS=y
 CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
 # CONFIG_FEATURE_RUN_PARTS_FANCY is not set
-CONFIG_START_STOP_DAEMON=y
-CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
 CONFIG_WHICH=y
 
 #
@@ -386,6 +390,7 @@ CONFIG_FEATURE_SHADOWPASSWDS=y
 CONFIG_USE_BB_PWD_GRP=y
 CONFIG_USE_BB_SHADOW=y
 # CONFIG_USE_BB_CRYPT is not set
+# CONFIG_USE_BB_CRYPT_SHA is not set
 CONFIG_ADDGROUP=y
 CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_DELGROUP=y
@@ -422,8 +427,6 @@ CONFIG_FSCK=y
 #
 # Linux Module Utilities
 #
-CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
-CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_MODPROBE_SMALL is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
 # CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
@@ -447,10 +450,14 @@ CONFIG_DEPMOD=y
 CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 CONFIG_FEATURE_MODUTILS_ALIAS=y
 CONFIG_FEATURE_MODUTILS_SYMBOLS=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 
 #
 # Linux System Utilities
 #
+CONFIG_ACPID=y
+CONFIG_FEATURE_ACPID_COMPAT=y
 # CONFIG_BLKID is not set
 CONFIG_DMESG=y
 CONFIG_FEATURE_DMESG_PRETTY=y
@@ -472,6 +479,7 @@ CONFIG_FEATURE_FDISK_ADVANCED=y
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_FEATURE_MINIX2 is not set
+CONFIG_MKFS_VFAT=y
 CONFIG_GETOPT=y
 CONFIG_HEXDUMP=y
 CONFIG_FEATURE_HEXDUMP_REVERSE=y
@@ -554,6 +562,7 @@ CONFIG_BBCONFIG=y
 CONFIG_CROND=y
 CONFIG_FEATURE_CROND_D=y
 CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
+CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
 CONFIG_CRONTAB=y
 CONFIG_DC=y
 CONFIG_FEATURE_DC_LIBM=y
@@ -566,7 +575,9 @@ CONFIG_FEATURE_DC_LIBM=y
 CONFIG_EJECT=y
 CONFIG_FEATURE_EJECT_SCSI=y
 CONFIG_FBSPLASH=y
-# CONFIG_INOTIFYD is not set
+# CONFIG_FLASH_ERASEALL is not set
+CONFIG_IONICE=y
+CONFIG_INOTIFYD=y
 CONFIG_LAST=y
 CONFIG_FEATURE_LAST_SMALL=y
 # CONFIG_FEATURE_LAST_FANCY is not set
@@ -574,11 +585,11 @@ CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
 CONFIG_FEATURE_LESS_FLAGS=y
-CONFIG_FEATURE_LESS_DASHCMD=y
 CONFIG_FEATURE_LESS_MARKS=y
 CONFIG_FEATURE_LESS_REGEXP=y
-CONFIG_FEATURE_LESS_LINENUMS=y
 CONFIG_FEATURE_LESS_WINCH=y
+CONFIG_FEATURE_LESS_DASHCMD=y
+CONFIG_FEATURE_LESS_LINENUMS=y
 # CONFIG_HDPARM is not set
 # CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -602,6 +613,7 @@ CONFIG_STRINGS=y
 # CONFIG_TASKSET is not set
 # CONFIG_FEATURE_TASKSET_FANCY is not set
 CONFIG_TIME=y
+CONFIG_TIMEOUT=y
 CONFIG_TTYSIZE=y
 CONFIG_WATCHDOG=y
 
@@ -619,6 +631,8 @@ CONFIG_FEATURE_BRCTL_SHOW=y
 CONFIG_DNSD=y
 CONFIG_ETHER_WAKE=y
 CONFIG_FAKEIDENTD=y
+CONFIG_FTPD=y
+CONFIG_FEATURE_FTP_WRITE=y
 CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
@@ -626,11 +640,9 @@ CONFIG_HOSTNAME=y
 CONFIG_HTTPD=y
 CONFIG_FEATURE_HTTPD_RANGES=y
 CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
 CONFIG_FEATURE_HTTPD_SETUID=y
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
 CONFIG_FEATURE_HTTPD_AUTH_MD5=y
-CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES=y
 CONFIG_FEATURE_HTTPD_CGI=y
 CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
 CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
@@ -718,6 +730,7 @@ CONFIG_FEATURE_UDHCPC_ARPING=y
 CONFIG_FEATURE_UDHCP_RFC3397=y
 CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
 CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
+CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
 CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
@@ -725,6 +738,8 @@ CONFIG_FEATURE_WGET_AUTHENTICATION=y
 # CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
 CONFIG_ZCIP=y
 # CONFIG_TCPSVD is not set
+CONFIG_TUNCTL=y
+CONFIG_FEATURE_TUNCTL_UG=y
 # CONFIG_UDPSVD is not set
 
 #
@@ -744,8 +759,6 @@ CONFIG_FEATURE_MIME_CHARSET="us-ascii"
 CONFIG_REFORMIME=y
 CONFIG_FEATURE_REFORMIME_COMPAT=y
 CONFIG_SENDMAIL=y
-# CONFIG_FEATURE_SENDMAIL_MAILX is not set
-# CONFIG_FEATURE_SENDMAIL_MAILXX is not set
 
 #
 # Process Utilities
@@ -824,8 +837,6 @@ CONFIG_ASH_JOB_CONTROL=y
 CONFIG_ASH_READ_NCHARS=y
 CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-CONFIG_ASH_MATH_SUPPORT_64=y
 CONFIG_ASH_GETOPTS=y
 CONFIG_ASH_BUILTIN_ECHO=y
 CONFIG_ASH_BUILTIN_PRINTF=y
@@ -843,12 +854,16 @@ CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH_IF is not set
 # CONFIG_HUSH_LOOPS is not set
 # CONFIG_HUSH_CASE is not set
+# CONFIG_HUSH_FUNCTIONS is not set
+# CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
 
 #
 # Bourne Shell Options
 #
+CONFIG_SH_MATH_SUPPORT=y
+# CONFIG_SH_MATH_SUPPORT_64 is not set
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set