Index: head/sysutils/fusefs-kmod/Makefile =================================================================== --- head/sysutils/fusefs-kmod/Makefile (revision 377940) +++ head/sysutils/fusefs-kmod/Makefile (revision 377941) @@ -1,71 +1,72 @@ # $FreeBSD$ PORTNAME= fusefs-kmod PORTVERSION= 0.263233 +PORTREVISION= 1 PORTEPOCH= 1 -CATEGORIES= sysutils kld +CATEGORIES= sysutils +MASTER_SITES= https://googledrive.com/host/0B0OQnKtejJEMQlpoTy11SG1nN2s/ MAINTAINER= dpejesh@yahoo.com COMMENT= FUSE kernel module -MASTER_SITES= https://googledrive.com/host/0B0OQnKtejJEMQlpoTy11SG1nN2s/ +BUILD_DEPENDS= fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs ONLY_FOR_ARCHS= amd64 i386 WRKSRC= ${WRKDIR} USE_RC_SUBR= fusefs USES= kmod uidfix -BUILD_DEPENDS= fusefs-libs>2.4.1:${PORTSDIR}/sysutils/fusefs-libs - MAKE_ENV= BINDIR="${PREFIX}/sbin" \ MANDIR="${MANPREFIX}/man/man" SUB_LIST+= KMODDIR=${KMODDIR} SUB_FILES= pkg-message .include .if ${OSVERSION} >= 800000 && ${OSVERSION} < 900000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8-fuse_vfsops.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-8-fuse_vnops.c .endif .if ${OSVERSION} >= 900000 && ${OSVERSION} < 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9-fuse_main.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9-fuse_vfsops.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-9-fuse_vnops.c .endif .if ${OSVERSION} >= 1000000 IGNORE= integrated into base .endif do-build: cd ${WRKDIR}/modules/fuse; ${MAKE} cd ${WRKDIR}/mount_fusefs; ${MAKE} do-install: ${INSTALL_KLD} ${WRKSRC}/modules/fuse/fuse.ko ${STAGEDIR}${KMODDIR} ${INSTALL_MAN} ${WRKSRC}/mount_fusefs/mount_fusefs.8 ${STAGEDIR}${PREFIX}/man/man8 ${INSTALL_PROGRAM} ${WRKSRC}/mount_fusefs/mount_fusefs ${STAGEDIR}${PREFIX}/sbin post-install: ${CAT} ${PKGMESSAGE} SVN_REV= 263233 SVN_MIRROR?= http://svn.freebsd.org/base EXPDIR= ${WRKSRC}/src maintainer-tar: ${MKDIR} ${EXPDIR} cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/head/sys/fs/fuse/ fs/fuse cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/head/sys/modules/fuse/ modules/fuse cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/head/sbin/mount_fusefs mount_fusefs cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/head/sbin/mount/getmntopts.c mount_fusefs/getmntopts.c cd ${EXPDIR} && svn export -r ${SVN_REV} ${SVN_MIRROR}/head/sbin/mount/mntopts.h mount_fusefs/ cd ${EXPDIR} && ${TAR} --uname root --uid 0 --gname wheel --gid 0 -zcvf ${DISTDIR}/${PORTNAME}-0.${SVN_REV}${EXTRACT_SUFX} fs modules mount_fusefs maintainer-check: @new=`svn log -ql 1 ${SVN_MIRROR}@HEAD head/sys/fs/fuse | ${GREP} -v ^- | ${SED} -e 's| .*||; s|r||'`;\ old="${SVN_REV}";\ if [ "$${new}" -gt "$${old}" ]; then ${ECHO_MSG} "New fuse rev: r$${new} (was $${old})"; fi .include Index: head/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c =================================================================== --- head/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c (nonexistent) +++ head/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c (revision 377941) @@ -0,0 +1,22 @@ +--- fs/fuse/fuse_main.c.orig 2014-12-02 15:57:14.465629906 +0200 ++++ fs/fuse/fuse_main.c 2014-12-02 16:03:10.070605830 +0200 +@@ -92,10 +92,19 @@ + .vfc_flags = VFCF_SYNTHETIC + }; + ++#ifdef SYSCTL_NULL_INT_PTR ++SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD, ++ SYSCTL_NULL_INT_PTR, FUSE_KERNEL_VERSION, ++ "FUSE kernel abi major version"); ++SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD, ++ SYSCTL_NULL_INT_PTR, FUSE_KERNEL_MINOR_VERSION, ++ "FUSE kernel abi minor version"); ++#else + SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_major, CTLFLAG_RD, + 0, FUSE_KERNEL_VERSION, "FUSE kernel abi major version"); + SYSCTL_INT(_vfs_fuse, OID_AUTO, kernelabi_minor, CTLFLAG_RD, + 0, FUSE_KERNEL_MINOR_VERSION, "FUSE kernel abi minor version"); ++#endif // SYSCTL_NULL_INT_PTR + + /****************************** + * Property changes on: head/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.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/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c =================================================================== --- head/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c (revision 377940) +++ head/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c (revision 377941) @@ -1,37 +1,62 @@ ---- fs/fuse/fuse_vfsops.c.orig -+++ fs/fuse/fuse_vfsops.c -@@ -62,7 +62,7 @@ __FBSDID("$FreeBSD$"); +--- fs/fuse/fuse_vfsops.c.orig 2014-03-16 12:55:57.000000000 +0200 ++++ fs/fuse/fuse_vfsops.c 2014-12-02 16:02:35.879606170 +0200 +@@ -62,7 +62,7 @@ #include #include #include -#include +#include #include #include #include -@@ -220,7 +220,6 @@ fuse_vfsop_mount(struct mount *mp) +@@ -113,13 +113,24 @@ + .vfs_statfs = fuse_vfsop_statfs, + }; + ++#ifdef SYSCTL_NULL_INT_PTR ++SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD, ++ SYSCTL_NULL_INT_PTR, 1, "indicate async handshake"); ++#else + SYSCTL_INT(_vfs_fuse, OID_AUTO, init_backgrounded, CTLFLAG_RD, + 0, 1, "indicate async handshake"); ++#endif // SYSCTL_NULL_INT_PTR + static int fuse_enforce_dev_perms = 0; + ++#ifdef SYSCTL_NULL_INT_PTR ++SYSCTL_INT(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW, ++ &fuse_enforce_dev_perms, 0, ++ "enforce fuse device permissions for secondary mounts"); ++#else + SYSCTL_LONG(_vfs_fuse, OID_AUTO, enforce_dev_perms, CTLFLAG_RW, + &fuse_enforce_dev_perms, 0, + "enforce fuse device permissions for secondary mounts"); ++#endif // SYSCTL_NULL_INT_PTR + static unsigned sync_unmount = 1; + + SYSCTL_UINT(_vfs_fuse, OID_AUTO, sync_unmount, CTLFLAG_RW, +@@ -220,7 +231,6 @@ struct file *fp, *fptmp; char *fspec, *subtype; struct vfsoptlist *opts; - cap_rights_t rights; subtype = NULL; max_read_set = 0; -@@ -290,7 +289,7 @@ fuse_vfsop_mount(struct mount *mp) +@@ -290,7 +300,7 @@ FS_DEBUG2G("mntopts 0x%jx\n", (uintmax_t)mntopts); - err = fget(td, fd, cap_rights_init(&rights, CAP_READ), &fp); + err = fget(td, fd, CAP_READ, &fp); if (err != 0) { FS_DEBUG("invalid or not opened device: data=%p\n", data); goto out; -@@ -459,7 +458,7 @@ fuse_vfsop_root(struct mount *mp, int lkflags, struct vnode **vpp) +@@ -459,7 +469,7 @@ FUSE_UNLOCK(); VOP_UNLOCK(*vpp, 0); vrele(*vpp); - vrecycle(*vpp); + vrecycle(*vpp, curthread); *vpp = data->vroot; } else FUSE_UNLOCK(); Index: head/sysutils/fusefs-kmod/pkg-descr =================================================================== --- head/sysutils/fusefs-kmod/pkg-descr (revision 377940) +++ head/sysutils/fusefs-kmod/pkg-descr (revision 377941) @@ -1,3 +1,2 @@ Kernel module for fusefs based filesystems, backported from 10.x to 8.x and 9.x. -