Attachment #184303 for bug #220674




# $FreeBSD$

PORTNAME=	glusterfs
PORTVERSION=	3.11.1
PORTREVISION=	1	
CATEGORIES=	net
MASTER_SITES=	http://bits.gluster.org/pub/gluster/glusterfs/src/

MAINTAINER=	craig001@lerwick.hopto.org
COMMENT=	GlusterFS distributed file system

LICENSE=	GPLv2 LGPL3
LICENSE_COMB=	dual

LIB_DEPENDS=	libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu

USE_GCC=	any

USES=		bison gettext libtool pkgconfig python readline shebangfix \
		sqlite ssl

BROKEN_SSL=	libressl

SHEBANG_FILES=	extras/peer_add_secret_pub.in \
		extras/ganesha/scripts/dbus-send.sh \
		extras/ganesha/scripts/ganesha-ha.sh \
		extras/ganesha/scripts/generate-epoch.py \
		extras/peer_add_secret_pub.in \
		tools/glusterfind/S57glusterfind-delete-post.py

USE_GNOME=	glib20 libxml2
USE_LDCONFIG=	yes
USE_RC_SUBR=	glusterd
GNU_CONFIGURE=	yes
CONFIGURE_ARGS=	--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
		--with-mountutildir=${PREFIX}/sbin \
		--localstatedir=/var \
		--disable-epoll \
		--enable-glupy \
		--disable-georeplication \
		ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
		ac_cv_func_setfsuid=no 	ac_cv_func_fdatasync=no \
		ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
CPPFLAGS+=	-I"${LOCALBASE}/include"
LDFLAGS+=	-L"${LOCALBASE}/lib" -largp
INSTALL_TARGET=	install-strip
PLIST_SUB=	GLUSTERLIBDIR="lib/${PORTNAME}/${PORTVERSION}"
KMODDIR?=	/boot/modules

.include <bsd.port.options.mk>

.if ${OSVERSION} < 1101001
USE_GCC=	yes
.endif

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1479924003	1	TIMESTAMP = 1499632037
2	SHA256 (glusterfs-3.9.0.tar.gz) = b417c674454b17d1851828a1ca395cb9e7ab198378391da04e2fb8911cc1fb14	2	SHA256 (glusterfs-3.11.1.tar.gz) = c7e0502631c9bc9da05795b666b74ef40a30a0344f5a2e205e65bd2faefe1442
3	SIZE (glusterfs-3.9.0.tar.gz) = 8709782	3	SIZE (glusterfs-3.11.1.tar.gz) = 9155001




--- 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
        ;;

Lines 1-10 Link Here

(-)files/patch-contrib-fuse-lib-mount.c (-10 lines)
1	--- contrib/fuse-lib/mount.c.orig 2016-11-15 14:54:27 UTC
2	+++ contrib/fuse-lib/mount.c
3	@@ -256,6 +256,7 @@ fuse_mount_sys (const char *mountpoint,
4	build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1);
5	build_iovec (&iov, &iovlen, "volname", source, -1);
6	build_iovec (&iov, &iovlen, "fd", fdstr, -1);
7	+ build_iovec (&iov, &iovlen, "allow_other", NULL, -1);
8	ret = nmount (iov, iovlen, mountflags);
9	#else
10	ret = mount (source, mountpoint, fstype, mountflags,

Line 0 Link Here

(-)files/patch-contrib_fuse-lib_mount.c (+10 lines)
	1	--- contrib/fuse-lib/mount.c.orig 2017-06-27 15:25:12 UTC
	2	+++ contrib/fuse-lib/mount.c
	3	@@ -382,6 +382,7 @@ fuse_mount_sys (const char *mountpoint,
	4	build_iovec (&iov, &iovlen, "from", "/dev/fuse", -1);
	5	build_iovec (&iov, &iovlen, "volname", source, -1);
	6	build_iovec (&iov, &iovlen, "fd", fdstr, -1);
	7	+ build_iovec (&iov, &iovlen, "allow_other", NULL, -1);
	8	ret = nmount (iov, iovlen, mountflags);
	9	#else
	10	ret = mount (source, mountpoint, fstype, mountflags,




--- extras/Makefile.in.orig	2016-11-15 14:54:33 UTC
+++ extras/Makefile.in
@@ -635,8 +635,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:
@@ -935,7 +935,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
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.




--- 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 \




bin/glusterfind
@sample etc/ganesha/ganesha-ha.conf.sample
%%ETCDIR%%/eventsconfig.json
%%ETCDIR%%/gluster-rsyslog-5.8.conf
%%ETCDIR%%/gluster-rsyslog-7.2.conf
@sample %%ETCDIR%%/glusterd.vol.sample
%%ETCDIR%%/glusterfs-georep-logrotate
%%ETCDIR%%/glusterfs-logrotate
%%ETCDIR%%/group-gluster-block
%%ETCDIR%%/group-metadata-cache
%%ETCDIR%%/group-nl-cache
%%ETCDIR%%/group-virt.example
%%ETCDIR%%/logger.conf.example
include/glusterfs/api/glfs-handles.h
include/glusterfs/api/glfs.h
include/glusterfs/atomic.h
include/glusterfs/byte-order.h
include/glusterfs/call-stub.h
include/glusterfs/checksum.h
include/glusterfs/circ-buff.h
include/glusterfs/cli1-xdr.h
include/glusterfs/client_t.h
include/glusterfs/cluster-syncop.h
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/gf-dirent.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
include/glusterfs/iatt.h
include/glusterfs/inode.h
include/glusterfs/iobuf.h
include/glusterfs/latency.h
include/glusterfs/libglusterfs-messages.h
include/glusterfs/list.h
include/glusterfs/lkowner.h
include/glusterfs/locking.h
include/glusterfs/logging.h
include/glusterfs/lvm-defaults.h
include/glusterfs/mem-pool.h
include/glusterfs/mem-types.h
include/glusterfs/options.h
include/glusterfs/parse-utils.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/portmap-xdr.h
include/glusterfs/rpc/protocol-common.h
include/glusterfs/rpc/rpc-clnt-ping.h
include/glusterfs/rpc/rpc-clnt.h
include/glusterfs/rpc/rpc-common-xdr.h
include/glusterfs/rpc/rpc-drc.h
include/glusterfs/rpc/rpc-lib-messages.h
include/glusterfs/rpc/rpc-pragmas.h
include/glusterfs/rpc/rpc-transport.h
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
include/glusterfs/server/authenticate.h
include/glusterfs/server/server-common.h
include/glusterfs/server/server-helpers.h
include/glusterfs/server/server-mem-types.h
include/glusterfs/server/server-messages.h
include/glusterfs/server/server.h
include/glusterfs/stack.h
include/glusterfs/statedump.h
include/glusterfs/store.h
include/glusterfs/strfd.h
include/glusterfs/syncop-utils.h
include/glusterfs/syncop.h
include/glusterfs/syscall.h
include/glusterfs/template-component-messages.h
include/glusterfs/throttle-tbf.h
include/glusterfs/timer.h
include/glusterfs/timespec.h
include/glusterfs/trie.h
include/glusterfs/tw.h
include/glusterfs/upcall-utils.h
include/glusterfs/xlator.h
include/glusterfs/y.tab.h
%%GLUSTERLIBDIR%%/auth/addr.so
%%GLUSTERLIBDIR%%/auth/login.so
%%GLUSTERLIBDIR%%/rpc-transport/socket.so
%%GLUSTERLIBDIR%%/xlator/cluster/afr.so
%%GLUSTERLIBDIR%%/xlator/cluster/dht.so
%%GLUSTERLIBDIR%%/xlator/cluster/disperse.so
%%GLUSTERLIBDIR%%/xlator/cluster/distribute.so
%%GLUSTERLIBDIR%%/xlator/cluster/ec.so
%%GLUSTERLIBDIR%%/xlator/cluster/nufa.so
%%GLUSTERLIBDIR%%/xlator/cluster/pump.so
%%GLUSTERLIBDIR%%/xlator/cluster/replicate.so
%%GLUSTERLIBDIR%%/xlator/cluster/stripe.so
%%GLUSTERLIBDIR%%/xlator/cluster/switch.so
%%GLUSTERLIBDIR%%/xlator/cluster/tier.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
%%GLUSTERLIBDIR%%/xlator/features/bit-rot.so
%%GLUSTERLIBDIR%%/xlator/features/bitrot-stub.so
%%GLUSTERLIBDIR%%/xlator/features/cdc.so
%%GLUSTERLIBDIR%%/xlator/features/changelog.so
%%GLUSTERLIBDIR%%/xlator/features/changetimerecorder.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.%%PYTHON_PYOEXTENSION%%
%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.py
%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.pyc
%%GLUSTERLIBDIR%%/xlator/features/glupy/helloworld.%%PYTHON_PYOEXTENSION%%
%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.py
%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.pyc
%%GLUSTERLIBDIR%%/xlator/features/glupy/negative.%%PYTHON_PYOEXTENSION%%
%%GLUSTERLIBDIR%%/xlator/features/index.so
%%GLUSTERLIBDIR%%/xlator/features/leases.so
%%GLUSTERLIBDIR%%/xlator/features/locks.so
%%GLUSTERLIBDIR%%/xlator/features/mac-compat.so
%%GLUSTERLIBDIR%%/xlator/features/marker.so
%%GLUSTERLIBDIR%%/xlator/features/posix-locks.so
%%GLUSTERLIBDIR%%/xlator/features/prot_client.so
%%GLUSTERLIBDIR%%/xlator/features/prot_dht.so
%%GLUSTERLIBDIR%%/xlator/features/prot_server.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/selinux.so
%%GLUSTERLIBDIR%%/xlator/features/shard.so
%%GLUSTERLIBDIR%%/xlator/features/snapview-client.so
%%GLUSTERLIBDIR%%/xlator/features/snapview-server.so
%%GLUSTERLIBDIR%%/xlator/features/trash.so
%%GLUSTERLIBDIR%%/xlator/features/upcall.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/nfs/server.so
%%GLUSTERLIBDIR%%/xlator/performance/decompounder.so
%%GLUSTERLIBDIR%%/xlator/performance/io-cache.so
%%GLUSTERLIBDIR%%/xlator/performance/io-threads.so
%%GLUSTERLIBDIR%%/xlator/performance/md-cache.so
%%GLUSTERLIBDIR%%/xlator/performance/nl-cache.so
%%GLUSTERLIBDIR%%/xlator/performance/open-behind.so
%%GLUSTERLIBDIR%%/xlator/performance/quick-read.so
%%GLUSTERLIBDIR%%/xlator/performance/read-ahead.so
%%GLUSTERLIBDIR%%/xlator/performance/readdir-ahead.so
%%GLUSTERLIBDIR%%/xlator/performance/stat-prefetch.so
%%GLUSTERLIBDIR%%/xlator/performance/write-behind.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/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/__init__.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.py
%%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.pyc
%%PYTHON_SITELIBDIR%%/gluster/cliutils/__init__.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.py
%%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.pyc
%%PYTHON_SITELIBDIR%%/gluster/cliutils/cliutils.%%PYTHON_PYOEXTENSION%%
%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.py
%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.pyc
%%PYTHON_SITELIBDIR%%/gluster/glupy/__init__.%%PYTHON_PYOEXTENSION%%
libdata/pkgconfig/glusterfs-api.pc
libdata/pkgconfig/libgfchangelog.pc
libdata/pkgconfig/libgfdb.pc
libexec/ganesha/create-export-ganesha.sh
libexec/ganesha/dbus-send.sh
libexec/ganesha/ganesha-ha.sh
libexec/ganesha/generate-epoch.py
libexec/glusterfs/events/__init__.py
libexec/glusterfs/events/__init__.pyc
libexec/glusterfs/events/__init__.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/events/eventsapiconf.py
libexec/glusterfs/events/eventsapiconf.pyc
libexec/glusterfs/events/eventsapiconf.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/events/eventtypes.py
libexec/glusterfs/events/eventtypes.pyc
libexec/glusterfs/events/eventtypes.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/events/gf_event.py
libexec/glusterfs/events/gf_event.pyc
libexec/glusterfs/events/gf_event.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/events/glustereventsd.py
libexec/glusterfs/events/handlers.py
libexec/glusterfs/events/handlers.pyc
libexec/glusterfs/events/handlers.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/events/utils.py
libexec/glusterfs/events/utils.pyc
libexec/glusterfs/events/utils.%%PYTHON_PYOEXTENSION%%
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/glusterfind/S57glusterfind-delete-post.py
libexec/glusterfs/glusterfind/__init__.py
libexec/glusterfs/glusterfind/__init__.pyc
libexec/glusterfs/glusterfind/__init__.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/glusterfind/brickfind.py
libexec/glusterfs/glusterfind/changelog.py
libexec/glusterfs/glusterfind/changelogdata.py
libexec/glusterfs/glusterfind/changelogdata.pyc
libexec/glusterfs/glusterfind/changelogdata.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/glusterfind/conf.py
libexec/glusterfs/glusterfind/conf.pyc
libexec/glusterfs/glusterfind/conf.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/glusterfind/libgfchangelog.py
libexec/glusterfs/glusterfind/libgfchangelog.pyc
libexec/glusterfs/glusterfind/libgfchangelog.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/glusterfind/main.py
libexec/glusterfs/glusterfind/main.pyc
libexec/glusterfs/glusterfind/main.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/glusterfind/nodeagent.py
libexec/glusterfs/glusterfind/tool.conf
libexec/glusterfs/glusterfind/utils.py
libexec/glusterfs/glusterfind/utils.pyc
libexec/glusterfs/glusterfind/utils.%%PYTHON_PYOEXTENSION%%
libexec/glusterfs/peer_add_secret_pub
libexec/glusterfs/peer_eventsapi.py
man/man8/gluster.8.gz
man/man8/glusterd.8.gz
man/man8/glusterfs.8.gz
man/man8/glusterfsd.8.gz
man/man8/mount.glusterfs.8.gz
sbin/conf.py
sbin/gcron.py
sbin/gf_attach
sbin/gfind_missing_files
sbin/glfsheal
sbin/gluster
sbin/gluster-eventsapi
sbin/glusterd
sbin/glustereventsd
sbin/glusterfs
sbin/glusterfsd
sbin/mount_glusterfs
sbin/snap_scheduler.py
sbin/umountd
%%PORTDOCS%%%%DOCSDIR%%/benchmarking/README
%%PORTDOCS%%%%DOCSDIR%%/benchmarking/glfs-bm.c
%%PORTDOCS%%%%DOCSDIR%%/benchmarking/launch-script.sh
%%PORTDOCS%%%%DOCSDIR%%/benchmarking/local-script.sh
%%PORTDOCS%%%%DOCSDIR%%/benchmarking/rdd.c
%%PORTDOCS%%%%DOCSDIR%%/glusterfs-mode.el
%%PORTDOCS%%%%DOCSDIR%%/glusterfs.vim
%%DATADIR%%/scripts/eventsdash.py
%%DATADIR%%/scripts/post-upgrade-script-for-quota.sh
%%DATADIR%%/scripts/pre-upgrade-script-for-quota.sh
%%DATADIR%%/scripts/stop-all-gluster-processes.sh
/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/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
/var/db/glusterd/hooks/1/reset/post/S31ganesha-reset.sh
/var/db/glusterd/hooks/1/set/post/S30samba-set.sh
/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
@dir /var/db/glusterd/glusterfind/.keys
@dir /var/db/glusterd/glusterfind
@dir /var/db/glusterd/groups
@dir /var/db/glusterd/hooks/1/add-brick/post
@dir /var/db/glusterd/hooks/1/add-brick/pre
@dir /var/db/glusterd/hooks/1/add-brick
@dir /var/db/glusterd/hooks/1/delete/post
@dir /var/db/glusterd/hooks/1/delete
@dir /var/db/glusterd/hooks/1/reset/post
@dir /var/db/glusterd/hooks/1/reset
@dir /var/db/glusterd/hooks/1/set/post
@dir /var/db/glusterd/hooks/1/set
@dir /var/db/glusterd/hooks/1/start/post
@dir /var/db/glusterd/hooks/1/start
@dir /var/db/glusterd/hooks/1/stop/pre
@dir /var/db/glusterd/hooks/1/stop
@dir /var/db/glusterd/hooks/1
@dir /var/db/glusterd/hooks
@dir /var/db/glusterd
@dir /var/log/glusterfs
@dir /var/run/gluster

Return to bug 220674

Lines 1-50 Link Here

(-)Makefile (-9 / +9 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= glusterfs	3	PORTNAME= glusterfs
4	PORTVERSION= 3.9.0	4	PORTVERSION= 3.11.1
5	PORTREVISION= 3	5	PORTREVISION= 1
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/	7	MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
8		8
9	MAINTAINER= craig001@lerwick.hopto.org	9	MAINTAINER= craig001@lerwick.hopto.org
10	COMMENT= GlusterFS distributed file system	10	COMMENT= GlusterFS distributed file system
11		11
12	LICENSE= GPLv2 LGPL3	12	LICENSE= GPLv2 LGPL3
13	LICENSE_COMB= dual	13	LICENSE_COMB= dual
14		14
15	LIB_DEPENDS= libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu	15	LIB_DEPENDS= libargp.so:devel/argp-standalone liburcu-bp.so:sysutils/liburcu
16		16
17	USE_GCC= any
18
19	USES= bison gettext libtool pkgconfig python readline shebangfix \	17	USES= bison gettext libtool pkgconfig python readline shebangfix \
20	sqlite ssl	18	sqlite ssl
21		19
22	BROKEN_SSL= libressl	20	BROKEN_SSL= libressl
23		21
24	SHEBANG_FILES= extras/ganesha/scripts/create-export-ganesha.sh \	22	SHEBANG_FILES= extras/peer_add_secret_pub.in \
25	extras/ganesha/scripts/dbus-send.sh \
26	extras/ganesha/scripts/ganesha-ha.sh \
27	extras/ganesha/scripts/generate-epoch.py \
28	extras/peer_add_secret_pub.in \
29	tools/glusterfind/S57glusterfind-delete-post.py	23	tools/glusterfind/S57glusterfind-delete-post.py
30		24
31	USE_GNOME= glib20 libxml2	25	USE_GNOME= glib20 libxml2
32	USE_LDCONFIG= yes	26	USE_LDCONFIG= yes
33	USE_RC_SUBR= glusterd	27	USE_RC_SUBR= glusterd
34	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
35	CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \	29	CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
36	--with-mountutildir=${PREFIX}/sbin \	30	--with-mountutildir=${PREFIX}/sbin \
37	--localstatedir=/var \	31	--localstatedir=/var \
38	--disable-epoll \	32	--disable-epoll \
39	--enable-glupy \	33	--enable-glupy \
40	--disable-georeplication \	34	--disable-georeplication \
41	ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \	35	ac_cv_lib_aio_io_setup=no ac_cv_func_fallocate=no \
42	ac_cv_func_setfsuid=no ac_cv_func_fdatasync=no \	36	ac_cv_func_setfsuid=no ac_cv_func_fdatasync=no \
43	ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no	37	ac_cv_func_llistxattr=no ac_cv_func_malloc_stats=no
44	CPPFLAGS+= -I"${LOCALBASE}/include"	38	CPPFLAGS+= -I"${LOCALBASE}/include"
45	LDFLAGS+= -L"${LOCALBASE}/lib" -largp	39	LDFLAGS+= -L"${LOCALBASE}/lib" -largp
46	INSTALL_TARGET= install-strip	40	INSTALL_TARGET= install-strip
47	PLIST_SUB= GLUSTERLIBDIR="lib/${PORTNAME}/${PORTVERSION}"	41	PLIST_SUB= GLUSTERLIBDIR="lib/${PORTNAME}/${PORTVERSION}"
48	KMODDIR?= /boot/modules	42	KMODDIR?= /boot/modules
49		43
		44	.include <bsd.port.options.mk>
		45
		46	.if ${OSVERSION} < 1101001
		47	USE_GCC= yes
		48	.endif
		49
50	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Lines 1-12 Link Here

(-)files/patch-configure (-2 / +2 lines)
1	--- configure.orig 2016-11-15 14:54:31 UTC	1	--- configure.orig 2017-06-27 15:25:15 UTC
2	+++ configure	2	+++ configure
3	@@ -13428,6 +13428,9 @@ case $host_os in	3	@@ -13475,6 +13475,9 @@ case $host_os in
4	linux*)	4	linux*)
5	#do nothing	5	#do nothing
6	;;	6	;;
7	+ freebsd*)	7	+ freebsd*)
8	+#do nothing	8	+#do nothing
9	+ ;;	9	+ ;;
10	netbsd*)	10	netbsd*)
11	#do nothing	11	#do nothing
12	;;	12	;;

Lines 1-22 Link Here

(-)files/patch-extras-Makefile.in (-22 lines)
1	--- extras/Makefile.in.orig 2016-11-15 14:54:33 UTC
2	+++ extras/Makefile.in
3	@@ -635,8 +635,8 @@ install-volDATA: $(vol_DATA)
4	echo "$$d$$p"; \
5	done \| $(am__base_list) \| \
6	while read files; do \
7	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)'"; \
8	- $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)" \|\| exit $$?; \
9	+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)/$${files}.sample'"; \
10	+ $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)/$${files}.sample" \|\| exit $$?; \
11	done
12
13	uninstall-volDATA:
14	@@ -935,7 +935,7 @@ install-data-local:
15	fi
16	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups
17	$(INSTALL_DATA) $(top_srcdir)/extras/group-virt.example \
18	- $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt
19	+ $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt.sample
20
21	# Tell versions [3.59,3.63) of GNU make to not export all variables.
22	# Otherwise a system limit (for SysV at least) may be exceeded.

Line 0 Link Here

(-)files/patch-extras_Makefile.in (+22 lines)
	1	--- extras/Makefile.in.orig 2017-06-27 15:25:17 UTC
	2	+++ extras/Makefile.in
	3	@@ -637,8 +637,8 @@ install-volDATA: $(vol_DATA)
	4	echo "$$d$$p"; \
	5	done \| $(am__base_list) \| \
	6	while read files; do \
	7	- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)'"; \
	8	- $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)" \|\| exit $$?; \
	9	+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(voldir)/$${files}.sample'"; \
	10	+ $(INSTALL_DATA) $$files "$(DESTDIR)$(voldir)/$${files}.sample" \|\| exit $$?; \
	11	done
	12
	13	uninstall-volDATA:
	14	@@ -937,7 +937,7 @@ install-data-local:
	15	fi
	16	$(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups
	17	$(INSTALL_DATA) $(top_srcdir)/extras/group-virt.example \
	18	- $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt
	19	+ $(DESTDIR)$(GLUSTERD_WORKDIR)/groups/virt.sample
	20	$(INSTALL_DATA) $(top_srcdir)/extras/group-metadata-cache \
	21	$(DESTDIR)$(GLUSTERD_WORKDIR)/groups/metadata-cache
	22	$(INSTALL_DATA) $(top_srcdir)/extras/group-gluster-block \