CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Paolo Vincenzo Olivo" <vins%netbsd.org@localhost>
Date: Fri, 8 Sep 2023 10:23:07 +0000

Module Name:    pkgsrc
Committed By:   vins
Date:           Fri Sep  8 10:23:07 UTC 2023

Modified Files:
        pkgsrc/filesystems/fuse-ntfs-3g: Makefile
        pkgsrc/filesystems/libntfs: Makefile Makefile.common distinfo
        pkgsrc/filesystems/libntfs/patches: patch-Makefile.in
            patch-libntfs-3g_Makefile.in patch-libntfs-3g_device.c
            patch-ntfsprogs_ntfsclone.c patch-src_Makefile.in
        pkgsrc/sysutils/ntfsprogs: Makefile PLIST
Added Files:
        pkgsrc/filesystems/libntfs/patches: patch-configure
            patch-libntfs-3g_mft.c

Log Message:
filesystems/libntfs filesystems/libntfs sysutils/ntfsprogs: update to 2022.10.3

# CHANGES (since release 2017.3.23)

## Security release 2022.10.3 (Oct 31, 2022)
* Rejected zero-sized runs
* Avoided merging runlists with no runs

## Security version 2022.5.17 (May 26, 2022)
* Improved defence against maliciously tampered NTFS partitions
* Improved defence against improper use of options
* Updated the documentation

## Stable Version 2021.8.22 (August 30, 2021)
* Fixed compile error when building with libfuse < 2.8.0
* Fixed obsolete macros in configure.ac
* Signalled support of UTIME_OMIT to external libfuse2
* Fixed an improper macro usage in ntfscp.c
* Updated the repository change in the README
* Fixed vulnerability threats caused by maliciously tampered NTFS partitions

## Stable Version 2017.3.23AR.6 (February 1, 2021)
* Used kernel cacheing on read-only mounts or with lowntfs-3g
* Avoided information leak when processing garbled compressed data
* Defined option posix_nlink to compute a Posix compliant st_nlink
* Recovered space when an index root is shortened
* Replaced ENODATA with ENOATTR in xattrs functions for macOS
* Added support for 'position' argument in macOS xattr functions
* Changed default xattr access method to 'openxattr' for macOS builds
* Allowed redefining the target location of the ntfsprogs tools
* Fixed updating the allocated size when attribute lies in an extent
* Enabled actions on directories in reparse plugins
* Inserted the reparse tag in the bad reparse symlink
* Supported use of WSL special files
* Dropped rejecting having both EA and reparse data
* Enabled Creating special files the same way as WSL
* Checked the locations of MFT and MFTMirr at startup

## Stable Version 2017.3.23AR.5 (April 1, 2020)
* Processed the request argument of ioctl() as unsigned
* Accepted alternative recording of cluster size
* Fixed a poorly sized string in ntfsinfo
* Fixed ntfsfallocate on a void file
* Decoded execlink reparse points
* Fixed object type returned in readdir() for reparse points
* Exported the translations of Windows paths to current ones

## Stable Version 2017.3.23AR.4 (March 1, 2019)
* Fixed reporting an error when failed to build the mountpoint
* Reverted accessing reparse directory through internal plugins
* Cleaned object ids beyond the updated part
* Fixed reacting to missing plugin
* Returned a low level error when an ioctl fails
* Truncated SSD trimming zones to granularity supported by the device

## Stable Version 2017.3.23AR.3 (September 1, 2018)
* Made sure log file buffers are properly aligned
* Made reparse directories visible through internal plugins
* Added an option to ntfscp to copy the modification time
* Renamed undeleted files to avoid overwriting existing ones
* Extended the allowed cluster size to 2MB
* Allocated full clusters for reading and rescuing in ntfsclone
* Prevented locally defined headers from interfering with ntfs-3g ones
* Attempted mounting read-only after failed permission to read-write
* Fixed collecting the label argument in mkntfs

## Stable Version 2017.3.23AR.2 (March 1, 2018)
* Made sure log file buffers are properly aligned
* Checked log file blocks more recent than temporary ones
* Processed redo log actions associated to undoing a CompensationlogRecord
* Allowed setting a file object id without defining its birth ids
* Documented read-only mount when Windows is hibernated
* Stopped checking matches of MFTMirr against MFT at record 16
* Filtered out reparse flags for selecting plugins
* Delayed updating the MFT runlist when resizing in read-only mode
* Double-checked whether record 15 is an extent of MFT
* Checked whether the device to mount was forced read-only

## Stable Version 2017.3.23AR.1 (October 1, 2017)
* Bypassed cluster allocation errors using --ignore-fs-check in ntfsclone
* Upgraded ntfsrecover to support log files for Windows 10
* Fixed the computation of highest_vcn when applying a runlist fixup
* Fixed updating the vcn of subtree in ntfsrecover
* Relaxed checks on security descriptors
* Enabled directory operations in plugins
* Decoded more reparse tags in ntfsinfo
* Logged falling back to mounting read-only
* Fixed compiling on MacOSX (Erik Larsson)


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/filesystems/fuse-ntfs-3g/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/filesystems/libntfs/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/filesystems/libntfs/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/filesystems/libntfs/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/filesystems/libntfs/patches/patch-Makefile.in \
    pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in \
    pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c \
    pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c
cvs rdiff -u -r0 -r1.1 pkgsrc/filesystems/libntfs/patches/patch-configure \
    pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_mft.c
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/filesystems/libntfs/patches/patch-src_Makefile.in
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/ntfsprogs/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/ntfsprogs/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/filesystems/fuse-ntfs-3g/Makefile
diff -u pkgsrc/filesystems/fuse-ntfs-3g/Makefile:1.23 pkgsrc/filesystems/fuse-ntfs-3g/Makefile:1.24
--- pkgsrc/filesystems/fuse-ntfs-3g/Makefile:1.23       Thu Sep  7 19:42:47 2023
+++ pkgsrc/filesystems/fuse-ntfs-3g/Makefile    Fri Sep  8 10:23:07 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.23 2023/09/07 19:42:47 vins Exp $
+# $NetBSD: Makefile,v 1.24 2023/09/08 10:23:07 vins Exp $
 
-PKGREVISION= 1
 .include "../../filesystems/libntfs/Makefile.common"
 
 PKGNAME=       fuse-${DISTNAME:S/_ntfsprogs//}
@@ -8,6 +7,7 @@ CATEGORIES=     filesystems
 
 COMMENT=       NTFS driver with read and write support
 
+CONFIGURE_ARGS+=       --with-fuse=external
 CONFIGURE_ARGS+=       --disable-ldconfig
 CONFIGURE_ARGS+=       --disable-ntfsprogs
 CONFIGURE_ARGS+=       --enable-mount-helper
@@ -26,7 +26,7 @@ USE_TOOLS+=   pkg-config
 # than open-coding the changing of which bl3 line is used.
 .include "../../filesystems/fuse/buildlink3.mk"
 .else
-# Find this platform's preferred FUSE implementation (normal approach). 
+# Find this platform's preferred FUSE implementation (normal approach).
 .include "../../mk/fuse.buildlink3.mk"
 .endif
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/filesystems/libntfs/Makefile
diff -u pkgsrc/filesystems/libntfs/Makefile:1.1 pkgsrc/filesystems/libntfs/Makefile:1.2
--- pkgsrc/filesystems/libntfs/Makefile:1.1     Mon May 19 12:22:06 2014
+++ pkgsrc/filesystems/libntfs/Makefile Fri Sep  8 10:23:07 2023
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.1 2014/05/19 12:22:06 adam Exp $
+# $NetBSD: Makefile,v 1.2 2023/09/08 10:23:07 vins Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       lib${DISTNAME:S/-3g_ntfsprogs//}
-CATEGORIES=    sysutils
 
 COMMENT=       Linux-NTFS project utilities for the Windows NT Filesystem
 
 CONFIGURE_ARGS+=       --disable-ntfs-3g
 CONFIGURE_ARGS+=       --disable-ntfsprogs
 
+INSTALL_TARGET=                install-strip
+
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/filesystems/libntfs/Makefile.common
diff -u pkgsrc/filesystems/libntfs/Makefile.common:1.4 pkgsrc/filesystems/libntfs/Makefile.common:1.5
--- pkgsrc/filesystems/libntfs/Makefile.common:1.4      Mon Apr  2 13:14:08 2018
+++ pkgsrc/filesystems/libntfs/Makefile.common  Fri Sep  8 10:23:07 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.4 2018/04/02 13:14:08 adam Exp $
+# $NetBSD: Makefile.common,v 1.5 2023/09/08 10:23:07 vins Exp $
 # used by filesystems/fuse-ntfs-3g/Makefile
 # used by sysutils/ntfsprogs/Makefile
 
-DISTNAME=      ntfs-3g_ntfsprogs-2017.3.23
-CATEGORIES=    sysutils
+DISTNAME=      ntfs-3g_ntfsprogs-2022.10.3
+CATEGORIES=    filesystems sysutils
 MASTER_SITES=  http://tuxera.com/opensource/
 EXTRACT_SUFX=  .tgz
 

Index: pkgsrc/filesystems/libntfs/distinfo
diff -u pkgsrc/filesystems/libntfs/distinfo:1.6 pkgsrc/filesystems/libntfs/distinfo:1.7
--- pkgsrc/filesystems/libntfs/distinfo:1.6     Tue Oct 26 10:25:29 2021
+++ pkgsrc/filesystems/libntfs/distinfo Fri Sep  8 10:23:07 2023
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:25:29 nia Exp $
+$NetBSD: distinfo,v 1.7 2023/09/08 10:23:07 vins Exp $
 
-BLAKE2s (ntfs-3g_ntfsprogs-2017.3.23.tgz) = 6a670df0eee7f75fd4e380f99f008ade6e76daf82db073a8813ecd1534edfb7d
-SHA512 (ntfs-3g_ntfsprogs-2017.3.23.tgz) = 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef
-Size (ntfs-3g_ntfsprogs-2017.3.23.tgz) = 1259054 bytes
-SHA1 (patch-Makefile.in) = 874ba5084b5eea312a24d7a6b339f83a3f7896d8
+BLAKE2s (ntfs-3g_ntfsprogs-2022.10.3.tgz) = 7a32e7473300114064611e219b6689e293b7bebaea915c541afed133f0b7ca93
+SHA512 (ntfs-3g_ntfsprogs-2022.10.3.tgz) = 891589483954423b19bef6e8a174fb4311ad92b6397a0db80f77c72b746bf18c2fa12457a571947f92755637a6bc784188920d4f017ae12a420819ab0d74af59
+Size (ntfs-3g_ntfsprogs-2022.10.3.tgz) = 1324320 bytes
+SHA1 (patch-Makefile.in) = e8788b9a008493510631e032f3a1d2244ba52ff0
+SHA1 (patch-configure) = 22ede9302d0c04f0fc3819ad6764afe9656008d4
 SHA1 (patch-include_ntfs-3g_compat.h) = 78ea127359416c9106eef7025a2ccc84fd0b4447
 SHA1 (patch-include_ntfs-3g_types.h) = bb6414b8991e8a05f32fce88d4915448bc498d58
-SHA1 (patch-libntfs-3g_Makefile.in) = 50a318a1c9a0a68d42e5cac2557e781f8c728094
+SHA1 (patch-libntfs-3g_Makefile.in) = 7930c0d04906969f39a731fe67bb8fe8a15c5c9d
 SHA1 (patch-libntfs-3g_compat.c) = 5cecaa8f8d4fe463094592f11f4757a434e903dd
-SHA1 (patch-libntfs-3g_device.c) = 3ad49d69b03cdd500246f77d9f6e30ca3d2e2ec6
+SHA1 (patch-libntfs-3g_device.c) = 2d2a9f2517df4535a6d19028384151c64d9afbe2
+SHA1 (patch-libntfs-3g_mft.c) = 992eaaae18b29a14f553bed2e53be0a0a915a7eb
 SHA1 (patch-ntfsprogs_Makefile.in) = 9acd073006c54009cedeafc766c964e9b5f11468
-SHA1 (patch-ntfsprogs_ntfsclone.c) = 3306b501e94ce71a709f394516829a727aa743ad
-SHA1 (patch-src_Makefile.in) = 7f733c4b2b09e81978a736217da9a2162bc7a844
-SHA1 (patch-src_lowntfs-3g.c) = 12c2e1d96327b0deb9eff213399dc4ffcc77f7e3
+SHA1 (patch-ntfsprogs_ntfsclone.c) = 62850f27bcc28c59e126f1ced467f9b64cd5b10e
+SHA1 (patch-src_Makefile.in) = 6d946cd2078d0983281d3e92af6e54bf3483bca1
 SHA1 (patch-src_ntfs-3g.c) = 9ae108fec22dc2a4219cd4ae5077d9eea17ab700

Index: pkgsrc/filesystems/libntfs/patches/patch-Makefile.in
diff -u pkgsrc/filesystems/libntfs/patches/patch-Makefile.in:1.1 pkgsrc/filesystems/libntfs/patches/patch-Makefile.in:1.2
--- pkgsrc/filesystems/libntfs/patches/patch-Makefile.in:1.1    Mon May 19 12:22:06 2014
+++ pkgsrc/filesystems/libntfs/patches/patch-Makefile.in        Fri Sep  8 10:23:07 2023
@@ -1,15 +1,15 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2023/09/08 10:23:07 vins Exp $
 
-Don't install README.
+Don't install README for ntfs-3g.
 
---- Makefile.in.orig   2014-05-19 07:53:27.000000000 +0000
+--- Makefile.in.orig   2022-10-20 15:35:11.000000000 +0000
 +++ Makefile.in
-@@ -754,7 +754,7 @@ info: info-recursive
+@@ -815,7 +815,7 @@ install-data: install-data-recursive
+ uninstall: uninstall-recursive
  
- info-am:
- 
--install-data-am: install-docDATA
-+install-data-am:
- 
- install-dvi: install-dvi-recursive
+ install-am: all-am
+-      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++      @$(MAKE) $(AM_MAKEFLAGS) install-exec-am
  
+ installcheck: installcheck-recursive
+ install-strip:
Index: pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in
diff -u pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in:1.1 pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in:1.2
--- pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in:1.1 Mon May 19 12:22:06 2014
+++ pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_Makefile.in     Fri Sep  8 10:23:07 2023
@@ -1,12 +1,22 @@
-$NetBSD: patch-libntfs-3g_Makefile.in,v 1.1 2014/05/19 12:22:06 adam Exp $
+$NetBSD: patch-libntfs-3g_Makefile.in,v 1.2 2023/09/08 10:23:07 vins Exp $
 
---- libntfs-3g/Makefile.in.orig        2014-02-15 14:08:00.000000000 +0000
+Do not attempt to move .so files outside of PREFIX.  
+
+--- libntfs-3g/Makefile.in.orig        2022-10-20 15:35:11.000000000 +0000
 +++ libntfs-3g/Makefile.in
-@@ -849,7 +849,6 @@ install-dvi-am:
- 
- install-exec-am: install-libLTLIBRARIES
-       @$(NORMAL_INSTALL)
--      $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
- install-html: install-html-am
+@@ -1170,15 +1170,9 @@ uninstall-am: uninstall-libLTLIBRARIES u
+ # We may need to move .so files to root
+ # And create ldscript or symbolic link from /usr
+ install-exec-hook: install-rootlibLTLIBRARIES
+-@INSTALL_LIBRARY_TRUE@        if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \
+-@INSTALL_LIBRARY_TRUE@                $(MV) -f "$(DESTDIR)/$(libdir)"/libntfs-3g.so* "$(DESTDIR)/$(rootlibdir)";  \
+-@INSTALL_LIBRARY_TRUE@        fi
+ @GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@        if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \
+ @GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@                $(install_sh_PROGRAM) "libntfs-3g.script.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \
+ @GENERATE_LDSCRIPT_TRUE@@INSTALL_LIBRARY_TRUE@        fi
+-@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@       if [ ! "$(rootlibdir)" -ef "$(libdir)" ]; then \
+-@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@               $(LN_S) "$(rootlibdir)/libntfs-3g.so" "$(DESTDIR)/$(libdir)/libntfs-3g.so"; \
+-@GENERATE_LDSCRIPT_FALSE@@INSTALL_LIBRARY_TRUE@       fi
  
- install-html-am:
+ uninstall-local:
+ @INSTALL_LIBRARY_TRUE@        $(RM) -f "$(DESTDIR)/$(rootlibdir)"/libntfs-3g.so*
Index: pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c
diff -u pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c:1.1 pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c:1.2
--- pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c:1.1    Mon May 19 12:22:06 2014
+++ pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_device.c        Fri Sep  8 10:23:07 2023
@@ -1,24 +1,28 @@
-$NetBSD: patch-libntfs-3g_device.c,v 1.1 2014/05/19 12:22:06 adam Exp $
+$NetBSD: patch-libntfs-3g_device.c,v 1.2 2023/09/08 10:23:07 vins Exp $
 
---- libntfs-3g/device.c.orig   2014-02-15 14:07:52.000000000 +0000
+Use DIOCGPARTINFO on NetBSD to get the device size in blocks.
+
+--- libntfs-3g/device.c.orig   2022-10-20 15:33:44.000000000 +0000
 +++ libntfs-3g/device.c
-@@ -95,6 +95,10 @@
+@@ -95,6 +95,11 @@
  #     define BLKBSZSET _IOW(0x12,113,size_t) /* Set device block size in bytes. */
  #endif
  
 +#if defined(__NetBSD__)
 +#include <sys/disklabel.h> /* XXX autoconf this ? */
++#include <sys/dkio.h>
 +#endif
 +
  /**
   * ntfs_device_alloc - allocate an ntfs device structure and pre-initialize it
   * @name:     name of the device (must be present)
-@@ -596,6 +600,23 @@ s64 ntfs_device_size_get(struct ntfs_dev
+@@ -596,6 +601,24 @@ s64 ntfs_device_size_get(struct ntfs_dev
                }
        }
  #endif
-+#ifdef DIOCGPART
++#ifdef DIOCGPARTINFO
 +      {
++              /* NetBSD */
 +              struct stat st;
 +              if (dev->d_ops->stat(dev, &st) >= 0) {
 +                      struct disklabel disklabel;
@@ -27,7 +31,7 @@ $NetBSD: patch-libntfs-3g_device.c,v 1.1
 +                      if (dev->d_ops->ioctl(dev, DIOCGDINFO, &disklabel) >= 0) {
 +                              secsize = disklabel.d_secsize;
 +                              psize = disklabel.d_partitions[DISKPART(st.st_rdev)].p_size;
-+                              ntfs_log_debug("DIOCGPART nr %d byte blocks = %lld (0x%llx)\n",
++                              ntfs_log_debug("DIOCGPARTINFO nr %d byte blocks = %lld (0x%llx)\n",
 +                                              secsize, psize, psize);
 +                              return psize * secsize / block_size;
 +                      }
Index: pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c
diff -u pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c:1.1 pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c:1.2
--- pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c:1.1  Mon May 19 12:22:06 2014
+++ pkgsrc/filesystems/libntfs/patches/patch-ntfsprogs_ntfsclone.c      Fri Sep  8 10:23:07 2023
@@ -1,8 +1,10 @@
-$NetBSD: patch-ntfsprogs_ntfsclone.c,v 1.1 2014/05/19 12:22:06 adam Exp $
+$NetBSD: patch-ntfsprogs_ntfsclone.c,v 1.2 2023/09/08 10:23:07 vins Exp $
 
---- ntfsprogs/ntfsclone.c.orig 2014-02-15 14:07:52.000000000 +0000
+Fix for NetBSD's statvfs(2).
+
+--- ntfsprogs/ntfsclone.c.orig 2021-09-13 07:34:39.000000000 +0000
 +++ ntfsprogs/ntfsclone.c
-@@ -68,6 +68,19 @@
+@@ -71,6 +71,19 @@
   */
  #define NTFS_DO_NOT_CHECK_ENDIANS
  
@@ -11,18 +13,18 @@ $NetBSD: patch-ntfsprogs_ntfsclone.c,v 1
 +   /* NetBSD versions later than 2.99.9 have statvfs(2) instead of statfs(2) */
 +#  if __NetBSD_Version__ >= 299000900
 +#    include <sys/statvfs.h>
-+#    define F_TYPE    f_fsid
++#    define F_TYPE     f_fsid
 +#  else
-+#    define F_TYPE    f_type
++#    define F_TYPE     f_type
 +#  endif
 +#else
-+#  define F_TYPE      f_type
++#  define F_TYPE       f_type
 +#endif
 +
+ #include "param.h"
  #include "debug.h"
  #include "types.h"
- #include "support.h"
-@@ -161,8 +174,12 @@ static struct {
+@@ -166,8 +179,12 @@ static struct {
        char *output;
        char *volume;
  #ifndef NO_STATFS
@@ -35,7 +37,7 @@ $NetBSD: patch-ntfsprogs_ntfsclone.c,v 1
  } opt;
  
  struct bitmap {
-@@ -818,7 +835,7 @@ static void copy_cluster(int rescue, u64
+@@ -852,7 +869,7 @@ static void copy_cluster(int rescue, u64
  #ifndef NO_STATFS
                int err = errno;
                perr_printf("Write failed");
@@ -44,7 +46,7 @@ $NetBSD: patch-ntfsprogs_ntfsclone.c,v 1
                        Printf("Apparently you tried to clone to a remote "
                               "Windows computer but they don't\nhave "
                               "efficient sparse file handling by default. "
-@@ -2238,7 +2255,7 @@ static void set_filesize(s64 filesize)
+@@ -2312,7 +2329,7 @@ static void set_filesize(s64 filesize)
                Printf("WARNING: Couldn't get filesystem type: "
                       "%s\n", strerror(errno));
        else

Index: pkgsrc/filesystems/libntfs/patches/patch-src_Makefile.in
diff -u pkgsrc/filesystems/libntfs/patches/patch-src_Makefile.in:1.3 pkgsrc/filesystems/libntfs/patches/patch-src_Makefile.in:1.4
--- pkgsrc/filesystems/libntfs/patches/patch-src_Makefile.in:1.3        Mon Apr  2 13:14:08 2018
+++ pkgsrc/filesystems/libntfs/patches/patch-src_Makefile.in    Fri Sep  8 10:23:07 2023
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_Makefile.in,v 1.3 2018/04/02 13:14:08 adam Exp $
+$NetBSD: patch-src_Makefile.in,v 1.4 2023/09/08 10:23:07 vins Exp $
 
 Link against already built and installed libntfs.
 Install binaries into PREFIX, not the root directory.
 
---- src/Makefile.in.orig       2017-03-23 09:43:00.000000000 +0000
+--- src/Makefile.in.orig       2022-10-20 15:35:12.000000000 +0000
 +++ src/Makefile.in
-@@ -110,8 +110,7 @@ am__DEPENDENCIES_1 =
+@@ -118,8 +118,7 @@ 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_1) \
@@ -15,7 +15,7 @@ Install binaries into PREFIX, not the ro
  AM_V_lt = $(am__v_lt_@AM_V@)
  am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
  am__v_lt_0 = --silent
-@@ -124,8 +123,7 @@ am__ntfs_3g_SOURCES_DIST = ntfs-3g.c ntf
+@@ -132,8 +131,7 @@ am__ntfs_3g_SOURCES_DIST = ntfs-3g.c ntf
  @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_1) \
@@ -25,7 +25,7 @@ Install binaries into PREFIX, not the ro
  ntfs_3g_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_CFLAGS) \
        $(CFLAGS) $(ntfs_3g_LDFLAGS) $(LDFLAGS) -o $@
-@@ -133,8 +131,7 @@ am__ntfs_3g_probe_SOURCES_DIST = ntfs-3g
+@@ -141,8 +139,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)
@@ -35,7 +35,7 @@ Install binaries into PREFIX, not the ro
  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 $@
-@@ -366,9 +363,9 @@ pkgconfigdir = @pkgconfigdir@
+@@ -382,9 +379,9 @@ pkgconfigdir = @pkgconfigdir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
  psdir = @psdir@
@@ -45,10 +45,10 @@ Install binaries into PREFIX, not the ro
 +rootbindir = @bindir@
 +rootlibdir = @libdir@
 +rootsbindir = @sbindir@
+ runstatedir = @runstatedir@
  sbindir = @sbindir@
  sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-@@ -391,7 +388,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+@@ -408,7 +405,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
  @DISABLE_PLUGINS_FALSE@PLUGIN_CFLAGS = -DPLUGIN_DIR=\"$(plugindir)\"
  @ENABLE_NTFS_3G_TRUE@rootsbin_DATA = #Create directory
  @ENABLE_NTFS_3G_TRUE@man_MANS = ntfs-3g.8 ntfs-3g.probe.8
@@ -57,7 +57,7 @@ Install binaries into PREFIX, not the ro
  @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)                    \
-@@ -401,7 +398,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+@@ -418,7 +415,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
  @ENABLE_NTFS_3G_TRUE@ $(PLUGIN_CFLAGS)
  
  @ENABLE_NTFS_3G_TRUE@ntfs_3g_SOURCES = ntfs-3g.c ntfs-3g_common.c
@@ -66,7 +66,7 @@ Install binaries into PREFIX, not the ro
  @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)                    \
-@@ -411,7 +408,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
+@@ -428,7 +425,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil
  @ENABLE_NTFS_3G_TRUE@ $(PLUGIN_CFLAGS)
  
  @ENABLE_NTFS_3G_TRUE@lowntfs_3g_SOURCES = lowntfs-3g.c ntfs-3g_common.c
@@ -75,7 +75,7 @@ Install binaries into PREFIX, not the ro
  @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_probe_LDFLAGS = $(AM_LDFLAGS) -all-static
  @ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
  @ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_SOURCES = ntfs-3g.probe.c
-@@ -969,9 +966,9 @@ uninstall-man: uninstall-man8
+@@ -1003,9 +1000,9 @@ uninstall-man: uninstall-man8
  @DISABLE_PLUGINS_FALSE@@ENABLE_NTFS_3G_TRUE@  $(MKDIR_P) $(DESTDIR)/$(plugindir)
  
  @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-exec-local:    install-rootbinPROGRAMS

Index: pkgsrc/sysutils/ntfsprogs/Makefile
diff -u pkgsrc/sysutils/ntfsprogs/Makefile:1.12 pkgsrc/sysutils/ntfsprogs/Makefile:1.13
--- pkgsrc/sysutils/ntfsprogs/Makefile:1.12     Mon May 19 12:22:06 2014
+++ pkgsrc/sysutils/ntfsprogs/Makefile  Fri Sep  8 10:23:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/05/19 12:22:06 adam Exp $
+# $NetBSD: Makefile,v 1.13 2023/09/08 10:23:07 vins Exp $
 
 .include "../../filesystems/libntfs/Makefile.common"
 
@@ -7,6 +7,7 @@ CATEGORIES=     sysutils
 
 COMMENT=       Linux-NTFS project utilities for the Windows NT Filesystem
 
+CONFIGURE_ARGS+=       --enable-extras
 CONFIGURE_ARGS+=       --disable-ntfs-3g
 
 BUILD_DIRS=            ntfsprogs

Index: pkgsrc/sysutils/ntfsprogs/PLIST
diff -u pkgsrc/sysutils/ntfsprogs/PLIST:1.9 pkgsrc/sysutils/ntfsprogs/PLIST:1.10
--- pkgsrc/sysutils/ntfsprogs/PLIST:1.9 Mon Apr  2 13:14:08 2018
+++ pkgsrc/sysutils/ntfsprogs/PLIST     Fri Sep  8 10:23:07 2023
@@ -1,10 +1,15 @@
-@comment $NetBSD: PLIST,v 1.9 2018/04/02 13:14:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2023/09/08 10:23:07 vins Exp $
 bin/ntfscat
 bin/ntfscluster
 bin/ntfscmp
 bin/ntfsfix
 bin/ntfsinfo
 bin/ntfsls
+bin/ntfsrecover
+bin/ntfssecaudit
+bin/ntfstruncate
+bin/ntfsusermap
+bin/ntfswipe
 man/man8/mkntfs.8
 man/man8/ntfscat.8
 man/man8/ntfsclone.8

Added files:

Index: pkgsrc/filesystems/libntfs/patches/patch-configure
diff -u /dev/null pkgsrc/filesystems/libntfs/patches/patch-configure:1.1
--- /dev/null   Fri Sep  8 10:23:07 2023
+++ pkgsrc/filesystems/libntfs/patches/patch-configure  Fri Sep  8 10:23:07 2023
@@ -0,0 +1,20 @@
+$NetBSD: patch-configure,v 1.1 2023/09/08 10:23:07 vins Exp $
+
+Avoid test "==" operator.
+
+--- configure.orig     2022-10-20 15:35:11.000000000 +0000
++++ configure
+@@ -14104,11 +14104,11 @@ esac
+ 
+ if test "x${enable_ntfs_3g}" != "xyes"; then
+       with_fuse="none"
+-elif test "x${with_fuse}" == "x"; then
++elif test "x${with_fuse}" = "x"; then
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking fuse compatibility" >&5
+ printf %s "checking fuse compatibility... " >&6; }
+       case "${target_os}" in
+-      linux*|solaris*)
++      netbsd*|linux*|solaris*)
+ 
+ # Check whether --with-fuse was given.
+ if test ${with_fuse+y}
Index: pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_mft.c
diff -u /dev/null pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_mft.c:1.1
--- /dev/null   Fri Sep  8 10:23:07 2023
+++ pkgsrc/filesystems/libntfs/patches/patch-libntfs-3g_mft.c   Fri Sep  8 10:23:07 2023
@@ -0,0 +1,85 @@
+$NetBSD: patch-libntfs-3g_mft.c,v 1.1 2023/09/08 10:23:07 vins Exp $
+
+Rip off mkntfs_get_page_size() from mkntfs.c, to avoid
+a build error on archs where PAGE_SIZE is unusable.
+From OpenBSD ports/sysutils/ntfs-3g.
+
+--- libntfs-3g/mft.c.orig      2022-10-20 15:33:44.000000000 +0000
++++ libntfs-3g/mft.c
+@@ -27,6 +27,9 @@
+ #include "config.h"
+ #endif
+ 
++#ifdef  HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ #ifdef HAVE_STDLIB_H
+ #include <stdlib.h>
+ #endif
+@@ -522,9 +525,28 @@ static int ntfs_is_mft(ntfs_inode *ni)
+       return 0;
+ }
+ 
+-#ifndef PAGE_SIZE
+-#define PAGE_SIZE 4096
++/**
++ * mkntfs_get_page_size - detect the system's memory page size.
++ */
++static long mkntfs_get_page_size(void)
++{
++      long page_size;
++#ifdef _SC_PAGESIZE
++      page_size = sysconf(_SC_PAGESIZE);
++      if (page_size < 0)
+ #endif
++#ifdef _SC_PAGE_SIZE
++              page_size = sysconf(_SC_PAGE_SIZE);
++      if (page_size < 0)
++#endif
++      {
++              ntfs_log_warning("Failed to determine system page size.  "
++                              "Assuming safe default of 4096 bytes.\n");
++              return 4096;
++      }
++      ntfs_log_debug("System page size is %li bytes.\n", page_size);
++      return page_size;
++}
+ 
+ #define RESERVED_MFT_RECORDS   64
+ 
+@@ -550,6 +572,7 @@ static int ntfs_mft_bitmap_find_free_rec
+       s64 pass_end, ll, data_pos, pass_start, ofs, bit;
+       ntfs_attr *mftbmp_na;
+       u8 *buf, *byte;
++      long page_size;
+       unsigned int size;
+       u8 pass, b;
+       int ret = -1;
+@@ -561,7 +584,8 @@ static int ntfs_mft_bitmap_find_free_rec
+        * Set the end of the pass making sure we do not overflow the mft
+        * bitmap.
+        */
+-      size = PAGE_SIZE;
++      page_size = mkntfs_get_page_size();
++      size = page_size;
+       pass_end = vol->mft_na->allocated_size >> vol->mft_record_size_bits;
+       ll = mftbmp_na->initialized_size << 3;
+       if (pass_end > ll)
+@@ -587,7 +611,7 @@ static int ntfs_mft_bitmap_find_free_rec
+               pass = 2;
+       }
+       pass_start = data_pos;
+-      buf = ntfs_malloc(PAGE_SIZE);
++      buf = ntfs_malloc(page_size);
+       if (!buf)
+               goto leave;
+       
+@@ -600,7 +624,7 @@ static int ntfs_mft_bitmap_find_free_rec
+       b = 0;
+ #endif
+       /* Loop until a free mft record is found. */
+-      for (; pass <= 2; size = PAGE_SIZE) {
++      for (; pass <= 2; size = page_size) {
+               /* Cap size to pass_end. */
+               ofs = data_pos >> 3;
+               ll = ((pass_end + 7) >> 3) - ofs;

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index