diff options
| author | Euan Harris <euan.harris@docker.com> | 2018-05-14 11:56:34 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-05-14 19:07:04 +0000 |
| commit | 1723be1db54b844925bdbf6aeac476b00e20fe6c (patch) | |
| tree | 936888a491be41e7401cc0f1e15c4a0825dc908a /main/busybox/APKBUILD | |
| parent | 6d2dc8194bf78753b8be2432549387630a7d5759 (diff) | |
| download | aports-1723be1db54b844925bdbf6aeac476b00e20fe6c.tar.bz2 aports-1723be1db54b844925bdbf6aeac476b00e20fe6c.tar.xz | |
main/busybox: Backport nsenter option parser fixes
* Rename --network to --net, to match util-linux and the help text
* -t, -S and -G should take mandatory integer options, but are defined
as simple flags, causing problems such as:
https://github.com/linuxkit/linuxkit/issues/567
https://github.com/gliderlabs/docker-alpine/issues/359
https://github.com/kontena/pharos-cluster/pull/81
These patches have been accepted upstream by Busybox.
Signed-off-by: Euan Harris <euan.harris@docker.com>
Diffstat (limited to 'main/busybox/APKBUILD')
| -rw-r--r-- | main/busybox/APKBUILD | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index b6d5421cfe..089cdce59f 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox pkgver=1.28.2 -pkgrel=3 +pkgrel=4 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -40,6 +40,9 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 fix-cpio-symlinks.patch 0001-grep-fix-echo-aa-busybox-grep-F-w-a-should-not-match.patch + 0001-nsenter-Rename-network-option-to-net.patch + 0002-nsenter-fix-parsing-of-t-S-and-G-options.patch + acpid.logrotate busyboxconfig busyboxconfig-extras @@ -202,6 +205,8 @@ a96aa81d2f0104b5c28f02e80b3f77dbce77af93c174c09015a34850474d69e42c160fc8061c62f0 d90d6b3406760fe3df6dbed46a0f4d1c02a69d5184ebc86d8c1692bc4576532127283ba3ff9a81e64f3660c279b8ee324dac7a426350873c45957067648651c6 0017-ifupdown-do-not-fail-if-interface-disappears-during-.patch 65c11538056b6bd782b6195252a2a49f3b374e285a04f3296f708bb7da02b87435c34d43eaf80f1961167f55106fc2e4d5843d0c27cf06e6156ff8fabe642ac8 fix-cpio-symlinks.patch bc16f8ee0369274aa145d050cf45d7b0f7e9cd569b40e327b634f442851fff23a7decee0ba7822535bb6e195a0f8ab8a29fe5899cd909abda8d60e4247b462d9 0001-grep-fix-echo-aa-busybox-grep-F-w-a-should-not-match.patch +d2364e20b12c5215c4baecc3c6faf903e6e1e2bee95d697af047d680e9d57e7aeea54c8584d062d92daa0ea64898b502fbae010b22ab236ec4018966b74deeec 0001-nsenter-Rename-network-option-to-net.patch +0dbffae82b62317fc4144a01940ebc601e58b0e14eb8338bc42db79407d0b74dbe9f0f44758b9a5baa399eb90f8e8ee8f9c344bebd1b03bdd2ce520cb2b28d5e 0002-nsenter-fix-parsing-of-t-S-and-G-options.patch a9b1403c844c51934637215307dd9e2adb9458921047acff0d86dcf229b6e0027f4b2c6cdaa25a58407aad9d098fb5685d58eb5ff8d2aa3de4912cdea21fe54c acpid.logrotate 035f2a28719971d9ff805d208d70bc1144fd3701235dc46ef581a559e696ef92265f28f7debf0248a2cee004a773dcd07828bcc088716f5aff944ccdce15d30f busyboxconfig 0efbe22e2fd56993d92b6542d4ccffb2b42d50495be085c98f417a71f503b4071e2f092afcec77f78064d33ffb0922c28daa3cb9958e6d7fb26d5a660abd90f4 busyboxconfig-extras |