main/busybox: upgrade to 1.25.1

3 files changed, 5 insertions, 110 deletions

diff --git a/main/busybox/0001-iproute-ensure-scope-is-correctly-initialised.patch b/main/busybox/0001-iproute-ensure-scope-is-correctly-initialised.patch
deleted file mode 100644
index 95c01a3f8d..0000000000
--- a/main/busybox/0001-iproute-ensure-scope-is-correctly-initialised.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b64e50214e1af64a94bd73f4e70da2a1a7659c75 Mon Sep 17 00:00:00 2001
-From: Ron Yorston <rmy@pobox.com>
-Date: Fri, 5 Aug 2016 19:39:31 +0100
-Subject: [PATCH] iproute: ensure scope is correctly initialised
-
-Code in iproute.c attempted to avoid assigning values to structure
-elements which were know to be zero unless the value to be assigned
-was non-zero.
-
-Commit ce4bc1ed added some more such cases.  However, the treatment
-of req.r.rtm_scope was incorrect.  Although this saved a few bytes it
-resulted in incorrect behaviour like:
-
-   $ sudo busybox ip route add 192.168.0.0/24 via 10.98.106.9 dev wlan0
-   ip: RTNETLINK answers: Invalid argument
-
-In practice this attempt at optimisation results in no saving, so
-remove it.
-
-Reported-by: Natanael Copa <ncopa@alpinelinux.org>
-Signed-off-by: Ron Yorston <rmy@pobox.com>
----
- networking/libiproute/iproute.c | 15 +++++----------
- 1 file changed, 5 insertions(+), 10 deletions(-)
-
-diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
-index e674e9a..8db9aef 100644
---- a/networking/libiproute/iproute.c
-+++ b/networking/libiproute/iproute.c
-@@ -356,18 +356,13 @@ IF_FEATURE_IP_RULE(ARG_table,)
- 	req.n.nlmsg_flags = NLM_F_REQUEST | flags;
- 	req.n.nlmsg_type = cmd;
- 	req.r.rtm_family = preferred_family;
--	if (RT_TABLE_MAIN != 0) /* if it is zero, memset already did it */
--		req.r.rtm_table = RT_TABLE_MAIN;
--	if (RT_SCOPE_NOWHERE != 0)
--		req.r.rtm_scope = RT_SCOPE_NOWHERE;
-+	req.r.rtm_table = RT_TABLE_MAIN;
-+	req.r.rtm_scope = RT_SCOPE_NOWHERE;
- 
- 	if (cmd != RTM_DELROUTE) {
--		if (RTPROT_BOOT != 0)
--			req.r.rtm_protocol = RTPROT_BOOT;
--		if (RT_SCOPE_UNIVERSE != 0)
--			req.r.rtm_scope = RT_SCOPE_UNIVERSE;
--		if (RTN_UNICAST != 0)
--			req.r.rtm_type = RTN_UNICAST;
-+		req.r.rtm_protocol = RTPROT_BOOT;
-+		req.r.rtm_scope = RT_SCOPE_UNIVERSE;
-+		req.r.rtm_type = RTN_UNICAST;
- 	}
- 
- 	mxrta->rta_type = RTA_METRICS;
--- 
-2.9.1
-
diff --git a/main/busybox/0012-gzip-fix-compression-level-bug.-Closes-9131.patch b/main/busybox/0012-gzip-fix-compression-level-bug.-Closes-9131.patch
deleted file mode 100644
index be01eabd5b..0000000000
--- a/main/busybox/0012-gzip-fix-compression-level-bug.-Closes-9131.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7402d19bc155f74b39a19d5478375dbfe95a76c6 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 3 Aug 2016 13:23:57 +0200
-Subject: [PATCH 12/15] gzip: fix compression level bug. Closes 9131
-
-fix broken logic to get the gzip_level_config value from options -1 to
--9.
-
-This fixes an off-by-one bug that caused gzip -9 output bigger files
-than the other compression levels.
-
-It fixes so that compression level 1 to 3 are actually mapped to level 4
-as comments say.
-
-It also fixes that levels -4 to -9 is mapped to correct level and avoids
-out-of-bounds access.
-
-Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
----
- archival/gzip.c | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/archival/gzip.c b/archival/gzip.c
-index 8f1e4ff..15ba57c 100644
---- a/archival/gzip.c
-+++ b/archival/gzip.c
-@@ -2220,10 +2220,7 @@ int gzip_main(int argc UNUSED_PARAM, char **argv)
- 	opt >>= ENABLE_GUNZIP ? 7 : 5; /* drop cfv[dt]qn bits */
- 	if (opt == 0)
- 		opt = 1 << 6; /* default: 6 */
--	/* Map 1..3 to 4 */
--	if (opt & 0x7)
--		opt |= 1 << 4;
--	opt = ffs(opt >> 3);
-+	opt = ffs(opt >> 4); /* Maps 1..3 to 4 */
- 	max_chain_length = 1 << gzip_level_config[opt].chain_shift;
- 	good_match	 = gzip_level_config[opt].good;
- 	max_lazy_match	 = gzip_level_config[opt].lazy2 * 2;
--- 
-2.9.1
-
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 5c9d3d5be2..5532b9b25b 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.25.0
-pkgrel=6
+pkgver=1.25.1
+pkgrel=0
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -16,7 +16,6 @@ options="suid"
 triggers="busybox.trigger=/bin:/usr/bin:/sbin:/usr/sbin:/lib/modules/*"
 source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	0001-ash-exec-busybox.static.patch
-	0001-iproute-ensure-scope-is-correctly-initialised.patch
 	0002-set-applet-location-to-correspond-to-upstream-for-vi.patch
 	0003-udhcpc-set-default-discover-retries-to-5.patch
 	0004-ping-make-ping-work-without-root-privileges.patch
@@ -27,7 +26,6 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
 	0010-su-FEATURE_SU_NULLOK_SECURE.patch
 	0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
-	0012-gzip-fix-compression-level-bug.-Closes-9131.patch
 	0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 	0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
 	0015-diff-add-support-for-no-dereference.patch
@@ -146,9 +144,8 @@ static() {
 		"$subpkgdir"/bin/busybox.static
 }
 
-md5sums="b05af9645076f75429a8683f8afcbdb3  busybox-1.25.0.tar.bz2
+md5sums="4f4c5de50b479b11ff636d7d8eb902a2  busybox-1.25.1.tar.bz2
 59028ad98544ec71c37f637df9d5c8f8  0001-ash-exec-busybox.static.patch
-4fbdfeeecbe01ee6353d9521827155f1  0001-iproute-ensure-scope-is-correctly-initialised.patch
 d6ca0a022af2f68746297b3673ca0467  0002-set-applet-location-to-correspond-to-upstream-for-vi.patch
 f06a9dd453e9527a8c46ededed00a30e  0003-udhcpc-set-default-discover-retries-to-5.patch
 c0ee8629bb7f2c75e6da39431b736572  0004-ping-make-ping-work-without-root-privileges.patch
@@ -159,7 +156,6 @@ c03e2940828e8c2bc9494aee74422bd3  0007-depmod-support-generating-kmod-binary-ind
 5fb24a9688a638e6bea5921bcc565bb6  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
 208869f8a34ef531437c4ece55115a78  0010-su-FEATURE_SU_NULLOK_SECURE.patch
 5fab4d6b3461a399d66a42f9385c6ad5  0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
-f5cd203e6e7acb8b0296e370621aaf63  0012-gzip-fix-compression-level-bug.-Closes-9131.patch
 f39e2d23f00d9a94a08d5159bd285ea5  0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 bcfa838ecc36ea8f2012a27561d6910d  0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
 83c0e05df23b2327e6e71fa93e911154  0015-diff-add-support-for-no-dereference.patch
@@ -168,9 +164,8 @@ bcfa838ecc36ea8f2012a27561d6910d  0014-ntpd-respond-only-to-client-and-symmetric
 09ad409662df7d086f0f0485aa8ce259  busyboxconfig
 378058009a1d6b1e321617b32b933e28  bbsuid.c
 d64b58a30892c558bdbab7f0d0997577  nologin.c"
-sha256sums="5a0fe06885ee1b805fb459ab6aaa023fe4f2eccee4fb8c0fd9a6c17c0daca2fc  busybox-1.25.0.tar.bz2
+sha256sums="27667e0f2328fdbd79cfd622e4453e5c57e58f781c5da97c9be337d93aa2a02e  busybox-1.25.1.tar.bz2
 4c28b5613123af696399cd6caed99aaa1a86715fde3ebc00c704425c4f086b0c  0001-ash-exec-busybox.static.patch
-51443d85c36a17cd434f56709b2792c239662538a857fe61c9810be672d44ba3  0001-iproute-ensure-scope-is-correctly-initialised.patch
 7a955bf237e965394ee4c96c3cbe39aa41fa638531b9185838df7ee5b2d97240  0002-set-applet-location-to-correspond-to-upstream-for-vi.patch
 10fedac0023498fc68b589fec3149801475b08882254fc2a5cc1d3c9dab2d750  0003-udhcpc-set-default-discover-retries-to-5.patch
 b9766d28fa8dcee8ffcbc00795c1b2edea82d99ef7a39b024876c54d258a6b59  0004-ping-make-ping-work-without-root-privileges.patch
@@ -181,7 +176,6 @@ e1e3f6efaba68a12a481bdb6ad4826fa10d1a3af5c6693c4066d12fb3c7ba676  0007-depmod-su
 a063e8a8acae6c42a8b47316279dc28b44e2d59aa924a6295cade00a08284a3a  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
 28573f6d49bd8be27beb535581b3b227489f43955d68669bea868128dfdb84cb  0010-su-FEATURE_SU_NULLOK_SECURE.patch
 243520c9ba069d7b58f440ce890357eca464c77f62a152eba6173f5de3968441  0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
-a90db1bb2d84f64982aba785f15871d7e2c73f1e9651536fbdafdca7f0a44bd4  0012-gzip-fix-compression-level-bug.-Closes-9131.patch
 30aaba169312101b45ee113cd3daa4ca5bfdee76298cb73c692a890484888e23  0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 0c4d7b8ea3844c0f771361deb52e7553f4cf198d3d591ed476fa43be56107a8e  0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
 cbe87aa26c161892f82cd319222c1a21768eabcd5b706c8b582a988e981aca10  0015-diff-add-support-for-no-dereference.patch
@@ -190,9 +184,8 @@ f7cbeb5a5a47395ad30454ce8262abcd3e91c33ef803c2ae31a9258d7142dd48  acpid.logrotat
 c94b126d5957e9fafe6270b5e191024ff0374bff074db6ec98fbbeaa5e82de95  busyboxconfig
 52bd2c7c44779f910eedd2fea73ec0de520add400894cc132276587e25c73e39  bbsuid.c
 9bbf0bec82e6d6907474958f3be048c54657fbf49207810b7e4d4d6146f0069d  nologin.c"
-sha512sums="4122a457709a19f697547f1f84fb37da6ae85dd22afefcb49f551b2c6386838e07bfed0d7d58e70ee8199ae8fd35fd4397bf7d8b3bdd66f60aefb3153376efe4  busybox-1.25.0.tar.bz2
+sha512sums="9648877ed11e5a55213cd14fd64f6fc64dbd17013fbfaa4e67f4fd433f59e9231ed78a88e6e8100a4794d833f1d9863bb86f75faae093418866770804bf873cb  busybox-1.25.1.tar.bz2
 1d5eaba0531263c2b60697d5c7652a2f700a23132c6d2923b45127ba6d7dcc8ccc6c9bd9054e1639fe0dc40e61147348399692c4f08dbf6a6b7bac3c1f2811f7  0001-ash-exec-busybox.static.patch
-5a0ecbfd5b494fc04cac04996187c975c1a2c39608226668861b639c3011384275e7762e2fc9a66295023e68d86bf6a0af1f07b85f47b68b5e4976af6b81cb60  0001-iproute-ensure-scope-is-correctly-initialised.patch
 14a8c43be87b6d6c19787f476405ad6de1a575198ff2420e32d7f952bc72f4869419ef8189ff0e7b11f078a48013eb1f6c73e4b82aff316abba287a5bda96195  0002-set-applet-location-to-correspond-to-upstream-for-vi.patch
 1c4393102465de46481dfb2c7d652e76890da567b075a8b11674ae7608f6f0e6966a89961408c396607439bdb5a2f98c00e443102917254f338d05b0676e6ef2  0003-udhcpc-set-default-discover-retries-to-5.patch
 91033878d9e5efa8b1e5cebb6b18ea9a87af68b9939ac9441f791c8493b144dff46bafcc9c8d2ff3f8bc3b2c4891faad8fddf3e7335417c099b4b3051cbe9ba4  0004-ping-make-ping-work-without-root-privileges.patch
@@ -203,7 +196,6 @@ a0f02c60f47035ddde11795f6dbf51194d2e516a88dec787ef00e7c79627dce79957e397690b6c75
 af7f538953f7ff7ef527e41fbf9e8f345049d33a138d5d20942d3ee2615abc303ca59cb62cb99e3e6fcbfd27975da8220d90e44aafec3de991b6cdfba2c27ce1  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
 00a2e73fd2af72ba798b5a914a01314b161ff2dce2ec6c3cb01a1816e065a20b3110c1558a2fcd4c76cd78223033737592ee1cdcabcc6d35b944ee9010fc1a83  0010-su-FEATURE_SU_NULLOK_SECURE.patch
 c1d9742d0045c6d62e731bee50ce3bfdc338601d0d61571271e8a24431d2ba1e3ee522346871fc50011d4047fcdb1eed5a4321e5364eb4e42dd4b65e698dce4c  0011-df-use-f_frsize-instead-of-f_bsize-for-correct-sizes.patch
-c31cb5b26f3fe6aa1e8c34ff78029de43d0e5a4ea261b38bc4142f80323e36b27ffc7e48e46b649cb39876065313c1a56f11abdabdf19d3d736d096c07e0d5ac  0012-gzip-fix-compression-level-bug.-Closes-9131.patch
 d7a4ee28e0bf924b372ecb2f8da67f566f3c9e78199d81085e83dfb9fc9f5655fb8d6d904285d09bfee07d5e93b50603ea5f04e37e0feaaf01375170f158b829  0013-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 1e188dfa8c74c9e01f98edab42271260bf6b181b083ef81b76bd3af34ddbca5884a0fe7c3d0352855d0754015d0c0d8da0f1390f5db808b1237153a183a90681  0014-ntpd-respond-only-to-client-and-symmetric-active-pac.patch
 e04ebc53049be29e5ac0c90dd789b2d275c10175629787f729c06aa323ef688b2ed266961d4f841bae90d00ff4ee454de48d6b92f84f0e5c8729d6c55d9650cd  0015-diff-add-support-for-no-dereference.patch