diff options
| author | Michael Mason <ms13sp@gmail.com> | 2009-10-28 11:14:28 +0000 |
|---|---|---|
| committer | Michael Mason <ms13sp@gmail.com> | 2009-10-28 11:14:28 +0000 |
| commit | 86ab49bf71dfd4dda5329a64f4e458e92f240edd (patch) | |
| tree | cc85fc098301719fb5cdd29ffebff0c667eb300b /testing/util-vserver | |
| parent | d4f48422585b6407b3cbf462933691a7d13ad468 (diff) | |
| parent | f881839e00a6387bf00dc5c48ad123e723ee7657 (diff) | |
| download | aports-86ab49bf71dfd4dda5329a64f4e458e92f240edd.tar.bz2 aports-86ab49bf71dfd4dda5329a64f4e458e92f240edd.tar.xz | |
Merge branch 'master' of git://git.alpinelinux.org/aports
Diffstat (limited to 'testing/util-vserver')
| -rw-r--r-- | testing/util-vserver/APKBUILD | 6 | ||||
| -rw-r--r-- | testing/util-vserver/busybox.patch | 11 |
2 files changed, 15 insertions, 2 deletions
diff --git a/testing/util-vserver/APKBUILD b/testing/util-vserver/APKBUILD index 4d70b9f81d..92faf45798 100644 --- a/testing/util-vserver/APKBUILD +++ b/testing/util-vserver/APKBUILD @@ -2,16 +2,17 @@ pkgname=util-vserver pkgver=0.30.216_pre2849 _realver=0.30.216-pre2849 -pkgrel=2 +pkgrel=3 pkgdesc="Linux-VServer admin utilities" url="http://www.nongnu.org/util-vserver/" license="GPL" # needs coreutils for touch -t makedepends="iptables-dev e2fsprogs-dev beecrypt-dev autoconf automake pkgconfig libtool" -depends="bash" +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 @@ -51,6 +52,7 @@ build() { } md5sums="af4c22b420320bdd94a1756f3c90de20 util-vserver-0.30.216-pre2849.tar.bz2 +62b7b9bbe5902b95f4614272af003dfd busybox.patch 73c7437dea6937a57cf38d166ef83c09 chmod.patch ff8f561f672524eb46fe633f584ef60e ensc_pathprog.patch da8b70c4fd40e68894b3903ffd121397 validate.patch diff --git a/testing/util-vserver/busybox.patch b/testing/util-vserver/busybox.patch new file mode 100644 index 0000000000..cc471cc4eb --- /dev/null +++ b/testing/util-vserver/busybox.patch @@ -0,0 +1,11 @@ +--- 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 |