pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/ntfsprogs Changes 1.13.0:
details: https://anonhg.NetBSD.org/pkgsrc/rev/790b48c71bc7
branches: trunk
changeset: 509108:790b48c71bc7
user: adam <adam%pkgsrc.org@localhost>
date: Fri Mar 03 10:15:46 2006 +0000
description:
Changes 1.13.0:
* mkntfs now creates NTFS 3.1 (Windows XP) volumes by default
* ntfsmount can deal with symbolic links and device files
* bug fixes and improvements
diffstat:
sysutils/ntfsprogs/Makefile | 7 +-
sysutils/ntfsprogs/PLIST | 5 +-
sysutils/ntfsprogs/distinfo | 25 ++----
sysutils/ntfsprogs/patches/patch-aa | 13 ---
sysutils/ntfsprogs/patches/patch-ab | 6 +-
sysutils/ntfsprogs/patches/patch-ac | 17 ++--
sysutils/ntfsprogs/patches/patch-ad | 119 ------------------------------------
sysutils/ntfsprogs/patches/patch-ae | 23 ++----
sysutils/ntfsprogs/patches/patch-af | 36 ++--------
sysutils/ntfsprogs/patches/patch-ag | 18 -----
sysutils/ntfsprogs/patches/patch-ai | 13 ---
sysutils/ntfsprogs/patches/patch-aj | 13 ---
sysutils/ntfsprogs/patches/patch-ak | 13 ---
sysutils/ntfsprogs/patches/patch-al | 13 ---
sysutils/ntfsprogs/patches/patch-am | 6 +-
15 files changed, 45 insertions(+), 282 deletions(-)
diffs (truncated from 501 to 300 lines):
diff -r 552cb5de3ed6 -r 790b48c71bc7 sysutils/ntfsprogs/Makefile
--- a/sysutils/ntfsprogs/Makefile Fri Mar 03 07:24:46 2006 +0000
+++ b/sysutils/ntfsprogs/Makefile Fri Mar 03 10:15:46 2006 +0000
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.3 2006/01/26 21:43:51 adam Exp $
+# $NetBSD: Makefile,v 1.4 2006/03/03 10:15:46 adam Exp $
-DISTNAME= ntfsprogs-1.12.1
+DISTNAME= ntfsprogs-1.13.0
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=linux-ntfs/}
MAINTAINER= tech-pkg%NetBSD.org@localhost
-HOMEPAGE= http://linux-ntfs.sourceforge.net/
+HOMEPAGE= http://www.linux-ntfs.org/
COMMENT= Linux-NTFS project utilities for the Windows NT Filesystem
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
diff -r 552cb5de3ed6 -r 790b48c71bc7 sysutils/ntfsprogs/PLIST
--- a/sysutils/ntfsprogs/PLIST Fri Mar 03 07:24:46 2006 +0000
+++ b/sysutils/ntfsprogs/PLIST Fri Mar 03 10:15:46 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/26 21:43:51 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/03 10:15:46 adam Exp $
bin/ntfscat
bin/ntfscluster
bin/ntfsfix
@@ -24,12 +24,15 @@
include/ntfs/lcnalloc.h
include/ntfs/list.h
include/ntfs/logfile.h
+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
diff -r 552cb5de3ed6 -r 790b48c71bc7 sysutils/ntfsprogs/distinfo
--- a/sysutils/ntfsprogs/distinfo Fri Mar 03 07:24:46 2006 +0000
+++ b/sysutils/ntfsprogs/distinfo Fri Mar 03 10:15:46 2006 +0000
@@ -1,18 +1,11 @@
-$NetBSD: distinfo,v 1.7 2006/02/20 23:10:05 wiz Exp $
+$NetBSD: distinfo,v 1.8 2006/03/03 10:15:46 adam Exp $
-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 (ntfsprogs-1.13.0.tar.gz) = 14dc4c6e47974d1c9d9cd2175557e30819054b41
+RMD160 (ntfsprogs-1.13.0.tar.gz) = 17f1f185f68ce77c538058dfb05fbfb56985f3eb
+Size (ntfsprogs-1.13.0.tar.gz) = 860532 bytes
+SHA1 (patch-ab) = cde641aad8d76e2b7abe14b9634c5d23c459f4a6
+SHA1 (patch-ac) = e8205fc7e2e3acc18c1289a2d99800507779b89e
+SHA1 (patch-ae) = 7c3f009489a97673e2f1c7667b7650d1da70cd52
+SHA1 (patch-af) = b3ea3caaf4b9eaef9f8906508d7aad1f7e470660
SHA1 (patch-ah) = b6da89fc9b5bbc83fa503dd887f3f2ec493ad7c7
-SHA1 (patch-ai) = b6a018460eb4d6c49a32052caae360fae61a7d41
-SHA1 (patch-aj) = a607fa5dd4e0b7d0075089bf35306560e5a2fe05
-SHA1 (patch-ak) = e3c7c4fd68e804f896e529635774c426368cb396
-SHA1 (patch-al) = d6a5ef4f3daaf7d237bd95c4fde445784181b0f0
-SHA1 (patch-am) = eec72f1264edcf58c924e436d5c0043c3009be9c
+SHA1 (patch-am) = 937c0c34c8b11b6953c12f5012c0d6ea0b946ec6
diff -r 552cb5de3ed6 -r 790b48c71bc7 sysutils/ntfsprogs/patches/patch-aa
--- a/sysutils/ntfsprogs/patches/patch-aa Fri Mar 03 07:24:46 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2006/01/26 21:43:51 adam Exp $
-
---- include/ntfs/debug.h.orig 2004-09-09 16:27:59.000000000 +0200
-+++ include/ntfs/debug.h
-@@ -63,6 +63,8 @@ extern void __Dputs(const char *s);
- extern void __Dperror(const char *s);
- #define Dperror(s) __Dperror(s)
-
-+extern FILE *ntfs_err_out;
-+
- extern void ntfs_debug_runlist_dump(const struct _runlist_element *rl);
-
- #else /* if !DEBUG */
diff -r 552cb5de3ed6 -r 790b48c71bc7 sysutils/ntfsprogs/patches/patch-ab
--- a/sysutils/ntfsprogs/patches/patch-ab Fri Mar 03 07:24:46 2006 +0000
+++ b/sysutils/ntfsprogs/patches/patch-ab Fri Mar 03 10:15:46 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2006/01/26 21:43:51 adam Exp $
+$NetBSD: patch-ab,v 1.3 2006/03/03 10:15:46 adam Exp $
---- include/ntfs/types.h.orig 2005-07-09 21:55:23.000000000 +0200
+--- include/ntfs/types.h.orig 2006-02-22 15:15:54.000000000 +0100
+++ include/ntfs/types.h
-@@ -61,6 +61,16 @@ typedef sle64 leVCN;
+@@ -68,6 +68,16 @@ typedef sle64 leVCN;
typedef s64 LCN;
typedef sle64 leLCN;
diff -r 552cb5de3ed6 -r 790b48c71bc7 sysutils/ntfsprogs/patches/patch-ac
--- a/sysutils/ntfsprogs/patches/patch-ac Fri Mar 03 07:24:46 2006 +0000
+++ b/sysutils/ntfsprogs/patches/patch-ac Fri Mar 03 10:15:46 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2006/01/26 21:43:51 adam Exp $
+$NetBSD: patch-ac,v 1.3 2006/03/03 10:15:46 adam Exp $
---- libntfs/attrib.c.orig 2005-09-30 21:17:02.000000000 +0200
+--- libntfs/attrib.c.orig 2006-02-24 10:17:49.000000000 +0100
+++ libntfs/attrib.c
-@@ -739,7 +739,7 @@ map_rl:
+@@ -763,7 +763,7 @@ map_rl:
*/
s64 ntfs_attr_pread(ntfs_attr *na, const s64 pos, s64 count, void *b)
{
@@ -11,15 +11,15 @@
ntfs_volume *vol;
runlist_element *rl;
-@@ -767,6 +767,7 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
- }
+@@ -795,6 +795,7 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
+ ntfs_inode_update_atime(na->ni);
if (!count)
return 0;
+ origcount = count;
/* Truncate reads beyond end of attribute. */
if (pos + count > na->data_size) {
if (pos >= na->data_size)
-@@ -858,7 +859,7 @@ res_err_out:
+@@ -885,13 +886,19 @@ res_err_out:
continue;
}
/* It is a real lcn, read it into @dst. */
@@ -27,9 +27,8 @@
+ to_read = min(origcount, (rl->length << vol->cluster_size_bits) -
ofs);
retry:
- Dprintf("%s(): Reading 0x%llx bytes from vcn 0x%llx, "
-@@ -866,6 +867,12 @@ retry:
- to_read, rl->vcn, rl->lcn, ofs);
+ 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);
br = ntfs_pread(vol->dev, (rl->lcn << vol->cluster_size_bits) +
ofs, to_read, b);
+ /* Zero any overage that we may have read */
diff -r 552cb5de3ed6 -r 790b48c71bc7 sysutils/ntfsprogs/patches/patch-ad
--- a/sysutils/ntfsprogs/patches/patch-ad Fri Mar 03 07:24:46 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2006/01/26 21:43:51 adam Exp $
-
---- libntfs/debug.c.orig 2004-09-09 09:54:06.000000000 +0200
-+++ libntfs/debug.c
-@@ -25,18 +25,20 @@
- #include "attrib.h"
- #include "debug.h"
-
-+FILE *ntfs_err_out = stderr;
-+
- /**
-- * Sprintf - silencable output to stderr
-- * @silent: if 0 string is output to stderr
-+ * Sprintf - silencable output to ntfs_err_out
-+ * @silent: if 0 string is output to ntfs_err_out
- * @fmt: printf style format string
- * @...: optional arguments for the printf style format string
- *
-- * If @silent is 0, output the string @fmt to stderr.
-+ * If @silent is 0, output the string @fmt to ntfs_err_out.
- *
- * This is basically a replacement for:
- *
- * if (!silent)
-- * fprintf(stderr, fmt, ...);
-+ * fprintf(ntfs_err_out, fmt, ...);
- *
- * 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,18 +50,22 @@ void __Sprintf(const int silent, const c
- int eo;
- va_list ap;
-
-- if (silent)
-+ if (silent || !ntfs_err_out)
- return;
- eo = errno;
- va_start(ap, fmt);
-- vfprintf(stderr, fmt, ap);
-+ vfprintf(ntfs_err_out, fmt, ap);
- va_end(ap);
-+ fflush(ntfs_err_out);
- errno = eo;
- }
-
- #ifdef DEBUG
-
--/* Debug output to stderr. To get it run ./configure --enable-debug. */
-+#ifdef HAVE_STRING_H
-+#include <string.h>
-+#endif
-+/* Debug output to ntfs_err_out. To get it run ./configure --enable-debug. */
-
- 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;
-
-+ if (!ntfs_err_out)
-+ return;
- va_start(ap, fmt);
-- vfprintf(stderr, fmt, ap);
-+ vfprintf(ntfs_err_out, fmt, ap);
- va_end(ap);
-+ fflush(ntfs_err_out);
- errno = eo;
- }
-
- void __Dputs(const char *s)
- {
- int eo = errno;
-- fprintf(stderr, "%s\n", s);
-+
-+ if (!ntfs_err_out)
-+ return;
-+ fprintf(ntfs_err_out, "%s\n", s);
-+ fflush(ntfs_err_out);
- errno = eo;
- }
-
diff -r 552cb5de3ed6 -r 790b48c71bc7 sysutils/ntfsprogs/patches/patch-ae
--- a/sysutils/ntfsprogs/patches/patch-ae Fri Mar 03 07:24:46 2006 +0000
+++ b/sysutils/ntfsprogs/patches/patch-ae Fri Mar 03 10:15:46 2006 +0000
@@ -1,18 +1,9 @@
-$NetBSD: patch-ae,v 1.3 2006/01/26 21:43:51 adam Exp $
+$NetBSD: patch-ae,v 1.4 2006/03/03 10:15:46 adam Exp $
---- libntfs/device.c.orig 2005-09-28 15:46:04.000000000 +0200
+--- libntfs/device.c.orig 2006-02-24 16:48:40.000000000 +0100
+++ libntfs/device.c
-@@ -55,6 +55,8 @@
- # include <linux/hdreg.h>
- #endif
-
-+#include "compat.h"
-+
- #include "types.h"
- #include "mst.h"
- #include "debug.h"
Home |
Main Index |
Thread Index |
Old Index