Index: head/net/glusterfs/Makefile =================================================================== --- head/net/glusterfs/Makefile (revision 543673) +++ head/net/glusterfs/Makefile (revision 543674) @@ -1,63 +1,70 @@ # $FreeBSD$ PORTNAME= glusterfs -PORTVERSION= 3.11.1 -PORTREVISION= 7 +PORTVERSION= 8.0 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 -EXPIRATION_DATE= 2020-09-15 +LIB_DEPENDS= libargp.so:devel/argp-standalone \ + 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 \ - events/src/glustereventsd.py \ - events/src/peer_eventsapi.py \ - tools/glusterfind/src/nodeagent.py \ - tools/glusterfind/src/brickfind.py \ - tools/glusterfind/src/changelog.py \ - tools/glusterfind/glusterfind.in \ - tools/gfind_missing_files/gfid_to_path.py \ - extras/pre-upgrade-script-for-quota.sh \ - events/tools/eventsdash.py \ +USES= autoreconf bison 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/dbus-send.sh \ + extras/ganesha/scripts/ganesha-ha.sh \ + 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 \ - events/src/glustereventsd.py \ - tools/glusterfind/S57glusterfind-delete-post.py + extras/stop-all-gluster-processes.sh \ + extras/thin-arbiter/setup-thin-arbiter.sh \ + 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 \ - --with-mountutildir=${PREFIX}/sbin \ - --localstatedir=/var \ - --disable-epoll \ - --enable-glupy \ +CONFIGURE_ARGS= --disable-epoll \ --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 + --localstatedir=/var \ + --with-mountutildir=${PREFIX}/sbin \ + --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 .include Index: head/net/glusterfs/distinfo =================================================================== --- head/net/glusterfs/distinfo (revision 543673) +++ head/net/glusterfs/distinfo (revision 543674) @@ -1,3 +1,3 @@ -TIMESTAMP = 1499632037 -SHA256 (glusterfs-3.11.1.tar.gz) = c7e0502631c9bc9da05795b666b74ef40a30a0344f5a2e205e65bd2faefe1442 -SIZE (glusterfs-3.11.1.tar.gz) = 9155001 +TIMESTAMP = 1594844267 +SHA256 (glusterfs-8.0.tar.gz) = bc0215380175a7d94c9ea90e3a7e0ca92a3ac691336e8b43da8a560f8e3c0169 +SIZE (glusterfs-8.0.tar.gz) = 7800370 Index: head/net/glusterfs/files/patch-configure =================================================================== --- head/net/glusterfs/files/patch-configure (revision 543673) +++ head/net/glusterfs/files/patch-configure (nonexistent) @@ -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 - ;; Property changes on: head/net/glusterfs/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/glusterfs/files/patch-extras_Makefile.in =================================================================== --- head/net/glusterfs/files/patch-extras_Makefile.in (revision 543673) +++ head/net/glusterfs/files/patch-extras_Makefile.in (nonexistent) @@ -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 \ Property changes on: head/net/glusterfs/files/patch-extras_Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/glusterfs/files/glusterd.in =================================================================== --- head/net/glusterfs/files/glusterd.in (revision 543673) +++ head/net/glusterfs/files/glusterd.in (revision 543674) @@ -1,27 +1,28 @@ #!/bin/sh # # $FreeBSD$ # PROVIDE: glusterd -# REQUIRE: LOGIN +# BEFORE: mountlate +# REQUIRE: NETWORKING # KEYWORD: shutdown . /etc/rc.subr name="glusterd" rcvar="${name}_enable" start_precmd="glusterd_prestart" glusterd_prestart() { mkdir -p /var/db/glusterd /var/log/glusterfs } load_rc_config $name : ${glusterd_program:="%%PREFIX%%/sbin/$name"} : ${glusterd_pidfile:="/var/run/${name}.pid"} pidfile="$glusterd_pidfile" glusterd_flags="--pid-file=\"${glusterd_pidfile}\" ${glusterd_flags}" run_rc_command "$1" Index: head/net/glusterfs/files/patch-configure.ac =================================================================== --- head/net/glusterfs/files/patch-configure.ac (nonexistent) +++ head/net/glusterfs/files/patch-configure.ac (revision 543674) @@ -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" Property changes on: head/net/glusterfs/files/patch-configure.ac ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/glusterfs/files/patch-contrib_fuse-lib_mount.c =================================================================== --- head/net/glusterfs/files/patch-contrib_fuse-lib_mount.c (revision 543673) +++ head/net/glusterfs/files/patch-contrib_fuse-lib_mount.c (revision 543674) @@ -1,10 +1,10 @@ ---- 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); + build_iovec (&iov, &iovlen, "allow_other", NULL, -1); ret = nmount (iov, iovlen, mountflags); #else ret = mount (source, mountpoint, fstype, mountflags, Index: head/net/glusterfs/files/patch-libglusterfs_src_common-utils.c =================================================================== --- head/net/glusterfs/files/patch-libglusterfs_src_common-utils.c (nonexistent) +++ head/net/glusterfs/files/patch-libglusterfs_src_common-utils.c (revision 543674) @@ -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}; Property changes on: head/net/glusterfs/files/patch-libglusterfs_src_common-utils.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/glusterfs/files/patch-libglusterfs_src_syscall.c =================================================================== --- head/net/glusterfs/files/patch-libglusterfs_src_syscall.c (nonexistent) +++ head/net/glusterfs/files/patch-libglusterfs_src_syscall.c (revision 543674) @@ -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 Property changes on: head/net/glusterfs/files/patch-libglusterfs_src_syscall.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am =================================================================== --- head/net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am (nonexistent) +++ head/net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am (revision 543674) @@ -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 \ Property changes on: head/net/glusterfs/files/patch-xlators_mgmt_glusterd_src_Makefile.am ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/glusterfs/pkg-message =================================================================== --- head/net/glusterfs/pkg-message (nonexistent) +++ head/net/glusterfs/pkg-message (revision 543674) @@ -0,0 +1,15 @@ +[ +{ type: install + message: <