busybox: update 1.18.0 to 1.18.1

* 1.18.1 is considered as the latest stable version
* add the lastest fixes from http://busybox.net/downloads/fixes-1.18.1/
* default 1.18.1 for SlugOS

Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Cc: Mike Westerhof <mwester@dls.net>
Acked-by: Mike Westerhof <mwester@dls.net>

15 files changed, 275 insertions, 171 deletions

diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 4a670ea8fe..6ae4432baa 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -29,7 +29,7 @@ PREFERRED_VERSION_automake-native		?= "1.11.1"
 PREFERRED_VERSION_binutils			?= "2.20.1"
 PREFERRED_VERSION_binutils-cross		?= "2.20.1"
 PREFERRED_VERSION_binutils-cross-sdk		?= "2.20.1"
-PREFERRED_VERSION_busybox			?= "1.18.0"
+PREFERRED_VERSION_busybox			?= "1.18.1"
 PREFERRED_VERSION_dbus				?= "1.2.3"
 PREFERRED_VERSION_eglibc			?= "2.11"
 PREFERRED_VERSION_eglibc-initial		?= "2.11"
diff --git a/recipes/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch b/recipes/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch
deleted file mode 100644
index c72e4d3b56..0000000000
--- a/recipes/busybox/busybox-1.18.0/busybox-1.18.0-buildsys.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urpN busybox-1.18.0/scripts/gen_build_files.sh busybox-1.18.0-buildsys/scripts/gen_build_files.sh
---- busybox-1.18.0/scripts/gen_build_files.sh	2010-11-22 21:43:22.000000000 +0100
-+++ busybox-1.18.0-buildsys/scripts/gen_build_files.sh	2010-11-24 14:59:47.732712663 +0100
-@@ -18,14 +18,14 @@ generate()
- 	local src="$1" dst="$2" header="$3" insert="$4"
- 	#chk "${dst}"
- 	(
--		echo "${header}"
-+		printf "%s\n" "${header}"
- 		if grep -qs '^INSERT$' "${src}"; then
- 			sed -n '1,/^INSERT$/p' "${src}"
--			echo "${insert}"
-+			printf "%s\n" "${insert}"
- 			sed -n '/^INSERT$/,$p' "${src}"
- 		else
- 			if [ -n "${insert}" ]; then
--				echo "ERROR: INSERT line missing in: ${src}" 1>&2
-+				printf "%s\n" "ERROR: INSERT line missing in: ${src}" 1>&2
- 			fi
- 			cat "${src}"
- 		fi
diff --git a/recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch b/recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch
deleted file mode 100644
index 41ad570a9a..0000000000
--- a/recipes/busybox/busybox-1.18.0/busybox-1.18.0-runsvdir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urpN busybox-1.18.0/runit/runsvdir.c busybox-1.18.0-runsvdir/runit/runsvdir.c
---- busybox-1.18.0/runit/runsvdir.c	2010-11-22 21:43:22.000000000 +0100
-+++ busybox-1.18.0-runsvdir/runit/runsvdir.c	2010-12-06 01:27:56.926036992 +0100
-@@ -312,8 +312,11 @@ int runsvdir_main(int argc UNUSED_PARAM,
- 						last_mtime = s.st_mtime;
- 						last_dev = s.st_dev;
- 						last_ino = s.st_ino;
--						//if (now <= mtime)
--						//	sleep(1);
-+						/* if the svdir changed this very second, wait until the
-+						 * next second, because we won't be able to detect more
-+						 * changes within this second */
-+						while (time(NULL) == last_mtime)
-+							usleep(100000);
- 						need_rescan = do_rescan();
- 						while (fchdir(curdir) == -1) {
- 							warn2_cannot("change directory, pausing", "");
diff --git a/recipes/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch b/recipes/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch
deleted file mode 100644
index 3ad66fd71e..0000000000
--- a/recipes/busybox/busybox-1.18.0/busybox-1.18.0-sha.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -urpN busybox-1.18.0/libbb/pw_encrypt_sha.c busybox-1.18.0-sha/libbb/pw_encrypt_sha.c
---- busybox-1.18.0/libbb/pw_encrypt_sha.c	2010-11-22 21:43:22.000000000 +0100
-+++ busybox-1.18.0-sha/libbb/pw_encrypt_sha.c	2010-12-01 13:56:24.372704380 +0100
-@@ -3,7 +3,7 @@
-  */
- 
- /* Prefix for optional rounds specification.  */
--static const char str_rounds[] = "rounds=%u$";
-+static const char str_rounds[] ALIGN1 = "rounds=%u$";
- 
- /* Maximum salt string length.  */
- #define SALT_LEN_MAX 16
-@@ -19,8 +19,8 @@ NOINLINE
- sha_crypt(/*const*/ char *key_data, /*const*/ char *salt_data)
- {
- 	void (*sha_begin)(void *ctx) FAST_FUNC;
--	void (*sha_hash)(const void *buffer, size_t len, void *ctx) FAST_FUNC;
--	void (*sha_end)(void *resbuf, void *ctx) FAST_FUNC;
-+	void (*sha_hash)(void *ctx, const void *buffer, size_t len) FAST_FUNC;
-+	void (*sha_end)(void *ctx, void *resbuf) FAST_FUNC;
- 	int _32or64;
- 
- 	char *result, *resptr;
-@@ -103,40 +103,40 @@ sha_crypt(/*const*/ char *key_data, /*co
- 
- 	/* Add KEY, SALT.  */
- 	sha_begin(&ctx);
--	sha_hash(key_data, key_len, &ctx);
--	sha_hash(salt_data, salt_len, &ctx);
-+	sha_hash(&ctx, key_data, key_len);
-+	sha_hash(&ctx, salt_data, salt_len);
- 
- 	/* Compute alternate SHA sum with input KEY, SALT, and KEY.
- 	   The final result will be added to the first context.  */
- 	sha_begin(&alt_ctx);
--	sha_hash(key_data, key_len, &alt_ctx);
--	sha_hash(salt_data, salt_len, &alt_ctx);
--	sha_hash(key_data, key_len, &alt_ctx);
--	sha_end(alt_result, &alt_ctx);
-+	sha_hash(&alt_ctx, key_data, key_len);
-+	sha_hash(&alt_ctx, salt_data, salt_len);
-+	sha_hash(&alt_ctx, key_data, key_len);
-+	sha_end(&alt_ctx, alt_result);
- 
- 	/* Add result of this to the other context.  */
- 	/* Add for any character in the key one byte of the alternate sum.  */
- 	for (cnt = key_len; cnt > _32or64; cnt -= _32or64)
--		sha_hash(alt_result, _32or64, &ctx);
--	sha_hash(alt_result, cnt, &ctx);
-+		sha_hash(&ctx, alt_result, _32or64);
-+	sha_hash(&ctx, alt_result, cnt);
- 
- 	/* Take the binary representation of the length of the key and for every
- 	   1 add the alternate sum, for every 0 the key.  */
- 	for (cnt = key_len; cnt != 0; cnt >>= 1)
- 		if ((cnt & 1) != 0)
--			sha_hash(alt_result, _32or64, &ctx);
-+			sha_hash(&ctx, alt_result, _32or64);
- 		else
--			sha_hash(key_data, key_len, &ctx);
-+			sha_hash(&ctx, key_data, key_len);
- 
- 	/* Create intermediate result.  */
--	sha_end(alt_result, &ctx);
-+	sha_end(&ctx, alt_result);
- 
- 	/* Start computation of P byte sequence.  */
- 	/* For every character in the password add the entire password.  */
- 	sha_begin(&alt_ctx);
- 	for (cnt = 0; cnt < key_len; ++cnt)
--		sha_hash(key_data, key_len, &alt_ctx);
--	sha_end(temp_result, &alt_ctx);
-+		sha_hash(&alt_ctx, key_data, key_len);
-+	sha_end(&alt_ctx, temp_result);
- 
- 	/* NB: past this point, raw key_data is not used anymore */
- 
-@@ -153,8 +153,8 @@ sha_crypt(/*const*/ char *key_data, /*co
- 	/* For every character in the password add the entire password.  */
- 	sha_begin(&alt_ctx);
- 	for (cnt = 0; cnt < 16 + alt_result[0]; ++cnt)
--		sha_hash(salt_data, salt_len, &alt_ctx);
--	sha_end(temp_result, &alt_ctx);
-+		sha_hash(&alt_ctx, salt_data, salt_len);
-+	sha_end(&alt_ctx, temp_result);
- 
- 	/* NB: past this point, raw salt_data is not used anymore */
- 
-@@ -174,22 +174,22 @@ sha_crypt(/*const*/ char *key_data, /*co
- 
- 		/* Add key or last result.  */
- 		if ((cnt & 1) != 0)
--			sha_hash(p_bytes, key_len, &ctx);
-+			sha_hash(&ctx, p_bytes, key_len);
- 		else
--			sha_hash(alt_result, _32or64, &ctx);
-+			sha_hash(&ctx, alt_result, _32or64);
- 		/* Add salt for numbers not divisible by 3.  */
- 		if (cnt % 3 != 0)
--			sha_hash(s_bytes, salt_len, &ctx);
-+			sha_hash(&ctx, s_bytes, salt_len);
- 		/* Add key for numbers not divisible by 7.  */
- 		if (cnt % 7 != 0)
--			sha_hash(p_bytes, key_len, &ctx);
-+			sha_hash(&ctx, p_bytes, key_len);
- 		/* Add key or last result.  */
- 		if ((cnt & 1) != 0)
--			sha_hash(alt_result, _32or64, &ctx);
-+			sha_hash(&ctx, alt_result, _32or64);
- 		else
--			sha_hash(p_bytes, key_len, &ctx);
-+			sha_hash(&ctx, p_bytes, key_len);
- 
--		sha_end(alt_result, &ctx);
-+		sha_end(&ctx, alt_result);
- 	}
- 
- 	/* Append encrypted password to result buffer */
diff --git a/recipes/busybox/busybox-1.18.0/B921600.patch b/recipes/busybox/busybox-1.18.1/B921600.patch
index 61cc32b0e5..61cc32b0e5 100644
--- a/recipes/busybox/busybox-1.18.0/B921600.patch
+++ b/recipes/busybox/busybox-1.18.1/B921600.patch
diff --git a/recipes/busybox/busybox-1.18.1/busybox-1.18.1-cpio.patch b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-cpio.patch
new file mode 100644
index 0000000000..135f8091cd
--- /dev/null
+++ b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-cpio.patch
@@ -0,0 +1,20 @@
+diff -urpN busybox-1.18.1/archival/cpio.c busybox-1.18.1-cpio/archival/cpio.c
+--- busybox-1.18.1/archival/cpio.c	2010-12-20 01:41:26.000000000 +0100
++++ busybox-1.18.1-cpio/archival/cpio.c	2010-12-26 02:26:38.000000000 +0100
+@@ -308,16 +308,12 @@ int cpio_main(int argc UNUSED_PARAM, cha
+ 	/* -L makes sense only with -o or -p */
+ 
+ #if !ENABLE_FEATURE_CPIO_O
+-	/* no parameters */
+-	opt_complementary = "=0";
+ 	opt = getopt32(argv, OPTION_STR, &cpio_filename);
+ 	argv += optind;
+ 	if (opt & CPIO_OPT_FILE) { /* -F */
+ 		xmove_fd(xopen(cpio_filename, O_RDONLY), STDIN_FILENO);
+ 	}
+ #else
+-	/* _exactly_ one parameter for -p, thus <= 1 param if -p is allowed */
+-	opt_complementary = ENABLE_FEATURE_CPIO_P ? "?1" : "=0";
+ 	opt = getopt32(argv, OPTION_STR "oH:" IF_FEATURE_CPIO_P("p"), &cpio_filename, &cpio_fmt);
+ 	argv += optind;
+ 	if ((opt & (CPIO_OPT_FILE|CPIO_OPT_CREATE)) == CPIO_OPT_FILE) { /* -F without -o */
diff --git a/recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch
new file mode 100644
index 0000000000..3e189a9dc2
--- /dev/null
+++ b/recipes/busybox/busybox-1.18.1/busybox-1.18.1-hush.patch
@@ -0,0 +1,241 @@
+diff -urpN busybox-1.18.1/shell/hush.c busybox-1.18.1-hush/shell/hush.c
+--- busybox-1.18.1/shell/hush.c	2010-12-21 05:31:04.000000000 +0100
++++ busybox-1.18.1-hush/shell/hush.c	2010-12-21 21:20:02.493651813 +0100
+@@ -913,7 +913,7 @@ static const struct built_in_command blt
+  */
+ #if HUSH_DEBUG
+ /* prevent disasters with G.debug_indent < 0 */
+-# define indent() fprintf(stderr, "%*s", (G.debug_indent * 2) & 0xff, "")
++# define indent() fdprintf(2, "%*s", (G.debug_indent * 2) & 0xff, "")
+ # define debug_enter() (G.debug_indent++)
+ # define debug_leave() (G.debug_indent--)
+ #else
+@@ -923,56 +923,56 @@ static const struct built_in_command blt
+ #endif
+ 
+ #ifndef debug_printf
+-# define debug_printf(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf(...) (indent(), fdprintf(2, __VA_ARGS__))
+ #endif
+ 
+ #ifndef debug_printf_parse
+-# define debug_printf_parse(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf_parse(...) (indent(), fdprintf(2, __VA_ARGS__))
+ #endif
+ 
+ #ifndef debug_printf_exec
+-#define debug_printf_exec(...) (indent(), fprintf(stderr, __VA_ARGS__))
++#define debug_printf_exec(...) (indent(), fdprintf(2, __VA_ARGS__))
+ #endif
+ 
+ #ifndef debug_printf_env
+-# define debug_printf_env(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf_env(...) (indent(), fdprintf(2, __VA_ARGS__))
+ #endif
+ 
+ #ifndef debug_printf_jobs
+-# define debug_printf_jobs(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf_jobs(...) (indent(), fdprintf(2, __VA_ARGS__))
+ # define DEBUG_JOBS 1
+ #else
+ # define DEBUG_JOBS 0
+ #endif
+ 
+ #ifndef debug_printf_expand
+-# define debug_printf_expand(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf_expand(...) (indent(), fdprintf(2, __VA_ARGS__))
+ # define DEBUG_EXPAND 1
+ #else
+ # define DEBUG_EXPAND 0
+ #endif
+ 
+ #ifndef debug_printf_varexp
+-# define debug_printf_varexp(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf_varexp(...) (indent(), fdprintf(2, __VA_ARGS__))
+ #endif
+ 
+ #ifndef debug_printf_glob
+-# define debug_printf_glob(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf_glob(...) (indent(), fdprintf(2, __VA_ARGS__))
+ # define DEBUG_GLOB 1
+ #else
+ # define DEBUG_GLOB 0
+ #endif
+ 
+ #ifndef debug_printf_list
+-# define debug_printf_list(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf_list(...) (indent(), fdprintf(2, __VA_ARGS__))
+ #endif
+ 
+ #ifndef debug_printf_subst
+-# define debug_printf_subst(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf_subst(...) (indent(), fdprintf(2, __VA_ARGS__))
+ #endif
+ 
+ #ifndef debug_printf_clean
+-# define debug_printf_clean(...) (indent(), fprintf(stderr, __VA_ARGS__))
++# define debug_printf_clean(...) (indent(), fdprintf(2, __VA_ARGS__))
+ # define DEBUG_CLEAN 1
+ #else
+ # define DEBUG_CLEAN 0
+@@ -982,9 +982,9 @@ static const struct built_in_command blt
+ static void debug_print_strings(const char *prefix, char **vv)
+ {
+ 	indent();
+-	fprintf(stderr, "%s:\n", prefix);
++	fdprintf(2, "%s:\n", prefix);
+ 	while (*vv)
+-		fprintf(stderr, " '%s'\n", *vv++);
++		fdprintf(2, " '%s'\n", *vv++);
+ }
+ #else
+ # define debug_print_strings(prefix, vv) ((void)0)
+@@ -1416,6 +1416,22 @@ static void hush_exit(int exitcode)
+ 		builtin_eval(argv);
+ 	}
+ 
++#if ENABLE_FEATURE_CLEAN_UP
++	{
++		struct variable *cur_var;
++		if (G.cwd != bb_msg_unknown)
++			free((char*)G.cwd);
++		cur_var = G.top_var;
++		while (cur_var) {
++			struct variable *tmp = cur_var;
++			if (!cur_var->max_len)
++				free(cur_var->varstr);
++			cur_var = cur_var->next;
++			free(tmp);
++		}
++	}
++#endif
++
+ #if ENABLE_HUSH_JOB
+ 	fflush_all();
+ 	sigexit(- (exitcode & 0xff));
+@@ -2158,22 +2174,22 @@ static void debug_print_list(const char 
+ 	int i = 0;
+ 
+ 	indent();
+-	fprintf(stderr, "%s: list:%p n:%d string_start:%d length:%d maxlen:%d glob:%d quoted:%d escape:%d\n",
++	fdprintf(2, "%s: list:%p n:%d string_start:%d length:%d maxlen:%d glob:%d quoted:%d escape:%d\n",
+ 			prefix, list, n, string_start, o->length, o->maxlen,
+ 			!!(o->o_expflags & EXP_FLAG_GLOB),
+ 			o->has_quoted_part,
+ 			!!(o->o_expflags & EXP_FLAG_ESC_GLOB_CHARS));
+ 	while (i < n) {
+ 		indent();
+-		fprintf(stderr, " list[%d]=%d '%s' %p\n", i, (int)list[i],
+-				o->data + (int)list[i] + string_start,
+-				o->data + (int)list[i] + string_start);
++		fdprintf(2, " list[%d]=%d '%s' %p\n", i, (int)(uintptr_t)list[i],
++				o->data + (int)(uintptr_t)list[i] + string_start,
++				o->data + (int)(uintptr_t)list[i] + string_start);
+ 		i++;
+ 	}
+ 	if (n) {
+-		const char *p = o->data + (int)list[n - 1] + string_start;
++		const char *p = o->data + (int)(uintptr_t)list[n - 1] + string_start;
+ 		indent();
+-		fprintf(stderr, " total_sz:%ld\n", (long)((p + strlen(p) + 1) - o->data));
++		fdprintf(2, " total_sz:%ld\n", (long)((p + strlen(p) + 1) - o->data));
+ 	}
+ }
+ #else
+@@ -2672,18 +2688,18 @@ static void debug_print_tree(struct pipe
+ 
+ 	pin = 0;
+ 	while (pi) {
+-		fprintf(stderr, "%*spipe %d res_word=%s followup=%d %s\n", lvl*2, "",
++		fdprintf(2, "%*spipe %d res_word=%s followup=%d %s\n", lvl*2, "",
+ 				pin, RES[pi->res_word], pi->followup, PIPE[pi->followup]);
+ 		prn = 0;
+ 		while (prn < pi->num_cmds) {
+ 			struct command *command = &pi->cmds[prn];
+ 			char **argv = command->argv;
+ 
+-			fprintf(stderr, "%*s cmd %d assignment_cnt:%d",
++			fdprintf(2, "%*s cmd %d assignment_cnt:%d",
+ 					lvl*2, "", prn,
+ 					command->assignment_cnt);
+ 			if (command->group) {
+-				fprintf(stderr, " group %s: (argv=%p)%s%s\n",
++				fdprintf(2, " group %s: (argv=%p)%s%s\n",
+ 						CMDTYPE[command->cmd_type],
+ 						argv
+ # if !BB_MMU
+@@ -2697,10 +2713,10 @@ static void debug_print_tree(struct pipe
+ 				continue;
+ 			}
+ 			if (argv) while (*argv) {
+-				fprintf(stderr, " '%s'", *argv);
++				fdprintf(2, " '%s'", *argv);
+ 				argv++;
+ 			}
+-			fprintf(stderr, "\n");
++			fdprintf(2, "\n");
+ 			prn++;
+ 		}
+ 		pi = pi->next;
+@@ -7445,7 +7461,7 @@ int hush_main(int argc, char **argv)
+ 	unsigned builtin_argc;
+ 	char **e;
+ 	struct variable *cur_var;
+-	struct variable shell_ver;
++	struct variable *shell_ver;
+ 
+ 	INIT_G();
+ 	if (EXIT_SUCCESS) /* if EXIT_SUCCESS == 0, it is already done */
+@@ -7454,17 +7470,17 @@ int hush_main(int argc, char **argv)
+ 	G.argv0_for_re_execing = argv[0];
+ #endif
+ 	/* Deal with HUSH_VERSION */
+-	memset(&shell_ver, 0, sizeof(shell_ver));
+-	shell_ver.flg_export = 1;
+-	shell_ver.flg_read_only = 1;
++	shell_ver = xzalloc(sizeof(*shell_ver));
++	shell_ver->flg_export = 1;
++	shell_ver->flg_read_only = 1;
+ 	/* Code which handles ${var<op>...} needs writable values for all variables,
+ 	 * therefore we xstrdup: */
+-	shell_ver.varstr = xstrdup(hush_version_str),
+-	G.top_var = &shell_ver;
++	shell_ver->varstr = xstrdup(hush_version_str);
+ 	/* Create shell local variables from the values
+ 	 * currently living in the environment */
+ 	debug_printf_env("unsetenv '%s'\n", "HUSH_VERSION");
+ 	unsetenv("HUSH_VERSION"); /* in case it exists in initial env */
++	G.top_var = shell_ver;
+ 	cur_var = G.top_var;
+ 	e = environ;
+ 	if (e) while (*e) {
+@@ -7479,8 +7495,8 @@ int hush_main(int argc, char **argv)
+ 		e++;
+ 	}
+ 	/* (Re)insert HUSH_VERSION into env (AFTER we scanned the env!) */
+-	debug_printf_env("putenv '%s'\n", shell_ver.varstr);
+-	putenv(shell_ver.varstr);
++	debug_printf_env("putenv '%s'\n", shell_ver->varstr);
++	putenv(shell_ver->varstr);
+ 
+ 	/* Export PWD */
+ 	set_pwd_var(/*exp:*/ 1);
+@@ -7840,18 +7856,6 @@ int hush_main(int argc, char **argv)
+ 	parse_and_run_file(stdin);
+ 
+  final_return:
+-#if ENABLE_FEATURE_CLEAN_UP
+-	if (G.cwd != bb_msg_unknown)
+-		free((char*)G.cwd);
+-	cur_var = G.top_var->next;
+-	while (cur_var) {
+-		struct variable *tmp = cur_var;
+-		if (!cur_var->max_len)
+-			free(cur_var->varstr);
+-		cur_var = cur_var->next;
+-		free(tmp);
+-	}
+-#endif
+ 	hush_exit(G.last_exitcode);
+ }
+ 
diff --git a/recipes/busybox/busybox-1.18.0/defconfig b/recipes/busybox/busybox-1.18.1/defconfig
index 5a6870c110..5a6870c110 100644
--- a/recipes/busybox/busybox-1.18.0/defconfig
+++ b/recipes/busybox/busybox-1.18.1/defconfig
diff --git a/recipes/busybox/busybox-1.18.0/fdisk_nios2.patch b/recipes/busybox/busybox-1.18.1/fdisk_nios2.patch
index 648e68e9da..648e68e9da 100644
--- a/recipes/busybox/busybox-1.18.0/fdisk_nios2.patch
+++ b/recipes/busybox/busybox-1.18.1/fdisk_nios2.patch
diff --git a/recipes/busybox/busybox-1.18.0/get_header_tar.patch b/recipes/busybox/busybox-1.18.1/get_header_tar.patch
index 62b55af501..62b55af501 100644
--- a/recipes/busybox/busybox-1.18.0/get_header_tar.patch
+++ b/recipes/busybox/busybox-1.18.1/get_header_tar.patch
diff --git a/recipes/busybox/busybox-1.18.0/slugos/defconfig b/recipes/busybox/busybox-1.18.1/slugos/defconfig
index d3e38b8f5f..d3e38b8f5f 100644
--- a/recipes/busybox/busybox-1.18.0/slugos/defconfig
+++ b/recipes/busybox/busybox-1.18.1/slugos/defconfig
diff --git a/recipes/busybox/busybox-1.18.0/udhcpc-fix-nfsroot.patch b/recipes/busybox/busybox-1.18.1/udhcpc-fix-nfsroot.patch
index 3b975b63f9..3b975b63f9 100644
--- a/recipes/busybox/busybox-1.18.0/udhcpc-fix-nfsroot.patch
+++ b/recipes/busybox/busybox-1.18.1/udhcpc-fix-nfsroot.patch
diff --git a/recipes/busybox/busybox-1.18.0/udhcpscript.patch b/recipes/busybox/busybox-1.18.1/udhcpscript.patch
index 2ffba956ae..2ffba956ae 100644
--- a/recipes/busybox/busybox-1.18.0/udhcpscript.patch
+++ b/recipes/busybox/busybox-1.18.1/udhcpscript.patch
diff --git a/recipes/busybox/busybox_1.18.0.bb b/recipes/busybox/busybox_1.18.0.bb
deleted file mode 100644
index d11dffe78e..0000000000
--- a/recipes/busybox/busybox_1.18.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require busybox_1.1x.inc
-PR = "${INC_PR}.3"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI += " \
-	file://busybox-1.18.0-buildsys.patch \
-	file://busybox-1.18.0-sha.patch \
-	file://busybox-1.18.0-runsvdir.patch \
-	"
-
-SRC_URI[md5sum] = "7a8150a10558a5292fa1f52f1c65b0f5"
-SRC_URI[sha256sum] = "3a9d5e6929045440ec3d0c9987376cbbb78e98886d6c5fa58fc2306d2662eb00"
-
diff --git a/recipes/busybox/busybox_1.18.1.bb b/recipes/busybox/busybox_1.18.1.bb
new file mode 100644
index 0000000000..8fe121029b
--- /dev/null
+++ b/recipes/busybox/busybox_1.18.1.bb
@@ -0,0 +1,13 @@
+require busybox_1.1x.inc
+PR = "${INC_PR}.0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI += " \
+	file://busybox-1.18.1-hush.patch \
+	file://busybox-1.18.1-cpio.patch \
+	"
+
+SRC_URI[md5sum] = "f15fe752d8b7012aa5e59f83b88ccb1c"
+SRC_URI[sha256sum] = "33eb25ea7b20c727c3af769256b21408a1ac1f927ff9f89a1f1e3767c18c9967"
+