Changes 2015.3.14:

Changes to NTFS-3G:
-------------------
Fixed inserting a new ACL after wiping out by chkdsk
Fixed Windows-type inheritance
Fixed ignoring the umask mount option when permissions are used
Fixed checking permissions when Posix ACLs are compiled in but not enabled
Disabled option remove_hiberfile on read-only mounts
Implemented an extended attribute to get/set EAs
Avoid full runlist updating in more situations
Update ctime after setting an ACL
Use MFT record 15 for the first extent to MFT:DATA
Ignore the sloppy mount option (-s)
Implemented FITRIM (fstrim) ioctl
Reengineered the compression algorithm

Changes to ntfsprogs:
---------------------
Return success from ntfsprogs utilities with options –version and the like
Implemented configure option –enable-quarantined for non functional utilities
Added manuals for ntfsdecrypt, ntfswipe, ntfstruncate and ntfsfallocate

7 files changed, 88 insertions, 36 deletions

diff --git a/filesystems/libntfs/Makefile.common b/filesystems/libntfs/Makefile.common
index 46fc441eb88..3883dbe9f6b 100644
--- a/filesystems/libntfs/Makefile.common
+++ b/filesystems/libntfs/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1 2014/05/19 12:22:06 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2015/11/10 17:45:22 adam Exp $
 # used by filesystems/fuse-ntfs-3g/Makefile
 # used by sysutils/ntfsprogs/Makefile
 
-DISTNAME=	ntfs-3g_ntfsprogs-2014.2.15
+DISTNAME=	ntfs-3g_ntfsprogs-2015.3.14
 CATEGORIES=	sysutils
 MASTER_SITES=	http://tuxera.com/opensource/
 EXTRACT_SUFX=	.tgz
diff --git a/filesystems/libntfs/PLIST b/filesystems/libntfs/PLIST
index 5926f961c24..b48cb1b24db 100644
--- a/filesystems/libntfs/PLIST
+++ b/filesystems/libntfs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/19 12:22:06 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/11/10 17:45:22 adam Exp $
 include/ntfs-3g/acls.h
 include/ntfs-3g/attrib.h
 include/ntfs-3g/attrlist.h
@@ -12,10 +12,12 @@ include/ntfs-3g/debug.h
 include/ntfs-3g/device.h
 include/ntfs-3g/device_io.h
 include/ntfs-3g/dir.h
+include/ntfs-3g/ea.h
 include/ntfs-3g/efs.h
 include/ntfs-3g/endians.h
 include/ntfs-3g/index.h
 include/ntfs-3g/inode.h
+include/ntfs-3g/ioctl.h
 include/ntfs-3g/layout.h
 include/ntfs-3g/lcnalloc.h
 include/ntfs-3g/logfile.h
diff --git a/filesystems/libntfs/distinfo b/filesystems/libntfs/distinfo
index 28d0371a0ed..5f7ef3f9362 100644
--- a/filesystems/libntfs/distinfo
+++ b/filesystems/libntfs/distinfo
@@ -1,14 +1,16 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 00:15:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2015/11/10 17:45:22 adam Exp $
 
-SHA1 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = c9836f340b508f5d7776156e5afb02434d3f0174
-RMD160 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 32418b98e60a483173352eb22cc101ed82c92ebf
-SHA512 (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 7e4a5c9ac9d43dcf0d4b4085dea6703126fc4808cb9e1b7038884b20df2a8ab8f54c269d7204a279b62c5ba1127a966fd64226a8ed8f0c11667d9326c2f8fa7c
-Size (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 1143575 bytes
+SHA1 (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 0ebd9adffd5a6ddcfbacade6be8efe1eba4b1a08
+RMD160 (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 67cbb81ab619c0941fe23a73e9a187a73008d51e
+SHA512 (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 9744dee814e89a97050bc8beb76f1a7d8a585e7d7740e8041e393c6912c93e49803f9b41af84e8315b3162e58b19ca8d155d435395cb07ecaa7de9caaf2af441
+Size (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 1210069 bytes
 SHA1 (patch-Makefile.in) = 874ba5084b5eea312a24d7a6b339f83a3f7896d8
 SHA1 (patch-include_ntfs-3g_compat.h) = 78ea127359416c9106eef7025a2ccc84fd0b4447
-SHA1 (patch-include_ntfs-3g_types.h) = b6731cee8e1cd72dfe1ef485f4f997e8dfa6e928
+SHA1 (patch-include_ntfs-3g_types.h) = bb6414b8991e8a05f32fce88d4915448bc498d58
 SHA1 (patch-libntfs-3g_Makefile.in) = 50a318a1c9a0a68d42e5cac2557e781f8c728094
+SHA1 (patch-libntfs-3g_compat.c) = 5cecaa8f8d4fe463094592f11f4757a434e903dd
 SHA1 (patch-libntfs-3g_device.c) = 3ad49d69b03cdd500246f77d9f6e30ca3d2e2ec6
 SHA1 (patch-ntfsprogs_Makefile.in) = 9acd073006c54009cedeafc766c964e9b5f11468
 SHA1 (patch-ntfsprogs_ntfsclone.c) = 3306b501e94ce71a709f394516829a727aa743ad
-SHA1 (patch-src_Makefile.in) = 78d107a3ba0e9e0b39a4c5e4eaad2fd58bb9ade2
+SHA1 (patch-src_Makefile.in) = eaa83166f98d2a2c9b2116abab6fe315faf545ac
+SHA1 (patch-src_ntfs-3g.c) = 9ae108fec22dc2a4219cd4ae5077d9eea17ab700
diff --git a/filesystems/libntfs/patches/patch-include_ntfs-3g_types.h b/filesystems/libntfs/patches/patch-include_ntfs-3g_types.h
index 0dd5594dcd0..17f57071e0c 100644
--- a/filesystems/libntfs/patches/patch-include_ntfs-3g_types.h
+++ b/filesystems/libntfs/patches/patch-include_ntfs-3g_types.h
@@ -1,4 +1,6 @@
-$NetBSD: patch-include_ntfs-3g_types.h,v 1.1 2014/05/19 12:22:06 adam Exp $
+$NetBSD: patch-include_ntfs-3g_types.h,v 1.2 2015/11/10 17:45:22 adam Exp $
+
+Fix TRUE and FALSE definitions.
 
 --- include/ntfs-3g/types.h.orig	2013-01-13 06:46:35.000000000 +0000
 +++ include/ntfs-3g/types.h
diff --git a/filesystems/libntfs/patches/patch-libntfs-3g_compat.c b/filesystems/libntfs/patches/patch-libntfs-3g_compat.c
new file mode 100644
index 00000000000..c773b2e9745
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-libntfs-3g_compat.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-libntfs-3g_compat.c,v 1.1 2015/11/10 17:45:22 adam Exp $
+
+Add missing function for NetBSD.
+
+--- libntfs-3g/compat.c.orig	2015-11-10 14:27:56.000000000 +0000
++++ libntfs-3g/compat.c
+@@ -248,3 +248,12 @@ char *strsep(char **stringp, const char 
+  *************************************************************/
+ #endif /* HAVE_STRSEP */
+ 
++#if defined(__NetBSD__)
++#include <fuse.h>
++
++int fuse_version(void)
++{
++    return FUSE_VERSION;
++}
++
++#endif /* __NetBSD__ */
diff --git a/filesystems/libntfs/patches/patch-src_Makefile.in b/filesystems/libntfs/patches/patch-src_Makefile.in
index 948c8f8986f..94363c152f9 100644
--- a/filesystems/libntfs/patches/patch-src_Makefile.in
+++ b/filesystems/libntfs/patches/patch-src_Makefile.in
@@ -1,61 +1,71 @@
-$NetBSD: patch-src_Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
+$NetBSD: patch-src_Makefile.in,v 1.2 2015/11/10 17:45:22 adam Exp $
 
+Add ENABLE_LOWNTFS condition.
 Link against already built and installed libntfs.
 Install binaries into PREFIX, not the root directory.
 
---- src/Makefile.in.orig	2014-02-15 14:08:01.000000000 +0000
+--- src/Makefile.in.orig	2015-03-14 14:10:28.000000000 +0000
 +++ src/Makefile.in
-@@ -68,8 +68,7 @@ lowntfs_3g_OBJECTS = $(am_lowntfs_3g_OBJ
+@@ -84,7 +84,7 @@ target_triplet = @target@
+ @ENABLE_NTFS_3G_TRUE@	ntfs-3g.usermap$(EXEEXT) \
+ @ENABLE_NTFS_3G_TRUE@	ntfs-3g.secaudit$(EXEEXT)
+ @ENABLE_NTFS_3G_TRUE@rootbin_PROGRAMS = ntfs-3g$(EXEEXT) \
+-@ENABLE_NTFS_3G_TRUE@	lowntfs-3g$(EXEEXT)
++@ENABLE_LOWNTFS@@ENABLE_NTFS_3G_TRUE@	lowntfs-3g$(EXEEXT)
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ 	$(srcdir)/ntfs-3g.8.in $(srcdir)/ntfs-3g.probe.8.in \
+@@ -113,8 +113,7 @@ lowntfs_3g_OBJECTS = $(am_lowntfs_3g_OBJ
  am__DEPENDENCIES_1 =
  @FUSE_INTERNAL_FALSE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
  @FUSE_INTERNAL_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/libfuse-lite/libfuse-lite.la
 -@ENABLE_NTFS_3G_TRUE@lowntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 -@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
 +@ENABLE_NTFS_3G_TRUE@lowntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2)
- lowntfs_3g_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(lowntfs_3g_CFLAGS) \
- 	$(CFLAGS) $(lowntfs_3g_LDFLAGS) $(LDFLAGS) -o $@
-@@ -77,8 +76,7 @@ am__ntfs_3g_SOURCES_DIST = ntfs-3g.c ntf
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -126,8 +125,7 @@ am__ntfs_3g_SOURCES_DIST = ntfs-3g.c ntf
  @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_OBJECTS = ntfs_3g-ntfs-3g.$(OBJEXT) \
  @ENABLE_NTFS_3G_TRUE@	ntfs_3g-ntfs-3g_common.$(OBJEXT)
  ntfs_3g_OBJECTS = $(am_ntfs_3g_OBJECTS)
 -@ENABLE_NTFS_3G_TRUE@ntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2) \
 -@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
 +@ENABLE_NTFS_3G_TRUE@ntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2)
- ntfs_3g_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(ntfs_3g_CFLAGS) $(CFLAGS) \
- 	$(ntfs_3g_LDFLAGS) $(LDFLAGS) -o $@
-@@ -86,8 +84,7 @@ am__ntfs_3g_probe_SOURCES_DIST = ntfs-3g
+ ntfs_3g_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_CFLAGS) \
+ 	$(CFLAGS) $(ntfs_3g_LDFLAGS) $(LDFLAGS) -o $@
+@@ -135,8 +133,7 @@ am__ntfs_3g_probe_SOURCES_DIST = ntfs-3g
  @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_probe_OBJECTS =  \
  @ENABLE_NTFS_3G_TRUE@	ntfs_3g_probe-ntfs-3g.probe.$(OBJEXT)
  ntfs_3g_probe_OBJECTS = $(am_ntfs_3g_probe_OBJECTS)
 -@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_DEPENDENCIES =  \
 -@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
 +@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_DEPENDENCIES =
- ntfs_3g_probe_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ ntfs_3g_probe_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
  	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_probe_CFLAGS) \
  	$(CFLAGS) $(ntfs_3g_probe_LDFLAGS) $(LDFLAGS) -o $@
-@@ -95,8 +92,7 @@ am__ntfs_3g_secaudit_SOURCES_DIST = seca
+@@ -144,8 +141,7 @@ am__ntfs_3g_secaudit_SOURCES_DIST = seca
  @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_secaudit_OBJECTS =  \
  @ENABLE_NTFS_3G_TRUE@	ntfs_3g_secaudit-secaudit.$(OBJEXT)
  ntfs_3g_secaudit_OBJECTS = $(am_ntfs_3g_secaudit_OBJECTS)
 -@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_DEPENDENCIES =  \
 -@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
 +@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_DEPENDENCIES =
- ntfs_3g_secaudit_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_secaudit_CFLAGS) \
- 	$(CFLAGS) $(ntfs_3g_secaudit_LDFLAGS) $(LDFLAGS) -o $@
-@@ -104,8 +100,7 @@ am__ntfs_3g_usermap_SOURCES_DIST = userm
+ ntfs_3g_secaudit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(ntfs_3g_secaudit_CFLAGS) $(CFLAGS) \
+@@ -154,8 +150,7 @@ am__ntfs_3g_usermap_SOURCES_DIST = userm
  @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_usermap_OBJECTS =  \
  @ENABLE_NTFS_3G_TRUE@	ntfs_3g_usermap-usermap.$(OBJEXT)
  ntfs_3g_usermap_OBJECTS = $(am_ntfs_3g_usermap_OBJECTS)
 -@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_DEPENDENCIES =  \
 -@ENABLE_NTFS_3G_TRUE@	$(top_builddir)/libntfs-3g/libntfs-3g.la
 +@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_DEPENDENCIES =
- ntfs_3g_usermap_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_usermap_CFLAGS) \
- 	$(CFLAGS) $(ntfs_3g_usermap_LDFLAGS) $(LDFLAGS) -o $@
-@@ -287,9 +282,9 @@ pkgconfigdir = @pkgconfigdir@
+ ntfs_3g_usermap_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(ntfs_3g_usermap_CFLAGS) $(CFLAGS) $(ntfs_3g_usermap_LDFLAGS) \
+@@ -390,9 +385,9 @@ pkgconfigdir = @pkgconfigdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
  psdir = @psdir@
@@ -68,7 +78,7 @@ Install binaries into PREFIX, not the root directory.
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
  srcdir = @srcdir@
-@@ -313,7 +308,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+@@ -416,7 +411,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
  @ENABLE_NTFS_3G_TRUE@		ntfs-3g.usermap.8 \
  @ENABLE_NTFS_3G_TRUE@		ntfs-3g.secaudit.8
  
@@ -77,7 +87,7 @@ Install binaries into PREFIX, not the root directory.
  @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_LDFLAGS = $(AM_LDFLAGS) -all-static
  @ENABLE_NTFS_3G_TRUE@ntfs_3g_CFLAGS = \
  @ENABLE_NTFS_3G_TRUE@	$(AM_CFLAGS) 			\
-@@ -322,7 +317,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+@@ -425,7 +420,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
  @ENABLE_NTFS_3G_TRUE@	-I$(top_srcdir)/include/ntfs-3g
  
  @ENABLE_NTFS_3G_TRUE@ntfs_3g_SOURCES = ntfs-3g.c ntfs-3g_common.c
@@ -86,7 +96,7 @@ Install binaries into PREFIX, not the root directory.
  @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@lowntfs_3g_LDFLAGS = $(AM_LDFLAGS) -all-static
  @ENABLE_NTFS_3G_TRUE@lowntfs_3g_CFLAGS = \
  @ENABLE_NTFS_3G_TRUE@	$(AM_CFLAGS) 			\
-@@ -331,9 +326,9 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+@@ -434,9 +429,9 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
  @ENABLE_NTFS_3G_TRUE@	-I$(top_srcdir)/include/ntfs-3g
  
  @ENABLE_NTFS_3G_TRUE@lowntfs_3g_SOURCES = lowntfs-3g.c ntfs-3g_common.c
@@ -99,7 +109,7 @@ Install binaries into PREFIX, not the root directory.
  @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_probe_LDFLAGS = $(AM_LDFLAGS) -all-static
  @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_usermap_LDFLAGS = $(AM_LDFLAGS) -all-static
  @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_secaudit_LDFLAGS = $(AM_LDFLAGS) -all-static
-@@ -921,9 +916,9 @@ uninstall-man: uninstall-man8
+@@ -1040,9 +1035,9 @@ uninstall-man: uninstall-man8
  @ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@	$(LDCONFIG)
  
  @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-exec-local:	install-rootbinPROGRAMS
diff --git a/filesystems/libntfs/patches/patch-src_ntfs-3g.c b/filesystems/libntfs/patches/patch-src_ntfs-3g.c
new file mode 100644
index 00000000000..88e6669af94
--- /dev/null
+++ b/filesystems/libntfs/patches/patch-src_ntfs-3g.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_ntfs-3g.c,v 1.1 2015/11/10 17:45:22 adam Exp $
+
+NetBSD is missing some functions, so omit them.
+
+--- src/ntfs-3g.c.orig	2015-11-10 16:54:17.000000000 +0000
++++ src/ntfs-3g.c
+@@ -3706,8 +3706,10 @@ static struct fuse *mount_fuse(char *par
+ 	if (!fh)
+ 		goto err;
+ 	
++#if !defined(__NetBSD__)
+ 	if (fuse_set_signal_handlers(fuse_get_session(fh)))
+ 		goto err_destory;
++#endif
+ out:
+ 	fuse_opt_free_args(&args);
+ 	return fh;