Update filesystems/glusterfs to 8.0

9 files changed, 185 insertions, 133 deletions

diff --git a/filesystems/glusterfs/MESSAGE.NetBSD b/filesystems/glusterfs/MESSAGE.NetBSD
index cb11af75f02..d24c4852f3f 100644
--- a/filesystems/glusterfs/MESSAGE.NetBSD
+++ b/filesystems/glusterfs/MESSAGE.NetBSD
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE.NetBSD,v 1.17 2020/06/14 23:55:09 gdt Exp $
+$NetBSD: MESSAGE.NetBSD,v 1.18 2020/07/07 01:01:27 manu Exp $
 
 *** GlusterFS clients ***
 This is required in /etc/sysctl.conf in order to avoid hangs on I/O operations
@@ -10,6 +10,12 @@ This is required in /etc/sysctl.conf in order to avoid hangs on I/O operations
 In order to use mount -t glusterfs, please install this link
 	ln -s ${PREFIX}/sbin/mount_glusterfs /sbin/mount_glusterfs
 
+* Only for netbsd-5 branch (later NetBSD GENERIC kernels have it enabled):
+A kernel with the following option is required:
+	file-system     PUFFS
+	pseudo-device   putter
+	pseudo-device   pud
+
 *** GlusterFS servers ***
 glusterfs servers will need extended attributes in exported filesystems.
 This is currently only supported in UFS1 (newfs -O1). You will need to
diff --git a/filesystems/glusterfs/Makefile b/filesystems/glusterfs/Makefile
index f7c75e99423..7b43269399c 100644
--- a/filesystems/glusterfs/Makefile
+++ b/filesystems/glusterfs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2020/06/14 23:52:32 gdt Exp $
+# $NetBSD: Makefile,v 1.99 2020/07/07 01:01:27 manu Exp $
 
-DISTNAME=	glusterfs-3.12.8
-PKGREVISION=	8
+DISTNAME=	glusterfs-8.0
+#PKGREVISION=	1
 CATEGORIES=	filesystems
 MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
@@ -66,6 +66,7 @@ REPLACE_BASH+=		extras/peer_add_secret_pub.in
 REPLACE_BASH+=		extras/post-upgrade-script-for-quota.sh
 REPLACE_BASH+=		extras/pre-upgrade-script-for-quota.sh
 REPLACE_BASH+=		extras/stop-all-gluster-processes.sh
+REPLACE_BASH+=		extras/thin-arbiter/setup-thin-arbiter.sh
 REPLACE_BASH+=		geo-replication/src/gverify.sh
 REPLACE_BASH+=		geo-replication/src/peer_gsec_create.in
 REPLACE_BASH+=		geo-replication/src/set_geo_rep_pem_keys.sh
@@ -78,6 +79,7 @@ SUBST_CLASSES+=		mtab
 SUBST_STAGE.mtab=	post-build
 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
@@ -92,8 +94,8 @@ SUBST_STAGE.vol=	post-build
 SUBST_FILES.vol=	extras/Makefile
 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
+#EGDIR=			${PREFIX}/etc/glusterfs
+#CONF_FILES+=		${EGDIR}/glusterd.vol.sample ${EGDIR}/glusterd.vol
 OWN_DIRS+=		${VARBASE}/log/glusterfs
 BUILD_DEFS+=		VARBASE
 
@@ -126,9 +128,12 @@ CONFIGURE_ARGS+=	--enable-debug
 
 .include "../../mk/bsd.prefs.mk"
 
+.include "../../devel/libuuid/buildlink3.mk"
+.include "../../devel/argp/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
+BUILDLINK_API_DEPENDS.userspace-rcu+=	userspace-rcu>=0.12.1
 .include "../../devel/userspace-rcu/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
diff --git a/filesystems/glusterfs/PLIST b/filesystems/glusterfs/PLIST
index 1f8103f97fe..d080b9588be 100644
--- a/filesystems/glusterfs/PLIST
+++ b/filesystems/glusterfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2018/04/19 02:49:04 manu Exp $
+@comment $NetBSD: PLIST,v 1.40 2020/07/07 01:01:27 manu Exp $
 ${PYSITELIB}/gluster/__init__.py
 ${PYSITELIB}/gluster/__init__.pyc
 ${PYSITELIB}/gluster/__init__.pyo
@@ -8,23 +8,27 @@ ${PYSITELIB}/gluster/cliutils/__init__.pyo
 ${PYSITELIB}/gluster/cliutils/cliutils.py
 ${PYSITELIB}/gluster/cliutils/cliutils.pyc
 ${PYSITELIB}/gluster/cliutils/cliutils.pyo
-${PYSITELIB}/gluster/glupy/__init__.py
-${PYSITELIB}/gluster/glupy/__init__.pyc
-${PYSITELIB}/gluster/glupy/__init__.pyo
 bin/glusterfind
+etc/ganesha/ganesha-ha.conf.sample
 etc/glusterfs/eventsconfig.json
 etc/glusterfs/gluster-rsyslog-5.8.conf
 etc/glusterfs/gluster-rsyslog-7.2.conf
-etc/glusterfs/glusterd.vol.sample
+etc/glusterfs/glusterd.vol
 etc/glusterfs/glusterfs-georep-logrotate
 etc/glusterfs/glusterfs-logrotate
+etc/glusterfs/group-db-workload
+etc/glusterfs/group-distributed-virt
 etc/glusterfs/group-gluster-block
 etc/glusterfs/group-metadata-cache
 etc/glusterfs/group-nl-cache
+etc/glusterfs/group-samba
 etc/glusterfs/group-virt.example
+etc/glusterfs/gsyncd.conf
 etc/glusterfs/logger.conf.example
+etc/glusterfs/thin-arbiter.vol
 include/glusterfs/api/glfs-handles.h
 include/glusterfs/api/glfs.h
+include/glusterfs/async.h
 include/glusterfs/atomic.h
 include/glusterfs/byte-order.h
 include/glusterfs/call-stub.h
@@ -36,28 +40,23 @@ include/glusterfs/common-utils.h
 include/glusterfs/compat-errno.h
 include/glusterfs/compat-uuid.h
 include/glusterfs/compat.h
-include/glusterfs/compound-fop-utils.h
 include/glusterfs/daemon.h
 include/glusterfs/default-args.h
 include/glusterfs/defaults.h
 include/glusterfs/dict.h
 include/glusterfs/event-history.h
-include/glusterfs/event.h
 include/glusterfs/events.h
 include/glusterfs/fd-lk.h
 include/glusterfs/fd.h
+include/glusterfs/gd-common-utils.h
 include/glusterfs/gf-dirent.h
+include/glusterfs/gf-event.h
 include/glusterfs/gfchangelog/changelog.h
-include/glusterfs/gfdb/gfdb_data_store.h
-include/glusterfs/gfdb/gfdb_data_store_helper.h
-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
 include/glusterfs/gidcache.h
 include/glusterfs/glfs-message-id.h
 include/glusterfs/globals.h
 include/glusterfs/glusterfs-acl.h
+include/glusterfs/glusterfs-fops.h
 include/glusterfs/glusterfs.h
 include/glusterfs/graph-utils.h
 include/glusterfs/hashfn.h
@@ -73,25 +72,20 @@ include/glusterfs/logging.h
 include/glusterfs/lvm-defaults.h
 include/glusterfs/mem-pool.h
 include/glusterfs/mem-types.h
+include/glusterfs/monitoring.h
 include/glusterfs/options.h
 include/glusterfs/parse-utils.h
-include/glusterfs/protocol-common.h
 include/glusterfs/quota-common-utils.h
 include/glusterfs/rbthash.h
 include/glusterfs/refcount.h
 include/glusterfs/revision.h
 include/glusterfs/rot-buffs.h
-include/glusterfs/rpc/acl3-xdr.h
 include/glusterfs/rpc/changelog-xdr.h
 include/glusterfs/rpc/cli1-xdr.h
 include/glusterfs/rpc/glusterd1-xdr.h
-include/glusterfs/rpc/glusterfs-fops.h
 include/glusterfs/rpc/glusterfs3-xdr.h
 include/glusterfs/rpc/glusterfs3.h
-include/glusterfs/rpc/mount3udp.h
-include/glusterfs/rpc/msg-nfs3.h
-include/glusterfs/rpc/nlm4-xdr.h
-include/glusterfs/rpc/nsm-xdr.h
+include/glusterfs/rpc/glusterfs4-xdr.h
 include/glusterfs/rpc/portmap-xdr.h
 include/glusterfs/rpc/protocol-common.h
 include/glusterfs/rpc/rpc-clnt-ping.h
@@ -105,7 +99,6 @@ include/glusterfs/rpc/rpcsvc-common.h
 include/glusterfs/rpc/rpcsvc.h
 include/glusterfs/rpc/xdr-common.h
 include/glusterfs/rpc/xdr-generic.h
-include/glusterfs/rpc/xdr-nfs3.h
 include/glusterfs/rpc/xdr-rpc.h
 include/glusterfs/rpc/xdr-rpcclnt.h
 include/glusterfs/run.h
@@ -140,17 +133,12 @@ lib/glusterfs/${GLUSTERFS_VERSION}/xlator/cluster/distribute.so
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/cluster/ec.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/cluster/nufa.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/cluster/replicate.so
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/cluster/stripe.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/cluster/switch.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/cluster/tier.la
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/debug/delay-gen.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/debug/error-gen.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/debug/io-stats.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/debug/sink.a
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/debug/sink.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/debug/sink.so
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/debug/trace.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/encryption/crypt.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/encryption/rot-13.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/access-control.so
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/arbiter.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/barrier.la
@@ -158,97 +146,87 @@ lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/bit-rot.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/bitrot-stub.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/cdc.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/changelog.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/changetimerecorder.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/gfid-access.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/debug-trace.py
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/debug-trace.pyc
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/debug-trace.pyo
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/helloworld.py
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/helloworld.pyc
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/helloworld.pyo
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/negative.py
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/negative.pyc
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/glupy/negative.pyo
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/index.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/leases.a
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/leases.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/leases.so
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/locks.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/marker.la
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/namespace.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/posix-locks.so
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/quiesce.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/quota.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/quotad.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/read-only.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/selinux.a
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/sdfs.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/selinux.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/selinux.so
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/shard.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/snapview-client.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/snapview-server.la
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/thin-arbiter.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/trash.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/upcall.la
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/utime.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/features/worm.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/meta.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/mgmt/glusterd.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/mount/api.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/mount/fuse.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/decompounder.a
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/decompounder.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/decompounder.so
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/io-cache.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/io-threads.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/md-cache.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/nl-cache.a
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/nl-cache.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/nl-cache.so
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/open-behind.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/quick-read.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/read-ahead.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/readdir-ahead.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/stat-prefetch.so
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/performance/write-behind.la
+lib/glusterfs/${GLUSTERFS_VERSION}/xlator/playground/template.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/protocol/client.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/protocol/server.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/storage/posix.la
 lib/glusterfs/${GLUSTERFS_VERSION}/xlator/system/posix-acl.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/testing/features/template.la
-lib/glusterfs/${GLUSTERFS_VERSION}/xlator/testing/performance/symlink-cache.la
 lib/libgfapi.la
 lib/libgfchangelog.la
-lib/libgfdb.la
 lib/libgfrpc.la
 lib/libgfxdr.la
+lib/libglusterd.la
 lib/libglusterfs.la
 lib/ocf/resource.d/glusterfs/glusterd
 lib/ocf/resource.d/glusterfs/volume
+lib/ocf/resource.d/heartbeat/ganesha_grace
+lib/ocf/resource.d/heartbeat/ganesha_mon
+lib/ocf/resource.d/heartbeat/ganesha_nfsd
 lib/pkgconfig/glusterfs-api.pc
 lib/pkgconfig/libgfchangelog.pc
-lib/pkgconfig/libgfdb.pc
-libexec/glusterfs/events/__init__.py
-libexec/glusterfs/events/__init__.pyc
-libexec/glusterfs/events/__init__.pyo
-libexec/glusterfs/events/eventsapiconf.py
-libexec/glusterfs/events/eventsapiconf.pyc
-libexec/glusterfs/events/eventsapiconf.pyo
-libexec/glusterfs/events/eventtypes.py
-libexec/glusterfs/events/eventtypes.pyc
-libexec/glusterfs/events/eventtypes.pyo
-libexec/glusterfs/events/gf_event.py
-libexec/glusterfs/events/gf_event.pyc
-libexec/glusterfs/events/gf_event.pyo
-libexec/glusterfs/events/glustereventsd.py
-libexec/glusterfs/events/handlers.py
-libexec/glusterfs/events/handlers.pyc
-libexec/glusterfs/events/handlers.pyo
-libexec/glusterfs/events/utils.py
-libexec/glusterfs/events/utils.pyc
-libexec/glusterfs/events/utils.pyo
+libexec/ganesha/create-export-ganesha.sh
+libexec/ganesha/dbus-send.sh
+libexec/ganesha/ganesha-ha.sh
+libexec/ganesha/generate-epoch.py
+libexec/glusterfs/gfevents/__init__.py
+libexec/glusterfs/gfevents/__init__.pyc
+libexec/glusterfs/gfevents/__init__.pyo
+libexec/glusterfs/gfevents/eventsapiconf.py
+libexec/glusterfs/gfevents/eventsapiconf.pyc
+libexec/glusterfs/gfevents/eventsapiconf.pyo
+libexec/glusterfs/gfevents/eventtypes.py
+libexec/glusterfs/gfevents/eventtypes.pyc
+libexec/glusterfs/gfevents/eventtypes.pyo
+libexec/glusterfs/gfevents/gf_event.py
+libexec/glusterfs/gfevents/gf_event.pyc
+libexec/glusterfs/gfevents/gf_event.pyo
+libexec/glusterfs/gfevents/glustereventsd.py
+libexec/glusterfs/gfevents/handlers.py
+libexec/glusterfs/gfevents/handlers.pyc
+libexec/glusterfs/gfevents/handlers.pyo
+libexec/glusterfs/gfevents/utils.py
+libexec/glusterfs/gfevents/utils.pyc
+libexec/glusterfs/gfevents/utils.pyo
 libexec/glusterfs/gfind_missing_files/gcrawler
 libexec/glusterfs/gfind_missing_files/gfid_to_path.py
 libexec/glusterfs/gfind_missing_files/gfid_to_path.sh
 libexec/glusterfs/gfind_missing_files/gfind_missing_files.sh
+libexec/glusterfs/glfsheal
 libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py
 libexec/glusterfs/glusterfind/__init__.py
 libexec/glusterfs/glusterfind/__init__.pyc
@@ -261,6 +239,9 @@ libexec/glusterfs/glusterfind/changelogdata.pyo
 libexec/glusterfs/glusterfind/conf.py
 libexec/glusterfs/glusterfind/conf.pyc
 libexec/glusterfs/glusterfind/conf.pyo
+libexec/glusterfs/glusterfind/gfind_py2py3.py
+libexec/glusterfs/glusterfind/gfind_py2py3.pyc
+libexec/glusterfs/glusterfind/gfind_py2py3.pyo
 libexec/glusterfs/glusterfind/libgfchangelog.py
 libexec/glusterfs/glusterfind/libgfchangelog.pyc
 libexec/glusterfs/glusterfind/libgfchangelog.pyo
@@ -284,48 +265,60 @@ libexec/glusterfs/python/syncdaemon/README.md
 libexec/glusterfs/python/syncdaemon/__init__.py
 libexec/glusterfs/python/syncdaemon/__init__.pyc
 libexec/glusterfs/python/syncdaemon/__init__.pyo
-libexec/glusterfs/python/syncdaemon/changelogagent.py
-libexec/glusterfs/python/syncdaemon/changelogagent.pyc
-libexec/glusterfs/python/syncdaemon/changelogagent.pyo
+libexec/glusterfs/python/syncdaemon/argsupgrade.py
+libexec/glusterfs/python/syncdaemon/argsupgrade.pyc
+libexec/glusterfs/python/syncdaemon/argsupgrade.pyo
 libexec/glusterfs/python/syncdaemon/conf.py
 libexec/glusterfs/python/syncdaemon/conf.pyc
 libexec/glusterfs/python/syncdaemon/conf.pyo
-libexec/glusterfs/python/syncdaemon/configinterface.py
-libexec/glusterfs/python/syncdaemon/configinterface.pyc
-libexec/glusterfs/python/syncdaemon/configinterface.pyo
-libexec/glusterfs/python/syncdaemon/gconf.py
-libexec/glusterfs/python/syncdaemon/gconf.pyc
-libexec/glusterfs/python/syncdaemon/gconf.pyo
 libexec/glusterfs/python/syncdaemon/gsyncd.py
 libexec/glusterfs/python/syncdaemon/gsyncd.pyc
 libexec/glusterfs/python/syncdaemon/gsyncd.pyo
+libexec/glusterfs/python/syncdaemon/gsyncdconfig.py
+libexec/glusterfs/python/syncdaemon/gsyncdconfig.pyc
+libexec/glusterfs/python/syncdaemon/gsyncdconfig.pyo
 libexec/glusterfs/python/syncdaemon/gsyncdstatus.py
 libexec/glusterfs/python/syncdaemon/gsyncdstatus.pyc
 libexec/glusterfs/python/syncdaemon/gsyncdstatus.pyo
-libexec/glusterfs/python/syncdaemon/ipaddr.py
-libexec/glusterfs/python/syncdaemon/ipaddr.pyc
-libexec/glusterfs/python/syncdaemon/ipaddr.pyo
 libexec/glusterfs/python/syncdaemon/libcxattr.py
 libexec/glusterfs/python/syncdaemon/libcxattr.pyc
 libexec/glusterfs/python/syncdaemon/libcxattr.pyo
 libexec/glusterfs/python/syncdaemon/libgfchangelog.py
 libexec/glusterfs/python/syncdaemon/libgfchangelog.pyc
 libexec/glusterfs/python/syncdaemon/libgfchangelog.pyo
+libexec/glusterfs/python/syncdaemon/logutils.py
+libexec/glusterfs/python/syncdaemon/logutils.pyc
+libexec/glusterfs/python/syncdaemon/logutils.pyo
 libexec/glusterfs/python/syncdaemon/master.py
 libexec/glusterfs/python/syncdaemon/master.pyc
 libexec/glusterfs/python/syncdaemon/master.pyo
 libexec/glusterfs/python/syncdaemon/monitor.py
 libexec/glusterfs/python/syncdaemon/monitor.pyc
 libexec/glusterfs/python/syncdaemon/monitor.pyo
+libexec/glusterfs/python/syncdaemon/py2py3.py
+libexec/glusterfs/python/syncdaemon/py2py3.pyc
+libexec/glusterfs/python/syncdaemon/py2py3.pyo
+libexec/glusterfs/python/syncdaemon/rconf.py
+libexec/glusterfs/python/syncdaemon/rconf.pyc
+libexec/glusterfs/python/syncdaemon/rconf.pyo
 libexec/glusterfs/python/syncdaemon/repce.py
 libexec/glusterfs/python/syncdaemon/repce.pyc
 libexec/glusterfs/python/syncdaemon/repce.pyo
 libexec/glusterfs/python/syncdaemon/resource.py
 libexec/glusterfs/python/syncdaemon/resource.pyc
 libexec/glusterfs/python/syncdaemon/resource.pyo
+libexec/glusterfs/python/syncdaemon/subcmds.py
+libexec/glusterfs/python/syncdaemon/subcmds.pyc
+libexec/glusterfs/python/syncdaemon/subcmds.pyo
 libexec/glusterfs/python/syncdaemon/syncdutils.py
 libexec/glusterfs/python/syncdaemon/syncdutils.pyc
 libexec/glusterfs/python/syncdaemon/syncdutils.pyo
+libexec/glusterfs/scripts/generate-gfid-file.sh
+libexec/glusterfs/scripts/get-gfid.sh
+libexec/glusterfs/scripts/gsync-sync-gfid
+libexec/glusterfs/scripts/gsync-upgrade.sh
+libexec/glusterfs/scripts/schedule_georep.py
+libexec/glusterfs/scripts/slave-upgrade.sh
 libexec/glusterfs/set_geo_rep_pem_keys.sh
 man/man8/gluster-setgfid2path.8
 man/man8/gluster.8
@@ -337,7 +330,6 @@ sbin/conf.py
 sbin/gcron.py
 sbin/gf_attach
 sbin/gfind_missing_files
-sbin/glfsheal
 sbin/gluster
 sbin/gluster-eventsapi
 sbin/gluster-georep-sshkey
@@ -359,13 +351,7 @@ share/doc/glusterfs/glusterfs-mode.el
 share/doc/glusterfs/glusterfs.vim
 share/examples/rc.d/glusterd
 share/glusterfs/scripts/eventsdash.py
-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/schedule_georep.py
-share/glusterfs/scripts/slave-upgrade.sh
+share/glusterfs/scripts/setup-thin-arbiter.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 e7c972f846e..122c8c27f59 100644
--- a/filesystems/glusterfs/distinfo
+++ b/filesystems/glusterfs/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.68 2020/03/23 23:01:48 gdt Exp $
+$NetBSD: distinfo,v 1.69 2020/07/07 01:01:27 manu Exp $
 
-SHA1 (glusterfs-3.12.8.tar.gz) = 9e8ab7a86c1a3eb476816c908718ad57753406ac
-RMD160 (glusterfs-3.12.8.tar.gz) = d0e09f748893829f85f6570eaad977f545745115
-SHA512 (glusterfs-3.12.8.tar.gz) = 4dfe00704489e5ce1c599d691105081c14f85209319c829d82e783fec09a4544e078dc956db5dce1d130e8fcc4e617b1dfecf915f9239e250869dc0cb2ef4397
-Size (glusterfs-3.12.8.tar.gz) = 7389786 bytes
-SHA1 (patch-libglusterfs_src_common-utils.c) = 526e702fe5538d3957f4192dec0781edae686d20
+SHA1 (glusterfs-8.0.tar.gz) = 8b9c5d1abcec207b716bd4d6b05957872c3a0f6d
+RMD160 (glusterfs-8.0.tar.gz) = 157db93505b4baad9f985ac45ff5283ae432352b
+SHA512 (glusterfs-8.0.tar.gz) = 6af94f31e08e9ba9d1f3f674678553815933f8db58672d4225f855dc47f3290e1ad22f44dbe95856f82120bf195bc2df7dbd02c88e3a27d9363877891c619b58
+Size (glusterfs-8.0.tar.gz) = 7800370 bytes
+SHA1 (patch-configure) = 8914f1434475faa7cbd419a3e31c44fdee872ed2
+SHA1 (patch-configure.ac) = 5c90938a02b6be460b733e88cd1932ed61fdb6fa
+SHA1 (patch-rpc_rpc_lib_rpcsvc.c) = d2d039b656327a43463d0819a1bcbfb3d99c5691
 SHA1 (patch-tools_gfind__missing__files_gfind__missing__files.sh) = 000cbc70acbb4645b9e55654698fade5605aa5b8
+SHA1 (patch-xlators_performance_write-behind_src_write-behind.c) = db2a72c3d061f3e6bbba51b48b613295b1ecdb0f
diff --git a/filesystems/glusterfs/patches/patch-configure b/filesystems/glusterfs/patches/patch-configure
new file mode 100644
index 00000000000..da0b57e08f6
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-configure
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure,v 1.3 2020/07/07 01:01:27 manu Exp $
+
+--- configure.orig	2020-06-28 22:54:09.920229276 +0000
++++ configure	2020-06-28 22:53:47.595791666 +0000
+@@ -14973,8 +14973,11 @@
+     *freebsd*)
+     CFLAGS="${CFLAGS} -isystem /usr/local/include"
+     ARGP_LDADD=-largp
+     ;;
++    *netbsd*)
++    ARGP_LDADD=-largp
++    ;;
+ esac
+ ac_fn_c_check_header_mongrel "$LINENO" "argp.h" "ac_cv_header_argp_h" "$ac_includes_default"
+ if test "x$ac_cv_header_argp_h" = xyes; then :
+ 
diff --git a/filesystems/glusterfs/patches/patch-configure.ac b/filesystems/glusterfs/patches/patch-configure.ac
new file mode 100644
index 00000000000..a14737e26ca
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-configure.ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-configure.ac,v 1.1 2020/07/07 01:01:27 manu Exp $
+
+--- configure.ac.orig	2020-05-31 16:45:57.328537679 +0200
++++ configure.ac	2020-06-28 03:10:02.906173087 +0200
+@@ -945,8 +945,11 @@
+     *freebsd*)
+     CFLAGS="${CFLAGS} -isystem /usr/local/include"
+     ARGP_LDADD=-largp
+     ;;
++    *netbsd*)
++    ARGP_LDADD=-largp
++    ;;
+ esac
+ dnl argp-standalone does not provide a pkg-config file
+ AC_CHECK_HEADER([argp.h], AC_DEFINE(HAVE_ARGP, 1, [have argp]))
+ if test "x$ac_cv_header_argp_h" != "xyes"; then
diff --git a/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c b/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c
deleted file mode 100644
index 5d257281443..00000000000
--- a/filesystems/glusterfs/patches/patch-libglusterfs_src_common-utils.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-libglusterfs_src_common-utils.c,v 1.3 2020/03/23 23:01:48 gdt Exp $
-
-Make NetBSD memory size reading routine 64-bit aware
-
---- libglusterfs/src/common-utils.c.orig	2018-04-12 17:46:46.578237383 +0000
-+++ libglusterfs/src/common-utils.c
-@@ -2971,13 +2971,23 @@ get_mem_size ()
- 	memsize = page_size * num_pages;
- #endif
- 
--#if defined GF_BSD_HOST_OS || defined GF_DARWIN_HOST_OS
-+#if defined GF_DARWIN_HOST_OS
- 
- 	size_t len = sizeof(memsize);
- 	int name [] = { CTL_HW, HW_PHYSMEM };
- 
- 	sysctl (name, 2, &memsize, &len, NULL, 0);
- #endif
-+
-+#if defined __NetBSD__
-+
-+	size_t len = sizeof(memsize);
-+	int name64 [] = { CTL_HW, HW_PHYSMEM64 };
-+
-+	sysctl (name64, 2, &memsize, &len, NULL, 0);
-+	if (memsize == -1)
-+		sysctl (name64, 2, &memsize, &len, NULL, 0);
-+#endif
- 	return memsize;
- }
- 
diff --git a/filesystems/glusterfs/patches/patch-rpc_rpc_lib_rpcsvc.c b/filesystems/glusterfs/patches/patch-rpc_rpc_lib_rpcsvc.c
new file mode 100644
index 00000000000..0c1b0698eeb
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-rpc_rpc_lib_rpcsvc.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-rpc_rpc_lib_rpcsvc.c,v 1.1 2020/07/07 01:01:27 manu Exp $
+
+--- ./rpc/rpc-lib/src/rpcsvc.c.orig	2020-06-28 02:37:34.988840145 +0200
++++ ./rpc/rpc-lib/src/rpcsvc.c	2020-06-28 02:38:41.302115459 +0200
+@@ -40,8 +40,12 @@
+ 
+ #include "xdr-rpcclnt.h"
+ #include <glusterfs/glusterfs-acl.h>
+ 
++#ifndef PTHREAD_MUTEX_ADAPTIVE_NP
++#define PTHREAD_MUTEX_ADAPTIVE_NP PTHREAD_MUTEX_DEFAULT
++#endif
++
+ static struct rpcsvc_program gluster_dump_prog;
+ 
+ #define rpcsvc_alloc_request(svc, request)                                     \
+     do {                                                                       \
diff --git a/filesystems/glusterfs/patches/patch-xlators_performance_write-behind_src_write-behind.c b/filesystems/glusterfs/patches/patch-xlators_performance_write-behind_src_write-behind.c
new file mode 100644
index 00000000000..7b32234e377
--- /dev/null
+++ b/filesystems/glusterfs/patches/patch-xlators_performance_write-behind_src_write-behind.c
@@ -0,0 +1,34 @@
+$NetBSD: patch-xlators_performance_write-behind_src_write-behind.c,v 1.1 2020/07/07 01:01:27 manu Exp $
+
+--- xlators/performance/write-behind/src/write-behind.c.orig	2020-06-28 02:50:52.965398208 +0200
++++ xlators/performance/write-behind/src/write-behind.c	2020-06-28 02:58:49.641108451 +0200
+@@ -2488,9 +2488,13 @@
+     wb_inode_t *wb_directory_inode = NULL;
+ 
+     wb_directory_inode = wb_inode_create(this, directory);
+ 
+-    if (!wb_directory_inode || !wb_directory_inode->lock.spinlock)
++    if (!wb_directory_inode 
++#ifndef __NetBSD__
++        || !wb_directory_inode->lock.spinlock
++#endif
++    )
+         return;
+ 
+     LOCK(&wb_directory_inode->lock);
+     {
+@@ -2508,9 +2512,13 @@
+     int readdirps = 0;
+ 
+     wb_directory_inode = wb_inode_ctx_get(this, directory);
+ 
+-    if (!wb_directory_inode || !wb_directory_inode->lock.spinlock)
++    if (!wb_directory_inode
++#ifndef __NetBSD__
++        || !wb_directory_inode->lock.spinlock
++#endif
++    )
+         return;
+ 
+     LOCK(&wb_directory_inode->lock);
+     {