diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-03 15:45:37 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-01-03 16:57:37 +0100 |
| commit | ce31356693e503fbc3ed8eea5f93298ac4c68581 (patch) | |
| tree | b85d56c7739718e9fa3fa27b0edfa05ac890eb92 /main | |
| parent | aac5a520b4c43578618ca98b179fb53831a1f650 (diff) | |
main/busybox: use ash internal glob
musl's glob does not handle input longer than PATH_MAX
Diffstat (limited to 'main')
| -rw-r--r-- | main/busybox/APKBUILD | 8 | ||||
| -rw-r--r-- | main/busybox/busyboxconfig | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index 0b8c73ff88d..b648478ffac 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=1 +pkgrel=2 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -161,7 +161,7 @@ e35fc8b29faf1742c0f09f5c3b95db94 0002-app-location-for-vi-and-lspci.patch 14746b0d10711cb4a824a166fc147706 0012-diff-add-support-for-no-dereference.patch 4570da064e03480aeb76447af1170992 0001-ash-fix-error-code-regression.patch 4046b78ee6a25259954797d73b94f4bd acpid.logrotate -8da7e079770d2bfcc4224afe676e5600 busyboxconfig +44e79c71ef60f20bf3ef45cfa2624d4e busyboxconfig 378058009a1d6b1e321617b32b933e28 bbsuid.c 5c2d151c173f5618d404af4bb5a91769 dad.if-up d64b58a30892c558bdbab7f0d0997577 nologin.c" @@ -180,7 +180,7 @@ c158a8f317a327edb2f134178ffd7d1d3027a3644e925d93c031448cf35b4b2f 0008-login-mov c77369008d38b2e4622bc61a2d546f0005bed5c8e5d6a59c0a24bbad7ad04ea2 0012-diff-add-support-for-no-dereference.patch 9deb0aaa2d03db0dd9aadc73b4c54557c33c2a380f710638e2dface0e50ca2bf 0001-ash-fix-error-code-regression.patch f7cbeb5a5a47395ad30454ce8262abcd3e91c33ef803c2ae31a9258d7142dd48 acpid.logrotate -934fd31f15bc68923c571c53f1e78d99fbab673d9053c2b3bf5f14f39aba3486 busyboxconfig +1ebe60a42345f70cb8c486935290ffb6f8622d0dbb2bb70059952f52004cc614 busyboxconfig 52bd2c7c44779f910eedd2fea73ec0de520add400894cc132276587e25c73e39 bbsuid.c 5a42f9dbe272b5ce792ebf0d67bb5808ede2e470b0fbfbc23192f17e0b7410ae dad.if-up 9bbf0bec82e6d6907474958f3be048c54657fbf49207810b7e4d4d6146f0069d nologin.c" @@ -199,7 +199,7 @@ f82caa1dc4395f266b024a7face267a916a80ead95f3d392b10fd397d0fdf62703e3078357bc7196 361959788bc11b7f20d4029bb0f561759d270983b09c44fe2a01817378c4eb1c98cd8ef73e7ef8c168b7540170f58ddb36b9e4f80a97565f3fe3ba85b593a471 0012-diff-add-support-for-no-dereference.patch 79d2ec8ad1530aacf8c5ccc5386ede252b06c3d538d1d027f9f4fc29dabcae6832939a15cbe1b78224eae9191684966e5ca5da44c046988b7fd8a55db24dc30e 0001-ash-fix-error-code-regression.patch dadb4c953ebc755b88ee95c1489feb0c2d352f6e44abc716166024e6eea11ab9d10c84fad62c081775834d205cb04aa1be3c994676c88f4284495c54b9188e8b acpid.logrotate -c762e8cd6f6cc780bff50ece4a651cc8581ef7079216ff7cd3976fba0ea99638ee6bc9b8a378578bab883364774ecc966fc346395ccbdd1ecffbf9396c3db53c busyboxconfig +5d711e387497aa884063375212cc1cf42c5bfc93b2e3e671949929dbab73557631d998ca6eb1890dd045bfed24996d270d6cca9262881a53dcf6bd93d9ffb481 busyboxconfig c1dd56509277c59751907a27f067f1622191ddfd498acfe390d83136d36a41f2bdfc2fd4daf35af77219a66fb00fea20483f34112afd5df2ccd9f36ab548e66f bbsuid.c a1127c8a384294135e11500fde7ead33b73d24b11c21911b08447a4c4ef71d7a9965d6466f60f2da64e3b877213b0a3e924a5add3c5333ee3ecde8c2a91c5e02 dad.if-up 4e7c291a70e879b74c0fc07c54a73ef50537d8be68fee6b2d409425c07afd2d67f9b6afcd8c33a7971014913cc5de85e45079681c9e77200c6cc2f34acfba6d2 nologin.c" diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig index 211394ab61e..a8c69980a21 100644 --- a/main/busybox/busyboxconfig +++ b/main/busybox/busyboxconfig @@ -1038,7 +1038,7 @@ CONFIG_SH_IS_ASH=y CONFIG_BASH_IS_NONE=y CONFIG_ASH=y CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -# CONFIG_ASH_INTERNAL_GLOB is not set +CONFIG_ASH_INTERNAL_GLOB=y CONFIG_ASH_RANDOM_SUPPORT=y CONFIG_ASH_EXPAND_PRMT=y CONFIG_ASH_BASH_COMPAT=y |