Index: head/net/nfs-ganesha/Makefile =================================================================== --- head/net/nfs-ganesha/Makefile (revision 479932) +++ head/net/nfs-ganesha/Makefile (revision 479933) @@ -1,29 +1,29 @@ # $FreeBSD$ PORTNAME= nfs-ganesha DISTVERSION= 2.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MAINTAINER= fatih@gandi.net COMMENT= NFS fileserver that runs in user mode LIB_DEPENDS= libdbus-1.so:devel/dbus RUN_DEPENDS= ${KMODDIR}/getfhat.ko:net/nfs-ganesha-kmod USES= cmake bison kmod pkgconfig python:build USE_RC_SUBR= ganesha USE_GITHUB= yes GH_ACCOUNT= nfs-ganesha -GH_TAGNAME= V2.7-rc1 +GH_TAGNAME= V2.7.0 CFLAGS+= -Wno-error -GH_TUPLE= nfs-ganesha:ntirpc:b69c2c1e353:ganesha/src/libntirpc +GH_TUPLE= nfs-ganesha:ntirpc:v1.7.0:ganesha/src/libntirpc CMAKE_ARGS= -DLIB_INSTALL_DIR=${LOCALBASE}/lib -DUSE_GSS=OFF -DUSE_9P=OFF \ -DUSE_FSAL_PROXY=OFF -DUSE_FSAL_GPFS=OFF -DUSE_FSAL_CEPH=OFF \ -DUSE_FSAL_GLUSTER=OFF -DUSE_FSAL_RGW=OFF -DUSE_RADOS_RECOV=OFF \ -DUSE_DBUS=ON -DUSE_ADMIN_TOOLS=ON CMAKE_SOURCE_PATH= ${WRKSRC}/src .include Property changes on: head/net/nfs-ganesha/Makefile ___________________________________________________________________ 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/nfs-ganesha/distinfo =================================================================== --- head/net/nfs-ganesha/distinfo (revision 479932) +++ head/net/nfs-ganesha/distinfo (revision 479933) @@ -1,5 +1,5 @@ -TIMESTAMP = 1534776761 -SHA256 (nfs-ganesha-nfs-ganesha-2.7.0-V2.7-rc1_GH0.tar.gz) = bcb7ae7f9a80e23c56164b8b69dd0be88dc9baa9945bbccb90895caa66d0f45f -SIZE (nfs-ganesha-nfs-ganesha-2.7.0-V2.7-rc1_GH0.tar.gz) = 1690807 -SHA256 (nfs-ganesha-ntirpc-b69c2c1e353_GH0.tar.gz) = c035a974cdb49af610a451bc7527b5d3c7891cf54778cde0a76f5c135b422329 -SIZE (nfs-ganesha-ntirpc-b69c2c1e353_GH0.tar.gz) = 373146 +TIMESTAMP = 1537179573 +SHA256 (nfs-ganesha-nfs-ganesha-2.7.0-V2.7.0_GH0.tar.gz) = a458bd461049e4800bad24a2fd01335de6020f46ee495d5b2621eb3270097bca +SIZE (nfs-ganesha-nfs-ganesha-2.7.0-V2.7.0_GH0.tar.gz) = 1691800 +SHA256 (nfs-ganesha-ntirpc-v1.7.0_GH0.tar.gz) = 61c72b481cd75945852df2f9ee5a6080e6f8cca7e57f4c7bc950f6cea0a7fbdb +SIZE (nfs-ganesha-ntirpc-v1.7.0_GH0.tar.gz) = 373195 Property changes on: head/net/nfs-ganesha/distinfo ___________________________________________________________________ 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/nfs-ganesha/files/ganesha.in =================================================================== --- head/net/nfs-ganesha/files/ganesha.in (revision 479932) +++ head/net/nfs-ganesha/files/ganesha.in (revision 479933) Property changes on: head/net/nfs-ganesha/files/ganesha.in ___________________________________________________________________ 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/nfs-ganesha/files/patch-src_os_freebsd_xattr.c =================================================================== --- head/net/nfs-ganesha/files/patch-src_os_freebsd_xattr.c (revision 479932) +++ head/net/nfs-ganesha/files/patch-src_os_freebsd_xattr.c (revision 479933) @@ -1,15 +1,14 @@ ---- src/os/freebsd/xattr.c.orig 2018-08-10 21:04:37 UTC +diff --git a/src/os/freebsd/xattr.c b/src/os/freebsd/xattr.c +index 5edb6f8b8..1d6275d61 100644 +--- src/os/freebsd/xattr.c +++ src/os/freebsd/xattr.c -@@ -27,8 +27,12 @@ +@@ -26,6 +26,9 @@ + */ #include ++#ifndef NAME_MAX ++#include ++#endif #include -+#include -+ -+#ifndef EXTATTR_MAXNAMELEN - #define EXTATTR_MAXNAMELEN 255 -+#endif - - ssize_t fgetxattr(int fd, const char *name, void *value, size_t size) - { + #ifndef EXTATTR_MAXNAMELEN Index: head/net/nfs-ganesha/files/patch-src_scripts_ganeshactl_CMakeLists.txt =================================================================== --- head/net/nfs-ganesha/files/patch-src_scripts_ganeshactl_CMakeLists.txt (nonexistent) +++ head/net/nfs-ganesha/files/patch-src_scripts_ganeshactl_CMakeLists.txt (revision 479933) @@ -0,0 +1,21 @@ +commit cf799916131f30bf42d33ddd86b326bb2f90ffbc +Author: Fatih Acar +Date: Fri May 18 12:30:19 2018 +0200 + + ganeshactl, cmakefile: python2.7 on freebsd + +diff --git a/src/scripts/ganeshactl/CMakeLists.txt b/src/scripts/ganeshactl/CMakeLists.txt +index 2e950b676..0fac9af3d 100644 +--- src/scripts/ganeshactl/CMakeLists.txt ++++ src/scripts/ganeshactl/CMakeLists.txt +@@ -1,6 +1,10 @@ + # Building and packaging DBUS scripts for ganesha + ++if (FREEBSD) ++find_program(PYTHON "python2.7") ++else (FREEBSD) + find_program(PYTHON "python") ++endif (FREEBSD) + + # PyQT based class modules + set(GANESHA_BASE_SRCS Property changes on: head/net/nfs-ganesha/files/patch-src_scripts_ganeshactl_CMakeLists.txt ___________________________________________________________________ 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/nfs-ganesha/pkg-descr =================================================================== --- head/net/nfs-ganesha/pkg-descr (revision 479932) +++ head/net/nfs-ganesha/pkg-descr (revision 479933) Property changes on: head/net/nfs-ganesha/pkg-descr ___________________________________________________________________ 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/nfs-ganesha/pkg-plist =================================================================== --- head/net/nfs-ganesha/pkg-plist (revision 479932) +++ head/net/nfs-ganesha/pkg-plist (revision 479933) @@ -1,131 +1,131 @@ include/ntirpc/libc_private.h include/ntirpc/version.h include/ntirpc/intrinsic.h include/ntirpc/rpcsvc/crypt.h include/ntirpc/reentrant.h include/ntirpc/getpeereid.h include/ntirpc/un-namespace.h include/ntirpc/fpmath.h include/ntirpc/lttng/rpcping.h include/ntirpc/lttng/xprt.h include/ntirpc/misc/socket.h include/ntirpc/misc/stdint.h include/ntirpc/misc/stdio.h include/ntirpc/misc/os_epoll.h include/ntirpc/misc/portable.h include/ntirpc/misc/rbtree_x.h include/ntirpc/misc/bsd_epoll.h include/ntirpc/misc/citycrc.h include/ntirpc/misc/opr.h include/ntirpc/misc/event.h include/ntirpc/misc/city.h include/ntirpc/misc/abstract_atomic.h include/ntirpc/misc/queue.h include/ntirpc/misc/wait_queue.h include/ntirpc/misc/opr_queue.h include/ntirpc/misc/timespec.h include/ntirpc/misc/winpthreads.h include/ntirpc/misc/rbtree.h include/ntirpc/namespace.h include/ntirpc/rpc/pmap_prot.h include/ntirpc/rpc/rpc_com.h include/ntirpc/rpc/xdr_inline.h include/ntirpc/rpc/gss_internal.h include/ntirpc/rpc/rpcb_prot.x include/ntirpc/rpc/rpcb_prot.h include/ntirpc/rpc/tirpc_compat.h include/ntirpc/rpc/xdr.h include/ntirpc/rpc/rpc_msg.h include/ntirpc/rpc/svc_rqst.h include/ntirpc/rpc/auth_inline.h include/ntirpc/rpc/rpc_cksum.h include/ntirpc/rpc/clnt.h include/ntirpc/rpc/des_crypt.h include/ntirpc/rpc/auth_stat.h include/ntirpc/rpc/clnt_stat.h include/ntirpc/rpc/xdr_ioq.h include/ntirpc/rpc/auth_gss.h include/ntirpc/rpc/rpcent.h include/ntirpc/rpc/rpcb_clnt.h include/ntirpc/rpc/rpc_err.h include/ntirpc/rpc/svc.h include/ntirpc/rpc/auth_unix.h include/ntirpc/rpc/types.h include/ntirpc/rpc/work_pool.h include/ntirpc/rpc/des.h include/ntirpc/rpc/pool_queue.h include/ntirpc/rpc/nettype.h include/ntirpc/rpc/auth.h include/ntirpc/rpc/svc_auth.h include/ntirpc/rpc/pmap_rmt.h include/ntirpc/rpc/rpc.h include/ntirpc/netconfig.h bin/ganesha_stats bin/ganesha_conf bin/ganesha_mgr bin/fake_recall bin/get_clientids bin/grace_period bin/ganesha.nfsd lib/libntirpc.so.1.7 -lib/libntirpc.so.1.7.0_rc1 +lib/libntirpc.so.1.7.0 lib/libntirpc.so lib/ganesha/libfsalmem.so.4 lib/ganesha/libfsalnull.so lib/ganesha/libfsaldummylustre.so lib/ganesha/libfsalmem.so lib/ganesha/libfsalvfs.so lib/ganesha/libfsalmem.so.4.2.0 lib/python2.7/site-packages/Ganesha/config_editor.pyc lib/python2.7/site-packages/Ganesha/glib_dbus_stats.pyc lib/python2.7/site-packages/Ganesha/glib_dbus_stats.py lib/python2.7/site-packages/Ganesha/io_stats.py lib/python2.7/site-packages/Ganesha/admin.py lib/python2.7/site-packages/Ganesha/ganesha_mgr_utils.pyc lib/python2.7/site-packages/Ganesha/admin.pyc lib/python2.7/site-packages/Ganesha/QtUI/log_settings.py lib/python2.7/site-packages/Ganesha/QtUI/__init__.py lib/python2.7/site-packages/Ganesha/QtUI/exports_table.pyc lib/python2.7/site-packages/Ganesha/QtUI/log_settings.pyc lib/python2.7/site-packages/Ganesha/QtUI/exports_table.py lib/python2.7/site-packages/Ganesha/QtUI/clients_table.pyc lib/python2.7/site-packages/Ganesha/QtUI/__init__.pyc lib/python2.7/site-packages/Ganesha/QtUI/clients_table.py lib/python2.7/site-packages/Ganesha/io_stats.pyc lib/python2.7/site-packages/Ganesha/__init__.py lib/python2.7/site-packages/Ganesha/config_editor.py lib/python2.7/site-packages/Ganesha/__init__.pyc lib/python2.7/site-packages/Ganesha/export_mgr.py lib/python2.7/site-packages/Ganesha/ganesha_mgr_utils.py lib/python2.7/site-packages/Ganesha/log_mgr.py lib/python2.7/site-packages/Ganesha/client_mgr.pyc lib/python2.7/site-packages/Ganesha/log_mgr.pyc lib/python2.7/site-packages/Ganesha/export_mgr.pyc lib/python2.7/site-packages/Ganesha/client_mgr.py -lib/python2.7/site-packages/ganeshactl-2.7_rc1-py2.7.egg-info +lib/python2.7/site-packages/ganeshactl-2.7.0-py2.7.egg-info libdata/pkgconfig/libntirpc.pc share/doc/ganesha/config_samples/vfs.conf share/doc/ganesha/config_samples/config.txt share/doc/ganesha/config_samples/logrotate_ganesha share/doc/ganesha/config_samples/gpfs.ganesha.exports.conf share/doc/ganesha/config_samples/gpfs.ganesha.nfsd.conf share/doc/ganesha/config_samples/ganesha.conf.example share/doc/ganesha/config_samples/gpfs.ganesha.main.conf share/doc/ganesha/config_samples/logrotate_fsal_gluster share/doc/ganesha/config_samples/gluster.conf share/doc/ganesha/config_samples/mem.conf share/doc/ganesha/config_samples/gpfs.ganesha.log.conf share/doc/ganesha/config_samples/export.txt share/doc/ganesha/config_samples/ds.conf share/doc/ganesha/config_samples/ceph.conf share/doc/ganesha/config_samples/rgw.conf share/doc/ganesha/config_samples/README share/doc/ganesha/config_samples/logging.txt share/doc/ganesha/config_samples/xfs.conf share/doc/ganesha/config_samples/rgw_bucket.conf share/doc/ganesha/config_samples/gpfs.conf share/doc/ganesha/config_samples/proxy.conf share/doc/ganesha/config_samples/lustre.conf share/man/man8/ganesha_conf.8 etc/ganesha/ganesha.conf @dir var/run/ganesha Property changes on: head/net/nfs-ganesha/pkg-plist ___________________________________________________________________ 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