Remove expired port:

2017-01-15 sysutils/fusefs-kmod: integrated into base

13 files changed, 1 insertions, 428 deletions

diff --git a/MOVED b/MOVED
index ab7835371260..c030941b5bcc 100644
--- a/MOVED
+++ b/MOVED
@@ -8989,3 +8989,4 @@ x11-drivers/drm-kmod||2017-01-15|Has expired: this port is only for 9.3 systems
 audio/xmms-openspc||2017-01-15|Has expired: does not build on FreeBSD 10.x and later
 audio/aureal-kmod||2017-01-15|Has expired: does not build (and fetch)
 emulators/doscmd||2017-01-15|Has expired: does not build (accesses field of opaque structure)
+sysutils/fusefs-kmod||2017-01-15|Has expired: integrated into base
diff --git a/sysutils/Makefile b/sysutils/Makefile
index bdf5c11fa96c..1abe0dd2891c 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -342,7 +342,6 @@
     SUBDIR += fusefs-gunzip
     SUBDIR += fusefs-httpfs
     SUBDIR += fusefs-ifuse
-    SUBDIR += fusefs-kmod
     SUBDIR += fusefs-libs
     SUBDIR += fusefs-lkl
     SUBDIR += fusefs-mhddfs
diff --git a/sysutils/fusefs-kmod/Makefile b/sysutils/fusefs-kmod/Makefile
deleted file mode 100644
index 4ed85cfbfbe7..000000000000
--- a/sysutils/fusefs-kmod/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	fusefs-kmod
-PORTVERSION=	0.263233
-PORTREVISION=	1
-PORTEPOCH=	1
-CATEGORIES=	sysutils
-MASTER_SITES=	https://googledrive.com/host/0B0OQnKtejJEMQlpoTy11SG1nN2s/
-
-MAINTAINER=	dpejesh@yahoo.com
-COMMENT=	FUSE kernel module
-
-IGNORE=		integrated into base
-DEPRECATED=	${IGNORE}
-EXPIRATION_DATE=	2017-01-15
-
-BUILD_DEPENDS=	fusefs-libs>2.4.1:sysutils/fusefs-libs
-
-ONLY_FOR_ARCHS=	amd64 i386
-
-WRKSRC=		${WRKDIR}
-
-USE_RC_SUBR=	fusefs
-USES=		kmod uidfix
-
-MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
-		MANDIR="${MANPREFIX}/man/man"
-
-SUB_LIST+=	KMODDIR=${KMODDIR}
-SUB_FILES=	pkg-message
-
-.include <bsd.port.pre.mk>
-
-.if ${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
-
-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
-
-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 <bsd.port.post.mk>
diff --git a/sysutils/fusefs-kmod/distinfo b/sysutils/fusefs-kmod/distinfo
deleted file mode 100644
index 16491487faf8..000000000000
--- a/sysutils/fusefs-kmod/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (fusefs-kmod-0.263233.tar.gz) = 68e0e5505cab651d089e6b0824b779676ae2a07d264724844f4980ffd6032933
-SIZE (fusefs-kmod-0.263233.tar.gz) = 58262
diff --git a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c
deleted file mode 100644
index 118e861afcc2..000000000000
--- a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_main.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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
- 
- /******************************
-  *
diff --git a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c
deleted file mode 100644
index c6fb4c368a73..000000000000
--- a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vfsops.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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 <sys/errno.h>
- #include <sys/param.h>
- #include <sys/kernel.h>
--#include <sys/capsicum.h>
-+#include <sys/capability.h>
- #include <sys/conf.h>
- #include <sys/filedesc.h>
- #include <sys/uio.h>
-@@ -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 +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 +469,7 @@
- 				FUSE_UNLOCK();
- 				VOP_UNLOCK(*vpp, 0);
- 				vrele(*vpp);
--				vrecycle(*vpp);
-+				vrecycle(*vpp, curthread);
- 				*vpp = data->vroot;
- 			} else
- 				FUSE_UNLOCK();
diff --git a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vnops.c b/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vnops.c
deleted file mode 100644
index 2f49f897050b..000000000000
--- a/sysutils/fusefs-kmod/files/extra-patch-9-fuse_vnops.c
+++ /dev/null
@@ -1,134 +0,0 @@
---- fs/fuse/fuse_vnops.c.orig
-+++ fs/fuse/fuse_vnops.c
-@@ -579,7 +579,7 @@ fuse_vnop_inactive(struct vop_inactive_args *ap)
- 	}
- 
- 	if ((fvdat->flag & FN_REVOKED) != 0 && fuse_reclaim_revoked) {
--		vrecycle(vp);
-+		vrecycle(vp, curthread);
- 	}
- 	return 0;
- }
-@@ -706,7 +706,7 @@ fuse_vnop_lookup(struct vop_lookup_args *ap)
- 		op = FUSE_GETATTR;
- 		goto calldaemon;
- 	} else if (fuse_lookup_cache_enable) {
--		err = cache_lookup(dvp, vpp, cnp, NULL, NULL);
-+		err = cache_lookup(dvp, vpp, cnp);
- 		switch (err) {
- 
- 		case -1:		/* positive match */
-@@ -1758,7 +1758,7 @@ fuse_vnop_getpages(struct vop_getpages_args *ap)
- 	 * can only occur at the file EOF.
- 	 */
- 
--	VM_OBJECT_WLOCK(vp->v_object);
-+	VM_OBJECT_LOCK(vp->v_object);
- 	fuse_vm_page_lock_queues();
- 	if (pages[ap->a_reqpage]->valid != 0) {
- 		for (i = 0; i < npages; ++i) {
-@@ -1769,11 +1769,11 @@ fuse_vnop_getpages(struct vop_getpages_args *ap)
- 			}
- 		}
- 		fuse_vm_page_unlock_queues();
--		VM_OBJECT_WUNLOCK(vp->v_object);
-+		VM_OBJECT_UNLOCK(vp->v_object);
- 		return 0;
- 	}
- 	fuse_vm_page_unlock_queues();
--	VM_OBJECT_WUNLOCK(vp->v_object);
-+	VM_OBJECT_UNLOCK(vp->v_object);
- 
- 	/*
- 	 * We use only the kva address for the buffer, but this is extremely
-@@ -1803,7 +1803,7 @@ fuse_vnop_getpages(struct vop_getpages_args *ap)
- 
- 	if (error && (uio.uio_resid == count)) {
- 		FS_DEBUG("error %d\n", error);
--		VM_OBJECT_WLOCK(vp->v_object);
-+		VM_OBJECT_LOCK(vp->v_object);
- 		fuse_vm_page_lock_queues();
- 		for (i = 0; i < npages; ++i) {
- 			if (i != ap->a_reqpage) {
-@@ -1813,7 +1813,7 @@ fuse_vnop_getpages(struct vop_getpages_args *ap)
- 			}
- 		}
- 		fuse_vm_page_unlock_queues();
--		VM_OBJECT_WUNLOCK(vp->v_object);
-+		VM_OBJECT_UNLOCK(vp->v_object);
- 		return VM_PAGER_ERROR;
- 	}
- 	/*
-@@ -1823,7 +1823,7 @@ fuse_vnop_getpages(struct vop_getpages_args *ap)
- 	 */
- 
- 	size = count - uio.uio_resid;
--	VM_OBJECT_WLOCK(vp->v_object);
-+	VM_OBJECT_LOCK(vp->v_object);
- 	fuse_vm_page_lock_queues();
- 	for (i = 0, toff = 0; i < npages; i++, toff = nextoff) {
- 		vm_page_t m;
-@@ -1843,7 +1843,7 @@ fuse_vnop_getpages(struct vop_getpages_args *ap)
- 			 * Read operation filled a partial page.
- 			 */
- 			m->valid = 0;
--			vm_page_set_valid_range(m, 0, size - toff);
-+			vm_page_set_valid(m, 0, size - toff);
- 			KASSERT(m->dirty == 0,
- 			    ("fuse_getpages: page %p is dirty", m));
- 		} else {
-@@ -1854,11 +1854,39 @@ fuse_vnop_getpages(struct vop_getpages_args *ap)
- 			 */
- 			;
- 		}
--		if (i != ap->a_reqpage)
--			vm_page_readahead_finish(m);
-+		if (i != ap->a_reqpage) {
-+			/*
-+			 * whether or not to leave the page activated is up in
-+			 * the air, but we should put the page on a page queue
-+			 * somewhere. (it already is in the object). Result:
-+			 * It appears that empirical results show that
-+			 * deactivating pages is best.
-+			 */
-+
-+			/*
-+			 * just in case someone was asking for this page we
-+			 * now tell them that it is ok to use
-+			 */
-+			if (!error) {
-+				if (m->oflags & VPO_WANTED) {
-+					vm_page_lock(m);
-+					vm_page_activate(m);
-+					vm_page_unlock(m);
-+				} else {
-+					vm_page_lock(m);
-+					vm_page_deactivate(m);
-+					vm_page_unlock(m);
-+				}
-+				vm_page_wakeup(m);
-+			} else {
-+				vm_page_lock(m);
-+				vm_page_free(m);
-+				vm_page_unlock(m);
-+			}
-+		}
- 	}
- 	fuse_vm_page_unlock_queues();
--	VM_OBJECT_WUNLOCK(vp->v_object);
-+	VM_OBJECT_UNLOCK(vp->v_object);
- 	return 0;
- }
- 
-@@ -1947,9 +1975,9 @@ fuse_vnop_putpages(struct vop_putpages_args *ap)
- 
- 		for (i = 0; i < nwritten; i++) {
- 			rtvals[i] = VM_PAGER_OK;
--			VM_OBJECT_WLOCK(pages[i]->object);
-+			VM_OBJECT_LOCK(pages[i]->object);
- 			vm_page_undirty(pages[i]);
--			VM_OBJECT_WUNLOCK(pages[i]->object);
-+			VM_OBJECT_UNLOCK(pages[i]->object);
- 		}
- 	}
- 	return rtvals[0];
diff --git a/sysutils/fusefs-kmod/files/fusefs.in b/sysutils/fusefs-kmod/files/fusefs.in
deleted file mode 100644
index 6b50625100d9..000000000000
--- a/sysutils/fusefs-kmod/files/fusefs.in
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: fusefs
-# REQUIRE: sysctl
-# BEFORE: mountlate
-# KEYWORD: shutdown
-#
-# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
-# to enable this service:
-#
-# fusefs_enable (bool):		Set to NO by default.
-#				Set it to YES to enable fusefs.
-#
-# fusefs_safe (bool):		Set to NO by default.
-#				Set it to YES to wait for all write operations
-#				to finish before terminating.
-#
-# fusefs_safe_evil (bool):	Set to NO by default.
-#				Set it to YES to pause the watchdog timer
-#				while waiting for write operations.
-#
-
-. /etc/rc.subr
-
-name="fusefs"
-rcvar=fusefs_enable
-
-kmod="%%KMODDIR%%/fuse.ko"
-
-start_cmd="fusefs_start"
-stop_cmd="fusefs_stop"
-
-fusefs_start()
-{
-	if kldstat | grep -q fuse\\.ko; then
-		echo "${name} is already running."
-		return 0
-	fi
-	echo "Starting ${name}."
-	kldload $kmod
-}
-
-fusefs_stop()
-{
-	if ! kldstat | grep -q fuse\\.ko; then
-		echo "${name} is not running."
-		return 1
-	fi
-	echo "Stopping ${name}."
-# Unmount FUSE filesystems in reverse order (in case they are nested) to
-# allow recent FUSE implementation to synchronize disks before shutdown.
-	mount | sed -e '1!G;h;$!d' | while read dev d1 mountpoint d2; do
-		case "$dev" in
-		/dev/fuse[0-9]*)
-			echo "fusefs: unmounting ${mountpoint}."
-			umount -f $mountpoint
-			;;
-		esac
-	done
-	if checkyesno "${name}_safe_evil"; then
-		if [ -n "$_rcshutdown_watchdog" ]; then
-			echo "fusefs: pausing watchdog timer."
-			kill -STOP "$_rcshutdown_watchdog"
-		fi
-	fi
-	if checkyesno "${name}_safe"; then
-		printf "fusefs: unloading $kmod... "
-		while ! kldunload $kmod 2> /dev/null; do
-			sleep 0.25
-		done
-		echo "done."
-	else
-		kldunload $kmod
-	fi
-	if checkyesno "${name}_safe_evil"; then
-		if [ -n "$_rcshutdown_watchdog" ]; then
-			echo "fusefs: continuing watchdog timer."
-			kill -CONT "$_rcshutdown_watchdog"
-		fi
-	fi
-}
-load_rc_config $name
-
-: ${fusefs_enable="NO"}
-: ${fusefs_safe="NO"}
-: ${fusefs_safe_evil="NO"}
-
-run_rc_command "$1"
diff --git a/sysutils/fusefs-kmod/files/patch-fuse_io.c b/sysutils/fusefs-kmod/files/patch-fuse_io.c
deleted file mode 100644
index c5a9597a37db..000000000000
--- a/sysutils/fusefs-kmod/files/patch-fuse_io.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- fs/fuse/fuse_io.c.orig
-+++ fs/fuse/fuse_io.c
-@@ -785,9 +785,9 @@ fuse_io_invalbuf(struct vnode *vp, struct thread *td)
- 	fvdat->flag |= FN_FLUSHINPROG;
- 
- 	if (vp->v_bufobj.bo_object != NULL) {
--		VM_OBJECT_WLOCK(vp->v_bufobj.bo_object);
-+		VM_OBJECT_LOCK(vp->v_bufobj.bo_object);
- 		vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC);
--		VM_OBJECT_WUNLOCK(vp->v_bufobj.bo_object);
-+		VM_OBJECT_UNLOCK(vp->v_bufobj.bo_object);
- 	}
- 	error = vinvalbuf(vp, V_SAVE, PCATCH, 0);
- 	while (error) {
diff --git a/sysutils/fusefs-kmod/files/patch-fuse_node.c b/sysutils/fusefs-kmod/files/patch-fuse_node.c
deleted file mode 100644
index a0d286d1e7d3..000000000000
--- a/sysutils/fusefs-kmod/files/patch-fuse_node.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- fs/fuse/fuse_node.c.orig
-+++ fs/fuse/fuse_node.c
-@@ -362,7 +362,7 @@ fuse_vnode_setsize(struct vnode *vp, struct ucred *cred, off_t newsize)
- 	fvdat->flag |= FN_SIZECHANGE;
- 
- 	if (newsize < oldsize) {
--		err = vtruncbuf(vp, cred, newsize, fuse_iosize(vp));
-+		err = vtruncbuf(vp, cred, curthread, newsize, fuse_iosize(vp));
- 	}
- 	vnode_pager_setsize(vp, newsize);
- 	return err;
diff --git a/sysutils/fusefs-kmod/files/pkg-message.in b/sysutils/fusefs-kmod/files/pkg-message.in
deleted file mode 100644
index 1d40884834ab..000000000000
--- a/sysutils/fusefs-kmod/files/pkg-message.in
+++ /dev/null
@@ -1,19 +0,0 @@
-==============================================================================
-
-In order to automatically load the fuse module on startup, you need to:
-
- - Add fusefs_enable="YES" to your /etc/rc.conf.
- - Run "%%PREFIX%%/etc/rc.d/fusefs start" (for the first time).
-
-Set "sysctl vfs.usermount=1" if you want to be able to mount fuse devices as
-an ordinary user.
-
-Now fuse filesystems (sysutils/fusefs-*) can be mounted at startup from
-/etc/fstab with the "late" parameter. This requires a symlink in /usr/sbin
-named "mount_<fstype>", which is not created by all the fusefs ports.
-
-Note that the rc.d script will unmount all fuse filesystems when called with
-"stop" (in reverse order in case of nested mounts), so it can unload the
-kernel module.
-
-==============================================================================
diff --git a/sysutils/fusefs-kmod/pkg-descr b/sysutils/fusefs-kmod/pkg-descr
deleted file mode 100644
index 9ab5d39d4594..000000000000
--- a/sysutils/fusefs-kmod/pkg-descr
+++ /dev/null
@@ -1,2 +0,0 @@
-Kernel module for fusefs based filesystems,
-backported from 10.x to 8.x and 9.x.
diff --git a/sysutils/fusefs-kmod/pkg-plist b/sysutils/fusefs-kmod/pkg-plist
deleted file mode 100644
index 3d92a01856d9..000000000000
--- a/sysutils/fusefs-kmod/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-man/man8/mount_fusefs.8.gz
-sbin/mount_fusefs
-@exec ln -fs %D/%F /usr/sbin
-@unexec rm -f /usr/sbin/mount_fusefs
-/%%KMODDIR%%/fuse.ko