6 files changed, 55 insertions, 44 deletions

diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index 8ea17170a7ae..3d0ab1fc47fe 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -5,9 +5,9 @@
 #
 
 PORTNAME=	ntfs
-PORTVERSION=	2009.4.4
+PORTVERSION=	2010.3.6
 CATEGORIES=	sysutils
-MASTER_SITES=	http://www.ntfs-3g.org/
+MASTER_SITES=	http://tuxera.com/opensource/
 PKGNAMEPREFIX=	fusefs-
 DISTNAME=	${PORTNAME}-3g-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
@@ -31,8 +31,7 @@ OPTIONS=	LOCK "Lock the device when mounting (avoids access)" on \
 SUB_FILES=	pkg-message
 DOCSDIR=	${PREFIX}/share/doc/ntfs-3g
 
-MAN8=		ntfs-3g.8 ntfs-3g.probe.8
-MLINKS=		ntfs-3g.8 mount_ntfs-3g.8
+MAN8=		ntfs-3g.8 ntfs-3g.probe.8 ntfs-3g.secaudit.8 ntfs-3g.usermap.8
 
 .include <bsd.port.pre.mk>
 
@@ -46,8 +45,12 @@ LIB_DEPENDS+=	ublio.1:${PORTSDIR}/devel/libublio
 CFLAGS+=	-DUSE_UBLIO
 .endif
 
-.if defined(NOPORTDOCS)
 post-patch:
+	@${REINPLACE_CMD} -e 's|ENODATA|ENOATTR|' \
+		${WRKSRC}/libntfs-3g/object_id.c \
+		${WRKSRC}/libntfs-3g/reparse.c \
+		${WRKSRC}/libntfs-3g/security.c
+.if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -Ee 's|^(install-data-am:) .*|\1|' \
 		${WRKSRC}/Makefile.in
 .endif
diff --git a/sysutils/fusefs-ntfs/distinfo b/sysutils/fusefs-ntfs/distinfo
index 0fb8b7154156..87c44e6f0812 100644
--- a/sysutils/fusefs-ntfs/distinfo
+++ b/sysutils/fusefs-ntfs/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntfs-3g-2009.4.4.tgz) = e0b5c170f088a8d82968f0a6b34d31da
-SHA256 (ntfs-3g-2009.4.4.tgz) = bcd39ebe90541f512e605b62911f14f6107239c4ff032d56d5da3dc3c05e0d0f
-SIZE (ntfs-3g-2009.4.4.tgz) = 652496
+MD5 (ntfs-3g-2010.3.6.tgz) = 12ce21aa044c6068a4df6e8cbd3c5cfa
+SHA256 (ntfs-3g-2010.3.6.tgz) = cca0a36e914824f626b4f6f94318f84ca0d9996ad61e161fe112a6401601895f
+SIZE (ntfs-3g-2010.3.6.tgz) = 837069
diff --git a/sysutils/fusefs-ntfs/files/extra-patch-ublio b/sysutils/fusefs-ntfs/files/extra-patch-ublio
index 2a7a1e38cca7..b3fa2029c9b2 100644
--- a/sysutils/fusefs-ntfs/files/extra-patch-ublio
+++ b/sysutils/fusefs-ntfs/files/extra-patch-ublio
@@ -1,24 +1,24 @@
---- libntfs-3g/Makefile.in.orig	2008-05-28 16:08:07.000000000 -0300
-+++ libntfs-3g/Makefile.in	2008-06-21 20:41:19.000000000 -0300
-@@ -252,6 +252,7 @@
+--- libntfs-3g/Makefile.in.orig	2010-03-06 13:12:36.000000000 -0300
++++ libntfs-3g/Makefile.in	2010-10-04 15:10:43.000000000 -0300
+@@ -241,6 +241,7 @@
  libntfs_3g_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
  libntfs_3g_la_LDFLAGS = -version-info $(LIBNTFS_3G_VERSION) -no-undefined
  @FUSE_INTERNAL_TRUE@libntfs_3g_la_LIBADD = $(top_builddir)/libfuse-lite/libfuse-lite.la
 +libntfs_3g_la_LIBADD = -lublio
- libntfs_3g_la_SOURCES = attrib.c attrlist.c bitmap.c bootsect.c \
- 	collate.c compat.c compress.c debug.c device.c dir.c index.c \
- 	inode.c lcnalloc.c logfile.c logging.c mft.c misc.c mst.c \
---- ./src/ntfs-3g.c.orig	Sun Apr 15 20:52:01 2007
-+++ ./src/ntfs-3g.c	Mon Apr 30 14:12:57 2007
-@@ -1603,7 +1603,11 @@
- 	.mkdir		= ntfs_fuse_mkdir,
- 	.rmdir		= ntfs_fuse_rmdir,
+ libntfs_3g_la_SOURCES = acls.c attrib.c attrlist.c bitmap.c bootsect.c \
+ 	cache.c collate.c compat.c compress.c debug.c device.c dir.c \
+ 	efs.c index.c inode.c lcnalloc.c logfile.c logging.c mft.c \
+--- src/ntfs-3g.c.orig	2010-03-06 13:12:25.000000000 -0300
++++ src/ntfs-3g.c	2010-10-04 15:11:57.000000000 -0300
+@@ -3508,7 +3508,11 @@
+ #else
  	.utime		= ntfs_fuse_utime,
-+#ifdef __linux__
+ #endif
++#ifndef __FreeBSD__
  	.bmap		= ntfs_fuse_bmap,
 +#else
 +	.bmap		= NULL,
 +#endif
  	.destroy        = ntfs_fuse_destroy2,
- #ifdef HAVE_SETXATTR
- 	.getxattr	= ntfs_fuse_getxattr,
+ #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
+ 	.access		= ntfs_fuse_access,
diff --git a/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c b/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c
index 647f300e155a..b3e4c3dad80a 100644
--- a/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c
+++ b/sysutils/fusefs-ntfs/files/patch-libntfs-3g__unix_io.c
@@ -1,5 +1,5 @@
---- libntfs-3g/unix_io.c.orig	Fri Jun  8 18:35:33 2007
-+++ libntfs-3g/unix_io.c	Wed Jul 11 17:55:03 2007
+--- libntfs-3g/unix_io.c.orig	2010-03-06 13:12:25.000000000 -0300
++++ libntfs-3g/unix_io.c	2010-10-04 15:17:18.000000000 -0300
 @@ -54,6 +54,22 @@
  #include <linux/fd.h>
  #endif
@@ -113,9 +113,9 @@
 +#endif
 +
  /**
-  * ntfs_device_unix_io_open - Open a device and lock it exclusively
-  * @dev:
-@@ -79,9 +172,21 @@
+  * fsync replacement which makes every effort to try to get the data down to
+  * disk, using different means for different operating systems. Specifically,
+@@ -113,9 +206,21 @@
   */
  static int ntfs_device_unix_io_open(struct ntfs_device *dev, int flags)
  {
@@ -138,7 +138,7 @@
  
  	if (NDevOpen(dev)) {
  		errno = EBUSY;
-@@ -91,20 +196,28 @@
+@@ -125,20 +230,28 @@
  		ntfs_log_perror("Failed to access '%s'", dev->d_name);
  		return -1;
  	}
@@ -174,7 +174,7 @@
  		err = errno;
  		goto err_out;
  	}
-@@ -112,6 +225,37 @@
+@@ -146,6 +259,37 @@
  	if ((flags & O_RDWR) != O_RDWR)
  		NDevSetReadOnly(dev);
  	
@@ -212,7 +212,7 @@
  	memset(&flk, 0, sizeof(flk));
  	if (NDevReadOnly(dev))
  		flk.l_type = F_RDLCK;
-@@ -119,7 +263,21 @@
+@@ -153,7 +297,21 @@
  		flk.l_type = F_WRLCK;
  	flk.l_whence = SEEK_SET;
  	flk.l_start = flk.l_len = 0LL;
@@ -235,7 +235,7 @@
  		err = errno;
  		ntfs_log_perror("Failed to %s lock '%s'", NDevReadOnly(dev) ? 
  				"read" : "write", dev->d_name);
-@@ -127,7 +285,16 @@
+@@ -161,7 +319,16 @@
  			ntfs_log_perror("Failed to close '%s'", dev->d_name);
  		goto err_out;
  	}
@@ -253,7 +253,7 @@
  	NDevSetOpen(dev);
  	return 0;
  err_out:
-@@ -147,7 +314,10 @@
+@@ -181,7 +348,10 @@
   */
  static int ntfs_device_unix_io_close(struct ntfs_device *dev)
  {
@@ -264,7 +264,7 @@
  
  	if (!NDevOpen(dev)) {
  		errno = EBADF;
-@@ -160,12 +330,18 @@
+@@ -194,12 +364,18 @@
  			return -1;
  		}
  
@@ -284,7 +284,7 @@
  	if (close(DEV_FD(dev))) {
  		ntfs_log_perror("Failed to close device %s", dev->d_name);
  		return -1;
-@@ -189,9 +365,234 @@
+@@ -223,9 +399,234 @@
  static s64 ntfs_device_unix_io_seek(struct ntfs_device *dev, s64 offset,
  		int whence)
  {
@@ -519,7 +519,7 @@
  /**
   * ntfs_device_unix_io_read - Read from the device, from the current location
   * @dev:
-@@ -205,6 +606,29 @@
+@@ -239,6 +640,29 @@
  static s64 ntfs_device_unix_io_read(struct ntfs_device *dev, void *buf,
  		s64 count)
  {
@@ -549,7 +549,7 @@
  	return read(DEV_FD(dev), buf, count);
  }
  
-@@ -226,6 +650,28 @@
+@@ -260,6 +684,28 @@
  		return -1;
  	}
  	NDevSetDirty(dev);
@@ -578,7 +578,7 @@
  	return write(DEV_FD(dev), buf, count);
  }
  
-@@ -243,6 +689,13 @@
+@@ -277,6 +723,13 @@
  static s64 ntfs_device_unix_io_pread(struct ntfs_device *dev, void *buf,
  		s64 count, s64 offset)
  {
@@ -592,7 +592,7 @@
  	return pread(DEV_FD(dev), buf, count, offset);
  }
  
-@@ -265,6 +718,13 @@
+@@ -299,6 +752,13 @@
  		return -1;
  	}
  	NDevSetDirty(dev);
@@ -606,17 +606,17 @@
  	return pwrite(DEV_FD(dev), buf, count, offset);
  }
  
-@@ -281,7 +741,14 @@
+@@ -315,7 +775,14 @@
  	int res = 0;
  	
  	if (!NDevReadOnly(dev)) {
 +#if USE_UBLIO
 +		if (DEV_HANDLE(dev)->ublio_fh)
-+ 			res = ublio_fsync(DEV_HANDLE(dev)->ublio_fh);
++			res = ublio_fsync(DEV_HANDLE(dev)->ublio_fh);
 +		if (!DEV_HANDLE(dev)->ublio_fh || !res)
-+			res = fsync(DEV_FD(dev));
++			res = ntfs_fsync(DEV_FD(dev));
 +#else
- 		res = fsync(DEV_FD(dev));
+ 		res = ntfs_fsync(DEV_FD(dev));
 +#endif
  		if (res)
  			ntfs_log_perror("Failed to sync device %s", dev->d_name);
diff --git a/sysutils/fusefs-ntfs/pkg-descr b/sysutils/fusefs-ntfs/pkg-descr
index a87a990cf3c5..e50f909cf02e 100644
--- a/sysutils/fusefs-ntfs/pkg-descr
+++ b/sysutils/fusefs-ntfs/pkg-descr
@@ -4,4 +4,4 @@ Server 2003 and Windows 2000 filesystems. Almost the full POSIX filesystem
 functionality is supported, the major exceptions are changing the file
 ownerships and the access rights.
 
-WWW: http://www.ntfs-3g.org/
+WWW: http://www.tuxera.com/community/
diff --git a/sysutils/fusefs-ntfs/pkg-plist b/sysutils/fusefs-ntfs/pkg-plist
index 183f4fe277f4..4109d10da33d 100644
--- a/sysutils/fusefs-ntfs/pkg-plist
+++ b/sysutils/fusefs-ntfs/pkg-plist
@@ -1,11 +1,15 @@
 bin/ntfs-3g
 bin/ntfs-3g.probe
+bin/ntfs-3g.secaudit
+bin/ntfs-3g.usermap
 @exec ln -fs %D/%F /usr/sbin/mount_ntfs-3g
 @unexec rm -f /usr/sbin/mount_ntfs-3g
+include/ntfs-3g/acls.h
 include/ntfs-3g/attrib.h
 include/ntfs-3g/attrlist.h
 include/ntfs-3g/bitmap.h
 include/ntfs-3g/bootsect.h
+include/ntfs-3g/cache.h
 include/ntfs-3g/collate.h
 include/ntfs-3g/compat.h
 include/ntfs-3g/compress.h
@@ -13,6 +17,7 @@ include/ntfs-3g/debug.h
 include/ntfs-3g/device.h
 include/ntfs-3g/device_io.h
 include/ntfs-3g/dir.h
+include/ntfs-3g/efs.h
 include/ntfs-3g/endians.h
 include/ntfs-3g/index.h
 include/ntfs-3g/inode.h
@@ -24,6 +29,9 @@ include/ntfs-3g/mft.h
 include/ntfs-3g/misc.h
 include/ntfs-3g/mst.h
 include/ntfs-3g/ntfstime.h
+include/ntfs-3g/object_id.h
+include/ntfs-3g/param.h
+include/ntfs-3g/reparse.h
 include/ntfs-3g/runlist.h
 include/ntfs-3g/security.h
 include/ntfs-3g/support.h
@@ -33,7 +41,7 @@ include/ntfs-3g/volume.h
 lib/libntfs-3g.a
 lib/libntfs-3g.la
 lib/libntfs-3g.so
-lib/libntfs-3g.so.54
+lib/libntfs-3g.so.75
 libdata/pkgconfig/libntfs-3g.pc
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.FreeBSD