diff options
| -rw-r--r-- | sysutils/fusefs-fusexmp_fh/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/fusefs-fusexmp_fh/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/fusefs-fusexmp_fh/files/patch-configure | 10 | ||||
| -rw-r--r-- | sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c | 38 | ||||
| -rw-r--r-- | sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c | 64 |
5 files changed, 83 insertions, 37 deletions
diff --git a/sysutils/fusefs-fusexmp_fh/Makefile b/sysutils/fusefs-fusexmp_fh/Makefile index 3091eb87eaa2..fadcb7fd786c 100644 --- a/sysutils/fusefs-fusexmp_fh/Makefile +++ b/sysutils/fusefs-fusexmp_fh/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fusexmp_fh -PORTVERSION= 2.7.4 -PORTREVISION= 1 +PORTVERSION= 2.9.3 CATEGORIES= sysutils MASTER_SITES= SF/fuse/fuse-2.X/${PORTVERSION} PKGNAMEPREFIX= fusefs- @@ -12,7 +11,6 @@ DISTNAME= fuse-${PORTVERSION} MAINTAINER= buganini@gmail.com COMMENT= Dummy driver from fusefs-libs example - USE_AUTOTOOLS= libtool USES= fuse pathfix iconv USE_LDCONFIG= yes diff --git a/sysutils/fusefs-fusexmp_fh/distinfo b/sysutils/fusefs-fusexmp_fh/distinfo index a8edce1bfd0a..275c8de670f4 100644 --- a/sysutils/fusefs-fusexmp_fh/distinfo +++ b/sysutils/fusefs-fusexmp_fh/distinfo @@ -1,2 +1,2 @@ -SHA256 (fuse-2.7.4.tar.gz) = c8b070ece5d4e09bd06eea6c28818c718f803d93a4b85bacb9982deb8ded49e6 -SIZE (fuse-2.7.4.tar.gz) = 506658 +SHA256 (fuse-2.9.3.tar.gz) = 0beb83eaf2c5e50730fc553406ef124d77bc02c64854631bdfc86bfd6437391c +SIZE (fuse-2.9.3.tar.gz) = 572044 diff --git a/sysutils/fusefs-fusexmp_fh/files/patch-configure b/sysutils/fusefs-fusexmp_fh/files/patch-configure deleted file mode 100644 index d35406f06134..000000000000 --- a/sysutils/fusefs-fusexmp_fh/files/patch-configure +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig 2008-06-05 13:58:44.000000000 -0700 -+++ configure 2008-06-05 14:00:32.000000000 -0700 -@@ -12201,6 +12201,7 @@ - _ACEOF - - fi -+ LIBICONV=$LTLIBICONV - if test "$am_cv_lib_iconv" = yes; then - { echo "$as_me:$LINENO: checking how to link with libiconv" >&5 - echo $ECHO_N "checking how to link with libiconv... $ECHO_C" >&6; } diff --git a/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c b/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c index 89f46a4595aa..c8b88076b132 100644 --- a/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c +++ b/sysutils/fusefs-fusexmp_fh/files/patch-lib_helper.c @@ -1,6 +1,6 @@ ---- lib/helper.c.orig 2007-12-12 09:33:35.000000000 -0500 -+++ lib/helper.c 2008-02-04 00:22:51.000000000 -0500 -@@ -30,7 +30,7 @@ +--- 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; @@ -9,25 +9,25 @@ char *mountpoint; }; -@@ -41,8 +41,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), +@@ -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), -@@ -52,7 +51,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_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 }; -@@ -122,24 +120,24 @@ +@@ -123,24 +121,24 @@ } } @@ -59,7 +59,7 @@ return res; } -@@ -155,8 +153,8 @@ +@@ -156,8 +154,8 @@ if (res == -1) return -1; diff --git a/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c b/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c index 8bc349838e47..6a9b18d46db8 100644 --- a/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c +++ b/sysutils/fusefs-fusexmp_fh/files/patch-lib_mount_bsd.c @@ -1,10 +1,68 @@ ---- lib/mount_bsd.c.orig 2008-07-07 08:01:09.000000000 +0200 -+++ lib/mount_bsd.c 2008-07-07 08:01:59.000000000 +0200 -@@ -10,6 +10,7 @@ +--- 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); + } |