Changes 2.0.0:

* ntfsmount (and libntfs) now has full basic read/write support.
* Cryptographic code is now integrated into libntfs, thus ntfscat and ntfsmount
  now can read encrypted files.  See "man 8 libntfs" for details.
* ntfsresize (and the entirety of ntfsprogs/libntfs in fact) now have full
  support for Windows Vista.
* ntfsprogs and libntfs are now entirely endian safe and more over now we have
  checks that automatically reports endian errors.
* mkntfs now creates a DCE compliant GUID for the volume and does a few other
  things to be more compliant with Windows Vista.

9 files changed, 52 insertions, 59 deletions

diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index b7de64f2b67..2222d628e8d 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2006/07/20 08:22:02 adam Exp $
+# $NetBSD: Makefile,v 1.7 2008/03/08 08:56:47 adam Exp $
 
-DISTNAME=	ntfsprogs-1.13.1
+DISTNAME=	ntfsprogs-2.0.0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=linux-ntfs/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.linux-ntfs.org/
diff --git a/sysutils/ntfsprogs/PLIST b/sysutils/ntfsprogs/PLIST
index 85b66520609..ffac5dd4807 100644
--- a/sysutils/ntfsprogs/PLIST
+++ b/sysutils/ntfsprogs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/07/20 08:22:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/03/08 08:56:47 adam Exp $
 bin/ntfscat
 bin/ntfscluster
 bin/ntfscmp
@@ -12,6 +12,7 @@ include/ntfs/bootsect.h
 include/ntfs/collate.h
 include/ntfs/compat.h
 include/ntfs/compress.h
+include/ntfs/crypto.h
 include/ntfs/debug.h
 include/ntfs/device.h
 include/ntfs/device_io.h
@@ -29,17 +30,16 @@ include/ntfs/logging.h
 include/ntfs/mft.h
 include/ntfs/mst.h
 include/ntfs/ntfstime.h
-include/ntfs/rich.h
 include/ntfs/runlist.h
 include/ntfs/security.h
 include/ntfs/support.h
-include/ntfs/tree.h
 include/ntfs/types.h
 include/ntfs/unistr.h
 include/ntfs/version.h
 include/ntfs/volume.h
 lib/libntfs.la
 man/man8/libntfs-gnomevfs.8
+man/man8/libntfs.8
 man/man8/mkfs.ntfs.8
 man/man8/mkntfs.8
 man/man8/ntfscat.8
diff --git a/sysutils/ntfsprogs/distinfo b/sysutils/ntfsprogs/distinfo
index f4b9ac0adf6..adcf15ebc2e 100644
--- a/sysutils/ntfsprogs/distinfo
+++ b/sysutils/ntfsprogs/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2006/10/05 02:52:16 rillig Exp $
+$NetBSD: distinfo,v 1.12 2008/03/08 08:56:47 adam Exp $
 
-SHA1 (ntfsprogs-1.13.1.tar.gz) = a4e50f6fc10fcc1e1f562ad64bcbf9a0d46ca72a
-RMD160 (ntfsprogs-1.13.1.tar.gz) = 4fea1dd03f7c4d2b7cfb05ca101aee902e1ed9d2
-Size (ntfsprogs-1.13.1.tar.gz) = 870260 bytes
-SHA1 (patch-ab) = cde641aad8d76e2b7abe14b9634c5d23c459f4a6
-SHA1 (patch-ac) = e8205fc7e2e3acc18c1289a2d99800507779b89e
-SHA1 (patch-ae) = 7c3f009489a97673e2f1c7667b7650d1da70cd52
-SHA1 (patch-af) = 582bee0039ca88906dd1883f1cf3c5dc2a7da1d7
+SHA1 (ntfsprogs-2.0.0.tar.bz2) = 75393dec021e73a922fe1fd034636de5a45f79a8
+RMD160 (ntfsprogs-2.0.0.tar.bz2) = aaef354ed7dab572c81f0eece89dd5994babfa8d
+Size (ntfsprogs-2.0.0.tar.bz2) = 678114 bytes
+SHA1 (patch-ab) = 2f277b21885c75c5ba63e9fcf37faca3bb0451dd
+SHA1 (patch-ac) = 94cf3266fb5109c8f6fd874e00c35b2ac642a9f1
+SHA1 (patch-ae) = 224e81c0ba3f530f52bbf646c1c66299b0519b3d
+SHA1 (patch-af) = e89fb98fb9b365a7f24f7c9bcafb655594523622
 SHA1 (patch-ah) = b6da89fc9b5bbc83fa503dd887f3f2ec493ad7c7
-SHA1 (patch-am) = a4382e075c046f3acdeecd12dcfbf99da43771d9
-SHA1 (patch-an) = 1d22f2d1aa7006c78cbbe56d500cd4a9bc1eb6c8
+SHA1 (patch-am) = 8dfca2bb615662a18230e6816729808733e1c2d4
+SHA1 (patch-an) = 894d4a11a8c7824120f78b329af4047b779f910b
diff --git a/sysutils/ntfsprogs/patches/patch-ab b/sysutils/ntfsprogs/patches/patch-ab
index 6c0eb1a6b5c..8ce017974e9 100644
--- a/sysutils/ntfsprogs/patches/patch-ab
+++ b/sysutils/ntfsprogs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2006/03/03 10:15:46 adam Exp $
+$NetBSD: patch-ab,v 1.4 2008/03/08 08:56:47 adam Exp $
 
---- include/ntfs/types.h.orig	2006-02-22 15:15:54.000000000 +0100
+--- include/ntfs/types.h.orig	2007-09-26 20:28:40.000000000 +0200
 +++ include/ntfs/types.h
-@@ -68,6 +68,16 @@ typedef sle64 leVCN;
+@@ -86,6 +86,16 @@ typedef sle64 leVCN;
  typedef s64 LCN;
  typedef sle64 leLCN;
  
diff --git a/sysutils/ntfsprogs/patches/patch-ac b/sysutils/ntfsprogs/patches/patch-ac
index f52fe2e66e7..4c6b48c5795 100644
--- a/sysutils/ntfsprogs/patches/patch-ac
+++ b/sysutils/ntfsprogs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2006/03/03 10:15:46 adam Exp $
+$NetBSD: patch-ac,v 1.4 2008/03/08 08:56:47 adam Exp $
 
---- libntfs/attrib.c.orig	2006-02-24 10:17:49.000000000 +0100
+--- libntfs/attrib.c.orig	2007-09-26 20:28:34.000000000 +0200
 +++ libntfs/attrib.c
-@@ -763,7 +763,7 @@ map_rl:
+@@ -865,7 +865,7 @@ map_rl:
   */
  s64 ntfs_attr_pread(ntfs_attr *na, const s64 pos, s64 count, void *b)
  {
@@ -11,15 +11,15 @@ $NetBSD: patch-ac,v 1.3 2006/03/03 10:15:46 adam Exp $
  	ntfs_volume *vol;
  	runlist_element *rl;
  
-@@ -795,6 +795,7 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
- 		ntfs_inode_update_atime(na->ni);
+@@ -892,6 +892,7 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
+ 	vol = na->ni->vol;
  	if (!count)
  		return 0;
 +	origcount = count;
  	/* Truncate reads beyond end of attribute. */
  	if (pos + count > na->data_size) {
  		if (pos >= na->data_size)
-@@ -885,13 +886,19 @@ res_err_out:
+@@ -982,7 +983,7 @@ res_err_out:
  			continue;
  		}
  		/* It is a real lcn, read it into @dst. */
@@ -27,8 +27,9 @@ $NetBSD: patch-ac,v 1.3 2006/03/03 10:15:46 adam Exp $
 +		to_read = min(origcount, (rl->length << vol->cluster_size_bits) -
  				ofs);
  retry:
- 		ntfs_log_trace("Reading 0x%llx bytes from vcn 0x%llx, lcn 0x%llx, "
- 				"ofs 0x%llx.\n", to_read, rl->vcn, rl->lcn, ofs);
+ 		ntfs_log_trace("Reading 0x%llx bytes from vcn 0x%llx, "
+@@ -990,6 +991,12 @@ retry:
+ 				rl->lcn, ofs);
  		br = ntfs_pread(vol->dev, (rl->lcn << vol->cluster_size_bits) +
  				ofs, to_read, b);
 +		/* Zero any overage that we may have read */
diff --git a/sysutils/ntfsprogs/patches/patch-ae b/sysutils/ntfsprogs/patches/patch-ae
index 5537b235edb..4ea32e75283 100644
--- a/sysutils/ntfsprogs/patches/patch-ae
+++ b/sysutils/ntfsprogs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2006/03/03 10:15:46 adam Exp $
+$NetBSD: patch-ae,v 1.5 2008/03/08 08:56:47 adam Exp $
 
---- libntfs/device.c.orig	2006-02-24 16:48:40.000000000 +0100
+--- libntfs/device.c.orig	2007-09-26 20:28:34.000000000 +0200
 +++ libntfs/device.c
-@@ -85,6 +87,10 @@
+@@ -85,6 +85,10 @@
  #	define BLKBSZSET _IOW(0x12,113,size_t) /* Set device block size in bytes. */
  #endif
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.4 2006/03/03 10:15:46 adam Exp $
  /**
   * ntfs_device_alloc - allocate an ntfs device structure and pre-initialize it
   * @name:	name of the device (must be present)
-@@ -531,6 +537,23 @@ s64 ntfs_device_size_get(struct ntfs_dev
+@@ -599,6 +603,23 @@ s64 ntfs_device_size_get(struct ntfs_dev
  		}
  	}
  #endif
diff --git a/sysutils/ntfsprogs/patches/patch-af b/sysutils/ntfsprogs/patches/patch-af
index c97faa91b92..cffdb2c69fd 100644
--- a/sysutils/ntfsprogs/patches/patch-af
+++ b/sysutils/ntfsprogs/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.6 2006/07/20 08:22:02 adam Exp $
+$NetBSD: patch-af,v 1.7 2008/03/08 08:56:47 adam Exp $
 
---- ntfsprogs/ntfsclone.c.orig	2006-06-21 09:59:19.000000000 +0200
+--- ntfsprogs/ntfsclone.c.orig	2007-09-19 18:51:09.000000000 +0200
 +++ ntfsprogs/ntfsclone.c
-@@ -55,6 +55,19 @@
- #include <getopt.h>
- #endif
+@@ -61,6 +61,19 @@
+  */
+ #define NTFS_DO_NOT_CHECK_ENDIANS
  
 +#ifdef __NetBSD__
 +#  include <sys/param.h>
@@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.6 2006/07/20 08:22:02 adam Exp $
  #include "debug.h"
  #include "types.h"
  #include "support.h"
-@@ -110,7 +123,11 @@ struct {
+@@ -116,7 +129,11 @@ static struct {
  	int restore_image;
  	char *output;
  	char *volume;
@@ -34,7 +34,7 @@ $NetBSD: patch-af,v 1.6 2006/07/20 08:22:02 adam Exp $
  } opt;
  
  struct bitmap {
-@@ -561,7 +578,7 @@ static void copy_cluster(int rescue, u64
+@@ -590,7 +607,7 @@ static void copy_cluster(int rescue, u64
  	if (write_all(&fd_out, buff, csize) == -1) {
  		int err = errno;
  		perr_printf("Write failed");
@@ -43,7 +43,7 @@ $NetBSD: patch-af,v 1.6 2006/07/20 08:22:02 adam Exp $
  			Printf("Apparently you tried to clone to a remote "
  			       "Windows computer but they don't\nhave "
  			       "efficient sparse file handling by default. "
-@@ -1426,7 +1443,7 @@ static void set_filesize(s64 filesize)
+@@ -1492,7 +1509,7 @@ static void set_filesize(s64 filesize)
  		Printf("WARNING: Couldn't get filesystem type: "
  		       "%s\n", strerror(errno));
  	else
diff --git a/sysutils/ntfsprogs/patches/patch-am b/sysutils/ntfsprogs/patches/patch-am
index 52047aa6e33..cce2a305dcc 100644
--- a/sysutils/ntfsprogs/patches/patch-am
+++ b/sysutils/ntfsprogs/patches/patch-am
@@ -1,12 +1,12 @@
-$NetBSD: patch-am,v 1.3 2006/07/20 08:22:02 adam Exp $
+$NetBSD: patch-am,v 1.4 2008/03/08 08:56:47 adam Exp $
 
---- ntfsprogs/Makefile.in.orig	2006-06-21 10:41:46.000000000 +0200
+--- ntfsprogs/Makefile.in.orig	2007-09-29 00:12:39.000000000 +0200
 +++ ntfsprogs/Makefile.in
-@@ -851,7 +851,6 @@ install-data-am: install-man
+@@ -999,7 +999,6 @@ install-dvi: install-dvi-am
  
  install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
  	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
  
- install-info: install-info-am
+ install-html: install-html-am
  
diff --git a/sysutils/ntfsprogs/patches/patch-an b/sysutils/ntfsprogs/patches/patch-an
index 4960b3e0936..b27b1967a66 100644
--- a/sysutils/ntfsprogs/patches/patch-an
+++ b/sysutils/ntfsprogs/patches/patch-an
@@ -1,22 +1,13 @@
-$NetBSD: patch-an,v 1.1 2006/10/05 02:52:16 rillig Exp $
+$NetBSD: patch-an,v 1.2 2008/03/08 08:56:47 adam Exp $
 
---- configure.orig	2006-10-05 04:38:23.000000000 +0200
-+++ configure	2006-10-05 04:51:08.000000000 +0200
-@@ -2217,7 +2217,7 @@ fi;
- # Check whether --enable-default-device-io-ops or --disable-default-device-io-ops was given.
+--- configure.orig	2007-09-29 00:12:33.000000000 +0200
++++ configure
+@@ -2775,7 +2775,7 @@ fi
+ 
+ # Check whether --enable-default-device-io-ops was given.
  if test "${enable_default_device_io_ops+set}" = set; then
-   enableval="$enable_default_device_io_ops"
--  if test "$enable_default_device_io_ops" == "no"; then
-+  if test "$enable_default_device_io_ops" = "no"; then
+-  enableval=$enable_default_device_io_ops; if test "$enable_default_device_io_ops" == "no"; then
++  enableval=$enable_default_device_io_ops; if test "$enable_default_device_io_ops" = "no"; then
  		cat >>confdefs.h <<\_ACEOF
  #define NO_NTFS_DEVICE_DEFAULT_IO_OPS 1
  _ACEOF
-@@ -2307,7 +2307,7 @@ fi
- # Check whether --enable-debug-logging or --disable-debug-logging was given.
- if test "${enable_debug_logging+set}" = set; then
-   enableval="$enable_debug_logging"
--  if test "$enable_debug_logging" == "no"; then
-+  if test "$enable_debug_logging" = "no"; then
- 		cat >>confdefs.h <<\_ACEOF
- #define NTFS_DISABLE_DEBUG_LOGGING 1
- _ACEOF