Add upstream hotfixes #350604 by Chris Richards.

Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64

8 files changed, 381 insertions, 11 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index a6caa7817428..3b3474402e41 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/busybox
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.264 2010/12/28 16:44:11 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.265 2011/01/07 17:30:34 vapier Exp $
+
+  07 Jan 2011; Mike Frysinger <vapier@gentoo.org> busybox-1.18.1.ebuild,
+  +files/busybox-1.18.1-bzip2.patch, +files/busybox-1.18.1-cpio.patch,
+  +files/busybox-1.18.1-hush.patch, +files/busybox-1.18.1-mkswap.patch,
+  +files/busybox-1.18.1-warning.patch:
+  Add upstream hotfixes #350604 by Chris Richards.
 
   28 Dec 2010; Markus Meier <maekke@gentoo.org> busybox-1.17.4.ebuild:
   arm stable, bug #349309
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 53a244d178b6..79e23dc46e69 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX busybox-1.15.2-bb.patch 956 RMD160 13d7f8e8fdb35245de4072ff1e55470b2c58f6db SHA1 ab66f70245a399a1a21af0e5598fd2fae809d935 SHA256 482de22b18764e8e0b264bb00d03accf9b821666b64f1a423068b10b30b4893c
 AUX busybox-1.16.0-bb.patch 1124 RMD160 c59e37bd32f9a05d78fca4599dcfdbc88d373c95 SHA1 8028db3af9fcbfa57d3af022e80074836766b7d9 SHA256 c938fd454dcafcf6a9d725104d78dd52fd1f5b9a98507ff8023e9b7419b103ce
@@ -12,6 +12,11 @@ AUX busybox-1.17.1-mktemp.patch 553 RMD160 98a344fbfb84fd1c4c14ffe72a4e4020f0e10
 AUX busybox-1.17.1-sed.patch 4385 RMD160 a95bf628faa8e5bbe9c35095d22ad5e0258946ca SHA1 a6c181f40b9fc150b19eb691cb6bde7060c102c5 SHA256 7bc59298b351ec5485be2a144d2325a6cb43517f1f8c169b01d8b639f6ec42b4
 AUX busybox-1.17.1-shell.patch 4308 RMD160 9a2d8fa37a8cb6311d056c21d3cde0ad28bcf893 SHA1 45e77540579ef6b2bfec546034c0c60d9fbff510 SHA256 6c89b0037eea646af54a1321bae905f3010969f5edfc3df513f14e8705444e2f
 AUX busybox-1.18.0-bb.patch 918 RMD160 e6a7be911deb07510ddf46b8a4b8b24ef5b1b29a SHA1 f4815f4cd948c300d65e553486c949c780f05752 SHA256 9e713de11f26a07e5a17d7e62eed7a10b163de91331d50541dcc2c037acbcb67
+AUX busybox-1.18.1-bzip2.patch 1215 RMD160 48e7f2554f13aee61b9e529100df024bf8fe2aaf SHA1 2eb3bf3803f997ce5929b6dc174dc0c5574346a2 SHA256 b91ec72c68961454f4b2cd19b2b4e13bf01650050c69f3875a48003f0740615f
+AUX busybox-1.18.1-cpio.patch 916 RMD160 fddcc3ee74a745634c3341d792c130bbbead0bf6 SHA1 1a2c0145d05b4c01b046fcd3ec29be3127f8eeb5 SHA256 b97aa58fa5925cd2fa59b178e33eaa86d5e6633c8c4522bc11f384ba60d33eb3
+AUX busybox-1.18.1-hush.patch 8447 RMD160 890c9fc9cc4a47389f5a36e52316e6863791fc60 SHA1 119a025215a70f8e41dcca1e81c93d1894f3679d SHA256 d6a066e2f606559f1cd036e7bcbaf555b1d7df8a924804eca6996bc535e44dbf
+AUX busybox-1.18.1-mkswap.patch 504 RMD160 9fbecd5d82ae1d3198acd365e411572bae90dbd3 SHA1 7d5560ca68a5f2f53f573c784929f710b87f5c9d SHA256 8cbf49401fafaf35be70ba414cab0d68c7c88b1d0a6bbb5b00d0dc27621accfa
+AUX busybox-1.18.1-warning.patch 913 RMD160 6b688c0561d7d059c7693b24575a103bb9bf978a SHA1 742d459957500551f24be81845b861994bb50c48 SHA256 95df2c2e95c6e0a3a2275d8c9b0958894f4b315666f0407e4f4c9c9dc0b47109
 AUX mdev-start.sh 2758 RMD160 c177aac4940b177bd857bc98ff2ac031e0489bbc SHA1 5a5b95da36c489cd12820513434a7a17ac3bffd1 SHA256 9904263c8dfe2b8c3e968a9b4245fa0c162a2413110c037cdd797ac3773587d7
 AUX mdev.rc 282 RMD160 6a11e23fbed92acd24088a7885bdc52b9c845fac SHA1 46f1a0494e009332e83b62599842f8213b60ba60 SHA256 e52abbc3399fc85ce1f097e8f12b25a5ca7fe2e3d648bee60c061b547ba39dc5
 AUX mdev/dvbdev 356 RMD160 db7f546ae6e47b59cca9712f1e218cdbc3985c78 SHA1 993c0ab79fa41912f84db95e7dd09aa0965aa8c7 SHA256 ef091bb4c8943a99b9a97b556cdc15ddd20275f5afa8287e201419b08c4e71de
@@ -25,13 +30,13 @@ DIST busybox-1.18.1.tar.bz2 2129404 RMD160 fb40d19103945eb1cd785a6041e5545f4055b
 EBUILD busybox-1.15.3.ebuild 7403 RMD160 574c4cc57a16c18a7409a67c25cf80e843b9e6f5 SHA1 d7c983ec464201e6934ccc6ca247aea37e109ac9 SHA256 1bf516cfbee42acf2b792729a066b7bf976aac90965b77fe9f460cdcff3d8999
 EBUILD busybox-1.17.1-r1.ebuild 7815 RMD160 b46e4325c7f98dfda2e0c9d0db01d6dcd3c98b5a SHA1 290857588367281cce5c20652cde1ad87d53d779 SHA256 92287477d7d6c3464518377c2b659262a189f7b4ae49b26fe4fef1e86cd634f8
 EBUILD busybox-1.17.4.ebuild 7875 RMD160 7145e4d0f26f8430a78c9e3b2a01b4c3a9ff42ff SHA1 f36792c71240ddc646bcdebeb9b30159f5b1655f SHA256 21f848417f4e361751fabd016d1eb6c63bdffa05ee7f6c2b5b8f0e127814c6a7
-EBUILD busybox-1.18.1.ebuild 7879 RMD160 37a61f1aad0924dd093cd17aade4c8231ec0a674 SHA1 6385245b1e0476e1c45ebb24cb31bb43bbc8d58a SHA256 7eecfc226d3f2ae6d10a7b40be69c08daaef57132db2401f028d107ca2fd7ecb
-MISC ChangeLog 39029 RMD160 01adda19a92e63f034bd383a5a52be69a427039b SHA1 da401d4b03452861df9a4e921a2cd774861c34fe SHA256 8357aa15c5a6073c850b2fc79f7c142cda8b8ea470a35cdbae7dbae850d4b12d
+EBUILD busybox-1.18.1.ebuild 7878 RMD160 bffa2b8a14b89e73284465fab69843a6c64bc59b SHA1 50f602ebad143a95e8c264391bf97d5ddf8a2150 SHA256 a227375d847bec70e835e060ffb8d4d0c7c570473f157970135b272f26710b4d
+MISC ChangeLog 39336 RMD160 ed7f4a3f04fb052d06bd1ce2a6dc92a520786446 SHA1 d34a4d3f5a4e05cad292ca0717040973ff408dbc SHA256 a7198026fb2f61c3b59bbe47f8324f11502406abe35770abc0df680796fc2f64
 MISC metadata.xml 368 RMD160 2facee7f44b7469c85383961c2dd4338ea6fffcb SHA1 eae78f6b5eb3a21aeae692f9a7420ab536be3739 SHA256 033b1cb2abe759f73b184ce43b5c791454716638090767c2bc70cc52b4ef187f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0aE+QACgkQkKaRLQcq0GKiGwCgo3BgC5+SxcbzhGGcAagdTLjQ
-N94AnReH+eZo+Y+x6nDwLzf24sqevHnj
-=zies
+iF4EAREIAAYFAk0nW8sACgkQaC/OocHi7JbxtQD/TMxdUyxGgrSfxHxRaSPSGA4x
+LtWsy5N7+zb9f7HMyxwA/RRUkDSJSAAzG2XXqLIFrFaWOTnaoWmX5MTjZynjRf8v
+=kyos
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.18.1.ebuild b/sys-apps/busybox/busybox-1.18.1.ebuild
index 82a6559b09b5..2c0c45fb37d7 100644
--- a/sys-apps/busybox/busybox-1.18.1.ebuild
+++ b/sys-apps/busybox/busybox-1.18.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.18.1.ebuild,v 1.1 2010/12/21 23:32:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.18.1.ebuild,v 1.2 2011/01/07 17:30:34 vapier Exp $
 
 EAPI=2
 inherit eutils flag-o-matic savedconfig toolchain-funcs
@@ -85,7 +85,7 @@ src_prepare() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/busybox-1.18.0-bb.patch
-	#epatch "${FILESDIR}"/busybox-${PV}-*.patch
+	epatch "${FILESDIR}"/busybox-${PV}-*.patch
 
 	# flag cleanup
 	sed -i -r \
diff --git a/sys-apps/busybox/files/busybox-1.18.1-bzip2.patch b/sys-apps/busybox/files/busybox-1.18.1-bzip2.patch
new file mode 100644
index 000000000000..cffa194355fe
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.18.1-bzip2.patch
@@ -0,0 +1,40 @@
+diff -urpN busybox-1.18.1/archival/bzip2.c busybox-1.18.1-bzip2/archival/bzip2.c
+--- busybox-1.18.1/archival/bzip2.c	2010-12-20 01:41:26.000000000 +0100
++++ busybox-1.18.1-bzip2/archival/bzip2.c	2010-12-30 04:43:11.000000000 +0100
+@@ -128,10 +128,12 @@ IF_DESKTOP(long long) int FAST_FUNC comp
+ 			break;
+ 	}
+ 
+-#if ENABLE_FEATURE_CLEAN_UP
++	/* Can't be conditional on ENABLE_FEATURE_CLEAN_UP -
++	 * we are called repeatedly
++	 */
+ 	BZ2_bzCompressEnd(strm);
+ 	free(iobuf);
+-#endif
++
+ 	return total;
+ }
+ 
+diff -urpN busybox-1.18.1/archival/libarchive/bz/bzlib.c busybox-1.18.1-bzip2/archival/libarchive/bz/bzlib.c
+--- busybox-1.18.1/archival/libarchive/bz/bzlib.c	2010-12-20 01:41:26.000000000 +0100
++++ busybox-1.18.1-bzip2/archival/libarchive/bz/bzlib.c	2010-12-30 04:43:11.000000000 +0100
+@@ -361,7 +361,6 @@ int BZ2_bzCompress(bz_stream *strm, int 
+ 
+ 
+ /*---------------------------------------------------*/
+-#if ENABLE_FEATURE_CLEAN_UP
+ static
+ void BZ2_bzCompressEnd(bz_stream *strm)
+ {
+@@ -372,9 +371,8 @@ void BZ2_bzCompressEnd(bz_stream *strm)
+ 	free(s->arr2);
+ 	free(s->ftab);
+ 	free(s->crc32table);
+-	free(strm->state);
++	free(s);
+ }
+-#endif
+ 
+ 
+ /*---------------------------------------------------*/
diff --git a/sys-apps/busybox/files/busybox-1.18.1-cpio.patch b/sys-apps/busybox/files/busybox-1.18.1-cpio.patch
new file mode 100644
index 000000000000..135f8091cda9
--- /dev/null
+++ b/sys-apps/busybox/files/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/sys-apps/busybox/files/busybox-1.18.1-hush.patch b/sys-apps/busybox/files/busybox-1.18.1-hush.patch
new file mode 100644
index 000000000000..5281a52e536c
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.18.1-hush.patch
@@ -0,0 +1,259 @@
+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	2011-01-07 14:59:19.649956156 +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;
+@@ -4106,7 +4122,16 @@ static struct pipe *parse_stream(char **
+ 				if (IS_NULL_CMD(ctx.command)
+ 				 && dest.length == 0 && !dest.has_quoted_part
+ 				) {
+-					continue;
++					/* This newline can be ignored. But...
++					 * without the below check, interactive shell
++					 * will ignore even lines with bare <newline>,
++					 * and show the continuation prompt:
++					 * ps1_prompt$ <enter>
++					 * ps2> _   <=== wrong prompt, should be ps1
++					 */
++					struct pipe *pi = ctx.list_head;
++					if (pi->num_cmds != 0)
++						continue;
+ 				}
+ 				/* Treat newline as a command separator. */
+ 				done_pipe(&ctx, PIPE_SEQ);
+@@ -7445,7 +7470,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 +7479,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 +7504,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 +7865,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/sys-apps/busybox/files/busybox-1.18.1-mkswap.patch b/sys-apps/busybox/files/busybox-1.18.1-mkswap.patch
new file mode 100644
index 000000000000..41dff57c0eec
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.18.1-mkswap.patch
@@ -0,0 +1,12 @@
+diff -urpN busybox-1.18.1/util-linux/mkswap.c busybox-1.18.1-mkswap/util-linux/mkswap.c
+--- busybox-1.18.1/util-linux/mkswap.c	2010-12-20 01:41:27.000000000 +0100
++++ busybox-1.18.1-mkswap/util-linux/mkswap.c	2011-01-05 11:41:24.455856773 +0100
+@@ -15,7 +15,7 @@ static void mkswap_selinux_setcontext(in
+ 	if (!is_selinux_enabled())
+ 		return;
+ 
+-	xfstat(fd, &stbuf, argv[0]);
++	xfstat(fd, &stbuf, path);
+ 	if (S_ISREG(stbuf.st_mode)) {
+ 		security_context_t newcon;
+ 		security_context_t oldcon = NULL;
diff --git a/sys-apps/busybox/files/busybox-1.18.1-warning.patch b/sys-apps/busybox/files/busybox-1.18.1-warning.patch
new file mode 100644
index 000000000000..cda94bd4fd00
--- /dev/null
+++ b/sys-apps/busybox/files/busybox-1.18.1-warning.patch
@@ -0,0 +1,28 @@
+diff -urpN busybox-1.18.1/libbb/procps.c busybox-1.18.1-warning/libbb/procps.c
+--- busybox-1.18.1/libbb/procps.c	2010-12-21 05:29:45.000000000 +0100
++++ busybox-1.18.1-warning/libbb/procps.c	2011-01-07 13:41:22.000000000 +0100
+@@ -154,6 +154,7 @@ static unsigned long fast_strtoul_10(cha
+ 	return n;
+ }
+ 
++# if ENABLE_FEATURE_FAST_TOP
+ static long fast_strtol_10(char **endptr)
+ {
+ 	if (**endptr != '-')
+@@ -162,6 +163,7 @@ static long fast_strtol_10(char **endptr
+ 	(*endptr)++;
+ 	return - (long)fast_strtoul_10(endptr);
+ }
++# endif
+ 
+ static char *skip_fields(char *str, int count)
+ {
+@@ -448,7 +450,7 @@ procps_status_t* FAST_FUNC procps_scan(p
+ //FIXME: is it safe to assume this field exists?
+ 			sp->last_seen_on_cpu = fast_strtoul_10(&cp);
+ # endif
+-#endif /* end of !ENABLE_FEATURE_TOP_SMP_PROCESS */
++#endif /* FEATURE_FAST_TOP */
+ 
+ #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
+ 			sp->niceness = tasknice;