diff options
Diffstat (limited to 'main/busybox')
| -rw-r--r-- | main/busybox/APKBUILD | 44 | ||||
| -rw-r--r-- | main/busybox/bbsuid.c | 1 | ||||
| -rw-r--r-- | main/busybox/busyboxconfig | 2 |
3 files changed, 27 insertions, 20 deletions
diff --git a/main/busybox/APKBUILD b/main/busybox/APKBUILD index a92aa1866b..e53889e831 100644 --- a/main/busybox/APKBUILD +++ b/main/busybox/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=busybox -pkgver=1.20.0 -pkgrel=4 +pkgver=1.20.1 +pkgrel=1 pkgdesc="Size optimized toolbox of many common UNIX utilities" url=http://busybox.net arch="all" @@ -21,13 +21,11 @@ source="http://busybox.net/downloads/$pkgname-$pkgver.tar.bz2 0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch loginutils-sha512.patch - http://busybox.net/downloads/fixes-1.20.0/busybox-1.20.0-buildsys.patch - http://busybox.net/downloads/fixes-1.20.0/busybox-1.20.0-ext4.patch - http://busybox.net/downloads/fixes-1.20.0/busybox-1.20.0-find.patch - http://busybox.net/downloads/fixes-1.20.0/busybox-1.20.0-getty.patch - http://busybox.net/downloads/fixes-1.20.0/busybox-1.20.0-lineedit.patch - http://busybox.net/downloads/fixes-1.20.0/busybox-1.20.0-mdev.patch - http://busybox.net/downloads/fixes-1.20.0/busybox-1.20.0-sed.patch + http://busybox.net/downloads/fixes-1.20.1/busybox-1.20.1-ash.patch + http://busybox.net/downloads/fixes-1.20.1/busybox-1.20.1-ifupdown.patch + http://busybox.net/downloads/fixes-1.20.1/busybox-1.20.1-man.patch + http://busybox.net/downloads/fixes-1.20.1/busybox-1.20.1-ps.patch + http://busybox.net/downloads/fixes-1.20.1/busybox-1.20.1-tar.patch busyboxconfig" @@ -80,6 +78,16 @@ package() { install -m4111 bbsuid "$pkgdir"/bin/bbsuid || return 1 # we need /bin/sh to be able to execute post-install ln -s /bin/busybox "$pkgdir"/bin/sh + + #ifupdown needs those dirs to be present + mkdir -p \ + "$pkgdir"/etc/network/if-down.d \ + "$pkgdir"/etc/network/if-post-down.d \ + "$pkgdir"/etc/network/if-post-up.d \ + "$pkgdir"/etc/network/if-pre-down.d \ + "$pkgdir"/etc/network/if-pre-up.d \ + "$pkgdir"/etc/network/if-up.d \ + || return 1 } static() { @@ -89,8 +97,8 @@ static() { "$subpkgdir"/bin/busybox.static } -md5sums="4334b34fa1cdae54e9d2dc174f35c9ae busybox-1.20.0.tar.bz2 -b7b06c7d5cff6935e4ff68a245cc64b5 bbsuid.c +md5sums="af2fededb6dca804544c05684636e574 busybox-1.20.1.tar.bz2 +8485cf1e389e891914cbb8771a6d9bbd bbsuid.c d64b58a30892c558bdbab7f0d0997577 nologin.c 4c0f3b486eaa0674961b7ddcd0c60a9b busybox-1.11.1-bb.patch b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch @@ -98,11 +106,9 @@ b5375210f13fd6e1ca61a565e8fabd35 busybox-uname-is-not-gnu.patch b0977368029587bab23067f0267ae309 0001-tar-Implement-no-recursion.patch 8bf65d5bc87112946675f540b46d406d 0001-unzip-ignore-chmod-errors-so-unzipping-on-FAT-works.patch 8c42c9ef0f0419c314c86bcaf7796106 loginutils-sha512.patch -56a22fda2f6aae71a38d6897b1d18ba8 busybox-1.20.0-buildsys.patch -ff2d91a8260157e3eee50156cb20ad52 busybox-1.20.0-ext4.patch -35bfb15eb5ad77d392edb4addebcf2c9 busybox-1.20.0-find.patch -72959a6267138e0692f6a823f2afde7b busybox-1.20.0-getty.patch -baa5aba9e52bc8ca8f1f7f120e82f80b busybox-1.20.0-lineedit.patch -276d3d140b35d8d02e05f725e40c4628 busybox-1.20.0-mdev.patch -bf3b5cc9f831a2a89b280979aa19e40b busybox-1.20.0-sed.patch -2f0ee9409d33bf48c64144bd1871081e busyboxconfig" +bfa2429d4d2f6b99a52ef1d8baa3ce1e busybox-1.20.1-ash.patch +aa0b89a3edb2152219df5dc79cb0f70e busybox-1.20.1-ifupdown.patch +8e85ee0d318bd67b2de2541a1824e1ff busybox-1.20.1-man.patch +0b81a3b16db2b74376027e33c127fb4d busybox-1.20.1-ps.patch +1374dd3102d0d1e2c98509bc22024464 busybox-1.20.1-tar.patch +8b3bcd5dd5e3245721da3d376172dcac busyboxconfig" diff --git a/main/busybox/bbsuid.c b/main/busybox/bbsuid.c index a970b01e71..9fc9bb1972 100644 --- a/main/busybox/bbsuid.c +++ b/main/busybox/bbsuid.c @@ -22,6 +22,7 @@ const static char * applets[] = { "/bin/mount", "/bin/ping", + "/bin/ping6", "/bin/umount", "/usr/bin/crontab", "/usr/bin/passwd", diff --git a/main/busybox/busyboxconfig b/main/busybox/busyboxconfig index 734315cb95..19cd7af7bf 100644 --- a/main/busybox/busyboxconfig +++ b/main/busybox/busyboxconfig @@ -287,7 +287,7 @@ CONFIG_UNEXPAND=y # CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set CONFIG_UNIQ=y CONFIG_USLEEP=y -# CONFIG_UUDECODE is not set +CONFIG_UUDECODE=y CONFIG_UUENCODE=y CONFIG_WC=y # CONFIG_FEATURE_WC_LARGE is not set |