diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-02-23 08:53:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-02-23 08:53:47 +0000 |
| commit | 4e4dd323e49e316fa2a38299b73b059648864906 (patch) | |
| tree | 844079663874741a82e87dbfdf8c74c76a439ccc | |
| parent | b78e2f6b5eb7ce82cd896582104f7bc75d7a2fdc (diff) | |
| download | aports-4e4dd323e49e316fa2a38299b73b059648864906.tar.bz2 aports-4e4dd323e49e316fa2a38299b73b059648864906.tar.xz | |
main/util-vserver: upgrade to 0.30.216_pre2935 and fix for bb grep
fixes #516
| -rw-r--r-- | main/util-vserver/APKBUILD | 14 | ||||
| -rw-r--r-- | main/util-vserver/bb-grep.patch | 11 |
2 files changed, 19 insertions, 6 deletions
diff --git a/main/util-vserver/APKBUILD b/main/util-vserver/APKBUILD index 2e4b1ad52d..c4e1a4e002 100644 --- a/main/util-vserver/APKBUILD +++ b/main/util-vserver/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=util-vserver -pkgver=0.30.216_pre2926 +pkgver=0.30.216_pre2935 _realver=${pkgver%_*}-${pkgver#*_} pkgrel=0 pkgdesc="Linux-VServer admin utilities" @@ -17,6 +17,7 @@ source="http://people.linux-vserver.org/~dhozac/t/uv-testing/util-vserver-$_real ensc_pathprog.patch validate.patch alpine.patch + bb-grep.patch setup-vs-template setup-vs-guest " @@ -26,10 +27,10 @@ _builddir="$srcdir"/$pkgname-$_realver prepare() { cd "$_builddir" - for i in ../*.patch; do - [ -r "$i" ] || continue - msg "Applying $i" - patch -p1 -i $i || return 1 + for i in $source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac done msg "Running autotools..." aclocal -I m4 && autoconf && automake && libtoolize || return 1 @@ -67,10 +68,11 @@ package() { install -Dm755 ../setup-vs-guest "$pkgdir"/usr/sbin/setup-vs-guest } -md5sums="236c0ef54b94f8c116afaf7b78396a58 util-vserver-0.30.216-pre2926.tar.bz2 +md5sums="46200abf1e2ca1e364c302148dc5b607 util-vserver-0.30.216-pre2935.tar.bz2 73c7437dea6937a57cf38d166ef83c09 chmod.patch ff8f561f672524eb46fe633f584ef60e ensc_pathprog.patch da8b70c4fd40e68894b3903ffd121397 validate.patch 04000261fd990a3963b0e98260b481bd alpine.patch +226f08ed5adf2c91faf9cdd4ea92eb14 bb-grep.patch 49bca7969cc284adf68e0ef284c0660e setup-vs-template 253253a488a632d834c1e1ac5424f55b setup-vs-guest" diff --git a/main/util-vserver/bb-grep.patch b/main/util-vserver/bb-grep.patch new file mode 100644 index 0000000000..e4e2101d31 --- /dev/null +++ b/main/util-vserver/bb-grep.patch @@ -0,0 +1,11 @@ +--- ./scripts/functions.orig ++++ ./scripts/functions +@@ -542,7 +542,7 @@ + (STOPPED) ! $_VSERVER "$_ga_i" running &>/dev/null || _ga_doadd=;; + (RUNNING) $_VSERVER "$_ga_i" running &>/dev/null || _ga_doadd=;; + (ALL) ;; +- (MARK) test -s "$_ga_markfile" && grep -qx "$3" "$_ga_markfile" || _ga_doadd=;; ++ (MARK) test -s "$_ga_markfile" && grep -q "^$3$" "$_ga_markfile" || _ga_doadd=;; + (*) panic $"Unknown vserver tagging '$2'";; + esac + |