Upgrade to glusterfs 3.5.0

New features includes...
 - File snapshots
 - On-wire compression/decompression
 - Quota sclability
 - Disk encryption
 - Brick failure detection

7 files changed, 121 insertions, 156 deletions

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index b0dbf37368a..1d8f2e06c73 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.37 2013/10/04 08:07:23 manu Exp $
+# $NetBSD: Makefile,v 1.38 2014/04/18 08:31:20 manu Exp $
 #
 
-DISTNAME=	glusterfs-3.4.1
-PKGREVISION=	1
+DISTNAME=	glusterfs-3.5.0
+#PKGREVISION=	1
 CATEGORIES=	filesystems
-MASTER_SITES=	http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.1/
+MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gluster.org/
@@ -25,43 +25,31 @@ MAKE_FLAGS+=		LEXLIB=""
 MAKE_FLAGS+=		libglusterfs_la_LIBADD=""
 MAKE_ENV+=		AM_MAKEFLAGS=${MAKE_FLAGS:Q}
 
-SUBST_CLASSES+=		py
-SUBST_STAGE.py=		post-build
-SUBST_FILES.py=		extras/volgen/glusterfs-volgen
-SUBST_SED.py=		-e "s,/usr/bin/python,${PYTHONBIN},g"
-
-SUBST_CLASSES+=		bash
-SUBST_STAGE.bash=	post-build
-SUBST_FILES.bash=	xlators/mount/fuse/utils/mount.glusterfs
-SUBST_SED.bash=		-e "s,/bin/bash,/bin/sh,g"
+REPLACE_PYTHON=		api/examples/gfapi.py
+REPLACE_PYTHON+=	contrib/ipaddr-py/ipaddr.py
+REPLACE_PYTHON+=	gen-headers.py
+REPLACE_PYTHON+=	tests/bugs/overlap.py
+REPLACE_PYTHON+=	tests/utils/create-files.py
 
 SUBST_CLASSES+=		mtab
 SUBST_STAGE.mtab=	post-build
-SUBST_FILES.mtab=	xlators/mount/fuse/utils/mount.glusterfs
+SUBST_FILES.mtab=	doc/mount.glusterfs.8
+SUBST_FILES.mtab=	libglusterfs/src/compat.h
+SUBST_FILES.mtab=	xlators/mount/fuse/utils/mount.glusterfs.in
 SUBST_SED.mtab=		-e "s,/etc/mtab,/proc/mounts,g"
 
 SUBST_CLASSES+=		etc
 SUBST_STAGE.etc=	pre-build
-SUBST_FILES.etc+=	cli/src/cli-rpc-ops.c
-SUBST_FILES.etc+=	libglusterfs/src/compat.h
-SUBST_FILES.etc+=	xlators/mgmt/glusterd/src/glusterd-op-sm.c
-SUBST_FILES.etc+=	xlators/mgmt/glusterd/src/glusterd.h
-SUBST_FILES.etc+=	doc/examples/replicate.vol
-SUBST_FILES.etc+=	doc/examples/protocol-server.vol
-SUBST_FILES.etc+=	doc/examples/unify.vol
-SUBST_FILES.etc+=	doc/examples/stripe.vol
-SUBST_FILES.etc+=	doc/glusterd.vol
-SUBST_FILES.etc+=	doc/glusterfsd.8
-SUBST_FILES.etc+=	doc/glusterfsd.vol.sample
+SUBST_FILES.etc+=       libglusterfs/src/logging.c
+SUBST_FILES.etc+=       extras/ocf/volume
+SUBST_FILES.etc+=       doc/glusterfsd.8
 SUBST_SED.etc=		-e "s,/etc/gluster,${PREFIX}/etc/gluster,g"
 
 SUBST_CLASSES+=		vol
 SUBST_STAGE.vol=	post-build
-SUBST_FILES.vol=	doc/Makefile
+SUBST_FILES.vol=	extras/Makefile
 SUBST_SED.vol=		-e "s/glusterd.vol/glusterd.vol.sample/g"
 
-REPLACE_PYTHON+=	${WRKSRC}/extras/volgen/glusterfs-volgen
-
 EGDIR=			${PREFIX}/etc/glusterfs
 CONF_FILES+=		${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol
 OWN_DIRS+=		${VARBASE}/log/glusterfs
@@ -72,24 +60,33 @@ RCD_SCRIPTS=		glusterfsd glusterd
 PLIST_SRC=		${PLIST_SRC_DFLT}
 PLIST_SUBST+=		VARBASE=${VARBASE}
 PLIST_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+PLIST_SUBST+=		PYSITELIB=${PYSITELIB:Q}
 MESSAGE_SRC=		${PKGDIR}/MESSAGE.${OPSYS}
 
 
+pre-build:
+	cd ${WRKSRC} && ./gen-headers.py
+
 post-build:
-	 cp ${WRKSRC}/doc/glusterd.vol ${WRKSRC}/doc/glusterd.vol.sample
+	cp ${WRKSRC}/extras/glusterd.vol ${WRKSRC}/extras/glusterd.vol.sample
 
 post-install:
 	${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount.glusterfs \
 	    ${DESTDIR}/${PREFIX}/sbin/mount.glusterfs
 
 # Debug
-CFLAGS+=		-g
+CFLAGS+=		-g 
 INSTALL_UNSTRIPPED=	yes
+.include "../../devel/boehm-gc/buildlink3.mk"
+CFLAGS+=-DGC_DEBUG
+CFLAGS+=-include gc.h
+LIBS+=-lgc
 
 .include "options.mk"
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/extension.mk"
 .if ${OPSYS} == "NetBSD"
 #.include "../../filesystems/perfuse/buildlink3.mk"
 .endif
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index f8ecb2d592a..280e0efbbe8 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,63 +1,93 @@
-@comment $NetBSD: PLIST,v 1.17 2014/03/11 14:05:01 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.18 2014/04/18 08:31:20 manu Exp $
+etc/glusterfs/gluster-rsyslog-5.8.conf
+etc/glusterfs/gluster-rsyslog-7.2.conf
 etc/glusterfs/glusterd.vol.sample
+etc/glusterfs/glusterfs-georep-logrotate
 etc/glusterfs/glusterfs-logrotate
+etc/glusterfs/logger.conf.example
+include/glusterfs/api/glfs-handles.h
 include/glusterfs/api/glfs.h
-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
+include/glusterfs/gfchangelog/changelog.h
+lib/glusterfs/3.5.0/auth/addr.la
+lib/glusterfs/3.5.0/auth/login.la
+lib/glusterfs/3.5.0/rpc-transport/socket.la
+lib/glusterfs/3.5.0/xlator/cluster/afr.la
+lib/glusterfs/3.5.0/xlator/cluster/dht.la
+lib/glusterfs/3.5.0/xlator/cluster/distribute.so
+lib/glusterfs/3.5.0/xlator/cluster/nufa.la
+lib/glusterfs/3.5.0/xlator/cluster/pump.la
+lib/glusterfs/3.5.0/xlator/cluster/replicate.so
+lib/glusterfs/3.5.0/xlator/cluster/stripe.la
+lib/glusterfs/3.5.0/xlator/cluster/switch.la
+lib/glusterfs/3.5.0/xlator/debug/error-gen.la
+lib/glusterfs/3.5.0/xlator/debug/io-stats.la
+lib/glusterfs/3.5.0/xlator/debug/trace.la
+lib/glusterfs/3.5.0/xlator/encryption/crypt.la
+lib/glusterfs/3.5.0/xlator/encryption/rot-13.la
+lib/glusterfs/3.5.0/xlator/features/access-control.so
+lib/glusterfs/3.5.0/xlator/features/cdc.la
+lib/glusterfs/3.5.0/xlator/features/changelog.la
+lib/glusterfs/3.5.0/xlator/features/gfid-access.la
+lib/glusterfs/3.5.0/xlator/features/glupy.la
+lib/glusterfs/3.5.0/xlator/features/glupy/debug-trace.py
+lib/glusterfs/3.5.0/xlator/features/glupy/debug-trace.pyc
+lib/glusterfs/3.5.0/xlator/features/glupy/debug-trace.pyo
+lib/glusterfs/3.5.0/xlator/features/glupy/helloworld.py
+lib/glusterfs/3.5.0/xlator/features/glupy/helloworld.pyc
+lib/glusterfs/3.5.0/xlator/features/glupy/helloworld.pyo
+lib/glusterfs/3.5.0/xlator/features/glupy/negative.py
+lib/glusterfs/3.5.0/xlator/features/glupy/negative.pyc
+lib/glusterfs/3.5.0/xlator/features/glupy/negative.pyo
+lib/glusterfs/3.5.0/xlator/features/index.la
+lib/glusterfs/3.5.0/xlator/features/locks.la
+lib/glusterfs/3.5.0/xlator/features/mac-compat.la
+lib/glusterfs/3.5.0/xlator/features/marker.la
+lib/glusterfs/3.5.0/xlator/features/posix-locks.so
+lib/glusterfs/3.5.0/xlator/features/prot_client.la
+lib/glusterfs/3.5.0/xlator/features/prot_dht.la
+lib/glusterfs/3.5.0/xlator/features/prot_server.la
+lib/glusterfs/3.5.0/xlator/features/quiesce.la
+lib/glusterfs/3.5.0/xlator/features/quota.la
+lib/glusterfs/3.5.0/xlator/features/quotad.la
+lib/glusterfs/3.5.0/xlator/features/read-only.la
+lib/glusterfs/3.5.0/xlator/features/worm.la
+lib/glusterfs/3.5.0/xlator/mgmt/glusterd.la
+lib/glusterfs/3.5.0/xlator/mount/api.la
+lib/glusterfs/3.5.0/xlator/mount/fuse.la
+lib/glusterfs/3.5.0/xlator/nfs/server.la
+lib/glusterfs/3.5.0/xlator/performance/io-cache.la
+lib/glusterfs/3.5.0/xlator/performance/io-threads.la
+lib/glusterfs/3.5.0/xlator/performance/md-cache.la
+lib/glusterfs/3.5.0/xlator/performance/open-behind.la
+lib/glusterfs/3.5.0/xlator/performance/quick-read.la
+lib/glusterfs/3.5.0/xlator/performance/read-ahead.la
+lib/glusterfs/3.5.0/xlator/performance/readdir-ahead.la
+lib/glusterfs/3.5.0/xlator/performance/stat-prefetch.so
+lib/glusterfs/3.5.0/xlator/performance/write-behind.la
+lib/glusterfs/3.5.0/xlator/protocol/client.la
+lib/glusterfs/3.5.0/xlator/protocol/server.la
+lib/glusterfs/3.5.0/xlator/storage/posix.la
+lib/glusterfs/3.5.0/xlator/system/posix-acl.la
+lib/glusterfs/3.5.0/xlator/testing/features/template.la
+lib/glusterfs/3.5.0/xlator/testing/performance/symlink-cache.la
 lib/libgfapi.la
-lib/libgfapi.so
-lib/libgfapi.so.0
-lib/libgfapi.so.0.0.0
+lib/libgfchangelog.la
 lib/libgfrpc.la
 lib/libgfxdr.la
 lib/libglusterfs.la
 lib/ocf/resource.d/glusterfs/glusterd
 lib/ocf/resource.d/glusterfs/volume
 lib/pkgconfig/glusterfs-api.pc
+lib/pkgconfig/libgfchangelog.pc
+${PYSITELIB}/gluster/__init__.py
+${PYSITELIB}/gluster/__init__.pyc
+${PYSITELIB}/gluster/__init__.pyo
+${PYSITELIB}/gluster/gfapi.py
+${PYSITELIB}/gluster/gfapi.pyc
+${PYSITELIB}/gluster/gfapi.pyo
+${PYSITELIB}/gluster/glupy.py
+${PYSITELIB}/gluster/glupy.pyc
+${PYSITELIB}/gluster/glupy.pyo
 man/man8/gluster.8
 man/man8/glusterd.8
 man/man8/glusterfs.8
@@ -75,4 +105,13 @@ share/doc/glusterfs/benchmarking/local-script.sh
 share/doc/glusterfs/benchmarking/rdd.c
 share/doc/glusterfs/glusterfs-mode.el
 share/doc/glusterfs/glusterfs.vim
+share/examples/rc.d/glusterd
+share/examples/rc.d/glusterfsd
+share/glusterfs/scripts/generate-gfid-file.sh
+share/glusterfs/scripts/get-gfid.sh
+share/glusterfs/scripts/gsync-sync-gfid
+share/glusterfs/scripts/gsync-upgrade.sh
+share/glusterfs/scripts/post-upgrade-script-for-quota.sh
+share/glusterfs/scripts/pre-upgrade-script-for-quota.sh
+share/glusterfs/scripts/slave-upgrade.sh
 @exec test -d ${PKG_SYSCONFDIR}/glusterd -a ! -d ${VARBASE}/lib/glusterd && ${MKDIR} -p ${VARBASE}/lib/ && mv ${PKG_SYSCONFDIR}/glusterd  ${VARBASE}/lib/glusterd && ${LN} -s ${VARBASE}/lib/glusterd  ${PKG_SYSCONFDIR}/glusterd
diff --git a/filesystems/glusterfs/PLIST.georeplication b/filesystems/glusterfs/PLIST.georeplication
index 7665228268b..bf25c1067ec 100644
--- a/filesystems/glusterfs/PLIST.georeplication
+++ b/filesystems/glusterfs/PLIST.georeplication
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.georeplication,v 1.6 2013/10/01 00:30:26 manu Exp $
+@comment $NetBSD: PLIST.georeplication,v 1.7 2014/04/18 08:31:20 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 bd4ccbe9eee..b987d0dc89e 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.32 2013/10/04 08:07:23 manu Exp $
+$NetBSD: distinfo,v 1.33 2014/04/18 08:31:20 manu Exp $
 
-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 (glusterfs-3.5.0.tar.gz) = 9900cae6c8c876ec69d244eeee1dd72a7797e03a
+RMD160 (glusterfs-3.5.0.tar.gz) = c836c58e224053632da65496c47eddf570e5e49b
+Size (glusterfs-3.5.0.tar.gz) = 4883901 bytes
 SHA1 (patch-argp-standalone_argp-fmtstream.c) = 241873f41bb774e1de4f777227c38b0dcae4ac59
 SHA1 (patch-argp-standalone_argp-fmtstream.h) = 9f2ead2a11c35fcc6347977082fa347343fccab2
-SHA1 (patch-cg) = ebb691ddaa56bd8368cc9a0458a8caeec64d2b8e
-SHA1 (patch-xlators_mount_fuse_src_fuse-helpers.c) = a770d557191c91a731da15e95caf5acd7ed567ff
diff --git a/filesystems/glusterfs/files/glusterd.sh b/filesystems/glusterfs/files/glusterd.sh
deleted file mode 100755
index d9b4d31fc64..00000000000
--- a/filesystems/glusterfs/files/glusterd.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: glusterd.sh,v 1.10 2012/10/19 04:15:21 manu Exp $
-#
-
-# PROVIDE: glusterd
-# REQUIRE: rpcbind
-# BEFORE: glusterfsd
-
-$_rc_subr_loaded . /etc/rc.subr
-
-glusterd_precmd()
-{
-	test -d @VARBASE@/lib/glusterd && return
-	test -d @PREFIX@/etc/glusterd || return
-	mv @PREFIX@/etc/glusterd @VARBASE@/lib/glusterd && \
-	    ln -s @VARBASE@/lib/glusterd @PREFIX@/etc/glusterd
-}
-
-name="glusterd"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-start_precmd="glusterd_precmd"
-pidfile="/var/run/${name}.pid"
-command_args="-p ${pidfile}"
-required_files="@PREFIX@/etc/glusterfs/${name}.vol"
-
-load_rc_config $name
-run_rc_command "$1"
-
diff --git a/filesystems/glusterfs/patches/patch-cg b/filesystems/glusterfs/patches/patch-cg
deleted file mode 100644
index f77e7b8343e..00000000000
--- a/filesystems/glusterfs/patches/patch-cg
+++ /dev/null
@@ -1,24 +0,0 @@
-$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-xlators_mount_fuse_src_fuse-helpers.c b/filesystems/glusterfs/patches/patch-xlators_mount_fuse_src_fuse-helpers.c
deleted file mode 100644
index 14e3d8678b4..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.3 2013/10/04 08:07:23 manu 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>