Update glusterfs to 3.2.6, which is a maintenance releases fixing various bugs

4 files changed, 45 insertions, 76 deletions

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index c182942416f..35005eb404e 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2012/03/15 11:53:27 obache Exp $
+# $NetBSD: Makefile,v 1.28 2012/03/28 14:24:59 manu Exp $
 #
 
 DISTNAME=	glusterfs-3.2.5
@@ -20,6 +20,7 @@ USE_TOOLS+=		flex bison
 PYTHON_VERSIONS_ACCEPTED= 27 26 25
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	CFLAGS=${CFLAGS:M*:Q}\ -D_INCOMPLETE_XOPEN_C063
+CONFIGURE_ARGS+=	CFLAGS=${CFLAGS:M*:Q}\ -DDEBUG
 
 # Make sure we do not attept to link with -lfl
 # Only libfl.a is available, and libtool wants libfl.so
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index b58d7739cf6..2539f29a9f6 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2011/12/09 16:57:44 manu Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/03/28 14:24:59 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.5/auth/addr.la
-lib/glusterfs/3.2.5/auth/login.la
-lib/glusterfs/3.2.5/rpc-transport/socket.la
-lib/glusterfs/3.2.5/xlator/cluster/afr.la
-lib/glusterfs/3.2.5/xlator/cluster/dht.la
-lib/glusterfs/3.2.5/xlator/cluster/distribute.so
-lib/glusterfs/3.2.5/xlator/cluster/nufa.la
-lib/glusterfs/3.2.5/xlator/cluster/pump.la
-lib/glusterfs/3.2.5/xlator/cluster/replicate.so
-lib/glusterfs/3.2.5/xlator/cluster/stripe.la
-lib/glusterfs/3.2.5/xlator/cluster/switch.la
-lib/glusterfs/3.2.5/xlator/debug/error-gen.la
-lib/glusterfs/3.2.5/xlator/debug/io-stats.la
-lib/glusterfs/3.2.5/xlator/debug/trace.la
-lib/glusterfs/3.2.5/xlator/encryption/rot-13.la
-lib/glusterfs/3.2.5/xlator/features/access-control.so
-lib/glusterfs/3.2.5/xlator/features/locks.la
-lib/glusterfs/3.2.5/xlator/features/mac-compat.la
-lib/glusterfs/3.2.5/xlator/features/marker.la
-lib/glusterfs/3.2.5/xlator/features/posix-locks.so
-lib/glusterfs/3.2.5/xlator/features/quiesce.la
-lib/glusterfs/3.2.5/xlator/features/quota.la
-lib/glusterfs/3.2.5/xlator/features/read-only.la
-lib/glusterfs/3.2.5/xlator/mgmt/glusterd.la
-lib/glusterfs/3.2.5/xlator/mount/fuse.la
-lib/glusterfs/3.2.5/xlator/nfs/server.la
-lib/glusterfs/3.2.5/xlator/performance/io-cache.la
-lib/glusterfs/3.2.5/xlator/performance/io-threads.la
-lib/glusterfs/3.2.5/xlator/performance/quick-read.la
-lib/glusterfs/3.2.5/xlator/performance/read-ahead.la
-lib/glusterfs/3.2.5/xlator/performance/stat-prefetch.la
-lib/glusterfs/3.2.5/xlator/performance/write-behind.la
-lib/glusterfs/3.2.5/xlator/protocol/client.la
-lib/glusterfs/3.2.5/xlator/protocol/server.la
-lib/glusterfs/3.2.5/xlator/storage/posix.la
-lib/glusterfs/3.2.5/xlator/system/posix-acl.la
-lib/glusterfs/3.2.5/xlator/testing/features/trash.la
-lib/glusterfs/3.2.5/xlator/testing/performance/symlink-cache.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
 man/man8/glusterfs.8
 man/man8/mount.glusterfs.8
 man/man8/gluster.8
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index 0af267f0bf2..8fb63cd71f6 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2011/12/16 05:40:46 manu Exp $
+$NetBSD: distinfo,v 1.24 2012/03/28 14:24:59 manu Exp $
 
-SHA1 (glusterfs-3.2.5.tar.gz) = 10f2e81ec7f118432c279236509fc3d89ab8f690
-RMD160 (glusterfs-3.2.5.tar.gz) = 13d0f8c1a2a1e7d39a43899bc9d09f7f13fea844
-Size (glusterfs-3.2.5.tar.gz) = 2413509 bytes
+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 (patch-aa) = bfd1dbcb6945dd387d88bd96616e4bc29c3e0628
 SHA1 (patch-ab) = d240bfd8bd8e5994f612a3387cd75f30bb91c8d7
 SHA1 (patch-ac) = 21d86775c2174ea630404a1a329dfd49c7f493d9
@@ -32,5 +32,4 @@ SHA1 (patch-bv) = 2c3b654e5858bf0948307ca6ae7048e276fca9ef
 SHA1 (patch-bw) = dca12eb81163fd1a0ada13165e990ddcb8fefbf2
 SHA1 (patch-bx) = b2aca473091bb64d14c6da046379d33ca8a5785e
 SHA1 (patch-ca) = 7b87f5b1a34eaa9a74f21bc40c794585817070ae
-SHA1 (patch-cc) = ed6b1fe1860514bfae944c74589d5c4bb8e78177
 SHA1 (patch-ce) = a1bfec3d057a27cefc4eb70d46a42202637d973f
diff --git a/filesystems/glusterfs/patches/patch-cc b/filesystems/glusterfs/patches/patch-cc
deleted file mode 100644
index 63e68337bde..00000000000
--- a/filesystems/glusterfs/patches/patch-cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2011/12/16 05:40:46 manu Exp $
-
-Fix from upstram: http://review.gluster.com/#change,784
-
---- xlators/protocol/client/src/client3_1-fops.c.orig	2011-11-14 14:46:02.000000000 +0100
-+++ xlators/protocol/client/src/client3_1-fops.c	2011-12-14 15:56:06.000000000 +0100
-@@ -3613,14 +3613,21 @@
-         ret = client_submit_vec_request (this, &req, frame, conf->fops, GFS3_OP_WRITE,
-                                          client3_1_writev_cbk,
-                                          args->vector, args->count,
-                                          args->iobref, xdr_from_writev_req);
--        if (ret)
--                goto unwind;
-+        if (ret) {
-+                /*
-+                 * If the lower layers fail to submit a request, they'll also
-+                 * do the unwind for us (see rpc_clnt_submit), so don't unwind
-+                 * here in such cases.
-+                 */
-+                gf_log (this->name, GF_LOG_WARNING,
-+                        "failed to send the fop: %s", strerror (op_errno));
-+        }
- 
-         return 0;
-+
- unwind:
--        gf_log (this->name, GF_LOG_WARNING, "failed to send the fop: %s", strerror (op_errno));
-         STACK_UNWIND_STRICT (writev, frame, -1, op_errno, NULL, NULL);
-         return 0;
- }
-