main/busybox: upgrade to 1.22.0

4 files changed, 44 insertions, 166 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index cdf3d517a4..19a6a375f7 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.21.1
+pkgver=1.22.0
 pkgrel=3
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
@@ -18,8 +18,6 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	busybox-uname-is-not-gnu.patch
 	bb-app-location.patch
 	loginutils-sha512.patch
-	busybox-musl-fixes.patch
-	sed-performance.patch
 
 	0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 	0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
@@ -102,45 +100,39 @@ static() {
 		"$subpkgdir"/bin/busybox.static
 }
 
-md5sums="795394f83903b5eec6567d51eebb417e  busybox-1.21.1.tar.bz2
+md5sums="ac1881d1cdeb0729b22c663feaf1c663  busybox-1.22.0.tar.bz2
 8485cf1e389e891914cbb8771a6d9bbd  bbsuid.c
 d64b58a30892c558bdbab7f0d0997577  nologin.c
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
 b5375210f13fd6e1ca61a565e8fabd35  busybox-uname-is-not-gnu.patch
 c5a8dbc8696db6da9c4624b0e11d8fba  bb-app-location.patch
 8c42c9ef0f0419c314c86bcaf7796106  loginutils-sha512.patch
-f718d6d53b6cd1e012edcee32686a846  busybox-musl-fixes.patch
-78f2bcb83779740f1217f71e87cf3077  sed-performance.patch
 04eeda8c49d4688e6dec02451f8b6aae  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 e1c183cbe1ca18a0fa0d9597314076c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 b15c67be5ccb3e523f540d8e218d5c85  0001-ifupdown-support-link-address-family.patch
-652392e6b44c9518f79c1422fe01d653  busyboxconfig
+67018f8e1f80818f5cb155277ec1163e  busyboxconfig
 befaac2c59c380e36a452b3f1c1d4a3a  glibc.patch"
-sha256sums="cd5be0912ec856110ae12c76c3ec9cd5cba1df45b5a9da2b095b8284d1481303  busybox-1.21.1.tar.bz2
+sha256sums="92f00cd391b7d5fa2215c8450abe2ba15f9d16c226e8855fb21b6c9a5b723a53  busybox-1.22.0.tar.bz2
 81957f1fe0c386120dad1c8174ccc1fcfeed98c14d229db7d164d4fb4c938b3d  bbsuid.c
 9bbf0bec82e6d6907474958f3be048c54657fbf49207810b7e4d4d6146f0069d  nologin.c
 327bb8049e2726351a5c8b6b2cef864f6ce58725d4453983f97092ea73656ccc  busybox-1.11.1-bb.patch
 a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef  busybox-uname-is-not-gnu.patch
 576366b4d50f1078da6c0364ef70415de92d97c93c64f4d790b11d7a34cdccd2  bb-app-location.patch
 57674b20158c0b266ed028b0c65299f9cbcad7d33d19c9fcc403d3967daba493  loginutils-sha512.patch
-06e0804532b1253019061078c3cd0a46cba74cb8a32a2d3f80cec23e04fa0386  busybox-musl-fixes.patch
-e1c98f71b0888af6082c042b0f79c550896514038c064f97a4fe237f32af00d6  sed-performance.patch
 2e9d56335ca39e944b9abd9ecc91d0e47a3fe3434f8b7ec3f526bc8fa0895ada  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 53563c6dc4db13004d0b37f7bf1748e861b5a5c4244c1d34f102c23b689420c5  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 9a41b920dd7ee4746866f9dd4ae42899198cd9b10bfa433f2f5ead8083957da2  0001-ifupdown-support-link-address-family.patch
-87dd5b841c891069b423db9b7c31ee70c11991f72757a355c44f662a79219326  busyboxconfig
+f4c3b871cd57f11ddf0bbbb78f8c5ae20b71fd8c06b6ce72940044dea8ee15a1  busyboxconfig
 c604ef791c31d35a8c5ee4558d21428a46f37a6d762c4a7e29864f4037fc44a0  glibc.patch"
-sha512sums="b1dd626e1c111214ebd9b933ce2465c943fd8a0a515b6962a31f3a76276ff7992c21b7f96eeb9baeb861a5e734689054e6df5dd6414c753c37084e2d705810e1  busybox-1.21.1.tar.bz2
+sha512sums="75d00fbad703d942c5a6882bda0c66fde32fb480ee9693c8da8107c2088ec5c95aad8eb3dbb2feceed095e133916fea27136328b7a1eba47e3b63bf50bc40a66  busybox-1.22.0.tar.bz2
 16b3dd6a8b76b062d51458351fcb44f84b49eb4bf898584c933df90fb2cb3966f9547865a4d7447589bb20b7c203beb04ff7512f76f85d29138d2cff4eb9ee81  bbsuid.c
 4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2  nologin.c
 eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d499e8dffbe6df8aa37ae27625c552162923d59fe35b55b32b  busybox-1.11.1-bb.patch
 225c0608972f7daaca672eafdf647eea392e076537287370ca7791931de4803645d4d159385dc2909314028dccba3c64d0c89fa4e1184f856959b17c58459ed1  busybox-uname-is-not-gnu.patch
 5c42b05be69c834c9fd5372c6b0d55a6399c74146a94ea09eae7285dd4fa75d1bde38bf7ab73e98638f65eb72db02115453cbdfe85a0085d742940366f617c7d  bb-app-location.patch
 69af4800fcf765b4ae029daced7ff171b6b04d810c94a987c7ba848e275a27b77b18b38df1b85f4a12c4a47ed42f62e0768260eb1198e2aff1c3cea898b85c61  loginutils-sha512.patch
-eed527c8cab79347ed786929c36da76028bf9592a4f047706c3ce14bc96787fc7e685441eca14006eab88b0b8d5ed939116daea95110fa0f87f8b94b1f5e9673  busybox-musl-fixes.patch
-b0b6dde2183a8b95ad0213c2157e6dadcaf0c95c6f6d035a5dfdbf08b5327b32d033ddae911d8aada3bf08a6d5aaea3f27dddbf55384490e8b0350471334095a  sed-performance.patch
 f2ed7bf994766a20ceecb28bea8c66307b6b66cdd7099408b1f29a529786ce07e55824b21256321708663e00d6fe9428480b0d3e121b67d6ebd8a8a87b1486d1  0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 b1a1cc2ada657a3d3364c8c96853575d73784e769cd8768c170c27a3e59abd2beace75dff6d5047c4391725e961d93149f9c3f45ed75fb1c582bf18b818282c9  0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
 2dcda497ba3b7c0a7dc9d85e08efa71e51c57e84967fa1a5f06d48f29c9ee9f14a1931c1c2854e9632a5db785c8e72df10bdfb0735a9ecad7a8d390fff74abd1  0001-ifupdown-support-link-address-family.patch
-18551328b24ab33ce08f16836c6bd523695f1d01e6b156215ab14387f770ed0c8a55cce88205a09dd0446f31b7872b37b9a76bbd7191b62949b447a6989dacd3  busyboxconfig
+7e60936116e2abac3a4b8f9b86264b01858b4e6a36572153fc28ec875cfa456e4d8de5c869294a10f9933373160f57ef888ed95dbf7b741aaa4bdf7537ed644d  busyboxconfig
 1d2739379dab1deb3eae7cffd4845300eb7d30f7343b4a1209b21a5680860d55080ad45fdefe098b249ce3040c01951fa7f0a79cd447b2d7b260eb000099d9dc  glibc.patch"
diff --git a/main/busybox/busybox-musl-fixes.patch b/main/busybox/busybox-musl-fixes.patch
deleted file mode 100644
index 36410ff32c..0000000000
--- a/main/busybox/busybox-musl-fixes.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -Naur busybox-1.19.3-old/include/platform.h busybox-1.19.3/include/platform.h
---- busybox-1.19.3-old/include/platform.h	2011-10-29 05:43:01.000000000 -0600
-+++ busybox-1.19.3/include/platform.h	2011-12-18 15:53:49.817278374 -0700
-@@ -443,6 +443,13 @@
- # undef HAVE_NET_ETHERNET_H
- #endif
- 
-+#if defined(__musl__)
-+# undef HAVE_SETBIT
-+# include <stddef.h>
-+# include <termios.h>
-+# include <sys/ioctl.h>
-+#endif
-+
- /*
-  * Now, define prototypes for all the functions defined in platform.c
-  * These must come after all the HAVE_* macros are defined (or not)
-diff -Naur busybox-1.19.3-old/miscutils/man.c busybox-1.19.3/miscutils/man.c
---- busybox-1.19.3-old/miscutils/man.c	2011-09-05 20:35:17.000000000 -0600
-+++ busybox-1.19.3/miscutils/man.c	2011-12-18 15:53:49.817278374 -0700
-@@ -116,7 +116,7 @@
- 	/* "2>&1" is added so that nroff errors are shown in pager too.
- 	 * Otherwise it may show just empty screen */
- 	cmd = xasprintf(
--		man ? "gtbl | nroff -Tlatin1 -mandoc 2>&1 | %s"
-+		man ? "nroff -Tutf -man 2>&1 | %s"
- 		    : "%s",
- 		pager);
- 	system(cmd);
-diff -Naur busybox-1.19.3-old/networking/ifconfig.c busybox-1.19.3/networking/ifconfig.c
---- busybox-1.19.3-old/networking/ifconfig.c	2011-09-05 20:35:17.000000000 -0600
-+++ busybox-1.19.3/networking/ifconfig.c	2011-12-18 15:53:49.817278374 -0700
-@@ -56,7 +56,7 @@
- #endif
- 
- #if ENABLE_FEATURE_IFCONFIG_SLIP
--# include <net/if_slip.h>
-+# include <linux/if_slip.h>
- #endif
- 
- /* I don't know if this is needed for busybox or not.  Anyone? */
-diff -Naur busybox-1.19.3-old/networking/libiproute/iplink.c busybox-1.19.3/networking/libiproute/iplink.c
---- busybox-1.19.3-old/networking/libiproute/iplink.c	2011-09-05 20:35:17.000000000 -0600
-+++ busybox-1.19.3/networking/libiproute/iplink.c	2011-12-18 15:53:49.821278291 -0700
-@@ -5,7 +5,6 @@
-  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
-  */
- #include <net/if.h>
--#include <net/if_packet.h>
- #include <netpacket/packet.h>
- #include <netinet/if_ether.h>
- 
-diff -Naur busybox-1.19.3-old/util-linux/fdisk.c busybox-1.19.3/util-linux/fdisk.c
---- busybox-1.19.3-old/util-linux/fdisk.c	2011-09-05 20:35:17.000000000 -0600
-+++ busybox-1.19.3/util-linux/fdisk.c	2011-12-18 15:53:49.821278291 -0700
-@@ -550,7 +550,7 @@
- {
- #if ENABLE_FDISK_SUPPORT_LARGE_DISKS
- 	off64_t off = (off64_t)secno * sector_size;
--	if (lseek64(dev_fd, off, SEEK_SET) == (off64_t) -1)
-+	if (lseek(dev_fd, off, SEEK_SET) == (off64_t) -1)
- 		fdisk_fatal(unable_to_seek);
- #else
- 	uint64_t off = (uint64_t)secno * sector_size;
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index d25faf764b..61483bd23d 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.21.1
-# Thu Jan  2 13:26:40 2014
+# Busybox version: 1.22.0
+# Thu Jan  2 13:04:57 2014
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -31,8 +31,8 @@ CONFIG_UNICODE_SUPPORT=y
 CONFIG_FEATURE_CHECK_UNICODE_IN_ENV=y
 CONFIG_SUBST_WCHAR=63
 CONFIG_LAST_SUPPORTED_WCHAR=767
-CONFIG_UNICODE_COMBINING_WCHARS=y
-CONFIG_UNICODE_WIDE_WCHARS=y
+# CONFIG_UNICODE_COMBINING_WCHARS is not set
+# CONFIG_UNICODE_WIDE_WCHARS is not set
 # CONFIG_UNICODE_BIDI_SUPPORT is not set
 # CONFIG_UNICODE_NEUTRAL_TABLE is not set
 # CONFIG_UNICODE_PRESERVE_BROKEN is not set
@@ -135,7 +135,14 @@ CONFIG_FEATURE_SEAMLESS_Z=y
 # CONFIG_AR is not set
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 # CONFIG_FEATURE_AR_CREATE is not set
+# CONFIG_UNCOMPRESS is not set
+CONFIG_GUNZIP=y
 CONFIG_BUNZIP2=y
+CONFIG_UNLZMA=y
+CONFIG_FEATURE_LZMA_FAST=y
+CONFIG_LZMA=y
+CONFIG_UNXZ=y
+# CONFIG_XZ is not set
 CONFIG_BZIP2=y
 CONFIG_CPIO=y
 CONFIG_FEATURE_CPIO_O=y
@@ -143,14 +150,13 @@ CONFIG_FEATURE_CPIO_P=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
-CONFIG_GUNZIP=y
 CONFIG_GZIP=y
 # CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set
 CONFIG_GZIP_FAST=2
 CONFIG_LZOP=y
 # CONFIG_LZOP_COMPR_HIGH is not set
-# CONFIG_RPM2CPIO is not set
 # CONFIG_RPM is not set
+# CONFIG_RPM2CPIO is not set
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 # CONFIG_FEATURE_TAR_AUTODETECT is not set
@@ -163,12 +169,6 @@ CONFIG_FEATURE_TAR_LONG_OPTIONS=y
 CONFIG_FEATURE_TAR_UNAME_GNAME=y
 CONFIG_FEATURE_TAR_NOPRESERVE_TIME=y
 # CONFIG_FEATURE_TAR_SELINUX is not set
-# CONFIG_UNCOMPRESS is not set
-CONFIG_UNLZMA=y
-CONFIG_FEATURE_LZMA_FAST=y
-CONFIG_LZMA=y
-CONFIG_UNXZ=y
-# CONFIG_XZ is not set
 CONFIG_UNZIP=y
 
 #
@@ -186,6 +186,7 @@ CONFIG_GROUPS=y
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
+CONFIG_FEATURE_TOUCH_NODEREF=y
 CONFIG_FEATURE_TOUCH_SUSV3=y
 CONFIG_TR=y
 CONFIG_FEATURE_TR_CLASSES=y
@@ -359,7 +360,16 @@ CONFIG_WHICH=y
 #
 # Editors
 #
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_LIBM=y
+CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
+CONFIG_FEATURE_DIFF_DIR=y
+CONFIG_ED=y
 CONFIG_PATCH=y
+CONFIG_SED=y
 CONFIG_VI=y
 CONFIG_FEATURE_VI_MAX_LEN=1024
 CONFIG_FEATURE_VI_8BIT=y
@@ -374,14 +384,6 @@ CONFIG_FEATURE_VI_SETOPTS=y
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_ASK_TERMINAL=y
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_LIBM=y
-CONFIG_CMP=y
-CONFIG_DIFF=y
-# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set
-CONFIG_FEATURE_DIFF_DIR=y
-CONFIG_ED=y
-CONFIG_SED=y
 CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
@@ -525,6 +527,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # Linux System Utilities
 #
 CONFIG_BLOCKDEV=y
+CONFIG_FSTRIM=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
 CONFIG_FEATURE_MDEV_RENAME=y
@@ -611,26 +614,27 @@ CONFIG_VOLUMEID=y
 #
 # Filesystem/Volume identification
 #
-CONFIG_FEATURE_VOLUMEID_EXT=y
 CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_FEATURE_VOLUMEID_REISERFS=y
-CONFIG_FEATURE_VOLUMEID_FAT=y
+CONFIG_FEATURE_VOLUMEID_CRAMFS=y
 CONFIG_FEATURE_VOLUMEID_EXFAT=y
+CONFIG_FEATURE_VOLUMEID_EXT=y
+CONFIG_FEATURE_VOLUMEID_F2FS=y
+CONFIG_FEATURE_VOLUMEID_FAT=y
 # CONFIG_FEATURE_VOLUMEID_HFS is not set
+CONFIG_FEATURE_VOLUMEID_ISO9660=y
 CONFIG_FEATURE_VOLUMEID_JFS=y
-CONFIG_FEATURE_VOLUMEID_XFS=y
+CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
+CONFIG_FEATURE_VOLUMEID_LUKS=y
 CONFIG_FEATURE_VOLUMEID_NILFS=y
 CONFIG_FEATURE_VOLUMEID_NTFS=y
-CONFIG_FEATURE_VOLUMEID_ISO9660=y
-CONFIG_FEATURE_VOLUMEID_UDF=y
-CONFIG_FEATURE_VOLUMEID_LUKS=y
-CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-CONFIG_FEATURE_VOLUMEID_CRAMFS=y
+CONFIG_FEATURE_VOLUMEID_OCFS2=y
+CONFIG_FEATURE_VOLUMEID_REISERFS=y
 # CONFIG_FEATURE_VOLUMEID_ROMFS is not set
 CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 # CONFIG_FEATURE_VOLUMEID_SYSV is not set
-CONFIG_FEATURE_VOLUMEID_OCFS2=y
-CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
+CONFIG_FEATURE_VOLUMEID_UDF=y
+CONFIG_FEATURE_VOLUMEID_XFS=y
 
 #
 # Miscellaneous Utilities
@@ -648,6 +652,7 @@ CONFIG_FEATURE_LESS_DASHCMD=y
 CONFIG_FEATURE_LESS_LINENUMS=y
 CONFIG_NANDWRITE=y
 CONFIG_NANDDUMP=y
+CONFIG_RFKILL=y
 CONFIG_SETSERIAL=y
 # CONFIG_UBIATTACH is not set
 # CONFIG_UBIDETACH is not set
@@ -655,6 +660,7 @@ CONFIG_SETSERIAL=y
 # CONFIG_UBIRMVOL is not set
 # CONFIG_UBIRSVOL is not set
 # CONFIG_UBIUPDATEVOL is not set
+CONFIG_WALL=y
 CONFIG_ADJTIMEX=y
 CONFIG_BBCONFIG=y
 CONFIG_FEATURE_COMPRESS_BBCONFIG=y
@@ -711,7 +717,6 @@ CONFIG_MOUNTPOINT=y
 # CONFIG_MT is not set
 CONFIG_RAIDAUTORUN=y
 CONFIG_READAHEAD=y
-CONFIG_RFKILL=y
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
 CONFIG_SETSID=y
@@ -722,7 +727,6 @@ CONFIG_TIME=y
 CONFIG_TIMEOUT=y
 CONFIG_TTYSIZE=y
 CONFIG_VOLNAME=y
-CONFIG_WALL=y
 CONFIG_WATCHDOG=y
 
 #
diff --git a/main/busybox/sed-performance.patch b/main/busybox/sed-performance.patch
deleted file mode 100644
index e6c8f78de7..0000000000
--- a/main/busybox/sed-performance.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b0e9b72915a87121aabf21d4e382e16e0a9a5175 Mon Sep 17 00:00:00 2001
-From: Denys Vlasenko <vda.linux@googlemail.com>
-Date: Sun, 21 Jul 2013 20:09:44 +0000
-Subject: sed: fix matching of newlines by $
-
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
-diff --git a/editors/sed.c b/editors/sed.c
-index e625a09..3a0d917 100644
---- a/editors/sed.c
-+++ b/editors/sed.c
-@@ -330,7 +330,7 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
- 		next = index_of_next_unescaped_regexp_delim(delimiter, ++pos);
- 		temp = copy_parsing_escapes(pos, next);
- 		*regex = xzalloc(sizeof(regex_t));
--		xregcomp(*regex, temp, G.regex_type|REG_NEWLINE);
-+		xregcomp(*regex, temp, G.regex_type);
- 		free(temp);
- 		/* Move position to next character after last delimiter */
- 		pos += (next+1);
-diff --git a/testsuite/sed.tests b/testsuite/sed.tests
-index 468565f..2af1e4c 100755
---- a/testsuite/sed.tests
-+++ b/testsuite/sed.tests
-@@ -310,6 +310,27 @@ testing "sed zero chars match/replace logic must not falsely trigger here 2" \
- 	"sed 's/ *$/_/g'" \
- 	"qwerty_\n" "" "qwerty\n"
- 
-+testing "sed /\$_in_regex/ should not match newlines, only end-of-line" \
-+	"sed ': testcont; /\\\\$/{ =; N; b testcont }'" \
-+	"\
-+this is a regular line
-+2
-+line with \\
-+continuation
-+more regular lines
-+5
-+line with \\
-+continuation
-+" \
-+	"" "\
-+this is a regular line
-+line with \\
-+continuation
-+more regular lines
-+line with \\
-+continuation
-+"
-+
- # testing "description" "commands" "result" "infile" "stdin"
- 
- exit $FAILCOUNT
---
-cgit v0.9.1