Update glusterfs to 3.2.7, a maintenance release

4 files changed, 63 insertions, 46 deletions

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 0602f065099..bb1ac680dbd 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2012/04/08 19:08:55 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2012/06/16 01:47:33 manu Exp $
 #
 
-DISTNAME=	glusterfs-3.2.6
+DISTNAME=	glusterfs-3.2.7
 CATEGORIES=	filesystems
-MASTER_SITES=	http://download.gluster.com/pub/gluster/glusterfs/3.2/3.2.6/
+MASTER_SITES=	http://download.gluster.com/pub/gluster/glusterfs/3.2/3.2.7/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gluster.org/
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index 2539f29a9f6..794848ca5fd 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/03/28 14:24:59 manu Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/06/16 01:47:33 manu Exp $
 etc/glusterfs/xattr-init.sh
 etc/glusterfs/glusterfs.vol.sample
 etc/glusterfs/glusterfsd.vol.sample
@@ -7,44 +7,44 @@ etc/glusterfs/xattr-init.sh
 lib/libglusterfs.la
 lib/libgfrpc.la
 lib/libgfxdr.la
-lib/glusterfs/3.2.6/auth/addr.la
-lib/glusterfs/3.2.6/auth/login.la
-lib/glusterfs/3.2.6/rpc-transport/socket.la
-lib/glusterfs/3.2.6/xlator/cluster/afr.la
-lib/glusterfs/3.2.6/xlator/cluster/dht.la
-lib/glusterfs/3.2.6/xlator/cluster/distribute.so
-lib/glusterfs/3.2.6/xlator/cluster/nufa.la
-lib/glusterfs/3.2.6/xlator/cluster/pump.la
-lib/glusterfs/3.2.6/xlator/cluster/replicate.so
-lib/glusterfs/3.2.6/xlator/cluster/stripe.la
-lib/glusterfs/3.2.6/xlator/cluster/switch.la
-lib/glusterfs/3.2.6/xlator/debug/error-gen.la
-lib/glusterfs/3.2.6/xlator/debug/io-stats.la
-lib/glusterfs/3.2.6/xlator/debug/trace.la
-lib/glusterfs/3.2.6/xlator/encryption/rot-13.la
-lib/glusterfs/3.2.6/xlator/features/access-control.so
-lib/glusterfs/3.2.6/xlator/features/locks.la
-lib/glusterfs/3.2.6/xlator/features/mac-compat.la
-lib/glusterfs/3.2.6/xlator/features/marker.la
-lib/glusterfs/3.2.6/xlator/features/posix-locks.so
-lib/glusterfs/3.2.6/xlator/features/quiesce.la
-lib/glusterfs/3.2.6/xlator/features/quota.la
-lib/glusterfs/3.2.6/xlator/features/read-only.la
-lib/glusterfs/3.2.6/xlator/mgmt/glusterd.la
-lib/glusterfs/3.2.6/xlator/mount/fuse.la
-lib/glusterfs/3.2.6/xlator/nfs/server.la
-lib/glusterfs/3.2.6/xlator/performance/io-cache.la
-lib/glusterfs/3.2.6/xlator/performance/io-threads.la
-lib/glusterfs/3.2.6/xlator/performance/quick-read.la
-lib/glusterfs/3.2.6/xlator/performance/read-ahead.la
-lib/glusterfs/3.2.6/xlator/performance/stat-prefetch.la
-lib/glusterfs/3.2.6/xlator/performance/write-behind.la
-lib/glusterfs/3.2.6/xlator/protocol/client.la
-lib/glusterfs/3.2.6/xlator/protocol/server.la
-lib/glusterfs/3.2.6/xlator/storage/posix.la
-lib/glusterfs/3.2.6/xlator/system/posix-acl.la
-lib/glusterfs/3.2.6/xlator/testing/features/trash.la
-lib/glusterfs/3.2.6/xlator/testing/performance/symlink-cache.la
+lib/glusterfs/3.2.7/auth/addr.la
+lib/glusterfs/3.2.7/auth/login.la
+lib/glusterfs/3.2.7/rpc-transport/socket.la
+lib/glusterfs/3.2.7/xlator/cluster/afr.la
+lib/glusterfs/3.2.7/xlator/cluster/dht.la
+lib/glusterfs/3.2.7/xlator/cluster/distribute.so
+lib/glusterfs/3.2.7/xlator/cluster/nufa.la
+lib/glusterfs/3.2.7/xlator/cluster/pump.la
+lib/glusterfs/3.2.7/xlator/cluster/replicate.so
+lib/glusterfs/3.2.7/xlator/cluster/stripe.la
+lib/glusterfs/3.2.7/xlator/cluster/switch.la
+lib/glusterfs/3.2.7/xlator/debug/error-gen.la
+lib/glusterfs/3.2.7/xlator/debug/io-stats.la
+lib/glusterfs/3.2.7/xlator/debug/trace.la
+lib/glusterfs/3.2.7/xlator/encryption/rot-13.la
+lib/glusterfs/3.2.7/xlator/features/access-control.so
+lib/glusterfs/3.2.7/xlator/features/locks.la
+lib/glusterfs/3.2.7/xlator/features/mac-compat.la
+lib/glusterfs/3.2.7/xlator/features/marker.la
+lib/glusterfs/3.2.7/xlator/features/posix-locks.so
+lib/glusterfs/3.2.7/xlator/features/quiesce.la
+lib/glusterfs/3.2.7/xlator/features/quota.la
+lib/glusterfs/3.2.7/xlator/features/read-only.la
+lib/glusterfs/3.2.7/xlator/mgmt/glusterd.la
+lib/glusterfs/3.2.7/xlator/mount/fuse.la
+lib/glusterfs/3.2.7/xlator/nfs/server.la
+lib/glusterfs/3.2.7/xlator/performance/io-cache.la
+lib/glusterfs/3.2.7/xlator/performance/io-threads.la
+lib/glusterfs/3.2.7/xlator/performance/quick-read.la
+lib/glusterfs/3.2.7/xlator/performance/read-ahead.la
+lib/glusterfs/3.2.7/xlator/performance/stat-prefetch.la
+lib/glusterfs/3.2.7/xlator/performance/write-behind.la
+lib/glusterfs/3.2.7/xlator/protocol/client.la
+lib/glusterfs/3.2.7/xlator/protocol/server.la
+lib/glusterfs/3.2.7/xlator/storage/posix.la
+lib/glusterfs/3.2.7/xlator/system/posix-acl.la
+lib/glusterfs/3.2.7/xlator/testing/features/trash.la
+lib/glusterfs/3.2.7/xlator/testing/performance/symlink-cache.la
 man/man8/glusterfs.8
 man/man8/mount.glusterfs.8
 man/man8/gluster.8
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index 8fb63cd71f6..645accca10e 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2012/03/28 14:24:59 manu Exp $
+$NetBSD: distinfo,v 1.25 2012/06/16 01:47:33 manu Exp $
 
-SHA1 (glusterfs-3.2.6.tar.gz) = b26de87528684fab8939a10087126ffd2a229de7
-RMD160 (glusterfs-3.2.6.tar.gz) = 207d9f90826a3eb80f470ef804606f7a6dce09b4
-Size (glusterfs-3.2.6.tar.gz) = 2420250 bytes
+SHA1 (glusterfs-3.2.7.tar.gz) = 13873edece614ecdbb75953daefaf76c4fd2ca3b
+RMD160 (glusterfs-3.2.7.tar.gz) = 8ecc90a0bf852a57db33d15480b494926abe2abe
+Size (glusterfs-3.2.7.tar.gz) = 2424292 bytes
 SHA1 (patch-aa) = bfd1dbcb6945dd387d88bd96616e4bc29c3e0628
 SHA1 (patch-ab) = d240bfd8bd8e5994f612a3387cd75f30bb91c8d7
 SHA1 (patch-ac) = 21d86775c2174ea630404a1a329dfd49c7f493d9
@@ -33,3 +33,4 @@ SHA1 (patch-bw) = dca12eb81163fd1a0ada13165e990ddcb8fefbf2
 SHA1 (patch-bx) = b2aca473091bb64d14c6da046379d33ca8a5785e
 SHA1 (patch-ca) = 7b87f5b1a34eaa9a74f21bc40c794585817070ae
 SHA1 (patch-ce) = a1bfec3d057a27cefc4eb70d46a42202637d973f
+SHA1 (patch-cf) = 6d615a6a48f14f7e08c6b034d73ce441c26d0105
diff --git a/filesystems/glusterfs/patches/patch-cf b/filesystems/glusterfs/patches/patch-cf
new file mode 100644
index 00000000000..a030a0d3269
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-cf
@@ -0,0 +1,16 @@
+$NetBSD: patch-cf,v 1.1 2012/06/16 01:47:34 manu Exp $
+
+Strip "-o stuff" from volfile_loc
+--- xlators/mount/fuse/utils/mount.glusterfs.in.orig	2012-06-16 03:23:37.000000000 +0200
++++ xlators/mount/fuse/utils/mount.glusterfs.in	2012-06-16 03:25:02.000000000 +0200
+@@ -191,9 +191,9 @@
+     log_server=$(echo "$options" | sed -n 's/.*log-server=\([^,]*\).*/\1/p');
+ 
+     log_server_port=$(echo "$options" | sed -n 's/.*log-server-port=\([^,]*\).*/\1/p');
+ 
+-    volfile_loc="$1";
++    volfile_loc=$(echo "$@" | sed -n 's/-o[ ]*\([^ ]*\)//p'|awk '{print $1}');
+ 
+     [ -r "$volfile_loc" ] || {
+ 	server_ip=$(echo "$volfile_loc" | sed -n 's/\([^\:]*\).*/\1/p');
+         test_str=$(echo "$volfile_loc" | sed -n 's/.*:\([^ ]*\).*/\1/p');