aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/busybox/0001-ash-exec-busybox.static.patch10
-rw-r--r--main/busybox/0002-app-location-for-cpio-vi-and-lspci.patch (renamed from main/busybox/0002-app-location-for-vi-and-lspci.patch)27
-rw-r--r--main/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch12
-rw-r--r--main/busybox/0004-ping-make-ping-work-without-root-privileges.patch8
-rw-r--r--main/busybox/0005-fbsplash-support-console-switching.patch6
-rw-r--r--main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch6
-rw-r--r--main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch62
-rw-r--r--main/busybox/0008-diff-add-support-for-no-dereference.patch (renamed from main/busybox/0012-diff-add-support-for-no-dereference.patch)16
-rw-r--r--main/busybox/0008-login-move-check_securetty-to-libbb.patch103
-rw-r--r--main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch70
-rw-r--r--main/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch (renamed from main/busybox/0015-syslogd-adjust-timezone-option.patch)9
-rw-r--r--main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch71
-rw-r--r--main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch (renamed from main/busybox/udhcpc.patch)13
-rw-r--r--main/busybox/0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch205
-rw-r--r--main/busybox/0011-testsuite-fix-cpio-tests.patch (renamed from main/busybox/fix-tests.patch)28
-rw-r--r--main/busybox/0013-ash-make-shellexec-capable-of-using-separate-argv-0-.patch91
-rw-r--r--main/busybox/0014-ash-implement-exec-a-ARGV0-CMD-ARGV1.patch69
-rw-r--r--main/busybox/APKBUILD57
-rw-r--r--main/busybox/busyboxconfig142
-rw-r--r--main/busybox/busyboxconfig-extras142
-rw-r--r--main/busybox/location-for-cpio.patch13
21 files changed, 323 insertions, 837 deletions
diff --git a/main/busybox/0001-ash-exec-busybox.static.patch b/main/busybox/0001-ash-exec-busybox.static.patch
index 7bdf874275..fdf1349601 100644
--- a/main/busybox/0001-ash-exec-busybox.static.patch
+++ b/main/busybox/0001-ash-exec-busybox.static.patch
@@ -1,17 +1,17 @@
-From 6ad2305eb299c864dbe04b368a9921e91fd41bcb Mon Sep 17 00:00:00 2001
+From 134582e8dd1c85cbcf1fc047956a57fcd642e46a Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 4 Aug 2016 11:03:07 +0200
-Subject: [PATCH 01/12] ash: exec busybox.static
+Subject: [PATCH 01/11] ash: exec busybox.static
---
shell/ash.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/shell/ash.c b/shell/ash.c
-index 8d8cc466b..1b1012e76 100644
+index b7635a823..e613ee6bb 100644
--- a/shell/ash.c
+++ b/shell/ash.c
-@@ -7552,6 +7552,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
+@@ -7721,6 +7721,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
}
/* re-exec ourselves with the new arguments */
execve(bb_busybox_exec_path, argv, envp);
@@ -21,5 +21,5 @@ index 8d8cc466b..1b1012e76 100644
* executable, fall through */
}
--
-2.11.0
+2.13.2
diff --git a/main/busybox/0002-app-location-for-vi-and-lspci.patch b/main/busybox/0002-app-location-for-cpio-vi-and-lspci.patch
index eb2e069e69..8c8e4ee7a0 100644
--- a/main/busybox/0002-app-location-for-vi-and-lspci.patch
+++ b/main/busybox/0002-app-location-for-cpio-vi-and-lspci.patch
@@ -1,18 +1,33 @@
-From a3016293eb42eb3679400148ed4520005ff6b8a7 Mon Sep 17 00:00:00 2001
+From 8937e2dfb3dbfa23597853e9605f930b3607fa63 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 27 Dec 2016 20:46:59 +0100
-Subject: [PATCH 02/12] app location for vi and lspci
+Subject: [PATCH 02/11] app location for cpio, vi and lspci
+Adjust location to where alpine linux installs them
---
+ archival/cpio.c | 2 +-
editors/vi.c | 2 +-
util-linux/lspci.c | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+diff --git a/archival/cpio.c b/archival/cpio.c
+index 683f0bb1f..45362b6bc 100644
+--- a/archival/cpio.c
++++ b/archival/cpio.c
+@@ -43,7 +43,7 @@
+ //config: help
+ //config: Passthrough mode. Rarely used.
+
+-//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
++//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
+ //kbuild:lib-$(CONFIG_CPIO) += cpio.o
+
+ //usage:#define cpio_trivial_usage
diff --git a/editors/vi.c b/editors/vi.c
-index 38a4692fd..dd3efda75 100644
+index 76d1f261b..73d0a67a9 100644
--- a/editors/vi.c
+++ b/editors/vi.c
-@@ -166,7 +166,7 @@
+@@ -163,7 +163,7 @@
//config: Unless you want more (or less) frequent "undo points" while typing,
//config: you should probably leave this unchanged.
@@ -35,5 +50,5 @@ index 8b38a2366..f918f0972 100644
//kbuild:lib-$(CONFIG_LSPCI) += lspci.o
--
-2.11.0
+2.13.2
diff --git a/main/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch b/main/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch
index 89cf6cd187..5671ee1b0c 100644
--- a/main/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch
+++ b/main/busybox/0003-udhcpc-set-default-discover-retries-to-5.patch
@@ -1,7 +1,7 @@
-From 5b9fc802f7f3bb7e1b0c539a3d6101dcca5399e9 Mon Sep 17 00:00:00 2001
+From 18415adc1cd9993a95d100dd773daf69b8ec819e Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 4 Aug 2016 11:08:35 +0200
-Subject: [PATCH 03/12] udhcpc: set default discover retries to 5
+Subject: [PATCH 03/11] udhcpc: set default discover retries to 5
Some slower nics needs more attempts to get a lease
---
@@ -9,10 +9,10 @@ Some slower nics needs more attempts to get a lease
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 0e236261b..3c36bc39b 100644
+index 1a66c610e..43aac1b85 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
-@@ -1189,7 +1189,7 @@ static void client_background(void)
+@@ -1191,7 +1191,7 @@ static void client_background(void)
//usage: "\n -s,--script PROG Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
//usage: "\n -p,--pidfile FILE Create pidfile"
//usage: "\n -B,--broadcast Request broadcast replies"
@@ -21,7 +21,7 @@ index 0e236261b..3c36bc39b 100644
//usage: "\n -T,--timeout SEC Pause between packets (default 3)"
//usage: "\n -A,--tryagain SEC Wait if lease is not obtained (default 20)"
//usage: "\n -n,--now Exit if lease is not obtained"
-@@ -1272,7 +1272,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
+@@ -1274,7 +1274,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
llist_t *list_x = NULL;
int tryagain_timeout = 20;
int discover_timeout = 3;
@@ -31,5 +31,5 @@ index 0e236261b..3c36bc39b 100644
uint32_t requested_ip = 0;
uint32_t xid = xid; /* for compiler */
--
-2.11.0
+2.13.2
diff --git a/main/busybox/0004-ping-make-ping-work-without-root-privileges.patch b/main/busybox/0004-ping-make-ping-work-without-root-privileges.patch
index 91befa6591..77fa5ed76e 100644
--- a/main/busybox/0004-ping-make-ping-work-without-root-privileges.patch
+++ b/main/busybox/0004-ping-make-ping-work-without-root-privileges.patch
@@ -1,14 +1,14 @@
-From 9432235d7dc8d4a2bc9b546e63e52e84b7cad5ce Mon Sep 17 00:00:00 2001
+From bef770d1ee4179e380dff24305d9b6d899147add Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Tue, 29 Mar 2016 18:59:22 +0200
-Subject: [PATCH 04/12] ping: make ping work without root privileges
+Subject: [PATCH 04/11] ping: make ping work without root privileges
---
networking/ping.c | 103 +++++++++++++++++++++++++++++++++++++++++++++---------
1 file changed, 87 insertions(+), 16 deletions(-)
diff --git a/networking/ping.c b/networking/ping.c
-index d0ef7ba62..73e903927 100644
+index 94fb007f5..26e40e1fc 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -155,6 +155,7 @@ enum {
@@ -193,5 +193,5 @@ index d0ef7ba62..73e903927 100644
#if ENABLE_PING6
{
--
-2.11.0
+2.13.2
diff --git a/main/busybox/0005-fbsplash-support-console-switching.patch b/main/busybox/0005-fbsplash-support-console-switching.patch
index 0d9b87861c..792c2d6c8e 100644
--- a/main/busybox/0005-fbsplash-support-console-switching.patch
+++ b/main/busybox/0005-fbsplash-support-console-switching.patch
@@ -1,7 +1,7 @@
-From f5660f60455d2a86fd78d5a8949a31864233faf8 Mon Sep 17 00:00:00 2001
+From a8f7d33f47cc28732cd04573ae1fb6a1ca6e9617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Mon, 24 Sep 2012 07:58:29 +0300
-Subject: [PATCH 05/12] fbsplash: support console switching
+Subject: [PATCH 05/11] fbsplash: support console switching
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -183,5 +183,5 @@ index fc6c9b953..ec5947314 100644
return EXIT_SUCCESS;
--
-2.11.0
+2.13.2
diff --git a/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch b/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
index b930cb1167..65c4231783 100644
--- a/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
+++ b/main/busybox/0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
@@ -1,7 +1,7 @@
-From 1dab8b58ff051d529fd3fd74caf6016e51b10ae3 Mon Sep 17 00:00:00 2001
+From 64e2d2e495f82ef7ccc952bfa4216d1ff8ab3481 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Fri, 21 Nov 2014 16:06:34 +0200
-Subject: [PATCH 06/12] fbsplash: support image and bar alignment and
+Subject: [PATCH 06/11] fbsplash: support image and bar alignment and
positioning
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -181,5 +181,5 @@ index ec5947314..34bbf81f5 100644
if (G.bdebug_messages)
G.logfile_fd = xfopen_for_write("/tmp/fbsplash.log");
--
-2.11.0
+2.13.2
diff --git a/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch b/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
index ccd4f25ffa..ee4dfb1b75 100644
--- a/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
+++ b/main/busybox/0007-depmod-support-generating-kmod-binary-index-files.patch
@@ -1,7 +1,7 @@
-From 0445b9734e02856a66cc7925a6816f26fedc822d Mon Sep 17 00:00:00 2001
+From c7d6c398844aca9651b7f01edadd9a8284919c89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Sun, 25 Oct 2015 22:21:41 +0200
-Subject: [PATCH 07/12] depmod: support generating kmod binary index files
+Subject: [PATCH 07/11] depmod: support generating kmod binary index files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -18,15 +18,15 @@ Signed-off-by: Timo Teräs <timo.teras@iki.fi>
modutils/Config.src | 10 ++
modutils/depmod.c | 281 ++++++++++++++++++++++++++++++++++++++++++----------
modutils/modprobe.c | 15 ---
- modutils/modutils.c | 27 ++++-
+ modutils/modutils.c | 31 ++++++
modutils/modutils.h | 15 +++
- 5 files changed, 281 insertions(+), 67 deletions(-)
+ 5 files changed, 286 insertions(+), 66 deletions(-)
diff --git a/modutils/Config.src b/modutils/Config.src
-index 4227f356a..6680044fc 100644
+index 9b76c83d2..5ab51d68b 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
-@@ -118,6 +118,16 @@ config FEATURE_MODUTILS_ALIAS
+@@ -152,6 +152,16 @@ config FEATURE_MODUTILS_ALIAS
Say Y if unsure.
@@ -41,10 +41,10 @@ index 4227f356a..6680044fc 100644
+ modutils and kmod (binaries and library).
+
config FEATURE_MODUTILS_SYMBOLS
- bool "Support for module.symbols file"
+ bool "Support module.symbols file"
default y
diff --git a/modutils/depmod.c b/modutils/depmod.c
-index b9347027e..e3cea18c1 100644
+index b7965ebd2..73ba7d0f4 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -2,7 +2,7 @@
@@ -56,7 +56,7 @@ index b9347027e..e3cea18c1 100644
* Copyright (c) 2008 Vladimir Dronnikov
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
-@@ -25,6 +25,24 @@
+@@ -26,6 +26,24 @@
#include "modutils.h"
#include <sys/utsname.h> /* uname() */
@@ -81,7 +81,7 @@ index b9347027e..e3cea18c1 100644
/*
* Theory of operation:
* - iterate over all modules and record their full path
-@@ -52,18 +70,12 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
+@@ -53,18 +71,12 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
for (ptr = image; ptr < image + len - 10; ptr++) {
if (is_prefixed_with(ptr, "depends=")) {
@@ -102,7 +102,7 @@ index b9347027e..e3cea18c1 100644
} else if (ENABLE_FEATURE_MODUTILS_SYMBOLS
&& is_prefixed_with(ptr, "__ksymtab_")
) {
-@@ -73,9 +85,10 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
+@@ -74,9 +86,10 @@ static int FAST_FUNC parse_module(const char *fname, struct stat *sb UNUSED_PARA
) {
continue;
}
@@ -116,7 +116,7 @@ index b9347027e..e3cea18c1 100644
}
free(image);
-@@ -107,12 +120,6 @@ static void order_dep_list(module_db *modules, module_entry *start, llist_t *add
+@@ -108,12 +121,6 @@ static void order_dep_list(module_db *modules, module_entry *start, llist_t *add
}
}
@@ -129,7 +129,7 @@ index b9347027e..e3cea18c1 100644
//usage:#if !ENABLE_MODPROBE_SMALL
//usage:#define depmod_trivial_usage "[-n] [-b BASE] [VERSION] [MODFILES]..."
//usage:#define depmod_full_usage "\n\n"
-@@ -166,6 +173,169 @@ enum {
+@@ -167,6 +174,169 @@ enum {
OPT_C = (1 << 9), /* -C,--config etc_modules_conf: ignored */
};
@@ -299,7 +299,7 @@ index b9347027e..e3cea18c1 100644
int depmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int depmod_main(int argc UNUSED_PARAM, char **argv)
{
-@@ -177,6 +347,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
+@@ -178,6 +348,8 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
unsigned i;
int tmp;
@@ -308,7 +308,7 @@ index b9347027e..e3cea18c1 100644
getopt32(argv, "aAb:eF:nruqC:", &moddir_base, NULL, NULL);
argv += optind;
-@@ -209,53 +381,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
+@@ -210,53 +382,60 @@ int depmod_main(int argc UNUSED_PARAM, char **argv)
}
/* Generate dependency and alias files */
@@ -403,10 +403,10 @@ index b9347027e..e3cea18c1 100644
if (ENABLE_FEATURE_CLEAN_UP)
moddb_free(&modules);
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
-index d404ef92f..72f449978 100644
+index 51ede9204..d1fcc0b7f 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
-@@ -189,21 +189,6 @@ struct globals {
+@@ -192,21 +192,6 @@ struct globals {
static int read_config(const char *path);
@@ -429,10 +429,10 @@ index d404ef92f..72f449978 100644
{
return moddb_get_or_create(&G.db, module);
diff --git a/modutils/modutils.c b/modutils/modutils.c
-index d36caaf68..aecfc2acb 100644
+index 6f7cd9721..257089af4 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
-@@ -70,6 +70,21 @@ void FAST_FUNC moddb_free(module_db *db)
+@@ -66,6 +66,21 @@ void FAST_FUNC moddb_free(module_db *db)
}
}
@@ -454,11 +454,12 @@ index d36caaf68..aecfc2acb 100644
void FAST_FUNC replace(char *s, char what, char with)
{
while (*s) {
-@@ -81,7 +96,17 @@ void FAST_FUNC replace(char *s, char what, char with)
+@@ -75,6 +90,22 @@ void FAST_FUNC replace(char *s, char what, char with)
+ }
+ }
- char* FAST_FUNC replace_underscores(char *s)
- {
-- replace(s, '-', '_');
++char* FAST_FUNC replace_underscores(char *s)
++{
+ int i;
+ for (i = 0; s[i]; i++) {
+ switch (s[i]) {
@@ -470,11 +471,14 @@ index d36caaf68..aecfc2acb 100644
+ break;
+ }
+ }
- return s;
- }
-
++ return s;
++}
++
+ int FAST_FUNC string_to_llist(char *string, llist_t **llist, const char *delim)
+ {
+ char *tok;
diff --git a/modutils/modutils.h b/modutils/modutils.h
-index 2cbd1448a..dd6f173f3 100644
+index 4a702e97c..c07d961bd 100644
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -18,6 +18,20 @@ PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
@@ -504,8 +508,8 @@ index 2cbd1448a..dd6f173f3 100644
+char *gather_options_str(char *opts, const char *append) FAST_FUNC;
void replace(char *s, char what, char with) FAST_FUNC;
- char *replace_underscores(char *s) FAST_FUNC;
int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC;
+ char *filename2modname(const char *filename, char *modname) FAST_FUNC;
--
-2.11.0
+2.13.2
diff --git a/main/busybox/0012-diff-add-support-for-no-dereference.patch b/main/busybox/0008-diff-add-support-for-no-dereference.patch
index 8e52293791..95063a863e 100644
--- a/main/busybox/0012-diff-add-support-for-no-dereference.patch
+++ b/main/busybox/0008-diff-add-support-for-no-dereference.patch
@@ -1,7 +1,7 @@
-From 56c14ec7f75a68c191f2fc210915108f428e849c Mon Sep 17 00:00:00 2001
+From d70be9891718ffb94ea9946cc3540b1b62eced77 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 25 Jul 2014 15:28:33 +0200
-Subject: [PATCH 12/12] diff: add support for --no-dereference
+Subject: [PATCH 08/11] diff: add support for --no-dereference
Add flag for not following symlinks when recursing
@@ -19,10 +19,10 @@ Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/editors/diff.c b/editors/diff.c
-index 75229ad8c..6266bde0d 100644
+index 7687518f3..f07cafb19 100644
--- a/editors/diff.c
+++ b/editors/diff.c
-@@ -117,6 +117,9 @@
+@@ -115,6 +115,9 @@
//usage: "\n -N Treat absent files as empty"
//usage: "\n -q Output only whether files differ"
//usage: "\n -r Recurse"
@@ -32,7 +32,7 @@ index 75229ad8c..6266bde0d 100644
//usage: "\n -S Start with FILE when comparing directories"
//usage: "\n -T Make tabs line up by prefixing a tab when necessary"
//usage: "\n -s Report when two files are the same"
-@@ -158,6 +161,7 @@ enum { /* Commandline flags */
+@@ -156,6 +159,7 @@ enum { /* Commandline flags */
FLAG_p, /* not implemented */
FLAG_B,
FLAG_E, /* not implemented */
@@ -40,7 +40,7 @@ index 75229ad8c..6266bde0d 100644
};
#define FLAG(x) (1 << FLAG_##x)
-@@ -872,7 +876,8 @@ static void diffdir(char *p[2], const char *s_start)
+@@ -869,7 +873,8 @@ static void diffdir(char *p[2], const char *s_start)
* Using list.len to specify its length,
* add_to_dirlist will remove it. */
list[i].len = strlen(p[i]);
@@ -50,7 +50,7 @@ index 75229ad8c..6266bde0d 100644
add_to_dirlist, skip_dir, &list[i], 0);
/* Sort dl alphabetically.
* GNU diff does this ignoring any number of trailing dots.
-@@ -969,6 +974,7 @@ static const char diff_longopts[] ALIGN1 =
+@@ -966,6 +971,7 @@ static const char diff_longopts[] ALIGN1 =
"report-identical-files\0" No_argument "s"
"starting-file\0" Required_argument "S"
"minimal\0" No_argument "d"
@@ -59,5 +59,5 @@ index 75229ad8c..6266bde0d 100644
#endif
--
-2.11.0
+2.13.2
diff --git a/main/busybox/0008-login-move-check_securetty-to-libbb.patch b/main/busybox/0008-login-move-check_securetty-to-libbb.patch
deleted file mode 100644
index bc3c3a002e..0000000000
--- a/main/busybox/0008-login-move-check_securetty-to-libbb.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 49cc996bd0c049c37e98506409c2e3ec30790bf0 Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Thu, 5 Nov 2015 16:27:34 +0200
-Subject: [PATCH 08/12] login: move check_securetty to libbb
-
----
- include/libbb.h | 1 +
- libbb/Kbuild.src | 1 +
- libbb/securetty.c | 27 +++++++++++++++++++++++++++
- loginutils/login.c | 19 -------------------
- 4 files changed, 29 insertions(+), 19 deletions(-)
- create mode 100644 libbb/securetty.c
-
-diff --git a/include/libbb.h b/include/libbb.h
-index abdc8c2b8..38d6d0b1e 100644
---- a/include/libbb.h
-+++ b/include/libbb.h
-@@ -1390,6 +1390,7 @@ extern void selinux_or_die(void) FAST_FUNC;
- #define SETUP_ENV_NO_CHDIR (1 << 4)
- void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC;
- void nuke_str(char *str) FAST_FUNC;
-+int check_securetty(const char *short_tty);
- int check_password(const struct passwd *pw, const char *plaintext) FAST_FUNC;
- int ask_and_check_password_extended(const struct passwd *pw, int timeout, const char *prompt) FAST_FUNC;
- int ask_and_check_password(const struct passwd *pw) FAST_FUNC;
-diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
-index e426f3c7e..84f3ff477 100644
---- a/libbb/Kbuild.src
-+++ b/libbb/Kbuild.src
-@@ -83,6 +83,7 @@ lib-y += safe_gethostname.o
- lib-y += safe_poll.o
- lib-y += safe_strncpy.o
- lib-y += safe_write.o
-+lib-y += securetty.o
- lib-y += setup_environment.o
- lib-y += signals.o
- lib-y += simplify_path.o
-diff --git a/libbb/securetty.c b/libbb/securetty.c
-new file mode 100644
-index 000000000..95edbc944
---- /dev/null
-+++ b/libbb/securetty.c
-@@ -0,0 +1,27 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * /etc/securetty checking.
-+ *
-+ * Licensed under GPLv2, see file LICENSE in this source tree.
-+ */
-+
-+#include "libbb.h"
-+
-+#if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM
-+int check_securetty(const char *short_tty)
-+{
-+ char *buf = (char*)"/etc/securetty"; /* any non-NULL is ok */
-+ parser_t *parser = config_open2("/etc/securetty", fopen_for_read);
-+ while (config_read(parser, &buf, 1, 1, "# \t", PARSE_NORMAL)) {
-+ if (strcmp(buf, short_tty) == 0)
-+ break;
-+ buf = NULL;
-+ }
-+ config_close(parser);
-+ /* buf != NULL here if config file was not found, empty
-+ * or line was found which equals short_tty */
-+ return buf != NULL;
-+}
-+#else
-+ALWAYS_INLINE int check_securetty(const char *short_tty UNUSED_PARAM) { return 1; }
-+#endif
-diff --git a/loginutils/login.c b/loginutils/login.c
-index 52abc1886..30aa63aee 100644
---- a/loginutils/login.c
-+++ b/loginutils/login.c
-@@ -173,25 +173,6 @@ static void die_if_nologin(void)
- # define die_if_nologin() ((void)0)
- #endif
-
--#if ENABLE_FEATURE_SECURETTY && !ENABLE_PAM
--static int check_securetty(const char *short_tty)
--{
-- char *buf = (char*)"/etc/securetty"; /* any non-NULL is ok */
-- parser_t *parser = config_open2("/etc/securetty", fopen_for_read);
-- while (config_read(parser, &buf, 1, 1, "# \t", PARSE_NORMAL)) {
-- if (strcmp(buf, short_tty) == 0)
-- break;
-- buf = NULL;
-- }
-- config_close(parser);
-- /* buf != NULL here if config file was not found, empty
-- * or line was found which equals short_tty */
-- return buf != NULL;
--}
--#else
--static ALWAYS_INLINE int check_securetty(const char *short_tty UNUSED_PARAM) { return 1; }
--#endif
--
- #if ENABLE_SELINUX
- static void initselinux(char *username, char *full_tty,
- security_context_t *user_sid)
---
-2.11.0
-
diff --git a/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch b/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
deleted file mode 100644
index 72dc0482a9..0000000000
--- a/main/busybox/0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 7d2e6a0a89ba11a98ce665e307d7acf86b5f00b6 Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Thu, 5 Nov 2015 16:27:35 +0200
-Subject: [PATCH 09/12] libbb: allow_blank argument for
- ask_and_check_password_extended()
-
----
- include/libbb.h | 2 +-
- libbb/correct_password.c | 6 +++---
- loginutils/sulogin.c | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/include/libbb.h b/include/libbb.h
-index 38d6d0b1e..f0ddce94f 100644
---- a/include/libbb.h
-+++ b/include/libbb.h
-@@ -1392,7 +1392,7 @@ void setup_environment(const char *shell, int flags, const struct passwd *pw) FA
- void nuke_str(char *str) FAST_FUNC;
- int check_securetty(const char *short_tty);
- int check_password(const struct passwd *pw, const char *plaintext) FAST_FUNC;
--int ask_and_check_password_extended(const struct passwd *pw, int timeout, const char *prompt) FAST_FUNC;
-+int ask_and_check_password_extended(const struct passwd *pw, int timeout, int allow_blank, const char *prompt) FAST_FUNC;
- int ask_and_check_password(const struct passwd *pw) FAST_FUNC;
- /* Returns a malloced string */
- #if !ENABLE_USE_BB_CRYPT
-diff --git a/libbb/correct_password.c b/libbb/correct_password.c
-index 513c93028..57cd2b890 100644
---- a/libbb/correct_password.c
-+++ b/libbb/correct_password.c
-@@ -96,7 +96,7 @@ int FAST_FUNC check_password(const struct passwd *pw, const char *plaintext)
- * NULL pw means "just fake it for login with bad username"
- */
- int FAST_FUNC ask_and_check_password_extended(const struct passwd *pw,
-- int timeout, const char *prompt)
-+ int timeout, int allow_blank, const char *prompt)
- {
- IF_FEATURE_SHADOWPASSWDS(char buffer[SHADOW_BUFSIZE];)
- char *plaintext;
-@@ -105,7 +105,7 @@ int FAST_FUNC ask_and_check_password_extended(const struct passwd *pw,
-
- pw_pass = get_passwd(pw, buffer);
- if (!pw_pass[0]) /* empty password field? */
-- return 1;
-+ return allow_blank;
-
- plaintext = bb_ask(STDIN_FILENO, timeout, prompt);
- if (!plaintext) {
-@@ -120,5 +120,5 @@ int FAST_FUNC ask_and_check_password_extended(const struct passwd *pw,
-
- int FAST_FUNC ask_and_check_password(const struct passwd *pw)
- {
-- return ask_and_check_password_extended(pw, 0, "Password: ");
-+ return ask_and_check_password_extended(pw, 0, 1, "Password: ");
- }
-diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
-index 2e32e2bbd..d2ddc6afa 100644
---- a/loginutils/sulogin.c
-+++ b/loginutils/sulogin.c
-@@ -62,7 +62,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
- while (1) {
- int r;
-
-- r = ask_and_check_password_extended(pwd, timeout,
-+ r = ask_and_check_password_extended(pwd, timeout, 1,
- "Give root password for system maintenance\n"
- "(or type Control-D for normal startup):"
- );
---
-2.11.0
-
diff --git a/main/busybox/0015-syslogd-adjust-timezone-option.patch b/main/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
index ba2b9aae42..2624675c4b 100644
--- a/main/busybox/0015-syslogd-adjust-timezone-option.patch
+++ b/main/busybox/0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
@@ -1,7 +1,7 @@
-From 97577835169acc9ee8ef25b0561cbfaa78463f5c Mon Sep 17 00:00:00 2001
+From 1cb2e911c47f1b798ee610deabbea21ba6fb6961 Mon Sep 17 00:00:00 2001
From: Shiz <hi@shiz.me>
Date: Mon, 8 May 2017 23:09:13 +0200
-Subject: [PATCH] sysklogd: add -Z option to adjust message timezones
+Subject: [PATCH 09/11] sysklogd: add -Z option to adjust message timezones
Some syslog() implementations like musl's[1] always send timestamps in UTC.
This change adds a new option to syslogd, -Z, to assume incoming timestamps
@@ -16,7 +16,7 @@ Signed-off-by: Shiz <hi@shiz.me>
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
-index d64ff27..159336e 100644
+index d64ff278f..159336ed7 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -122,6 +122,7 @@
@@ -100,6 +100,5 @@ index d64ff27..159336e 100644
if (opts & OPT_filesize) // -s
G.logFileSize = xatou_range(opt_s, 0, INT_MAX/1024) * 1024;
--
-2.10.0
-
+2.13.2
diff --git a/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch b/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch
deleted file mode 100644
index 13c464e4a0..0000000000
--- a/main/busybox/0010-su-FEATURE_SU_NULLOK_SECURE.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From d9c09138d91566af49ef8179d9995c84294e2486 Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Thu, 5 Nov 2015 16:27:36 +0200
-Subject: [PATCH 10/12] su: FEATURE_SU_NULLOK_SECURE
-
-When this feature is enabled, blank passwords are not accepted by su
-unless the user is on a secure TTY defined in /etc/securetty. This
-resembles the default PAM configuration of some Linux distros which
-specify the nullok_secure option for pam_unix.so.
----
- loginutils/su.c | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/loginutils/su.c b/loginutils/su.c
-index 24ffbde86..086445243 100644
---- a/loginutils/su.c
-+++ b/loginutils/su.c
-@@ -24,6 +24,11 @@
- //config: bool "Enable su to check user's shell to be listed in /etc/shells"
- //config: depends on SU
- //config: default y
-+//config:config FEATURE_SU_NULLOK_SECURE
-+//config: bool "Disallow blank passwords from TTYs other than specified in /etc/securetty"
-+//config: depends on SU
-+//config: default n
-+
-
- //applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */
- //applet:IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE))
-@@ -76,6 +81,7 @@ int su_main(int argc UNUSED_PARAM, char **argv)
- struct passwd *pw;
- uid_t cur_uid = getuid();
- const char *tty;
-+ int allow_blank = 1;
- #if ENABLE_FEATURE_UTMP
- char user_buf[64];
- #endif
-@@ -100,6 +106,12 @@ int su_main(int argc UNUSED_PARAM, char **argv)
- argv++;
- }
-
-+ tty = xmalloc_ttyname(STDIN_FILENO);
-+ if (!tty) tty = "none";
-+ tty = skip_dev_pfx(tty);
-+
-+ if (ENABLE_FEATURE_SU_NULLOK_SECURE) allow_blank = check_securetty(tty);
-+
- if (ENABLE_FEATURE_SU_SYSLOG) {
- /* The utmp entry (via getlogin) is probably the best way to
- * identify the user, especially if someone su's from a su-shell.
-@@ -113,16 +125,12 @@ int su_main(int argc UNUSED_PARAM, char **argv)
- pw = getpwuid(cur_uid);
- old_user = pw ? xstrdup(pw->pw_name) : "";
- }
-- tty = xmalloc_ttyname(2);
-- if (!tty) {
-- tty = "none";
-- }
- openlog(applet_name, 0, LOG_AUTH);
- }
-
- pw = xgetpwnam(opt_username);
-
-- if (cur_uid == 0 || ask_and_check_password(pw) > 0) {
-+ if (cur_uid == 0 || ask_and_check_password_extended(pw, 0, allow_blank, "Password: ") > 0) {
- if (ENABLE_FEATURE_SU_SYSLOG)
- syslog(LOG_NOTICE, "%c %s %s:%s",
- '+', tty, old_user, opt_username);
---
-2.11.0
-
diff --git a/main/busybox/udhcpc.patch b/main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
index baf7c6138e..75fe62dfd7 100644
--- a/main/busybox/udhcpc.patch
+++ b/main/busybox/0010-udhcpc-Don-t-background-if-n-is-given.patch
@@ -1,11 +1,17 @@
-udhcpc: Don't background if -n is given
+From a663349a9ae6d62bfad1243a8781fb254065b480 Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 6 Jul 2017 13:39:15 +0200
+Subject: [PATCH 10/11] udhcpc: Don't background if -n is given
we need add -b to our udhcpc options to prevent boot forever if there are no
dhcp server. We also need a way for users to disable this behavior by making
it possible to set -n option at runtime.
+---
+ networking/udhcp/dhcpc.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
-index 6aa6731fb..2c0307413 100644
+index 43aac1b85..bf53dd559 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1504,19 +1504,19 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv)
@@ -34,3 +40,6 @@ index 6aa6731fb..2c0307413 100644
/* wait before trying again */
timeout = tryagain_timeout;
packet_num = 0;
+--
+2.13.2
+
diff --git a/main/busybox/0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch b/main/busybox/0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
deleted file mode 100644
index a7e5d14fd1..0000000000
--- a/main/busybox/0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-From 838188511cb2085d8980956b270cc68ed9911102 Mon Sep 17 00:00:00 2001
-From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
-Date: Thu, 4 Aug 2016 12:26:56 +0200
-Subject: [PATCH 11/12] ntpd: postpone hostname resolution if fails on startup
-
-Signed-off-by: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
----
- networking/ntpd.c | 130 +++++++++++++++++++++++++++---------------------------
- 1 file changed, 64 insertions(+), 66 deletions(-)
-
-diff --git a/networking/ntpd.c b/networking/ntpd.c
-index b7fa5dce9..c6d07adac 100644
---- a/networking/ntpd.c
-+++ b/networking/ntpd.c
-@@ -155,6 +155,7 @@
- #define RETRY_INTERVAL 32 /* on send/recv error, retry in N secs (need to be power of 2) */
- #define NOREPLY_INTERVAL 512 /* sent, but got no reply: cap next query by this many seconds */
- #define RESPONSE_INTERVAL 16 /* wait for reply up to N secs */
-+#define HOSTNAME_INTERVAL 4 /* hostname lookup failed. Wait N secs for next try */
-
- /* Step threshold (sec). std ntpd uses 0.128.
- */
-@@ -293,6 +294,7 @@ typedef struct {
-
- typedef struct {
- len_and_sockaddr *p_lsa;
-+ char *p_hostname;
- char *p_dotted;
- int p_fd;
- int datapoint_idx;
-@@ -318,7 +320,6 @@ typedef struct {
- datapoint_t filter_datapoint[NUM_DATAPOINTS];
- /* last sent packet: */
- msg_t p_xmt_msg;
-- char p_hostname[1];
- } peer_t;
-
-
-@@ -791,27 +792,17 @@ reset_peer_stats(peer_t *p, double offset)
- }
-
- static void
--resolve_peer_hostname(peer_t *p, int loop_on_fail)
--{
-- len_and_sockaddr *lsa;
--
-- again:
-- lsa = host2sockaddr(p->p_hostname, 123);
-- if (!lsa) {
-- /* error message already emitted by host2sockaddr() */
-- if (!loop_on_fail)
-- return;
--//FIXME: do this to avoid infinite looping on typo in a hostname?
--//well... in which case, what is a good value for loop_on_fail?
-- //if (--loop_on_fail == 0)
-- // xfunc_die();
-- sleep(5);
-- goto again;
-+resolve_peer_hostname(peer_t *p) {
-+ len_and_sockaddr *lsa = host2sockaddr(p->p_hostname, 123);
-+ if (lsa) {
-+ if (p->p_lsa) {
-+ free(p->p_lsa);
-+ free(p->p_dotted);
-+ }
-+ p->p_lsa = lsa;
-+ p->p_dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
- }
-- free(p->p_lsa);
-- free(p->p_dotted);
-- p->p_lsa = lsa;
-- p->p_dotted = xmalloc_sockaddr2dotted_noport(&lsa->u.sa);
-+ set_next(p, lsa ? 0 : HOSTNAME_INTERVAL);
- }
-
- static void
-@@ -820,28 +811,29 @@ add_peers(const char *s)
- llist_t *item;
- peer_t *p;
-
-- p = xzalloc(sizeof(*p) + strlen(s));
-- strcpy(p->p_hostname, s);
-- resolve_peer_hostname(p, /*loop_on_fail=*/ 1);
-+ p = xzalloc(sizeof(*p));
-+ p->p_hostname = xstrdup(s);
-+ resolve_peer_hostname(p);
-
- /* Names like N.<country2chars>.pool.ntp.org are randomly resolved
- * to a pool of machines. Sometimes different N's resolve to the same IP.
- * It is not useful to have two peers with same IP. We skip duplicates.
- */
-- for (item = G.ntp_peers; item != NULL; item = item->link) {
-- peer_t *pp = (peer_t *) item->data;
-- if (strcmp(p->p_dotted, pp->p_dotted) == 0) {
-- bb_error_msg("duplicate peer %s (%s)", s, p->p_dotted);
-- free(p->p_lsa);
-- free(p->p_dotted);
-- free(p);
-- return;
-+ if (p->p_lsa)
-+ for (item = G.ntp_peers; item != NULL; item = item->link) {
-+ peer_t *pp = (peer_t *) item->data;
-+ if (pp->p_lsa && strcmp(p->p_dotted, pp->p_dotted) == 0) {
-+ bb_error_msg("duplicate peer %s (%s)", s, p->p_dotted);
-+ free(p->p_hostname);
-+ free(p->p_lsa);
-+ free(p->p_dotted);
-+ free(p);
-+ return;
-+ }
- }
-- }
-
- p->p_fd = -1;
- p->p_xmt_msg.m_status = MODE_CLIENT | (NTP_VERSION << 3);
-- p->next_action_time = G.cur_time; /* = set_next(p, 0); */
- reset_peer_stats(p, STEP_THRESHOLD);
-
- llist_add_to(&G.ntp_peers, p);
-@@ -2378,44 +2370,50 @@ int ntpd_main(int argc UNUSED_PARAM, char **argv)
- for (item = G.ntp_peers; item != NULL; item = item->link) {
- peer_t *p = (peer_t *) item->data;
-
-- if (p->next_action_time <= G.cur_time) {
-- if (p->p_fd == -1) {
-- /* Time to send new req */
-- if (--cnt == 0) {
-- VERB4 bb_error_msg("disabling burst mode");
-- G.polladj_count = 0;
-- G.poll_exp = MINPOLL;
-+ if (p->p_lsa) {
-+
-+ if (p->next_action_time <= G.cur_time) {
-+ if (p->p_fd == -1) {
-+ /* Time to send new req */
-+ if (--cnt == 0) {
-+ VERB4 bb_error_msg("disabling burst mode");
-+ G.polladj_count = 0;
-+ G.poll_exp = MINPOLL;
-+ }
-+ send_query_to_peer(p);
-+ } else {
-+ /* Timed out waiting for reply */
-+ close(p->p_fd);
-+ p->p_fd = -1;
-+ /* If poll interval is small, increase it */
-+ if (G.poll_exp < BIGPOLL)
-+ adjust_poll(MINPOLL);
-+ timeout = poll_interval(NOREPLY_INTERVAL);
-+ bb_error_msg("timed out waiting for %s, reach 0x%02x, next query in %us",
-+ p->p_dotted, p->reachable_bits, timeout);
-+
-+ /* What if don't see it because it changed its IP? */
-+ if (p->reachable_bits == 0)
-+ resolve_peer_hostname(p);
-+
-+ set_next(p, timeout);
- }
-- send_query_to_peer(p);
-- } else {
-- /* Timed out waiting for reply */
-- close(p->p_fd);
-- p->p_fd = -1;
-- /* If poll interval is small, increase it */
-- if (G.poll_exp < BIGPOLL)
-- adjust_poll(MINPOLL);
-- timeout = poll_interval(NOREPLY_INTERVAL);
-- bb_error_msg("timed out waiting for %s, reach 0x%02x, next query in %us",
-- p->p_dotted, p->reachable_bits, timeout);
--
-- /* What if don't see it because it changed its IP? */
-- if (p->reachable_bits == 0)
-- resolve_peer_hostname(p, /*loop_on_fail=*/ 0);
--
-- set_next(p, timeout);
- }
-- }
-+
-+ if (p->p_fd >= 0) {
-+ /* Wait for reply from this peer */
-+ pfd[i].fd = p->p_fd;
-+ pfd[i].events = POLLIN;
-+ idx2peer[i] = p;
-+ i++;
-+ }
-+
-+ } else
-+ resolve_peer_hostname(p);
-
- if (p->next_action_time < nextaction)
- nextaction = p->next_action_time;
-
-- if (p->p_fd >= 0) {
-- /* Wait for reply from this peer */
-- pfd[i].fd = p->p_fd;
-- pfd[i].events = POLLIN;
-- idx2peer[i] = p;
-- i++;
-- }
- }
-
- timeout = nextaction - G.cur_time;
---
-2.11.0
-
diff --git a/main/busybox/fix-tests.patch b/main/busybox/0011-testsuite-fix-cpio-tests.patch
index aed099f879..a6eb803de5 100644
--- a/main/busybox/fix-tests.patch
+++ b/main/busybox/0011-testsuite-fix-cpio-tests.patch
@@ -1,12 +1,24 @@
+From 9a522cf388e321b47f9462bbbd7726323095f8db Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 6 Jul 2017 13:41:32 +0200
+Subject: [PATCH 11/11] testsuite: fix cpio tests
+
The cpio tests don't search for the right output line correctly,
using a hardcoded tail offset. Instead, grep for the file entry
just added.
The reverse-hunk patch tests seem to get the output order wrong,
and the tests pass when this is corrected.
+---
+ testsuite/cpio.tests | 6 +++---
+ testsuite/patch.tests | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
+index 88ec086b6..40f72c363 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ SKIP=
optional FEATURE_CPIO_O
testing "cpio uses by default uid/gid" \
@@ -15,7 +27,7 @@ and the tests pass when this is corrected.
"\
$user/$group
0
-@@ -138,7 +138,7 @@
+@@ -138,7 +138,7 @@ SKIP=
optional FEATURE_CPIO_O
testing "cpio -R with create" \
@@ -24,7 +36,7 @@ and the tests pass when this is corrected.
"\
1234/5678
0
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ SKIP=
optional FEATURE_CPIO_O
testing "cpio -R with extract" \
@@ -33,10 +45,11 @@ and the tests pass when this is corrected.
"\
8765/4321
0
-
+diff --git a/testsuite/patch.tests b/testsuite/patch.tests
+index 39205242c..1d48e90be 100755
--- a/testsuite/patch.tests
+++ b/testsuite/patch.tests
-@@ -75,12 +75,12 @@
+@@ -75,12 +75,12 @@ zxc
testing "patch detects already applied hunk" \
'patch 2>&1; echo $?; cat input' \
"\
@@ -50,7 +63,7 @@ and the tests pass when this is corrected.
1
abc
def
-@@ -103,12 +103,12 @@
+@@ -103,12 +103,12 @@ def
testing "patch detects already applied hunk at the EOF" \
'patch 2>&1; echo $?; cat input' \
"\
@@ -64,3 +77,6 @@ and the tests pass when this is corrected.
1
abc
123
+--
+2.13.2
+
diff --git a/main/busybox/0013-ash-make-shellexec-capable-of-using-separate-argv-0-.patch b/main/busybox/0013-ash-make-shellexec-capable-of-using-separate-argv-0-.patch
deleted file mode 100644
index 70f420a923..0000000000
--- a/main/busybox/0013-ash-make-shellexec-capable-of-using-separate-argv-0-.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From e139ae307e4fd9eb3b86a6fc2e97b4e212925199 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Wed, 12 Apr 2017 21:02:33 +0200
-Subject: [PATCH 13/14] ash: make shellexec capable of using separate argv[0]
- and filename to exec
-
-function old new delta
-execcmd 71 78 +7
-shellexec 221 224 +3
-evalcommand 1158 1161 +3
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 3/0 up/down: 13/0) Total: 13 bytes
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- shell/ash.c | 21 ++++++++++-----------
- 1 file changed, 10 insertions(+), 11 deletions(-)
-
-diff --git a/shell/ash.c b/shell/ash.c
-index 983f7b1..044f166 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -7744,9 +7744,8 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) char *cmd, char **argv, char **
- * have to change the find_command routine as well.
- * argv[-1] must exist and be writable! See tryexec() for why.
- */
--static void shellexec(char **, const char *, int) NORETURN;
--static void
--shellexec(char **argv, const char *path, int idx)
-+static void shellexec(char *prog, char **argv, const char *path, int idx) NORETURN;
-+static void shellexec(char *prog, char **argv, const char *path, int idx)
- {
- char *cmdname;
- int e;
-@@ -7755,12 +7754,12 @@ shellexec(char **argv, const char *path, int idx)
- int applet_no = -1; /* used only by FEATURE_SH_STANDALONE */
-
- envp = listvars(VEXPORT, VUNSET, /*end:*/ NULL);
-- if (strchr(argv[0], '/') != NULL
-+ if (strchr(prog, '/') != NULL
- #if ENABLE_FEATURE_SH_STANDALONE
-- || (applet_no = find_applet_by_name(argv[0])) >= 0
-+ || (applet_no = find_applet_by_name(prog)) >= 0
- #endif
- ) {
-- tryexec(IF_FEATURE_SH_STANDALONE(applet_no,) argv[0], argv, envp);
-+ tryexec(IF_FEATURE_SH_STANDALONE(applet_no,) prog, argv, envp);
- if (applet_no >= 0) {
- /* We tried execing ourself, but it didn't work.
- * Maybe /proc/self/exe doesn't exist?
-@@ -7772,7 +7771,7 @@ shellexec(char **argv, const char *path, int idx)
- } else {
- try_PATH:
- e = ENOENT;
-- while ((cmdname = path_advance(&path, argv[0])) != NULL) {
-+ while ((cmdname = path_advance(&path, prog)) != NULL) {
- if (--idx < 0 && pathopt == NULL) {
- tryexec(IF_FEATURE_SH_STANDALONE(-1,) cmdname, argv, envp);
- if (errno != ENOENT && errno != ENOTDIR)
-@@ -7796,8 +7795,8 @@ shellexec(char **argv, const char *path, int idx)
- }
- exitstatus = exerrno;
- TRACE(("shellexec failed for %s, errno %d, suppress_int %d\n",
-- argv[0], e, suppress_int));
-- ash_msg_and_raise(EXEXIT, "%s: %s", argv[0], errmsg(e, "not found"));
-+ prog, e, suppress_int));
-+ ash_msg_and_raise(EXEXIT, "%s: %s", prog, errmsg(e, "not found"));
- /* NOTREACHED */
- }
-
-@@ -9371,7 +9370,7 @@ execcmd(int argc UNUSED_PARAM, char **argv)
- /*setsignal(SIGTSTP); - unnecessary because of mflag=0 */
- /*setsignal(SIGTTOU); - unnecessary because of mflag=0 */
-
-- shellexec(argv + 1, pathval(), 0);
-+ shellexec(argv[1], argv + 1, pathval(), 0);
- /* NOTREACHED */
- }
- return 0;
-@@ -9773,7 +9772,7 @@ evalcommand(union node *cmd, int flags)
- /* fall through to exec'ing external program */
- }
- listsetvar(varlist.list, VEXPORT|VSTACK);
-- shellexec(argv, path, cmdentry.u.index);
-+ shellexec(argv[0], argv, path, cmdentry.u.index);
- /* NOTREACHED */
- } /* default */
- case CMDBUILTIN:
---
-2.9.3
-
diff --git a/main/busybox/0014-ash-implement-exec-a-ARGV0-CMD-ARGV1.patch b/main/busybox/0014-ash-implement-exec-a-ARGV0-CMD-ARGV1.patch
deleted file mode 100644
index 028196a40b..0000000000
--- a/main/busybox/0014-ash-implement-exec-a-ARGV0-CMD-ARGV1.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6c149f4d9afaed9edb75c88b784ad900c1f40700 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Wed, 12 Apr 2017 21:31:32 +0200
-Subject: [PATCH 14/14] ash: implement "exec -a ARGV0 CMD ARGV1..."
-
-function old new delta
-execcmd 71 112 +41
-shellexec 221 224 +3
-evalcommand 1158 1161 +3
-localcmd 364 366 +2
-unaliascmd 163 154 -9
-------------------------------------------------------------------------------
-(add/remove: 0/0 grow/shrink: 4/1 up/down: 49/-9) Total: 40 bytes
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
- shell/ash.c | 22 +++++++++++++++-------
- 1 file changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/shell/ash.c b/shell/ash.c
-index 044f166..e170bec 100644
---- a/shell/ash.c
-+++ b/shell/ash.c
-@@ -3345,11 +3345,9 @@ unaliascmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
- {
- int i;
-
-- while ((i = nextopt("a")) != '\0') {
-- if (i == 'a') {
-- rmaliases();
-- return 0;
-- }
-+ while (nextopt("a") != '\0') {
-+ rmaliases();
-+ return 0;
- }
- for (i = 0; *argptr; argptr++) {
- if (unalias(*argptr)) {
-@@ -9354,7 +9352,14 @@ truecmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
- static int FAST_FUNC
- execcmd(int argc UNUSED_PARAM, char **argv)
- {
-- if (argv[1]) {
-+ optionarg = NULL;
-+ while (nextopt("a:") != '\0')
-+ /* nextopt() sets optionarg to "-a ARGV0" */;
-+
-+ argv = argptr;
-+ if (argv[0]) {
-+ char *prog;
-+
- iflag = 0; /* exit on error */
- mflag = 0;
- optschanged();
-@@ -9370,7 +9375,10 @@ execcmd(int argc UNUSED_PARAM, char **argv)
- /*setsignal(SIGTSTP); - unnecessary because of mflag=0 */
- /*setsignal(SIGTTOU); - unnecessary because of mflag=0 */
-
-- shellexec(argv[1], argv + 1, pathval(), 0);
-+ prog = argv[0];
-+ if (optionarg)
-+ argv[0] = optionarg;
-+ shellexec(prog, argv, pathval(), 0);
- /* NOTREACHED */
- }
- return 0;
---
-2.9.3
-
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index d95df6a3c8..f7bf0eecf5 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Oliver Smith <ollieparanoid@bitmessage.ch>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=busybox
-pkgver=1.26.2
-pkgrel=8
+pkgver=1.27.0
+pkgrel=0
pkgdesc="Size optimized toolbox of many common UNIX utilities"
url=http://busybox.net
arch="all"
@@ -19,24 +19,16 @@ options="suid !check"
triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
0001-ash-exec-busybox.static.patch
- 0002-app-location-for-vi-and-lspci.patch
+ 0002-app-location-for-cpio-vi-and-lspci.patch
0003-udhcpc-set-default-discover-retries-to-5.patch
0004-ping-make-ping-work-without-root-privileges.patch
0005-fbsplash-support-console-switching.patch
0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
0007-depmod-support-generating-kmod-binary-index-files.patch
- 0008-login-move-check_securetty-to-libbb.patch
- 0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
- 0010-su-FEATURE_SU_NULLOK_SECURE.patch
- 0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
- 0012-diff-add-support-for-no-dereference.patch
- 0013-ash-make-shellexec-capable-of-using-separate-argv-0-.patch
- 0014-ash-implement-exec-a-ARGV0-CMD-ARGV1.patch
- 0015-syslogd-adjust-timezone-option.patch
- udhcpc.patch
-
- fix-tests.patch
- location-for-cpio.patch
+ 0008-diff-add-support-for-no-dereference.patch
+ 0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
+ 0010-udhcpc-Don-t-background-if-n-is-given.patch
+ 0011-testsuite-fix-cpio-tests.patch
acpid.logrotate
busyboxconfig
@@ -173,28 +165,21 @@ static() {
"$subpkgdir"/bin/busybox.static
}
-sha512sums="9926d211d0b4f34b513d934d7b111ebbf933c2dc31206bdd80426a62d47d5b1475b70bec5aaa14a26b94a202ab1465d994062a002750a312dcb8167096eb3719 busybox-1.26.2.tar.bz2
-ed16b7a38d99eb309ed03d3212ffd1c1993e292724665be2aaefcf645c9a37d1b0c5d24308dac7dbb093afde5b700961c55336d67be4f2bb788c85550e5f1de8 0001-ash-exec-busybox.static.patch
-cd6b0b59ca8006bfc545ba521a92de81be320c0dd3ed0a41d6a60339b73f44c80f1ac36fb05d35a8555fd173167b792f73ae279115d23d59f8f623ae01aed7d1 0002-app-location-for-vi-and-lspci.patch
-3fef7a3f47ca798859c5cf8d78bc36ed98c4b9f841a3593bca71b9242ca15719bbe9b683437f8ea61b9a5f6c31c9272b7f72dcb6ef6fc2a42fd3219e302113eb 0003-udhcpc-set-default-discover-retries-to-5.patch
-36d1090b35db49fd81ca5a39f5c5050f3173d628ac5e1b9b1c5873a3d0641942c9ffc5448533baa6c4512f4e539e8eb81d53c526a8f6e41b12f6f7606746793f 0004-ping-make-ping-work-without-root-privileges.patch
-6fc8fd411daec7989632b448ff73cbac05d8e4c497167f24c0b2a55517449f9c89fcc0131fa64973f163f0d5d0c5ed75613682b95b0f11900d340366693acf2a 0005-fbsplash-support-console-switching.patch
-7b6300130ca72b6842283b696c5138ac119b7b79d926ef336395246549b48a0f9c7c97c4708dfc45192d90898da3cad5b9bfe309072751615c012c8fcccfbb42 0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
-11529fe845bbd4094dd57f99c8150aefeed69822d04bc0692975ea4f70c1691698d0b76d7522741eca9e45e8baaa877e55aed3ef21809bbaeecf67be7049bf70 0007-depmod-support-generating-kmod-binary-index-files.patch
-29589a224a432363620fa1b56c605ca93e39c879d263087f58c531aa4331ca366baa531b7464c41a8fdee96e7750b155e5e00f2bb0aeaa8da50d2cae01eab4f4 0008-login-move-check_securetty-to-libbb.patch
-fc291167b2e026166e283d98d2d61cb3c9701e5e83c09062692d0c5a77f3b838ba73065706461095039f9adcbd9a7e4ae60a8b578986d0499caa33789fea3050 0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
-f82caa1dc4395f266b024a7face267a916a80ead95f3d392b10fd397d0fdf62703e3078357bc71962616d6531ea913aef80e1a7cdf8180bca70e723c7d331238 0010-su-FEATURE_SU_NULLOK_SECURE.patch
-16b513b34b3bf16002f14566aae66aab986403cb7a0f416c27264b739706bbd624a99fd37d5b56ff6efe623f3cc48aef3e8fe51c4ae2e94eda3fe9e8e618e3a1 0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
-361959788bc11b7f20d4029bb0f561759d270983b09c44fe2a01817378c4eb1c98cd8ef73e7ef8c168b7540170f58ddb36b9e4f80a97565f3fe3ba85b593a471 0012-diff-add-support-for-no-dereference.patch
-bf3e7c400e718fbc19fda19d7304ed938e5c59f45d5d1ba6eafd8f62a984d40419dbefd9f6840ac7f220d00abfae67e8f31be78b4c2e25310b265bca8beb91a2 0013-ash-make-shellexec-capable-of-using-separate-argv-0-.patch
-cb7aa4d5d22596bc8c6510cb653599dd8cf4c3a5312e93adfc6411d811376db2ad3b506a111322f46aa9929a5337e22a169da4ea250fd4b39e703adbc8792a2d 0014-ash-implement-exec-a-ARGV0-CMD-ARGV1.patch
-c37d1583cfb32e7aa077e7f4ea121dd3b2e3cf989a3dca2793126bcd89eb6d8eb6fae948085565807c2fb98d8dc92a2907cc03d988d1a47305d3e588ac268c5b 0015-syslogd-adjust-timezone-option.patch
-1375aa41038d80ef21ac3cd239999f813fd9a2e5ec062f34ed221d75e312f5e17e4bfcac4b20450139059dd586cfeda2b10c02b9cc17416c828e9a1ea3421601 udhcpc.patch
-2adfc6c71cfcc5df12edef13228c92b34c7782615e60effc97e6e7a9aa7e015c24c7b3950a8a9a2bf3ba5efd43a08ad45b16b35b03c90275807380e0600cb70d fix-tests.patch
-f26e090f5de0096ba5c4d46989ebe0ab5fa64c8bf54cd37ddec302fddfde23eac914858d86cc52bf3b5780a8e81ea2612ef6e713df2828e52c606f86a6816f39 location-for-cpio.patch
+sha512sums="0be9acb32e58539c5881c1e147fe2b16bf7f776a16cf41924a61460ddebb8971cfb2cf122797c1faf06d10603a0f90d4db983c60459d23fac18f431f136da1cf busybox-1.27.0.tar.bz2
+1930775839354a63c30970f0d52d00cfd3a8f6b9f48d6de45ea7d2478d080bde7193c1c2cce026dc7337d9ecf0b65f5ff1dd4351c1eb195e6f0c0c5126f10511 0001-ash-exec-busybox.static.patch
+a756aa89c4602cd091df0052e2e3d7b45a359fbfe953b70aa3029e3eeb8e5d1772cbf1525bb62df6ce6547f1e5605617195ddae336e1ffe41f5c58d524af6ba6 0002-app-location-for-cpio-vi-and-lspci.patch
+fc17ce9b12726e3449518692bf0d4906c36f091534706b5b91c910866bd8cd50d8f7d4b449d54eeed24ee656012a6ef04612bf092874e4b83b0723f852fdce0e 0003-udhcpc-set-default-discover-retries-to-5.patch
+dc0b660b60ef3028a4cc86f712e7f6d08ad7c00d27056f9978a2a103434f45edc7385d2c48eca5ee83efab8fc81735674bf1c40e78fb07a1b5d07ca9da37811a 0004-ping-make-ping-work-without-root-privileges.patch
+63838512679586eb6d83e7b7d3b1e318bb693b91dfb9675a48480e6623e03472b1aa7f86fb7e2ab9e8d6db7a9609b2bcf1c3c1de64fc7d73b65b4794cab87cbf 0005-fbsplash-support-console-switching.patch
+1afe261da507ca13869923033a4adbb3c22e512136cc4b771a2d14d0c25d8de6514cec1dd0363b0684410f0e6a274c3250c1ca8a8a839111f3ed16f800b1d403 0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
+1d7df1977eff54da029109bab014505aeb7cd47cd411e455d5309d2fa2970b546e44d97de86649af44a071ab25f0c43846e9ad7256d691cf5a7585d6a059a853 0007-depmod-support-generating-kmod-binary-index-files.patch
+baac796f8aa96fbeab19f96eea7787ace5737b182f49e02f1b1e911d0a927ae14f3c334daad4241858617dc79607541b9ce66b367d0379b2cb32f67a1e9efc5b 0008-diff-add-support-for-no-dereference.patch
+d1c375184f806f7550bac5c82ab5471bdb8085d845172c973724b22af05ab3759b3ce982e088b4c45815ade56b9adfb7a677d0c180e077545ac7ec003c8aa7c4 0009-sysklogd-add-Z-option-to-adjust-message-timezones.patch
+9b5143d0be615b1604d82007628d59a62721f1e61a63cca7a4ffa5e60fa8da102bfc21fa20cc35c2f5a0a24bc8013598f8eff5888f9d0f3bcfa796343b5f5a91 0010-udhcpc-Don-t-background-if-n-is-given.patch
+f4e00eb13fda752df13f300a7ed9b1320ca9f573c4309247f292c8710464d7be8740148f42e4aff16312335eadabce5a629dce4af58334b9199faf2fd658e4f9 0011-testsuite-fix-cpio-tests.patch
a9b1403c844c51934637215307dd9e2adb9458921047acff0d86dcf229b6e0027f4b2c6cdaa25a58407aad9d098fb5685d58eb5ff8d2aa3de4912cdea21fe54c acpid.logrotate
-2b3f72c67e806748707a750201313b085aea5a3e34cfebe27841ce2b3e2dcfad741866fb0c1f0f3f09f4089e640a33290eec0f448ae58a1a8239374ec954b541 busyboxconfig
-cd2683417540118b364e184a23c76742fb9da37d520ea2fcb1cf1729443c67ef6bc7938711bf1ab9ebd211ece02cf7300d4977499e82a35b879e27a2470be524 busyboxconfig-extras
+857dece10267a065e0e8c16dd6190656f890a5aff774e96321715673dda23e75a8e61148e81d6286b7bdfe737a0b99104f9b04deeb4f392c72b63d8e3d00e556 busyboxconfig
+341cd3e82a9152743aaf0e1a2969bef11b914aa0ee0ed584e74cd72bbb409e6b15207857046743822179909a0760f00c37f5618a660670e1a0e56f82abc9f470 busyboxconfig-extras
e84087a453f8c9814951c9ad496cce19f8280b80a8ab6a1c8e21385f1facb17e987adc8d1d72c7cb463c04eb0cadd2bd6fb9b6f6c0067ddd21eeacf91ca42f32 bbsuid.c
a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02 dad.if-up
4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2 nologin.c"
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index 8cabf22712..5a8bf59d3e 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.26.2
-# Wed Jun 7 17:24:01 2017
+# Busybox version: 1.27.0
+# Thu Jul 6 14:03:45 2017
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -12,7 +12,6 @@ CONFIG_DESKTOP=y
# CONFIG_EXTRA_COMPAT is not set
# CONFIG_INCLUDE_SUSv2 is not set
# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
CONFIG_SHOW_USAGE=y
CONFIG_FEATURE_VERBOSE_USAGE=y
CONFIG_FEATURE_COMPRESS_USAGE=y
@@ -35,6 +34,7 @@ CONFIG_FEATURE_SUID=y
CONFIG_BUSYBOX_EXEC_PATH="/bin/busybox"
CONFIG_FEATURE_SYSLOG=y
# CONFIG_FEATURE_HAVE_RPC is not set
+CONFIG_PLATFORM_LINUX=y
#
# Build Options
@@ -89,7 +89,6 @@ CONFIG_MD5_SMALL=0
CONFIG_SHA3_SMALL=0
CONFIG_FEATURE_FAST_TOP=y
# CONFIG_FEATURE_ETC_NETWORKS is not set
-CONFIG_FEATURE_USE_TERMIOS=y
CONFIG_FEATURE_EDITING=y
CONFIG_FEATURE_EDITING_MAX_LEN=1024
CONFIG_FEATURE_EDITING_VI=y
@@ -150,6 +149,7 @@ CONFIG_UNXZ=y
CONFIG_XZCAT=y
# CONFIG_XZ is not set
CONFIG_BZIP2=y
+CONFIG_FEATURE_BZIP2_DECOMPRESS=y
CONFIG_CPIO=y
CONFIG_FEATURE_CPIO_O=y
CONFIG_FEATURE_CPIO_P=y
@@ -159,6 +159,7 @@ CONFIG_GZIP=y
# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
CONFIG_GZIP_FAST=2
CONFIG_FEATURE_GZIP_LEVELS=y
+CONFIG_FEATURE_GZIP_DECOMPRESS=y
CONFIG_LZOP=y
CONFIG_UNLZOP=y
CONFIG_LZOPCAT=y
@@ -166,26 +167,29 @@ CONFIG_LZOPCAT=y
# CONFIG_RPM is not set
# CONFIG_RPM2CPIO is not set
CONFIG_TAR=y
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
CONFIG_FEATURE_TAR_CREATE=y
CONFIG_FEATURE_TAR_AUTODETECT=y
CONFIG_FEATURE_TAR_FROM=y
CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY=y
CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY=y
CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-CONFIG_FEATURE_TAR_LONG_OPTIONS=y
# CONFIG_FEATURE_TAR_TO_COMMAND is not set
CONFIG_FEATURE_TAR_UNAME_GNAME=y
CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
# CONFIG_FEATURE_TAR_SELINUX is not set
CONFIG_UNZIP=y
+CONFIG_FEATURE_UNZIP_CDF=y
+CONFIG_FEATURE_UNZIP_BZIP2=y
+CONFIG_FEATURE_UNZIP_LZMA=y
+CONFIG_FEATURE_UNZIP_XZ=y
#
# Coreutils
#
CONFIG_BASENAME=y
-CONFIG_CAL=y
CONFIG_CAT=y
-CONFIG_CATV=y
+CONFIG_FEATURE_CATV=y
CONFIG_CHGRP=y
CONFIG_CHMOD=y
CONFIG_CHOWN=y
@@ -222,6 +226,7 @@ CONFIG_UNEXPAND=y
# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
CONFIG_EXPR=y
CONFIG_EXPR_MATH_SUPPORT_64=y
+CONFIG_FACTOR=y
CONFIG_FALSE=y
CONFIG_FOLD=y
CONFIG_FSYNC=y
@@ -232,12 +237,14 @@ CONFIG_ID=y
CONFIG_GROUPS=y
CONFIG_INSTALL=y
# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+CONFIG_LINK=y
CONFIG_LN=y
# CONFIG_LOGNAME is not set
CONFIG_LS=y
CONFIG_FEATURE_LS_FILETYPES=y
CONFIG_FEATURE_LS_FOLLOWLINKS=y
CONFIG_FEATURE_LS_RECURSIVE=y
+CONFIG_FEATURE_LS_WIDTH=y
CONFIG_FEATURE_LS_SORTFILES=y
CONFIG_FEATURE_LS_TIMESTAMPS=y
CONFIG_FEATURE_LS_USERNAME=y
@@ -257,11 +264,15 @@ CONFIG_MKDIR=y
# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
CONFIG_MKFIFO=y
CONFIG_MKNOD=y
+CONFIG_MKTEMP=y
CONFIG_MV=y
# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
CONFIG_NICE=y
+CONFIG_NL=y
CONFIG_NOHUP=y
+CONFIG_NPROC=y
CONFIG_OD=y
+CONFIG_PASTE=y
CONFIG_PRINTENV=y
CONFIG_PRINTF=y
CONFIG_PWD=y
@@ -272,6 +283,7 @@ CONFIG_RM=y
CONFIG_RMDIR=y
# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
CONFIG_SEQ=y
+CONFIG_SHRED=y
CONFIG_SHUF=y
CONFIG_SLEEP=y
CONFIG_FEATURE_FANCY_SLEEP=y
@@ -296,6 +308,7 @@ CONFIG_TEST=y
CONFIG_TEST1=y
CONFIG_TEST2=y
CONFIG_FEATURE_TEST_64=y
+CONFIG_TIMEOUT=y
CONFIG_TOUCH=y
CONFIG_FEATURE_TOUCH_NODEREF=y
CONFIG_FEATURE_TOUCH_SUSV3=y
@@ -316,6 +329,7 @@ CONFIG_UUENCODE=y
CONFIG_WC=y
# CONFIG_FEATURE_WC_LARGE is not set
# CONFIG_WHO is not set
+# CONFIG_W is not set
# CONFIG_USERS is not set
CONFIG_WHOAMI=y
CONFIG_YES=y
@@ -331,11 +345,6 @@ CONFIG_FEATURE_VERBOSE=y
CONFIG_FEATURE_PRESERVE_HARDLINKS=y
#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
-
-#
# Common options for df, du, ls
#
CONFIG_FEATURE_HUMAN_READABLE=y
@@ -373,14 +382,13 @@ CONFIG_SHOWKEY=y
#
# Debian Utilities
#
-CONFIG_MKTEMP=y
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 is not set
-# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+# CONFIG_FEATURE_START_STOP_DAEMON_FANCY is not set
CONFIG_WHICH=y
#
@@ -471,12 +479,10 @@ CONFIG_FEATURE_KILL_REMOVED=y
CONFIG_FEATURE_KILL_DELAY=0
CONFIG_FEATURE_INIT_SCTTY=y
CONFIG_FEATURE_INIT_SYSLOG=y
-CONFIG_FEATURE_EXTRA_QUIET=y
+CONFIG_FEATURE_INIT_QUIET=y
# CONFIG_FEATURE_INIT_COREDUMPS is not set
CONFIG_INIT_TERMINAL_TYPE="linux"
# CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set
-CONFIG_MESG=y
-CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
#
# Login/Password Management Utilities
@@ -516,7 +522,7 @@ CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
CONFIG_SU=y
CONFIG_FEATURE_SU_SYSLOG=y
CONFIG_FEATURE_SU_CHECKS_SHELLS=y
-CONFIG_FEATURE_SU_NULLOK_SECURE=y
+CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY=y
# CONFIG_SULOGIN is not set
CONFIG_VLOCK=y
@@ -537,8 +543,6 @@ CONFIG_INSMOD=y
CONFIG_LSMOD=y
CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
CONFIG_MODINFO=y
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
CONFIG_MODPROBE=y
CONFIG_FEATURE_MODPROBE_BLACKLIST=y
CONFIG_RMMOD=y
@@ -546,14 +550,16 @@ CONFIG_RMMOD=y
#
# Options common to multiple modutils
#
+CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS=y
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
CONFIG_FEATURE_MODUTILS_ALIAS=y
CONFIG_FEATURE_MODUTILS_BIN=y
CONFIG_FEATURE_MODUTILS_SYMBOLS=y
@@ -569,8 +575,13 @@ CONFIG_BLKDISCARD=y
CONFIG_BLKID=y
CONFIG_FEATURE_BLKID_TYPE=y
CONFIG_BLOCKDEV=y
+CONFIG_CAL=y
+# CONFIG_CHRT is not set
CONFIG_DMESG=y
CONFIG_FEATURE_DMESG_PRETTY=y
+CONFIG_EJECT=y
+CONFIG_FEATURE_EJECT_SCSI=y
+CONFIG_FALLOCATE=y
CONFIG_FATATTR=y
CONFIG_FBSET=y
CONFIG_FEATURE_FBSET_FANCY=y
@@ -590,17 +601,22 @@ CONFIG_FLOCK=y
CONFIG_FDFLUSH=y
# CONFIG_FREERAMDISK is not set
# CONFIG_FSCK_MINIX is not set
+# CONFIG_FSFREEZE is not set
CONFIG_FSTRIM=y
CONFIG_GETOPT=y
CONFIG_FEATURE_GETOPT_LONG=y
CONFIG_HEXDUMP=y
CONFIG_FEATURE_HEXDUMP_REVERSE=y
CONFIG_HD=y
+CONFIG_XXD=y
CONFIG_HWCLOCK=y
CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
+CONFIG_IONICE=y
CONFIG_IPCRM=y
CONFIG_IPCS=y
+# CONFIG_LAST is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
CONFIG_LOSETUP=y
CONFIG_LSPCI=y
CONFIG_LSUSB=y
@@ -610,6 +626,8 @@ CONFIG_FEATURE_MDEV_RENAME=y
CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
CONFIG_FEATURE_MDEV_EXEC=y
CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
+CONFIG_MESG=y
+CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y
# CONFIG_MKE2FS is not set
# CONFIG_MKFS_EXT2 is not set
# CONFIG_MKFS_MINIX is not set
@@ -630,12 +648,14 @@ CONFIG_FEATURE_MOUNT_CIFS=y
CONFIG_FEATURE_MOUNT_FLAGS=y
CONFIG_FEATURE_MOUNT_FSTAB=y
# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
+CONFIG_MOUNTPOINT=y
CONFIG_NSENTER=y
CONFIG_FEATURE_NSENTER_LONG_OPTS=y
# CONFIG_PIVOT_ROOT is not set
CONFIG_RDATE=y
CONFIG_RDEV=y
CONFIG_READPROFILE=y
+CONFIG_RENICE=y
CONFIG_REV=y
# CONFIG_RTCWAKE is not set
# CONFIG_SCRIPT is not set
@@ -643,15 +663,20 @@ CONFIG_REV=y
# CONFIG_SETARCH is not set
CONFIG_LINUX32=y
CONFIG_LINUX64=y
+CONFIG_SETPRIV=y
+CONFIG_SETSID=y
CONFIG_SWAPON=y
CONFIG_FEATURE_SWAPON_DISCARD=y
CONFIG_FEATURE_SWAPON_PRI=y
CONFIG_SWAPOFF=y
CONFIG_SWITCH_ROOT=y
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
# CONFIG_UEVENT is not set
CONFIG_UMOUNT=y
CONFIG_FEATURE_UMOUNT_ALL=y
CONFIG_UNSHARE=y
+# CONFIG_WALL is not set
#
# Common options for mount/umount
@@ -705,7 +730,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=30
# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
CONFIG_CONSPY=y
CONFIG_CROND=y
CONFIG_FEATURE_CROND_D=y
@@ -720,8 +744,6 @@ CONFIG_FEATURE_DC_LIBM=y
# CONFIG_DEVFSD_VERBOSE is not set
# CONFIG_FEATURE_DEVFS is not set
# CONFIG_DEVMEM is not set
-CONFIG_EJECT=y
-CONFIG_FEATURE_EJECT_SCSI=y
CONFIG_FBSPLASH=y
# CONFIG_FLASH_ERASEALL is not set
# CONFIG_FLASH_LOCK is not set
@@ -739,9 +761,6 @@ CONFIG_HDPARM=y
# CONFIG_I2CDUMP is not set
# CONFIG_I2CDETECT is not set
CONFIG_INOTIFYD=y
-CONFIG_IONICE=y
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
CONFIG_LESS=y
CONFIG_FEATURE_LESS_MAXLINES=9999999
CONFIG_FEATURE_LESS_BRACKETS=y
@@ -753,27 +772,24 @@ CONFIG_FEATURE_LESS_WINCH=y
CONFIG_FEATURE_LESS_ASK_TERMINAL=y
CONFIG_FEATURE_LESS_DASHCMD=y
CONFIG_FEATURE_LESS_LINENUMS=y
+# CONFIG_LSSCSI is not set
# CONFIG_MAKEDEVS is not set
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
# CONFIG_MAN is not set
CONFIG_MICROCOM=y
-CONFIG_MOUNTPOINT=y
# CONFIG_MT is not set
CONFIG_NANDWRITE=y
CONFIG_NANDDUMP=y
+CONFIG_PARTPROBE=y
CONFIG_RAIDAUTORUN=y
CONFIG_READAHEAD=y
CONFIG_RFKILL=y
# CONFIG_RUNLEVEL is not set
# CONFIG_RX is not set
CONFIG_SETSERIAL=y
-CONFIG_SETSID=y
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_UBIATTACH is not set
# CONFIG_UBIDETACH is not set
@@ -783,7 +799,6 @@ CONFIG_TTYSIZE=y
# CONFIG_UBIUPDATEVOL is not set
# CONFIG_UBIRENAME is not set
CONFIG_VOLNAME=y
-# CONFIG_WALL is not set
CONFIG_WATCHDOG=y
#
@@ -860,8 +875,8 @@ CONFIG_FEATURE_IP_RULE=y
CONFIG_FEATURE_IP_NEIGH=y
CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
CONFIG_IPCALC=y
-CONFIG_FEATURE_IPCALC_FANCY=y
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_FEATURE_IPCALC_FANCY=y
# CONFIG_FAKEIDENTD is not set
CONFIG_NAMEIF=y
CONFIG_FEATURE_NAMEIF_EXTENDED=y
@@ -883,11 +898,13 @@ CONFIG_FEATURE_FANCY_PING=y
CONFIG_PSCAN=y
CONFIG_ROUTE=y
CONFIG_SLATTACH=y
+CONFIG_SSL_CLIENT=y
# CONFIG_TCPSVD is not set
# CONFIG_UDPSVD is not set
# CONFIG_TELNET is not set
# CONFIG_FEATURE_TELNET_TTYPE is not set
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+# CONFIG_FEATURE_TELNET_WIDTH is not set
# CONFIG_TELNETD is not set
# CONFIG_FEATURE_TELNETD_STANDALONE is not set
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set
@@ -898,6 +915,7 @@ CONFIG_SLATTACH=y
# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set
# CONFIG_TFTP_DEBUG is not set
+CONFIG_TLS=y
CONFIG_TRACEROUTE=y
CONFIG_TRACEROUTE6=y
CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
@@ -906,29 +924,32 @@ CONFIG_TUNCTL=y
CONFIG_FEATURE_TUNCTL_UG=y
CONFIG_VCONFIG=y
CONFIG_WGET=y
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
CONFIG_FEATURE_WGET_STATUSBAR=y
CONFIG_FEATURE_WGET_AUTHENTICATION=y
-CONFIG_FEATURE_WGET_LONG_OPTIONS=y
CONFIG_FEATURE_WGET_TIMEOUT=y
+CONFIG_FEATURE_WGET_HTTPS=y
CONFIG_FEATURE_WGET_OPENSSL=y
-CONFIG_FEATURE_WGET_SSL_HELPER=y
CONFIG_WHOIS=y
# CONFIG_ZCIP is not set
CONFIG_UDHCPC6=y
+CONFIG_FEATURE_UDHCPC6_RFC3646=y
+CONFIG_FEATURE_UDHCPC6_RFC4704=y
+CONFIG_FEATURE_UDHCPC6_RFC4833=y
CONFIG_UDHCPD=y
-# CONFIG_DHCPRELAY is not set
-CONFIG_DUMPLEASES=y
CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
CONFIG_DHCPD_LEASES_FILE="/var/lib/udhcpd/udhcpd.leases"
+CONFIG_DUMPLEASES=y
+# CONFIG_DHCPRELAY is not set
CONFIG_UDHCPC=y
CONFIG_FEATURE_UDHCPC_ARPING=y
CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
CONFIG_FEATURE_UDHCP_RFC3397=y
CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-b"
@@ -969,18 +990,19 @@ CONFIG_FEATURE_PIDOF_SINGLE=y
CONFIG_FEATURE_PIDOF_OMIT=y
CONFIG_PMAP=y
CONFIG_POWERTOP=y
+CONFIG_FEATURE_POWERTOP_INTERACTIVE=y
CONFIG_PS=y
# CONFIG_FEATURE_PS_WIDE is not set
# CONFIG_FEATURE_PS_LONG is not set
CONFIG_FEATURE_PS_TIME=y
-CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS=y
CONFIG_PSTREE=y
CONFIG_PWDX=y
-CONFIG_RENICE=y
CONFIG_SMEMCAP=y
CONFIG_BB_SYSCTL=y
CONFIG_TOP=y
+CONFIG_FEATURE_TOP_INTERACTIVE=y
CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
CONFIG_FEATURE_TOP_SMP_CPU=y
@@ -1035,24 +1057,23 @@ CONFIG_BASH_IS_NONE=y
CONFIG_ASH=y
CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
CONFIG_ASH_INTERNAL_GLOB=y
-CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_ASH_EXPAND_PRMT=y
CONFIG_ASH_BASH_COMPAT=y
-CONFIG_ASH_IDLE_TIMEOUT=y
CONFIG_ASH_JOB_CONTROL=y
CONFIG_ASH_ALIAS=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_PRINTF=y
-CONFIG_ASH_BUILTIN_TEST=y
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
+CONFIG_ASH_IDLE_TIMEOUT=y
+CONFIG_ASH_MAIL=y
+CONFIG_ASH_ECHO=y
+CONFIG_ASH_PRINTF=y
+CONFIG_ASH_TEST=y
CONFIG_ASH_HELP=y
+CONFIG_ASH_GETOPTS=y
CONFIG_ASH_CMDCMD=y
-CONFIG_ASH_MAIL=y
# CONFIG_CTTYHACK is not set
# CONFIG_HUSH is not set
# CONFIG_HUSH_BASH_COMPAT is not set
# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
# CONFIG_HUSH_INTERACTIVE is not set
# CONFIG_HUSH_SAVEHISTORY is not set
# CONFIG_HUSH_JOB is not set
@@ -1063,9 +1084,28 @@ CONFIG_ASH_MAIL=y
# CONFIG_HUSH_FUNCTIONS is not set
# CONFIG_HUSH_LOCAL is not set
# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
# CONFIG_HUSH_MODE_X is not set
+# CONFIG_HUSH_ECHO is not set
+# CONFIG_HUSH_PRINTF is not set
+# CONFIG_HUSH_TEST is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_EXPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_KILL is not set
+# CONFIG_HUSH_WAIT is not set
+# CONFIG_HUSH_TRAP is not set
+# CONFIG_HUSH_TYPE is not set
+# CONFIG_HUSH_READ is not set
+# CONFIG_HUSH_SET is not set
+# CONFIG_HUSH_UNSET is not set
+# CONFIG_HUSH_ULIMIT is not set
+# CONFIG_HUSH_UMASK is not set
+# CONFIG_HUSH_MEMLEAK is not set
# CONFIG_MSH is not set
+
+#
+# Options common to all shells
+#
CONFIG_FEATURE_SH_MATH=y
CONFIG_FEATURE_SH_MATH_64=y
CONFIG_FEATURE_SH_EXTRA_QUIET=y
diff --git a/main/busybox/busyboxconfig-extras b/main/busybox/busyboxconfig-extras
index 8aec08e58b..c19998bd9d 100644
--- a/main/busybox/busyboxconfig-extras
+++ b/main/busybox/busyboxconfig-extras
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Busybox version: 1.26.2
-# Wed Jun 7 17:39:30 2017
+# Busybox version: 1.27.0
+# Thu Jul 6 14:05:06 2017
#
CONFIG_HAVE_DOT_CONFIG=y
@@ -12,7 +12,6 @@ CONFIG_HAVE_DOT_CONFIG=y
# CONFIG_EXTRA_COMPAT is not set
# CONFIG_INCLUDE_SUSv2 is not set
# CONFIG_USE_PORTABLE_CODE is not set
-CONFIG_PLATFORM_LINUX=y
CONFIG_SHOW_USAGE=y
CONFIG_FEATURE_VERBOSE_USAGE=y
CONFIG_FEATURE_COMPRESS_USAGE=y
@@ -35,6 +34,7 @@ CONFIG_PID_FILE_PATH=""
CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
CONFIG_FEATURE_SYSLOG=y
# CONFIG_FEATURE_HAVE_RPC is not set
+CONFIG_PLATFORM_LINUX=y
#
# Build Options
@@ -89,7 +89,6 @@ CONFIG_MD5_SMALL=1
CONFIG_SHA3_SMALL=1
# CONFIG_FEATURE_FAST_TOP is not set
# CONFIG_FEATURE_ETC_NETWORKS is not set
-# CONFIG_FEATURE_USE_TERMIOS is not set
# CONFIG_FEATURE_EDITING is not set
CONFIG_FEATURE_EDITING_MAX_LEN=0
# CONFIG_FEATURE_EDITING_VI is not set
@@ -150,6 +149,7 @@ CONFIG_FEATURE_SEAMLESS_GZ=y
# CONFIG_XZCAT is not set
# CONFIG_XZ is not set
# CONFIG_BZIP2 is not set
+# CONFIG_FEATURE_BZIP2_DECOMPRESS is not set
# CONFIG_CPIO is not set
# CONFIG_FEATURE_CPIO_O is not set
# CONFIG_FEATURE_CPIO_P is not set
@@ -159,6 +159,7 @@ CONFIG_FEATURE_SEAMLESS_GZ=y
# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
CONFIG_GZIP_FAST=0
# CONFIG_FEATURE_GZIP_LEVELS is not set
+# CONFIG_FEATURE_GZIP_DECOMPRESS is not set
# CONFIG_LZOP is not set
# CONFIG_UNLZOP is not set
# CONFIG_LZOPCAT is not set
@@ -166,26 +167,29 @@ CONFIG_GZIP_FAST=0
# CONFIG_RPM is not set
# CONFIG_RPM2CPIO is not set
# CONFIG_TAR is not set
+# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
# CONFIG_FEATURE_TAR_CREATE is not set
# CONFIG_FEATURE_TAR_AUTODETECT is not set
# CONFIG_FEATURE_TAR_FROM is not set
# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
# CONFIG_FEATURE_TAR_TO_COMMAND is not set
# CONFIG_FEATURE_TAR_UNAME_GNAME is not set
# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set
# CONFIG_FEATURE_TAR_SELINUX is not set
# CONFIG_UNZIP is not set
+# CONFIG_FEATURE_UNZIP_CDF is not set
+# CONFIG_FEATURE_UNZIP_BZIP2 is not set
+# CONFIG_FEATURE_UNZIP_LZMA is not set
+# CONFIG_FEATURE_UNZIP_XZ is not set
#
# Coreutils
#
# CONFIG_BASENAME is not set
-# CONFIG_CAL is not set
# CONFIG_CAT is not set
-# CONFIG_CATV is not set
+# CONFIG_FEATURE_CATV is not set
# CONFIG_CHGRP is not set
# CONFIG_CHMOD is not set
# CONFIG_CHOWN is not set
@@ -222,6 +226,7 @@ CONFIG_GZIP_FAST=0
# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
# CONFIG_EXPR is not set
# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+# CONFIG_FACTOR is not set
# CONFIG_FALSE is not set
# CONFIG_FOLD is not set
# CONFIG_FSYNC is not set
@@ -232,12 +237,14 @@ CONFIG_GZIP_FAST=0
# CONFIG_GROUPS is not set
# CONFIG_INSTALL is not set
# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
+# CONFIG_LINK is not set
# CONFIG_LN is not set
# CONFIG_LOGNAME is not set
# CONFIG_LS is not set
# CONFIG_FEATURE_LS_FILETYPES is not set
# CONFIG_FEATURE_LS_FOLLOWLINKS is not set
# CONFIG_FEATURE_LS_RECURSIVE is not set
+# CONFIG_FEATURE_LS_WIDTH is not set
# CONFIG_FEATURE_LS_SORTFILES is not set
# CONFIG_FEATURE_LS_TIMESTAMPS is not set
# CONFIG_FEATURE_LS_USERNAME is not set
@@ -253,11 +260,15 @@ CONFIG_GZIP_FAST=0
# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
# CONFIG_MKFIFO is not set
# CONFIG_MKNOD is not set
+# CONFIG_MKTEMP is not set
# CONFIG_MV is not set
# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
# CONFIG_NICE is not set
+# CONFIG_NL is not set
# CONFIG_NOHUP is not set
+# CONFIG_NPROC is not set
# CONFIG_OD is not set
+# CONFIG_PASTE is not set
# CONFIG_PRINTENV is not set
# CONFIG_PRINTF is not set
# CONFIG_PWD is not set
@@ -268,6 +279,7 @@ CONFIG_GZIP_FAST=0
# CONFIG_RMDIR is not set
# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set
# CONFIG_SEQ is not set
+# CONFIG_SHRED is not set
# CONFIG_SHUF is not set
# CONFIG_SLEEP is not set
# CONFIG_FEATURE_FANCY_SLEEP is not set
@@ -292,6 +304,7 @@ CONFIG_GZIP_FAST=0
# CONFIG_TEST1 is not set
# CONFIG_TEST2 is not set
# CONFIG_FEATURE_TEST_64 is not set
+# CONFIG_TIMEOUT is not set
# CONFIG_TOUCH is not set
# CONFIG_FEATURE_TOUCH_NODEREF is not set
# CONFIG_FEATURE_TOUCH_SUSV3 is not set
@@ -312,6 +325,7 @@ CONFIG_UNAME_OSNAME=""
# CONFIG_WC is not set
# CONFIG_FEATURE_WC_LARGE is not set
# CONFIG_WHO is not set
+# CONFIG_W is not set
# CONFIG_USERS is not set
# CONFIG_WHOAMI is not set
# CONFIG_YES is not set
@@ -321,11 +335,6 @@ CONFIG_UNAME_OSNAME=""
#
# CONFIG_FEATURE_VERBOSE is not set
# CONFIG_FEATURE_PRESERVE_HARDLINKS is not set
-
-#
-# Common options for ls, more and telnet
-#
-CONFIG_FEATURE_AUTOWIDTH=y
# CONFIG_FEATURE_HUMAN_READABLE is not set
#
@@ -357,14 +366,13 @@ CONFIG_DEFAULT_SETFONT_DIR=""
#
# Debian Utilities
#
-# CONFIG_MKTEMP is not set
# CONFIG_PIPE_PROGRESS is not set
# CONFIG_RUN_PARTS is not set
# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
# 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_FEATURE_START_STOP_DAEMON_FANCY is not set
# CONFIG_WHICH is not set
#
@@ -455,12 +463,10 @@ CONFIG_TELINIT_PATH=""
CONFIG_FEATURE_KILL_DELAY=0
# CONFIG_FEATURE_INIT_SCTTY is not set
# CONFIG_FEATURE_INIT_SYSLOG is not set
-# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_FEATURE_INIT_QUIET is not set
# CONFIG_FEATURE_INIT_COREDUMPS is not set
CONFIG_INIT_TERMINAL_TYPE=""
# CONFIG_FEATURE_INIT_MODIFY_CMDLINE is not set
-# CONFIG_MESG is not set
-# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
#
# Login/Password Management Utilities
@@ -500,7 +506,7 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
# CONFIG_SU is not set
# CONFIG_FEATURE_SU_SYSLOG is not set
# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set
-# CONFIG_FEATURE_SU_NULLOK_SECURE is not set
+# CONFIG_FEATURE_SU_BLANK_PW_NEEDS_SECURE_TTY is not set
# CONFIG_SULOGIN is not set
# CONFIG_VLOCK is not set
@@ -521,8 +527,6 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
# CONFIG_LSMOD is not set
# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set
# CONFIG_MODINFO is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set
-# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
# CONFIG_MODPROBE is not set
# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set
# CONFIG_RMMOD is not set
@@ -530,14 +534,16 @@ CONFIG_FEATURE_DEFAULT_PASSWD_ALGO=""
#
# Options common to multiple modutils
#
+# CONFIG_FEATURE_CMDLINE_MODULE_OPTIONS is not set
+# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set
# CONFIG_FEATURE_2_4_MODULES is not set
-# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set
+# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set
# CONFIG_FEATURE_MODUTILS_ALIAS is not set
# CONFIG_FEATURE_MODUTILS_BIN is not set
# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set
@@ -553,8 +559,13 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_BLKID is not set
# CONFIG_FEATURE_BLKID_TYPE is not set
# CONFIG_BLOCKDEV is not set
+# CONFIG_CAL is not set
+# CONFIG_CHRT is not set
# CONFIG_DMESG is not set
# CONFIG_FEATURE_DMESG_PRETTY is not set
+# CONFIG_EJECT is not set
+# CONFIG_FEATURE_EJECT_SCSI is not set
+# CONFIG_FALLOCATE is not set
# CONFIG_FATATTR is not set
# CONFIG_FBSET is not set
# CONFIG_FEATURE_FBSET_FANCY is not set
@@ -574,17 +585,22 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_FDFLUSH is not set
# CONFIG_FREERAMDISK is not set
# CONFIG_FSCK_MINIX is not set
+# CONFIG_FSFREEZE is not set
# CONFIG_FSTRIM is not set
# CONFIG_GETOPT is not set
# CONFIG_FEATURE_GETOPT_LONG is not set
# CONFIG_HEXDUMP is not set
# CONFIG_FEATURE_HEXDUMP_REVERSE is not set
# CONFIG_HD is not set
+# CONFIG_XXD is not set
# CONFIG_HWCLOCK is not set
# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set
+# CONFIG_IONICE is not set
# CONFIG_IPCRM is not set
# CONFIG_IPCS is not set
+# CONFIG_LAST is not set
+# CONFIG_FEATURE_LAST_FANCY is not set
# CONFIG_LOSETUP is not set
# CONFIG_LSPCI is not set
# CONFIG_LSUSB is not set
@@ -594,6 +610,8 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set
# CONFIG_FEATURE_MDEV_EXEC is not set
# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+# CONFIG_MESG is not set
+# CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set
# CONFIG_MKE2FS is not set
# CONFIG_MKFS_EXT2 is not set
# CONFIG_MKFS_MINIX is not set
@@ -614,12 +632,14 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_FEATURE_MOUNT_FLAGS is not set
# CONFIG_FEATURE_MOUNT_FSTAB is not set
# CONFIG_FEATURE_MOUNT_OTHERTAB is not set
+# CONFIG_MOUNTPOINT is not set
# CONFIG_NSENTER is not set
# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set
# CONFIG_PIVOT_ROOT is not set
# CONFIG_RDATE is not set
# CONFIG_RDEV is not set
# CONFIG_READPROFILE is not set
+# CONFIG_RENICE is not set
# CONFIG_REV is not set
# CONFIG_RTCWAKE is not set
# CONFIG_SCRIPT is not set
@@ -627,15 +647,20 @@ CONFIG_DEFAULT_DEPMOD_FILE=""
# CONFIG_SETARCH is not set
# CONFIG_LINUX32 is not set
# CONFIG_LINUX64 is not set
+# CONFIG_SETPRIV is not set
+# CONFIG_SETSID is not set
# CONFIG_SWAPON is not set
# CONFIG_FEATURE_SWAPON_DISCARD is not set
# CONFIG_FEATURE_SWAPON_PRI is not set
# CONFIG_SWAPOFF is not set
# CONFIG_SWITCH_ROOT is not set
+# CONFIG_TASKSET is not set
+# CONFIG_FEATURE_TASKSET_FANCY is not set
# CONFIG_UEVENT is not set
# CONFIG_UMOUNT is not set
# CONFIG_FEATURE_UMOUNT_ALL is not set
# CONFIG_UNSHARE is not set
+# CONFIG_WALL is not set
# CONFIG_FEATURE_MOUNT_LOOP is not set
# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
# CONFIG_FEATURE_MTAB_SUPPORT is not set
@@ -681,7 +706,6 @@ CONFIG_FEATURE_BEEP_LENGTH_MS=0
# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set
# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set
# CONFIG_FEATURE_CHAT_CLR_ABORT is not set
-# CONFIG_CHRT is not set
# CONFIG_CONSPY is not set
# CONFIG_CROND is not set
# CONFIG_FEATURE_CROND_D is not set
@@ -696,8 +720,6 @@ CONFIG_FEATURE_CROND_DIR=""
# CONFIG_DEVFSD_VERBOSE is not set
# CONFIG_FEATURE_DEVFS is not set
# CONFIG_DEVMEM is not set
-# CONFIG_EJECT is not set
-# CONFIG_FEATURE_EJECT_SCSI is not set
# CONFIG_FBSPLASH is not set
# CONFIG_FLASH_ERASEALL is not set
# CONFIG_FLASH_LOCK is not set
@@ -715,9 +737,6 @@ CONFIG_FEATURE_CROND_DIR=""
# CONFIG_I2CDUMP is not set
# CONFIG_I2CDETECT is not set
# CONFIG_INOTIFYD is not set
-# CONFIG_IONICE is not set
-# CONFIG_LAST is not set
-# CONFIG_FEATURE_LAST_FANCY is not set
# CONFIG_LESS is not set
CONFIG_FEATURE_LESS_MAXLINES=0
# CONFIG_FEATURE_LESS_BRACKETS is not set
@@ -729,27 +748,24 @@ CONFIG_FEATURE_LESS_MAXLINES=0
# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set
# CONFIG_FEATURE_LESS_DASHCMD is not set
# CONFIG_FEATURE_LESS_LINENUMS is not set
+# CONFIG_LSSCSI is not set
# CONFIG_MAKEDEVS is not set
# CONFIG_FEATURE_MAKEDEVS_LEAF is not set
# CONFIG_FEATURE_MAKEDEVS_TABLE is not set
# CONFIG_MAN is not set
# CONFIG_MICROCOM is not set
-# CONFIG_MOUNTPOINT is not set
# CONFIG_MT is not set
# CONFIG_NANDWRITE is not set
# CONFIG_NANDDUMP is not set
+# CONFIG_PARTPROBE is not set
# CONFIG_RAIDAUTORUN is not set
CONFIG_READAHEAD=y
# CONFIG_RFKILL is not set
# CONFIG_RUNLEVEL is not set
# CONFIG_RX is not set
# CONFIG_SETSERIAL is not set
-# CONFIG_SETSID is not set
# CONFIG_STRINGS is not set
-# CONFIG_TASKSET is not set
-# CONFIG_FEATURE_TASKSET_FANCY is not set
# CONFIG_TIME is not set
-# CONFIG_TIMEOUT is not set
# CONFIG_TTYSIZE is not set
# CONFIG_UBIATTACH is not set
# CONFIG_UBIDETACH is not set
@@ -759,7 +775,6 @@ CONFIG_READAHEAD=y
# CONFIG_UBIUPDATEVOL is not set
# CONFIG_UBIRENAME is not set
# CONFIG_VOLNAME is not set
-# CONFIG_WALL is not set
# CONFIG_WATCHDOG is not set
#
@@ -836,8 +851,8 @@ CONFIG_FEATURE_IP_ROUTE_DIR=""
# CONFIG_FEATURE_IP_NEIGH is not set
# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set
# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+# CONFIG_FEATURE_IPCALC_FANCY is not set
CONFIG_FAKEIDENTD=y
# CONFIG_NAMEIF is not set
# CONFIG_FEATURE_NAMEIF_EXTENDED is not set
@@ -859,11 +874,13 @@ CONFIG_FAKEIDENTD=y
# CONFIG_PSCAN is not set
# CONFIG_ROUTE is not set
# CONFIG_SLATTACH is not set
+# CONFIG_SSL_CLIENT is not set
# CONFIG_TCPSVD is not set
# CONFIG_UDPSVD is not set
CONFIG_TELNET=y
CONFIG_FEATURE_TELNET_TTYPE=y
CONFIG_FEATURE_TELNET_AUTOLOGIN=y
+CONFIG_FEATURE_TELNET_WIDTH=y
CONFIG_TELNETD=y
CONFIG_FEATURE_TELNETD_STANDALONE=y
CONFIG_FEATURE_TELNETD_INETD_WAIT=y
@@ -878,6 +895,7 @@ CONFIG_FEATURE_TFTP_PUT=y
CONFIG_FEATURE_TFTP_BLOCKSIZE=y
CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
# CONFIG_TFTP_DEBUG is not set
+# CONFIG_TLS is not set
# CONFIG_TRACEROUTE is not set
# CONFIG_TRACEROUTE6 is not set
# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
@@ -886,29 +904,32 @@ CONFIG_FEATURE_TFTP_PROGRESS_BAR=y
# CONFIG_FEATURE_TUNCTL_UG is not set
# CONFIG_VCONFIG is not set
# CONFIG_WGET is not set
+# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
# CONFIG_FEATURE_WGET_STATUSBAR is not set
# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
# CONFIG_FEATURE_WGET_TIMEOUT is not set
+# CONFIG_FEATURE_WGET_HTTPS is not set
# CONFIG_FEATURE_WGET_OPENSSL is not set
-# CONFIG_FEATURE_WGET_SSL_HELPER is not set
# CONFIG_WHOIS is not set
# CONFIG_ZCIP is not set
# CONFIG_UDHCPC6 is not set
+# CONFIG_FEATURE_UDHCPC6_RFC3646 is not set
+# CONFIG_FEATURE_UDHCPC6_RFC4704 is not set
+# CONFIG_FEATURE_UDHCPC6_RFC4833 is not set
# CONFIG_UDHCPD is not set
-# CONFIG_DHCPRELAY is not set
-# CONFIG_DUMPLEASES is not set
# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
CONFIG_DHCPD_LEASES_FILE=""
+# CONFIG_DUMPLEASES is not set
+# CONFIG_DHCPRELAY is not set
# CONFIG_UDHCPC is not set
# CONFIG_FEATURE_UDHCPC_ARPING is not set
# CONFIG_FEATURE_UDHCPC_SANITIZEOPT is not set
+CONFIG_UDHCPC_DEFAULT_SCRIPT=""
# CONFIG_FEATURE_UDHCP_PORT is not set
CONFIG_UDHCP_DEBUG=0
# CONFIG_FEATURE_UDHCP_RFC3397 is not set
# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
@@ -949,18 +970,19 @@ CONFIG_FEATURE_MIME_CHARSET=""
# CONFIG_FEATURE_PIDOF_OMIT is not set
# CONFIG_PMAP is not set
# CONFIG_POWERTOP is not set
+# CONFIG_FEATURE_POWERTOP_INTERACTIVE is not set
# CONFIG_PS is not set
# CONFIG_FEATURE_PS_WIDE is not set
# CONFIG_FEATURE_PS_LONG is not set
# CONFIG_FEATURE_PS_TIME is not set
-# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
+# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set
# CONFIG_PSTREE is not set
# CONFIG_PWDX is not set
-# CONFIG_RENICE is not set
# CONFIG_SMEMCAP is not set
# CONFIG_BB_SYSCTL is not set
# CONFIG_TOP is not set
+# CONFIG_FEATURE_TOP_INTERACTIVE is not set
# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set
# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set
# CONFIG_FEATURE_TOP_SMP_CPU is not set
@@ -1015,24 +1037,23 @@ CONFIG_BASH_IS_NONE=y
# CONFIG_ASH is not set
# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
# CONFIG_ASH_INTERNAL_GLOB is not set
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_ASH_EXPAND_PRMT is not set
# CONFIG_ASH_BASH_COMPAT is not set
-# CONFIG_ASH_IDLE_TIMEOUT is not set
# CONFIG_ASH_JOB_CONTROL is not set
# CONFIG_ASH_ALIAS is not set
-# CONFIG_ASH_GETOPTS is not set
-# CONFIG_ASH_BUILTIN_ECHO is not set
-# CONFIG_ASH_BUILTIN_PRINTF is not set
-# CONFIG_ASH_BUILTIN_TEST is not set
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+# CONFIG_ASH_EXPAND_PRMT is not set
+# CONFIG_ASH_IDLE_TIMEOUT is not set
+# CONFIG_ASH_MAIL is not set
+# CONFIG_ASH_ECHO is not set
+# CONFIG_ASH_PRINTF is not set
+# CONFIG_ASH_TEST is not set
# CONFIG_ASH_HELP is not set
+# CONFIG_ASH_GETOPTS is not set
# CONFIG_ASH_CMDCMD is not set
-# CONFIG_ASH_MAIL is not set
# CONFIG_CTTYHACK is not set
# CONFIG_HUSH is not set
# CONFIG_HUSH_BASH_COMPAT is not set
# CONFIG_HUSH_BRACE_EXPANSION is not set
-# CONFIG_HUSH_HELP is not set
# CONFIG_HUSH_INTERACTIVE is not set
# CONFIG_HUSH_SAVEHISTORY is not set
# CONFIG_HUSH_JOB is not set
@@ -1043,9 +1064,28 @@ CONFIG_BASH_IS_NONE=y
# CONFIG_HUSH_FUNCTIONS is not set
# CONFIG_HUSH_LOCAL is not set
# CONFIG_HUSH_RANDOM_SUPPORT is not set
-# CONFIG_HUSH_EXPORT_N is not set
# CONFIG_HUSH_MODE_X is not set
+# CONFIG_HUSH_ECHO is not set
+# CONFIG_HUSH_PRINTF is not set
+# CONFIG_HUSH_TEST is not set
+# CONFIG_HUSH_HELP is not set
+# CONFIG_HUSH_EXPORT is not set
+# CONFIG_HUSH_EXPORT_N is not set
+# CONFIG_HUSH_KILL is not set
+# CONFIG_HUSH_WAIT is not set
+# CONFIG_HUSH_TRAP is not set
+# CONFIG_HUSH_TYPE is not set
+# CONFIG_HUSH_READ is not set
+# CONFIG_HUSH_SET is not set
+# CONFIG_HUSH_UNSET is not set
+# CONFIG_HUSH_ULIMIT is not set
+# CONFIG_HUSH_UMASK is not set
+# CONFIG_HUSH_MEMLEAK is not set
# CONFIG_MSH is not set
+
+#
+# Options common to all shells
+#
# CONFIG_FEATURE_SH_MATH is not set
# CONFIG_FEATURE_SH_MATH_64 is not set
# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
diff --git a/main/busybox/location-for-cpio.patch b/main/busybox/location-for-cpio.patch
deleted file mode 100644
index e7069f2b9a..0000000000
--- a/main/busybox/location-for-cpio.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/archival/cpio.c b/archival/cpio.c
-index 540218cb2..369bf19a7 100644
---- a/archival/cpio.c
-+++ b/archival/cpio.c
-@@ -43,7 +43,7 @@
- //config: help
- //config: Passthrough mode. Rarely used.
-
--//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
-+//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
- //kbuild:lib-$(CONFIG_CPIO) += cpio.o
-
- //usage:#define cpio_trivial_usage