11 files changed, 25 insertions, 396 deletions

diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index b7e96ef25bb3..564ca8aa0dd1 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -2,16 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	busybox
-PORTVERSION=	1.20.2
-PORTREVISION=	3
+PORTVERSION=	1.21.1
 CATEGORIES=	sysutils misc shells
 MASTER_SITES=	http://www.busybox.net/downloads/
 
 PATCH_SITES=	http://www.busybox.net/downloads/fixes-${PORTVERSION}/
 PATCH_DIST_STRIP=	-p1
-PATCHFILES=	busybox-1.20.2-kernel_ver.patch \
-		busybox-1.20.2-ntpd.patch \
-		busybox-1.20.2-sys-resource.patch
+PATCHFILES=
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	Busybox for FreeBSD
@@ -22,8 +19,6 @@ BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 
 CONFLICTS_INSTALL=	busybox-unstable-*
 
-PORTSCOUT=	limitw:1,EVEN
-
 MAKE_JOBS_SAFE=	yes
 MAKE_ARGS+=	SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"
 USE_BZIP2=	yes
diff --git a/sysutils/busybox/distinfo b/sysutils/busybox/distinfo
index c9aa66fa8961..6d868dd4cb5b 100644
--- a/sysutils/busybox/distinfo
+++ b/sysutils/busybox/distinfo
@@ -1,8 +1,2 @@
-SHA256 (busybox-1.20.2.tar.bz2) = eb13ff01dae5618ead2ef6f92ba879e9e0390f9583bd545d8789d27cf39b6882
-SIZE (busybox-1.20.2.tar.bz2) = 2186738
-SHA256 (busybox-1.20.2-kernel_ver.patch) = 707ea6e4455c08337df0e8c86d21970aca2b9b1f71f2bc2ae1b48f59881438a8
-SIZE (busybox-1.20.2-kernel_ver.patch) = 540
-SHA256 (busybox-1.20.2-ntpd.patch) = 34600b94a842b25e551998b164c8fe5ff52b63cb72a258e0f39ebe976f524e70
-SIZE (busybox-1.20.2-ntpd.patch) = 493
-SHA256 (busybox-1.20.2-sys-resource.patch) = 35d632df48e66c5b9184d9571e9b9dfdd436ea76b7f02d13e5807f440361a0d6
-SIZE (busybox-1.20.2-sys-resource.patch) = 3561
+SHA256 (busybox-1.21.1.tar.bz2) = cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303
+SIZE (busybox-1.21.1.tar.bz2) = 2201917
diff --git a/sysutils/busybox/files/data-.config b/sysutils/busybox/files/data-.config
index e9b773965aaf..637ee3096ae3 100644
--- a/sysutils/busybox/files/data-.config
+++ b/sysutils/busybox/files/data-.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.20.2
-# Tue Jul 17 04:11:27 2012
+# Busybox version: 1.21.0
+# Mon Jan 21 21:22:08 2013
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -16,7 +16,7 @@ CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_EXTRA_COMPAT is not set
 CONFIG_INCLUDE_SUSv2=y
 CONFIG_USE_PORTABLE_CODE=y
-# CONFIG_PLATFORM_LINUX is not set
+CONFIG_PLATFORM_LINUX=y
 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -42,6 +42,7 @@ CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_UTMP is not set
 # CONFIG_FEATURE_WTMP is not set
 CONFIG_FEATURE_PIDFILE=y
+CONFIG_PID_FILE_PATH="/var/run"
 CONFIG_FEATURE_SUID=y
 CONFIG_FEATURE_SUID_CONFIG=y
 CONFIG_FEATURE_SUID_CONFIG_QUIET=y
@@ -96,6 +97,7 @@ CONFIG_PREFIX="./_install"
 CONFIG_FEATURE_RTMINMAX=y
 CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SMALL=1
+CONFIG_SHA3_SMALL=1
 CONFIG_FEATURE_FAST_TOP=y
 # CONFIG_FEATURE_ETC_NETWORKS is not set
 CONFIG_FEATURE_USE_TERMIOS=y
@@ -263,6 +265,7 @@ CONFIG_SEQ=y
 CONFIG_SHA1SUM=y
 CONFIG_SHA256SUM=y
 CONFIG_SHA512SUM=y
+CONFIG_SHA3SUM=y
 CONFIG_SLEEP=y
 CONFIG_FEATURE_FANCY_SLEEP=y
 CONFIG_FEATURE_FLOAT_SLEEP=y
@@ -310,7 +313,7 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
-# Common options for md5sum, sha1sum, sha256sum, sha512sum
+# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum
 #
 CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y
 
@@ -371,7 +374,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
 CONFIG_AWK=y
 CONFIG_FEATURE_AWK_LIBM=y
 CONFIG_CMP=y
@@ -604,9 +606,11 @@ CONFIG_SCRIPTREPLAY=y
 # CONFIG_FEATURE_VOLUMEID_BTRFS is not set
 # CONFIG_FEATURE_VOLUMEID_REISERFS is not set
 # CONFIG_FEATURE_VOLUMEID_FAT is not set
+# CONFIG_FEATURE_VOLUMEID_EXFAT is not set
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
 # CONFIG_FEATURE_VOLUMEID_JFS is not set
 # CONFIG_FEATURE_VOLUMEID_XFS is not set
+# CONFIG_FEATURE_VOLUMEID_NILFS is not set
 # CONFIG_FEATURE_VOLUMEID_NTFS is not set
 # CONFIG_FEATURE_VOLUMEID_ISO9660 is not set
 # CONFIG_FEATURE_VOLUMEID_UDF is not set
@@ -614,6 +618,7 @@ CONFIG_SCRIPTREPLAY=y
 # CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set
 # CONFIG_FEATURE_VOLUMEID_CRAMFS is not set
 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
+# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set
 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
 # CONFIG_FEATURE_VOLUMEID_OCFS2 is not set
 # CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set
@@ -886,6 +891,13 @@ CONFIG_POWERTOP=y
 CONFIG_PSTREE=y
 CONFIG_PWDX=y
 CONFIG_SMEMCAP=y
+# CONFIG_TOP 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
+# CONFIG_FEATURE_TOP_DECIMALS is not set
+# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
+# CONFIG_FEATURE_TOPMEM is not set
 # CONFIG_UPTIME is not set
 # CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set
 # CONFIG_FREE is not set
@@ -906,13 +918,6 @@ CONFIG_FEATURE_PS_LONG=y
 # CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set
 CONFIG_RENICE=y
 CONFIG_BB_SYSCTL=y
-# CONFIG_TOP 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
-# CONFIG_FEATURE_TOP_DECIMALS is not set
-# CONFIG_FEATURE_TOP_SMP_PROCESS is not set
-# CONFIG_FEATURE_TOPMEM is not set
 CONFIG_FEATURE_SHOW_THREADS=y
 CONFIG_WATCH=y
 
@@ -1007,6 +1012,7 @@ CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=16
 CONFIG_LOGREAD=y
 CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING=y
+CONFIG_FEATURE_KMSG_SYSLOG=y
 # CONFIG_KLOGD is not set
 # CONFIG_FEATURE_KLOGD_KLOGCTL is not set
 CONFIG_LOGGER=y
diff --git a/sysutils/busybox/files/patch-380c8a0-xz-support-concatenated-.xz-streams b/sysutils/busybox/files/patch-380c8a0-xz-support-concatenated-.xz-streams
deleted file mode 100644
index b3794901013f..000000000000
--- a/sysutils/busybox/files/patch-380c8a0-xz-support-concatenated-.xz-streams
+++ /dev/null
@@ -1,99 +0,0 @@
-commit 380c8a0763462692eef8d00df4872a561ff7aa7b
-Author: Lasse Collin <lasse.collin@tukaani.org>
-Date:   Wed Feb 27 17:26:40 2013 +0100
-
-    xz: support concatenated .xz streams
-    
-    function                                             old     new   delta
-    xz_dec_reset                                           -      77     +77
-    unpack_xz_stream                                    2402    2397      -5
-    
-    Signed-off-by: Lasse Collin <lasse.collin@tukaani.org>
-    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
-diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
-index 79b48a1..e9ddd37 100644
---- ./archival/libarchive/decompress_unxz.c
-+++ ./archival/libarchive/decompress_unxz.c
-@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
- IF_DESKTOP(long long) int FAST_FUNC
- unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
- {
-+	enum xz_ret xz_result;
- 	struct xz_buf iobuf;
- 	struct xz_dec *state;
- 	unsigned char *membuf;
-@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
- 	/* Limit memory usage to about 64 MiB. */
- 	state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024);
- 
-+	xz_result = X_OK;
- 	while (1) {
--		enum xz_ret r;
--
- 		if (iobuf.in_pos == iobuf.in_size) {
- 			int rd = safe_read(src_fd, membuf, BUFSIZ);
- 			if (rd < 0) {
-@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd)
- 				total = -1;
- 				break;
- 			}
-+			if (rd == 0 && xz_result == XZ_STREAM_END)
-+				break;
- 			iobuf.in_size = rd;
- 			iobuf.in_pos = 0;
- 		}
-+		if (xz_result == XZ_STREAM_END) {
-+			/*
-+			 * Try to start decoding next concatenated stream.
-+			 * Stream padding must always be a multiple of four
-+			 * bytes to preserve four-byte alignment. To keep the
-+			 * code slightly smaller, we aren't as strict here as
-+			 * the .xz spec requires. We just skip all zero-bytes
-+			 * without checking the alignment and thus can accept
-+			 * files that aren't valid, e.g. the XZ utils test
-+			 * files bad-0pad-empty.xz and bad-0catpad-empty.xz.
-+			 */
-+			do {
-+				if (membuf[iobuf.in_pos] != 0) {
-+					xz_dec_reset(state);
-+					goto do_run;
-+				}
-+				iobuf.in_pos++;
-+			} while (iobuf.in_pos < iobuf.in_size);
-+		}
-+ do_run:
- //		bb_error_msg(">in pos:%d size:%d out pos:%d size:%d",
- //				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size);
--		r = xz_dec_run(state, &iobuf);
-+		xz_result = xz_dec_run(state, &iobuf);
- //		bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d",
--//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r);
-+//				iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result);
- 		if (iobuf.out_pos) {
- 			xwrite(dst_fd, iobuf.out, iobuf.out_pos);
- 			IF_DESKTOP(total += iobuf.out_pos;)
- 			iobuf.out_pos = 0;
- 		}
--		if (r == XZ_STREAM_END) {
--			break;
-+		if (xz_result == XZ_STREAM_END) {
-+			/*
-+			 * Can just "break;" here, if not for concatenated
-+			 * .xz streams.
-+			 * Checking for padding may require buffer
-+			 * replenishment. Can't do it here.
-+			 */
-+			continue;
- 		}
--		if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) {
-+		if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) {
- 			bb_error_msg("corrupted data");
- 			total = -1;
- 			break;
- 		}
- 	}
-+
- 	xz_dec_end(state);
- 	free(membuf);
- 
diff --git a/sysutils/busybox/files/patch-fix-grep--Fw-not-respecting-the--w-option.patch b/sysutils/busybox/files/patch-fix-grep--Fw-not-respecting-the--w-option.patch
deleted file mode 100644
index ceaf62a54f17..000000000000
--- a/sysutils/busybox/files/patch-fix-grep--Fw-not-respecting-the--w-option.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-commit 2f5b5beb28a3ffe9d12a19b79c453c640cee2f29
-Author: Denys Vlasenko <vda.linux@googlemail.com>
-Date:   Sun Jan 20 16:57:19 2013 +0100
-Bug-Debian: http://bugs.debian.org/695862
-
-    grep: fix grep -Fw not respecting the -w option. Closes 5792
-    
-    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
-diff --git a/findutils/grep.c b/findutils/grep.c
-index de4fcf5..70f3516 100644
---- ./findutils/grep.c
-+++ ./findutils/grep.c
-@@ -344,10 +344,34 @@ static int grep_file(FILE *file)
- 		while (pattern_ptr) {
- 			gl = (grep_list_data_t *)pattern_ptr->data;
- 			if (FGREP_FLAG) {
--				found |= (((option_mask32 & OPT_i)
--					? strcasestr(line, gl->pattern)
--					: strstr(line, gl->pattern)
--					) != NULL);
-+				char *match;
-+				char *str = line;
-+ opt_f_again:
-+				match = ((option_mask32 & OPT_i)
-+					? strcasestr(str, gl->pattern)
-+					: strstr(str, gl->pattern)
-+					);
-+				if (match) {
-+					if (option_mask32 & OPT_x) {
-+						if (match != str)
-+							goto opt_f_not_found;
-+						if (str[strlen(gl->pattern)] != '\0')
-+							goto opt_f_not_found;
-+					} else
-+					if (option_mask32 & OPT_w) {
-+						char c = (match != str) ? match[-1] : ' ';
-+						if (!isalnum(c) && c != '_') {
-+							c = match[strlen(gl->pattern)];
-+							if (!c || (!isalnum(c) && c != '_'))
-+								goto opt_f_found;
-+						}
-+						str = match + 1;
-+						goto opt_f_again;
-+					}
-+ opt_f_found:
-+					found = 1;
-+ opt_f_not_found: ;
-+				}
- 			} else {
- 				if (!(gl->flg_mem_alocated_compiled & COMPILED)) {
- 					gl->flg_mem_alocated_compiled |= COMPILED;
-@@ -376,7 +400,8 @@ static int grep_file(FILE *file)
- 					if (option_mask32 & OPT_x) {
- 						found = (gl->matched_range.rm_so == 0
- 						         && line[gl->matched_range.rm_eo] == '\0');
--					} else if (!(option_mask32 & OPT_w)) {
-+					} else
-+					if (!(option_mask32 & OPT_w)) {
- 						found = 1;
- 					} else {
- 						char c = ' ';
-@@ -387,6 +412,8 @@ static int grep_file(FILE *file)
- 							if (!c || (!isalnum(c) && c != '_'))
- 								found = 1;
- 						}
-+//BUG: "echo foop foo | grep -w foo" should match, but doesn't:
-+//we bail out on first "mismatch" because it's not a word.
- 					}
- 				}
- 			}
-diff --git a/testsuite/grep.tests b/testsuite/grep.tests
-index 006a215..4781f22 100755
---- ./testsuite/grep.tests
-+++ ./testsuite/grep.tests
-@@ -115,6 +115,18 @@ testing "grep -v -f EMPTY_FILE" \
- 	"" \
- 	"test\n"
- 
-+testing "grep -Fw matches only words" \
-+	"grep -Fw foo input" \
-+	"" \
-+	"foop\n" \
-+	""
-+
-+testing "grep -Fw doesn't stop on 1st mismatch" \
-+	"grep -Fw foo input" \
-+	"foop foo\n" \
-+	"foop foo\n" \
-+	""
-+
- # testing "test name" "commands" "expected result" "file input" "stdin"
- #   file input will be file called "input"
- #   test can create a file "actual" instead of writing to stdout
diff --git a/sysutils/busybox/files/patch-fix-move_to_unaligned16.patch b/sysutils/busybox/files/patch-fix-move_to_unaligned16.patch
deleted file mode 100644
index 4bb4719f55af..000000000000
--- a/sysutils/busybox/files/patch-fix-move_to_unaligned16.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit e3e321682cd1e9861ba7680e61ab6dadaf1e2e32
-Author: Denys Vlasenko <vda.linux@googlemail.com>
-Date:   Wed Feb 27 15:49:38 2013 +0100
-Bug-Debian: http://bugs.debian.org/701968
-
-    Fix move_to_unaligned16
-    
-    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
-diff --git a/include/platform.h b/include/platform.h
-index 1282306..f4deb30 100644
---- ./include/platform.h
-+++ ./include/platform.h
-@@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FIX_ALIASING;
- # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
- # define move_to_unaligned16(u16p, v) do { \
- 	uint16_t __t = (v); \
--	memcpy((u16p), &__t, 4); \
-+	memcpy((u16p), &__t, 2); \
- } while (0)
- # define move_to_unaligned32(u32p, v) do { \
- 	uint32_t __t = (v); \
diff --git a/sysutils/busybox/files/patch-include__platform.h b/sysutils/busybox/files/patch-include__platform.h
index 4b5eeddd01ce..69cdd329a3d4 100644
--- a/sysutils/busybox/files/patch-include__platform.h
+++ b/sysutils/busybox/files/patch-include__platform.h
@@ -1,6 +1,6 @@
---- ./include/platform.h.orig	2012-07-02 14:08:25.000000000 +0000
-+++ ./include/platform.h	2012-07-17 02:08:37.000000000 +0000
-@@ -423,6 +423,15 @@
+--- ./include/platform.h.orig	2013-01-14 05:19:43.000000000 +0100
++++ ./include/platform.h	2013-01-21 21:26:34.000000000 +0100
+@@ -433,6 +433,15 @@
  
  #if defined(__FreeBSD__)
  # undef HAVE_STRCHRNUL
diff --git a/sysutils/busybox/files/patch-lineedit-initialize-delptr b/sysutils/busybox/files/patch-lineedit-initialize-delptr
deleted file mode 100644
index 5b50f6741ccb..000000000000
--- a/sysutils/busybox/files/patch-lineedit-initialize-delptr
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 46031da862a60422f80050a905cea0b67026b021
-Author: Shawn J. Goff <shawn7400@gmail.com>
-Date:   Wed Feb 27 18:30:05 2013 +0100
-Bug-Debian: http://bugs.debian.org/701959
-
-    lineedit: initialize delptr
-    
-    In vi mode, the 'p' and 'P' commands caused a segfault when nothing had
-    been put in the buffer yet because the delptr was not initialized.
-    
-    Signed-off-by: Shawn J. Goff <shawn7400@gmail.com>
-    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
-diff --git a/libbb/lineedit.c b/libbb/lineedit.c
-index dbe6164..52b49e8 100644
---- ./libbb/lineedit.c
-+++ ./libbb/lineedit.c
-@@ -187,6 +187,7 @@ extern struct lineedit_statics *const lineedit_ptr_to_statics;
- 	cmdedit_termw = 80; \
- 	IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
- 	IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
-+	IF_FEATURE_EDITING_VI(delptr = delbuf;) \
- } while (0)
- 
- static void deinit_S(void)
diff --git a/sysutils/busybox/files/patch-mdev-fix-mode-of-dir1-in-=dir1-dir2-file-rule b/sysutils/busybox/files/patch-mdev-fix-mode-of-dir1-in-=dir1-dir2-file-rule
deleted file mode 100644
index 9bd69c471b74..000000000000
--- a/sysutils/busybox/files/patch-mdev-fix-mode-of-dir1-in-=dir1-dir2-file-rule
+++ /dev/null
@@ -1,91 +0,0 @@
-commit 4609f477c7e043a4f6147dfe6e86b775da2ef784
-Author: Denys Vlasenko <vda.linux@googlemail.com>
-Date:   Mon Jan 21 01:22:12 2013 +0100
-Bug-Debian: http://bugs.debian.org/701965
-Comment: removed one hunk not needed for 1.20 version, by mjt
-
-    mdev: fix mode of dir1 in =dir1/dir2/file rule
-    
-    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
-diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests
-index 7320e17..48d3dcc 100755
---- ./testsuite/mdev.tests
-+++ ./testsuite/mdev.tests
-@@ -11,7 +11,7 @@ FILTER_LS="grep -v '^total ' | sed -e 's/,  */,/g' -e 's/  */ /g' | cut -d' ' -f
- # cut: remove size+date
- FILTER_LS2="grep -v '^total ' | sed -e 's/,  */,/g' -e 's/  */ /g' | cut -d' ' -f 1-4,9-"
- 
--# testing "test name" "options" "expected result" "file input" "stdin"
-+# testing "test name" "commands" "expected result" "file input" "stdin"
- 
- rm -rf mdev.testdir
- mkdir mdev.testdir
-@@ -128,6 +128,26 @@ SKIP=
- 
- # continuing to use directory structure from prev test
- rm -rf mdev.testdir/dev/*
-+echo "sda 0:0 444 =disk/sd/a" >mdev.testdir/etc/mdev.conf
-+optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME
-+testing "mdev move rule '=bar/baz/fname'" \
-+	"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
-+	ls -lnR mdev.testdir/dev | $FILTER_LS2" \
-+"\
-+mdev.testdir/dev:
-+drwxr-xr-x 3 0 0 disk
-+
-+mdev.testdir/dev/disk:
-+drwxr-xr-x 2 0 0 sd
-+
-+mdev.testdir/dev/disk/sd:
-+br--r--r-- 1 0 0 a
-+" \
-+	"" ""
-+SKIP=
-+
-+# continuing to use directory structure from prev test
-+rm -rf mdev.testdir/dev/*
- # here we complicate things by having non-matching group 1 and using %0
- echo "s([0-9])*d([a-z]+) 0:0 644 >sd/%2_%0" >mdev.testdir/etc/mdev.conf
- optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_MDEV_RENAME_REGEXP FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_LS_SORTFILES
-diff --git a/util-linux/mdev.c b/util-linux/mdev.c
-index 79871d3..75de14f 100644
---- ./util-linux/mdev.c
-+++ ./util-linux/mdev.c
-@@ -429,6 +429,18 @@ static const struct rule *next_rule(void)
- 
- #endif
- 
-+static void mkdir_recursive(char *name)
-+{
-+	/* if name has many levels ("dir1/dir2"),
-+	 * bb_make_directory() will create dir1 according to umask,
-+	 * not according to its "mode" parameter.
-+	 * Since we run with umask=0, need to temporarily switch it.
-+	 */
-+	umask(022); /* "dir1" (if any) will be 0755 too */
-+	bb_make_directory(name, 0755, FILEUTILS_RECUR);
-+	umask(0);
-+}
-+
- /* Builds an alias path.
-  * This function potentionally reallocates the alias parameter.
-  * Only used for ENABLE_FEATURE_MDEV_RENAME
-@@ -442,7 +454,7 @@ static char *build_alias(char *alias, const char *device_name)
- 	dest = strrchr(alias, '/');
- 	if (dest) { /* ">bar/[baz]" ? */
- 		*dest = '\0'; /* mkdir bar */
--		bb_make_directory(alias, 0755, FILEUTILS_RECUR);
-+		mkdir_recursive(alias);
- 		*dest = '/';
- 		if (dest[1] == '\0') { /* ">bar/" => ">bar/device_name" */
- 			dest = alias;
-# not needed for 1.20: @@ -641,7 +653,7 @@ static void make_device(char *device_name, char *path, int operation)
- 			char *slash = strrchr(node_name, '/');
- 			if (slash) {
- 				*slash = '\0';
--				bb_make_directory(node_name, 0755, FILEUTILS_RECUR);
-+				mkdir_recursive(node_name);
- 				*slash = '/';
- 			}
- 			if (G.verbose)
diff --git a/sysutils/busybox/files/patch-scripts__kconfig__mconf.c b/sysutils/busybox/files/patch-scripts__kconfig__mconf.c
deleted file mode 100644
index 8a0e9b34584e..000000000000
--- a/sysutils/busybox/files/patch-scripts__kconfig__mconf.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./scripts/kconfig/mconf.c.orig	2012-07-02 14:08:25.000000000 +0000
-+++ ./scripts/kconfig/mconf.c	2012-07-17 02:08:37.000000000 +0000
-@@ -8,7 +8,6 @@
-  * i18n, 2005, Arnaldo Carvalho de Melo <acme@conectiva.com.br>
-  */
- 
--#define _XOPEN_SOURCE 700
- 
- #include <sys/ioctl.h>
- #include <sys/wait.h>
diff --git a/sysutils/busybox/files/patch-xz-fix-put_unaligned_e32 b/sysutils/busybox/files/patch-xz-fix-put_unaligned_e32
deleted file mode 100644
index 741e35aeee13..000000000000
--- a/sysutils/busybox/files/patch-xz-fix-put_unaligned_e32
+++ /dev/null
@@ -1,25 +0,0 @@
-commit f59d563399be3d9af3e7b4673e13905d28f2339b
-Author: Leonid Lisovskiy <lly.dev@gmail.com>
-Date:   Wed Feb 27 18:32:58 2013 +0100
-Bug-Debian: http://bugs.debian.org/701968
-
-    xz: fix put_unaligned_{l,b}e32
-    
-    Signed-off-by: Leonid Lisovskiy <lly.dev@gmail.com>
-    Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-
-diff --git a/archival/libarchive/decompress_unxz.c b/archival/libarchive/decompress_unxz.c
-index e9ddd37..986b7b1 100644
---- ./archival/libarchive/decompress_unxz.c
-+++ ./archival/libarchive/decompress_unxz.c
-@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t *buf, size_t size, uint32_t crc)
- /* We use arch-optimized unaligned accessors */
- #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); })
- #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); })
--#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val))
--#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val))
-+#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val))
-+#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val))
- 
- #include "unxz/xz_dec_bcj.c"
- #include "unxz/xz_dec_lzma2.c"