Date: Mon, 4 Feb 2008 00:32:19 -0500 From: "Anish Mistry" <amistry@am-productions.biz> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Cc: alepulver@FreeBSD.org Subject: ports/120246: Update fusefs-lib to 2.7.2 Message-ID: <1202103139.10390@bigguy.am-productions.biz> Resent-Message-ID: <200802040530.m145U1E7090104@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 120246
>Category: ports
>Synopsis: Update fusefs-lib to 2.7.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Feb 04 05:30:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Anish Mistry
>Release: FreeBSD 7.0-RC1 i386
>Organization:
AM Productions
>Environment:
System: FreeBSD 7.0-RC1 #16: Fri Jan 18 02:45:02 EST 2008
amistry@bigguy.am-productions.biz:/usr/home/amistry/storage/temp/usr/home/amistry/windows-share/build/src/sys/BIGGUY
>Description:
Update to 2.7.2 in preparation for kmod update.
>How-To-Repeat:
>Fix:
--- fusefs-libs-2.7.2.patch begins here ---
diff -ruN fusefs-libs.orig/Makefile fusefs-libs/Makefile
--- fusefs-libs.orig/Makefile 2008-02-04 00:15:12.000000000 -0500
+++ fusefs-libs/Makefile 2008-02-04 00:15:27.000000000 -0500
@@ -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 -ruN fusefs-libs.orig/distinfo fusefs-libs/distinfo
--- fusefs-libs.orig/distinfo 2008-02-04 00:15:12.000000000 -0500
+++ fusefs-libs/distinfo 2008-02-04 00:16:05.000000000 -0500
@@ -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 -ruN fusefs-libs.orig/files/patch-lib_helper.c fusefs-libs/files/patch-lib_helper.c
--- fusefs-libs.orig/files/patch-lib_helper.c 1969-12-31 19:00:00.000000000 -0500
+++ fusefs-libs/files/patch-lib_helper.c 2008-02-04 00:26:18.000000000 -0500
@@ -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 -ruN fusefs-libs.orig/files/patch-lib_mount_util.c fusefs-libs/files/patch-lib_mount_util.c
--- fusefs-libs.orig/files/patch-lib_mount_util.c 1969-12-31 19:00:00.000000000 -0500
+++ fusefs-libs/files/patch-lib_mount_util.c 2008-02-04 00:25:39.000000000 -0500
@@ -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 -ruN fusefs-libs.orig/files/patch-lib_mount_util.h fusefs-libs/files/patch-lib_mount_util.h
--- fusefs-libs.orig/files/patch-lib_mount_util.h 1969-12-31 19:00:00.000000000 -0500
+++ fusefs-libs/files/patch-lib_mount_util.h 2008-02-04 00:25:48.000000000 -0500
@@ -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 -ruN fusefs-libs.orig/files/patch-subtype fusefs-libs/files/patch-subtype
--- fusefs-libs.orig/files/patch-subtype 2008-02-04 00:15:12.000000000 -0500
+++ fusefs-libs/files/patch-subtype 1969-12-31 19:00:00.000000000 -0500
@@ -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);
--- fusefs-libs-2.7.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1202103139.10390>