summaryrefslogtreecommitdiff
path: root/net/glusterfs/files
diff options
context:
space:
mode:
Diffstat (limited to 'net/glusterfs/files')
-rw-r--r--net/glusterfs/files/glusterd.in3
-rw-r--r--net/glusterfs/files/patch-configure12
-rw-r--r--net/glusterfs/files/patch-configure.ac23
-rw-r--r--net/glusterfs/files/patch-contrib_fuse-lib_mount.c4
-rw-r--r--net/glusterfs/files/patch-extras_Makefile.in22
-rw-r--r--net/glusterfs/files/patch-libglusterfs_src_common-utils.c11
-rw-r--r--net/glusterfs/files/patch-libglusterfs_src_syscall.c20
-rw-r--r--net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am18
8 files changed, 76 insertions, 37 deletions
diff --git a/net/glusterfs/files/glusterd.in b/net/glusterfs/files/glusterd.in
index 22f19b0385ec..f9082401618f 100644
--- a/net/glusterfs/files/glusterd.in
+++ b/net/glusterfs/files/glusterd.in
@@ -3,7 +3,8 @@
# $FreeBSD$
# PROVIDE: glusterd
-# REQUIRE: LOGIN
+# BEFORE: mountlate
+# REQUIRE: NETWORKING
# KEYWORD: shutdown
. /etc/rc.subr
diff --git a/net/glusterfs/files/patch-configure b/net/glusterfs/files/patch-configure
deleted file mode 100644
index 930af26f999f..000000000000
--- a/net/glusterfs/files/patch-configure
+++ /dev/null
@@ -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
- ;;
diff --git a/net/glusterfs/files/patch-configure.ac b/net/glusterfs/files/patch-configure.ac
new file mode 100644
index 000000000000..6d385aa7902e
--- /dev/null
+++ b/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"
diff --git a/net/glusterfs/files/patch-contrib_fuse-lib_mount.c b/net/glusterfs/files/patch-contrib_fuse-lib_mount.c
index 1241f34027af..ac27edd4a418 100644
--- a/net/glusterfs/files/patch-contrib_fuse-lib_mount.c
+++ b/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);
diff --git a/net/glusterfs/files/patch-extras_Makefile.in b/net/glusterfs/files/patch-extras_Makefile.in
deleted file mode 100644
index 510b99f53b0e..000000000000
--- a/net/glusterfs/files/patch-extras_Makefile.in
+++ /dev/null
@@ -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 \
diff --git a/net/glusterfs/files/patch-libglusterfs_src_common-utils.c b/net/glusterfs/files/patch-libglusterfs_src_common-utils.c
new file mode 100644
index 000000000000..0e3d73e575aa
--- /dev/null
+++ b/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};
diff --git a/net/glusterfs/files/patch-libglusterfs_src_syscall.c b/net/glusterfs/files/patch-libglusterfs_src_syscall.c
new file mode 100644
index 000000000000..a674d3b9218d
--- /dev/null
+++ b/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
diff --git a/net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am b/net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am
new file mode 100644
index 000000000000..7d69cd2a958f
--- /dev/null
+++ b/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 \
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-09 23:28:52 +0000