main/busybox: upgrade to 1.24.1

5 files changed, 64 insertions, 147 deletions

diff --git a/main/busybox/0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch b/main/busybox/0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
index 14086269b3..3fb88fd5c0 100644
--- a/main/busybox/0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
+++ b/main/busybox/0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
@@ -1,6 +1,6 @@
-From 3809536eb8286e972fc7170493fffed35c301f29 Mon Sep 17 00:00:00 2001
+From 028524317d8d0011ed38e86e507a06738a5b5a97 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 20 Aug 2012 13:50:46 +0300
+Date: Mon, 26 Oct 2015 17:06:12 +0100
 Subject: [PATCH] ifupdown: pass interface device name for ipv6 route commands
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
@@ -12,37 +12,36 @@ some places, but kernel refuses to insert the route unless device
 name is explicitly specified in the route addition.
 
 Signed-off-by: Timo Teräs <timo.teras@iki.fi>
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
 ---
- networking/ifupdown.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ networking/ifupdown.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/networking/ifupdown.c b/networking/ifupdown.c
-index 9b34986..11a8cec 100644
+index 7c45e89..d477ff6 100644
 --- a/networking/ifupdown.c
 +++ b/networking/ifupdown.c
-@@ -401,11 +401,11 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
+@@ -394,8 +394,8 @@ static int FAST_FUNC static_up6(struct interface_defn_t *ifd, execfn *exec)
+ # if ENABLE_FEATURE_IFUPDOWN_IP
  	result = execute("ip addr add %address%/%netmask% dev %iface%[[ label %label%]]", ifd, exec);
  	result += execute("ip link set[[ mtu %mtu%]][[ addr %hwaddress%]] %iface% up", ifd, exec);
- 	/* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
--	result += execute("[[ip route add ::/0 via %gateway%]][[ prio %metric%]]", ifd, exec);
-+	result += execute("[[ip route add ::/0 via %gateway% dev %iface%]][[ prio %metric%]]", ifd, exec);
+-	/* Was: "[[ ip ....%gateway% ]]". Removed extra spaces w/o checking */
+-	result += execute("[[ip route add ::/0 via %gateway%]][[ metric %metric%]]", ifd, exec);
++	/* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
++	result += execute("[[ip route add ::/0 via %gateway% dev %iface%]][[ metric %metric%]]", ifd, exec);
  # else
  	result = execute("ifconfig %iface%[[ media %media%]][[ hw %hwaddress%]][[ mtu %mtu%]] up", ifd, exec);
  	result += execute("ifconfig %iface% add %address%/%netmask%", ifd, exec);
--	result += execute("[[route -A inet6 add ::/0 gw %gateway%[[ metric %metric%]]]]", ifd, exec);
-+	result += execute("[[route -A inet6 add ::/0 gw %gateway% dev %iface%[[ metric %metric%]]]]", ifd, exec);
- # endif
- 	return ((result == 3) ? 3 : 0);
- }
-@@ -427,7 +427,7 @@ static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
+@@ -421,7 +421,8 @@ static int FAST_FUNC v4tunnel_up(struct interface_defn_t *ifd, execfn *exec)
  			"%endpoint%[[ local %local%]][[ ttl %ttl%]]", ifd, exec);
  	result += execute("ip link set %iface% up", ifd, exec);
  	result += execute("ip addr add %address%/%netmask% dev %iface%", ifd, exec);
 -	result += execute("[[ip route add ::/0 via %gateway%]]", ifd, exec);
++	/* Reportedly, IPv6 needs "dev %iface%", but IPv4 does not: */
 +	result += execute("[[ip route add ::/0 via %gateway% dev %iface%]]", ifd, exec);
  	return ((result == 4) ? 4 : 0);
  }
  
 -- 
-1.7.12
+2.6.1
 
diff --git a/main/busybox/0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch b/main/busybox/0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
deleted file mode 100644
index 9707c95a6c..0000000000
--- a/main/busybox/0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From f47fa75ef19a43848dedb4a2bff79368878362bf Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 22 Apr 2014 12:41:20 +0000
-Subject: [PATCH] linedit, deluser: use POSIX getpwent instead of getpwent_r
-
-This fixes building with musl libc.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- libbb/lineedit.c     | 11 ++++-------
- loginutils/deluser.c | 11 +++++------
- 2 files changed, 9 insertions(+), 13 deletions(-)
-
-diff --git a/libbb/lineedit.c b/libbb/lineedit.c
-index 8564307..99e6e2c 100644
---- a/libbb/lineedit.c
-+++ b/libbb/lineedit.c
-@@ -672,20 +672,17 @@ static char *username_path_completion(char *ud)
-  */
- static NOINLINE unsigned complete_username(const char *ud)
- {
--	/* Using _r function to avoid pulling in static buffers */
--	char line_buff[256];
--	struct passwd pwd;
--	struct passwd *result;
-+	struct passwd *pw;
- 	unsigned userlen;
- 
- 	ud++; /* skip ~ */
- 	userlen = strlen(ud);
- 
- 	setpwent();
--	while (!getpwent_r(&pwd, line_buff, sizeof(line_buff), &result)) {
-+	while ((pw = getpwent())) {
- 		/* Null usernames should result in all users as possible completions. */
--		if (/*!userlen || */ strncmp(ud, pwd.pw_name, userlen) == 0) {
--			add_match(xasprintf("~%s/", pwd.pw_name));
-+		if (/*!userlen || */ strncmp(ud, pw->pw_name, userlen) == 0) {
-+			add_match(xasprintf("~%s/", pw->pw_name));
- 		}
- 	}
- 	endpwent();
-diff --git a/loginutils/deluser.c b/loginutils/deluser.c
-index e39ac55..d7d9b24 100644
---- a/loginutils/deluser.c
-+++ b/loginutils/deluser.c
-@@ -73,14 +73,13 @@ int deluser_main(int argc, char **argv)
- 			if (!member) {
- 				/* "delgroup GROUP" */
- 				struct passwd *pw;
--				struct passwd pwent;
- 				/* Check if the group is in use */
--#define passwd_buf bb_common_bufsiz1
--				while (!getpwent_r(&pwent, passwd_buf, sizeof(passwd_buf), &pw)) {
--					if (pwent.pw_gid == gr->gr_gid)
--						bb_error_msg_and_die("'%s' still has '%s' as their primary group!", pwent.pw_name, name);
-+				setpwent();
-+				while ((pw = getpwent())) {
-+					if (pw->pw_gid == gr->gr_gid)
-+						bb_error_msg_and_die("'%s' still has '%s' as their primary group!", pw->pw_name, name);
- 				}
--				//endpwent();
-+				endpwent();
- 			}
- 			pfile = bb_path_group_file;
- 			if (ENABLE_FEATURE_SHADOWPASSWDS)
--- 
-1.9.2
-
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 1a4df36af2..0dc5b2f3c8 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.23.2
-pkgrel=10
+pkgver=1.24.1
+pkgrel=0
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -16,7 +16,6 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 
 	nologin.c
 	$pkgname-1.11.1-bb.patch
-	busybox-uname-is-not-gnu.patch
 	bb-app-location.patch
 	loginutils-sha512.patch
 	udhcpc-discover-retries.patch
@@ -24,7 +23,6 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 	0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 
-	0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
 	0001-diff-add-support-for-no-dereference.patch
 
 	1000-fbsplash-use-virtual-y-size-in-mmap-size-calculation.patch
@@ -128,57 +126,51 @@ static() {
 		"$subpkgdir"/bin/busybox.static
 }
 
-md5sums="7925683d7dd105aabe9b6b618d48cc73  busybox-1.23.2.tar.bz2
+md5sums="be98a40cadf84ce2d6b05fa41a275c6a  busybox-1.24.1.tar.bz2
 8485cf1e389e891914cbb8771a6d9bbd  bbsuid.c
 d64b58a30892c558bdbab7f0d0997577  nologin.c
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
-b5375210f13fd6e1ca61a565e8fabd35  busybox-uname-is-not-gnu.patch
 c5a8dbc8696db6da9c4624b0e11d8fba  bb-app-location.patch
 8c42c9ef0f0419c314c86bcaf7796106  loginutils-sha512.patch
 91a7584a562a72ba886936558e576bbd  udhcpc-discover-retries.patch
-04eeda8c49d4688e6dec02451f8b6aae  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
+d6f0ecf89f7633753d8998abe7e06e7e  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 e1c183cbe1ca18a0fa0d9597314076c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
-239dbe5dae5d36bbf73548b2749a22b1  0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
 69fa40bee9abec058427bf67fde1b61e  0001-diff-add-support-for-no-dereference.patch
 699ce5aa1095ba4419cd595cec8a8f75  1000-fbsplash-use-virtual-y-size-in-mmap-size-calculation.patch
 b56d306ccba574da78dff060b7330806  1001-fbsplash-support-console-switching.patch
 4fe5f9e973674c7db3d07f295c363a7c  1002-fbsplash-support-image-and-bar-alignment-and-positio.patch
 4046b78ee6a25259954797d73b94f4bd  acpid.logrotate
-3dc374d3d6e901d381353c81ab773b7a  busyboxconfig
+3bcc0a7d9155d4439552ba3ff866692f  busyboxconfig
 befaac2c59c380e36a452b3f1c1d4a3a  glibc.patch"
-sha256sums="05a6f9e21aad8c098e388ae77de7b2361941afa7157ef74216703395b14e319a  busybox-1.23.2.tar.bz2
+sha256sums="37d03132cc078937360b392170b7a1d0e5b322eee9f57c0b82292a8b1f0afe3d  busybox-1.24.1.tar.bz2
 81957f1fe0c386120dad1c8174ccc1fcfeed98c14d229db7d164d4fb4c938b3d  bbsuid.c
 9bbf0bec82e6d6907474958f3be048c54657fbf49207810b7e4d4d6146f0069d  nologin.c
 327bb8049e2726351a5c8b6b2cef864f6ce58725d4453983f97092ea73656ccc  busybox-1.11.1-bb.patch
-a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef  busybox-uname-is-not-gnu.patch
 576366b4d50f1078da6c0364ef70415de92d97c93c64f4d790b11d7a34cdccd2  bb-app-location.patch
 57674b20158c0b266ed028b0c65299f9cbcad7d33d19c9fcc403d3967daba493  loginutils-sha512.patch
 90825a443339f1c8c249d05f7b025ce53e374d305f8e113d98d45146b105494d  udhcpc-discover-retries.patch
-2e9d56335ca39e944b9abd9ecc91d0e47a3fe3434f8b7ec3f526bc8fa0895ada  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
+666d0e9c5a4b37aca84d88138736012527d97de578f81b719bf913f558823e18  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 53563c6dc4db13004d0b37f7bf1748e861b5a5c4244c1d34f102c23b689420c5  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
-ac2cd5fed91bfaec22ed1f2766396d0feb29b9b96f20b2c12d5d8ac8769afae9  0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
 70180473e3939402e460b25de8273a5ce7f62b130a9efe31f33d847b2406ac92  0001-diff-add-support-for-no-dereference.patch
 043963183cad556bdae5d5608180f0cb76cf7eede175cd97aa002a787780500f  1000-fbsplash-use-virtual-y-size-in-mmap-size-calculation.patch
 b8b0b16ed67b0159256193b1d2108b8ef9aa8a334ab81e463bb970c71257da9a  1001-fbsplash-support-console-switching.patch
 e1f3fad8e21dfd72cfcae7ab3ba31d7938e964e0f9ec08b2da0b14d462435424  1002-fbsplash-support-image-and-bar-alignment-and-positio.patch
 f7cbeb5a5a47395ad30454ce8262abcd3e91c33ef803c2ae31a9258d7142dd48  acpid.logrotate
-51ed9bcb94bfc544b9652caf993b250b0ff70e7605b307980a9bb46167a4e7f4  busyboxconfig
+2c4987e8a7ef2b47e947a0067b6facfc687f8192c683dfe35beb264e8bff28d7  busyboxconfig
 c604ef791c31d35a8c5ee4558d21428a46f37a6d762c4a7e29864f4037fc44a0  glibc.patch"
-sha512sums="209c8ef26e40ccb81510f6b663202b080f9bbecac7faf386bbabf7e36a43d63b15dd6ce9f7a84c1ccc5345c524999812251da1e113ef9faadc6af1fedd24c7c9  busybox-1.23.2.tar.bz2
+sha512sums="3afc757ebaae61ae13c2c69097ee734717434f9e658eb77093a8b7b49af3326cbca2d723483ff84a1da99544b822fd2b47d9a97c68f09962e11754e5daf124ca  busybox-1.24.1.tar.bz2
 16b3dd6a8b76b062d51458351fcb44f84b49eb4bf898584c933df90fb2cb3966f9547865a4d7447589bb20b7c203beb04ff7512f76f85d29138d2cff4eb9ee81  bbsuid.c
 4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2  nologin.c
 eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d499e8dffbe6df8aa37ae27625c552162923d59fe35b55b32b  busybox-1.11.1-bb.patch
-225c0608972f7daaca672eafdf647eea392e076537287370ca7791931de4803645d4d159385dc2909314028dccba3c64d0c89fa4e1184f856959b17c58459ed1  busybox-uname-is-not-gnu.patch
 5c42b05be69c834c9fd5372c6b0d55a6399c74146a94ea09eae7285dd4fa75d1bde38bf7ab73e98638f65eb72db02115453cbdfe85a0085d742940366f617c7d  bb-app-location.patch
 69af4800fcf765b4ae029daced7ff171b6b04d810c94a987c7ba848e275a27b77b18b38df1b85f4a12c4a47ed42f62e0768260eb1198e2aff1c3cea898b85c61  loginutils-sha512.patch
 34415fe69f6b8d42756046aa8e6d9e4f64a3b0ceb9f57c4c988e35870fe975f05d0ac76f1f9a712196e9c59e67aa2a54abf398242009134fb3aca342c25a3646  udhcpc-discover-retries.patch
-f2ed7bf994766a20ceecb28bea8c66307b6b66cdd7099408b1f29a529786ce07e55824b21256321708663e00d6fe9428480b0d3e121b67d6ebd8a8a87b1486d1  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
+9c836f85d5bc3b33d459394679a93635658c59fb744e266109f84531d391880926d62d671f8ccef56d3b744f0bcc54a8ad2789931e50dcbc40d5d94158bcc503  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 b1a1cc2ada657a3d3364c8c96853575d73784e769cd8768c170c27a3e59abd2beace75dff6d5047c4391725e961d93149f9c3f45ed75fb1c582bf18b818282c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
-6781b10ca078296b243373d2c3f2bca2507a9df18a6b06d051e9ce84ed31a238aef3b2bb085daf12b145550be68c07c854272bd78a6f77da9197779b9c7cd9e9  0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
 a35b66cd28b79ccc14b47315ac94677fdf8c14d8a6e8956707e71fb50d453dfc5b4b822832cd1faecfe9bf79e687f9b25a1357e0a88db530044c5f8514701c98  0001-diff-add-support-for-no-dereference.patch
 2a8e9360e1cedd26bdb70d8cc036ef0abc7588bf2eee147c1c7436d7a40763f8e31d346b980145a36649130a2f811d299e4f46f7e1b60a8165a60ae9e79727d5  1000-fbsplash-use-virtual-y-size-in-mmap-size-calculation.patch
 a181dd54e8e11cf1199edb1b1fcd4b7402bbf142593b6014f32c6815bb7093b56899ad0fcc9f73c382f56203ac5274fb3d51fa070feb541436f23c31680f1a69  1001-fbsplash-support-console-switching.patch
 c33073416f7da2805a20f3f456f869217171c8fbfdef85f4ae481307aeb1e1b5717084bbbc619010fa5500c3f3f49b6468d5c122024fcc49d637c82427a3f553  1002-fbsplash-support-image-and-bar-alignment-and-positio.patch
 dadb4c953ebc755b88ee95c1489feb0c2d352f6e44abc716166024e6eea11ab9d10c84fad62c081775834d205cb04aa1be3c994676c88f4284495c54b9188e8b  acpid.logrotate
-e79f8fd31f660d6ae5df1a5bfde17f09a9457801e8b9bf509cc4cb401dc7243276fd8b95c13e657561f08c12426121e55338d960eca78e50fa628583883baced  busyboxconfig
+03aa02d9799d43d9aaa1675bc9a146ccdce58026b6f2775215b6017ae187d48df3a1033727c8569f835c55835919602662a7f674ed8147559b0c586181a415fe  busyboxconfig
 1d2739379dab1deb3eae7cffd4845300eb7d30f7343b4a1209b21a5680860d55080ad45fdefe098b249ce3040c01951fa7f0a79cd447b2d7b260eb000099d9dc  glibc.patch"
diff --git a/main/busybox/busybox-uname-is-not-gnu.patch b/main/busybox/busybox-uname-is-not-gnu.patch
deleted file mode 100644
index 95b31394c3..0000000000
--- a/main/busybox/busybox-uname-is-not-gnu.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- busybox-1.18.2.orig/coreutils/uname.c
-+++ busybox-1.18.2/coreutils/uname.c
-@@ -56,7 +56,7 @@
- 	struct utsname name;
- 	char processor[sizeof(((struct utsname*)NULL)->machine)];
- 	char platform[sizeof(((struct utsname*)NULL)->machine)];
--	char os[sizeof("GNU/Linux")];
-+	char os[sizeof("Linux")];
- } uname_info_t;
- 
- static const char options[] ALIGN1 = "snrvmpioa";
-@@ -123,7 +123,7 @@
- #endif
- 	strcpy(uname_info.processor, unknown_str);
- 	strcpy(uname_info.platform, unknown_str);
--	strcpy(uname_info.os, "GNU/Linux");
-+	strcpy(uname_info.os, "Linux");
- #if 0
- 	/* Fedora does something like this */
- 	strcpy(uname_info.processor, uname_info.name.machine);
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 11a939ec03..4bb03545ab 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.23.2
-# Fri Aug 21 21:52:52 2015
+# Busybox version: 1.24.1
+# Wed Oct 28 09:25:45 2015
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -41,8 +41,8 @@ CONFIG_FEATURE_USE_SENDFILE=y
 CONFIG_LONG_OPTS=y
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
-CONFIG_FEATURE_UTMP=y
-CONFIG_FEATURE_WTMP=y
+# CONFIG_FEATURE_UTMP is not set
+# CONFIG_FEATURE_WTMP is not set
 CONFIG_FEATURE_PIDFILE=y
 CONFIG_PID_FILE_PATH="/var/run"
 CONFIG_FEATURE_SUID=y
@@ -156,6 +156,7 @@ CONFIG_FEATURE_CPIO_P=y
 CONFIG_GZIP=y
 # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
 CONFIG_GZIP_FAST=2
+CONFIG_FEATURE_GZIP_LEVELS=y
 CONFIG_LZOP=y
 # CONFIG_LZOP_COMPR_HIGH is not set
 # CONFIG_RPM is not set
@@ -183,10 +184,17 @@ CONFIG_DATE=y
 CONFIG_FEATURE_DATE_ISOFMT=y
 # CONFIG_FEATURE_DATE_NANO is not set
 CONFIG_FEATURE_DATE_COMPAT=y
+CONFIG_DD=y
+CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
+# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
+CONFIG_FEATURE_DD_IBS_OBS=y
+CONFIG_FEATURE_DD_STATUS=y
 CONFIG_HOSTID=y
 CONFIG_ID=y
 CONFIG_GROUPS=y
 CONFIG_SHUF=y
+CONFIG_SYNC=y
+CONFIG_FEATURE_SYNC_FANCY=y
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
@@ -195,6 +203,7 @@ CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
 CONFIG_FEATURE_TR_EQUIV=y
+CONFIG_TRUNCATE=y
 CONFIG_UNLINK=y
 CONFIG_BASE64=y
 CONFIG_WHO=y
@@ -211,10 +220,6 @@ CONFIG_COMM=y
 CONFIG_CP=y
 CONFIG_FEATURE_CP_LONG_OPTIONS=y
 CONFIG_CUT=y
-CONFIG_DD=y
-CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set
-CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_DF=y
 CONFIG_FEATURE_DF_FANCY=y
 CONFIG_DIRNAME=y
@@ -283,7 +288,6 @@ CONFIG_STAT=y
 CONFIG_FEATURE_STAT_FORMAT=y
 CONFIG_STTY=y
 CONFIG_SUM=y
-CONFIG_SYNC=y
 CONFIG_TAC=y
 CONFIG_TAIL=y
 CONFIG_FEATURE_FANCY_TAIL=y
@@ -292,6 +296,7 @@ CONFIG_FEATURE_TEE_USE_BLOCK_IO=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
+CONFIG_UNAME_OSNAME="Linux"
 CONFIG_UNEXPAND=y
 # CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
 CONFIG_UNIQ=y
@@ -554,7 +559,18 @@ CONFIG_FEATURE_MDEV_RENAME=y
 CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
+# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
 CONFIG_REV=y
+# CONFIG_UEVENT is not set
 CONFIG_ACPID=y
 CONFIG_FEATURE_ACPID_COMPAT=y
 CONFIG_BLKID=y
@@ -600,15 +616,6 @@ CONFIG_LSUSB=y
 CONFIG_MKSWAP=y
 CONFIG_FEATURE_MKSWAP_UUID=y
 CONFIG_MORE=y
-CONFIG_MOUNT=y
-CONFIG_FEATURE_MOUNT_FAKE=y
-CONFIG_FEATURE_MOUNT_VERBOSE=y
-CONFIG_FEATURE_MOUNT_HELPERS=y
-CONFIG_FEATURE_MOUNT_LABEL=y
-# CONFIG_FEATURE_MOUNT_NFS is not set
-CONFIG_FEATURE_MOUNT_CIFS=y
-CONFIG_FEATURE_MOUNT_FLAGS=y
-CONFIG_FEATURE_MOUNT_FSTAB=y
 # CONFIG_PIVOT_ROOT is not set
 CONFIG_RDATE=y
 CONFIG_RDEV=y
@@ -665,10 +672,15 @@ CONFIG_CROND=y
 CONFIG_FEATURE_CROND_D=y
 CONFIG_FEATURE_CROND_CALL_SENDMAIL=y
 CONFIG_FEATURE_CROND_DIR="/var/spool/cron"
+# CONFIG_I2CGET is not set
+# CONFIG_I2CSET is not set
+# CONFIG_I2CDUMP is not set
+# CONFIG_I2CDETECT is not set
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
 CONFIG_FEATURE_LESS_FLAGS=y
+CONFIG_FEATURE_LESS_TRUNCATE=y
 CONFIG_FEATURE_LESS_MARKS=y
 CONFIG_FEATURE_LESS_REGEXP=y
 CONFIG_FEATURE_LESS_WINCH=y
@@ -763,6 +775,13 @@ CONFIG_NC_110_COMPAT=y
 CONFIG_PING=y
 CONFIG_PING6=y
 CONFIG_FEATURE_FANCY_PING=y
+CONFIG_WGET=y
+CONFIG_FEATURE_WGET_STATUSBAR=y
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_TIMEOUT=y
+CONFIG_FEATURE_WGET_OPENSSL=y
+CONFIG_FEATURE_WGET_SSL_HELPER=y
 CONFIG_WHOIS=y
 CONFIG_FEATURE_IPV6=y
 # CONFIG_FEATURE_UNIX_LOCAL is not set
@@ -824,6 +843,7 @@ CONFIG_IP=y
 CONFIG_FEATURE_IP_ADDRESS=y
 CONFIG_FEATURE_IP_LINK=y
 CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
 CONFIG_FEATURE_IP_TUNNEL=y
 CONFIG_FEATURE_IP_RULE=y
 CONFIG_FEATURE_IP_SHORT_FORMS=y
@@ -890,11 +910,6 @@ CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n"
 # CONFIG_UDPSVD is not set
 CONFIG_VCONFIG=y
-CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
-CONFIG_FEATURE_WGET_TIMEOUT=y
 # CONFIG_ZCIP is not set
 
 #