diff options
| -rw-r--r-- | main/util-vserver/APKBUILD | 14 | ||||
| -rw-r--r-- | main/util-vserver/busybox.patch | 11 |
2 files changed, 8 insertions, 17 deletions
diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD index 272d3f36d0..18c8ca63a6 100644 --- a/main/util-vserver/APKBUILD +++ b/main/util-vserver/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=util-vserver -pkgver=0.30.216_pre2921 -_realver=0.30.216-pre2921 -pkgrel=1 +pkgver=0.30.216_pre2926 +_realver=${pkgver%_*}-${pkgver#*_} +pkgrel=0 pkgdesc="Linux-VServer admin utilities" url="http://www.nongnu.org/util-vserver/" arch="x86 x86_64" @@ -13,7 +13,6 @@ makedepends="iptables-dev e2fsprogs-dev beecrypt-dev autoconf automake depends="bash make" source="http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-$_realver.tar.bz2 - busybox.patch chmod.patch ensc_pathprog.patch validate.patch @@ -60,12 +59,15 @@ build() { package() { cd "$_builddir" make -j1 DESTDIR="$pkgdir/" install install-distribution + + # obsolete and broken + rm -f "$pkgdir"/usr/sbin/vserver-copy + install -Dm755 ../setup-vs-template "$pkgdir"/usr/sbin/setup-vs-template install -Dm755 ../setup-vs-guest "$pkgdir"/usr/sbin/setup-vs-guest } -md5sums="21b9cbdcd4943b469d8e720826337edd util-vserver-0.30.216-pre2921.tar.bz2 -62b7b9bbe5902b95f4614272af003dfd busybox.patch +md5sums="236c0ef54b94f8c116afaf7b78396a58 util-vserver-0.30.216-pre2926.tar.bz2 73c7437dea6937a57cf38d166ef83c09 chmod.patch ff8f561f672524eb46fe633f584ef60e ensc_pathprog.patch da8b70c4fd40e68894b3903ffd121397 validate.patch diff --git a/main/util-vserver/busybox.patch b/main/util-vserver/busybox.patch deleted file mode 100644 index cc471cc4eb..0000000000 --- a/main/util-vserver/busybox.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/scripts/start-vservers Mon Oct 26 13:58:40 2009 -+++ b/scripts/start-vservers Mon Oct 26 13:59:31 2009 -@@ -131,7 +131,7 @@ - d=$__CONFDIR/${vservers[$i]}/apps/init - f=$d/mark - { test -n "$OPTION_MARK_ANY"; } || \ -- { test -n "$OPTION_MARK" -a -r "$f" && grep -qx "$OPTION_MARK" "$f"; } || \ -+ { test -n "$OPTION_MARK" -a -r "$f" && grep -q "^${OPTION_MARK}$" "$f"; } || \ - { test -z "$OPTION_MARK" && test ! -e "$f"; } || \ - unset vservers[$i] - done |