summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-17 01:13:08 -0200
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-10-17 01:13:08 -0200
commit53f6224e2d2c2657f316b44851889c9dd9a5266e (patch)
treed12efa2c3d0300888f186d75afac9bcdef0b9c12
parent56540f6473669a5f7e1210a771df5a61ed6a9dcb (diff)
parent4a0d84ee70b7ed0343eeb0c09df08c991ff7d95c (diff)
downloadabslibre-53f6224e2d2c2657f316b44851889c9dd9a5266e.tar.gz
abslibre-53f6224e2d2c2657f316b44851889c9dd9a5266e.tar.bz2
abslibre-53f6224e2d2c2657f316b44851889c9dd9a5266e.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--~lukeshu/9mount/PKGBUILD36
-rw-r--r--~lukeshu/9mount/fix-checks.patch24
2 files changed, 60 insertions, 0 deletions
diff --git a/~lukeshu/9mount/PKGBUILD b/~lukeshu/9mount/PKGBUILD
new file mode 100644
index 000000000..c0052731d
--- /dev/null
+++ b/~lukeshu/9mount/PKGBUILD
@@ -0,0 +1,36 @@
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Fazlul Shahriar <fshahriar@gmail.com>
+
+pkgname=9mount
+pkgver=1.3
+pkgdesc="A set of SUID tools for mounting 9p filesystems via v9fs."
+url="http://sqweek.net/code/9mount/"
+license=('custom:ISC')
+source=("http://sqweek.net/9p/$pkgname-$pkgver.tar.gz" fix-checks.patch)
+
+pkgrel=2
+arch=('i686' 'x86_64')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ patch -i "$srcdir/fix-checks.patch"
+ make
+}
+
+check() {
+ cd "$srcdir/$pkgname-$pkgver"
+ PATH=.:$PATH sh ./test.sh
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make prefix="$pkgdir/usr" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ ln -s 9mount.1 "$pkgdir/usr/share/man/man1/9umount.1"
+ ln -s 9mount.1 "$pkgdir/usr/share/man/man1/9bind.1"
+}
+
+md5sums=('711a0a6f4d076c8275596171b0a315d0'
+ '7961acda05c55f91f8cd6fb0d51b5c7d')
+sha256sums=('820d80b9b478d05ecb022ad658477b37cfc2414a8669c3af17d192a522064c17'
+ '69cd1be08cc13cdecf2851dd6f78efd734afa8b0b099484cd777edb0b1d36f79')
diff --git a/~lukeshu/9mount/fix-checks.patch b/~lukeshu/9mount/fix-checks.patch
new file mode 100644
index 000000000..9af711ba5
--- /dev/null
+++ b/~lukeshu/9mount/fix-checks.patch
@@ -0,0 +1,24 @@
+--- test.sh.orig 2012-10-15 11:15:07.000000000 -0400
++++ test.sh 2012-10-15 11:15:11.000000000 -0400
+@@ -7,7 +7,7 @@
+ shift; shift
+ actual=$(9mount -n "$@" 2>&1)
+ aopts=$(echo $actual |sed 's/.*-o \([^ ]*\) .*/\1/' |tr , '\n' |sort |tr '\n' , |sed 's/,$//')
+- actual=$(echo $actual |sed 's/-o [^ ]*/-o '"$aopts"'/')
++ actual=$(echo $actual |sed -e 's/-o [^ ]*/-o '"$aopts"'/' -e 's/ ::1 / 127.0.0.1 /')
+ if [ "$expected" != "$actual" ]; then
+ echo ' '9mount "$@"
+ echo $expected' #expected'
+@@ -48,6 +48,7 @@
+ output=$(9mount -n "$@" 2>&1) && {
+ echo ' '9mount "$@"
+ echo $output' #should have failed!'
++ exit 1
+ }
+ }
+
+@@ -59,3 +60,4 @@
+ shouldfail unix!/tmp/9mount!qux $mtpt
+ shouldfail virtio!/dev/chan!bar $mtpt
+ shouldfail tcp!localhost!564!foo $mtpt
++exit 0