Attachment #218314 for bug #249492





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


LICENSE=	GPLv2 LGPL3
LICENSE_COMB=	dual

BROKEN_SSL=	libressl

BUILD_DEPENDS=	bash:shells/bash
RUN_DEPENDS=	bash:shells/bash
LIB_DEPENDS=	libargp.so:devel/argp-standalone \
		libcurl.so:ftp/curl \
		liburcu-bp.so:sysutils/liburcu \
		libuuid.so:misc/e2fsprogs-libuuid

USES=		autoreconf bison compiler:c11 gettext gnome libtool pkgconfig python \
		readline shebangfix sqlite ssl

SHEBANG_FILES=	build-aux/pkg-version \
		events/src/glustereventsd.py events/src/peer_eventsapi.py \
USES=		autoreconf bison compiler:c11 gettext gnome libtool pkgconfig \
		python readline shebangfix sqlite ssl

SHEBANG_FILES=	events/src/glustereventsd.py events/src/peer_eventsapi.py \
		events/tools/eventsdash.py extras/ganesha/ocf/ganesha_grace \
		extras/ganesha/ocf/ganesha_mon extras/ganesha/ocf/ganesha_nfsd \
		extras/ganesha/scripts/create-export-ganesha.sh \

		extras/ganesha/scripts/ganesha-ha.sh \
		extras/ganesha/scripts/generate-epoch.py \
		extras/peer_add_secret_pub.in \
		extras/hook-scripts/start/post/S29CTDBsetup.sh \
		extras/hook-scripts/start/post/S30samba-start.sh \
		extras/hook-scripts/start/post/S31ganesha-start.sh \
		extras/post-upgrade-script-for-quota.sh \
		extras/pre-upgrade-script-for-quota.sh \
		extras/snap_scheduler/gcron.py \

CPPFLAGS+=	-I"${LOCALBASE}/include"
LDFLAGS+=	-L"${LOCALBASE}/lib" -largp
INSTALL_TARGET=	install-strip
PLIST_SUB=	GLUSTERLIBDIR="lib/${PORTNAME}" \
		PORTVERSION="${PORTVERSION}"
KMODDIR?=	/boot/modules

OPTIONS_DEFINE=	DOCS

post-install:
		${LN} -nfs ${PREFIX}/libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py		${STAGEDIR}/var/db/glusterd/hooks/1/delete/post/S57glusterfind-delete-post
		${LN} -nfs ../libexec/glusterfs/peer_eventsapi.py						${STAGEDIR}${PREFIX}/sbin/gluster-eventsapi
		${LN} -nfs ../libexec/glusterfs/gfevents/glustereventsd.py					${STAGEDIR}${PREFIX}/sbin/glustereventsd
		${LN} -nfs ../libexec/glusterfs/gfind_missing_files/gfind_missing_files.sh			${STAGEDIR}${PREFIX}/sbin/gfind_missing_files

.include <bsd.port.mk>




         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"
@@ -1508,6 +1514,13 @@ AC_SUBST(AM_LIBTOOLFLAGS)
 AC_SUBST(GF_NO_UNDEFINED)
 AC_SUBST(GF_XLATOR_DEFAULT_LDFLAGS)
 AC_SUBST(GF_XLATOR_LDFLAGS)
+AC_SUBST(GF_XLATOR_MGNT_LIBADD)
+
+case $host_os in
+     *freebsd*)
+        GF_XLATOR_MGNT_LIBADD="-lutil -lprocstat"
+        ;;
+esac
 
 CONTRIBDIR='$(top_srcdir)/contrib'
 AC_SUBST(CONTRIBDIR)




--- libglusterfs/src/Makefile.am.orig	2020-07-06 01:22:37 UTC
+++ libglusterfs/src/Makefile.am
@@ -12,7 +12,8 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE
 	-DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel \
 	-I$(CONTRIBDIR)/xxhash
 
-libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS)
+libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) $(LIB_DL) \
+	$(URCU_LIBS) $(URCU_CDS_LIBS)
 libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) $(GF_LDFLAGS) \
 	-export-symbols $(top_srcdir)/libglusterfs/src/libglusterfs.sym
 




--- libglusterfs/src/common-utils.c.orig	2020-07-06 01:22:37 UTC
+++ libglusterfs/src/common-utils.c
@@ -3113,7 +3113,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};
@@ -4127,6 +4127,14 @@ gf_skip_header_section(int fd, int header_len)
 gf_boolean_t
 gf_is_pid_running(int pid)
 {
+#ifdef __FreeBSD__
+	int ret = -1;
+
+	ret = sys_kill(pid, 0);
+	if (ret < 0) {
+		return _gf_false;
+	}
+#else
     char fname[32] = {
         0,
     };
@@ -4140,6 +4148,7 @@ gf_is_pid_running(int pid)
     }
 
     sys_close(fd);
+#endif
     return _gf_true;
 }
 




--- libglusterfs/src/glusterfs/syscall.h.orig	2020-08-04 12:41:32 UTC
+++ libglusterfs/src/glusterfs/syscall.h
@@ -266,4 +266,13 @@ ssize_t
 sys_copy_file_range(int fd_in, off64_t *off_in, int fd_out, off64_t *off_out,
                     size_t len, unsigned int flags);
 
+int
+sys_kill(pid_t pid, int sig);
+
+#ifdef __FreeBSD__
+int
+sys_sysctl(const int *name, u_int namelen, void *oldp,	size_t *oldlenp,
+		 const void *newp, size_t newlen);
+#endif
+
 #endif /* __SYSCALL_H__ */

Line 0 Link Here

(-)files/patch-libglusterfs_src_libglusterfs.sym (+11 lines)
	1	--- libglusterfs/src/libglusterfs.sym.orig 2020-08-04 12:41:32 UTC
	2	+++ libglusterfs/src/libglusterfs.sym
	3	@@ -1080,6 +1080,8 @@ sys_write
	4	sys_writev
	5	sys_socket
	6	sys_accept
	7	+sys_kill
	8	+sys_sysctl
	9	tbf_init
	10	tbf_throttle
	11	timespec_now




--- libglusterfs/src/syscall.c.orig	2020-08-04 12:41:32 UTC
+++ libglusterfs/src/syscall.c
@@ -13,6 +13,10 @@
 #include "glusterfs/mem-pool.h"
 #include "glusterfs/libglusterfs-messages.h"
 
+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+#include <signal.h>
+#endif
 #include <sys/types.h>
 #include <utime.h>
 #include <sys/time.h>
@@ -506,9 +510,17 @@ sys_lsetxattr(const char *path, const char *name, cons
 #endif
 
 #ifdef GF_BSD_HOST_OS
-    return FS_RET_CHECK0(
+    ssize_t ret = FS_RET_CHECK(
         extattr_set_link(path, EXTATTR_NAMESPACE_USER, name, value, size),
         errno);
+    /* On BSD extattr_set_link returns the number of bytes written/read on
+     * success. Force this to be 0 if it was successful so the result remains
+     * compatible with other platform expectations.
+     */
+    if(ret > 0) {
+       ret = 0;
+    }
+    return ret;
 #endif
 
 #ifdef GF_SOLARIS_HOST_OS
@@ -624,9 +636,17 @@ sys_fsetxattr(int filedes, const char *name, const voi
 #endif
 
 #ifdef GF_BSD_HOST_OS
-    return FS_RET_CHECK0(
+    ssize_t ret = FS_RET_CHECK(
         extattr_set_fd(filedes, EXTATTR_NAMESPACE_USER, name, value, size),
         errno);
+    /* On BSD extattr_set_fd returns the number of bytes written/read on
+     * success. Force this to be 0 if it was successful so the result remains
+     * compatible with other platform expectations.
+     */
+    if(ret > 0) {
+       ret = 0;
+    }
+    return ret;
 #endif
 
 #ifdef GF_SOLARIS_HOST_OS
@@ -854,3 +874,18 @@ sys_copy_file_range(int fd_in, off64_t *off_in, int fd
 #endif /* HAVE_COPY_FILE_RANGE_SYS */
 #endif /* HAVE_COPY_FILE_RANGE */
 }
+
+#ifdef __FreeBSD__
+int
+sys_kill(pid_t pid, int sig)
+{
+    return FS_RET_CHECK0(kill(pid, sig), errno);
+}
+
+int
+sys_sysctl(const int *name, u_int namelen, void *oldp,	size_t *oldlenp,
+		 const void *newp, size_t newlen)
+{
+	return FS_RET_CHECK0(sysctl(name, namelen, oldp, oldlenp, newp, newlen), errno);
+}
+#endif

Lines 1-5 Link Here

(-)files/patch-mount_glusterfs.in (-2 / +2 lines)
1	--- xlators/mount/fuse/utils/mount_glusterfs.in.orig 2017-06-27 22:25:12.392137135 +0700	1	--- xlators/mount/fuse/utils/mount_glusterfs.in.orig 2017-06-28 05:25:12 UTC
2	+++ xlators/mount/fuse/utils/mount_glusterfs.in 2017-12-19 18:24:21.736142000 +0700	2	+++ xlators/mount/fuse/utils/mount_glusterfs.in
3	@@ -463,50 +463,44 @@ parse_options()	3	@@ -463,50 +463,44 @@ parse_options()
4	if [ "$key" = "$value" ]; then	4	if [ "$key" = "$value" ]; then
5	without_options $pair;	5	without_options $pair;




--- xlators/mgmt/glusterd/src/Makefile.am.orig	2020-07-16 17:28:50 UTC
+++ xlators/mgmt/glusterd/src/Makefile.am
@@ -25,13 +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 \

 	$(top_builddir)/libglusterd/src/libglusterd.la \
 	$(top_builddir)/rpc/xdr/src/libgfxdr.la \
 	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
-	$(XML_LIBS) -lcrypto $(URCU_LIBS) $(URCU_CDS_LIBS) $(LIB_DL)
+	$(XML_LIBS) -lcrypto $(URCU_LIBS) $(URCU_CDS_LIBS) $(LIB_DL) $(GF_XLATOR_MGNT_LIBADD)
 
 noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \
 	glusterd-sm.h glusterd-store.h glusterd-mem-types.h \
@@ -46,7 +47,8 @@ noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-
 	glusterd-scrub-svc.h glusterd-server-quorum.h glusterd-errno.h \
         glusterd-shd-svc.h glusterd-shd-svc-helper.h \
         glusterd-gfproxyd-svc.h glusterd-gfproxyd-svc-helper.h \
-	$(CONTRIBDIR)/userspace-rcu/rculist-extra.h
+	$(CONTRIBDIR)/userspace-rcu/rculist-extra.h \
+	$(CONTRIBDIR)/mount/mntent_compat.h
 
 AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
 	-I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \




--- xlators/mgmt/glusterd/src/glusterd-utils.c.orig	2020-07-06 01:22:37 UTC
+++ xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -79,6 +79,14 @@
 #include <sys/sockio.h>
 #endif
 
+#ifdef __FreeBSD__
+#include <sys/sysctl.h>
+#include <sys/param.h>
+#include <sys/queue.h>
+#include <libprocstat.h>
+#include <libutil.h>
+#endif
+
 #define NFS_PROGRAM 100003
 #define NFSV3_VERSION 3
 
@@ -6270,7 +6278,6 @@ find_compatible_brick(glusterd_conf_t *conf, glusterd_
 int
 glusterd_get_sock_from_brick_pid(int pid, char *sockpath, size_t len)
 {
-    char fname[128] = "";
     char buf[1024] = "";
     char cmdline[2048] = "";
     xlator_t *this = NULL;
@@ -6285,6 +6292,22 @@ glusterd_get_sock_from_brick_pid(int pid, char *sockpa
     this = THIS;
     GF_ASSERT(this);
 
+#ifdef __FreeBSD__
+	blen = sizeof(buf);
+	int mib[4];
+
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_PROC;
+	mib[2] = KERN_PROC_ARGS;
+	mib[3] = pid;
+
+    if (sys_sysctl(mib, 4, buf, &blen, NULL, blen) != 0) {
+        gf_log(this->name, GF_LOG_ERROR, "brick process %d is not running",
+               pid);
+        return ret;
+    }
+#else
+    char fname[128] = "";
     snprintf(fname, sizeof(fname), "/proc/%d/cmdline", pid);
 
     if (sys_access(fname, R_OK) != 0) {
@@ -6301,6 +6324,7 @@ glusterd_get_sock_from_brick_pid(int pid, char *sockpa
                strerror(errno), fname);
         return ret;
     }
+#endif
 
     /* convert cmdline to single string */
     for (i = 0, j = 0; i < blen; i++) {
@@ -6349,6 +6373,42 @@ glusterd_get_sock_from_brick_pid(int pid, char *sockpa
 char *
 search_brick_path_from_proc(pid_t brick_pid, char *brickpath)
 {
+    char *brick_path = NULL;
+#ifdef __FreeBSD__
+	struct filestat *fst;
+	struct procstat *ps;
+	struct kinfo_proc *kp;
+	struct filestat_list *head;
+
+	ps = procstat_open_sysctl();	
+	if (ps == NULL)
+		goto out;
+	
+	kp = kinfo_getproc(brick_pid);
+	if (kp == NULL)
+		goto out;
+	
+	head = procstat_getfiles(ps, (void *)kp, 0);
+	if (head == NULL)
+		goto out;
+
+	STAILQ_FOREACH(fst, head, next) {
+		if(fst->fs_fd < 0)
+			continue;
+
+        if (!strcmp(fst->fs_path, brickpath)) {
+            brick_path = gf_strdup(fst->fs_path);
+            break;
+        }
+	}
+
+out:
+	if (head != NULL)
+		procstat_freefiles(ps, head);
+	if (kp != NULL)
+		free(kp);
+	procstat_close(ps);
+#else
     struct dirent *dp = NULL;
     DIR *dirp = NULL;
     size_t len = 0;
@@ -6359,7 +6419,6 @@ search_brick_path_from_proc(pid_t brick_pid, char *bri
             0,
         },
     };
-    char *brick_path = NULL;
 
     if (!brickpath)
         goto out;
@@ -6396,6 +6455,7 @@ search_brick_path_from_proc(pid_t brick_pid, char *bri
     }
 out:
     sys_closedir(dirp);
+#endif
     return brick_path;
 }
 




%%ETCDIR%%/group-metadata-cache
%%ETCDIR%%/group-nl-cache
%%ETCDIR%%/group-samba
%%ETCDIR%%/group-virt.example
@sample %%ETCDIR%%/logger.conf.example %%ETCDIR%%/logger.conf
@sample etc/ganesha/ganesha-ha.conf.sample
%%ETCDIR%%/thin-arbiter.vol
include/glusterfs/api/glfs-handles.h

include/glusterfs/upcall-utils.h
include/glusterfs/xlator.h
include/glusterfs/y.tab.h
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/auth/addr.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/auth/login.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/cloudsync-plugins/cloudsyncs3.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/rpc-transport/socket.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/afr.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/dht.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/disperse.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/distribute.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/ec.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/nufa.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/replicate.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/switch.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/delay-gen.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/error-gen.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/io-stats.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/sink.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/trace.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/access-control.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/arbiter.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/barrier.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/bit-rot.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/bitrot-stub.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/cdc.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/changelog.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/cloudsync.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/gfid-access.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/index.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/leases.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/locks.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/marker.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/namespace.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/posix-locks.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/quiesce.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/quota.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/quotad.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/read-only.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/sdfs.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/selinux.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/shard.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/snapview-client.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/snapview-server.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/thin-arbiter.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/trash.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/upcall.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/utime.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/worm.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/meta.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/mgmt/glusterd.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/mount/api.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/mount/fuse.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/io-cache.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/io-threads.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/md-cache.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/nl-cache.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/open-behind.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/quick-read.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/read-ahead.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/readdir-ahead.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/stat-prefetch.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/write-behind.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/playground/template.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/protocol/client.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/protocol/server.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/storage/posix.so
%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/system/posix-acl.so
lib/libgfapi.so
lib/libgfapi.so.0
lib/libgfapi.so.0.0.0

Return to bug 249492

Lines 11-18 Link Here

(-)pkg-plist (-67 / +67 lines)
11	%%ETCDIR%%/group-metadata-cache	11	%%ETCDIR%%/group-metadata-cache
12	%%ETCDIR%%/group-nl-cache	12	%%ETCDIR%%/group-nl-cache
13	%%ETCDIR%%/group-samba	13	%%ETCDIR%%/group-samba
14	@sample %%ETCDIR%%/group-virt.example	14	%%ETCDIR%%/group-virt.example
15	@sample %%ETCDIR%%/logger.conf.example	15	@sample %%ETCDIR%%/logger.conf.example %%ETCDIR%%/logger.conf
16	@sample etc/ganesha/ganesha-ha.conf.sample	16	@sample etc/ganesha/ganesha-ha.conf.sample
17	%%ETCDIR%%/thin-arbiter.vol	17	%%ETCDIR%%/thin-arbiter.vol
18	include/glusterfs/api/glfs-handles.h	18	include/glusterfs/api/glfs-handles.h
Lines 112-182 Link Here
112	include/glusterfs/upcall-utils.h	112	include/glusterfs/upcall-utils.h
113	include/glusterfs/xlator.h	113	include/glusterfs/xlator.h
114	include/glusterfs/y.tab.h	114	include/glusterfs/y.tab.h
115	%%GLUSTERLIBDIR%%/auth/addr.so	115	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/auth/addr.so
116	%%GLUSTERLIBDIR%%/auth/login.so	116	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/auth/login.so
117	%%GLUSTERLIBDIR%%/cloudsync-plugins/cloudsyncs3.so	117	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/cloudsync-plugins/cloudsyncs3.so
118	%%GLUSTERLIBDIR%%/rpc-transport/socket.so	118	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/rpc-transport/socket.so
119	%%GLUSTERLIBDIR%%/xlator/cluster/afr.so	119	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/afr.so
120	%%GLUSTERLIBDIR%%/xlator/cluster/dht.so	120	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/dht.so
121	%%GLUSTERLIBDIR%%/xlator/cluster/disperse.so	121	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/disperse.so
122	%%GLUSTERLIBDIR%%/xlator/cluster/distribute.so	122	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/distribute.so
123	%%GLUSTERLIBDIR%%/xlator/cluster/ec.so	123	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/ec.so
124	%%GLUSTERLIBDIR%%/xlator/cluster/nufa.so	124	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/nufa.so
125	%%GLUSTERLIBDIR%%/xlator/cluster/replicate.so	125	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/replicate.so
126	%%GLUSTERLIBDIR%%/xlator/cluster/switch.so	126	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/cluster/switch.so
127	%%GLUSTERLIBDIR%%/xlator/debug/delay-gen.so	127	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/delay-gen.so
128	%%GLUSTERLIBDIR%%/xlator/debug/error-gen.so	128	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/error-gen.so
129	%%GLUSTERLIBDIR%%/xlator/debug/io-stats.so	129	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/io-stats.so
130	%%GLUSTERLIBDIR%%/xlator/debug/sink.so	130	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/sink.so
131	%%GLUSTERLIBDIR%%/xlator/debug/trace.so	131	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/debug/trace.so
132	%%GLUSTERLIBDIR%%/xlator/features/access-control.so	132	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/access-control.so
133	%%GLUSTERLIBDIR%%/xlator/features/arbiter.so	133	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/arbiter.so
134	%%GLUSTERLIBDIR%%/xlator/features/barrier.so	134	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/barrier.so
135	%%GLUSTERLIBDIR%%/xlator/features/bit-rot.so	135	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/bit-rot.so
136	%%GLUSTERLIBDIR%%/xlator/features/bitrot-stub.so	136	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/bitrot-stub.so
137	%%GLUSTERLIBDIR%%/xlator/features/cdc.so	137	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/cdc.so
138	%%GLUSTERLIBDIR%%/xlator/features/changelog.so	138	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/changelog.so
139	%%GLUSTERLIBDIR%%/xlator/features/cloudsync.so	139	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/cloudsync.so
140	%%GLUSTERLIBDIR%%/xlator/features/gfid-access.so	140	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/gfid-access.so
141	%%GLUSTERLIBDIR%%/xlator/features/index.so	141	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/index.so
142	%%GLUSTERLIBDIR%%/xlator/features/leases.so	142	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/leases.so
143	%%GLUSTERLIBDIR%%/xlator/features/locks.so	143	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/locks.so
144	%%GLUSTERLIBDIR%%/xlator/features/marker.so	144	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/marker.so
145	%%GLUSTERLIBDIR%%/xlator/features/namespace.so	145	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/namespace.so
146	%%GLUSTERLIBDIR%%/xlator/features/posix-locks.so	146	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/posix-locks.so
147	%%GLUSTERLIBDIR%%/xlator/features/quiesce.so	147	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/quiesce.so
148	%%GLUSTERLIBDIR%%/xlator/features/quota.so	148	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/quota.so
149	%%GLUSTERLIBDIR%%/xlator/features/quotad.so	149	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/quotad.so
150	%%GLUSTERLIBDIR%%/xlator/features/read-only.so	150	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/read-only.so
151	%%GLUSTERLIBDIR%%/xlator/features/sdfs.so	151	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/sdfs.so
152	%%GLUSTERLIBDIR%%/xlator/features/selinux.so	152	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/selinux.so
153	%%GLUSTERLIBDIR%%/xlator/features/shard.so	153	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/shard.so
154	%%GLUSTERLIBDIR%%/xlator/features/snapview-client.so	154	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/snapview-client.so
155	%%GLUSTERLIBDIR%%/xlator/features/snapview-server.so	155	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/snapview-server.so
156	%%GLUSTERLIBDIR%%/xlator/features/thin-arbiter.so	156	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/thin-arbiter.so
157	%%GLUSTERLIBDIR%%/xlator/features/trash.so	157	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/trash.so
158	%%GLUSTERLIBDIR%%/xlator/features/upcall.so	158	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/upcall.so
159	%%GLUSTERLIBDIR%%/xlator/features/utime.so	159	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/utime.so
160	%%GLUSTERLIBDIR%%/xlator/features/worm.so	160	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/features/worm.so
161	%%GLUSTERLIBDIR%%/xlator/meta.so	161	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/meta.so
162	%%GLUSTERLIBDIR%%/xlator/mgmt/glusterd.so	162	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/mgmt/glusterd.so
163	%%GLUSTERLIBDIR%%/xlator/mount/api.so	163	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/mount/api.so
164	%%GLUSTERLIBDIR%%/xlator/mount/fuse.so	164	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/mount/fuse.so
165	%%GLUSTERLIBDIR%%/xlator/performance/io-cache.so	165	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/io-cache.so
166	%%GLUSTERLIBDIR%%/xlator/performance/io-threads.so	166	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/io-threads.so
167	%%GLUSTERLIBDIR%%/xlator/performance/md-cache.so	167	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/md-cache.so
168	%%GLUSTERLIBDIR%%/xlator/performance/nl-cache.so	168	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/nl-cache.so
169	%%GLUSTERLIBDIR%%/xlator/performance/open-behind.so	169	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/open-behind.so
170	%%GLUSTERLIBDIR%%/xlator/performance/quick-read.so	170	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/quick-read.so
171	%%GLUSTERLIBDIR%%/xlator/performance/read-ahead.so	171	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/read-ahead.so
172	%%GLUSTERLIBDIR%%/xlator/performance/readdir-ahead.so	172	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/readdir-ahead.so
173	%%GLUSTERLIBDIR%%/xlator/performance/stat-prefetch.so	173	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/stat-prefetch.so
174	%%GLUSTERLIBDIR%%/xlator/performance/write-behind.so	174	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/performance/write-behind.so
175	%%GLUSTERLIBDIR%%/xlator/playground/template.so	175	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/playground/template.so
176	%%GLUSTERLIBDIR%%/xlator/protocol/client.so	176	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/protocol/client.so
177	%%GLUSTERLIBDIR%%/xlator/protocol/server.so	177	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/protocol/server.so
178	%%GLUSTERLIBDIR%%/xlator/storage/posix.so	178	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/storage/posix.so
179	%%GLUSTERLIBDIR%%/xlator/system/posix-acl.so	179	%%GLUSTERLIBDIR%%/%%PORTVERSION%%/xlator/system/posix-acl.so
180	lib/libgfapi.so	180	lib/libgfapi.so
181	lib/libgfapi.so.0	181	lib/libgfapi.so.0
182	lib/libgfapi.so.0.0.0	182	lib/libgfapi.so.0.0.0

Lines 2-7 Link Here

(-)Makefile (-8 / +20 lines)
2		2
3	PORTNAME= glusterfs	3	PORTNAME= glusterfs
4	PORTVERSION= 8.0	4	PORTVERSION= 8.0
		5	PORTREVISION= 1
5	CATEGORIES= net	6	CATEGORIES= net
6	MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/	7	MASTER_SITES= http://bits.gluster.org/pub/gluster/glusterfs/src/
7		8
Lines 11-29 Link Here
11	LICENSE= GPLv2 LGPL3	12	LICENSE= GPLv2 LGPL3
12	LICENSE_COMB= dual	13	LICENSE_COMB= dual
13		14
		15	BROKEN_SSL= libressl
		16
		17	BUILD_DEPENDS= bash:shells/bash
		18	RUN_DEPENDS= bash:shells/bash
14	LIB_DEPENDS= libargp.so:devel/argp-standalone \	19	LIB_DEPENDS= libargp.so:devel/argp-standalone \
15	libcurl.so:ftp/curl \	20	libcurl.so:ftp/curl \
16	liburcu-bp.so:sysutils/liburcu \	21	liburcu-bp.so:sysutils/liburcu \
17	libuuid.so:misc/e2fsprogs-libuuid	22	libuuid.so:misc/e2fsprogs-libuuid
18		23
19	RUN_DEPENDS= bash:shells/bash	24	USES= autoreconf bison compiler:c11 gettext gnome libtool pkgconfig python \
		25	readline shebangfix sqlite ssl
20		26
21	BROKEN_SSL= libressl	27	SHEBANG_FILES= build-aux/pkg-version \
22		28	events/src/glustereventsd.py events/src/peer_eventsapi.py \
23	USES= autoreconf bison compiler:c11 gettext gnome libtool pkgconfig \
24	python readline shebangfix sqlite ssl
25
26	SHEBANG_FILES= events/src/glustereventsd.py events/src/peer_eventsapi.py \
27	events/tools/eventsdash.py extras/ganesha/ocf/ganesha_grace \	29	events/tools/eventsdash.py extras/ganesha/ocf/ganesha_grace \
28	extras/ganesha/ocf/ganesha_mon extras/ganesha/ocf/ganesha_nfsd \	30	extras/ganesha/ocf/ganesha_mon extras/ganesha/ocf/ganesha_nfsd \
29	extras/ganesha/scripts/create-export-ganesha.sh \	31	extras/ganesha/scripts/create-export-ganesha.sh \
Lines 31-36 Link Here
31	extras/ganesha/scripts/ganesha-ha.sh \	33	extras/ganesha/scripts/ganesha-ha.sh \
32	extras/ganesha/scripts/generate-epoch.py \	34	extras/ganesha/scripts/generate-epoch.py \
33	extras/peer_add_secret_pub.in \	35	extras/peer_add_secret_pub.in \
		36	extras/hook-scripts/start/post/S29CTDBsetup.sh \
		37	extras/hook-scripts/start/post/S30samba-start.sh \
		38	extras/hook-scripts/start/post/S31ganesha-start.sh \
34	extras/post-upgrade-script-for-quota.sh \	39	extras/post-upgrade-script-for-quota.sh \
35	extras/pre-upgrade-script-for-quota.sh \	40	extras/pre-upgrade-script-for-quota.sh \
36	extras/snap_scheduler/gcron.py \	41	extras/snap_scheduler/gcron.py \
Lines 62-70 Link Here
62	CPPFLAGS+= -I"${LOCALBASE}/include"	67	CPPFLAGS+= -I"${LOCALBASE}/include"
63	LDFLAGS+= -L"${LOCALBASE}/lib" -largp	68	LDFLAGS+= -L"${LOCALBASE}/lib" -largp
64	INSTALL_TARGET= install-strip	69	INSTALL_TARGET= install-strip
65	PLIST_SUB= GLUSTERLIBDIR="lib/${PORTNAME}"	70	PLIST_SUB= GLUSTERLIBDIR="lib/${PORTNAME}" \
		71	PORTVERSION="${PORTVERSION}"
66	KMODDIR?= /boot/modules	72	KMODDIR?= /boot/modules
67		73
68	OPTIONS_DEFINE= DOCS	74	OPTIONS_DEFINE= DOCS
69		75
		76	post-install:
		77	${LN} -nfs ${PREFIX}/libexec/glusterfs/glusterfind/S57glusterfind-delete-post.py ${STAGEDIR}/var/db/glusterd/hooks/1/delete/post/S57glusterfind-delete-post
		78	${LN} -nfs ../libexec/glusterfs/peer_eventsapi.py ${STAGEDIR}${PREFIX}/sbin/gluster-eventsapi
		79	${LN} -nfs ../libexec/glusterfs/gfevents/glustereventsd.py ${STAGEDIR}${PREFIX}/sbin/glustereventsd
		80	${LN} -nfs ../libexec/glusterfs/gfind_missing_files/gfind_missing_files.sh ${STAGEDIR}${PREFIX}/sbin/gfind_missing_files
		81
70	.include <bsd.port.mk>	82	.include <bsd.port.mk>

Lines 37-39 Link Here

(-)files/patch-configure.ac (+14 lines)
37	GF_CFLAGS="${GF_CFLAGS} -DO_DSYNC=0"	37	GF_CFLAGS="${GF_CFLAGS} -DO_DSYNC=0"
38	GF_CFLAGS="${GF_CFLAGS} -Dxdr_quad_t=xdr_longlong_t"	38	GF_CFLAGS="${GF_CFLAGS} -Dxdr_quad_t=xdr_longlong_t"
39	GF_CFLAGS="${GF_CFLAGS} -Dxdr_u_quad_t=xdr_u_longlong_t"	39	GF_CFLAGS="${GF_CFLAGS} -Dxdr_u_quad_t=xdr_u_longlong_t"
		40	@@ -1508,6 +1514,13 @@ AC_SUBST(AM_LIBTOOLFLAGS)
		41	AC_SUBST(GF_NO_UNDEFINED)
		42	AC_SUBST(GF_XLATOR_DEFAULT_LDFLAGS)
		43	AC_SUBST(GF_XLATOR_LDFLAGS)
		44	+AC_SUBST(GF_XLATOR_MGNT_LIBADD)
		45	+
		46	+case $host_os in
		47	+ freebsd)
		48	+ GF_XLATOR_MGNT_LIBADD="-lutil -lprocstat"
		49	+ ;;
		50	+esac
		51
		52	CONTRIBDIR='$(top_srcdir)/contrib'
		53	AC_SUBST(CONTRIBDIR)

Lines 1-11 Link Here

(-)files/patch-libglusterfs_src_Makefile.am (-2 / +3 lines)
1	--- libglusterfs/src/Makefile.am.orig 2020-07-06 01:22:37 UTC	1	--- libglusterfs/src/Makefile.am.orig 2020-07-06 01:22:37 UTC
2	+++ libglusterfs/src/Makefile.am	2	+++ libglusterfs/src/Makefile.am
3	@@ -12,7 +12,7 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE	3	@@ -12,7 +12,8 @@ libglusterfs_la_CPPFLAGS = $(GF_CPPFLAGS) -D__USE_FILE
4	-DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel \	4	-DSBIN_DIR=\"$(sbindir)\" -I$(CONTRIBDIR)/timer-wheel \
5	-I$(CONTRIBDIR)/xxhash	5	-I$(CONTRIBDIR)/xxhash
6		6
7	-libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS)	7	-libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS)
8	+libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) $(URCU_LIBS)	8	+libglusterfs_la_LIBADD = $(ZLIB_LIBS) $(MATH_LIB) $(UUID_LIBS) $(LIB_DL) \
		9	+ $(URCU_LIBS) $(URCU_CDS_LIBS)
9	libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) $(GF_LDFLAGS) \	10	libglusterfs_la_LDFLAGS = -version-info $(LIBGLUSTERFS_LT_VERSION) $(GF_LDFLAGS) \
10	-export-symbols $(top_srcdir)/libglusterfs/src/libglusterfs.sym	11	-export-symbols $(top_srcdir)/libglusterfs/src/libglusterfs.sym
11		12

Lines 1-11 Link Here

(-)files/patch-libglusterfs_src_common-utils.c (-4 / +27 lines)
1	--- libglusterfs/src/common-utils.c.orig 2020-05-18 20:57:54 UTC	1	--- libglusterfs/src/common-utils.c.orig 2020-07-06 01:22:37 UTC
2	+++ libglusterfs/src/common-utils.c	2	+++ libglusterfs/src/common-utils.c
3	@@ -3067,7 +3067,7 @@ get_mem_size()	3	@@ -3113,7 +3113,7 @@ get_mem_size()
4	memsize = page_size * num_pages;	4	memsize = page_size * num_pages;
5	#endif	5	#endif
6		6
7	-#if defined GF_DARWIN_HOST_OS	7	-#if defined GF_DARWIN_HOST_OS
8	+#if defined GF_DARWIN_HOST_OS \|\| defined __FreeBSD__	8	+#if defined GF_DARWIN_HOST_OS \|\| defined __FreeBSD__
9		9
10	size_t len = sizeof(memsize);	10	size_t len = sizeof(memsize);
11	int name[] = {CTL_HW, HW_PHYSMEM};	11	int name[] = {CTL_HW, HW_PHYSMEM};
		12	@@ -4127,6 +4127,14 @@ gf_skip_header_section(int fd, int header_len)
		13	gf_boolean_t
		14	gf_is_pid_running(int pid)
		15	{
		16	+#ifdef __FreeBSD__
		17	+ int ret = -1;
		18	+
		19	+ ret = sys_kill(pid, 0);
		20	+ if (ret < 0) {
		21	+ return _gf_false;
		22	+ }
		23	+#else
		24	char fname[32] = {
		25	0,
		26	};
		27	@@ -4140,6 +4148,7 @@ gf_is_pid_running(int pid)
		28	}
		29
		30	sys_close(fd);
		31	+#endif
		32	return _gf_true;
		33	}
		34

Line 0 Link Here

(-)files/patch-libglusterfs_src_glusterfs_syscall.h (+16 lines)
	1	--- libglusterfs/src/glusterfs/syscall.h.orig 2020-08-04 12:41:32 UTC
	2	+++ libglusterfs/src/glusterfs/syscall.h
	3	@@ -266,4 +266,13 @@ ssize_t
	4	sys_copy_file_range(int fd_in, off64_t off_in, int fd_out, off64_t off_out,
	5	size_t len, unsigned int flags);
	6
	7	+int
	8	+sys_kill(pid_t pid, int sig);
	9	+
	10	+#ifdef __FreeBSD__
	11	+int
	12	+sys_sysctl(const int name, u_int namelen, void oldp, size_t *oldlenp,
	13	+ const void *newp, size_t newlen);
	14	+#endif
	15	+
	16	#endif /* __SYSCALL_H__ */

Lines 1-20 Link Here

(-)files/patch-libglusterfs_src_syscall.c (-7 / +57 lines)
1	--- libglusterfs/src/syscall.c.orig 2020-05-18 20:57:54 UTC	1	--- libglusterfs/src/syscall.c.orig 2020-08-04 12:41:32 UTC
2	+++ libglusterfs/src/syscall.c	2	+++ libglusterfs/src/syscall.c
3	@@ -485,7 +485,7 @@ sys_lsetxattr(const char path, const char name, cons	3	@@ -13,6 +13,10 @@
		4	#include "glusterfs/mem-pool.h"
		5	#include "glusterfs/libglusterfs-messages.h"
		6
		7	+#ifdef __FreeBSD__
		8	+#include <sys/sysctl.h>
		9	+#include <signal.h>
		10	+#endif
		11	#include <sys/types.h>
		12	#include <utime.h>
		13	#include <sys/time.h>
		14	@@ -506,9 +510,17 @@ sys_lsetxattr(const char path, const char name, cons
4	#endif	15	#endif
5		16
6	#ifdef GF_BSD_HOST_OS	17	#ifdef GF_BSD_HOST_OS
7	- return FS_RET_CHECK0(	18	- return FS_RET_CHECK0(
8	+ return FS_RET_CHECK(	19	+ ssize_t ret = FS_RET_CHECK(
9	extattr_set_link(path, EXTATTR_NAMESPACE_USER, name, value, size),	20	extattr_set_link(path, EXTATTR_NAMESPACE_USER, name, value, size),
10	errno);	21	errno);
		22	+ /* On BSD extattr_set_link returns the number of bytes written/read on
		23	+ * success. Force this to be 0 if it was successful so the result remains
		24	+ * compatible with other platform expectations.
		25	+ */
		26	+ if(ret > 0) {
		27	+ ret = 0;
		28	+ }
		29	+ return ret;
11	#endif	30	#endif
12	@@ -603,7 +603,7 @@ sys_fsetxattr(int filedes, const char *name, const voi	31
		32	#ifdef GF_SOLARIS_HOST_OS
		33	@@ -624,9 +636,17 @@ sys_fsetxattr(int filedes, const char *name, const voi
13	#endif	34	#endif
14		35
15	#ifdef GF_BSD_HOST_OS	36	#ifdef GF_BSD_HOST_OS
16	- return FS_RET_CHECK0(	37	- return FS_RET_CHECK0(
17	+ return FS_RET_CHECK(	38	+ ssize_t ret = FS_RET_CHECK(
18	extattr_set_fd(filedes, EXTATTR_NAMESPACE_USER, name, value, size),	39	extattr_set_fd(filedes, EXTATTR_NAMESPACE_USER, name, value, size),
19	errno);	40	errno);
		41	+ /* On BSD extattr_set_fd returns the number of bytes written/read on
		42	+ * success. Force this to be 0 if it was successful so the result remains
		43	+ * compatible with other platform expectations.
		44	+ */
		45	+ if(ret > 0) {
		46	+ ret = 0;
		47	+ }
		48	+ return ret;
20	#endif	49	#endif
		50
		51	#ifdef GF_SOLARIS_HOST_OS
		52	@@ -854,3 +874,18 @@ sys_copy_file_range(int fd_in, off64_t *off_in, int fd
		53	#endif /* HAVE_COPY_FILE_RANGE_SYS */
		54	#endif /* HAVE_COPY_FILE_RANGE */
		55	}
		56	+
		57	+#ifdef __FreeBSD__
		58	+int
		59	+sys_kill(pid_t pid, int sig)
		60	+{
		61	+ return FS_RET_CHECK0(kill(pid, sig), errno);
		62	+}
		63	+
		64	+int
		65	+sys_sysctl(const int name, u_int namelen, void oldp, size_t *oldlenp,
		66	+ const void *newp, size_t newlen)
		67	+{
		68	+ return FS_RET_CHECK0(sysctl(name, namelen, oldp, oldlenp, newp, newlen), errno);
		69	+}
		70	+#endif

Lines 1-6 Link Here

(-)files/patch-xlators_mgmt_glusterd_src_Makefile.am (-3 / +14 lines)
1	--- xlators/mgmt/glusterd/src/Makefile.am.orig 2020-07-16 17:28:50 UTC	1	--- xlators/mgmt/glusterd/src/Makefile.am.orig 2020-07-16 17:28:50 UTC
2	+++ xlators/mgmt/glusterd/src/Makefile.am	2	+++ xlators/mgmt/glusterd/src/Makefile.am
3	@@ -25,12 +25,14 @@ glusterd_la_SOURCES = glusterd.c glusterd-handler.c gl	3	@@ -25,13 +25,14 @@ glusterd_la_SOURCES = glusterd.c glusterd-handler.c gl
4	glusterd-conn-helper.c glusterd-snapd-svc.c glusterd-snapd-svc-helper.c \	4	glusterd-conn-helper.c glusterd-snapd-svc.c glusterd-snapd-svc-helper.c \
5	glusterd-bitd-svc.c glusterd-scrub-svc.c glusterd-server-quorum.c \	5	glusterd-bitd-svc.c glusterd-scrub-svc.c glusterd-server-quorum.c \
6	glusterd-reset-brick.c glusterd-shd-svc.c glusterd-shd-svc-helper.c \	6	glusterd-reset-brick.c glusterd-shd-svc.c glusterd-shd-svc-helper.c \
Lines 12-18 Link Here
12	$(top_builddir)/libglusterd/src/libglusterd.la \	12	$(top_builddir)/libglusterd/src/libglusterd.la \
13	$(top_builddir)/rpc/xdr/src/libgfxdr.la \	13	$(top_builddir)/rpc/xdr/src/libgfxdr.la \
14	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \	14	$(top_builddir)/rpc/rpc-lib/src/libgfrpc.la \
15	+ $(CONTRIBDIR)/mount/mntent_compat.h \	15	- $(XML_LIBS) -lcrypto $(URCU_LIBS) $(URCU_CDS_LIBS) $(LIB_DL)
16	$(XML_LIBS) -lcrypto $(URCU_LIBS) $(URCU_CDS_LIBS) $(LIB_DL)	16	+ $(XML_LIBS) -lcrypto $(URCU_LIBS) $(URCU_CDS_LIBS) $(LIB_DL) $(GF_XLATOR_MGNT_LIBADD)
17		17
18	noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \	18	noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-op-sm.h \
		19	glusterd-sm.h glusterd-store.h glusterd-mem-types.h \
		20	@@ -46,7 +47,8 @@ noinst_HEADERS = glusterd.h glusterd-utils.h glusterd-
		21	glusterd-scrub-svc.h glusterd-server-quorum.h glusterd-errno.h \
		22	glusterd-shd-svc.h glusterd-shd-svc-helper.h \
		23	glusterd-gfproxyd-svc.h glusterd-gfproxyd-svc-helper.h \
		24	- $(CONTRIBDIR)/userspace-rcu/rculist-extra.h
		25	+ $(CONTRIBDIR)/userspace-rcu/rculist-extra.h \
		26	+ $(CONTRIBDIR)/mount/mntent_compat.h
		27
		28	AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \
		29	-I$(top_srcdir)/rpc/xdr/src -I$(top_builddir)/rpc/xdr/src \

Line 0 Link Here

(-)files/patch-xlators_mgmt_glusterd_src_glusterd-utils.c (+115 lines)
		1	--- xlators/mgmt/glusterd/src/glusterd-utils.c.orig 2020-07-06 01:22:37 UTC
		2	+++ xlators/mgmt/glusterd/src/glusterd-utils.c
		3	@@ -79,6 +79,14 @@
		4	#include <sys/sockio.h>
		5	#endif
		6
		7	+#ifdef __FreeBSD__
		8	+#include <sys/sysctl.h>
		9	+#include <sys/param.h>
		10	+#include <sys/queue.h>
		11	+#include <libprocstat.h>
		12	+#include <libutil.h>
		13	+#endif
		14	+
		15	#define NFS_PROGRAM 100003
		16	#define NFSV3_VERSION 3
		17
		18	@@ -6270,7 +6278,6 @@ find_compatible_brick(glusterd_conf_t *conf, glusterd_
		19	int
		20	glusterd_get_sock_from_brick_pid(int pid, char *sockpath, size_t len)
		21	{
		22	- char fname[128] = "";
		23	char buf[1024] = "";
		24	char cmdline[2048] = "";
		25	xlator_t *this = NULL;
		26	@@ -6285,6 +6292,22 @@ glusterd_get_sock_from_brick_pid(int pid, char *sockpa
		27	this = THIS;
		28	GF_ASSERT(this);
		29
		30	+#ifdef __FreeBSD__
		31	+ blen = sizeof(buf);
		32	+ int mib[4];
		33	+
		34	+ mib[0] = CTL_KERN;
		35	+ mib[1] = KERN_PROC;
		36	+ mib[2] = KERN_PROC_ARGS;
		37	+ mib[3] = pid;
		38	+
		39	+ if (sys_sysctl(mib, 4, buf, &blen, NULL, blen) != 0) {
		40	+ gf_log(this->name, GF_LOG_ERROR, "brick process %d is not running",
		41	+ pid);
		42	+ return ret;
		43	+ }
		44	+#else
		45	+ char fname[128] = "";
		46	snprintf(fname, sizeof(fname), "/proc/%d/cmdline", pid);
		47
		48	if (sys_access(fname, R_OK) != 0) {
		49	@@ -6301,6 +6324,7 @@ glusterd_get_sock_from_brick_pid(int pid, char *sockpa
		50	strerror(errno), fname);
		51	return ret;
		52	}
		53	+#endif
		54
		55	/* convert cmdline to single string */
		56	for (i = 0, j = 0; i < blen; i++) {
		57	@@ -6349,6 +6373,42 @@ glusterd_get_sock_from_brick_pid(int pid, char *sockpa
		58	char *
		59	search_brick_path_from_proc(pid_t brick_pid, char *brickpath)
		60	{
		61	+ char *brick_path = NULL;
		62	+#ifdef __FreeBSD__
		63	+ struct filestat *fst;
		64	+ struct procstat *ps;
65	+ struct kinfo_proc *kp;
66	+ struct filestat_list *head;
67	+
68	+ ps = procstat_open_sysctl();
69	+ if (ps == NULL)
70	+ goto out;
71	+
72	+ kp = kinfo_getproc(brick_pid);
73	+ if (kp == NULL)
74	+ goto out;
75	+
76	+ head = procstat_getfiles(ps, (void *)kp, 0);
77	+ if (head == NULL)
78	+ goto out;
79	+
80	+ STAILQ_FOREACH(fst, head, next) {
81	+ if(fst->fs_fd < 0)
82	+ continue;
83	+
84	+ if (!strcmp(fst->fs_path, brickpath)) {
85	+ brick_path = gf_strdup(fst->fs_path);
86	+ break;
87	+ }
88	+ }
89	+
90	+out:
91	+ if (head != NULL)
92	+ procstat_freefiles(ps, head);
93	+ if (kp != NULL)
94	+ free(kp);
95	+ procstat_close(ps);
96	+#else
97	struct dirent *dp = NULL;
98	DIR *dirp = NULL;
99	size_t len = 0;
100	@@ -6359,7 +6419,6 @@ search_brick_path_from_proc(pid_t brick_pid, char *bri
101	0,
102	},
103	};
104	- char *brick_path = NULL;
105
106	if (!brickpath)
107	goto out;
108	@@ -6396,6 +6455,7 @@ search_brick_path_from_proc(pid_t brick_pid, char *bri
109	}
110	out:
111	sys_closedir(dirp);
112	+#endif
113	return brick_path;
114	}
115