main/busybox: upgrade to 1.23

1 files changed, 20 insertions, 54 deletions

diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD
index dd21d7af61..c942296717 100644
--- a/main/busybox/APKBUILD
+++ b/main/busybox/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=busybox
-pkgver=1.22.1
-pkgrel=14
+pkgver=1.23.0
+pkgrel=0
 pkgdesc="Size optimized toolbox of many common UNIX utilities"
 url=http://busybox.net
 arch="all"
 license="GPL-2"
 depends=
+makedepends="linux-headers"
 install="$pkgname.post-install $pkgname.post-upgrade"
 subpackages="$pkgname-static"
 options="suid"
@@ -21,20 +22,10 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2
 	loginutils-sha512.patch
 	udhcpc-discover-retries.patch
 
-	busybox-1.22.1-ash.patch
-	busybox-1.22.1-date.patch
-	busybox-1.22.1-iplink.patch
-	busybox-1.22.1-nc.patch
-
 	0001-ifupdown-pass-interface-device-name-for-ipv6-route-c.patch
 	0001-ifupdown-use-x-hostname-NAME-with-udhcpc.patch
-	0001-ifupdown-support-link-address-family.patch
 
-	0001-sendmail-make-f-optional-document-its-default-value.patch
-	0002-sendmail-use-FQDN-in-default-envelope-sender.patch
 	0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
-	0001-top-fix-and-merge-code-to-parse-proc-meminfo.patch
-	fix-top.patch
 	0001-diff-add-support-for-no-dereference.patch
 
 	1000-fbsplash-use-virtual-y-size-in-mmap-size-calculation.patch
@@ -67,6 +58,17 @@ build() {
 	msg "Building bbsuid"
 	${CC:-${CROSS_COMPILE}gcc} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "$srcdir"/bbsuid.c -o "$_dyndir"/bbsuid || return 1
 
+	# build dynamic
+	cd "$_dyndir"
+	msg "Building dynamic busybox"
+	cp "$_config" .config
+	[ "$CLIBC" = musl ] && sed -i \
+		-e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \
+		.config
+	make -C "$_sdir" O="$PWD" silentoldconfig || return 1
+	make || return 1
+
+	# build static
 	cd "$_staticdir"
 	msg "Building static busybox"
 	sed -e "s/.*CONFIG_PIE.*/\# CONFIG_PIE is not set/" \
@@ -80,15 +82,6 @@ build() {
 	make || return 1
 	mv busybox busybox.static
 
-	# build dynamic
-	cd "$_dyndir"
-	msg "Building dynamic busybox"
-	cp "$_config" .config
-	[ "$CLIBC" = musl ] && sed -i \
-		-e "s/CONFIG_EXTRA_COMPAT=y/CONFIG_EXTRA_COMPAT=n/" \
-		.config
-	make -C "$_sdir" O="$PWD" silentoldconfig || return 1
-	make || return 1
 }
 
 package() {
@@ -119,7 +112,7 @@ static() {
 		"$subpkgdir"/bin/busybox.static
 }
 
-md5sums="337d1a15ab1cb1d4ed423168b1eb7d7e  busybox-1.22.1.tar.bz2
+md5sums="6dffeb16044c6022476c64744492106a  busybox-1.23.0.tar.bz2
 8485cf1e389e891914cbb8771a6d9bbd  bbsuid.c
 d64b58a30892c558bdbab7f0d0997577  nologin.c
 4c0f3b486eaa0674961b7ddcd0c60a9b  busybox-1.11.1-bb.patch
@@ -127,25 +120,16 @@ b5375210f13fd6e1ca61a565e8fabd35  busybox-uname-is-not-gnu.patch
 c5a8dbc8696db6da9c4624b0e11d8fba  bb-app-location.patch
 8c42c9ef0f0419c314c86bcaf7796106  loginutils-sha512.patch
 91a7584a562a72ba886936558e576bbd  udhcpc-discover-retries.patch
-a2dad16b8d7d29ea8120b6d27cf98529  busybox-1.22.1-ash.patch
-bc381f9ceb3824141c968f5bc4353943  busybox-1.22.1-date.patch
-24686ec2750a8703feb57fc9c6aaed1d  busybox-1.22.1-iplink.patch
-69eecaae5f812d08655dfdf34b60503f  busybox-1.22.1-nc.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
-d372d376820957fd5f2aee158af9867e  0001-sendmail-make-f-optional-document-its-default-value.patch
-9d83db6173fe5b0fb8ee6ce741d5bb18  0002-sendmail-use-FQDN-in-default-envelope-sender.patch
 239dbe5dae5d36bbf73548b2749a22b1  0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
-7cadebb1071d648b947cfbcca9839721  0001-top-fix-and-merge-code-to-parse-proc-meminfo.patch
-f2821edec523aadb36c3973d14386c1c  fix-top.patch
 69fa40bee9abec058427bf67fde1b61e  0001-diff-add-support-for-no-dereference.patch
 699ce5aa1095ba4419cd595cec8a8f75  1000-fbsplash-use-virtual-y-size-in-mmap-size-calculation.patch
 b56d306ccba574da78dff060b7330806  1001-fbsplash-support-console-switching.patch
 4fe5f9e973674c7db3d07f295c363a7c  1002-fbsplash-support-image-and-bar-alignment-and-positio.patch
-2fe6e74affe7d4e5e112035cead59432  busyboxconfig
+3cff842a3618c84465d7ef5425c8749b  busyboxconfig
 befaac2c59c380e36a452b3f1c1d4a3a  glibc.patch"
-sha256sums="ae0b029d0a9e4dd71a077a790840e496dd838998e4571b87b60fed7462b6678b  busybox-1.22.1.tar.bz2
+sha256sums="483ab594dd962ddbb332fd24e36ffdd6e36ac2182fbff055c56e1ca49fda09e4  busybox-1.23.0.tar.bz2
 81957f1fe0c386120dad1c8174ccc1fcfeed98c14d229db7d164d4fb4c938b3d  bbsuid.c
 9bbf0bec82e6d6907474958f3be048c54657fbf49207810b7e4d4d6146f0069d  nologin.c
 327bb8049e2726351a5c8b6b2cef864f6ce58725d4453983f97092ea73656ccc  busybox-1.11.1-bb.patch
@@ -153,25 +137,16 @@ a31ce8bcb8b81b20e80ffa407600a530d085806c6471f4e4249fcb3a491b79ef  busybox-uname-
 576366b4d50f1078da6c0364ef70415de92d97c93c64f4d790b11d7a34cdccd2  bb-app-location.patch
 57674b20158c0b266ed028b0c65299f9cbcad7d33d19c9fcc403d3967daba493  loginutils-sha512.patch
 90825a443339f1c8c249d05f7b025ce53e374d305f8e113d98d45146b105494d  udhcpc-discover-retries.patch
-9917257771ab715480427a6b744785b035d381e7ec0de381faf945bc7abadb97  busybox-1.22.1-ash.patch
-8502dd7454e948a56fcd8201f4fe9d629d2844b9df2bacff7ee0bb09398d12e8  busybox-1.22.1-date.patch
-186b41734e43ee117cb367055ce6a4d5b3aac671c09d71f2a6347793874d653b  busybox-1.22.1-iplink.patch
-0d2f9ba2e9e5db813fe9feb6fc84052ac85403ce2debefb8b1281a05aadec052  busybox-1.22.1-nc.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
-422ce68917dadf1a49085df2a00ffab670e2d0866dcdb7209ee49318ad195fca  0001-sendmail-make-f-optional-document-its-default-value.patch
-7c88ef1d837ec8efb7c21e5b1b16e4ac3060ccde7ad5f698e9e6ef630d412593  0002-sendmail-use-FQDN-in-default-envelope-sender.patch
 ac2cd5fed91bfaec22ed1f2766396d0feb29b9b96f20b2c12d5d8ac8769afae9  0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
-79c6e19853a4ceecfec65311e5f8e66033243b8250829c06420d27d8240f1775  0001-top-fix-and-merge-code-to-parse-proc-meminfo.patch
-d4673907d58ce80e78a3bfe3c2414b15e7a2b072cfea0c87c2ae9f709744b9ec  fix-top.patch
 70180473e3939402e460b25de8273a5ce7f62b130a9efe31f33d847b2406ac92  0001-diff-add-support-for-no-dereference.patch
 043963183cad556bdae5d5608180f0cb76cf7eede175cd97aa002a787780500f  1000-fbsplash-use-virtual-y-size-in-mmap-size-calculation.patch
 b8b0b16ed67b0159256193b1d2108b8ef9aa8a334ab81e463bb970c71257da9a  1001-fbsplash-support-console-switching.patch
 e1f3fad8e21dfd72cfcae7ab3ba31d7938e964e0f9ec08b2da0b14d462435424  1002-fbsplash-support-image-and-bar-alignment-and-positio.patch
-9bfb197fb57f9b3ac5b7a8800dfda6e5f7bee10db5e892d58176fa3733fe5229  busyboxconfig
+342bb69c144a1e63d7a7fe4c24578ce5b483c09751ac16bb36d1b88929068141  busyboxconfig
 c604ef791c31d35a8c5ee4558d21428a46f37a6d762c4a7e29864f4037fc44a0  glibc.patch"
-sha512sums="3e99fe373d638f714c3a61e1b02493d85ca532f472df038f7557db518ded38347072882ed568852941be7aac46fc34007257b4287375335ff5a09b60b295ce80  busybox-1.22.1.tar.bz2
+sha512sums="02c8f9dd9e47ad67b417fa58ba952bbdda6e79bad5399fba3d8217803053c2fd045228bd76d56e97d40c98296841dc66e4fa829887c05378a83bdeabafeb7f72  busybox-1.23.0.tar.bz2
 16b3dd6a8b76b062d51458351fcb44f84b49eb4bf898584c933df90fb2cb3966f9547865a4d7447589bb20b7c203beb04ff7512f76f85d29138d2cff4eb9ee81  bbsuid.c
 4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2  nologin.c
 eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d499e8dffbe6df8aa37ae27625c552162923d59fe35b55b32b  busybox-1.11.1-bb.patch
@@ -179,21 +154,12 @@ eb7cce973bfd53ce3350713437b9e2751becfb8dfb10b14f27c4f812297c403b90f80dc2906179d4
 5c42b05be69c834c9fd5372c6b0d55a6399c74146a94ea09eae7285dd4fa75d1bde38bf7ab73e98638f65eb72db02115453cbdfe85a0085d742940366f617c7d  bb-app-location.patch
 69af4800fcf765b4ae029daced7ff171b6b04d810c94a987c7ba848e275a27b77b18b38df1b85f4a12c4a47ed42f62e0768260eb1198e2aff1c3cea898b85c61  loginutils-sha512.patch
 34415fe69f6b8d42756046aa8e6d9e4f64a3b0ceb9f57c4c988e35870fe975f05d0ac76f1f9a712196e9c59e67aa2a54abf398242009134fb3aca342c25a3646  udhcpc-discover-retries.patch
-000bbc9f1b87b676fab5d86c6f535008f2e99e830af9a48354d669b457998044c1d7ac74090f1d2ae56c14eecf88ae9a15eba61c5347f5a9124b518d0f278051  busybox-1.22.1-ash.patch
-0836ef682e24fc0e6d660d0d835200d5f4cd863691a6b58d071e40d001923664389f61670037140c2f95deb2080a93c989037308c761ac9304165d83cbfd3d34  busybox-1.22.1-date.patch
-f213d11c842841a5b7a6c8b1ffb38719eb038cde220b06f8b5419e63998e21629b0e3f481ad7549d67a764e113abe524d8a7fa0fd9286b8b355a1f20211fd889  busybox-1.22.1-iplink.patch
-9988abf5936f8b8d952627999630c40cbfb4f6f1b91030a2692bbaa7b7e8516758a1ce0959bb5122c6911cd547ee04fce29a0c60c91ccf25e82f59ca52ac1e8f  busybox-1.22.1-nc.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
-7fde27b1742f641ad1da376d5cf7a96e1f60fef70fb9d382ca47b062df76d1c35d7a7f08cba5350484f818383eb897c772d5469fd515e648023d0a85d0ed640e  0001-sendmail-make-f-optional-document-its-default-value.patch
-d466676cd2779ff33f288bb073aa2baa4f3606cf8b96ec514e624a7acb46442a2839ef18c47e19cc18a8234a485de39596773b44e4be2eff39617d7cf677dd38  0002-sendmail-use-FQDN-in-default-envelope-sender.patch
 6781b10ca078296b243373d2c3f2bca2507a9df18a6b06d051e9ce84ed31a238aef3b2bb085daf12b145550be68c07c854272bd78a6f77da9197779b9c7cd9e9  0001-linedit-deluser-use-POSIX-getpwent-instead-of-getpwe.patch
-fa5f7f43bf8030f4bfcdf09d85e2e314014d5a083a24de95ac2e78c15e0dfebc14e410088e7f8eaeb8cdf24dea64e3b665b99afb8f96259e9908eebce81745bc  0001-top-fix-and-merge-code-to-parse-proc-meminfo.patch
-2dea81509f73621e60d95db1b04186056add15fb24d1f9f7b32bb50aee99733d3cf45404c33b7ca6993cff23d76f31c0bcf38c04ac741dcdd2baaf3bc2afd707  fix-top.patch
 a35b66cd28b79ccc14b47315ac94677fdf8c14d8a6e8956707e71fb50d453dfc5b4b822832cd1faecfe9bf79e687f9b25a1357e0a88db530044c5f8514701c98  0001-diff-add-support-for-no-dereference.patch
 2a8e9360e1cedd26bdb70d8cc036ef0abc7588bf2eee147c1c7436d7a40763f8e31d346b980145a36649130a2f811d299e4f46f7e1b60a8165a60ae9e79727d5  1000-fbsplash-use-virtual-y-size-in-mmap-size-calculation.patch
 a181dd54e8e11cf1199edb1b1fcd4b7402bbf142593b6014f32c6815bb7093b56899ad0fcc9f73c382f56203ac5274fb3d51fa070feb541436f23c31680f1a69  1001-fbsplash-support-console-switching.patch
 c33073416f7da2805a20f3f456f869217171c8fbfdef85f4ae481307aeb1e1b5717084bbbc619010fa5500c3f3f49b6468d5c122024fcc49d637c82427a3f553  1002-fbsplash-support-image-and-bar-alignment-and-positio.patch
-35ab915e729e73c4909793f58530edcfc10f10d750df0d41913892137f799f773a7bb476e29ed742c86d0f279603f85ed9bf5c660714571bc5f5179ea852aade  busyboxconfig
+2efb13f23c48a4dc3e2eb6343256694719c3425fe8ddd36ce9fb1837e45fafa3326c2630a08d731abc6bbc104536218d095b2d997861c5b35a7f7907177d2e66  busyboxconfig
 1d2739379dab1deb3eae7cffd4845300eb7d30f7343b4a1209b21a5680860d55080ad45fdefe098b249ce3040c01951fa7f0a79cd447b2d7b260eb000099d9dc  glibc.patch"