[pkgsrc/trunk]: pkgsrc/sysutils/ntfsprogs Changes 1.12.1:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/ntfsprogs Changes 1.12.1:
From: adam <adam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 02:58:17 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/1b6fb1d655d7
branches:  trunk
changeset: 507118:1b6fb1d655d7
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Jan 26 21:43:51 2006 +0000

description:
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.

diffstat:

 sysutils/ntfsprogs/Makefile         |  18 ++++-----
 sysutils/ntfsprogs/PLIST            |  10 +++++-
 sysutils/ntfsprogs/distinfo         |  30 ++++++++--------
 sysutils/ntfsprogs/patches/patch-aa |   6 +-
 sysutils/ntfsprogs/patches/patch-ab |  14 ++++----
 sysutils/ntfsprogs/patches/patch-ac |  16 ++++----
 sysutils/ntfsprogs/patches/patch-ad |  64 ++++++++++++++++++++++++------------
 sysutils/ntfsprogs/patches/patch-ae |  30 ++++++++--------
 sysutils/ntfsprogs/patches/patch-af |  55 ++++++++++--------------------
 sysutils/ntfsprogs/patches/patch-ag |   6 +-
 sysutils/ntfsprogs/patches/patch-ai |  12 ++----
 sysutils/ntfsprogs/patches/patch-aj |  12 ++----
 sysutils/ntfsprogs/patches/patch-ak |  12 ++----
 sysutils/ntfsprogs/patches/patch-al |  16 ++++-----
 14 files changed, 152 insertions(+), 149 deletions(-)

diffs (truncated from 570 to 300 lines):

diff -r 52aca195e06a -r 1b6fb1d655d7 sysutils/ntfsprogs/Makefile
--- a/sysutils/ntfsprogs/Makefile       Thu Jan 26 21:41:35 2006 +0000
+++ b/sysutils/ntfsprogs/Makefile       Thu Jan 26 21:43:51 2006 +0000
@@ -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@localhost
 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 -r 52aca195e06a -r 1b6fb1d655d7 sysutils/ntfsprogs/PLIST
--- a/sysutils/ntfsprogs/PLIST  Thu Jan 26 21:41:35 2006 +0000
+++ b/sysutils/ntfsprogs/PLIST  Thu Jan 26 21:43:51 2006 +0000
@@ -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/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/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/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 -r 52aca195e06a -r 1b6fb1d655d7 sysutils/ntfsprogs/distinfo
--- a/sysutils/ntfsprogs/distinfo       Thu Jan 26 21:41:35 2006 +0000
+++ b/sysutils/ntfsprogs/distinfo       Thu Jan 26 21:43:51 2006 +0000
@@ -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 -r 52aca195e06a -r 1b6fb1d655d7 sysutils/ntfsprogs/patches/patch-aa
--- a/sysutils/ntfsprogs/patches/patch-aa       Thu Jan 26 21:41:35 2006 +0000
+++ b/sysutils/ntfsprogs/patches/patch-aa       Thu Jan 26 21:43:51 2006 +0000
@@ -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 -r 52aca195e06a -r 1b6fb1d655d7 sysutils/ntfsprogs/patches/patch-ab
--- a/sysutils/ntfsprogs/patches/patch-ab       Thu Jan 26 21:41:35 2006 +0000
+++ b/sysutils/ntfsprogs/patches/patch-ab       Thu Jan 26 21:43:51 2006 +0000
@@ -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 @@
 +#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 -r 52aca195e06a -r 1b6fb1d655d7 sysutils/ntfsprogs/patches/patch-ac
--- a/sysutils/ntfsprogs/patches/patch-ac       Thu Jan 26 21:41:35 2006 +0000
+++ b/sysutils/ntfsprogs/patches/patch-ac       Thu Jan 26 21:43:51 2006 +0000
@@ -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 @@
        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 @@
        /* 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 @@
 +              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 -r 52aca195e06a -r 1b6fb1d655d7 sysutils/ntfsprogs/patches/patch-ad
--- a/sysutils/ntfsprogs/patches/patch-ad       Thu Jan 26 21:41:35 2006 +0000
+++ b/sysutils/ntfsprogs/patches/patch-ad       Thu Jan 26 21:43:51 2006 +0000
@@ -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 @@
   *
   * 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 @@
 +#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 @@
        errno = eo;
  }
  
- void __Dperror(const char *s)
- {
-       int eo = errno;
--      perror(s);
-+
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated sysutils/ntfsprogs to 1.12.1
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/ruby-ncurses Initial import of ruby-ncurses-1.0 ...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated sysutils/ntfsprogs to 1.12.1
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/ruby-ncurses Initial import of ruby-ncurses-1.0 ...
Indexes:
Home | Main Index | Thread Index | Old Index