ports/174408: mtpfs port update
John Hixson
john at pcbsd.org
Thu Dec 13 03:30:00 UTC 2012
>Number: 174408
>Category: ports
>Synopsis: mtpfs port update
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 13 03:30:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: John Hixson
>Release: 10.0-CURRENT
>Organization:
ixsystems
>Environment:
FreeBSD thinkbsd 9.9-CURRENT FreeBSD 10.0-CURRENT #6 r242372: Tue Oct 30 22:40:48 PDT 2012 root at thinkbsd:/usr/obj/usr/src/sys/THINKBSD amd64
>Description:
update mtpfs from 0.9 to 1.1
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -urN /usr/ports/sysutils/mtpfs/Makefile mtpfs/Makefile
--- /usr/ports/sysutils/mtpfs/Makefile 2012-11-16 22:01:39.000000000 -0800
+++ mtpfs/Makefile 2012-12-12 19:19:08.855525309 -0800
@@ -2,10 +2,10 @@
# $FreeBSD: ports/sysutils/mtpfs/Makefile,v 1.13 2012/11/17 06:01:39 svnexp Exp $
PORTNAME= mtpfs
-PORTVERSION= 0.9
-PORTREVISION= 2
+PORTVERSION= 1.1
+PORTREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://www.adebenham.com/mtpfs/
+MASTER_SITES= http://www.adebenham.com/files/mtp/
MAINTAINER= john at pcbsd.org
COMMENT= MTP device filesystem
diff -urN /usr/ports/sysutils/mtpfs/distinfo mtpfs/distinfo
--- /usr/ports/sysutils/mtpfs/distinfo 2011-03-19 05:32:54.000000000 -0700
+++ mtpfs/distinfo 2012-12-12 19:19:15.325526977 -0800
@@ -1,2 +1,2 @@
-SHA256 (mtpfs-0.9.tar.gz) = 828e82955232155380b243348eb16cb5f6acfe02ddbf97222308b2fc2dcb1d09
-SIZE (mtpfs-0.9.tar.gz) = 95038
+SHA256 (mtpfs-1.1.tar.gz) = 1baf357de16995a5f0b5bc1b6833517a77456481d861cdba70f1ce1316ce4c1d
+SIZE (mtpfs-1.1.tar.gz) = 108329
diff -urN /usr/ports/sysutils/mtpfs/files/patch-Makefile.in mtpfs/files/patch-Makefile.in
--- /usr/ports/sysutils/mtpfs/files/patch-Makefile.in 2007-09-07 22:10:39.000000000 -0700
+++ mtpfs/files/patch-Makefile.in 2012-12-12 19:15:48.455524971 -0800
@@ -1,11 +1,11 @@
---- Makefile.in.orig Sun Jul 1 11:45:44 2007
-+++ Makefile.in Sun Jul 1 11:46:00 2007
-@@ -157,7 +157,7 @@
+--- Makefile.in 2012-02-26 17:02:28.000000000 -0800
++++ Makefile.in 2012-12-12 19:11:25.155523995 -0800
+@@ -181,7 +181,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
- mtpfs_SOURCES = id3read.c mtpfs.c mtpfs.h id3read.h
--mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=22 $(FUSE_CFLAGS)
-+mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=25 $(FUSE_CFLAGS)
- mtpfs_LDADD = $(FUSE_LIBS)
+ mtpfs_SOURCES = mtpfs.c mtpfs.h $(am__append_1)
+-mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=22 $(FUSE_CFLAGS) $(GLIB_CFLAGS) \
++mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=26 $(FUSE_CFLAGS) $(GLIB_CFLAGS) \
+ $(MTP_CFLAGS) $(am__append_2)
+ mtpfs_LDADD = $(FUSE_LIBS) $(GLIB_LIBS) $(MTP_LIBS) $(am__append_3)
all: all-am
-
diff -urN /usr/ports/sysutils/mtpfs/files/patch-mtpfs.c mtpfs/files/patch-mtpfs.c
--- /usr/ports/sysutils/mtpfs/files/patch-mtpfs.c 2012-10-30 11:08:06.000000000 -0700
+++ mtpfs/files/patch-mtpfs.c 2012-12-12 19:15:55.105526228 -0800
@@ -1,15 +1,6 @@
---- mtpfs.c.orig 2008-08-05 07:29:29.000000000 +0200
-+++ mtpfs.c 2012-10-30 00:47:13.487478272 +0100
-@@ -534,7 +534,7 @@
- }
- }
- close (fi->fh);
-- return_unlock();
-+ return_unlock(0);
- }
-
- void
-@@ -1143,7 +1143,7 @@
+--- mtpfs.c 2012-02-26 16:59:39.000000000 -0800
++++ mtpfs.c 2012-12-12 19:11:46.955525173 -0800
+@@ -1270,7 +1270,7 @@
}
static int
@@ -18,3 +9,37 @@
{
DBG("mtpfs_statfs");
stbuf->f_bsize=1024;
+@@ -1282,7 +1282,7 @@
+ }
+
+ void *
+-mtpfs_init ()
++mtpfs_init (struct fuse_conn_info *conn)
+ {
+ LIBMTP_devicestorage_t *storage;
+ DBG("mtpfs_init");
+@@ -1298,8 +1298,14 @@
+ // Do nothing
+ }
+
++int
++mtpfs_blank_chmod(const char *path, mode_t mode)
++{
++ return (0);
++}
++
+ static struct fuse_operations mtpfs_oper = {
+- .chmod = mtpfs_blank,
++ .chmod = mtpfs_blank_chmod,
+ .release = mtpfs_release,
+ .readdir = mtpfs_readdir,
+ .getattr = mtpfs_getattr,
+@@ -1428,7 +1434,7 @@
+
+ DBG("Start fuse");
+
+- fuse_stat=fuse_main (argc, argv, &mtpfs_oper);
++ fuse_stat=fuse_main (argc, argv, &mtpfs_oper, NULL);
+ DBG("fuse_main returned %d\n", fuse_stat);
+ return fuse_stat;
+ }
diff -urN /usr/ports/sysutils/mtpfs/files/patch-mtpfs.h mtpfs/files/patch-mtpfs.h
--- /usr/ports/sysutils/mtpfs/files/patch-mtpfs.h 2009-01-24 06:27:01.000000000 -0800
+++ mtpfs/files/patch-mtpfs.h 2012-12-12 19:16:02.195525012 -0800
@@ -1,18 +1,26 @@
---- mtpfs.h.orig 2009-01-04 03:03:56.000000000 +0800
-+++ mtpfs.h 2009-01-04 03:05:16.000000000 +0800
-@@ -18,8 +18,9 @@
+--- mtpfs.h 2012-02-23 20:37:14.000000000 -0800
++++ mtpfs.h 2012-12-12 19:10:01.055523958 -0800
+@@ -18,7 +18,9 @@
#include <fcntl.h>
#include <dirent.h>
#include <errno.h>
-#include <sys/statfs.h>
--
+#include <sys/param.h>
+#include <sys/mount.h>
+#include <sys/statvfs.h>
+
#include <libmtp.h>
#include <glib.h>
- #include <id3tag.h>
-@@ -49,7 +50,7 @@
+@@ -49,7 +51,7 @@
+
+
+ /* fuse functions */
+-static void * mtpfs_init (void);
++static void * mtpfs_init (struct fuse_conn_info *);
+ static int mtpfs_blank ();
+ static int mtpfs_release (const char *path, struct fuse_file_info *fi);
+ void mtpfs_destroy ();
+@@ -62,7 +64,7 @@
static int mtpfs_unlink (const gchar * path);
static int mtpfs_mkdir (const char *path, mode_t mode);
static int mtpfs_rmdir (const char *path);
@@ -20,4 +28,4 @@
+static int mtpfs_statfs (const char *path, struct statvfs *stbuf);
int calc_length(int f);
-
+ static LIBMTP_mtpdevice_t *device;
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list