Attachment #136894 for bug #182238

View | Details | Raw Unified | Return to bug 182238
Collapse All | Expand All

Lines 2-9 Link Here

(-)sysutils/fusefs-fusexmp_fh/Makefile (-2 / +1 lines)
2	# $FreeBSD: sysutils/fusefs-fusexmp_fh/Makefile 316683 2013-04-27 18:25:24Z mva $	2	# $FreeBSD: sysutils/fusefs-fusexmp_fh/Makefile 316683 2013-04-27 18:25:24Z mva $
3		3
4	PORTNAME= fusexmp_fh	4	PORTNAME= fusexmp_fh
5	PORTVERSION= 2.7.4	5	PORTVERSION= 2.9.3
6	PORTREVISION= 1
7	CATEGORIES= sysutils	6	CATEGORIES= sysutils
8	MASTER_SITES= SF/fuse/fuse-2.X/${PORTVERSION}	7	MASTER_SITES= SF/fuse/fuse-2.X/${PORTVERSION}
9	PKGNAMEPREFIX= fusefs-	8	PKGNAMEPREFIX= fusefs-

Lines 1-2 Link Here

(-)sysutils/fusefs-fusexmp_fh/distinfo (-2 / +2 lines)
1	SHA256 (fuse-2.7.4.tar.gz) = c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6	1	SHA256 (fuse-2.9.3.tar.gz) = 0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c
2	SIZE (fuse-2.7.4.tar.gz) = 506658	2	SIZE (fuse-2.9.3.tar.gz) = 572044

Lines 1-10 Link Here

(-)sysutils/fusefs-fusexmp_fh/files/patch-configure (-10 lines)
1	--- configure.orig 2008-06-05 13:58:44.000000000 -0700
2	+++ configure 2008-06-05 14:00:32.000000000 -0700
3	@@ -12201,6 +12201,7 @@
4	_ACEOF
5
6	fi
7	+ LIBICONV=$LTLIBICONV
8	if test "$am_cv_lib_iconv" = yes; then
9	{ echo "$as_me:$LINENO: checking how to link with libiconv" >&5
10	echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; }




--- lib/helper.c.orig	2012-04-10 15:28:55.000000000 +0200
+++ lib/helper.c	2012-07-31 00:06:11.384938678 +0200
@@ -31,7 +31,7 @@
 struct helper_opts {
 	int singlethread;
 	int foreground;

 	char *mountpoint;
 };
 
@@ -42,8 +42,7 @@
 	FUSE_HELPER_OPT("debug",	foreground),
 	FUSE_HELPER_OPT("-f",		foreground),
 	FUSE_HELPER_OPT("-s",		singlethread),
-	FUSE_HELPER_OPT("fsname=",	nodefault_subtype),
-	FUSE_HELPER_OPT("subtype=",	nodefault_subtype),
+	FUSE_HELPER_OPT("fsname=",	fsname),
 
 	FUSE_OPT_KEY("-h",		KEY_HELP),
 	FUSE_OPT_KEY("--help",		KEY_HELP),
@@ -53,7 +52,6 @@
 	FUSE_OPT_KEY("-d",		FUSE_OPT_KEY_KEEP),
 	FUSE_OPT_KEY("debug",		FUSE_OPT_KEY_KEEP),
 	FUSE_OPT_KEY("fsname=",		FUSE_OPT_KEY_KEEP),
-	FUSE_OPT_KEY("subtype=",	FUSE_OPT_KEY_KEEP),
 	FUSE_OPT_END
 };
 
@@ -123,24 +121,24 @@
 	}
 }
 

 	return res;
 }
 
@@ -156,8 +154,8 @@
 	if (res == -1)
 		return -1;
 




--- lib/mount_bsd.c.orig	2013-07-01 09:40:53.000000000 +0200
+++ lib/mount_bsd.c	2013-07-24 16:20:34.533073286 +0200
@@ -10,6 +10,8 @@
 #include "fuse_misc.h"
 #include "fuse_opt.h"
 
+#include <sys/param.h>
+#include <sys/mount.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/sysctl.h>
@@ -192,56 +194,12 @@
 	free(umount_cmd);
 }
 
-static void do_unmount(char *dev, int fd)
-{
-	char device_path[SPECNAMELEN + 12];
-	const char *argv[4];
-	const char umount_cmd[] = "/sbin/umount";
-	pid_t pid;
-
-	snprintf(device_path, SPECNAMELEN + 12, _PATH_DEV "%s", dev);
-
-	argv[0] = umount_cmd;
-	argv[1] = "-f";
-	argv[2] = device_path;
-	argv[3] = NULL;
-
-	pid = fork();
-
-	if (pid == -1)
-		return;
-
-	if (pid == 0) {
-		close(fd);
-		execvp(umount_cmd, (char **)argv);
-		exit(1);
-	}
-
-	waitpid(pid, NULL, 0);
-}
-
 void fuse_kern_unmount(const char *mountpoint, int fd)
 {
 	char *ep, dev[128];
 	struct stat sbuf;
 
-	(void)mountpoint;
-
-	if (fstat(fd, &sbuf) == -1)
-		goto out;
-
-	devname_r(sbuf.st_rdev, S_IFCHR, dev, 128);
-
-	if (strncmp(dev, "fuse", 4))
-		goto out;
-
-	strtol(dev + 4, &ep, 10);
-	if (*ep != '\0')
-		goto out;
-
-	do_unmount(dev, fd);
-
-out:
+	unmount(mountpoint, MNT_FORCE);
 	close(fd);
 }


Return to bug 182238

Lines 1-6 Link Here

(-)sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c (-20 / +20 lines)
1	--- lib/helper.c.orig 2007-12-12 09:33:35.000000000 -0500	1	--- lib/helper.c.orig 2012-04-10 15:28:55.000000000 +0200
2	+++ lib/helper.c 2008-02-04 00:22:51.000000000 -0500	2	+++ lib/helper.c 2012-07-31 00:06:11.384938678 +0200
3	@@ -30,7 +30,7 @@	3	@@ -31,7 +31,7 @@
4	struct helper_opts {	4	struct helper_opts {
5	int singlethread;	5	int singlethread;
6	int foreground;	6	int foreground;
Lines 9-33 Link Here
9	char *mountpoint;	9	char *mountpoint;
10	};	10	};
11		11
12	@@ -41,8 +41,7 @@	12	@@ -42,8 +42,7 @@
13	FUSE_HELPER_OPT("debug", foreground),	13	FUSE_HELPER_OPT("debug", foreground),
14	FUSE_HELPER_OPT("-f", foreground),	14	FUSE_HELPER_OPT("-f", foreground),
15	FUSE_HELPER_OPT("-s", singlethread),	15	FUSE_HELPER_OPT("-s", singlethread),
16	- FUSE_HELPER_OPT("fsname=", nodefault_subtype),	16	- FUSE_HELPER_OPT("fsname=", nodefault_subtype),
17	- FUSE_HELPER_OPT("subtype=", nodefault_subtype),	17	- FUSE_HELPER_OPT("subtype=", nodefault_subtype),
18	+ FUSE_HELPER_OPT("fsname=", fsname),	18	+ FUSE_HELPER_OPT("fsname=", fsname),
19		19
20	FUSE_OPT_KEY("-h", KEY_HELP),	20	FUSE_OPT_KEY("-h", KEY_HELP),
21	FUSE_OPT_KEY("--help", KEY_HELP),	21	FUSE_OPT_KEY("--help", KEY_HELP),
22	@@ -52,7 +51,6 @@	22	@@ -53,7 +52,6 @@
23	FUSE_OPT_KEY("-d", FUSE_OPT_KEY_KEEP),	23	FUSE_OPT_KEY("-d", FUSE_OPT_KEY_KEEP),
24	FUSE_OPT_KEY("debug", FUSE_OPT_KEY_KEEP),	24	FUSE_OPT_KEY("debug", FUSE_OPT_KEY_KEEP),
25	FUSE_OPT_KEY("fsname=", FUSE_OPT_KEY_KEEP),	25	FUSE_OPT_KEY("fsname=", FUSE_OPT_KEY_KEEP),
26	- FUSE_OPT_KEY("subtype=", FUSE_OPT_KEY_KEEP),	26	- FUSE_OPT_KEY("subtype=", FUSE_OPT_KEY_KEEP),
27	FUSE_OPT_END	27	FUSE_OPT_END
28	};	28	};
29		29
30	@@ -122,24 +120,24 @@	30	@@ -123,24 +121,24 @@
31	}	31	}
32	}	32	}
33		33
Lines 59-65 Link Here
59	return res;	59	return res;
60	}	60	}
61		61
62	@@ -155,8 +153,8 @@	62	@@ -156,8 +154,8 @@
63	if (res == -1)	63	if (res == -1)
64	return -1;	64	return -1;
65		65

Lines 1-10 Link Here

(-)sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c (-3 / +62 lines)
1	--- lib/mount_bsd.c.orig 2008-07-07 08:01:09.000000000 +0200	1	--- lib/mount_bsd.c.orig 2013-07-01 09:40:53.000000000 +0200
2	+++ lib/mount_bsd.c 2008-07-07 08:01:59.000000000 +0200	2	+++ lib/mount_bsd.c 2013-07-24 16:20:34.533073286 +0200
3	@@ -10,6 +10,7 @@	3	@@ -10,6 +10,8 @@
4	#include "fuse_misc.h"	4	#include "fuse_misc.h"
5	#include "fuse_opt.h"	5	#include "fuse_opt.h"
6		6
7	+#include <sys/param.h>	7	+#include <sys/param.h>
		8	+#include <sys/mount.h>
8	#include <sys/stat.h>	9	#include <sys/stat.h>
9	#include <sys/wait.h>	10	#include <sys/wait.h>
10	#include <sys/sysctl.h>	11	#include <sys/sysctl.h>
		12	@@ -192,56 +194,12 @@
		13	free(umount_cmd);
		14	}
		15
		16	-static void do_unmount(char *dev, int fd)
		17	-{
		18	- char device_path[SPECNAMELEN + 12];
		19	- const char *argv[4];
		20	- const char umount_cmd[] = "/sbin/umount";
		21	- pid_t pid;
		22	-
		23	- snprintf(device_path, SPECNAMELEN + 12, _PATH_DEV "%s", dev);
		24	-
		25	- argv[0] = umount_cmd;
		26	- argv[1] = "-f";
		27	- argv[2] = device_path;
		28	- argv[3] = NULL;
		29	-
		30	- pid = fork();
		31	-
		32	- if (pid == -1)
		33	- return;
		34	-
		35	- if (pid == 0) {
		36	- close(fd);
		37	- execvp(umount_cmd, (char **)argv);
		38	- exit(1);
		39	- }
		40	-
		41	- waitpid(pid, NULL, 0);
		42	-}
		43	-
		44	void fuse_kern_unmount(const char *mountpoint, int fd)
		45	{
		46	char *ep, dev[128];
		47	struct stat sbuf;
		48
		49	- (void)mountpoint;
		50	-
		51	- if (fstat(fd, &sbuf) == -1)
		52	- goto out;
		53	-
		54	- devname_r(sbuf.st_rdev, S_IFCHR, dev, 128);
		55	-
		56	- if (strncmp(dev, "fuse", 4))
		57	- goto out;
		58	-
		59	- strtol(dev + 4, &ep, 10);
		60	- if (*ep != '\0')
		61	- goto out;
		62	-
		63	- do_unmount(dev, fd);
		64	-
		65	-out:
		66	+ unmount(mountpoint, MNT_FORCE);
		67	close(fd);
		68	}
		69