main/busybox: upgrade to 1.26.1

2 files changed, 24 insertions, 27 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 6c64caa8c2..a5a79c2c56 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.26.0
+pkgver=1.26.1
 pkgrel=0
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
@@ -144,7 +144,7 @@ static() {
 		"$subpkgdir"/bin/busybox.static
 }
 
-md5sums="362acc60bd94343aa36d98beb1f0831f  busybox-1.26.0.tar.bz2
+md5sums="044684cb9e4e3253fc31c84f66a5bd9a  busybox-1.26.1.tar.bz2
 5784516439ec6dc4e60612b094fc6fda  0001-ash-exec-busybox.static.patch
 e35fc8b29faf1742c0f09f5c3b95db94  0002-app-location-for-vi-and-lspci.patch
 5c356ff8346936d1f545750456edb1b2  0003-udhcpc-set-default-discover-retries-to-5.patch
@@ -158,11 +158,11 @@ e35fc8b29faf1742c0f09f5c3b95db94  0002-app-location-for-vi-and-lspci.patch
 723a879123be8df4726455d857d910aa  0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 14746b0d10711cb4a824a166fc147706  0012-diff-add-support-for-no-dereference.patch
 4046b78ee6a25259954797d73b94f4bd  acpid.logrotate
-2e94a4ce16cdc0721b53a08e5e61a183  busyboxconfig
+8da7e079770d2bfcc4224afe676e5600  busyboxconfig
 378058009a1d6b1e321617b32b933e28  bbsuid.c
 5c2d151c173f5618d404af4bb5a91769  dad.if-up
 d64b58a30892c558bdbab7f0d0997577  nologin.c"
-sha256sums="3ad227375ee870d529007f6ce83f173b8bd5a37df624ecb460295554261c0f4c  busybox-1.26.0.tar.bz2
+sha256sums="0fbbe487fa35cc3258749cf79c259578c1a221013cc4fb60d6a3542590f781f2  busybox-1.26.1.tar.bz2
 985aeb3f592bfae16a0f24be4b6a39616401927ff1b4cf47e01f15d4559120d5  0001-ash-exec-busybox.static.patch
 6a43bbc49ed29ed5c506e0010f9f23df4c9696299b569549aff242c1aceb450b  0002-app-location-for-vi-and-lspci.patch
 e3f85c4679f0884303c5a8848f0ef6307e002e51cfd209caaf4f776b853dd055  0003-udhcpc-set-default-discover-retries-to-5.patch
@@ -176,11 +176,11 @@ c158a8f317a327edb2f134178ffd7d1d3027a3644e925d93c031448cf35b4b2f  0008-login-mov
 9bc67c6af540cbfdc05c020f517e5f0b8def2cb789f83891e6599ff310e999cb  0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 c77369008d38b2e4622bc61a2d546f0005bed5c8e5d6a59c0a24bbad7ad04ea2  0012-diff-add-support-for-no-dereference.patch
 f7cbeb5a5a47395ad30454ce8262abcd3e91c33ef803c2ae31a9258d7142dd48  acpid.logrotate
-f32006d2fecb30d26679e8ed093a60cd3b62d8e33d7324c8ad8aaefbb8e0bcd7  busyboxconfig
+934fd31f15bc68923c571c53f1e78d99fbab673d9053c2b3bf5f14f39aba3486  busyboxconfig
 52bd2c7c44779f910eedd2fea73ec0de520add400894cc132276587e25c73e39  bbsuid.c
 5a42f9dbe272b5ce792ebf0d67bb5808ede2e470b0fbfbc23192f17e0b7410ae  dad.if-up
 9bbf0bec82e6d6907474958f3be048c54657fbf49207810b7e4d4d6146f0069d  nologin.c"
-sha512sums="9e38c2f4c5ddb6c3a184170b5526c1a78cf53a575ed359fb18c407976cab9788fa95a26ca2d4e5c32e1d639890944d98e118149ee1402b18fe085b0baf0186d3  busybox-1.26.0.tar.bz2
+sha512sums="2b71563185e8d9601fe57c6975473336d5950c034ed62ca51b79cc32248612770724c2f8fd2028d15892d126829ef177223496688cd6816b6c7c0203772f9886  busybox-1.26.1.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
@@ -194,7 +194,7 @@ f82caa1dc4395f266b024a7face267a916a80ead95f3d392b10fd397d0fdf62703e3078357bc7196
 16b513b34b3bf16002f14566aae66aab986403cb7a0f416c27264b739706bbd624a99fd37d5b56ff6efe623f3cc48aef3e8fe51c4ae2e94eda3fe9e8e618e3a1  0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 361959788bc11b7f20d4029bb0f561759d270983b09c44fe2a01817378c4eb1c98cd8ef73e7ef8c168b7540170f58ddb36b9e4f80a97565f3fe3ba85b593a471  0012-diff-add-support-for-no-dereference.patch
 dadb4c953ebc755b88ee95c1489feb0c2d352f6e44abc716166024e6eea11ab9d10c84fad62c081775834d205cb04aa1be3c994676c88f4284495c54b9188e8b  acpid.logrotate
-87a2c1d5e15c8d9941a8468b7b43948883a4a7973a39ddfed55fb09f3b8e6bfc02f888fcde16516144a41da140e084ce3720673ee2ad78abab8747d619ca1304  busyboxconfig
+c762e8cd6f6cc780bff50ece4a651cc8581ef7079216ff7cd3976fba0ea99638ee6bc9b8a378578bab883364774ecc966fc346395ccbdd1ecffbf9396c3db53c  busyboxconfig
 c1dd56509277c59751907a27f067f1622191ddfd498acfe390d83136d36a41f2bdfc2fd4daf35af77219a66fb00fea20483f34112afd5df2ccd9f36ab548e66f  bbsuid.c
 a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02  dad.if-up
 4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2  nologin.c"
diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig
index dd94178fb0..211394ab61 100644
--- a/main/busybox/busyboxconfig
+++ b/main/busybox/busyboxconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.26.0
-# Thu Dec 29 16:31:41 2016
+# Busybox version: 1.26.1
+# Tue Jan  3 09:59:23 2017
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -531,12 +531,12 @@ CONFIG_FSCK=y
 #
 # Linux Module Utilities
 #
+# CONFIG_MODPROBE_SMALL is not set
 CONFIG_DEPMOD=y
 CONFIG_INSMOD=y
 CONFIG_LSMOD=y
 CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 CONFIG_MODINFO=y
-# CONFIG_MODPROBE_SMALL 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=y
@@ -833,8 +833,6 @@ CONFIG_IFUP=y
 CONFIG_IFDOWN=y
 CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
 CONFIG_FEATURE_IFUPDOWN_IP=y
-CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
-# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
 CONFIG_FEATURE_IFUPDOWN_IPV4=y
 CONFIG_FEATURE_IFUPDOWN_IPV6=y
 # CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
@@ -847,6 +845,12 @@ CONFIG_INETD=y
 # CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set
 # CONFIG_FEATURE_INETD_RPC is not set
 CONFIG_IP=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
+CONFIG_IPNEIGH=y
 CONFIG_FEATURE_IP_ADDRESS=y
 CONFIG_FEATURE_IP_LINK=y
 CONFIG_FEATURE_IP_ROUTE=y
@@ -854,14 +858,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2"
 CONFIG_FEATURE_IP_TUNNEL=y
 CONFIG_FEATURE_IP_RULE=y
 CONFIG_FEATURE_IP_NEIGH=y
-CONFIG_FEATURE_IP_SHORT_FORMS=y
 CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
-CONFIG_IPADDR=y
-CONFIG_IPLINK=y
-CONFIG_IPROUTE=y
-CONFIG_IPTUNNEL=y
-CONFIG_IPRULE=y
-CONFIG_IPNEIGH=y
 CONFIG_IPCALC=y
 CONFIG_FEATURE_IPCALC_FANCY=y
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
@@ -1033,6 +1030,12 @@ CONFIG_SV_DEFAULT_SERVICE_DIR=""
 #
 # Shells
 #
+CONFIG_SH_IS_ASH=y
+# CONFIG_SH_IS_HUSH is not set
+# CONFIG_SH_IS_NONE is not set
+# CONFIG_BASH_IS_ASH is not set
+# CONFIG_BASH_IS_HUSH is not set
+CONFIG_BASH_IS_NONE=y
 CONFIG_ASH=y
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
 # CONFIG_ASH_INTERNAL_GLOB is not set
@@ -1067,14 +1070,8 @@ CONFIG_ASH_MAIL=y
 # CONFIG_HUSH_EXPORT_N is not set
 # CONFIG_HUSH_MODE_X is not set
 # CONFIG_MSH is not set
-CONFIG_FEATURE_SH_IS_ASH=y
-# CONFIG_FEATURE_SH_IS_HUSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-# CONFIG_FEATURE_BASH_IS_ASH is not set
-# CONFIG_FEATURE_BASH_IS_HUSH is not set
-CONFIG_FEATURE_BASH_IS_NONE=y
-CONFIG_SH_MATH_SUPPORT=y
-# CONFIG_SH_MATH_SUPPORT_64 is not set
+CONFIG_FEATURE_SH_MATH=y
+CONFIG_FEATURE_SH_MATH_64=y
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_FEATURE_SH_NOFORK is not set