Upgrade to 2.7.2.

PR:		ports/120246
Submitted by:	maintainer

6 files changed, 106 insertions, 143 deletions

diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index 9e77c8da5afd..4a0e3fa85097 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -5,8 +5,7 @@
 #
 
 PORTNAME=	fusefs
-PORTVERSION=	2.7.0
-PORTREVISION=	1
+PORTVERSION=	2.7.2
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	fuse
diff --git a/sysutils/fusefs-libs/distinfo b/sysutils/fusefs-libs/distinfo
index f0b6e1d2ea5b..85ac5610d2ee 100644
--- a/sysutils/fusefs-libs/distinfo
+++ b/sysutils/fusefs-libs/distinfo
@@ -1,3 +1,3 @@
-MD5 (fuse-2.7.0.tar.gz) = 7c3d52f81816e3a8e0cc2b5822a37e86
-SHA256 (fuse-2.7.0.tar.gz) = a26117fb74b3bf6a3c6867611c46c53b75d6749198933486ec8a778ac315f855
-SIZE (fuse-2.7.0.tar.gz) = 502261
+MD5 (fuse-2.7.2.tar.gz) = 813782a4f23211386c1ea91dc0ac7ded
+SHA256 (fuse-2.7.2.tar.gz) = fb390948aa27628e4fb48aa6658a20ad8c1ee304fe76bb60ac29b81c63d3baff
+SIZE (fuse-2.7.2.tar.gz) = 505855
diff --git a/sysutils/fusefs-libs/files/patch-lib_helper.c b/sysutils/fusefs-libs/files/patch-lib_helper.c
new file mode 100644
index 000000000000..a9cfbb98635a
--- /dev/null
+++ b/sysutils/fusefs-libs/files/patch-lib_helper.c
@@ -0,0 +1,72 @@
+--- 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 @@
+ struct helper_opts {
+ 	int singlethread;
+ 	int foreground;
+-	int nodefault_subtype;
++	int fsname;
+ 	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),
+ 
+ 	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_END
+ };
+ 
+@@ -122,24 +120,24 @@
+ 	}
+ }
+ 
+-static int add_default_subtype(const char *progname, struct fuse_args *args)
++static int add_default_fsname(const char *progname, struct fuse_args *args)
+ {
+ 	int res;
+-	char *subtype_opt;
++	char *fsname_opt;
+ 	const char *basename = strrchr(progname, '/');
+ 	if (basename == NULL)
+ 		basename = progname;
+ 	else if (basename[1] != '\0')
+ 		basename++;
+ 
+-	subtype_opt = (char *) malloc(strlen(basename) + 64);
+-	if (subtype_opt == NULL) {
++	fsname_opt = (char *) malloc(strlen(basename) + 64);
++	if (fsname_opt == NULL) {
+ 		fprintf(stderr, "fuse: memory allocation failed\n");
+ 		return -1;
+ 	}
+-	sprintf(subtype_opt, "-osubtype=%s", basename);
+-	res = fuse_opt_add_arg(args, subtype_opt);
+-	free(subtype_opt);
++	sprintf(fsname_opt, "-osubtype=%s", basename);
++	res = fuse_opt_add_arg(args, fsname_opt);
++	free(fsname_opt);
+ 	return res;
+ }
+ 
+@@ -155,8 +153,8 @@
+ 	if (res == -1)
+ 		return -1;
+ 
+-	if (!hopts.nodefault_subtype) {
+-		res = add_default_subtype(args->argv[0], args);
++	if (!hopts.fsname) {
++		res = add_default_fsname(args->argv[0], args);
+ 		if (res == -1)
+ 			goto err;
+ 	}
diff --git a/sysutils/fusefs-libs/files/patch-lib_mount_util.c b/sysutils/fusefs-libs/files/patch-lib_mount_util.c
new file mode 100644
index 000000000000..b81a34084aee
--- /dev/null
+++ b/sysutils/fusefs-libs/files/patch-lib_mount_util.c
@@ -0,0 +1,23 @@
+--- lib/mount_util.c.orig	2008-02-04 00:23:30.000000000 -0500
++++ lib/mount_util.c	2008-02-04 00:23:58.000000000 -0500
+@@ -224,20 +224,3 @@
+ 	}
+ 	return 0;
+ }
+-
+-int fuse_mnt_check_fuseblk(void)
+-{
+-	char buf[256];
+-	FILE *f = fopen("/proc/filesystems", "r");
+-	if (!f)
+-		return 1;
+-
+-	while (fgets(buf, sizeof(buf), f))
+-		if (strstr(buf, "fuseblk\n")) {
+-			fclose(f);
+-			return 1;
+-		}
+-
+-	fclose(f);
+-	return 0;
+-}
diff --git a/sysutils/fusefs-libs/files/patch-lib_mount_util.h b/sysutils/fusefs-libs/files/patch-lib_mount_util.h
new file mode 100644
index 000000000000..836fdc133e9d
--- /dev/null
+++ b/sysutils/fusefs-libs/files/patch-lib_mount_util.h
@@ -0,0 +1,7 @@
+--- lib/mount_util.h.orig	2008-02-04 00:24:07.000000000 -0500
++++ lib/mount_util.h	2008-02-04 00:24:20.000000000 -0500
+@@ -14,4 +14,3 @@
+ char *fuse_mnt_resolve_path(const char *progname, const char *orig);
+ int fuse_mnt_check_empty(const char *progname, const char *mnt,
+ 			 mode_t rootmode, off_t rootsize);
+-int fuse_mnt_check_fuseblk(void);
diff --git a/sysutils/fusefs-libs/files/patch-subtype b/sysutils/fusefs-libs/files/patch-subtype
deleted file mode 100644
index 0563b5794d4a..000000000000
--- a/sysutils/fusefs-libs/files/patch-subtype
+++ /dev/null
@@ -1,138 +0,0 @@
---- ../fuse-2.7.0/include/fuse_common.h	Mon Jul  2 13:32:15 2007
-+++ include/fuse_common.h	Wed Apr 25 18:14:26 2007
-@@ -160,20 +160,8 @@
- int fuse_parse_cmdline(struct fuse_args *args, char **mountpoint,
-                        int *multithreaded, int *foreground);
- 
--/**
-- * Go into the background
-- *
-- * @param foreground if true, stay in the foreground
-- * @return 0 on success, -1 on failure
-- */
--int fuse_daemonize(int foreground);
- 
--/**
-- * Get the version of the library
-- *
-- * @return the version
-- */
--int fuse_version(void);
-+int fuse_daemonize(int foreground);
- 
- /* ----------------------------------------------------------- *
-  * Signal handling                                             *
---- ../fuse-2.7.0/lib/helper.c	Mon Jul  2 13:32:17 2007
-+++ lib/helper.c	Wed Apr 25 18:14:26 2007
-@@ -29,7 +29,7 @@
- struct helper_opts {
-     int singlethread;
-     int foreground;
--    int nodefault_subtype;
-+    int fsname;
-     char *mountpoint;
- };
- 
-@@ -40,8 +40,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),
-@@ -51,7 +50,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
- };
- 
-@@ -119,24 +117,24 @@
-     }
- }
- 
--static int add_default_subtype(const char *progname, struct fuse_args *args)
-+static int add_default_fsname(const char *progname, struct fuse_args *args)
- {
-     int res;
--    char *subtype_opt;
-+    char *fsname_opt;
-     const char *basename = strrchr(progname, '/');
-     if (basename == NULL)
-         basename = progname;
-     else if (basename[1] != '\0')
-         basename++;
- 
--    subtype_opt = (char *) malloc(strlen(basename) + 64);
--    if (subtype_opt == NULL) {
-+    fsname_opt = (char *) malloc(strlen(basename) + 64);
-+    if (fsname_opt == NULL) {
-         fprintf(stderr, "fuse: memory allocation failed\n");
-         return -1;
-     }
--    sprintf(subtype_opt, "-osubtype=%s", basename);
--    res = fuse_opt_add_arg(args, subtype_opt);
--    free(subtype_opt);
-+    sprintf(fsname_opt, "-ofsname=%s", basename);
-+    res = fuse_opt_add_arg(args, fsname_opt);
-+    free(fsname_opt);
-     return res;
- }
- 
-@@ -151,8 +149,8 @@
-     if (res == -1)
-         return -1;
- 
--    if (!hopts.nodefault_subtype) {
--        res = add_default_subtype(args->argv[0], args);
-+    if (!hopts.fsname) {
-+        res = add_default_fsname(args->argv[0], args);
-         if (res == -1)
-             goto err;
-     }
-@@ -331,11 +329,6 @@
- {
-     fprintf(stderr, "fuse_main(): This function does not exist\n");
-     return -1;
--}
--
--int fuse_version(void)
--{
--    return FUSE_VERSION;
- }
- 
- #include "fuse_compat.h"
---- ../fuse-2.7.0/lib/mount_util.c	Mon Jul  2 13:32:17 2007
-+++ lib/mount_util.c	Thu May  3 13:56:37 2007
-@@ -193,20 +193,3 @@
-     }
-     return 0;
- }
--
--int fuse_mnt_check_fuseblk(void)
--{
--    char buf[256];
--    FILE *f = fopen("/proc/filesystems", "r");
--    if (!f)
--        return 1;
--
--    while (fgets(buf, sizeof(buf), f))
--        if (strstr(buf, "fuseblk\n")) {
--            fclose(f);
--            return 1;
--        }
--
--    fclose(f);
--    return 0;
--}
---- ../fuse-2.7.0/lib/mount_util.h	Mon Jul  2 13:32:17 2007
-+++ lib/mount_util.h	Wed May  2 16:34:03 2007
-@@ -14,4 +14,3 @@
- char *fuse_mnt_resolve_path(const char *progname, const char *orig);
- int fuse_mnt_check_empty(const char *progname, const char *mnt,
-                          mode_t rootmode, off_t rootsize);
--int fuse_mnt_check_fuseblk(void);