Update glusterfs to 3.4.1

Disable eager locks, which seem broken on NetBSD for glusterfs-3.4.x

9 files changed, 79 insertions, 153 deletions

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 3b07d3c24bd..0a4e8706863 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2013/09/08 03:38:52 manu Exp $
+# $NetBSD: Makefile,v 1.36 2013/10/01 00:30:26 manu Exp $
 #
 
-DISTNAME=	glusterfs-3.4.0
+DISTNAME=	glusterfs-3.4.1
 #PKGREVISION=	1
 CATEGORIES=	filesystems
-MASTER_SITES=	http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.0/
+MASTER_SITES=	http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.1/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gluster.org/
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index a4fb513175d..a9462c9ffb2 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,52 +1,52 @@
-@comment $NetBSD: PLIST,v 1.15 2013/09/08 03:38:52 manu Exp $
+@comment $NetBSD: PLIST,v 1.16 2013/10/01 00:30:26 manu Exp $
 etc/glusterfs/glusterd.vol.sample
 etc/glusterfs/glusterfs-logrotate
 include/glusterfs/api/glfs.h
-lib/glusterfs/3.4.0/auth/addr.la
-lib/glusterfs/3.4.0/auth/login.la
-lib/glusterfs/3.4.0/rpc-transport/socket.la
-lib/glusterfs/3.4.0/xlator/cluster/afr.la
-lib/glusterfs/3.4.0/xlator/cluster/dht.la
-lib/glusterfs/3.4.0/xlator/cluster/distribute.so
-lib/glusterfs/3.4.0/xlator/cluster/nufa.la
-lib/glusterfs/3.4.0/xlator/cluster/pump.la
-lib/glusterfs/3.4.0/xlator/cluster/replicate.so
-lib/glusterfs/3.4.0/xlator/cluster/stripe.la
-lib/glusterfs/3.4.0/xlator/cluster/switch.la
-lib/glusterfs/3.4.0/xlator/debug/error-gen.la
-lib/glusterfs/3.4.0/xlator/debug/io-stats.la
-lib/glusterfs/3.4.0/xlator/debug/trace.la
-lib/glusterfs/3.4.0/xlator/encryption/rot-13.la
-lib/glusterfs/3.4.0/xlator/features/access-control.so
-lib/glusterfs/3.4.0/xlator/features/index.la
-lib/glusterfs/3.4.0/xlator/features/locks.la
-lib/glusterfs/3.4.0/xlator/features/mac-compat.la
-lib/glusterfs/3.4.0/xlator/features/marker.la
-lib/glusterfs/3.4.0/xlator/features/posix-locks.so
-lib/glusterfs/3.4.0/xlator/features/quiesce.la
-lib/glusterfs/3.4.0/xlator/features/quota.la
-lib/glusterfs/3.4.0/xlator/features/read-only.la
-lib/glusterfs/3.4.0/xlator/features/worm.la
-lib/glusterfs/3.4.0/xlator/mgmt/glusterd.la
-lib/glusterfs/3.4.0/xlator/mount/api.a
-lib/glusterfs/3.4.0/xlator/mount/api.la
-lib/glusterfs/3.4.0/xlator/mount/fuse.la
-lib/glusterfs/3.4.0/xlator/nfs/server.la
-lib/glusterfs/3.4.0/xlator/performance/io-cache.la
-lib/glusterfs/3.4.0/xlator/performance/io-threads.la
-lib/glusterfs/3.4.0/xlator/performance/md-cache.la
-lib/glusterfs/3.4.0/xlator/performance/open-behind.a
-lib/glusterfs/3.4.0/xlator/performance/open-behind.la
-lib/glusterfs/3.4.0/xlator/performance/open-behind.so
-lib/glusterfs/3.4.0/xlator/performance/quick-read.la
-lib/glusterfs/3.4.0/xlator/performance/read-ahead.la
-lib/glusterfs/3.4.0/xlator/performance/stat-prefetch.so
-lib/glusterfs/3.4.0/xlator/performance/write-behind.la
-lib/glusterfs/3.4.0/xlator/protocol/client.la
-lib/glusterfs/3.4.0/xlator/protocol/server.la
-lib/glusterfs/3.4.0/xlator/storage/posix.la
-lib/glusterfs/3.4.0/xlator/system/posix-acl.la
-lib/glusterfs/3.4.0/xlator/testing/performance/symlink-cache.la
+lib/glusterfs/3.4.1/auth/addr.la
+lib/glusterfs/3.4.1/auth/login.la
+lib/glusterfs/3.4.1/rpc-transport/socket.la
+lib/glusterfs/3.4.1/xlator/cluster/afr.la
+lib/glusterfs/3.4.1/xlator/cluster/dht.la
+lib/glusterfs/3.4.1/xlator/cluster/distribute.so
+lib/glusterfs/3.4.1/xlator/cluster/nufa.la
+lib/glusterfs/3.4.1/xlator/cluster/pump.la
+lib/glusterfs/3.4.1/xlator/cluster/replicate.so
+lib/glusterfs/3.4.1/xlator/cluster/stripe.la
+lib/glusterfs/3.4.1/xlator/cluster/switch.la
+lib/glusterfs/3.4.1/xlator/debug/error-gen.la
+lib/glusterfs/3.4.1/xlator/debug/io-stats.la
+lib/glusterfs/3.4.1/xlator/debug/trace.la
+lib/glusterfs/3.4.1/xlator/encryption/rot-13.la
+lib/glusterfs/3.4.1/xlator/features/access-control.so
+lib/glusterfs/3.4.1/xlator/features/index.la
+lib/glusterfs/3.4.1/xlator/features/locks.la
+lib/glusterfs/3.4.1/xlator/features/mac-compat.la
+lib/glusterfs/3.4.1/xlator/features/marker.la
+lib/glusterfs/3.4.1/xlator/features/posix-locks.so
+lib/glusterfs/3.4.1/xlator/features/quiesce.la
+lib/glusterfs/3.4.1/xlator/features/quota.la
+lib/glusterfs/3.4.1/xlator/features/read-only.la
+lib/glusterfs/3.4.1/xlator/features/worm.la
+lib/glusterfs/3.4.1/xlator/mgmt/glusterd.la
+lib/glusterfs/3.4.1/xlator/mount/api.a
+lib/glusterfs/3.4.1/xlator/mount/api.la
+lib/glusterfs/3.4.1/xlator/mount/fuse.la
+lib/glusterfs/3.4.1/xlator/nfs/server.la
+lib/glusterfs/3.4.1/xlator/performance/io-cache.la
+lib/glusterfs/3.4.1/xlator/performance/io-threads.la
+lib/glusterfs/3.4.1/xlator/performance/md-cache.la
+lib/glusterfs/3.4.1/xlator/performance/open-behind.a
+lib/glusterfs/3.4.1/xlator/performance/open-behind.la
+lib/glusterfs/3.4.1/xlator/performance/open-behind.so
+lib/glusterfs/3.4.1/xlator/performance/quick-read.la
+lib/glusterfs/3.4.1/xlator/performance/read-ahead.la
+lib/glusterfs/3.4.1/xlator/performance/stat-prefetch.so
+lib/glusterfs/3.4.1/xlator/performance/write-behind.la
+lib/glusterfs/3.4.1/xlator/protocol/client.la
+lib/glusterfs/3.4.1/xlator/protocol/server.la
+lib/glusterfs/3.4.1/xlator/storage/posix.la
+lib/glusterfs/3.4.1/xlator/system/posix-acl.la
+lib/glusterfs/3.4.1/xlator/testing/performance/symlink-cache.la
 lib/libgfapi.a
 lib/libgfapi.la
 lib/libgfapi.so
diff --git a/filesystems/glusterfs/PLIST.georeplication b/filesystems/glusterfs/PLIST.georeplication
index 86d4f6e4c49..7665228268b 100644
--- a/filesystems/glusterfs/PLIST.georeplication
+++ b/filesystems/glusterfs/PLIST.georeplication
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.georeplication,v 1.5 2012/10/19 04:15:21 manu Exp $
+@comment $NetBSD: PLIST.georeplication,v 1.6 2013/10/01 00:30:26 manu Exp $
 libexec/glusterfs/python/syncdaemon/README.md
 libexec/glusterfs/python/syncdaemon/__init__.py
 libexec/glusterfs/python/syncdaemon/__init__.pyc
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index 234e90c3e1c..0673f68ae36 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.30 2013/09/17 21:10:32 joerg Exp $
+$NetBSD: distinfo,v 1.31 2013/10/01 00:30:26 manu Exp $
 
-SHA1 (glusterfs-3.4.0.tar.gz) = 8795bcb309730c173a226c8cb1e08587e56ea692
-RMD160 (glusterfs-3.4.0.tar.gz) = 15a290ad890541ec365134eb998e5f0ec48d3bbc
-Size (glusterfs-3.4.0.tar.gz) = 3774842 bytes
-SHA1 (patch-argp-standalone_argp-fmtstream.c) = 241873f41bb774e1de4f777227c38b0dcae4ac59
-SHA1 (patch-argp-standalone_argp-fmtstream.h) = 9f2ead2a11c35fcc6347977082fa347343fccab2
-SHA1 (patch-libglusterfs_src_glusterfs.h) = 59a0523652628ed24641d63a926f5e33b33bc802
-SHA1 (patch-xlators_mount_fuse_src_fuse-helpers.c) = a770d557191c91a731da15e95caf5acd7ed567ff
+SHA1 (glusterfs-3.4.1.tar.gz) = 3c940cc864abd5402f0f70197085cb17212fc9cb
+RMD160 (glusterfs-3.4.1.tar.gz) = cb05c769eaaa72cf7f79c9dd7580d5a40c850fe7
+Size (glusterfs-3.4.1.tar.gz) = 3811931 bytes
+SHA1 (patch-cg) = ebb691ddaa56bd8368cc9a0458a8caeec64d2b8e
diff --git a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c
deleted file mode 100644
index efbbb5ba47e..00000000000
--- a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-argp-standalone_argp-fmtstream.c,v 1.3 2013/09/15 12:29:21 joerg Exp $
-
---- argp-standalone/argp-fmtstream.c.orig	2013-07-12 17:43:25.000000000 +0000
-+++ argp-standalone/argp-fmtstream.c
-@@ -389,6 +389,7 @@ __argp_fmtstream_printf (struct argp_fmt
- weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
- #endif
- 
-+#if __STDC_VERSION__ - 199900L < 1
- /* Duplicate the inline definitions in argp-fmtstream.h, for compilers
-  * that don't do inlining. */
- size_t
-@@ -471,5 +472,6 @@ __argp_fmtstream_point (argp_fmtstream_t
-     __argp_fmtstream_update (__fs);
-   return __fs->point_col >= 0 ? __fs->point_col : 0;
- }
-+#endif
- 
- #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
diff --git a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h b/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h
deleted file mode 100644
index 0dd18b6104a..00000000000
--- a/filesystems/glusterfs/patches/patch-argp-standalone_argp-fmtstream.h
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-argp-standalone_argp-fmtstream.h,v 1.3 2013/09/15 12:29:21 joerg Exp $
-
---- argp-standalone/argp-fmtstream.h.orig	2013-07-12 17:43:25.000000000 +0000
-+++ argp-standalone/argp-fmtstream.h
-@@ -153,6 +153,7 @@ extern ssize_t argp_fmtstream_printf (ar
- 				      __const char *__fmt, ...)
-      PRINTF_STYLE(2,3);
- 
-+#if 0
- extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
- extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
- 
-@@ -163,6 +164,7 @@ extern size_t __argp_fmtstream_write (ar
- 				      __const char *__str, size_t __len);
- extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
- 				    __const char *__str, size_t __len);
-+#endif
- 
- /* Access macros for various bits of state.  */
- #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
-@@ -172,6 +174,7 @@ extern size_t argp_fmtstream_write (argp
- #define __argp_fmtstream_rmargin argp_fmtstream_rmargin
- #define __argp_fmtstream_wmargin argp_fmtstream_wmargin
- 
-+#if 0
- /* Set __FS's left margin to LMARGIN and return the old value.  */
- extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
- 					  size_t __lmargin);
-@@ -193,6 +196,7 @@ extern size_t __argp_fmtstream_set_wmarg
- /* Return the column number of the current output point in __FS.  */
- extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
- extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
-+#endif
- 
- /* Internal routines.  */
- extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
-@@ -216,7 +220,11 @@ extern int __argp_fmtstream_ensure (argp
- #endif
- 
- #ifndef ARGP_FS_EI
-+#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
- #define ARGP_FS_EI extern inline
-+#else
-+#define ARGP_FS_EI inline
-+#endif
- #endif
- 
- ARGP_FS_EI size_t
diff --git a/filesystems/glusterfs/patches/patch-cg b/filesystems/glusterfs/patches/patch-cg
new file mode 100644
index 00000000000..f77e7b8343e
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-cg
@@ -0,0 +1,24 @@
+$NetBSD: patch-cg,v 1.1 2013/10/01 00:30:26 manu Exp $
+
+--- xlators/cluster/afr/src/afr.c.orig	2013-09-30 16:51:57.000000000 +0200
++++ xlators/cluster/afr/src/afr.c	2013-09-30 17:23:03.000000000 +0200
+@@ -673,9 +675,19 @@
+           .description = "Enabling this option logs entry lock/unlocks"
+         },
+         { .key = {"eager-lock"},
+           .type = GF_OPTION_TYPE_BOOL,
++#ifdef __NetBSD__
++	/*
++	 * eager-locks are broken on NetBSD, and cause spurious
++	 * split brain with all NULL pending matrix, as described
++	 * in https://bugzilla.redhat.com/show_bug.cgi?id=1005526
++	 * We therefore disable them for now
++	 */
++          .default_value = "off",
++#else
+           .default_value = "on",
++#endif
+           .description = "Lock phase of a transaction has two sub-phases. "
+                          "First is an attempt to acquire locks in parallel by "
+                          "broadcasting non-blocking lock requests. If lock "
+                          "aquistion fails on any server, then the held locks "
diff --git a/filesystems/glusterfs/patches/patch-libglusterfs_src_glusterfs.h b/filesystems/glusterfs/patches/patch-libglusterfs_src_glusterfs.h
deleted file mode 100644
index 8a3da27b84c..00000000000
--- a/filesystems/glusterfs/patches/patch-libglusterfs_src_glusterfs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-libglusterfs_src_glusterfs.h,v 1.1 2013/09/08 03:38:52 manu Exp $
---- libglusterfs/src/glusterfs.h.orig	2013-07-18 04:31:33.000000000 +0200
-+++ libglusterfs/src/glusterfs.h	2013-07-18 04:32:59.000000000 +0200
-@@ -31,8 +31,9 @@
- #include <fcntl.h>
- #include <arpa/inet.h>
- #include <sys/poll.h>
- #include <pthread.h>
-+#include <limits.h> /* For PATH_MAX */
- 
- #include "list.h"
- #include "logging.h"
- #include "lkowner.h"
diff --git a/filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-helpers.c b/filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-helpers.c
deleted file mode 100644
index cd041b1b2fc..00000000000
--- a/filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-helpers.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-xlators_mount_fuse_src_fuse-helpers.c,v 1.1 2013/09/17 21:10:32 joerg Exp $
-
---- xlators/mount/fuse/src/fuse-helpers.c.orig	2013-09-17 13:41:20.000000000 +0000
-+++ xlators/mount/fuse/src/fuse-helpers.c
-@@ -7,6 +7,10 @@
-    later), or the GNU General Public License, version 2 (GPLv2), in all
-    cases as published by the Free Software Foundation.
- */
-+#ifdef __NetBSD__
-+#define _KMEMUSER
-+#endif
-+
- #include "fuse-bridge.h"
- #if defined(GF_SOLARIS_HOST_OS)
- #include <sys/procfs.h>