Update to glusterfs 3.2.2 (maintenance release for bug fixes)

34 files changed, 183 insertions, 233 deletions

diff --git a/filesystems/glusterfs/MESSAGE.NetBSD b/filesystems/glusterfs/MESSAGE.NetBSD
index e200aface0b..19b9d241f74 100644
--- a/filesystems/glusterfs/MESSAGE.NetBSD
+++ b/filesystems/glusterfs/MESSAGE.NetBSD
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.8 2011/07/19 07:54:30 manu Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.9 2011/07/23 01:14:43 manu Exp $
 
 In order to use mount -t glusterfs, please install this link
 	ln -s ${PREFIX}/sbin/mount.glusterfs /sbin/mount_glusterfs
diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 51e5d1f37e8..765e3993597 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.13 2011/07/19 07:54:31 manu Exp $
+# $NetBSD: Makefile,v 1.14 2011/07/23 01:14:43 manu Exp $
 #
 
-DISTNAME=	glusterfs-3.2.1
-PKGREVISION=	2
+DISTNAME=	glusterfs-3.2.2
+#PKGREVISION=	1
 CATEGORIES=	filesystems
-MASTER_SITES=	http://download.gluster.com/pub/gluster/glusterfs/3.2/3.2.1/
+MASTER_SITES=	http://download.gluster.com/pub/gluster/glusterfs/3.2/3.2.2/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gluster.org/
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index 3553a51453c..cdfaff594b5 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,88 +1,50 @@
-@comment $NetBSD: PLIST,v 1.6 2011/07/19 07:54:31 manu Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/07/23 01:14:43 manu Exp $
 etc/glusterfs/xattr-init.sh
 etc/glusterfs/glusterfs.vol.sample
 etc/glusterfs/glusterfsd.vol.sample
 etc/glusterfs/glusterd.vol.sample
 etc/glusterfs/xattr-init.sh
-lib/libglusterfs.so.0.0.0
 lib/libglusterfs.la
-lib/libglusterfs.a
-lib/libgfrpc.so.0.0.0
 lib/libgfrpc.la
-lib/glusterfs/3.2.1/rpc-transport/socket.so.0.0.0
-lib/glusterfs/3.2.1/rpc-transport/socket.la
-lib/glusterfs/3.2.1/xlator/cluster/distribute.so
-lib/glusterfs/3.2.1/xlator/cluster/replicate.so
-lib/glusterfs/3.2.1/xlator/features/posix-locks.so
-lib/glusterfs/3.2.1/xlator/cluster/stripe.so.0.0.0
-lib/glusterfs/3.2.1/xlator/cluster/stripe.la
-lib/glusterfs/3.2.1/xlator/cluster/afr.so.0.0.0
-lib/glusterfs/3.2.1/xlator/cluster/afr.la
-lib/glusterfs/3.2.1/xlator/cluster/pump.so.0.0.0
-lib/glusterfs/3.2.1/xlator/cluster/pump.la
-lib/glusterfs/3.2.1/xlator/cluster/dht.so.0.0.0
-lib/glusterfs/3.2.1/xlator/cluster/dht.la
-lib/glusterfs/3.2.1/xlator/cluster/nufa.so.0.0.0
-lib/glusterfs/3.2.1/xlator/cluster/nufa.la
-lib/glusterfs/3.2.1/xlator/cluster/switch.so.0.0.0
-lib/glusterfs/3.2.1/xlator/cluster/switch.la
-lib/glusterfs/3.2.1/xlator/storage/posix.so.0.0.0
-lib/glusterfs/3.2.1/xlator/storage/posix.la
-lib/glusterfs/3.2.1/xlator/protocol/client.so.0.0.0
-lib/glusterfs/3.2.1/xlator/protocol/client.la
-lib/glusterfs/3.2.1/xlator/protocol/server.so.0.0.0
-lib/glusterfs/3.2.1/xlator/protocol/server.la
-lib/glusterfs/3.2.1/xlator/performance/write-behind.so.0.0.0
-lib/glusterfs/3.2.1/xlator/performance/write-behind.la
-lib/glusterfs/3.2.1/xlator/performance/read-ahead.so.0.0.0
-lib/glusterfs/3.2.1/xlator/performance/read-ahead.la
-lib/glusterfs/3.2.1/xlator/performance/io-threads.so.0.0.0
-lib/glusterfs/3.2.1/xlator/performance/io-threads.la
-lib/glusterfs/3.2.1/xlator/performance/io-cache.so.0.0.0
-lib/glusterfs/3.2.1/xlator/performance/io-cache.la
-lib/glusterfs/3.2.1/xlator/performance/quick-read.so.0.0.0
-lib/glusterfs/3.2.1/xlator/performance/quick-read.la
-lib/glusterfs/3.2.1/xlator/performance/stat-prefetch.so.0.0.0
-lib/glusterfs/3.2.1/xlator/performance/stat-prefetch.la
-lib/glusterfs/3.2.1/xlator/testing/performance/symlink-cache.so.0.0.0
-lib/glusterfs/3.2.1/xlator/testing/performance/symlink-cache.la
-lib/glusterfs/3.2.1/xlator/testing/features/trash.so.0.0.0
-lib/glusterfs/3.2.1/xlator/testing/features/trash.la
-lib/glusterfs/3.2.1/xlator/debug/trace.so.0.0.0
-lib/glusterfs/3.2.1/xlator/debug/trace.la
-lib/glusterfs/3.2.1/xlator/debug/error-gen.so.0.0.0
-lib/glusterfs/3.2.1/xlator/debug/error-gen.la
-lib/glusterfs/3.2.1/xlator/debug/io-stats.so.0.0.0
-lib/glusterfs/3.2.1/xlator/debug/io-stats.la
-lib/glusterfs/3.2.1/xlator/features/locks.so.0.0.0
-lib/glusterfs/3.2.1/xlator/features/locks.la
-lib/glusterfs/3.2.1/xlator/features/quota.so.0.0.0
-lib/glusterfs/3.2.1/xlator/features/quota.la
-lib/glusterfs/3.2.1/xlator/features/read-only.so.0.0.0
-lib/glusterfs/3.2.1/xlator/features/read-only.la
-lib/glusterfs/3.2.1/xlator/features/access-control.so.0.0.0
-lib/glusterfs/3.2.1/xlator/features/access-control.la
-lib/glusterfs/3.2.1/xlator/features/mac-compat.so.0.0.0
-lib/glusterfs/3.2.1/xlator/features/mac-compat.la
-lib/glusterfs/3.2.1/xlator/features/quiesce.so.0.0.0
-lib/glusterfs/3.2.1/xlator/features/quiesce.la
-lib/glusterfs/3.2.1/xlator/features/marker.so.0.0.0
-lib/glusterfs/3.2.1/xlator/features/marker.la
-lib/glusterfs/3.2.1/xlator/encryption/rot-13.so.0.0.0
-lib/glusterfs/3.2.1/xlator/encryption/rot-13.la
-lib/glusterfs/3.2.1/xlator/mount/fuse.so.0.0.0
-lib/glusterfs/3.2.1/xlator/mount/fuse.la
-lib/glusterfs/3.2.1/xlator/nfs/server.so.0.0.0
-lib/glusterfs/3.2.1/xlator/nfs/server.la
-lib/glusterfs/3.2.1/xlator/mgmt/glusterd.so.0.0.0
-lib/glusterfs/3.2.1/xlator/mgmt/glusterd.la
-lib/glusterfs/3.2.1/auth/addr.so.0.0.0
-lib/glusterfs/3.2.1/auth/addr.la
-lib/glusterfs/3.2.1/auth/login.so.0.0.0
-lib/glusterfs/3.2.1/auth/login.la
-lib/libgfxdr.so.0.0.0
 lib/libgfxdr.la
-lib/libgfxdr.a
+lib/glusterfs/3.2.2/auth/addr.la
+lib/glusterfs/3.2.2/auth/login.la
+lib/glusterfs/3.2.2/rpc-transport/socket.la
+lib/glusterfs/3.2.2/xlator/cluster/afr.la
+lib/glusterfs/3.2.2/xlator/cluster/dht.la
+lib/glusterfs/3.2.2/xlator/cluster/distribute.so
+lib/glusterfs/3.2.2/xlator/cluster/nufa.la
+lib/glusterfs/3.2.2/xlator/cluster/pump.la
+lib/glusterfs/3.2.2/xlator/cluster/replicate.so
+lib/glusterfs/3.2.2/xlator/cluster/stripe.la
+lib/glusterfs/3.2.2/xlator/cluster/switch.la
+lib/glusterfs/3.2.2/xlator/debug/error-gen.la
+lib/glusterfs/3.2.2/xlator/debug/io-stats.la
+lib/glusterfs/3.2.2/xlator/debug/trace.la
+lib/glusterfs/3.2.2/xlator/encryption/rot-13.la
+lib/glusterfs/3.2.2/xlator/features/access-control.so
+lib/glusterfs/3.2.2/xlator/features/locks.la
+lib/glusterfs/3.2.2/xlator/features/mac-compat.la
+lib/glusterfs/3.2.2/xlator/features/marker.la
+lib/glusterfs/3.2.2/xlator/features/posix-locks.so
+lib/glusterfs/3.2.2/xlator/features/quiesce.la
+lib/glusterfs/3.2.2/xlator/features/quota.la
+lib/glusterfs/3.2.2/xlator/features/read-only.la
+lib/glusterfs/3.2.2/xlator/mgmt/glusterd.la
+lib/glusterfs/3.2.2/xlator/mount/fuse.la
+lib/glusterfs/3.2.2/xlator/nfs/server.la
+lib/glusterfs/3.2.2/xlator/performance/io-cache.la
+lib/glusterfs/3.2.2/xlator/performance/io-threads.la
+lib/glusterfs/3.2.2/xlator/performance/quick-read.la
+lib/glusterfs/3.2.2/xlator/performance/read-ahead.la
+lib/glusterfs/3.2.2/xlator/performance/stat-prefetch.la
+lib/glusterfs/3.2.2/xlator/performance/write-behind.la
+lib/glusterfs/3.2.2/xlator/protocol/client.la
+lib/glusterfs/3.2.2/xlator/protocol/server.la
+lib/glusterfs/3.2.2/xlator/storage/posix.la
+lib/glusterfs/3.2.2/xlator/system/posix-acl.la
+lib/glusterfs/3.2.2/xlator/testing/features/trash.la
+lib/glusterfs/3.2.2/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 150f876be44..5befc9f6a69 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,32 +1,32 @@
-$NetBSD: distinfo,v 1.8 2011/07/19 07:54:31 manu Exp $
+$NetBSD: distinfo,v 1.9 2011/07/23 01:14:43 manu Exp $
 
-SHA1 (glusterfs-3.2.1.tar.gz) = 41719aa09593d9c32d8298022acadf74d8895b58
-RMD160 (glusterfs-3.2.1.tar.gz) = 877667fb852617b38c18d01c040e311cd6f55e49
-Size (glusterfs-3.2.1.tar.gz) = 2339056 bytes
-SHA1 (patch-aa) = 0975321d76f7f3d1675989b3e7ebbbd10fa37914
-SHA1 (patch-ab) = 50ebee4f7ba34ef260bccada8f99cbed286f834c
-SHA1 (patch-ac) = c8ed15790eaa9aa72b61096eadb823a88271e94e
-SHA1 (patch-ae) = 2ce22194e5841227d38da90aacd9a6780ae5b24c
-SHA1 (patch-af) = b9772f2a91c4d3d94695218e9889d7cd39c1acbf
-SHA1 (patch-an) = d5452531c252c0fc54239fc6bb26ed63222e2ee7
-SHA1 (patch-ao) = 48248ed7eff63d0528f285a271b824346d0874df
-SHA1 (patch-ar) = a5a18baa88fda145795d0b6f85ba86014e2128f7
-SHA1 (patch-as) = 54f6ea0ee4208cd29052084efeb928618936c7d1
-SHA1 (patch-ax) = bc33548df9f66edefe324871c62108252b0a29c6
-SHA1 (patch-ba) = e53d4b833f7b26eaa474a339e5962a251ecacd49
-SHA1 (patch-bb) = f6f39469eef53cbd3ef2cb81e124d4c8ead94f36
-SHA1 (patch-bc) = e9323641ed748cbe0ef6cb8912ab76dc5508cc80
-SHA1 (patch-be) = 9178d3f8422bb4e1c06b0bf468b4d857924a2394
-SHA1 (patch-bf) = e4ce30b127d0a32ca168723f09fc7689f2e318da
-SHA1 (patch-bh) = befda4dc6d049cf6759aa9147e124900b3962c73
-SHA1 (patch-bj) = 508dbb651cfe0f284f50490b52cca6aae194da59
-SHA1 (patch-bk) = 7ecaa91aac8ae936600078c41e963ff600613bd5
-SHA1 (patch-bl) = 11565e61240985be475ae54baeb8e58cd736132c
-SHA1 (patch-bm) = 71156d3bd9dcc02b09db022ee20852f4b52e7306
-SHA1 (patch-bn) = d806dc6319568279d79fcc7b14fddd76771aa210
-SHA1 (patch-bo) = 3c564fc3854847d26e512ded60082715745a0b1c
-SHA1 (patch-bp) = 28363fc5468ef0bc930fe2551a78bed818ec2585
-SHA1 (patch-bq) = 717d0a01f96c8eac0e4cbc31b294fbfdb3cc3fcf
-SHA1 (patch-br) = 5781be44be29b6dbda01983f6c9b5338bf07210e
-SHA1 (patch-bs) = 49300630717279bc88077afbe78fad6c8628e63b
-SHA1 (patch-bt) = e566da60cf0a88c82ec61e5b2efb08dbafe20cb4
+SHA1 (glusterfs-3.2.2.tar.gz) = 6eb800edf49f99270490bff5e71078131efe4704
+RMD160 (glusterfs-3.2.2.tar.gz) = 35fc13580136ef702c8a3bebd3521822c7c24020
+Size (glusterfs-3.2.2.tar.gz) = 2341561 bytes
+SHA1 (patch-aa) = d8a47d655866d766f39b567b03dd137a1c84b093
+SHA1 (patch-ab) = a0ea407cd7a6ef45669fe42fcfd5cd6310625193
+SHA1 (patch-ac) = fc73cc2605baf0d85a00e3127e2fbd1985a3e47d
+SHA1 (patch-ae) = dfb3410ca20858955bc4ecf31046753690021e91
+SHA1 (patch-af) = 190862a357dcb584e18b8225a6969879319e6a34
+SHA1 (patch-an) = 2122bce6e6c87d5d805c658cda76a324d9e4e430
+SHA1 (patch-ao) = 4e606e0b98e23725d8a462aac6cf36a2642d8abf
+SHA1 (patch-ar) = 60294ccb85e6c94d75c947287ff4d1a8ed723132
+SHA1 (patch-as) = 1aa447fa12baafe8e737337e969090fe3c0b8bee
+SHA1 (patch-ax) = fdeecce5e1de7816d490cde7bfd284e0a2c63b76
+SHA1 (patch-ba) = 7e29d565083da2a8889687a2aa0145504d473d01
+SHA1 (patch-bb) = 004b3a75a25bcb51cb72e5bbb7ad4f8e5acb5ba8
+SHA1 (patch-bc) = eac0cf4a9ce6c6071d54d423f4407c77841794f5
+SHA1 (patch-be) = 72fd161c97ac384b93411e120c4f4b798e45d975
+SHA1 (patch-bf) = 2cc789497c6c48dbdb1b8e5481ef4c762dc2aac4
+SHA1 (patch-bh) = 80f36614f8b616c3551cc2a70a5355d347ada755
+SHA1 (patch-bj) = 45ff9aa609e0795edae7185485bf74a3f301de8f
+SHA1 (patch-bk) = f5d346a2b1c8632b15008eda3227e5eba5ca71f5
+SHA1 (patch-bl) = c13fbbf16b86291b860fcab389319e67399d360b
+SHA1 (patch-bm) = dea299751eebe17eecfcc1fc9ca66ccdc7513d1d
+SHA1 (patch-bn) = 81860049e6c3effc797ab84c222b53091406323c
+SHA1 (patch-bo) = 23a6858e97fb2f3ad82a0bf3d03a90adf884b5b2
+SHA1 (patch-bp) = 1e22539ff37ff3fdf90b15151b88139eb67d5f1c
+SHA1 (patch-bq) = 4c3a174473ba15f510389ffa135bcbb68ee4c2bc
+SHA1 (patch-br) = cab5604eeab953440a12fa0f27b4f69ddb75af06
+SHA1 (patch-bs) = 3946d339e86c9d575a6f39880644cf8115f5f145
+SHA1 (patch-bt) = a0b4573dde307086caa6688d53cbfe9d81b2d910
diff --git a/filesystems/glusterfs/files/glusterd.sh b/filesystems/glusterfs/files/glusterd.sh
index f69fc6d6442..1c542cf0a0c 100755
--- a/filesystems/glusterfs/files/glusterd.sh
+++ b/filesystems/glusterfs/files/glusterd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: glusterd.sh,v 1.5 2011/07/19 07:54:31 manu Exp $
+# $NetBSD: glusterd.sh,v 1.6 2011/07/23 01:14:44 manu Exp $
 #
 
 # PROVIDE: glusterd
diff --git a/filesystems/glusterfs/files/glusterfsd.sh b/filesystems/glusterfs/files/glusterfsd.sh
index 1ca7d087021..f21a8f330e0 100755
--- a/filesystems/glusterfs/files/glusterfsd.sh
+++ b/filesystems/glusterfs/files/glusterfsd.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: glusterfsd.sh,v 1.5 2011/07/19 07:54:31 manu Exp $
+# $NetBSD: glusterfsd.sh,v 1.6 2011/07/23 01:14:44 manu Exp $
 #
 
 # PROVIDE: glusterfsd
diff --git a/filesystems/glusterfs/files/xattr-init.sh b/filesystems/glusterfs/files/xattr-init.sh
index e090c67915a..33b5fa58216 100755
--- a/filesystems/glusterfs/files/xattr-init.sh
+++ b/filesystems/glusterfs/files/xattr-init.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# $NetBSD: xattr-init.sh,v 1.6 2011/07/19 07:54:31 manu Exp $
+# $NetBSD: xattr-init.sh,v 1.7 2011/07/23 01:14:44 manu Exp $
 
 GLUSTERFS_XATTR="
   trusted.distribute.linkinfo
diff --git a/filesystems/glusterfs/patches/patch-aa b/filesystems/glusterfs/patches/patch-aa
index a27d485e4a0..1c0a9875ca7 100644
--- a/filesystems/glusterfs/patches/patch-aa
+++ b/filesystems/glusterfs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-aa,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 The == operator is a non-standard bash extension. = should be used instead
---- xlators/mount/fuse/utils/mount_glusterfs.in.orig	2011-04-22 19:37:28.000000000 +0200
-+++ xlators/mount/fuse/utils/mount_glusterfs.in	2011-05-19 12:31:23.000000000 +0200
+--- xlators/mount/fuse/utils/mount_glusterfs.in.orig	2011-07-22 08:57:20.000000000 +0200
++++ xlators/mount/fuse/utils/mount_glusterfs.in	2011-07-22 08:57:29.000000000 +0200
 @@ -164,9 +164,9 @@
      }
  
diff --git a/filesystems/glusterfs/patches/patch-ab b/filesystems/glusterfs/patches/patch-ab
index 61cc7b45227..70690bca022 100644
--- a/filesystems/glusterfs/patches/patch-ab
+++ b/filesystems/glusterfs/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-ab,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 NetBSD does not have AI_ADDRCONFIG. This patch has a side effect: glusterfsd
 listens on IPv6 adresses only by default. Option transport.socket.bind-address 
 in volume server-tcp must be used to listen on an IPv4 address.
 
---- rpc/rpc-lib/src/rpc-transport.h.orig	2011-04-22 19:37:28.000000000 +0200
-+++ rpc/rpc-lib/src/rpc-transport.h	2011-05-19 12:31:33.000000000 +0200
+--- rpc/rpc-lib/src/rpc-transport.h.orig	2011-07-14 14:21:10.000000000 +0200
++++ rpc/rpc-lib/src/rpc-transport.h	2011-07-22 08:58:11.000000000 +0200
 @@ -39,8 +39,12 @@
  #ifndef MAX_IOVEC
  #define MAX_IOVEC 16
@@ -19,8 +19,8 @@ in volume server-tcp must be used to listen on an IPv4 address.
   * is the last fragment for the RPC record being assemebled.
   * RPC Record marking standard defines a 32 bit value as the fragment
   * header with the MSB signifying whether the fragment is the last
---- xlators/nfs/lib/src/rpc-socket.c.orig	2011-04-22 19:37:28.000000000 +0200
-+++ xlators/nfs/lib/src/rpc-socket.c	2011-05-19 12:31:33.000000000 +0200
+--- xlators/nfs/lib/src/rpc-socket.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ xlators/nfs/lib/src/rpc-socket.c	2011-07-22 08:58:11.000000000 +0200
 @@ -36,8 +36,12 @@
  #include <netdb.h>
  #include <netinet/in.h>
@@ -34,8 +34,8 @@ in volume server-tcp must be used to listen on an IPv4 address.
  nfs_rpcsvc_socket_server_get_local_socket (int addrfam, char *listenhost,
                                             uint16_t listenport,
                                             struct sockaddr *addr,
---- libglusterfs/src/common-utils.c.orig	2011-05-19 14:59:16.000000000 +0200
-+++ libglusterfs/src/common-utils.c	2011-05-19 15:00:05.000000000 +0200
+--- libglusterfs/src/common-utils.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ libglusterfs/src/common-utils.c	2011-07-22 08:58:11.000000000 +0200
 @@ -48,8 +48,12 @@
  #include "stack.h"
  #include "globals.h"
diff --git a/filesystems/glusterfs/patches/patch-ac b/filesystems/glusterfs/patches/patch-ac
index be2458ae75a..bf8e833fdf7 100644
--- a/filesystems/glusterfs/patches/patch-ac
+++ b/filesystems/glusterfs/patches/patch-ac
@@ -1,6 +1,7 @@
+$NetBSD: patch-ac,v 1.3 2011/07/23 01:14:44 manu Exp $
 NetBSD does not have EDOOFUS
---- libglusterfs/src/compat-errno.c.orig	2011-04-22 19:37:28.000000000 +0200
-+++ libglusterfs/src/compat-errno.c	2011-05-19 15:04:01.000000000 +0200
+--- libglusterfs/src/compat-errno.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ libglusterfs/src/compat-errno.c	2011-07-22 08:58:37.000000000 +0200
 @@ -857,11 +857,13 @@
          /*      ENOATTR         87              / * Attribute not found */
          gf_error_to_errno_array[GF_ERROR_CODE_NOATTR] = ENOATTR;
diff --git a/filesystems/glusterfs/patches/patch-ae b/filesystems/glusterfs/patches/patch-ae
index 2df25651414..987d6f2821e 100644
--- a/filesystems/glusterfs/patches/patch-ae
+++ b/filesystems/glusterfs/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-ae,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 On NetBSD use libperfuse(3), rename umount2(2) as unmount(2), and skip
 inexistant /etc/mtab management.
---- contrib/fuse-lib/mount.c.orig	2011-04-22 19:37:28.000000000 +0200
-+++ contrib/fuse-lib/mount.c	2011-05-19 12:32:47.000000000 +0200
+--- contrib/fuse-lib/mount.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ contrib/fuse-lib/mount.c	2011-07-22 08:59:10.000000000 +0200
 @@ -19,16 +19,23 @@
  #include <limits.h>
  #include <fcntl.h>
diff --git a/filesystems/glusterfs/patches/patch-af b/filesystems/glusterfs/patches/patch-af
index 13ecdf5363d..eb2fe2781b7 100644
--- a/filesystems/glusterfs/patches/patch-af
+++ b/filesystems/glusterfs/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-af,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 Works around "error: 'TCP_KEEPALIVE' undeclared" on NetBSD
---- rpc/rpc-transport/socket/src/socket.c.orig	2011-04-22 19:37:28.000000000 +0200
-+++ rpc/rpc-transport/socket/src/socket.c	2011-05-19 12:32:50.000000000 +0200
+--- rpc/rpc-transport/socket/src/socket.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ rpc/rpc-transport/socket/src/socket.c	2011-07-22 08:59:33.000000000 +0200
 @@ -397,9 +397,9 @@
  
          if (keepalive_intvl == GF_USE_DEFAULT_KEEPALIVE)
diff --git a/filesystems/glusterfs/patches/patch-an b/filesystems/glusterfs/patches/patch-an
index feb4fc4f61c..3b59667ca24 100644
--- a/filesystems/glusterfs/patches/patch-an
+++ b/filesystems/glusterfs/patches/patch-an
@@ -1,10 +1,10 @@
-$NetBSD: patch-an,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-an,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 NetBSD uses libperfuse(3). Also enable debugging (-g) for now,
 and let it build georeplication.
---- configure.ac.orig	2011-06-10 18:59:08.000000000 +0200
-+++ configure.ac	2011-07-18 15:17:46.000000000 +0200
-@@ -290,8 +290,11 @@
+--- configure.ac.orig	2011-07-14 14:21:10.000000000 +0200
++++ configure.ac	2011-07-22 08:59:39.000000000 +0200
+@@ -291,8 +291,11 @@
  case $host_os in
       linux*)
  #do nothing
@@ -16,7 +16,7 @@ and let it build georeplication.
  #disabling geo replication for non-linux platforms
  	enable_georeplication=no
          ;;
-@@ -413,8 +416,19 @@
+@@ -414,8 +417,19 @@
  	GF_GLUSTERFS_LDFLAGS="-lnsl -lresolv -lsocket"
          BUILD_FUSE_CLIENT=no
          FUSE_CLIENT_SUBDIR=""
@@ -36,7 +36,7 @@ and let it build georeplication.
          GF_HOST_OS="GF_BSD_HOST_OS"
  	GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0"
  	GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
-@@ -449,8 +463,9 @@
+@@ -450,8 +464,9 @@
  AC_SUBST(GF_GLUSTERFS_CFLAGS)
  AC_SUBST(GF_CFLAGS)
  AC_SUBST(GF_LDFLAGS)
diff --git a/filesystems/glusterfs/patches/patch-ao b/filesystems/glusterfs/patches/patch-ao
index c3aad6d6603..0807055aba8 100644
--- a/filesystems/glusterfs/patches/patch-ao
+++ b/filesystems/glusterfs/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-ao,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 NetBSD uses libperfuse(3). Also enable debugging (-g) for now,
 and let it build georeplication
---- configure.orig	2011-06-10 18:59:14.000000000 +0200
-+++ configure	2011-07-18 15:18:08.000000000 +0200
+--- configure.orig	2011-07-14 14:21:15.000000000 +0200
++++ configure	2011-07-22 08:59:47.000000000 +0200
 @@ -464,9 +464,9 @@
  # include <unistd.h>
  #endif"
@@ -47,7 +47,7 @@ and let it build georeplication
          GF_HOST_OS="GF_BSD_HOST_OS"
  	GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0"
  	GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
-@@ -22853,8 +22867,9 @@
+@@ -22854,8 +22868,9 @@
  s,@GF_GLUSTERFS_CFLAGS@,$GF_GLUSTERFS_CFLAGS,;t t
  s,@GF_CFLAGS@,$GF_CFLAGS,;t t
  s,@GF_LDFLAGS@,$GF_LDFLAGS,;t t
diff --git a/filesystems/glusterfs/patches/patch-ar b/filesystems/glusterfs/patches/patch-ar
index 012a324ba5d..479d38a23bc 100644
--- a/filesystems/glusterfs/patches/patch-ar
+++ b/filesystems/glusterfs/patches/patch-ar
@@ -1,9 +1,9 @@
-$NetBSD: patch-ar,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-ar,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 Add @GF_FUSE_LDADD@ to fuse.so library dependecies so that -lperfuse is
 added at configure time for NetBSD.
---- xlators/mount/fuse/src/Makefile.am.orig	2011-04-22 19:37:28.000000000 +0200
-+++ xlators/mount/fuse/src/Makefile.am	2011-05-19 12:39:16.000000000 +0200
+--- xlators/mount/fuse/src/Makefile.am.orig	2011-07-14 14:21:10.000000000 +0200
++++ xlators/mount/fuse/src/Makefile.am	2011-07-22 08:59:56.000000000 +0200
 @@ -15,8 +15,9 @@
  fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \
  	$(CONTRIBDIR)/fuse-lib/misc.c $(mount_source)
diff --git a/filesystems/glusterfs/patches/patch-as b/filesystems/glusterfs/patches/patch-as
index c85698db591..98ffd3af5c8 100644
--- a/filesystems/glusterfs/patches/patch-as
+++ b/filesystems/glusterfs/patches/patch-as
@@ -1,9 +1,9 @@
-$NetBSD: patch-as,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-as,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 Add @GF_FUSE_LDADD@ to fuse.so library dependecies so that -lperfuse is
 added at configure time for NetBSD.
---- xlators/mount/fuse/src/Makefile.in.orig	2011-04-22 19:37:40.000000000 +0200
-+++ xlators/mount/fuse/src/Makefile.in	2011-05-19 12:39:21.000000000 +0200
+--- xlators/mount/fuse/src/Makefile.in.orig	2011-07-14 14:21:24.000000000 +0200
++++ xlators/mount/fuse/src/Makefile.in	2011-07-22 09:00:00.000000000 +0200
 @@ -55,9 +55,9 @@
  am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
  am__installdirs = "$(DESTDIR)$(xlatordir)"
diff --git a/filesystems/glusterfs/patches/patch-ax b/filesystems/glusterfs/patches/patch-ax
index cbeb6c41111..124cc7f2c81 100644
--- a/filesystems/glusterfs/patches/patch-ax
+++ b/filesystems/glusterfs/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.4 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-ax,v 1.5 2011/07/23 01:14:44 manu Exp $
 
 Do not strip binaries so that we have debug for now.
---- install-sh.orig	2011-04-22 19:37:34.000000000 +0200
-+++ install-sh	2011-05-19 12:39:25.000000000 +0200
+--- install-sh.orig	2011-07-14 14:21:18.000000000 +0200
++++ install-sh	2011-07-22 09:00:03.000000000 +0200
 @@ -120,9 +120,9 @@
          shift
          shift
@@ -14,29 +14,3 @@ Do not strip binaries so that we have debug for now.
          continue;;
  
      -t) dstarg=$2
---- rpc/rpc-transport/socket/src/Makefile.in.orig	2011-07-07 12:16:41.000000000 +0200
-+++ rpc/rpc-transport/socket/src/Makefile.in	2011-07-07 12:19:06.000000000 +0200
-@@ -222,9 +222,9 @@
- rpctransport_LTLIBRARIES = socket.la
- rpctransportdir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/rpc-transport
- socket_la_LDFLAGS = -module -avoidversion
- socket_la_SOURCES = socket.c name.c
--socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-+socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl
- AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
- 	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \
- 	-I$(top_srcdir)/rpc/xdr/src/ -shared -nostartfiles $(GF_CFLAGS)
- 
---- rpc/rpc-transport/socket/src/Makefile.am.orig	2011-07-07 12:18:15.000000000 +0200
-+++ rpc/rpc-transport/socket/src/Makefile.am	2011-07-07 12:18:52.000000000 +0200
-@@ -5,9 +5,9 @@
- 
- socket_la_LDFLAGS = -module -avoidversion
- 
- socket_la_SOURCES = socket.c name.c
--socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-+socket_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la -lssl
- 
- AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\
- 	-I$(top_srcdir)/libglusterfs/src -I$(top_srcdir)/rpc/rpc-lib/src/ \
- 	-I$(top_srcdir)/rpc/xdr/src/ -shared -nostartfiles $(GF_CFLAGS)
diff --git a/filesystems/glusterfs/patches/patch-ba b/filesystems/glusterfs/patches/patch-ba
index 76a07513099..3c7924c9242 100644
--- a/filesystems/glusterfs/patches/patch-ba
+++ b/filesystems/glusterfs/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-ba,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 glibc dirname() modify the string it is given and returns it.
 glusterfs takes this behavior for granted, and assume that if it
@@ -14,8 +14,8 @@ At least NetBSD returns a static storage. glusterfs will return it to
 a calling function that has the responsability to free it, causing
 a SIGSEGV.
 
---- xlators/performance/stat-prefetch/src/stat-prefetch.c.orig	2011-04-22 19:37:28.000000000 +0200
-+++ xlators/performance/stat-prefetch/src/stat-prefetch.c	2011-05-19 12:41:28.000000000 +0200
+--- xlators/performance/stat-prefetch/src/stat-prefetch.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ xlators/performance/stat-prefetch/src/stat-prefetch.c	2011-07-22 09:00:07.000000000 +0200
 @@ -949,18 +949,24 @@
                  path = dirname (cpy);
                  switch (i)
diff --git a/filesystems/glusterfs/patches/patch-bb b/filesystems/glusterfs/patches/patch-bb
index 5596e6fb1a2..94d93a26bc4 100644
--- a/filesystems/glusterfs/patches/patch-bb
+++ b/filesystems/glusterfs/patches/patch-bb
@@ -1,7 +1,11 @@
-$NetBSD: patch-bb,v 1.6 2011/07/19 07:54:31 manu Exp $
---- xlators/performance/quick-read/src/quick-read.c.orig	2011-07-03 03:59:32.000000000 +0200
-+++ xlators/performance/quick-read/src/quick-read.c	2011-07-03 03:59:42.000000000 +0200
-@@ -726,9 +726,9 @@
+$NetBSD: patch-bb,v 1.7 2011/07/23 01:14:44 manu Exp $
+
+O_DIRECTORY is defined as 0, therefore ((flags & O_DIRECTORY) == O_DIRECTORY)
+is always true even if the flag is not set.
+
+--- xlators/performance/quick-read/src/quick-read.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ xlators/performance/quick-read/src/quick-read.c	2011-07-22 09:16:44.000000000 +0200
+@@ -727,9 +727,9 @@
                  }
          }
          UNLOCK (&table->lock);
diff --git a/filesystems/glusterfs/patches/patch-bc b/filesystems/glusterfs/patches/patch-bc
index 849062fd612..8531baf9791 100644
--- a/filesystems/glusterfs/patches/patch-bc
+++ b/filesystems/glusterfs/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bc,v 1.6 2011/07/23 01:14:44 manu Exp $
                  
 glibc dirname() modify the string it is given and returns it.
 glusterfs takes this behavior for granted, and assume that if it
@@ -14,8 +14,8 @@ At least NetBSD returns a static storage. glusterfs will return it to
 a calling function that has the responsability to free it, causing
 a SIGSEGV.
 
---- xlators/performance/quick-read/src/quick-read.c.orig	2011-04-22 19:37:28.000000000 +0200
-+++ xlators/performance/quick-read/src/quick-read.c	2011-05-19 12:44:01.000000000 +0200
+--- xlators/performance/quick-read/src/quick-read.c.orig	2011-07-22 09:00:09.000000000 +0200
++++ xlators/performance/quick-read/src/quick-read.c	2011-07-22 09:00:12.000000000 +0200
 @@ -80,8 +80,9 @@
  qr_loc_fill (loc_t *loc, inode_t *inode, char *path)
  {
diff --git a/filesystems/glusterfs/patches/patch-be b/filesystems/glusterfs/patches/patch-be
index a4e36e172de..9cc4683b0a3 100644
--- a/filesystems/glusterfs/patches/patch-be
+++ b/filesystems/glusterfs/patches/patch-be
@@ -1,11 +1,11 @@
-$NetBSD: patch-be,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-be,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 basename() and dirname() are not supposed to be thread-safe, and NetBSD's
 implementation is not. glusterfs assume the functions are thread-safe.
 Borrow basename() and rdirname() form glibc and make NetBSD use them.
 
---- libglusterfs/src/compat.c.orig	2011-06-10 16:59:04.000000000 +0000
-+++ libglusterfs/src/compat.c	2011-07-08 01:37:36.000000000 +0000
+--- libglusterfs/src/compat.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ libglusterfs/src/compat.c	2011-07-22 09:00:15.000000000 +0200
 @@ -529,8 +529,412 @@
  
  }
diff --git a/filesystems/glusterfs/patches/patch-bf b/filesystems/glusterfs/patches/patch-bf
index 81ca87cebc6..12e6bea3bff 100644
--- a/filesystems/glusterfs/patches/patch-bf
+++ b/filesystems/glusterfs/patches/patch-bf
@@ -1,11 +1,11 @@
-$NetBSD: patch-bf,v 1.5 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bf,v 1.6 2011/07/23 01:14:44 manu Exp $
 
 basename() and dirname() are not supposed to be thread-safe, and NetBSD's
 implementation is not. glusterfs assume the functions are thread-safe. 
 Borrow basename() and rdirname() form glibc and make NetBSD use them.
 
---- libglusterfs/src/compat.h.orig	2011-06-10 18:59:04.000000000 +0200
-+++ libglusterfs/src/compat.h	2011-07-07 18:30:56.000000000 +0200
+--- libglusterfs/src/compat.h.orig	2011-07-14 14:21:10.000000000 +0200
++++ libglusterfs/src/compat.h	2011-07-22 09:00:17.000000000 +0200
 @@ -57,26 +57,31 @@
  #endif /* HAVE_LLISTXATTR */
  #endif /* GF_LINUX_HOST_OS */
diff --git a/filesystems/glusterfs/patches/patch-bh b/filesystems/glusterfs/patches/patch-bh
index 936f0245028..05de590aab6 100644
--- a/filesystems/glusterfs/patches/patch-bh
+++ b/filesystems/glusterfs/patches/patch-bh
@@ -1,12 +1,12 @@
-$NetBSD: patch-bh,v 1.4 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bh,v 1.5 2011/07/23 01:14:44 manu Exp $
 
 NetBSD's <dirent.h> does a #defiine d_ino d_fileno. Since glusterfs 
 declares structs with d_ino members, we must include <dirent.h> early
 so that d_ino get preprocessed into d_fileno conssitently.
 
 Also define proper xdr types for NetBSD.
---- rpc/rpc-lib/src/xdr-common.h.orig	2011-04-22 19:37:28.000000000 +0200
-+++ rpc/rpc-lib/src/xdr-common.h	2011-05-19 12:47:38.000000000 +0200
+--- rpc/rpc-lib/src/xdr-common.h.orig	2011-07-14 14:21:10.000000000 +0200
++++ rpc/rpc-lib/src/xdr-common.h	2011-07-22 09:00:19.000000000 +0200
 @@ -29,8 +29,13 @@
  #include <sys/types.h>
  #include <rpc/xdr.h>
diff --git a/filesystems/glusterfs/patches/patch-bj b/filesystems/glusterfs/patches/patch-bj
index bb2fdfe9520..7bff1d69cb6 100644
--- a/filesystems/glusterfs/patches/patch-bj
+++ b/filesystems/glusterfs/patches/patch-bj
@@ -1,11 +1,11 @@
-$NetBSD: patch-bj,v 1.4 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bj,v 1.5 2011/07/23 01:14:44 manu Exp $
 Make sure NetBSD pulls proper FUSE header
---- xlators/mount/fuse/src/fuse-bridge.h.orig	2011-04-22 19:37:28.000000000 +0200
-+++ xlators/mount/fuse/src/fuse-bridge.h	2011-05-19 12:48:31.000000000 +0200
-@@ -57,9 +57,9 @@
+--- xlators/mount/fuse/src/fuse-bridge.h.orig	2011-07-22 09:00:37.000000000 +0200
++++ xlators/mount/fuse/src/fuse-bridge.h	2011-07-22 09:01:05.000000000 +0200
+@@ -54,9 +54,9 @@
  
- /* TODO: when supporting posix acl, remove this definition */
- #define DISABLE_POSIX_ACL
+ #include "list.h"
+ #include "dict.h"
  
 -#ifdef GF_LINUX_HOST_OS
 +#if defined(GF_LINUX_HOST_OS) || defined(__NetBSD__)
diff --git a/filesystems/glusterfs/patches/patch-bk b/filesystems/glusterfs/patches/patch-bk
index 2e149796e64..df8d40e4daa 100644
--- a/filesystems/glusterfs/patches/patch-bk
+++ b/filesystems/glusterfs/patches/patch-bk
@@ -1,9 +1,9 @@
-$NetBSD: patch-bk,v 1.4 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bk,v 1.5 2011/07/23 01:14:44 manu Exp $
 
 Add missing xdr_sizeof() in NetBSD. Stollen from
 http://www.freebsd.org/cgi/cvsweb.cgi/src/sys/xdr/xdr_sizeof.c?rev=1.1
---- rpc/rpc-lib/src/xdr-sizeof.c.orig	2011-05-19 12:48:34.000000000 +0200
-+++ rpc/rpc-lib/src/xdr-sizeof.c	2011-05-19 12:48:34.000000000 +0200
+--- rpc/rpc-lib/src/xdr-sizeof.c.orig	2011-07-22 09:01:14.000000000 +0200
++++ rpc/rpc-lib/src/xdr-sizeof.c	2011-07-22 09:01:14.000000000 +0200
 @@ -0,0 +1,164 @@
 +#ifdef __NetBSD__
 +/*
diff --git a/filesystems/glusterfs/patches/patch-bl b/filesystems/glusterfs/patches/patch-bl
index 8ce01bade0e..2a08f3b9b82 100644
--- a/filesystems/glusterfs/patches/patch-bl
+++ b/filesystems/glusterfs/patches/patch-bl
@@ -1,9 +1,9 @@
-$NetBSD: patch-bl,v 1.3 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bl,v 1.4 2011/07/23 01:14:44 manu Exp $
 
 #include <signal.h> for SIGTERM
 
---- glusterfsd/src/glusterfsd-mgmt.c.orig	2011-05-19 15:15:46.000000000 +0200
-+++ glusterfsd/src/glusterfsd-mgmt.c	2011-05-19 15:16:00.000000000 +0200
+--- glusterfsd/src/glusterfsd-mgmt.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ glusterfsd/src/glusterfsd-mgmt.c	2011-07-22 09:01:16.000000000 +0200
 @@ -20,8 +20,9 @@
  #include <stdio.h>
  #include <sys/types.h>
diff --git a/filesystems/glusterfs/patches/patch-bm b/filesystems/glusterfs/patches/patch-bm
index cebeaead2b5..44a6f70272f 100644
--- a/filesystems/glusterfs/patches/patch-bm
+++ b/filesystems/glusterfs/patches/patch-bm
@@ -1,9 +1,9 @@
-$NetBSD: patch-bm,v 1.3 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bm,v 1.4 2011/07/23 01:14:44 manu Exp $
 
 Add xdr-sizeof() to the build
 
---- rpc/rpc-lib/src/Makefile.am.orig	2011-05-19 15:41:12.000000000 +0200
-+++ rpc/rpc-lib/src/Makefile.am	2011-05-19 15:41:33.000000000 +0200
+--- rpc/rpc-lib/src/Makefile.am.orig	2011-07-14 14:21:10.000000000 +0200
++++ rpc/rpc-lib/src/Makefile.am	2011-07-22 09:01:18.000000000 +0200
 @@ -1,9 +1,9 @@
  lib_LTLIBRARIES = libgfrpc.la
  
diff --git a/filesystems/glusterfs/patches/patch-bn b/filesystems/glusterfs/patches/patch-bn
index cd6bba0ab7b..ab8dbeee33d 100644
--- a/filesystems/glusterfs/patches/patch-bn
+++ b/filesystems/glusterfs/patches/patch-bn
@@ -1,9 +1,9 @@
-$NetBSD: patch-bn,v 1.3 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bn,v 1.4 2011/07/23 01:14:44 manu Exp $
 
 Add xdr-sizeof() to the build
 
---- rpc/rpc-lib/src/Makefile.in.orig	2011-05-19 15:41:17.000000000 +0200
-+++ rpc/rpc-lib/src/Makefile.in	2011-05-19 15:43:00.000000000 +0200
+--- rpc/rpc-lib/src/Makefile.in.orig	2011-07-14 14:21:20.000000000 +0200
++++ rpc/rpc-lib/src/Makefile.in	2011-07-22 09:01:21.000000000 +0200
 @@ -59,9 +59,9 @@
  libgfrpc_la_DEPENDENCIES =  \
  	$(top_builddir)/libglusterfs/src/libglusterfs.la
diff --git a/filesystems/glusterfs/patches/patch-bo b/filesystems/glusterfs/patches/patch-bo
index b5e4b771f3d..37d463cdbdd 100644
--- a/filesystems/glusterfs/patches/patch-bo
+++ b/filesystems/glusterfs/patches/patch-bo
@@ -1,5 +1,9 @@
---- rpc/xdr/src/cli1-xdr.c.orig	2011-05-19 15:56:47.000000000 +0200
-+++ rpc/xdr/src/cli1-xdr.c	2011-05-19 15:57:10.000000000 +0200
+$NetBSD: patch-bo,v 1.2 2011/07/23 01:14:44 manu Exp $
+
+Build fix
+
+--- rpc/xdr/src/cli1-xdr.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ rpc/xdr/src/cli1-xdr.c	2011-07-22 09:01:24.000000000 +0200
 @@ -23,8 +23,9 @@
   * It was generated using rpcgen.
   */
diff --git a/filesystems/glusterfs/patches/patch-bp b/filesystems/glusterfs/patches/patch-bp
index 30aed75404d..cfc44e86df4 100644
--- a/filesystems/glusterfs/patches/patch-bp
+++ b/filesystems/glusterfs/patches/patch-bp
@@ -1,9 +1,9 @@
-$NetBSD: patch-bp,v 1.3 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bp,v 1.4 2011/07/23 01:14:44 manu Exp $
 
 NetBSD does not have umount(2), but unmount(2)
 
---- xlators/mgmt/glusterd/src/glusterd-op-sm.c.orig	2011-06-02 10:19:31.000000000 +0200
-+++ xlators/mgmt/glusterd/src/glusterd-op-sm.c	2011-06-02 10:20:33.000000000 +0200
+--- xlators/mgmt/glusterd/src/glusterd-op-sm.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ xlators/mgmt/glusterd/src/glusterd-op-sm.c	2011-07-22 09:01:26.000000000 +0200
 @@ -49,8 +49,12 @@
  #include "syscall.h"
  #include "cli1.h"
diff --git a/filesystems/glusterfs/patches/patch-bq b/filesystems/glusterfs/patches/patch-bq
index 26708d3e9f2..89860900a65 100644
--- a/filesystems/glusterfs/patches/patch-bq
+++ b/filesystems/glusterfs/patches/patch-bq
@@ -1,5 +1,10 @@
---- xlators/mgmt/glusterd/src/glusterd-utils.c.orig	2011-06-10 18:59:07.000000000 +0200
-+++ xlators/mgmt/glusterd/src/glusterd-utils.c	2011-07-03 03:37:40.000000000 +0200
+$NetBSD: patch-bq,v 1.4 2011/07/23 01:14:44 manu Exp $
+
+Make sure glusterfsd listens on the same address family as glusterd: if
+glusterd uses inet, glusterfsd should not use inet6
+
+--- xlators/mgmt/glusterd/src/glusterd-utils.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ xlators/mgmt/glusterd/src/glusterd-utils.c	2011-07-22 09:01:28.000000000 +0200
 @@ -88,8 +88,52 @@
          //TODO: set timestamp
          return 0;
diff --git a/filesystems/glusterfs/patches/patch-br b/filesystems/glusterfs/patches/patch-br
index 812e5d1695e..3dffa53467c 100644
--- a/filesystems/glusterfs/patches/patch-br
+++ b/filesystems/glusterfs/patches/patch-br
@@ -1,10 +1,10 @@
-$NetBSD: patch-br,v 1.2 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-br,v 1.3 2011/07/23 01:14:44 manu Exp $
 
 Hide .attribute to glusterfs clients in order to make sure it will
 not be distributed by the cluster/dht xlator
---- xlators/storage/posix/src/posix.c.orig	2011-06-19 11:02:41.000000000 +0200
-+++ xlators/storage/posix/src/posix.c	2011-06-19 11:05:41.000000000 +0200
-@@ -4094,8 +4094,21 @@
+--- xlators/storage/posix/src/posix.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ xlators/storage/posix/src/posix.c	2011-07-22 09:01:30.000000000 +0200
+@@ -4313,8 +4313,21 @@
  
                  if ((!strcmp(real_path, base_path))
                      && (!strcmp(entry->d_name, GF_REPLICATE_TRASH_DIR)))
diff --git a/filesystems/glusterfs/patches/patch-bs b/filesystems/glusterfs/patches/patch-bs
index a0c03c986bf..41d00800db6 100644
--- a/filesystems/glusterfs/patches/patch-bs
+++ b/filesystems/glusterfs/patches/patch-bs
@@ -1,10 +1,10 @@
-$NetBSD: patch-bs,v 1.2 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bs,v 1.3 2011/07/23 01:14:44 manu Exp $
 
 Actually use the Linux [lf]?(set|get|list|remove)xattr reimplementation
 we have in libglusterfs/src/compat.c
 
---- libglusterfs/src/syscall.c.orig	2011-06-25 03:34:26.000000000 +0200
-+++ libglusterfs/src/syscall.c	2011-06-25 03:39:37.000000000 +0200
+--- libglusterfs/src/syscall.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ libglusterfs/src/syscall.c	2011-07-22 09:01:32.000000000 +0200
 @@ -267,9 +267,9 @@
  sys_lsetxattr (const char *path, const char *name, const void *value,
                 size_t size, int flags)
diff --git a/filesystems/glusterfs/patches/patch-bt b/filesystems/glusterfs/patches/patch-bt
index be335cf9b17..76dd3570c11 100644
--- a/filesystems/glusterfs/patches/patch-bt
+++ b/filesystems/glusterfs/patches/patch-bt
@@ -1,10 +1,10 @@
-$NetBSD: patch-bt,v 1.2 2011/07/19 07:54:31 manu Exp $
+$NetBSD: patch-bt,v 1.3 2011/07/23 01:14:44 manu Exp $
 
 Fix the io-threads xlator, which forgot to initialize its pthread
 condition and mutex.
 
---- xlators/performance/io-threads/src/io-threads.c.orig
-+++ xlators/performance/io-threads/src/io-threads.c
+--- xlators/performance/io-threads/src/io-threads.c.orig	2011-07-14 14:21:10.000000000 +0200
++++ xlators/performance/io-threads/src/io-threads.c	2011-07-22 09:01:34.000000000 +0200
 @@ -2181,8 +2181,20 @@
                          "out of memory");
                  goto out;