Update glusterfs to 3.7.9

This is a maintenance release

3 files changed, 87 insertions, 86 deletions

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index 65a4417e23e..1bdb401fad1 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.62 2016/03/05 11:28:29 jperkin Exp $
+# $NetBSD: Makefile,v 1.63 2016/03/22 08:14:00 manu Exp $
 
-DISTNAME=	glusterfs-3.7.8
+DISTNAME=	glusterfs-3.7.9
 #PKGREVISION=	1
-PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
@@ -25,6 +24,7 @@ MAKE_FLAGS+=		LEXLIB=""
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # only 2.x supported as of 3.6.0
 
 REPLACE_PYTHON+=	contrib/ipaddr-py/ipaddr.py
+REPLACE_PYTHON+=	extras/geo-rep/schedule_georep.py
 REPLACE_PYTHON+=	extras/snap_scheduler/gcron.py
 REPLACE_PYTHON+=	extras/snap_scheduler/snap_scheduler.py
 REPLACE_PYTHON+=	geo-replication/src/peer_mountbroker.in
@@ -78,7 +78,7 @@ SUBST_SED.etc=		-e "s,/etc/gluster,${PREFIX}/etc/gluster,g"
 SUBST_CLASSES+=		vol
 SUBST_STAGE.vol=	post-build
 SUBST_FILES.vol=	extras/Makefile
-SUBST_SED.vol=		-e "/^vol_DATA/s/glusterd.vol/glusterd.vol.sample/g"
+SUBST_SED.vol=		-e "/vol_DATA/s/glusterd.vol/glusterd.vol.sample/g"
 
 EGDIR=			${PREFIX}/etc/glusterfs
 CONF_FILES+=		${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index a02f3d24cd0..e02d7741de5 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.31 2016/02/09 11:04:51 manu Exp $
+@comment $NetBSD: PLIST,v 1.32 2016/03/22 08:14:00 manu Exp $
 ${PYSITELIB}/gluster/__init__.py
 ${PYSITELIB}/gluster/__init__.pyc
 ${PYSITELIB}/gluster/__init__.pyo
@@ -23,83 +23,83 @@ include/glusterfs/gfdb/gfdb_data_store_types.h
 include/glusterfs/gfdb/gfdb_mem-types.h
 include/glusterfs/gfdb/gfdb_sqlite3.h
 include/glusterfs/gfdb/gfdb_sqlite3_helper.h
-lib/glusterfs/3.7.8/auth/addr.la
-lib/glusterfs/3.7.8/auth/login.la
-lib/glusterfs/3.7.8/rpc-transport/socket.la
-lib/glusterfs/3.7.8/xlator/cluster/afr.la
-lib/glusterfs/3.7.8/xlator/cluster/dht.la
-lib/glusterfs/3.7.8/xlator/cluster/disperse.so
-lib/glusterfs/3.7.8/xlator/cluster/distribute.so
-lib/glusterfs/3.7.8/xlator/cluster/ec.la
-lib/glusterfs/3.7.8/xlator/cluster/nufa.la
-lib/glusterfs/3.7.8/xlator/cluster/pump.la
-lib/glusterfs/3.7.8/xlator/cluster/replicate.so
-lib/glusterfs/3.7.8/xlator/cluster/stripe.la
-lib/glusterfs/3.7.8/xlator/cluster/switch.la
-lib/glusterfs/3.7.8/xlator/cluster/tier.la
-lib/glusterfs/3.7.8/xlator/debug/error-gen.la
-lib/glusterfs/3.7.8/xlator/debug/io-stats.la
-lib/glusterfs/3.7.8/xlator/debug/trace.la
-lib/glusterfs/3.7.8/xlator/encryption/crypt.la
-lib/glusterfs/3.7.8/xlator/encryption/rot-13.la
-lib/glusterfs/3.7.8/xlator/features/access-control.so
-lib/glusterfs/3.7.8/xlator/features/arbiter.la
-lib/glusterfs/3.7.8/xlator/features/barrier.la
-lib/glusterfs/3.7.8/xlator/features/bit-rot.la
-lib/glusterfs/3.7.8/xlator/features/bitrot-stub.la
-lib/glusterfs/3.7.8/xlator/features/cdc.la
-lib/glusterfs/3.7.8/xlator/features/changelog.la
-lib/glusterfs/3.7.8/xlator/features/changetimerecorder.la
-lib/glusterfs/3.7.8/xlator/features/ganesha.la
-lib/glusterfs/3.7.8/xlator/features/gfid-access.la
-lib/glusterfs/3.7.8/xlator/features/glupy.la
-lib/glusterfs/3.7.8/xlator/features/glupy/debug-trace.py
-lib/glusterfs/3.7.8/xlator/features/glupy/debug-trace.pyc
-lib/glusterfs/3.7.8/xlator/features/glupy/debug-trace.pyo
-lib/glusterfs/3.7.8/xlator/features/glupy/helloworld.py
-lib/glusterfs/3.7.8/xlator/features/glupy/helloworld.pyc
-lib/glusterfs/3.7.8/xlator/features/glupy/helloworld.pyo
-lib/glusterfs/3.7.8/xlator/features/glupy/negative.py
-lib/glusterfs/3.7.8/xlator/features/glupy/negative.pyc
-lib/glusterfs/3.7.8/xlator/features/glupy/negative.pyo
-lib/glusterfs/3.7.8/xlator/features/index.la
-lib/glusterfs/3.7.8/xlator/features/locks.la
-lib/glusterfs/3.7.8/xlator/features/mac-compat.la
-lib/glusterfs/3.7.8/xlator/features/marker.la
-lib/glusterfs/3.7.8/xlator/features/posix-locks.so
-lib/glusterfs/3.7.8/xlator/features/prot_client.la
-lib/glusterfs/3.7.8/xlator/features/prot_dht.la
-lib/glusterfs/3.7.8/xlator/features/prot_server.la
-lib/glusterfs/3.7.8/xlator/features/quiesce.la
-lib/glusterfs/3.7.8/xlator/features/quota.la
-lib/glusterfs/3.7.8/xlator/features/quotad.la
-lib/glusterfs/3.7.8/xlator/features/read-only.la
-lib/glusterfs/3.7.8/xlator/features/shard.la
-lib/glusterfs/3.7.8/xlator/features/snapview-client.la
-lib/glusterfs/3.7.8/xlator/features/snapview-server.la
-lib/glusterfs/3.7.8/xlator/features/trash.la
-lib/glusterfs/3.7.8/xlator/features/upcall.la
-lib/glusterfs/3.7.8/xlator/features/worm.la
-lib/glusterfs/3.7.8/xlator/meta.la
-lib/glusterfs/3.7.8/xlator/mgmt/glusterd.la
-lib/glusterfs/3.7.8/xlator/mount/api.la
-lib/glusterfs/3.7.8/xlator/mount/fuse.la
-lib/glusterfs/3.7.8/xlator/nfs/server.la
-lib/glusterfs/3.7.8/xlator/performance/io-cache.la
-lib/glusterfs/3.7.8/xlator/performance/io-threads.la
-lib/glusterfs/3.7.8/xlator/performance/md-cache.la
-lib/glusterfs/3.7.8/xlator/performance/open-behind.la
-lib/glusterfs/3.7.8/xlator/performance/quick-read.la
-lib/glusterfs/3.7.8/xlator/performance/read-ahead.la
-lib/glusterfs/3.7.8/xlator/performance/readdir-ahead.la
-lib/glusterfs/3.7.8/xlator/performance/stat-prefetch.so
-lib/glusterfs/3.7.8/xlator/performance/write-behind.la
-lib/glusterfs/3.7.8/xlator/protocol/client.la
-lib/glusterfs/3.7.8/xlator/protocol/server.la
-lib/glusterfs/3.7.8/xlator/storage/posix.la
-lib/glusterfs/3.7.8/xlator/system/posix-acl.la
-lib/glusterfs/3.7.8/xlator/testing/features/template.la
-lib/glusterfs/3.7.8/xlator/testing/performance/symlink-cache.la
+lib/glusterfs/3.7.9/auth/addr.la
+lib/glusterfs/3.7.9/auth/login.la
+lib/glusterfs/3.7.9/rpc-transport/socket.la
+lib/glusterfs/3.7.9/xlator/cluster/afr.la
+lib/glusterfs/3.7.9/xlator/cluster/dht.la
+lib/glusterfs/3.7.9/xlator/cluster/disperse.so
+lib/glusterfs/3.7.9/xlator/cluster/distribute.so
+lib/glusterfs/3.7.9/xlator/cluster/ec.la
+lib/glusterfs/3.7.9/xlator/cluster/nufa.la
+lib/glusterfs/3.7.9/xlator/cluster/pump.la
+lib/glusterfs/3.7.9/xlator/cluster/replicate.so
+lib/glusterfs/3.7.9/xlator/cluster/stripe.la
+lib/glusterfs/3.7.9/xlator/cluster/switch.la
+lib/glusterfs/3.7.9/xlator/cluster/tier.la
+lib/glusterfs/3.7.9/xlator/debug/error-gen.la
+lib/glusterfs/3.7.9/xlator/debug/io-stats.la
+lib/glusterfs/3.7.9/xlator/debug/trace.la
+lib/glusterfs/3.7.9/xlator/encryption/crypt.la
+lib/glusterfs/3.7.9/xlator/encryption/rot-13.la
+lib/glusterfs/3.7.9/xlator/features/access-control.so
+lib/glusterfs/3.7.9/xlator/features/arbiter.la
+lib/glusterfs/3.7.9/xlator/features/barrier.la
+lib/glusterfs/3.7.9/xlator/features/bit-rot.la
+lib/glusterfs/3.7.9/xlator/features/bitrot-stub.la
+lib/glusterfs/3.7.9/xlator/features/cdc.la
+lib/glusterfs/3.7.9/xlator/features/changelog.la
+lib/glusterfs/3.7.9/xlator/features/changetimerecorder.la
+lib/glusterfs/3.7.9/xlator/features/ganesha.la
+lib/glusterfs/3.7.9/xlator/features/gfid-access.la
+lib/glusterfs/3.7.9/xlator/features/glupy.la
+lib/glusterfs/3.7.9/xlator/features/glupy/debug-trace.py
+lib/glusterfs/3.7.9/xlator/features/glupy/debug-trace.pyc
+lib/glusterfs/3.7.9/xlator/features/glupy/debug-trace.pyo
+lib/glusterfs/3.7.9/xlator/features/glupy/helloworld.py
+lib/glusterfs/3.7.9/xlator/features/glupy/helloworld.pyc
+lib/glusterfs/3.7.9/xlator/features/glupy/helloworld.pyo
+lib/glusterfs/3.7.9/xlator/features/glupy/negative.py
+lib/glusterfs/3.7.9/xlator/features/glupy/negative.pyc
+lib/glusterfs/3.7.9/xlator/features/glupy/negative.pyo
+lib/glusterfs/3.7.9/xlator/features/index.la
+lib/glusterfs/3.7.9/xlator/features/locks.la
+lib/glusterfs/3.7.9/xlator/features/mac-compat.la
+lib/glusterfs/3.7.9/xlator/features/marker.la
+lib/glusterfs/3.7.9/xlator/features/posix-locks.so
+lib/glusterfs/3.7.9/xlator/features/prot_client.la
+lib/glusterfs/3.7.9/xlator/features/prot_dht.la
+lib/glusterfs/3.7.9/xlator/features/prot_server.la
+lib/glusterfs/3.7.9/xlator/features/quiesce.la
+lib/glusterfs/3.7.9/xlator/features/quota.la
+lib/glusterfs/3.7.9/xlator/features/quotad.la
+lib/glusterfs/3.7.9/xlator/features/read-only.la
+lib/glusterfs/3.7.9/xlator/features/shard.la
+lib/glusterfs/3.7.9/xlator/features/snapview-client.la
+lib/glusterfs/3.7.9/xlator/features/snapview-server.la
+lib/glusterfs/3.7.9/xlator/features/trash.la
+lib/glusterfs/3.7.9/xlator/features/upcall.la
+lib/glusterfs/3.7.9/xlator/features/worm.la
+lib/glusterfs/3.7.9/xlator/meta.la
+lib/glusterfs/3.7.9/xlator/mgmt/glusterd.la
+lib/glusterfs/3.7.9/xlator/mount/api.la
+lib/glusterfs/3.7.9/xlator/mount/fuse.la
+lib/glusterfs/3.7.9/xlator/nfs/server.la
+lib/glusterfs/3.7.9/xlator/performance/io-cache.la
+lib/glusterfs/3.7.9/xlator/performance/io-threads.la
+lib/glusterfs/3.7.9/xlator/performance/md-cache.la
+lib/glusterfs/3.7.9/xlator/performance/open-behind.la
+lib/glusterfs/3.7.9/xlator/performance/quick-read.la
+lib/glusterfs/3.7.9/xlator/performance/read-ahead.la
+lib/glusterfs/3.7.9/xlator/performance/readdir-ahead.la
+lib/glusterfs/3.7.9/xlator/performance/stat-prefetch.so
+lib/glusterfs/3.7.9/xlator/performance/write-behind.la
+lib/glusterfs/3.7.9/xlator/protocol/client.la
+lib/glusterfs/3.7.9/xlator/protocol/server.la
+lib/glusterfs/3.7.9/xlator/storage/posix.la
+lib/glusterfs/3.7.9/xlator/system/posix-acl.la
+lib/glusterfs/3.7.9/xlator/testing/features/template.la
+lib/glusterfs/3.7.9/xlator/testing/performance/symlink-cache.la
 lib/libgfapi.la
 lib/libgfchangelog.la
 lib/libgfdb.la
@@ -222,6 +222,7 @@ 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/schedule_georep.py
 share/glusterfs/scripts/slave-upgrade.sh
 share/glusterfs/scripts/stop-all-gluster-processes.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/distinfo b/filesystems/glusterfs/distinfo
index bdcba59688f..6cd4fdb291b 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.48 2016/02/09 11:04:51 manu Exp $
+$NetBSD: distinfo,v 1.49 2016/03/22 08:14:00 manu Exp $
 
-SHA1 (glusterfs-3.7.8.tar.gz) = 7e35c369e9dbca8125bd977f4d537f7bd6ae3d63
-RMD160 (glusterfs-3.7.8.tar.gz) = b040564a67cd17fb299455532b8c3bb0fb387ea1
-Size (glusterfs-3.7.8.tar.gz) = 7866091 bytes
+SHA1 (glusterfs-3.7.9.tar.gz) = 37aafabb849c7bcc5fa1c3017c0f2f0df36ef431
+RMD160 (glusterfs-3.7.9.tar.gz) = 992557a72f0506b0ef97bcb98abad149de7f55e8
+Size (glusterfs-3.7.9.tar.gz) = 7971840 bytes