main/busybox: move cpio to /usr/bin

2 files changed, 16 insertions, 39 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index 0ca8cb004d..0bc2ee33da 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
 pkgver=1.26.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
@@ -29,6 +29,7 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	0012-diff-add-support-for-no-dereference.patch
 
 	0001-ash-fix-error-code-regression.patch
+	location-for-cpio.patch
 
 	acpid.logrotate
 	busyboxconfig
@@ -146,44 +147,6 @@ static() {
 		"$subpkgdir"/bin/busybox.static
 }
 
-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
-04daa6589029bea08381153997cb9b4f  0004-ping-make-ping-work-without-root-privileges.patch
-41d1f17aae5fb141d47fca05e2a128d6  0005-fbsplash-support-console-switching.patch
-5d2501b4ef3cff23fa1c45e7bdc3d166  0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
-2e30ea0f9597ae181907b83f74c171f2  0007-depmod-support-generating-kmod-binary-index-files.patch
-2b6008e4b808822758d5a543c03aff66  0008-login-move-check_securetty-to-libbb.patch
-3999f781c0647edf8bda494c6a2ad615  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
-5f97342f411c5ad237a509066f757c1e  0010-su-FEATURE_SU_NULLOK_SECURE.patch
-723a879123be8df4726455d857d910aa  0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
-14746b0d10711cb4a824a166fc147706  0012-diff-add-support-for-no-dereference.patch
-4570da064e03480aeb76447af1170992  0001-ash-fix-error-code-regression.patch
-4046b78ee6a25259954797d73b94f4bd  acpid.logrotate
-2568c5f57cc3f3b78c32fba719ebe476  busyboxconfig
-378058009a1d6b1e321617b32b933e28  bbsuid.c
-5c2d151c173f5618d404af4bb5a91769  dad.if-up
-d64b58a30892c558bdbab7f0d0997577  nologin.c"
-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
-234e5649d9219c4334553ee10d2c1717d363c6193b654f48f45cef9b3f4e5abd  0004-ping-make-ping-work-without-root-privileges.patch
-c1f8356d3a2a1b40d42a9753130bf4af3a22ff940f7e0dafe45b4649280c6e7d  0005-fbsplash-support-console-switching.patch
-bc6349a441fca2e81e80178078d8ebcbaef337a8a871a89c1d4683d23d1186b1  0006-fbsplash-support-image-and-bar-alignment-and-positio.patch
-9a71642e381662dbf55c6f4b6ba09bf87f90e82980bea8d12aa25d412fc5af45  0007-depmod-support-generating-kmod-binary-index-files.patch
-c158a8f317a327edb2f134178ffd7d1d3027a3644e925d93c031448cf35b4b2f  0008-login-move-check_securetty-to-libbb.patch
-3b200f6df58de952b1bf81e338e279a73dbbc536b9a56759cdc5b74a41ddd141  0009-libbb-allow_blank-argument-for-ask_and_check_passwor.patch
-343cb66bead0b2a0069263069642ce95f139772dfd4d44d8b81db6d0c142a54d  0010-su-FEATURE_SU_NULLOK_SECURE.patch
-9bc67c6af540cbfdc05c020f517e5f0b8def2cb789f83891e6599ff310e999cb  0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
-c77369008d38b2e4622bc61a2d546f0005bed5c8e5d6a59c0a24bbad7ad04ea2  0012-diff-add-support-for-no-dereference.patch
-9deb0aaa2d03db0dd9aadc73b4c54557c33c2a380f710638e2dface0e50ca2bf  0001-ash-fix-error-code-regression.patch
-f7cbeb5a5a47395ad30454ce8262abcd3e91c33ef803c2ae31a9258d7142dd48  acpid.logrotate
-e2148845c2a1fc9b26ac686b65489bcb120a1aed2385a8995462269df4e41ec2  busyboxconfig
-52bd2c7c44779f910eedd2fea73ec0de520add400894cc132276587e25c73e39  bbsuid.c
-5a42f9dbe272b5ce792ebf0d67bb5808ede2e470b0fbfbc23192f17e0b7410ae  dad.if-up
-9bbf0bec82e6d6907474958f3be048c54657fbf49207810b7e4d4d6146f0069d  nologin.c"
 sha512sums="2b71563185e8d9601fe57c6975473336d5950c034ed62ca51b79cc32248612770724c2f8fd2028d15892d126829ef177223496688cd6816b6c7c0203772f9886  busybox-1.26.1.tar.bz2
 ed16b7a38d99eb309ed03d3212ffd1c1993e292724665be2aaefcf645c9a37d1b0c5d24308dac7dbb093afde5b700961c55336d67be4f2bb788c85550e5f1de8  0001-ash-exec-busybox.static.patch
 cd6b0b59ca8006bfc545ba521a92de81be320c0dd3ed0a41d6a60339b73f44c80f1ac36fb05d35a8555fd173167b792f73ae279115d23d59f8f623ae01aed7d1  0002-app-location-for-vi-and-lspci.patch
@@ -198,6 +161,7 @@ f82caa1dc4395f266b024a7face267a916a80ead95f3d392b10fd397d0fdf62703e3078357bc7196
 16b513b34b3bf16002f14566aae66aab986403cb7a0f416c27264b739706bbd624a99fd37d5b56ff6efe623f3cc48aef3e8fe51c4ae2e94eda3fe9e8e618e3a1  0011-ntpd-postpone-hostname-resolution-if-fails-on-startu.patch
 361959788bc11b7f20d4029bb0f561759d270983b09c44fe2a01817378c4eb1c98cd8ef73e7ef8c168b7540170f58ddb36b9e4f80a97565f3fe3ba85b593a471  0012-diff-add-support-for-no-dereference.patch
 79d2ec8ad1530aacf8c5ccc5386ede252b06c3d538d1d027f9f4fc29dabcae6832939a15cbe1b78224eae9191684966e5ca5da44c046988b7fd8a55db24dc30e  0001-ash-fix-error-code-regression.patch
+f26e090f5de0096ba5c4d46989ebe0ab5fa64c8bf54cd37ddec302fddfde23eac914858d86cc52bf3b5780a8e81ea2612ef6e713df2828e52c606f86a6816f39  location-for-cpio.patch
 dadb4c953ebc755b88ee95c1489feb0c2d352f6e44abc716166024e6eea11ab9d10c84fad62c081775834d205cb04aa1be3c994676c88f4284495c54b9188e8b  acpid.logrotate
 d4b9f4a09dcf08ec9f7a66c5250465e3a6dd9beb15140a462a1464110824426c732399e4dab4e6a33073626d4db0e76085b218cd0521027e57ce9f918ff1af29  busyboxconfig
 c1dd56509277c59751907a27f067f1622191ddfd498acfe390d83136d36a41f2bdfc2fd4daf35af77219a66fb00fea20483f34112afd5df2ccd9f36ab548e66f  bbsuid.c
diff --git a/main/busybox/location-for-cpio.patch b/main/busybox/location-for-cpio.patch
new file mode 100644
index 0000000000..e7069f2b9a
--- /dev/null
+++ b/main/busybox/location-for-cpio.patch
@@ -0,0 +1,13 @@
+diff --git a/archival/cpio.c b/archival/cpio.c
+index 540218cb2..369bf19a7 100644
+--- a/archival/cpio.c
++++ b/archival/cpio.c
+@@ -43,7 +43,7 @@
+ //config:	help
+ //config:	  Passthrough mode. Rarely used.
+ 
+-//applet:IF_CPIO(APPLET(cpio, BB_DIR_BIN, BB_SUID_DROP))
++//applet:IF_CPIO(APPLET(cpio, BB_DIR_USR_BIN, BB_SUID_DROP))
+ //kbuild:lib-$(CONFIG_CPIO) += cpio.o
+ 
+ //usage:#define cpio_trivial_usage