Update to 8.0, this is a collaborative effort between Daniel Morante and

myself.

- update to 8.0
- make it possible to mount gluster volumes on boot [1]
- reset maintainer [1], I would have set it to ports@ but Daniel volunteered
  to maintain the port
- add pkg-message to point out that procfs is required for some operations
  like "gluster volume status" which is also required for self healing. [2]

This version works although I still see the same memory leak as with the
3.X series.

PR:		236112 [1], 223671 [2]
Submitted by:	Daniel Morante <daniel@morante.net>, flo
Obtained from:	https://github.com/tuaris/freebsd-glusterfs7
Differential Revision:	D25037

net/glusterfs/Makefile

@@ -1,61 +1,68 @@
 # $FreeBSD$
 
 PORTNAME=	glusterfs
-PORTVERSION=	3.11.1
+PORTVERSION=	8.0
-PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/
 
-MAINTAINER=	craig001@lerwick.hopto.org
+MAINTAINER=	daniel@morante.net
 COMMENT=	GlusterFS distributed file system
 
 LICENSE=	GPLv2 LGPL3
 LICENSE_COMB=	dual
 
-DEPRECATED=	Uses deprecated version of python
+LIB_DEPENDS=	libargp.so:devel/argp-standalone \
-EXPIRATION_DATE=	2020-09-15
+		libcurl.so:ftp/curl \
+		liburcu-bp.so:sysutils/liburcu \
+		libuuid.so:misc/e2fsprogs-libuuid
 
-LIB_DEPENDS=	libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu
+RUN_DEPENDS=	bash:shells/bash
-
-USES=		bison gettext gnome libtool pkgconfig python:2.7 readline \
-		shebangfix sqlite ssl
 
 BROKEN_SSL=	libressl
 
-SHEBANG_FILES=	extras/peer_add_secret_pub.in \
+USES=		autoreconf bison gettext gnome libtool pkgconfig python \
-		events/src/glustereventsd.py \
+		readline shebangfix sqlite ssl
-		events/src/peer_eventsapi.py \
+
-		tools/glusterfind/src/nodeagent.py \
+SHEBANG_FILES=	events/src/glustereventsd.py events/src/peer_eventsapi.py \
-		tools/glusterfind/src/brickfind.py \
+		events/tools/eventsdash.py extras/ganesha/ocf/ganesha_grace \
-		tools/glusterfind/src/changelog.py \
+		extras/ganesha/ocf/ganesha_mon extras/ganesha/ocf/ganesha_nfsd \
-		tools/glusterfind/glusterfind.in \
+		extras/ganesha/scripts/create-export-ganesha.sh \
-		tools/gfind_missing_files/gfid_to_path.py \
+		extras/ganesha/scripts/dbus-send.sh \
-		extras/pre-upgrade-script-for-quota.sh \
+		extras/ganesha/scripts/ganesha-ha.sh \
-		events/tools/eventsdash.py \
+		extras/ganesha/scripts/generate-epoch.py \
+		extras/peer_add_secret_pub.in \
 		extras/post-upgrade-script-for-quota.sh \
+		extras/pre-upgrade-script-for-quota.sh \
 		extras/snap_scheduler/gcron.py \
 		extras/snap_scheduler/snap_scheduler.py \
-		events/src/peer_eventsapi.py \
+		extras/stop-all-gluster-processes.sh \
-		events/src/glustereventsd.py \
+		extras/thin-arbiter/setup-thin-arbiter.sh \
-		tools/glusterfind/S57glusterfind-delete-post.py
+		tools/gfind_missing_files/gfid_to_path.py \
+		tools/glusterfind/glusterfind.in \
+		tools/glusterfind/S57glusterfind-delete-post.py \
+		tools/glusterfind/src/brickfind.py \
+		tools/glusterfind/src/changelog.py \
+		tools/glusterfind/src/nodeagent.py
 
 USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	glusterd
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
+CONFIGURE_ARGS=	--disable-epoll \
-		--with-mountutildir=${PREFIX}/sbin \
-		--localstatedir=/var \
-		--disable-epoll \
-		--enable-glupy \
 		--disable-georeplication \
-		ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
+		--localstatedir=/var \
-		ac_cv_func_setfsuid=no ac_cv_func_fdatasync=no \
+		--with-mountutildir=${PREFIX}/sbin \
-		ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
+		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
+		ac_cv_func_fallocate=no \
+		ac_cv_func_fdatasync=no \
+		ac_cv_func_llistxattr=no \
+		ac_cv_func_malloc_stats=no \
+		ac_cv_func_setfsuid=no \
+		ac_cv_lib_aio_io_setup=no
 CPPFLAGS+=	-I"${LOCALBASE}/include"
 LDFLAGS+=	-L"${LOCALBASE}/lib" -largp
 INSTALL_TARGET=	install-strip
-PLIST_SUB=	GLUSTERLIBDIR="lib/${PORTNAME}/${PORTVERSION}"
+PLIST_SUB=	GLUSTERLIBDIR="lib/${PORTNAME}"
 KMODDIR?=	/boot/modules
 
 OPTIONS_DEFINE=	DOCS

net/glusterfs/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1499632037
+TIMESTAMP = 1594844267
-SHA256 (glusterfs-3.11.1.tar.gz) = c7e0502631c9bc9da05795b666b74ef40a30a0344f5a2e205e65bd2faefe1442
+SHA256 (glusterfs-8.0.tar.gz) = bc0215380175a7d94c9ea90e3a7e0ca92a3ac691336e8b43da8a560f8e3c0169
-SIZE (glusterfs-3.11.1.tar.gz) = 9155001
+SIZE (glusterfs-8.0.tar.gz) = 7800370

net/glusterfs/files/glusterd.in

@@ -3,7 +3,8 @@
 # $FreeBSD$
 
 # PROVIDE: glusterd
-# REQUIRE: LOGIN
+# BEFORE: mountlate
+# REQUIRE: NETWORKING
 # KEYWORD: shutdown
 
 . /etc/rc.subr

net/glusterfs/files/patch-configure

@@ -1,12 +0,0 @@
---- configure.orig	2017-06-27 15:25:15 UTC
-+++ configure
-@@ -13475,6 +13475,9 @@ case $host_os in
-      linux*)
- #do nothing
-        ;;
-+     freebsd*)
-+#do nothing
-+       ;;
-      netbsd*)
- #do nothing
-        ;;

net/glusterfs/files/patch-configure.ac

@@ -0,0 +1,23 @@
+--- configure.ac.orig	2020-07-06 01:22:37 UTC
++++ configure.ac
+@@ -731,6 +731,9 @@ AC_ARG_ENABLE([georeplication],
+ 
+ BUILD_SYNCDAEMON=no
+ case $host_os in
++     freebsd*)
++#do nothing
++       ;;
+      linux*)
+ #do nothing
+        ;;
+@@ -1207,10 +1210,6 @@ case $host_os in
+         ;;
+      *freebsd*)
+         GF_HOST_OS="GF_BSD_HOST_OS"
+-        GF_CFLAGS="${GF_CFLAGS} -O0"
+-        GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_BASENAME"
+-        GF_CFLAGS="${GF_CFLAGS} -DTHREAD_UNSAFE_DIRNAME"
+-        GF_CFLAGS="${GF_CFLAGS} -D_LIBGEN_H_"
+         GF_CFLAGS="${GF_CFLAGS} -DO_DSYNC=0"
+         GF_CFLAGS="${GF_CFLAGS} -Dxdr_quad_t=xdr_longlong_t"
+         GF_CFLAGS="${GF_CFLAGS} -Dxdr_u_quad_t=xdr_u_longlong_t"

net/glusterfs/files/patch-contrib_fuse-lib_mount.c

@@ -1,6 +1,6 @@
---- contrib/fuse-lib/mount.c.orig	2017-06-27 15:25:12 UTC
+--- contrib/fuse-lib/mount.c.orig	2020-07-06 01:22:37 UTC
 +++ contrib/fuse-lib/mount.c
-@@ -382,6 +382,7 @@ fuse_mount_sys (const char *mountpoint, 
+@@ -390,6 +390,7 @@ fuse_mount_sys (const char *mountpoint, char *fsname,
          build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1);
          build_iovec (&iov, &iovlen, "volname", source, -1);
          build_iovec (&iov, &iovlen, "fd", fdstr, -1);

net/glusterfs/files/patch-extras_Makefile.in

@@ -1,22 +0,0 @@
---- extras/Makefile.in.orig	2017-06-27 15:25:17 UTC
-+++ extras/Makefile.in
-@@ -637,8 +637,8 @@ install-volDATA: $(vol_DATA)
- 	  echo "$$d$$p"; \
- 	done | $(am__base_list) | \
- 	while read files; do \
--	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)'"; \
--	  $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)" || exit $$?; \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)/$${files}.sample'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)/$${files}.sample" || exit $$?; \
- 	done
- 
- uninstall-volDATA:
-@@ -937,7 +937,7 @@ install-data-local:
- 	fi
- 	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups
- 	$(INSTALL_DATA) $(top_srcdir)/extras/group-virt.example \
--		$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt
-+		$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt.sample
- 	$(INSTALL_DATA) $(top_srcdir)/extras/group-metadata-cache \
- 		$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/metadata-cache
- 	$(INSTALL_DATA) $(top_srcdir)/extras/group-gluster-block \

net/glusterfs/files/patch-libglusterfs_src_common-utils.c

@@ -0,0 +1,11 @@
+--- libglusterfs/src/common-utils.c.orig	2020-05-18 20:57:54 UTC
++++ libglusterfs/src/common-utils.c
+@@ -3067,7 +3067,7 @@ get_mem_size()
+     memsize = page_size * num_pages;
+ #endif
+
+-#if defined GF_DARWIN_HOST_OS
++#if defined GF_DARWIN_HOST_OS || defined __FreeBSD__
+
+     size_t len = sizeof(memsize);
+     int name[] = {CTL_HW, HW_PHYSMEM};

net/glusterfs/files/patch-libglusterfs_src_syscall.c

@@ -0,0 +1,20 @@
+--- libglusterfs/src/syscall.c.orig	2020-05-18 20:57:54 UTC
++++ libglusterfs/src/syscall.c
+@@ -485,7 +485,7 @@ sys_lsetxattr(const char *path, const char *name, cons
+ #endif
+
+ #ifdef GF_BSD_HOST_OS
+-    return FS_RET_CHECK0(
++    return FS_RET_CHECK(
+         extattr_set_link(path, EXTATTR_NAMESPACE_USER, name, value, size),
+         errno);
+ #endif
+@@ -603,7 +603,7 @@ sys_fsetxattr(int filedes, const char *name, const voi
+ #endif
+
+ #ifdef GF_BSD_HOST_OS
+-    return FS_RET_CHECK0(
++    return FS_RET_CHECK(
+         extattr_set_fd(filedes, EXTATTR_NAMESPACE_USER, name, value, size),
+         errno);
+ #endif

net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am

@@ -0,0 +1,18 @@
+--- xlators/mgmt/glusterd/src/Makefile.am.orig	2020-07-16 17:28:50 UTC
++++ xlators/mgmt/glusterd/src/Makefile.am
+@@ -25,12 +25,14 @@ glusterd_la_SOURCES = glusterd.c glusterd-handler.c gl
+ 	glusterd-conn-helper.c glusterd-snapd-svc.c glusterd-snapd-svc-helper.c \
+ 	glusterd-bitd-svc.c glusterd-scrub-svc.c glusterd-server-quorum.c \
+ 	glusterd-reset-brick.c glusterd-shd-svc.c glusterd-shd-svc-helper.c \
+-        glusterd-gfproxyd-svc.c glusterd-gfproxyd-svc-helper.c glusterd-ganesha.c
++        glusterd-gfproxyd-svc.c glusterd-gfproxyd-svc-helper.c glusterd-ganesha.c \
++	$(CONTRIBDIR)/mount/mntent.c
+ 
+ glusterd_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la \
+ 	$(top_builddir)/libglusterd/src/libglusterd.la \
+ 	$(top_builddir)/rpc/xdr/src/libgfxdr.la \
+ 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
++	$(CONTRIBDIR)/mount/mntent_compat.h \
+ 	$(XML_LIBS) -lcrypto $(URCU_LIBS) $(URCU_CDS_LIBS) $(LIB_DL)
+ 
+ noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \

net/glusterfs/pkg-message

@@ -0,0 +1,15 @@
+[
+{ type: install
+  message: <<EOM
+Glusterfs needs procfs(5) mounted on /proc for some features.
+
+If you have not done it yet, please do the following:
+
+        mount -t procfs proc /proc
+
+To make it permanent, you need the following lines in /etc/fstab:
+
+        proc    /proc           procfs          rw      0       0
+EOM
+}
+]

net/glusterfs/pkg-plist

@@ -2,16 +2,22 @@ bin/glusterfind
 %%ETCDIR%%/eventsconfig.json
 %%ETCDIR%%/gluster-rsyslog-5.8.conf
 %%ETCDIR%%/gluster-rsyslog-7.2.conf
-@sample %%ETCDIR%%/glusterd.vol.sample
+%%ETCDIR%%/glusterd.vol
 %%ETCDIR%%/glusterfs-georep-logrotate
 %%ETCDIR%%/glusterfs-logrotate
+%%ETCDIR%%/group-db-workload
+%%ETCDIR%%/group-distributed-virt
 %%ETCDIR%%/group-gluster-block
 %%ETCDIR%%/group-metadata-cache
 %%ETCDIR%%/group-nl-cache
-%%ETCDIR%%/group-virt.example
+%%ETCDIR%%/group-samba
-%%ETCDIR%%/logger.conf.example
+@sample %%ETCDIR%%/group-virt.example
+@sample %%ETCDIR%%/logger.conf.example
+@sample etc/ganesha/ganesha-ha.conf.sample
+%%ETCDIR%%/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
@@ -23,28 +29,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
@@ -60,6 +61,7 @@ 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/quota-common-utils.h
@@ -67,17 +69,12 @@ 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/glusterfs4-xdr.h
-include/glusterfs/rpc/msg-nfs3.h
-include/glusterfs/rpc/nlm4-xdr.h
-include/glusterfs/rpc/nsm-xdr.h
 include/glusterfs/rpc/portmap-xdr.h
 include/glusterfs/rpc/protocol-common.h
 include/glusterfs/rpc/rpc-clnt-ping.h
@@ -91,7 +88,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
@@ -118,7 +114,7 @@ include/glusterfs/xlator.h
 include/glusterfs/y.tab.h
 %%GLUSTERLIBDIR%%/auth/addr.so
 %%GLUSTERLIBDIR%%/auth/login.so
-%%GLUSTERLIBDIR%%/rpc-transport/rdma.so
+%%GLUSTERLIBDIR%%/cloudsync-plugins/cloudsyncs3.so
 %%GLUSTERLIBDIR%%/rpc-transport/socket.so
 %%GLUSTERLIBDIR%%/xlator/cluster/afr.so
 %%GLUSTERLIBDIR%%/xlator/cluster/dht.so
@@ -127,15 +123,12 @@ include/glusterfs/y.tab.h
 %%GLUSTERLIBDIR%%/xlator/cluster/ec.so
 %%GLUSTERLIBDIR%%/xlator/cluster/nufa.so
 %%GLUSTERLIBDIR%%/xlator/cluster/replicate.so
-%%GLUSTERLIBDIR%%/xlator/cluster/stripe.so
 %%GLUSTERLIBDIR%%/xlator/cluster/switch.so
-%%GLUSTERLIBDIR%%/xlator/cluster/tier.so
+%%GLUSTERLIBDIR%%/xlator/debug/delay-gen.so
 %%GLUSTERLIBDIR%%/xlator/debug/error-gen.so
 %%GLUSTERLIBDIR%%/xlator/debug/io-stats.so
 %%GLUSTERLIBDIR%%/xlator/debug/sink.so
 %%GLUSTERLIBDIR%%/xlator/debug/trace.so
-%%GLUSTERLIBDIR%%/xlator/encryption/crypt.so
-%%GLUSTERLIBDIR%%/xlator/encryption/rot-13.so
 %%GLUSTERLIBDIR%%/xlator/features/access-control.so
 %%GLUSTERLIBDIR%%/xlator/features/arbiter.so
 %%GLUSTERLIBDIR%%/xlator/features/barrier.so
@@ -143,39 +136,32 @@ include/glusterfs/y.tab.h
 %%GLUSTERLIBDIR%%/xlator/features/bitrot-stub.so
 %%GLUSTERLIBDIR%%/xlator/features/cdc.so
 %%GLUSTERLIBDIR%%/xlator/features/changelog.so
-%%GLUSTERLIBDIR%%/xlator/features/changetimerecorder.so
+%%GLUSTERLIBDIR%%/xlator/features/cloudsync.so
 %%GLUSTERLIBDIR%%/xlator/features/gfid-access.so
-%%GLUSTERLIBDIR%%/xlator/features/glupy.so
-%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.py
-%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.pyc
-%%GLUSTERLIBDIR%%/xlator/features/glupy/debug-trace.pyo
-%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.py
-%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.pyc
-%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.pyo
-%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.py
-%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.pyc
-%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.pyo
 %%GLUSTERLIBDIR%%/xlator/features/index.so
 %%GLUSTERLIBDIR%%/xlator/features/leases.so
 %%GLUSTERLIBDIR%%/xlator/features/locks.so
 %%GLUSTERLIBDIR%%/xlator/features/marker.so
+%%GLUSTERLIBDIR%%/xlator/features/namespace.so
 %%GLUSTERLIBDIR%%/xlator/features/posix-locks.so
 %%GLUSTERLIBDIR%%/xlator/features/quiesce.so
 %%GLUSTERLIBDIR%%/xlator/features/quota.so
 %%GLUSTERLIBDIR%%/xlator/features/quotad.so
 %%GLUSTERLIBDIR%%/xlator/features/read-only.so
+%%GLUSTERLIBDIR%%/xlator/features/sdfs.so
 %%GLUSTERLIBDIR%%/xlator/features/selinux.so
 %%GLUSTERLIBDIR%%/xlator/features/shard.so
 %%GLUSTERLIBDIR%%/xlator/features/snapview-client.so
 %%GLUSTERLIBDIR%%/xlator/features/snapview-server.so
+%%GLUSTERLIBDIR%%/xlator/features/thin-arbiter.so
 %%GLUSTERLIBDIR%%/xlator/features/trash.so
 %%GLUSTERLIBDIR%%/xlator/features/upcall.so
+%%GLUSTERLIBDIR%%/xlator/features/utime.so
 %%GLUSTERLIBDIR%%/xlator/features/worm.so
 %%GLUSTERLIBDIR%%/xlator/meta.so
 %%GLUSTERLIBDIR%%/xlator/mgmt/glusterd.so
 %%GLUSTERLIBDIR%%/xlator/mount/api.so
 %%GLUSTERLIBDIR%%/xlator/mount/fuse.so
-%%GLUSTERLIBDIR%%/xlator/performance/decompounder.so
 %%GLUSTERLIBDIR%%/xlator/performance/io-cache.so
 %%GLUSTERLIBDIR%%/xlator/performance/io-threads.so
 %%GLUSTERLIBDIR%%/xlator/performance/md-cache.so
@@ -186,95 +172,102 @@ include/glusterfs/y.tab.h
 %%GLUSTERLIBDIR%%/xlator/performance/readdir-ahead.so
 %%GLUSTERLIBDIR%%/xlator/performance/stat-prefetch.so
 %%GLUSTERLIBDIR%%/xlator/performance/write-behind.so
+%%GLUSTERLIBDIR%%/xlator/playground/template.so
 %%GLUSTERLIBDIR%%/xlator/protocol/client.so
 %%GLUSTERLIBDIR%%/xlator/protocol/server.so
 %%GLUSTERLIBDIR%%/xlator/storage/posix.so
 %%GLUSTERLIBDIR%%/xlator/system/posix-acl.so
-%%GLUSTERLIBDIR%%/xlator/testing/features/template.so
-%%GLUSTERLIBDIR%%/xlator/testing/performance/symlink-cache.so
 lib/libgfapi.so
 lib/libgfapi.so.0
 lib/libgfapi.so.0.0.0
 lib/libgfchangelog.so
 lib/libgfchangelog.so.0
 lib/libgfchangelog.so.0.0.1
-lib/libgfdb.so
-lib/libgfdb.so.0
-lib/libgfdb.so.0.0.1
 lib/libgfrpc.so
 lib/libgfrpc.so.0
 lib/libgfrpc.so.0.0.1
 lib/libgfxdr.so
 lib/libgfxdr.so.0
 lib/libgfxdr.so.0.0.1
+lib/libglusterd.so
+lib/libglusterd.so.0
+lib/libglusterd.so.0.0.1
 lib/libglusterfs.so
 lib/libglusterfs.so.0
 lib/libglusterfs.so.0.0.1
 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
 %%PYTHON_SITELIBDIR%%/gluster/__init__.py
-%%PYTHON_SITELIBDIR%%/gluster/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gluster/__pycache__/__init__.cpython-37.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gluster/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gluster/__pycache__/__init__.cpython-37.pyc
 %%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.py
-%%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.pyc
+%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/__init__.cpython-37.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.pyo
+%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/__init__.cpython-37.pyc
+%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/cliutils.cpython-37.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/gluster/cliutils/__pycache__/cliutils.cpython-37.pyc
 %%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.py
-%%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.pyc
-%%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.pyo
-%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.py
-%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyo
 libdata/pkgconfig/glusterfs-api.pc
 libdata/pkgconfig/libgfchangelog.pc
-libdata/pkgconfig/libgfdb.pc
+libexec/ganesha/create-export-ganesha.sh
-libexec/glusterfs/events/__init__.py
+libexec/ganesha/dbus-send.sh
-libexec/glusterfs/events/__init__.pyc
+libexec/ganesha/ganesha-ha.sh
-libexec/glusterfs/events/__init__.pyo
+libexec/ganesha/generate-epoch.py
-libexec/glusterfs/events/eventsapiconf.py
+libexec/glusterfs/gfevents/__init__.py
-libexec/glusterfs/events/eventsapiconf.pyc
+libexec/glusterfs/gfevents/__pycache__/__init__.cpython-37.opt-1.pyc
-libexec/glusterfs/events/eventsapiconf.pyo
+libexec/glusterfs/gfevents/__pycache__/__init__.cpython-37.pyc
-libexec/glusterfs/events/eventtypes.py
+libexec/glusterfs/gfevents/__pycache__/eventsapiconf.cpython-37.opt-1.pyc
-libexec/glusterfs/events/eventtypes.pyc
+libexec/glusterfs/gfevents/__pycache__/eventsapiconf.cpython-37.pyc
-libexec/glusterfs/events/eventtypes.pyo
+libexec/glusterfs/gfevents/__pycache__/eventtypes.cpython-37.opt-1.pyc
-libexec/glusterfs/events/gf_event.py
+libexec/glusterfs/gfevents/__pycache__/eventtypes.cpython-37.pyc
-libexec/glusterfs/events/gf_event.pyc
+libexec/glusterfs/gfevents/__pycache__/gf_event.cpython-37.opt-1.pyc
-libexec/glusterfs/events/gf_event.pyo
+libexec/glusterfs/gfevents/__pycache__/gf_event.cpython-37.pyc
-libexec/glusterfs/events/glustereventsd.py
+libexec/glusterfs/gfevents/__pycache__/handlers.cpython-37.opt-1.pyc
-libexec/glusterfs/events/handlers.py
+libexec/glusterfs/gfevents/__pycache__/handlers.cpython-37.pyc
-libexec/glusterfs/events/handlers.pyc
+libexec/glusterfs/gfevents/__pycache__/utils.cpython-37.opt-1.pyc
-libexec/glusterfs/events/handlers.pyo
+libexec/glusterfs/gfevents/__pycache__/utils.cpython-37.pyc
-libexec/glusterfs/events/utils.py
+libexec/glusterfs/gfevents/eventsapiconf.py
-libexec/glusterfs/events/utils.pyc
+libexec/glusterfs/gfevents/eventtypes.py
-libexec/glusterfs/events/utils.pyo
+libexec/glusterfs/gfevents/gf_event.py
+libexec/glusterfs/gfevents/glustereventsd.py
+libexec/glusterfs/gfevents/handlers.py
+libexec/glusterfs/gfevents/utils.py
 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
+libexec/glusterfs/glusterfind/__pycache__/__init__.cpython-37.opt-1.pyc
-libexec/glusterfs/glusterfind/__init__.pyo
+libexec/glusterfs/glusterfind/__pycache__/__init__.cpython-37.pyc
+libexec/glusterfs/glusterfind/__pycache__/changelogdata.cpython-37.opt-1.pyc
+libexec/glusterfs/glusterfind/__pycache__/changelogdata.cpython-37.pyc
+libexec/glusterfs/glusterfind/__pycache__/conf.cpython-37.opt-1.pyc
+libexec/glusterfs/glusterfind/__pycache__/conf.cpython-37.pyc
+libexec/glusterfs/glusterfind/__pycache__/gfind_py2py3.cpython-37.opt-1.pyc
+libexec/glusterfs/glusterfind/__pycache__/gfind_py2py3.cpython-37.pyc
+libexec/glusterfs/glusterfind/__pycache__/libgfchangelog.cpython-37.opt-1.pyc
+libexec/glusterfs/glusterfind/__pycache__/libgfchangelog.cpython-37.pyc
+libexec/glusterfs/glusterfind/__pycache__/main.cpython-37.opt-1.pyc
+libexec/glusterfs/glusterfind/__pycache__/main.cpython-37.pyc
+libexec/glusterfs/glusterfind/__pycache__/utils.cpython-37.opt-1.pyc
+libexec/glusterfs/glusterfind/__pycache__/utils.cpython-37.pyc
 libexec/glusterfs/glusterfind/brickfind.py
 libexec/glusterfs/glusterfind/changelog.py
 libexec/glusterfs/glusterfind/changelogdata.py
-libexec/glusterfs/glusterfind/changelogdata.pyc
-libexec/glusterfs/glusterfind/changelogdata.pyo
 libexec/glusterfs/glusterfind/conf.py
-libexec/glusterfs/glusterfind/conf.pyc
+libexec/glusterfs/glusterfind/gfind_py2py3.py
-libexec/glusterfs/glusterfind/conf.pyo
 libexec/glusterfs/glusterfind/libgfchangelog.py
-libexec/glusterfs/glusterfind/libgfchangelog.pyc
-libexec/glusterfs/glusterfind/libgfchangelog.pyo
 libexec/glusterfs/glusterfind/main.py
-libexec/glusterfs/glusterfind/main.pyc
-libexec/glusterfs/glusterfind/main.pyo
 libexec/glusterfs/glusterfind/nodeagent.py
 libexec/glusterfs/glusterfind/tool.conf
 libexec/glusterfs/glusterfind/utils.py
-libexec/glusterfs/glusterfind/utils.pyc
-libexec/glusterfs/glusterfind/utils.pyo
 libexec/glusterfs/peer_add_secret_pub
 libexec/glusterfs/peer_eventsapi.py
+man/man8/gluster-setgfid2path.8.gz
 man/man8/gluster.8.gz
 man/man8/glusterd.8.gz
 man/man8/glusterfs.8.gz
@@ -284,9 +277,9 @@ sbin/conf.py
 sbin/gcron.py
 sbin/gf_attach
 sbin/gfind_missing_files
-sbin/glfsheal
 sbin/gluster
 sbin/gluster-eventsapi
+sbin/gluster-setgfid2path
 sbin/glusterd
 sbin/glustereventsd
 sbin/glusterfs
@@ -304,11 +297,17 @@ sbin/umountd
 %%DATADIR%%/scripts/eventsdash.py
 %%DATADIR%%/scripts/post-upgrade-script-for-quota.sh
 %%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh
+%%DATADIR%%/scripts/setup-thin-arbiter.sh
 %%DATADIR%%/scripts/stop-all-gluster-processes.sh
+/var/db/glusterd/groups/db-workload
+/var/db/glusterd/groups/distributed-virt
 /var/db/glusterd/groups/gluster-block
 /var/db/glusterd/groups/metadata-cache
 /var/db/glusterd/groups/nl-cache
-@sample /var/db/glusterd/groups/virt.sample
+/var/db/glusterd/groups/samba
+/var/db/glusterd/groups/virt
+/var/db/glusterd/hooks/1/add-brick/post/S10selinux-label-brick.sh
+/var/db/glusterd/hooks/1/add-brick/post/S13create-subdir-mounts.sh
 /var/db/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh
 /var/db/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh
 /var/db/glusterd/hooks/1/delete/post/S57glusterfind-delete-post
@@ -316,6 +315,7 @@ sbin/umountd
 /var/db/glusterd/hooks/1/set/post/S32gluster_enable_shared_storage.sh
 /var/db/glusterd/hooks/1/start/post/S29CTDBsetup.sh
 /var/db/glusterd/hooks/1/start/post/S30samba-start.sh
+/var/db/glusterd/hooks/1/start/post/S31ganesha-start.sh
 /var/db/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh
 /var/db/glusterd/hooks/1/stop/pre/S30samba-stop.sh
 @dir /var/db/glusterd/events