Upgrade to 3.7.7

This a maintenance release.

5 files changed, 86 insertions, 115 deletions

diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index a1ae59d8442..426971be8ce 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.59 2015/12/10 02:55:58 joerg Exp $
+# $NetBSD: Makefile,v 1.60 2016/02/01 14:27:02 manu Exp $
 
-DISTNAME=	glusterfs-3.7.6
-PKGREVISION=	1
+DISTNAME=	glusterfs-3.7.7
+#PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
@@ -21,7 +21,7 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 # Only libfl.a is available, and libtool wants libfl.so
 MAKE_FLAGS+=		LEXLIB=""
 
-PYTHON_VERSIONS_INCOMPATIBLE=	33 34 35 # only 2.x supported as of 3.6.0
+PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # only 2.x supported as of 3.6.0
 
 REPLACE_PYTHON+=	contrib/ipaddr-py/ipaddr.py
 REPLACE_PYTHON+=	extras/snap_scheduler/gcron.py
@@ -116,7 +116,6 @@ CONFIGURE_ARGS+=	--enable-debug
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/userspace-rcu/buildlink3.mk"
-.include "../../devel/argp/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index 0f0f3e4f506..5346df2bd2b 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2015/11/09 04:13:56 manu Exp $
+@comment $NetBSD: PLIST,v 1.30 2016/02/01 14:27:02 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.6/auth/addr.la
-lib/glusterfs/3.7.6/auth/login.la
-lib/glusterfs/3.7.6/rpc-transport/socket.la
-lib/glusterfs/3.7.6/xlator/cluster/afr.la
-lib/glusterfs/3.7.6/xlator/cluster/dht.la
-lib/glusterfs/3.7.6/xlator/cluster/disperse.so
-lib/glusterfs/3.7.6/xlator/cluster/distribute.so
-lib/glusterfs/3.7.6/xlator/cluster/ec.la
-lib/glusterfs/3.7.6/xlator/cluster/nufa.la
-lib/glusterfs/3.7.6/xlator/cluster/pump.la
-lib/glusterfs/3.7.6/xlator/cluster/replicate.so
-lib/glusterfs/3.7.6/xlator/cluster/stripe.la
-lib/glusterfs/3.7.6/xlator/cluster/switch.la
-lib/glusterfs/3.7.6/xlator/cluster/tier.la
-lib/glusterfs/3.7.6/xlator/debug/error-gen.la
-lib/glusterfs/3.7.6/xlator/debug/io-stats.la
-lib/glusterfs/3.7.6/xlator/debug/trace.la
-lib/glusterfs/3.7.6/xlator/encryption/crypt.la
-lib/glusterfs/3.7.6/xlator/encryption/rot-13.la
-lib/glusterfs/3.7.6/xlator/features/access-control.so
-lib/glusterfs/3.7.6/xlator/features/arbiter.la
-lib/glusterfs/3.7.6/xlator/features/barrier.la
-lib/glusterfs/3.7.6/xlator/features/bit-rot.la
-lib/glusterfs/3.7.6/xlator/features/bitrot-stub.la
-lib/glusterfs/3.7.6/xlator/features/cdc.la
-lib/glusterfs/3.7.6/xlator/features/changelog.la
-lib/glusterfs/3.7.6/xlator/features/changetimerecorder.la
-lib/glusterfs/3.7.6/xlator/features/ganesha.la
-lib/glusterfs/3.7.6/xlator/features/gfid-access.la
-lib/glusterfs/3.7.6/xlator/features/glupy.la
-lib/glusterfs/3.7.6/xlator/features/glupy/debug-trace.py
-lib/glusterfs/3.7.6/xlator/features/glupy/debug-trace.pyc
-lib/glusterfs/3.7.6/xlator/features/glupy/debug-trace.pyo
-lib/glusterfs/3.7.6/xlator/features/glupy/helloworld.py
-lib/glusterfs/3.7.6/xlator/features/glupy/helloworld.pyc
-lib/glusterfs/3.7.6/xlator/features/glupy/helloworld.pyo
-lib/glusterfs/3.7.6/xlator/features/glupy/negative.py
-lib/glusterfs/3.7.6/xlator/features/glupy/negative.pyc
-lib/glusterfs/3.7.6/xlator/features/glupy/negative.pyo
-lib/glusterfs/3.7.6/xlator/features/index.la
-lib/glusterfs/3.7.6/xlator/features/locks.la
-lib/glusterfs/3.7.6/xlator/features/mac-compat.la
-lib/glusterfs/3.7.6/xlator/features/marker.la
-lib/glusterfs/3.7.6/xlator/features/posix-locks.so
-lib/glusterfs/3.7.6/xlator/features/prot_client.la
-lib/glusterfs/3.7.6/xlator/features/prot_dht.la
-lib/glusterfs/3.7.6/xlator/features/prot_server.la
-lib/glusterfs/3.7.6/xlator/features/quiesce.la
-lib/glusterfs/3.7.6/xlator/features/quota.la
-lib/glusterfs/3.7.6/xlator/features/quotad.la
-lib/glusterfs/3.7.6/xlator/features/read-only.la
-lib/glusterfs/3.7.6/xlator/features/shard.la
-lib/glusterfs/3.7.6/xlator/features/snapview-client.la
-lib/glusterfs/3.7.6/xlator/features/snapview-server.la
-lib/glusterfs/3.7.6/xlator/features/trash.la
-lib/glusterfs/3.7.6/xlator/features/upcall.la
-lib/glusterfs/3.7.6/xlator/features/worm.la
-lib/glusterfs/3.7.6/xlator/meta.la
-lib/glusterfs/3.7.6/xlator/mgmt/glusterd.la
-lib/glusterfs/3.7.6/xlator/mount/api.la
-lib/glusterfs/3.7.6/xlator/mount/fuse.la
-lib/glusterfs/3.7.6/xlator/nfs/server.la
-lib/glusterfs/3.7.6/xlator/performance/io-cache.la
-lib/glusterfs/3.7.6/xlator/performance/io-threads.la
-lib/glusterfs/3.7.6/xlator/performance/md-cache.la
-lib/glusterfs/3.7.6/xlator/performance/open-behind.la
-lib/glusterfs/3.7.6/xlator/performance/quick-read.la
-lib/glusterfs/3.7.6/xlator/performance/read-ahead.la
-lib/glusterfs/3.7.6/xlator/performance/readdir-ahead.la
-lib/glusterfs/3.7.6/xlator/performance/stat-prefetch.so
-lib/glusterfs/3.7.6/xlator/performance/write-behind.la
-lib/glusterfs/3.7.6/xlator/protocol/client.la
-lib/glusterfs/3.7.6/xlator/protocol/server.la
-lib/glusterfs/3.7.6/xlator/storage/posix.la
-lib/glusterfs/3.7.6/xlator/system/posix-acl.la
-lib/glusterfs/3.7.6/xlator/testing/features/template.la
-lib/glusterfs/3.7.6/xlator/testing/performance/symlink-cache.la
+lib/glusterfs/3.7.7/auth/addr.la
+lib/glusterfs/3.7.7/auth/login.la
+lib/glusterfs/3.7.7/rpc-transport/socket.la
+lib/glusterfs/3.7.7/xlator/cluster/afr.la
+lib/glusterfs/3.7.7/xlator/cluster/dht.la
+lib/glusterfs/3.7.7/xlator/cluster/disperse.so
+lib/glusterfs/3.7.7/xlator/cluster/distribute.so
+lib/glusterfs/3.7.7/xlator/cluster/ec.la
+lib/glusterfs/3.7.7/xlator/cluster/nufa.la
+lib/glusterfs/3.7.7/xlator/cluster/pump.la
+lib/glusterfs/3.7.7/xlator/cluster/replicate.so
+lib/glusterfs/3.7.7/xlator/cluster/stripe.la
+lib/glusterfs/3.7.7/xlator/cluster/switch.la
+lib/glusterfs/3.7.7/xlator/cluster/tier.la
+lib/glusterfs/3.7.7/xlator/debug/error-gen.la
+lib/glusterfs/3.7.7/xlator/debug/io-stats.la
+lib/glusterfs/3.7.7/xlator/debug/trace.la
+lib/glusterfs/3.7.7/xlator/encryption/crypt.la
+lib/glusterfs/3.7.7/xlator/encryption/rot-13.la
+lib/glusterfs/3.7.7/xlator/features/access-control.so
+lib/glusterfs/3.7.7/xlator/features/arbiter.la
+lib/glusterfs/3.7.7/xlator/features/barrier.la
+lib/glusterfs/3.7.7/xlator/features/bit-rot.la
+lib/glusterfs/3.7.7/xlator/features/bitrot-stub.la
+lib/glusterfs/3.7.7/xlator/features/cdc.la
+lib/glusterfs/3.7.7/xlator/features/changelog.la
+lib/glusterfs/3.7.7/xlator/features/changetimerecorder.la
+lib/glusterfs/3.7.7/xlator/features/ganesha.la
+lib/glusterfs/3.7.7/xlator/features/gfid-access.la
+lib/glusterfs/3.7.7/xlator/features/glupy.la
+lib/glusterfs/3.7.7/xlator/features/glupy/debug-trace.py
+lib/glusterfs/3.7.7/xlator/features/glupy/debug-trace.pyc
+lib/glusterfs/3.7.7/xlator/features/glupy/debug-trace.pyo
+lib/glusterfs/3.7.7/xlator/features/glupy/helloworld.py
+lib/glusterfs/3.7.7/xlator/features/glupy/helloworld.pyc
+lib/glusterfs/3.7.7/xlator/features/glupy/helloworld.pyo
+lib/glusterfs/3.7.7/xlator/features/glupy/negative.py
+lib/glusterfs/3.7.7/xlator/features/glupy/negative.pyc
+lib/glusterfs/3.7.7/xlator/features/glupy/negative.pyo
+lib/glusterfs/3.7.7/xlator/features/index.la
+lib/glusterfs/3.7.7/xlator/features/locks.la
+lib/glusterfs/3.7.7/xlator/features/mac-compat.la
+lib/glusterfs/3.7.7/xlator/features/marker.la
+lib/glusterfs/3.7.7/xlator/features/posix-locks.so
+lib/glusterfs/3.7.7/xlator/features/prot_client.la
+lib/glusterfs/3.7.7/xlator/features/prot_dht.la
+lib/glusterfs/3.7.7/xlator/features/prot_server.la
+lib/glusterfs/3.7.7/xlator/features/quiesce.la
+lib/glusterfs/3.7.7/xlator/features/quota.la
+lib/glusterfs/3.7.7/xlator/features/quotad.la
+lib/glusterfs/3.7.7/xlator/features/read-only.la
+lib/glusterfs/3.7.7/xlator/features/shard.la
+lib/glusterfs/3.7.7/xlator/features/snapview-client.la
+lib/glusterfs/3.7.7/xlator/features/snapview-server.la
+lib/glusterfs/3.7.7/xlator/features/trash.la
+lib/glusterfs/3.7.7/xlator/features/upcall.la
+lib/glusterfs/3.7.7/xlator/features/worm.la
+lib/glusterfs/3.7.7/xlator/meta.la
+lib/glusterfs/3.7.7/xlator/mgmt/glusterd.la
+lib/glusterfs/3.7.7/xlator/mount/api.la
+lib/glusterfs/3.7.7/xlator/mount/fuse.la
+lib/glusterfs/3.7.7/xlator/nfs/server.la
+lib/glusterfs/3.7.7/xlator/performance/io-cache.la
+lib/glusterfs/3.7.7/xlator/performance/io-threads.la
+lib/glusterfs/3.7.7/xlator/performance/md-cache.la
+lib/glusterfs/3.7.7/xlator/performance/open-behind.la
+lib/glusterfs/3.7.7/xlator/performance/quick-read.la
+lib/glusterfs/3.7.7/xlator/performance/read-ahead.la
+lib/glusterfs/3.7.7/xlator/performance/readdir-ahead.la
+lib/glusterfs/3.7.7/xlator/performance/stat-prefetch.so
+lib/glusterfs/3.7.7/xlator/performance/write-behind.la
+lib/glusterfs/3.7.7/xlator/protocol/client.la
+lib/glusterfs/3.7.7/xlator/protocol/server.la
+lib/glusterfs/3.7.7/xlator/storage/posix.la
+lib/glusterfs/3.7.7/xlator/system/posix-acl.la
+lib/glusterfs/3.7.7/xlator/testing/features/template.la
+lib/glusterfs/3.7.7/xlator/testing/performance/symlink-cache.la
 lib/libgfapi.la
 lib/libgfchangelog.la
 lib/libgfdb.la
diff --git a/filesystems/glusterfs/distinfo b/filesystems/glusterfs/distinfo
index 9eba4f2eb84..915d2b0ea93 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.46 2015/12/10 02:55:58 joerg Exp $
+$NetBSD: distinfo,v 1.47 2016/02/01 14:27:02 manu Exp $
 
-SHA1 (glusterfs-3.7.6.tar.gz) = e611726b87f55e91041d4e8e6aa8c50e861f0957
-RMD160 (glusterfs-3.7.6.tar.gz) = 58a9e1cc6b6c80caf03d0f495ff7c98673e816ea
-Size (glusterfs-3.7.6.tar.gz) = 7690697 bytes
-SHA1 (patch-glusterfsd_src_Makefile.in) = 2ddb8d1817e4b4acae01215f16b576015806071e
-SHA1 (patch-xlators_mgmt_glusterd_src_Makefile.in) = bfc093b482edc1e95f95152ab407633bdf7d0f55
+SHA1 (glusterfs-3.7.7.tar.gz) = 62c948a30312358c039576b2891a8327bfa8d51b
+RMD160 (glusterfs-3.7.7.tar.gz) = f40964b6eccde76d1027fb78d9eb1f1f38f973c4
+Size (glusterfs-3.7.7.tar.gz) = 7858640 bytes
diff --git a/filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in b/filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in
deleted file mode 100644
index a185df4d6c3..00000000000
--- a/filesystems/glusterfs/patches/patch-glusterfsd_src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-glusterfsd_src_Makefile.in,v 1.3 2015/12/10 02:55:59 joerg Exp $
-
---- glusterfsd/src/Makefile.in.orig	2015-11-28 18:55:07.000000000 +0000
-+++ glusterfsd/src/Makefile.in
-@@ -319,7 +319,7 @@ glusterfsd_LDADD = $(top_builddir)/libgl
- 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
- 	$(top_builddir)/rpc/xdr/src/libgfxdr.la ${GF_LDADD}
- 
--glusterfsd_LDFLAGS = $(GF_LDFLAGS)
-+glusterfsd_LDFLAGS = $(GF_LDFLAGS) -largp
- noinst_HEADERS = glusterfsd.h glusterfsd-mem-types.h glusterfsd-messages.h
- AM_CPPFLAGS = $(GF_CPPFLAGS) \
- 	-I$(top_srcdir)/libglusterfs/src -DDATADIR=\"$(localstatedir)\" \
diff --git a/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in b/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in
deleted file mode 100644
index ff15d8f2dbe..00000000000
--- a/filesystems/glusterfs/patches/patch-xlators_mgmt_glusterd_src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-xlators_mgmt_glusterd_src_Makefile.in,v 1.6 2015/12/10 02:55:59 joerg Exp $
-
---- xlators/mgmt/glusterd/src/Makefile.in.orig	2015-11-08 21:58:06.000000000 +0000
-+++ xlators/mgmt/glusterd/src/Makefile.in
-@@ -409,7 +409,7 @@ noinst_HEADERS = glusterd.h glusterd-uti
- 	glusterd-server-quorum.h glusterd-errno.h
- 
- AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
--	-I$(rpclibdir) -I$(CONTRIBDIR)/rbtree \
-+	-I$(CONTRIBDIR)/rbtree \
- 	-I$(top_srcdir)/rpc/xdr/src -I$(top_srcdir)/rpc/rpc-lib/src \
- 	-I$(CONTRIBDIR)/mount \
- 	-I$(CONTRIBDIR)/userspace-rcu \