summaryrefslogtreecommitdiff
path: root/filesystems
diff options
context:
space:
mode:
authormanu <manu>2011-05-19 14:54:22 +0000
committermanu <manu>2011-05-19 14:54:22 +0000
commit210eb055cf88e5fc62a31f7b94fb4b57687c9c2b (patch)
treeb1220ba3b8a729ceca55a91d6c2f697120be1175 /filesystems
parent1d74fd45679d09ca27d7f8bd9b14530acde7195d (diff)
downloadpkgsrc-210eb055cf88e5fc62a31f7b94fb4b57687c9c2b.tar.gz
Update glusterfs to 3.2. According to http://www.gluster.org, news are:
* Geo-Replication * Easily Accessible Usage Quotas * Advanced Monitoring Tools
Diffstat (limited to 'filesystems')
-rw-r--r--filesystems/glusterfs/MESSAGE.NetBSD2
-rw-r--r--filesystems/glusterfs/Makefile13
-rw-r--r--filesystems/glusterfs/PLIST121
-rw-r--r--filesystems/glusterfs/distinfo49
-rwxr-xr-xfilesystems/glusterfs/files/glusterd.sh2
-rwxr-xr-xfilesystems/glusterfs/files/glusterfsd.sh4
-rwxr-xr-xfilesystems/glusterfs/files/xattr-init.sh7
-rw-r--r--filesystems/glusterfs/patches/patch-aa6
-rw-r--r--filesystems/glusterfs/patches/patch-ab42
-rw-r--r--filesystems/glusterfs/patches/patch-ac32
-rw-r--r--filesystems/glusterfs/patches/patch-ae6
-rw-r--r--filesystems/glusterfs/patches/patch-af8
-rw-r--r--filesystems/glusterfs/patches/patch-ag20
-rw-r--r--filesystems/glusterfs/patches/patch-an10
-rw-r--r--filesystems/glusterfs/patches/patch-ao21
-rw-r--r--filesystems/glusterfs/patches/patch-ar8
-rw-r--r--filesystems/glusterfs/patches/patch-as6
-rw-r--r--filesystems/glusterfs/patches/patch-ax6
-rw-r--r--filesystems/glusterfs/patches/patch-ba10
-rw-r--r--filesystems/glusterfs/patches/patch-bb18
-rw-r--r--filesystems/glusterfs/patches/patch-bc20
-rw-r--r--filesystems/glusterfs/patches/patch-be25
-rw-r--r--filesystems/glusterfs/patches/patch-bf8
-rw-r--r--filesystems/glusterfs/patches/patch-bg15
-rw-r--r--filesystems/glusterfs/patches/patch-bh11
-rw-r--r--filesystems/glusterfs/patches/patch-bj8
-rw-r--r--filesystems/glusterfs/patches/patch-bk58
-rw-r--r--filesystems/glusterfs/patches/patch-bl16
-rw-r--r--filesystems/glusterfs/patches/patch-bm17
-rw-r--r--filesystems/glusterfs/patches/patch-bn38
-rw-r--r--filesystems/glusterfs/patches/patch-bo12
31 files changed, 332 insertions, 287 deletions
diff --git a/filesystems/glusterfs/MESSAGE.NetBSD b/filesystems/glusterfs/MESSAGE.NetBSD
index a3615e9eeec..cee91596694 100644
--- a/filesystems/glusterfs/MESSAGE.NetBSD
+++ b/filesystems/glusterfs/MESSAGE.NetBSD
@@ -1,5 +1,5 @@
===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.5 2011/05/12 10:28:47 manu Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.6 2011/05/19 14:54:22 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 402d6eb33a3..a915679be3e 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2011/05/12 10:28:47 manu Exp $
+# $NetBSD: Makefile,v 1.9 2011/05/19 14:54:22 manu Exp $
#
-DISTNAME= glusterfs-3.1.4
-PKGREVISION= 2
+DISTNAME= glusterfs-3.2.0
CATEGORIES= filesystems
-MASTER_SITES= http://download.gluster.com/pub/gluster/glusterfs/3.1/LATEST/
+MASTER_SITES= http://download.gluster.com/pub/gluster/glusterfs/3.2/LATEST/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gluster.org/
@@ -71,7 +70,11 @@ post-install:
${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount.glusterfs \
${DESTDIR}/${PREFIX}/sbin/
${INSTALL_SCRIPT} ${FILESDIR}/xattr-init.sh \
- ${DESTDIR}/${PREFIX}/etc/glusterfs
+ ${DESTDIR}/${PREFIX}/etc/glusterfs/
+
+# Debug
+CFLAGS+= -g
+INSTALL_UNSTRIPPED= yes
.include "../../mk/bsd.prefs.mk"
.include "../../lang/python/application.mk"
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index d8029799c0e..37197be84e3 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,55 +1,96 @@
-@comment $NetBSD: PLIST,v 1.2 2011/04/18 16:19:47 manu Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/05/19 14:54:22 manu Exp $
+etc/glusterfs/xattr-init.sh
etc/glusterfs/glusterfs.vol.sample
etc/glusterfs/glusterfsd.vol.sample
etc/glusterfs/glusterd.vol
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.0/rpc-transport/socket.so.0.0.0
+lib/glusterfs/3.2.0/rpc-transport/socket.la
+lib/glusterfs/3.2.0/xlator/cluster/distribute.so
+lib/glusterfs/3.2.0/xlator/cluster/replicate.so
+lib/glusterfs/3.2.0/xlator/features/posix-locks.so
+lib/glusterfs/3.2.0/xlator/cluster/stripe.so.0.0.0
+lib/glusterfs/3.2.0/xlator/cluster/stripe.la
+lib/glusterfs/3.2.0/xlator/cluster/afr.so.0.0.0
+lib/glusterfs/3.2.0/xlator/cluster/afr.la
+lib/glusterfs/3.2.0/xlator/cluster/pump.so.0.0.0
+lib/glusterfs/3.2.0/xlator/cluster/pump.la
+lib/glusterfs/3.2.0/xlator/cluster/dht.so.0.0.0
+lib/glusterfs/3.2.0/xlator/cluster/dht.la
+lib/glusterfs/3.2.0/xlator/cluster/nufa.so.0.0.0
+lib/glusterfs/3.2.0/xlator/cluster/nufa.la
+lib/glusterfs/3.2.0/xlator/cluster/switch.so.0.0.0
+lib/glusterfs/3.2.0/xlator/cluster/switch.la
+lib/glusterfs/3.2.0/xlator/storage/posix.so.0.0.0
+lib/glusterfs/3.2.0/xlator/storage/posix.la
+lib/glusterfs/3.2.0/xlator/protocol/client.so.0.0.0
+lib/glusterfs/3.2.0/xlator/protocol/client.la
+lib/glusterfs/3.2.0/xlator/protocol/server.so.0.0.0
+lib/glusterfs/3.2.0/xlator/protocol/server.la
+lib/glusterfs/3.2.0/xlator/performance/write-behind.so.0.0.0
+lib/glusterfs/3.2.0/xlator/performance/write-behind.la
+lib/glusterfs/3.2.0/xlator/performance/read-ahead.so.0.0.0
+lib/glusterfs/3.2.0/xlator/performance/read-ahead.la
+lib/glusterfs/3.2.0/xlator/performance/io-threads.so.0.0.0
+lib/glusterfs/3.2.0/xlator/performance/io-threads.la
+lib/glusterfs/3.2.0/xlator/performance/io-cache.so.0.0.0
+lib/glusterfs/3.2.0/xlator/performance/io-cache.la
+lib/glusterfs/3.2.0/xlator/performance/quick-read.so.0.0.0
+lib/glusterfs/3.2.0/xlator/performance/quick-read.la
+lib/glusterfs/3.2.0/xlator/performance/stat-prefetch.so.0.0.0
+lib/glusterfs/3.2.0/xlator/performance/stat-prefetch.la
+lib/glusterfs/3.2.0/xlator/testing/performance/symlink-cache.so.0.0.0
+lib/glusterfs/3.2.0/xlator/testing/performance/symlink-cache.la
+lib/glusterfs/3.2.0/xlator/testing/features/trash.so.0.0.0
+lib/glusterfs/3.2.0/xlator/testing/features/trash.la
+lib/glusterfs/3.2.0/xlator/debug/trace.so.0.0.0
+lib/glusterfs/3.2.0/xlator/debug/trace.la
+lib/glusterfs/3.2.0/xlator/debug/error-gen.so.0.0.0
+lib/glusterfs/3.2.0/xlator/debug/error-gen.la
+lib/glusterfs/3.2.0/xlator/debug/io-stats.so.0.0.0
+lib/glusterfs/3.2.0/xlator/debug/io-stats.la
+lib/glusterfs/3.2.0/xlator/features/locks.so.0.0.0
+lib/glusterfs/3.2.0/xlator/features/locks.la
+lib/glusterfs/3.2.0/xlator/features/quota.so.0.0.0
+lib/glusterfs/3.2.0/xlator/features/quota.la
+lib/glusterfs/3.2.0/xlator/features/read-only.so.0.0.0
+lib/glusterfs/3.2.0/xlator/features/read-only.la
+lib/glusterfs/3.2.0/xlator/features/access-control.so.0.0.0
+lib/glusterfs/3.2.0/xlator/features/access-control.la
+lib/glusterfs/3.2.0/xlator/features/mac-compat.so.0.0.0
+lib/glusterfs/3.2.0/xlator/features/mac-compat.la
+lib/glusterfs/3.2.0/xlator/features/quiesce.so.0.0.0
+lib/glusterfs/3.2.0/xlator/features/quiesce.la
+lib/glusterfs/3.2.0/xlator/features/marker.so.0.0.0
+lib/glusterfs/3.2.0/xlator/features/marker.la
+lib/glusterfs/3.2.0/xlator/encryption/rot-13.so.0.0.0
+lib/glusterfs/3.2.0/xlator/encryption/rot-13.la
+lib/glusterfs/3.2.0/xlator/mount/fuse.so.0.0.0
+lib/glusterfs/3.2.0/xlator/mount/fuse.la
+lib/glusterfs/3.2.0/xlator/nfs/server.so.0.0.0
+lib/glusterfs/3.2.0/xlator/nfs/server.la
+lib/glusterfs/3.2.0/xlator/mgmt/glusterd.so.0.0.0
+lib/glusterfs/3.2.0/xlator/mgmt/glusterd.la
+lib/glusterfs/3.2.0/auth/addr.so.0.0.0
+lib/glusterfs/3.2.0/auth/addr.la
+lib/glusterfs/3.2.0/auth/login.so.0.0.0
+lib/glusterfs/3.2.0/auth/login.la
+lib/libgfxdr.so.0.0.0
lib/libgfxdr.la
-lib/glusterfs/3.1.4/rpc-transport/socket.la
-lib/glusterfs/3.1.4/xlator/cluster/stripe.la
-lib/glusterfs/3.1.4/xlator/cluster/afr.la
-lib/glusterfs/3.1.4/xlator/cluster/pump.la
-lib/glusterfs/3.1.4/xlator/cluster/replicate.so
-lib/glusterfs/3.1.4/xlator/cluster/dht.la
-lib/glusterfs/3.1.4/xlator/cluster/nufa.la
-lib/glusterfs/3.1.4/xlator/cluster/switch.la
-lib/glusterfs/3.1.4/xlator/cluster/distribute.so
-lib/glusterfs/3.1.4/xlator/storage/posix.la
-lib/glusterfs/3.1.4/xlator/protocol/client.la
-lib/glusterfs/3.1.4/xlator/protocol/server.la
-lib/glusterfs/3.1.4/xlator/performance/write-behind.la
-lib/glusterfs/3.1.4/xlator/performance/read-ahead.la
-lib/glusterfs/3.1.4/xlator/performance/io-threads.la
-lib/glusterfs/3.1.4/xlator/performance/io-cache.la
-lib/glusterfs/3.1.4/xlator/performance/quick-read.la
-lib/glusterfs/3.1.4/xlator/performance/stat-prefetch.la
-lib/glusterfs/3.1.4/xlator/testing/performance/symlink-cache.la
-lib/glusterfs/3.1.4/xlator/testing/features/trash.la
-lib/glusterfs/3.1.4/xlator/debug/trace.la
-lib/glusterfs/3.1.4/xlator/debug/error-gen.la
-lib/glusterfs/3.1.4/xlator/debug/io-stats.la
-lib/glusterfs/3.1.4/xlator/features/locks.la
-lib/glusterfs/3.1.4/xlator/features/posix-locks.so
-lib/glusterfs/3.1.4/xlator/features/quota.la
-lib/glusterfs/3.1.4/xlator/features/read-only.la
-lib/glusterfs/3.1.4/xlator/features/access-control.la
-lib/glusterfs/3.1.4/xlator/features/mac-compat.la
-lib/glusterfs/3.1.4/xlator/features/quiesce.la
-lib/glusterfs/3.1.4/xlator/encryption/rot-13.la
-lib/glusterfs/3.1.4/xlator/mount/fuse.la
-lib/glusterfs/3.1.4/xlator/nfs/server.la
-lib/glusterfs/3.1.4/xlator/mgmt/glusterd.la
-lib/glusterfs/3.1.4/auth/addr.la
-lib/glusterfs/3.1.4/auth/login.la
+lib/libgfxdr.a
man/man8/glusterfs.8
man/man8/mount.glusterfs.8
man/man8/gluster.8
man/man8/glusterd.8
man/man8/glusterfsd.8
-sbin/glusterfsd
-sbin/glusterfs
sbin/glusterd
+sbin/glusterfs
+sbin/glusterfsd
sbin/gluster
sbin/mount.glusterfs
share/doc/glusterfs/examples/README
@@ -73,5 +114,5 @@ share/doc/glusterfs/benchmarking/launch-script.sh
share/doc/glusterfs/benchmarking/local-script.sh
share/doc/glusterfs/glusterfs-mode.el
share/doc/glusterfs/glusterfs.vim
-share/examples/rc.d/glusterd
share/examples/rc.d/glusterfsd
+share/examples/rc.d/glusterd
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index 5e1a82c05a8..1b3f36110a8 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,25 +1,26 @@
-$NetBSD: distinfo,v 1.2 2011/04/18 16:19:47 manu Exp $
+$NetBSD: distinfo,v 1.3 2011/05/19 14:54:22 manu Exp $
-SHA1 (glusterfs-3.1.4.tar.gz) = 1166063b4a3fa25927b16c88025cc1186c73f420
-RMD160 (glusterfs-3.1.4.tar.gz) = dc7db013790dc2366f574e6e8a4fca6a67078cdc
-Size (glusterfs-3.1.4.tar.gz) = 2173373 bytes
-SHA1 (patch-aa) = b5d19e5ec8a1d9ca9d6e7e5e8e9e251638ac7127
-SHA1 (patch-ab) = c244841380b6f3bc55581a5e18fd3e22b94c9107
-SHA1 (patch-ac) = f130a850238f3e0b1b7f906cc2b37242249ef9f2
-SHA1 (patch-ae) = b4b12863b608c7aea043809059c586278b62dffc
-SHA1 (patch-af) = fe4494041804bc91a4985c25829e61abfe85eb87
-SHA1 (patch-ag) = ea16cbe55fbaea0989842fcefb61d35c0a6e8da4
-SHA1 (patch-an) = 0b7f67f3698c170e40f8d5e1cfc743eac1a84a97
-SHA1 (patch-ao) = 3368aa3e531ec128383a0b2c85d17cb8809458b3
-SHA1 (patch-ar) = 1ab07f9db7da9ed1cbf34f8285f1ea9be8f7366e
-SHA1 (patch-as) = b5d309e2678f07eb43e2017f47ba7d978dd74b73
-SHA1 (patch-ax) = 89e42127b49d70cc0071c0ce32641d3cdf59fae9
-SHA1 (patch-ba) = 23f0753c8f2b523a381cd2499078d13d01524185
-SHA1 (patch-bb) = 3d78df8c77764d2dfc6ba8447fc933918f55b2f2
-SHA1 (patch-bc) = 4bc72a9e5013a03b43f4d1e2ecbb6ed883786cff
-SHA1 (patch-be) = a8f1e059f1f9e6dfd070d647d9709bab01fdd1df
-SHA1 (patch-bf) = b04efbad0242d7258b9c84185f626ce6c9525f99
-SHA1 (patch-bg) = 559edf8b560a5054e2ee9791570b92992be18c56
-SHA1 (patch-bh) = 21a84a74e1ec114569b6fa4636a0f07b5a0bea16
-SHA1 (patch-bj) = ab35e4e3b70cac2fd6b4fe1df89ab5710e14ed59
-SHA1 (patch-bk) = 8c82f5896c2b4a10be496a627d13b9060ed21bc2
+SHA1 (glusterfs-3.2.0.tar.gz) = a8095e04feedce81aa21634639f278b3810398b8
+RMD160 (glusterfs-3.2.0.tar.gz) = a69f47efd396a413ffb350e1711345ff49557325
+Size (glusterfs-3.2.0.tar.gz) = 2307276 bytes
+SHA1 (patch-aa) = 0975321d76f7f3d1675989b3e7ebbbd10fa37914
+SHA1 (patch-ab) = 50ebee4f7ba34ef260bccada8f99cbed286f834c
+SHA1 (patch-ac) = c8ed15790eaa9aa72b61096eadb823a88271e94e
+SHA1 (patch-ae) = 2ce22194e5841227d38da90aacd9a6780ae5b24c
+SHA1 (patch-af) = b9772f2a91c4d3d94695218e9889d7cd39c1acbf
+SHA1 (patch-an) = f61d747e22665a154b95546cb632489d1e0c55bf
+SHA1 (patch-ao) = 1845277f39531160bab22dadec1f4eb3c761a358
+SHA1 (patch-ar) = a5a18baa88fda145795d0b6f85ba86014e2128f7
+SHA1 (patch-as) = 54f6ea0ee4208cd29052084efeb928618936c7d1
+SHA1 (patch-ax) = 2588db4c21df8559ffbcf1b814479228dadd4623
+SHA1 (patch-ba) = e53d4b833f7b26eaa474a339e5962a251ecacd49
+SHA1 (patch-bc) = e9323641ed748cbe0ef6cb8912ab76dc5508cc80
+SHA1 (patch-be) = 0db2543504300504be1064cdbb6f19de06917e17
+SHA1 (patch-bf) = 30a39360435dd5f9faaf00e272a2d14fdb1ec86c
+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
diff --git a/filesystems/glusterfs/files/glusterd.sh b/filesystems/glusterfs/files/glusterd.sh
index 42a8811cde9..17998ada1ef 100755
--- a/filesystems/glusterfs/files/glusterd.sh
+++ b/filesystems/glusterfs/files/glusterd.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: glusterd.sh,v 1.1 2011/04/18 16:19:48 manu Exp $
+# $NetBSD: glusterd.sh,v 1.2 2011/05/19 14:54:22 manu Exp $
#
# PROVIDE: glusterd
diff --git a/filesystems/glusterfs/files/glusterfsd.sh b/filesystems/glusterfs/files/glusterfsd.sh
index 38e8e8fa3e2..8284898a36f 100755
--- a/filesystems/glusterfs/files/glusterfsd.sh
+++ b/filesystems/glusterfs/files/glusterfsd.sh
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: glusterfsd.sh,v 1.2 2011/05/09 09:38:26 manu Exp $
+# $NetBSD: glusterfsd.sh,v 1.3 2011/05/19 14:54:22 manu Exp $
#
# PROVIDE: glusterfsd
@@ -16,4 +16,4 @@ command_args="-p ${pidfile}"
required_files="@PREFIX@/etc/glusterfs/${name}.vol"
load_rc_config $name
-run_rc_command "$1"
+run_rc_command "$1"
diff --git a/filesystems/glusterfs/files/xattr-init.sh b/filesystems/glusterfs/files/xattr-init.sh
index 5a2f6bdf8ef..d6cca39c16a 100755
--- a/filesystems/glusterfs/files/xattr-init.sh
+++ b/filesystems/glusterfs/files/xattr-init.sh
@@ -1,17 +1,20 @@
#!/bin/sh
-# $NetBSD: xattr-init.sh,v 1.2 2011/04/26 16:06:32 manu Exp $
+# $NetBSD: xattr-init.sh,v 1.3 2011/05/19 14:54:22 manu Exp $
GLUSTERFS_XATTR="
trusted.distribute.linkinfo
trusted.distribute.fix.layout
trusted.glusterfs.pathinfo
- trusted.glusterfs.test
trusted.glusterfs.volume-mark
trusted.glusterfs.test
trusted.posix1.gen
trusted.gfid
trusted.afr
+ glusterfs.open-fd-count
+ glusterfs.inodelk-count
+ glusterfs.entrylk-count
+ glusterfs.posixlk-count
"
test $# -ne 1 && {
diff --git a/filesystems/glusterfs/patches/patch-aa b/filesystems/glusterfs/patches/patch-aa
index 70ab4eae1a3..f9cc6336c49 100644
--- a/filesystems/glusterfs/patches/patch-aa
+++ b/filesystems/glusterfs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-aa,v 1.3 2011/05/19 14:54:23 manu Exp $
The == operator is a non-standard bash extension. = should be used instead
---- xlators/mount/fuse/utils/mount_glusterfs.in.orig 2011-04-13 10:19:20.000000000 +0200
-+++ xlators/mount/fuse/utils/mount_glusterfs.in 2011-04-13 10:19:33.000000000 +0200
+--- 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
@@ -164,9 +164,9 @@
}
diff --git a/filesystems/glusterfs/patches/patch-ab b/filesystems/glusterfs/patches/patch-ab
index df18eb1688a..33fa81c4193 100644
--- a/filesystems/glusterfs/patches/patch-ab
+++ b/filesystems/glusterfs/patches/patch-ab
@@ -1,27 +1,26 @@
-$NetBSD: patch-ab,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-ab,v 1.3 2011/05/19 14:54:23 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.
---- libglusterfs/src/common-utils.c.orig 2011-04-13 09:28:41.000000000 +0200
-+++ libglusterfs/src/common-utils.c 2011-04-13 09:29:41.000000000 +0200
-@@ -47,8 +47,12 @@
- #include "glusterfs.h"
- #include "stack.h"
- #include "globals.h"
+--- 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
+@@ -39,8 +39,12 @@
+ #ifndef MAX_IOVEC
+ #define MAX_IOVEC 16
+ #endif
+#ifndef AI_ADDRCONFIG
+#define AI_ADDRCONFIG 0
+#endif /* AI_ADDRCONFIG */
+
- typedef int32_t (*rw_op_t)(int32_t fd, char *buf, int32_t size);
- typedef int32_t (*rwv_op_t)(int32_t fd, const struct iovec *buf, int32_t size);
-
- struct dnscache6 {
-
---- xlators/nfs/lib/src/rpc-socket.c.orig 2011-04-13 15:03:16.000000000 +0200
-+++ xlators/nfs/lib/src/rpc-socket.c 2011-04-13 15:03:48.000000000 +0200
+ /* Given the 4-byte fragment header, returns non-zero if this fragment
+ * 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
@@ -36,8 +36,12 @@
#include <netdb.h>
#include <netinet/in.h>
@@ -35,3 +34,18 @@ 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
+@@ -48,8 +48,12 @@
+ #include "stack.h"
+ #include "globals.h"
+ #include "md5.h"
+
++#ifndef AI_ADDRCONFIG
++#define AI_ADDRCONFIG 0
++#endif /* AI_ADDRCONFIG */
++
+ typedef int32_t (*rw_op_t)(int32_t fd, char *buf, int32_t size);
+ typedef int32_t (*rwv_op_t)(int32_t fd, const struct iovec *buf, int32_t size);
+
+ struct dnscache6 {
diff --git a/filesystems/glusterfs/patches/patch-ac b/filesystems/glusterfs/patches/patch-ac
index 3d0b9465ad6..be2458ae75a 100644
--- a/filesystems/glusterfs/patches/patch-ac
+++ b/filesystems/glusterfs/patches/patch-ac
@@ -1,19 +1,17 @@
-$NetBSD: patch-ac,v 1.1.1.1 2010/08/26 14:26:18 manu Exp $
-
-NetBSD does not have EDOOFUS.
---- libglusterfs/src/compat-errno.c.orig 2010-07-16 11:44:51.000000000 +0200
-+++ libglusterfs/src/compat-errno.c 2010-07-16 11:50:55.000000000 +0200
+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
@@ -857,11 +857,13 @@
- /* ENOATTR 87 / * Attribute not found */
- gf_error_to_errno_array[GF_ERROR_CODE_NOATTR] = ENOATTR;
- gf_errno_to_error_array[ENOATTR] = GF_ERROR_CODE_NOATTR;
-
-+#ifdef EDOOFUS /* Undefined on NetBSD */
- /* EDOOFUS 88 / * Programming error */
- gf_error_to_errno_array[GF_ERROR_CODE_DOOFUS] = EDOOFUS;
- gf_errno_to_error_array[EDOOFUS] = GF_ERROR_CODE_DOOFUS;
-+#endif /* EDOOFUS */
+ /* ENOATTR 87 / * Attribute not found */
+ gf_error_to_errno_array[GF_ERROR_CODE_NOATTR] = ENOATTR;
+ gf_errno_to_error_array[ENOATTR] = GF_ERROR_CODE_NOATTR;
- /* EBADMSG 89 / * Bad message */
- gf_error_to_errno_array[GF_ERROR_CODE_BADMSG] = EBADMSG;
- gf_errno_to_error_array[EBADMSG] = GF_ERROR_CODE_BADMSG;
++#ifndef __NetBSD__ /* Undefined on NetBSD */
+ /* EDOOFUS 88 / * Programming error */
+ gf_error_to_errno_array[GF_ERROR_CODE_DOOFUS] = EDOOFUS;
+ gf_errno_to_error_array[EDOOFUS] = GF_ERROR_CODE_DOOFUS;
++#endif /* __NetBSD__ */
+
+ /* EBADMSG 89 / * Bad message */
+ gf_error_to_errno_array[GF_ERROR_CODE_BADMSG] = EBADMSG;
+ gf_errno_to_error_array[EBADMSG] = GF_ERROR_CODE_BADMSG;
diff --git a/filesystems/glusterfs/patches/patch-ae b/filesystems/glusterfs/patches/patch-ae
index fafe270db06..a3d08a167c8 100644
--- a/filesystems/glusterfs/patches/patch-ae
+++ b/filesystems/glusterfs/patches/patch-ae
@@ -1,9 +1,9 @@
-$NetBSD: patch-ae,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-ae,v 1.3 2011/05/19 14:54:23 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-09 10:09:02.000000000 +0200
-+++ contrib/fuse-lib/mount.c 2011-04-13 14:36:53.000000000 +0200
+--- 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
@@ -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 dd86dddff3f..2d8871abcfc 100644
--- a/filesystems/glusterfs/patches/patch-af
+++ b/filesystems/glusterfs/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-af,v 1.3 2011/05/19 14:54:23 manu Exp $
Works around "error: 'TCP_KEEPALIVE' undeclared" on NetBSD
---- rpc/rpc-transport/socket/src/socket.c.orig 2011-04-13 09:38:31.000000000 +0200
-+++ rpc/rpc-transport/socket/src/socket.c 2011-04-13 09:38:31.000000000 +0200
-@@ -374,9 +374,9 @@
+--- 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
+@@ -397,9 +397,9 @@
if (keepalive_intvl == GF_USE_DEFAULT_KEEPALIVE)
goto done;
diff --git a/filesystems/glusterfs/patches/patch-ag b/filesystems/glusterfs/patches/patch-ag
deleted file mode 100644
index 1e599dbdf17..00000000000
--- a/filesystems/glusterfs/patches/patch-ag
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2011/04/18 16:19:48 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-13 09:44:53.000000000 +0200
-+++ rpc/rpc-lib/src/rpc-transport.h 2011-04-13 09:45:08.000000000 +0200
-@@ -39,8 +39,12 @@
- #ifndef MAX_IOVEC
- #define MAX_IOVEC 16
- #endif
-
-+#ifndef AI_ADDRCONFIG
-+#define AI_ADDRCONFIG 0
-+#endif /* AI_ADDRCONFIG */
-+
- /* Given the 4-byte fragment header, returns non-zero if this fragment
- * 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
diff --git a/filesystems/glusterfs/patches/patch-an b/filesystems/glusterfs/patches/patch-an
index 73e28b02fda..bff3ec8e4d2 100644
--- a/filesystems/glusterfs/patches/patch-an
+++ b/filesystems/glusterfs/patches/patch-an
@@ -1,9 +1,9 @@
-$NetBSD: patch-an,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-an,v 1.3 2011/05/19 14:54:23 manu Exp $
NetBSD uses libperfuse(3). Also enable debugging (-g) for now.
---- configure.ac.orig 2011-04-09 10:09:04.000000000 +0200
-+++ configure.ac 2011-04-13 14:40:11.000000000 +0200
-@@ -409,8 +409,19 @@
+--- configure.ac.orig 2011-04-22 19:37:28.000000000 +0200
++++ configure.ac 2011-05-19 12:32:55.000000000 +0200
+@@ -413,8 +413,19 @@
GF_GLUSTERFS_LDFLAGS="-lnsl -lresolv -lsocket"
BUILD_FUSE_CLIENT=no
FUSE_CLIENT_SUBDIR=""
@@ -23,7 +23,7 @@ NetBSD uses libperfuse(3). Also enable debugging (-g) for now.
GF_HOST_OS="GF_BSD_HOST_OS"
GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0"
GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
-@@ -445,8 +456,9 @@
+@@ -449,8 +460,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 f27bcc3fd94..8abb77926b7 100644
--- a/filesystems/glusterfs/patches/patch-ao
+++ b/filesystems/glusterfs/patches/patch-ao
@@ -1,9 +1,20 @@
-$NetBSD: patch-ao,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-ao,v 1.3 2011/05/19 14:54:23 manu Exp $
NetBSD uses libperfuse(3). Also enable debugging (-g) for now.
---- configure.orig 2011-04-09 10:09:09.000000000 +0200
-+++ configure 2011-04-13 14:40:44.000000000 +0200
-@@ -21732,8 +21732,19 @@
+--- configure.orig 2011-05-19 12:36:23.000000000 +0200
++++ configure 2011-05-19 12:37:13.000000000 +0200
+@@ -464,9 +464,9 @@
+ # include <unistd.h>
+ #endif"
+
+ ac_subdirs_all="$ac_subdirs_all argp-standalone"
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mountutildir initdir launchddir LEX LEXLIB LEX_OUTPUT_ROOT YACC LD ac_ct_LD HAVE_SPINLOCK HAVE_STRNLEN FUSE_CLIENT_SUBDIR FUSERMOUNT_SUBDIR IBVERBS_SUBDIR RDMA_SUBDIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYNCDAEMON_COMPILE SYNCDAEMON_SUBDIR HAVE_BACKTRACE HAVE_MALLOC_STATS subdirs ARGP_STANDALONE_CPPFLAGS ARGP_STANDALONE_LDADD GF_DISTRIBUTION GF_HOST_OS GF_GLUSTERFS_LDFLAGS GF_GLUSTERFS_CFLAGS GF_CFLAGS GF_LDFLAGS GF_LDADD GF_FUSE_CFLAGS RLLIBS CONTRIBDIR INCLUDES GF_DARWIN_HOST_OS_TRUE GF_DARWIN_HOST_OS_FALSE LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL mountutildir initdir launchddir LEX LEXLIB LEX_OUTPUT_ROOT YACC LD ac_ct_LD HAVE_SPINLOCK HAVE_STRNLEN FUSE_CLIENT_SUBDIR FUSERMOUNT_SUBDIR IBVERBS_SUBDIR RDMA_SUBDIR PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYNCDAEMON_COMPILE SYNCDAEMON_SUBDIR HAVE_BACKTRACE HAVE_MALLOC_STATS subdirs ARGP_STANDALONE_CPPFLAGS ARGP_STANDALONE_LDADD GF_DISTRIBUTION GF_HOST_OS GF_GLUSTERFS_LDFLAGS GF_GLUSTERFS_CFLAGS GF_CFLAGS GF_LDFLAGS GF_LDADD GF_FUSE_LDADD GF_FUSE_CFLAGS RLLIBS CONTRIBDIR INCLUDES GF_DARWIN_HOST_OS_TRUE GF_DARWIN_HOST_OS_FALSE LIBOBJS LTLIBOBJS'
+ ac_subst_files=''
+
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -21731,8 +21731,19 @@
GF_GLUSTERFS_LDFLAGS="-lnsl -lresolv -lsocket"
BUILD_FUSE_CLIENT=no
FUSE_CLIENT_SUBDIR=""
@@ -23,7 +34,7 @@ NetBSD uses libperfuse(3). Also enable debugging (-g) for now.
GF_HOST_OS="GF_BSD_HOST_OS"
GF_CFLAGS="${ARGP_STANDALONE_CPPFLAGS} -O0"
GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}"
-@@ -22849,8 +22860,9 @@
+@@ -22853,8 +22864,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 e4da8d88820..5838a63b59a 100644
--- a/filesystems/glusterfs/patches/patch-ar
+++ b/filesystems/glusterfs/patches/patch-ar
@@ -1,9 +1,9 @@
-$NetBSD: patch-ar,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-ar,v 1.3 2011/05/19 14:54:23 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-13 09:55:12.000000000 +0200
-+++ xlators/mount/fuse/src/Makefile.am 2011-04-13 09:56:14.000000000 +0200
+--- 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
@@ -15,8 +15,9 @@
fuse_la_SOURCES = fuse-helpers.c fuse-resolve.c fuse-bridge.c \
$(CONTRIBDIR)/fuse-lib/misc.c $(mount_source)
@@ -13,4 +13,4 @@ added at configure time for NetBSD.
AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -D$(GF_HOST_OS) -Wall \
-I$(top_srcdir)/libglusterfs/src -I$(CONTRIBDIR)/fuse-include \
- -I$(top_srcdir)/glusterfsd/src $(GF_CFLAGS) $(GF_FUSE_CFLAGS)
+ $(GF_CFLAGS) $(GF_FUSE_CFLAGS)
diff --git a/filesystems/glusterfs/patches/patch-as b/filesystems/glusterfs/patches/patch-as
index 8faecff78bd..9b57275539f 100644
--- a/filesystems/glusterfs/patches/patch-as
+++ b/filesystems/glusterfs/patches/patch-as
@@ -1,9 +1,9 @@
-$NetBSD: patch-as,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-as,v 1.3 2011/05/19 14:54:23 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-13 09:57:06.000000000 +0200
-+++ xlators/mount/fuse/src/Makefile.in 2011-04-13 09:57:24.000000000 +0200
+--- 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
@@ -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 ba860c60c3b..edd208eb3a2 100644
--- a/filesystems/glusterfs/patches/patch-ax
+++ b/filesystems/glusterfs/patches/patch-ax
@@ -1,8 +1,8 @@
-$NetBSD: patch-ax,v 1.1.1.1 2010/08/26 14:26:18 manu Exp $
+$NetBSD: patch-ax,v 1.2 2011/05/19 14:54:23 manu Exp $
Do not strip binaries so that we have debug for now.
---- install-sh.orig 2010-08-23 16:56:17.000000000 +0200
-+++ install-sh 2010-08-23 16:56:40.000000000 +0200
+--- install-sh.orig 2011-04-22 19:37:34.000000000 +0200
++++ install-sh 2011-05-19 12:39:25.000000000 +0200
@@ -120,9 +120,9 @@
shift
shift
diff --git a/filesystems/glusterfs/patches/patch-ba b/filesystems/glusterfs/patches/patch-ba
index 3d4c7dea4a5..d16891c7e4e 100644
--- a/filesystems/glusterfs/patches/patch-ba
+++ b/filesystems/glusterfs/patches/patch-ba
@@ -1,4 +1,4 @@
-$NetBSD: patch-ba,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-ba,v 1.3 2011/05/19 14:54:23 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,9 +14,9 @@ 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-13 09:59:38.000000000 +0200
-+++ ./xlators/performance/stat-prefetch/src/stat-prefetch.c 2011-04-13 10:01:01.000000000 +0200
-@@ -905,18 +905,24 @@
+--- 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
+@@ -949,18 +949,24 @@
path = dirname (cpy);
switch (i)
{
@@ -39,7 +39,7 @@ a SIGSEGV.
out:
+ if (cpy != NULL)
+ GF_FREE(cpy);
- return ret;
+ return ret;
}
diff --git a/filesystems/glusterfs/patches/patch-bb b/filesystems/glusterfs/patches/patch-bb
deleted file mode 100644
index 71ae5071ea7..00000000000
--- a/filesystems/glusterfs/patches/patch-bb
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2011/04/18 16:19:48 manu Exp $
-
-On NetBSD and FreeBSD, O_DIRECTORY does not exists and is defined as 0
-by glusterfs. ((flags & O_DIRECTORY) == O_DIRECTORY) always evaluate
-to true, and this is a bug.
---- ./xlators/performance/quick-read/src/quick-read.c.orig 2011-04-13 10:02:38.000000000 +0200
-+++ ./xlators/performance/quick-read/src/quick-read.c 2011-04-13 10:03:23.000000000 +0200
-@@ -637,9 +637,9 @@
- }
- }
- UNLOCK (&table->lock);
-
-- if (content_cached && ((flags & O_DIRECTORY) == O_DIRECTORY)) {
-+ if (content_cached && (flags & O_DIRECTORY)) {
- op_ret = -1;
- op_errno = ENOTDIR;
- goto unwind;
- }
diff --git a/filesystems/glusterfs/patches/patch-bc b/filesystems/glusterfs/patches/patch-bc
index fbac1f39d13..8d594776fef 100644
--- a/filesystems/glusterfs/patches/patch-bc
+++ b/filesystems/glusterfs/patches/patch-bc
@@ -1,4 +1,4 @@
-$NetBSD: patch-bc,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-bc,v 1.3 2011/05/19 14:54:23 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,18 +14,18 @@ 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-13 10:04:09.000000000 +0200
-+++ xlators/performance/quick-read/src/quick-read.c 2011-04-13 10:05:35.000000000 +0200
+--- 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
@@ -80,8 +80,9 @@
qr_loc_fill (loc_t *loc, inode_t *inode, char *path)
{
- int32_t ret = -1;
+ int32_t ret = -1;
char *parent = NULL;
-+ char *path_copy = NULL;
++ char *path_copy = NULL;
- if ((loc == NULL) || (inode == NULL) || (path == NULL)
- || (inode->table == NULL)) {
- ret = -1;
+ GF_VALIDATE_OR_GOTO_WITH_ERROR ("quick-read", loc, out, errno, EINVAL);
+ GF_VALIDATE_OR_GOTO_WITH_ERROR ("quick-read", inode, out, errno,
+ EINVAL);
@@ -92,15 +93,15 @@
loc->inode = inode_ref (inode);
loc->path = gf_strdup (path);
@@ -45,9 +45,9 @@ a SIGSEGV.
loc->parent = inode_from_path (inode->table, parent);
if (loc->parent == NULL) {
ret = -1;
-@@ -114,10 +115,10 @@
+@@ -116,10 +117,10 @@
+ if (ret == -1) {
qr_loc_wipe (loc);
-
}
- if (parent) {
diff --git a/filesystems/glusterfs/patches/patch-be b/filesystems/glusterfs/patches/patch-be
index 4af8e8c06ef..2b4cd31dec6 100644
--- a/filesystems/glusterfs/patches/patch-be
+++ b/filesystems/glusterfs/patches/patch-be
@@ -1,19 +1,10 @@
-$NetBSD: patch-be,v 1.2 2011/04/18 16:19:48 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.
-
-Also map Linux extended attribute system calls to NetBSD counterpart
-
---- libglusterfs/src/compat.c.orig 2011-04-09 10:09:02.000000000 +0200
-+++ libglusterfs/src/compat.c 2011-04-14 10:36:40.000000000 +0200
-@@ -547,4 +547,282 @@
- len++;
- return len;
+--- libglusterfs/src/compat.c.orig 2011-04-22 19:37:28.000000000 +0200
++++ libglusterfs/src/compat.c 2011-05-19 15:27:32.000000000 +0200
+@@ -529,8 +529,285 @@
+
}
- #endif /* STRNLEN */
-+
+ #endif /* GF_SOLARIS_HOST_OS */
+
+#ifdef __NetBSD__
+/*
+ * basename() and dirname() are not supposed to be thread-safe.
@@ -291,3 +282,7 @@ Also map Linux extended attribute system calls to NetBSD counterpart
+{ return extattr_set_link(path, EXTATTR_NAMESPACE_USER, key, value, size); }
+
+#endif /* __NetBSD__ */
+ #ifndef HAVE_STRNLEN
+ size_t
+ strnlen(const char *string, size_t maxlen)
+ {
diff --git a/filesystems/glusterfs/patches/patch-bf b/filesystems/glusterfs/patches/patch-bf
index c650fa879e9..180f350c435 100644
--- a/filesystems/glusterfs/patches/patch-bf
+++ b/filesystems/glusterfs/patches/patch-bf
@@ -1,16 +1,16 @@
-$NetBSD: patch-bf,v 1.2 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-bf,v 1.3 2011/05/19 14:54:23 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-04-09 10:09:02.000000000 +0200
-+++ libglusterfs/src/compat.h 2011-04-14 15:27:54.000000000 +0200
+--- libglusterfs/src/compat.h.orig 2011-04-22 19:37:28.000000000 +0200
++++ libglusterfs/src/compat.h 2011-05-19 12:45:53.000000000 +0200
@@ -57,9 +57,9 @@
#endif /* HAVE_LLISTXATTR */
#endif /* GF_LINUX_HOST_OS */
- #ifdef GF_BSD_HOST_OS
+ #ifdef GF_BSD_HOST_OS
-/* In case of FreeBSD */
+/* In case of FreeBSD and NetBSD */
diff --git a/filesystems/glusterfs/patches/patch-bg b/filesystems/glusterfs/patches/patch-bg
deleted file mode 100644
index a10bae0c8f8..00000000000
--- a/filesystems/glusterfs/patches/patch-bg
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2011/04/18 16:19:48 manu Exp $
-GCC does not have to be being with 64 bit mode.
---- argp-standalone/configure.orig 2011-04-13 10:27:45.000000000 +0200
-+++ argp-standalone/configure 2011-04-13 10:27:52.000000000 +0200
-@@ -6114,9 +6114,9 @@
- true
- else
- CFLAGS="$CFLAGS -ggdb3"
- fi
-- CFLAGS="$CFLAGS -m64 -Wall -W \
-+ CFLAGS="$CFLAGS -Wall -W \
- -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes \
- -Waggregate-return \
- -Wpointer-arith -Wbad-function-cast -Wnested-externs"
- fi
diff --git a/filesystems/glusterfs/patches/patch-bh b/filesystems/glusterfs/patches/patch-bh
index 19471cc6356..e1359dcb987 100644
--- a/filesystems/glusterfs/patches/patch-bh
+++ b/filesystems/glusterfs/patches/patch-bh
@@ -1,13 +1,13 @@
-$NetBSD: patch-bh,v 1.1 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-bh,v 1.2 2011/05/19 14:54:23 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-13 10:41:50.000000000 +0200
-+++ rpc/rpc-lib/src/xdr-common.h 2011-04-13 10:47:57.000000000 +0200
-@@ -29,8 +29,12 @@
+--- 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
+@@ -29,8 +29,13 @@
#include <sys/types.h>
#include <rpc/xdr.h>
#include <sys/uio.h>
@@ -16,11 +16,12 @@ Also define proper xdr types for NetBSD.
+#include <dirent.h>
+#endif /* __NetBSD__ */
+
++
enum gf_dump_procnum {
GF_DUMP_NULL,
GF_DUMP_DUMP,
GF_DUMP_MAXVALUE,
-@@ -46,8 +50,15 @@
+@@ -46,8 +51,15 @@
#define xdr_uint32_t xdr_u_int32_t
#define uint64_t u_int64_t
#endif
diff --git a/filesystems/glusterfs/patches/patch-bj b/filesystems/glusterfs/patches/patch-bj
index 945ab021db4..9a20f9505e1 100644
--- a/filesystems/glusterfs/patches/patch-bj
+++ b/filesystems/glusterfs/patches/patch-bj
@@ -1,8 +1,8 @@
-$NetBSD: patch-bj,v 1.1 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-bj,v 1.2 2011/05/19 14:54:23 manu Exp $
Make sure NetBSD pulls proper FUSE header
---- xlators/mount/fuse/src/fuse-bridge.h.orig 2011-04-13 14:32:26.000000000 +0200
-+++ xlators/mount/fuse/src/fuse-bridge.h 2011-04-13 14:32:27.000000000 +0200
-@@ -58,9 +58,9 @@
+--- 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 @@
/* TODO: when supporting posix acl, remove this definition */
#define DISABLE_POSIX_ACL
diff --git a/filesystems/glusterfs/patches/patch-bk b/filesystems/glusterfs/patches/patch-bk
index 15b662d3f30..15c9dce795f 100644
--- a/filesystems/glusterfs/patches/patch-bk
+++ b/filesystems/glusterfs/patches/patch-bk
@@ -1,61 +1,9 @@
-$NetBSD: patch-bk,v 1.1 2011/04/18 16:19:48 manu Exp $
+$NetBSD: patch-bk,v 1.2 2011/05/19 14:54:23 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/Makefile.am.orig 2011-04-09 10:09:02.000000000 +0200
-+++ rpc/rpc-lib/src/Makefile.am 2011-04-13 15:34:52.000000000 +0200
-@@ -1,9 +1,9 @@
- lib_LTLIBRARIES = libgfrpc.la
-
- libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \
-- rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \
-- rpc-common.c
-+ rpc-transport.c xdr-rpc.c xdr-rpcclnt.c xdr-sizeof.c \
-+ rpc-clnt.c auth-glusterfs.c rpc-common.c
- libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
-
- noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \
- rpc-clnt.h rpcsvc-common.h protocol-common.h
---- rpc/rpc-lib/src/Makefile.in.orig 2011-04-09 10:09:13.000000000 +0200
-+++ rpc/rpc-lib/src/Makefile.in 2011-04-13 15:34:52.000000000 +0200
-@@ -58,10 +58,10 @@
- LTLIBRARIES = $(lib_LTLIBRARIES)
- libgfrpc_la_DEPENDENCIES = \
- $(top_builddir)/libglusterfs/src/libglusterfs.la
- am_libgfrpc_la_OBJECTS = auth-unix.lo rpcsvc-auth.lo rpcsvc.lo \
-- auth-null.lo rpc-transport.lo xdr-rpc.lo xdr-rpcclnt.lo \
-- rpc-clnt.lo auth-glusterfs.lo rpc-common.lo
-+ auth-null.lo rpc-transport.lo xdr-rpc.lo xdr-sizeof.lo \
-+ xdr-rpcclnt.lo rpc-clnt.lo auth-glusterfs.lo rpc-common.lo
- libgfrpc_la_OBJECTS = $(am_libgfrpc_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -221,10 +221,10 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- lib_LTLIBRARIES = libgfrpc.la
- libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \
-- rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \
-- rpc-common.c
-+ rpc-transport.c xdr-rpc.c xdr-rpcclnt.c xdr-sizeof.c \
-+ rpc-clnt.c auth-glusterfs.c rpc-common.c
-
- libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
- noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \
- rpc-clnt.h rpcsvc-common.h protocol-common.h
-@@ -313,8 +313,9 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpcsvc-auth.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpcsvc.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr-rpc.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr-rpcclnt.Plo@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr-sizeof.Plo@am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
- @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
---- rpc/rpc-lib/src/xdr-sizeof.c.orig 2011-04-13 15:34:52.000000000 +0200
-+++ rpc/rpc-lib/src/xdr-sizeof.c 2011-04-13 15:46:04.000000000 +0200
+--- 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
@@ -0,0 +1,164 @@
+#ifdef __NetBSD__
+/*
diff --git a/filesystems/glusterfs/patches/patch-bl b/filesystems/glusterfs/patches/patch-bl
new file mode 100644
index 00000000000..c00b040a96c
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-bl
@@ -0,0 +1,16 @@
+$NetBSD: patch-bl,v 1.1 2011/05/19 14:54:23 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
+@@ -20,8 +20,9 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <stdlib.h>
++#include <signal.h>
+
+ #ifndef _CONFIG_H
+ #define _CONFIG_H
+ #include "config.h"
diff --git a/filesystems/glusterfs/patches/patch-bm b/filesystems/glusterfs/patches/patch-bm
new file mode 100644
index 00000000000..d7b35fb1731
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-bm
@@ -0,0 +1,17 @@
+$NetBSD: patch-bm,v 1.1 2011/05/19 14:54:23 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
+@@ -1,9 +1,9 @@
+ lib_LTLIBRARIES = libgfrpc.la
+
+ libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \
+ rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \
+- rpc-common.c
++ rpc-common.c xdr-sizeof.c
+ libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+
+ noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \
+ rpc-clnt.h rpcsvc-common.h protocol-common.h
diff --git a/filesystems/glusterfs/patches/patch-bn b/filesystems/glusterfs/patches/patch-bn
new file mode 100644
index 00000000000..865ab49fdb4
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-bn
@@ -0,0 +1,38 @@
+$NetBSD: patch-bn,v 1.1 2011/05/19 14:54:23 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
+@@ -59,9 +59,9 @@
+ libgfrpc_la_DEPENDENCIES = \
+ $(top_builddir)/libglusterfs/src/libglusterfs.la
+ am_libgfrpc_la_OBJECTS = auth-unix.lo rpcsvc-auth.lo rpcsvc.lo \
+ auth-null.lo rpc-transport.lo xdr-rpc.lo xdr-rpcclnt.lo \
+- rpc-clnt.lo auth-glusterfs.lo rpc-common.lo
++ rpc-clnt.lo auth-glusterfs.lo rpc-common.lo xdr-sizeof.lo
+ libgfrpc_la_OBJECTS = $(am_libgfrpc_la_OBJECTS)
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -222,9 +222,9 @@
+ target_alias = @target_alias@
+ lib_LTLIBRARIES = libgfrpc.la
+ libgfrpc_la_SOURCES = auth-unix.c rpcsvc-auth.c rpcsvc.c auth-null.c \
+ rpc-transport.c xdr-rpc.c xdr-rpcclnt.c rpc-clnt.c auth-glusterfs.c \
+- rpc-common.c
++ rpc-common.c xdr-sizeof.lo
+
+ libgfrpc_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la
+ noinst_HEADERS = rpcsvc.h rpc-transport.h xdr-common.h xdr-rpc.h xdr-rpcclnt.h \
+ rpc-clnt.h rpcsvc-common.h protocol-common.h
+@@ -308,8 +308,9 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth-null.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/auth-unix.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpc-clnt.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpc-common.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr-sizeof.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpc-transport.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpcsvc-auth.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rpcsvc.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdr-rpc.Plo@am__quote@
diff --git a/filesystems/glusterfs/patches/patch-bo b/filesystems/glusterfs/patches/patch-bo
new file mode 100644
index 00000000000..b5e4b771f3d
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-bo
@@ -0,0 +1,12 @@
+--- 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
+@@ -23,8 +23,9 @@
+ * It was generated using rpcgen.
+ */
+
+ #include "cli1-xdr.h"
++#include "xdr-common.h"
+ #include "compat.h"
+
+ bool_t
+ xdr_gf1_cluster_type (XDR *xdrs, gf1_cluster_type *objp)