summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2006-01-26 21:43:51 +0000
committeradam <adam@pkgsrc.org>2006-01-26 21:43:51 +0000
commit848b9ae948e9964fdcd3a5c3690160e4a4544bd8 (patch)
tree49f5d41c87fb3f0d22a9b8d60cace95113dd7ddc
parente78b6c9a6cf5f294f47a47c05db474849ea6cf6c (diff)
downloadpkgsrc-848b9ae948e9964fdcd3a5c3690160e4a4544bd8.tar.gz
Changes 1.12.1:
- Fix hardcoded location for uninstalling mount.ntfs-fuse hardlink to match the relocatable location for installing it. - Move mount.ntfs-fuse and mkfs.ntfs to be symlinks instead of hardlinks and move both to /sbin rather than prefix/sbin. Note we still obey $destdir so building packages works as well as installing into alternate chroot / other system still works. - ntfscmp: fix some corner cases and all memory leaks; handle corrupt NTFS more gracefully. - If the system does not have realpath(), supply our own dummy version which just copies the string without any kind of checking or expansion.
-rw-r--r--sysutils/ntfsprogs/Makefile18
-rw-r--r--sysutils/ntfsprogs/PLIST10
-rw-r--r--sysutils/ntfsprogs/distinfo30
-rw-r--r--sysutils/ntfsprogs/patches/patch-aa6
-rw-r--r--sysutils/ntfsprogs/patches/patch-ab14
-rw-r--r--sysutils/ntfsprogs/patches/patch-ac16
-rw-r--r--sysutils/ntfsprogs/patches/patch-ad64
-rw-r--r--sysutils/ntfsprogs/patches/patch-ae30
-rw-r--r--sysutils/ntfsprogs/patches/patch-af55
-rw-r--r--sysutils/ntfsprogs/patches/patch-ag6
-rw-r--r--sysutils/ntfsprogs/patches/patch-ai12
-rw-r--r--sysutils/ntfsprogs/patches/patch-aj12
-rw-r--r--sysutils/ntfsprogs/patches/patch-ak12
-rw-r--r--sysutils/ntfsprogs/patches/patch-al16
14 files changed, 152 insertions, 149 deletions
diff --git a/sysutils/ntfsprogs/Makefile b/sysutils/ntfsprogs/Makefile
index e8ed4f86d21..a057e16725c 100644
--- a/sysutils/ntfsprogs/Makefile
+++ b/sysutils/ntfsprogs/Makefile
@@ -1,23 +1,21 @@
-# $NetBSD: Makefile,v 1.2 2004/10/09 10:29:12 kristerw Exp $
-#
+# $NetBSD: Makefile,v 1.3 2006/01/26 21:43:51 adam Exp $
-DISTNAME= ntfsprogs-1.9.4
+DISTNAME= ntfsprogs-1.12.1
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=linux-ntfs/}
MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://linux-ntfs.sourceforge.net/
-COMMENT= Linux-NTFS project utilities for the Windows NT Filesystem (ntfs)
+COMMENT= Linux-NTFS project utilities for the Windows NT Filesystem
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-USE_LANGUAGES= c c++
-
-CONFIGURE_ARGS+=--enable-debug
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-debug
# XXX support for this should be possibly integrated with other
# gnome pkgsrc and this could be a configurable option
-CONFIGURE_ARGS+=--disable-gnome-vfs
+CONFIGURE_ARGS+= --disable-gnome-vfs
GCC_REQD+= 2.96
diff --git a/sysutils/ntfsprogs/PLIST b/sysutils/ntfsprogs/PLIST
index 2198b827c7f..9f452e13723 100644
--- a/sysutils/ntfsprogs/PLIST
+++ b/sysutils/ntfsprogs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/01/26 21:43:51 adam Exp $
bin/ntfscat
bin/ntfscluster
bin/ntfsfix
@@ -8,6 +8,7 @@ include/ntfs/attrib.h
include/ntfs/attrlist.h
include/ntfs/bitmap.h
include/ntfs/bootsect.h
+include/ntfs/collate.h
include/ntfs/compat.h
include/ntfs/compress.h
include/ntfs/debug.h
@@ -17,6 +18,7 @@ include/ntfs/dir.h
include/ntfs/endians.h
include/ntfs/gnome-vfs-method.h
include/ntfs/gnome-vfs-module.h
+include/ntfs/index.h
include/ntfs/inode.h
include/ntfs/layout.h
include/ntfs/lcnalloc.h
@@ -24,27 +26,33 @@ include/ntfs/list.h
include/ntfs/logfile.h
include/ntfs/mft.h
include/ntfs/mst.h
+include/ntfs/ntfstime.h
include/ntfs/runlist.h
include/ntfs/security.h
include/ntfs/support.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/mkfs.ntfs.8
man/man8/mkntfs.8
man/man8/ntfscat.8
man/man8/ntfsclone.8
man/man8/ntfscluster.8
+man/man8/ntfscp.8
man/man8/ntfsfix.8
man/man8/ntfsinfo.8
man/man8/ntfslabel.8
man/man8/ntfsls.8
+man/man8/ntfsmount.8
man/man8/ntfsprogs.8
man/man8/ntfsresize.8
man/man8/ntfsundelete.8
sbin/mkntfs
sbin/ntfsclone
+sbin/ntfscp
sbin/ntfslabel
sbin/ntfsresize
sbin/ntfsundelete
diff --git a/sysutils/ntfsprogs/distinfo b/sysutils/ntfsprogs/distinfo
index 6fd78341924..ec4f63e472c 100644
--- a/sysutils/ntfsprogs/distinfo
+++ b/sysutils/ntfsprogs/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.5 2005/11/04 21:46:12 dbj Exp $
+$NetBSD: distinfo,v 1.6 2006/01/26 21:43:51 adam Exp $
-SHA1 (ntfsprogs-1.9.4.tar.gz) = 1250e161f2ee7182bf6e473d4589b5139e3fda8a
-RMD160 (ntfsprogs-1.9.4.tar.gz) = cdeeb8629d5c68a8af23d06adaf56bec62a282e6
-Size (ntfsprogs-1.9.4.tar.gz) = 701154 bytes
-SHA1 (patch-aa) = 1e63d62190b3d2ca78d96c9ba2398232c656a5dc
-SHA1 (patch-ab) = 6d571d962e702d776792c84a81bdaf8e7b8357e4
-SHA1 (patch-ac) = 3ebaa59a289c4085cfec2e27b7e94ce95ff9e74d
-SHA1 (patch-ad) = 576f8505b95965e0c49ec7e63516b49edd5f5679
-SHA1 (patch-ae) = a72389126cda4a7c4cfb46760afdf7e14c94ece3
-SHA1 (patch-af) = 119938eefd0f2f942ca160e8520a91dc2eb6dd13
-SHA1 (patch-ag) = 79883013e1ee78c7d8901601badbe9f1857dab65
+SHA1 (ntfsprogs-1.12.1.tar.gz) = 111e323234d395e57b8250e623ab40e1c2f22756
+RMD160 (ntfsprogs-1.12.1.tar.gz) = 4197df10e943d129b5324dbbcaac4fa9e1e19e5a
+Size (ntfsprogs-1.12.1.tar.gz) = 801124 bytes
+SHA1 (patch-aa) = f1c8899120e50082ecbcb150886fd3e0b5cf4ccb
+SHA1 (patch-ab) = 1ca19ac57b37db532ae3e55443eaa8fdd1fc9443
+SHA1 (patch-ac) = 82eefe0dfc6a92dcd422248d0798b21b548e84ae
+SHA1 (patch-ad) = b56115b7a536eade1a0e5e6404cc2166865fc02e
+SHA1 (patch-ae) = 58cd1998510bdfa99454fcccfa23c715e598d367
+SHA1 (patch-af) = c8cbc8a7a825fa98c3467f1de5d97e07447ddeb0
+SHA1 (patch-ag) = 4da5b589cc260bcbaabdbc695ce4716dbadded15
SHA1 (patch-ah) = b6da89fc9b5bbc83fa503dd887f3f2ec493ad7c7
-SHA1 (patch-ai) = aa2784d6c859d7cb1136808cd0750c45c026928a
-SHA1 (patch-aj) = d1e401cf378267d241b4842c02fba91ad6528fce
-SHA1 (patch-ak) = 9920e5c08242af2b09e46858be2fffedde7b7c7a
-SHA1 (patch-al) = 6d7ca94fba1972afcd4ebbee12a6ece057f2c45b
+SHA1 (patch-ai) = b6a018460eb4d6c49a32052caae360fae61a7d41
+SHA1 (patch-aj) = a607fa5dd4e0b7d0075089bf35306560e5a2fe05
+SHA1 (patch-ak) = e3c7c4fd68e804f896e529635774c426368cb396
+SHA1 (patch-al) = d6a5ef4f3daaf7d237bd95c4fde445784181b0f0
diff --git a/sysutils/ntfsprogs/patches/patch-aa b/sysutils/ntfsprogs/patches/patch-aa
index 7db0a6ef4cf..f2a06926b83 100644
--- a/sysutils/ntfsprogs/patches/patch-aa
+++ b/sysutils/ntfsprogs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/26 21:43:51 adam Exp $
---- include/ntfs/debug.h.orig Sat Sep 4 06:16:32 2004
+--- include/ntfs/debug.h.orig 2004-09-09 16:27:59.000000000 +0200
+++ include/ntfs/debug.h
-@@ -53,6 +53,8 @@ extern void __Dputs(const char *s);
+@@ -63,6 +63,8 @@ extern void __Dputs(const char *s);
extern void __Dperror(const char *s);
#define Dperror(s) __Dperror(s)
diff --git a/sysutils/ntfsprogs/patches/patch-ab b/sysutils/ntfsprogs/patches/patch-ab
index e7721c65682..5baa5f48850 100644
--- a/sysutils/ntfsprogs/patches/patch-ab
+++ b/sysutils/ntfsprogs/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+$NetBSD: patch-ab,v 1.2 2006/01/26 21:43:51 adam Exp $
---- include/ntfs/types.h.orig Sat Sep 4 06:16:32 2004
+--- include/ntfs/types.h.orig 2005-07-09 21:55:23.000000000 +0200
+++ include/ntfs/types.h
-@@ -59,6 +59,16 @@ typedef s64 LCN;
- */
- typedef s64 LSN;
+@@ -61,6 +61,16 @@ typedef sle64 leVCN;
+ typedef s64 LCN;
+ typedef sle64 leLCN;
+/* XXX For some reason, including sys/mount.h on osx defines TRUE and FALSE
+ * so clear them here.
@@ -17,5 +17,5 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+#endif
+
/*
- * Cygwin has a collusion between our BOOL and <windef.h>'s
- * As long as this file will be included after <windows.h> were fine.
+ * The NTFS journal $LogFile uses log sequence numbers which are signed 64-bit
+ * values. We define our own type LSN, to allow for type checking and better
diff --git a/sysutils/ntfsprogs/patches/patch-ac b/sysutils/ntfsprogs/patches/patch-ac
index cd1e187ec79..17a467fff77 100644
--- a/sysutils/ntfsprogs/patches/patch-ac
+++ b/sysutils/ntfsprogs/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+$NetBSD: patch-ac,v 1.2 2006/01/26 21:43:51 adam Exp $
---- libntfs/attrib.c.orig Sat Sep 4 06:16:32 2004
+--- libntfs/attrib.c.orig 2005-09-30 21:17:02.000000000 +0200
+++ libntfs/attrib.c
-@@ -709,7 +709,7 @@ map_rl:
+@@ -739,7 +739,7 @@ map_rl:
*/
s64 ntfs_attr_pread(ntfs_attr *na, const s64 pos, s64 count, void *b)
{
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
ntfs_volume *vol;
runlist_element *rl;
-@@ -737,6 +737,7 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
+@@ -767,6 +767,7 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
}
if (!count)
return 0;
@@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
/* Truncate reads beyond end of attribute. */
if (pos + count > na->data_size) {
if (pos >= na->data_size)
-@@ -818,7 +819,7 @@ res_err_out:
+@@ -858,7 +859,7 @@ res_err_out:
continue;
}
/* It is a real lcn, read it into @dst. */
@@ -27,9 +27,9 @@ $NetBSD: patch-ac,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+ to_read = min(origcount, (rl->length << vol->cluster_size_bits) -
ofs);
retry:
- Dprintf("%s(): Reading 0x%llx bytes from vcn 0x%llx, lcn 0x%llx, "
-@@ -826,6 +827,12 @@ retry:
- rl->vcn, rl->lcn, ofs);
+ Dprintf("%s(): Reading 0x%llx bytes from vcn 0x%llx, "
+@@ -866,6 +867,12 @@ retry:
+ to_read, rl->vcn, 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-ad b/sysutils/ntfsprogs/patches/patch-ad
index 1ecbc1e6abb..28da5dfeee8 100644
--- a/sysutils/ntfsprogs/patches/patch-ad
+++ b/sysutils/ntfsprogs/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+$NetBSD: patch-ad,v 1.2 2006/01/26 21:43:51 adam Exp $
---- libntfs/debug.c.orig Sat Sep 4 06:16:32 2004
+--- libntfs/debug.c.orig 2004-09-09 09:54:06.000000000 +0200
+++ libntfs/debug.c
@@ -25,18 +25,20 @@
#include "attrib.h"
@@ -27,7 +27,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
*
* It is more convenient to use Sprintf instead of the above code and perhaps
* more importantly, Sprintf makes it much easier to turn it into a "do
-@@ -48,41 +50,61 @@
+@@ -48,18 +50,22 @@ void __Sprintf(const int silent, const c
int eo;
va_list ap;
@@ -49,11 +49,49 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
-+
+/* Debug output to ntfs_err_out. To get it run ./configure --enable-debug. */
- void __Dprintf(const char *fmt, ...)
+ void __ntfs_error(const char *function, const char *fmt, ...)
{
+@@ -68,13 +74,16 @@ void __ntfs_error(const char *function,
+ va_list args;
+ char err_buf[1024];
+
++ if (!ntfs_err_out)
++ return;
+ if (function)
+ flen = strlen(function);
+ va_start(args, fmt);
+- vsnprintf(err_buf, sizeof(err_buf), fmt, args);
++ vsnprintf(ntfs_err_out, sizeof(err_buf), fmt, args);
+ va_end(args);
+- fprintf(stderr, "NTFS error: %s(): %s\n", flen ? function : "",
++ fprintf(ntfs_err_out, "NTFS error: %s(): %s\n", flen ? function : "",
+ err_buf);
++ fflush(ntfs_err_out);
+ errno = eo;
+ }
+
+@@ -86,13 +95,16 @@ void __ntfs_debug (const char *file, int
+ va_list args;
+ char err_buf[1024];
+
++ if (!ntfs_err_out)
++ return;
+ if (function)
+ flen = strlen(function);
+ va_start(args, fmt);
+- vsnprintf(err_buf, sizeof(err_buf), fmt, args);
++ vsnprintf(ntfs_err_out, sizeof(err_buf), fmt, args);
+ va_end(args);
+- fprintf(stderr, "NTFS DEBUG (%s, %d): %s(): %s\n", file, line,
++ fprintf(ntfs_err_out, "NTFS DEBUG (%s, %d): %s(): %s\n", file, line,
+ flen ? function : "", err_buf);
++ fflush(ntfs_err_out);
+ errno = eo;
+ }
+
+@@ -101,16 +113,23 @@ void __Dprintf(const char *fmt, ...)
int eo = errno;
va_list ap;
@@ -79,19 +117,3 @@ $NetBSD: patch-ad,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
errno = eo;
}
- void __Dperror(const char *s)
- {
- int eo = errno;
-- perror(s);
-+
-+ if (!ntfs_err_out)
-+ return;
-+ if (s && s[0]) {
-+ fprintf(ntfs_err_out, "%s: %s\n", s, strerror(eo));
-+ } else {
-+ fprintf(ntfs_err_out, "%s\n", strerror(eo));
-+ }
-+ fflush(ntfs_err_out);
- errno = eo;
- }
-
diff --git a/sysutils/ntfsprogs/patches/patch-ae b/sysutils/ntfsprogs/patches/patch-ae
index 0626e861ab2..bf9c3a67260 100644
--- a/sysutils/ntfsprogs/patches/patch-ae
+++ b/sysutils/ntfsprogs/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2005/03/15 20:24:30 rillig Exp $
+$NetBSD: patch-ae,v 1.3 2006/01/26 21:43:51 adam Exp $
---- libntfs/device.c.orig Sat Sep 4 12:16:32 2004
-+++ libntfs/device.c Sat Mar 12 10:14:34 2005
-@@ -37,6 +37,8 @@
+--- libntfs/device.c.orig 2005-09-28 15:46:04.000000000 +0200
++++ libntfs/device.c
+@@ -55,6 +55,8 @@
# include <linux/hdreg.h>
#endif
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.2 2005/03/15 20:24:30 rillig Exp $
#include "types.h"
#include "mst.h"
#include "debug.h"
-@@ -52,6 +54,10 @@
+@@ -70,6 +72,10 @@
#define HDIO_GETGEO 0x0301 /* Get device geometry. */
#endif
@@ -22,13 +22,10 @@ $NetBSD: patch-ae,v 1.2 2005/03/15 20:24:30 rillig Exp $
/**
* ntfs_device_alloc - allocate an ntfs device structure and pre-initialize it
* name: name of the device (must be present)
-@@ -498,6 +504,23 @@ s64 ntfs_device_size_get(struct ntfs_dev
- (unsigned long)this_floppy.size,
- (unsigned long)this_floppy.size);
- return (s64)this_floppy.size * 512 / block_size;
-+ }
-+ }
-+#endif
+@@ -519,6 +525,23 @@ s64 ntfs_device_size_get(struct ntfs_dev
+ }
+ }
+ #endif
+#ifdef DIOCGPART
+ {
+ struct stat st;
@@ -43,6 +40,9 @@ $NetBSD: patch-ae,v 1.2 2005/03/15 20:24:30 rillig Exp $
+ secsize, psize, psize);
+ return psize * secsize / block_size;
+ }
- }
- }
- #endif
++ }
++ }
++#endif
+ /*
+ * We couldn't figure it out by using a specialized ioctl,
+ * so do binary search to find the size of the device.
diff --git a/sysutils/ntfsprogs/patches/patch-af b/sysutils/ntfsprogs/patches/patch-af
index becf4803adf..39d593e07c2 100644
--- a/sysutils/ntfsprogs/patches/patch-af
+++ b/sysutils/ntfsprogs/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.3 2005/11/04 21:46:12 dbj Exp $
+$NetBSD: patch-af,v 1.4 2006/01/26 21:43:51 adam Exp $
---- ntfsprogs/ntfsclone.c.orig 2004-09-04 06:16:32.000000000 -0400
-+++ ntfsprogs/ntfsclone.c 2005-09-25 10:43:27.000000000 -0400
-@@ -30,6 +30,19 @@
- #include <errno.h>
+--- ntfsprogs/ntfsclone.c.orig 2005-10-07 15:58:47.000000000 +0200
++++ ntfsprogs/ntfsclone.c
+@@ -52,6 +52,19 @@
#include <getopt.h>
+ #endif
+#ifdef __NetBSD__
+# include <sys/param.h>
@@ -22,7 +22,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 21:46:12 dbj Exp $
#include "debug.h"
#include "types.h"
#include "support.h"
-@@ -66,7 +79,11 @@
+@@ -99,7 +112,11 @@ struct {
int restore_image;
char *output;
char *volume;
@@ -34,21 +34,19 @@ $NetBSD: patch-af,v 1.3 2005/11/04 21:46:12 dbj Exp $
} opt;
struct bitmap {
-@@ -338,16 +355,13 @@
- }
-
+@@ -387,15 +404,10 @@ static void parse_options(int argc, char
+
msg_out = stdout;
--
+
- /* FIXME: this is a workaround for loosing debug info if stdout != stderr
- and for the uncontrollable verbose messages in libntfs. Ughhh. */
- if (opt.std_out)
- msg_out = stderr;
+- if (opt.std_out)
+- msg_out = stderr;
- else if (opt.debug)
-- stderr = stdout;
+- stderr = stdout;
- else
- if (!(stderr = fopen("/dev/null", "rw")))
- perr_exit("Couldn't open /dev/null");
-+
+#ifdef DEBUG
+ if (!opt.debug)
+ ntfs_err_out = NULL;
@@ -56,7 +54,7 @@ $NetBSD: patch-af,v 1.3 2005/11/04 21:46:12 dbj Exp $
}
static void progress_init(struct progress_bar *p, u64 start, u64 stop, int res)
-@@ -462,7 +476,7 @@
+@@ -538,7 +550,7 @@ static void copy_cluster(int rescue, u64
if (write_all(&fd_out, buff, csize) == -1) {
int err = errno;
perr_printf("Write failed");
@@ -65,27 +63,12 @@ $NetBSD: patch-af,v 1.3 2005/11/04 21:46:12 dbj Exp $
Printf("Apparently you tried to clone to a remote "
"Windows computer but they don't\nhave "
"efficient sparse file handling by default. "
-@@ -1152,12 +1166,12 @@
- if (fstatfs(fd_out, &opt.stfs) == -1)
+@@ -1243,7 +1255,7 @@ static void set_filesize(s64 filesize)
Printf("WARNING: Couldn't get filesystem type: "
"%s\n", strerror(errno));
-- else if (opt.stfs.f_type == 0x52654973)
-+ else if (opt.stfs.F_TYPE == 0x52654973)
+ else
+- fs_type = opt.stfs.f_type;
++ fs_type = opt.stfs.F_TYPE;
+
+ if (fs_type == 0x52654973)
Printf("WARNING: You're using ReiserFS, it has very poor "
- "performance creating\nlarge sparse files. The next "
- "operation might take a very long time!\n"
- "Creating sparse output file ...\n");
-- else if (opt.stfs.f_type == 0x517b)
-+ else if (opt.stfs.F_TYPE == 0x517b)
- Printf("WARNING: You're using SMBFS and if the remote share "
- "isn't Samba but a Windows\ncomputer then the clone "
- "operation will be very inefficient and may fail!\n");
-@@ -1168,7 +1182,7 @@
- if (err == E2BIG) {
- Printf("Your system or the destination filesystem "
- "doesn't support large files.\n");
-- if (opt.stfs.f_type == 0x517b) {
-+ if (opt.stfs.F_TYPE == 0x517b) {
- Printf("SMBFS needs minimum Linux kernel "
- "version 2.4.25 and\n the 'lfs' option"
- "\nfor smbmount to have large "
diff --git a/sysutils/ntfsprogs/patches/patch-ag b/sysutils/ntfsprogs/patches/patch-ag
index b4352f6e1b6..48cef64dd77 100644
--- a/sysutils/ntfsprogs/patches/patch-ag
+++ b/sysutils/ntfsprogs/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $
+$NetBSD: patch-ag,v 1.2 2006/01/26 21:43:51 adam Exp $
---- ntfsprogs/ntfsresize.c.orig Sat Sep 4 06:16:32 2004
+--- ntfsprogs/ntfsresize.c.orig 2005-10-07 15:57:31.000000000 +0200
+++ ntfsprogs/ntfsresize.c
-@@ -483,12 +483,9 @@ static int parse_options(int argc, char
+@@ -527,12 +527,9 @@ static int parse_options(int argc, char
}
}
diff --git a/sysutils/ntfsprogs/patches/patch-ai b/sysutils/ntfsprogs/patches/patch-ai
index a03af3831a7..c5411661e3f 100644
--- a/sysutils/ntfsprogs/patches/patch-ai
+++ b/sysutils/ntfsprogs/patches/patch-ai
@@ -1,12 +1,10 @@
-$NetBSD: patch-ai,v 1.1 2005/03/15 20:24:30 rillig Exp $
+$NetBSD: patch-ai,v 1.2 2006/01/26 21:43:51 adam Exp $
-Needed for ENOTSUP on NetBSD-1.6.2.
-
---- libntfs/attrlist.c.orig Sat Sep 4 12:16:32 2004
-+++ libntfs/attrlist.c Sat Mar 12 10:14:41 2005
-@@ -24,6 +24,8 @@
-
+--- libntfs/attrlist.c.orig 2005-09-28 15:41:31.000000000 +0200
++++ libntfs/attrlist.c
+@@ -30,6 +30,8 @@
#include <errno.h>
+ #endif
+#include "compat.h"
+
diff --git a/sysutils/ntfsprogs/patches/patch-aj b/sysutils/ntfsprogs/patches/patch-aj
index 70509be5460..ec639e2de15 100644
--- a/sysutils/ntfsprogs/patches/patch-aj
+++ b/sysutils/ntfsprogs/patches/patch-aj
@@ -1,12 +1,10 @@
-$NetBSD: patch-aj,v 1.1 2005/03/15 20:24:30 rillig Exp $
+$NetBSD: patch-aj,v 1.2 2006/01/26 21:43:51 adam Exp $
-Needed for ENOTSUP on NetBSD-1.6.2.
-
---- libntfs/volume.c.orig Sat Sep 4 12:16:32 2004
-+++ libntfs/volume.c Sat Mar 12 10:15:07 2005
-@@ -30,6 +30,8 @@
- #include <sys/stat.h>
+--- libntfs/volume.c.orig 2005-10-10 14:47:06.000000000 +0200
++++ libntfs/volume.c
+@@ -47,6 +47,8 @@
#include <limits.h>
+ #endif
+#include "compat.h"
+
diff --git a/sysutils/ntfsprogs/patches/patch-ak b/sysutils/ntfsprogs/patches/patch-ak
index 4630bc99d9e..8e9872387b2 100644
--- a/sysutils/ntfsprogs/patches/patch-ak
+++ b/sysutils/ntfsprogs/patches/patch-ak
@@ -1,12 +1,10 @@
-$NetBSD: patch-ak,v 1.1 2005/03/15 20:24:30 rillig Exp $
+$NetBSD: patch-ak,v 1.2 2006/01/26 21:43:51 adam Exp $
-Needed for ENOTSUP on NetBSD-1.6.2.
-
---- libntfs/win32_io.c.orig Sat Sep 4 12:16:32 2004
-+++ libntfs/win32_io.c Sat Mar 12 10:15:23 2005
-@@ -32,6 +32,8 @@
- #include <errno.h>
+--- libntfs/win32_io.c.orig 2005-10-10 09:55:22.000000000 +0200
++++ libntfs/win32_io.c
+@@ -42,6 +42,8 @@
#include <fcntl.h>
+ #endif
+#include "compat.h"
+
diff --git a/sysutils/ntfsprogs/patches/patch-al b/sysutils/ntfsprogs/patches/patch-al
index 678c3e5604c..eae415ff896 100644
--- a/sysutils/ntfsprogs/patches/patch-al
+++ b/sysutils/ntfsprogs/patches/patch-al
@@ -1,15 +1,13 @@
-$NetBSD: patch-al,v 1.1 2005/03/15 20:24:30 rillig Exp $
+$NetBSD: patch-al,v 1.2 2006/01/26 21:43:51 adam Exp $
-Needed for ENOTSUP on NetBSD-1.6.2.
-
---- ntfsprogs/mkntfs.c.orig Sat Sep 4 12:16:32 2004
-+++ ntfsprogs/mkntfs.c Sat Mar 12 10:17:19 2005
-@@ -116,6 +116,8 @@
- # define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytse. */
+--- ntfsprogs/mkntfs.c.orig 2005-10-07 15:56:09.000000000 +0200
++++ ntfsprogs/mkntfs.c
+@@ -126,6 +126,8 @@
+ # define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytes. */
#endif
+#include "compat.h"
+
#include "types.h"
- #include "bootsect.h"
- #include "device.h"
+ #include "attrib.h"
+ #include "bitmap.h"