head 1.7; access; symbols pkgsrc-2014Q1:1.6.0.2 pkgsrc-2014Q1-base:1.6 pkgsrc-2013Q4:1.5.0.52 pkgsrc-2013Q4-base:1.5 pkgsrc-2013Q3:1.5.0.50 pkgsrc-2013Q3-base:1.5 pkgsrc-2013Q2:1.5.0.48 pkgsrc-2013Q2-base:1.5 pkgsrc-2013Q1:1.5.0.46 pkgsrc-2013Q1-base:1.5 pkgsrc-2012Q4:1.5.0.44 pkgsrc-2012Q4-base:1.5 pkgsrc-2012Q3:1.5.0.42 pkgsrc-2012Q3-base:1.5 pkgsrc-2012Q2:1.5.0.40 pkgsrc-2012Q2-base:1.5 pkgsrc-2012Q1:1.5.0.38 pkgsrc-2012Q1-base:1.5 pkgsrc-2011Q4:1.5.0.36 pkgsrc-2011Q4-base:1.5 pkgsrc-2011Q3:1.5.0.34 pkgsrc-2011Q3-base:1.5 pkgsrc-2011Q2:1.5.0.32 pkgsrc-2011Q2-base:1.5 pkgsrc-2011Q1:1.5.0.30 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.28 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.26 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.24 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.22 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.20 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.18 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.16 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.14 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.5.0.12 pkgsrc-2008Q4-base:1.5 pkgsrc-2008Q3:1.5.0.10 pkgsrc-2008Q3-base:1.5 cube-native-xorg:1.5.0.8 cube-native-xorg-base:1.5 pkgsrc-2008Q2:1.5.0.6 pkgsrc-2008Q2-base:1.5 cwrapper:1.5.0.4 pkgsrc-2008Q1:1.5.0.2 pkgsrc-2008Q1-base:1.5 pkgsrc-2007Q4:1.4.0.16 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.4.0.14 pkgsrc-2007Q3-base:1.4 pkgsrc-2007Q2:1.4.0.12 pkgsrc-2007Q2-base:1.4 pkgsrc-2007Q1:1.4.0.10 pkgsrc-2007Q1-base:1.4 pkgsrc-2006Q4:1.4.0.8 pkgsrc-2006Q4-base:1.4 pkgsrc-2006Q3:1.4.0.6 pkgsrc-2006Q3-base:1.4 pkgsrc-2006Q2:1.4.0.4 pkgsrc-2006Q2-base:1.4 pkgsrc-2006Q1:1.4.0.2 pkgsrc-2006Q1-base:1.4 pkgsrc-2005Q4:1.2.0.8 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.6 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.4 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.2 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.1.1.1.0.2 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.7 date 2014.05.19.12.22.06; author adam; state dead; branches; next 1.6; commitid JOHirqcvxKMB59Bx; 1.6 date 2014.03.30.23.58.19; author jakllsch; state Exp; branches; next 1.5; commitid wdKwbUmGn7dZxMux; 1.5 date 2008.03.08.08.56.47; author adam; state Exp; branches; next 1.4; 1.4 date 2006.03.03.10.15.46; author adam; state Exp; branches; next 1.3; 1.3 date 2006.01.26.21.43.51; author adam; state Exp; branches; next 1.2; 1.2 date 2005.03.15.20.24.30; author rillig; state Exp; branches; next 1.1; 1.1 date 2004.10.05.12.39.38; author agc; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.10.05.12.39.38; author agc; state Exp; branches; next ; desc @@ 1.7 log @Changes 2014.2.15: libntfs: added use of hd library to get the legacy BIOS geometry libntfs: switched to /proc/mounts for checking existing mounts libntfs: fixed usa checking by ntfsck on 4K sector disks libntfs: fixed processing compressed data beyond file size (Windows 8 compliance) libntfs: fixed expanding a resident attribute without inserting holes libntfs: allow DACLs to not have any ACE libntfs: ignore unmapped regions when checking whether sparse libntfs: upgraded the Win32 interface for use with ntfsprogs ntfsresize: enabled relocating the MFT when shrinking a volume ntfsresize: fixed trying to update the MFT and Bitmap on a test run ntfsresize: fixed updating all the MFT runs in a relocated MFT ntfsresize: set the backup boot sector when the size is reliable ntfsresize: reserved a single sector for the backup boot sector ntfsundelete: output the modification time when scanning files ntfsundelete: ported to Windows ntfsclone: fixed wiping fragmented metadata when creating a metadata image ntfsclone: allowed cloning a file system despite allocation errors ntfsclone: fixed bad copying of the backup boot sector ntfsclone: ported to Windows ntfsdecrypt: made compatible with libgrypt-1.6 @ text @$NetBSD: patch-ae,v 1.6 2014/03/30 23:58:19 jakllsch Exp $ --- libntfs/device.c.orig 2007-09-26 18:28:34.000000000 +0000 +++ libntfs/device.c @@@@ -85,6 +85,10 @@@@ # define BLKBSZSET _IOW(0x12,113,size_t) /* Set device block size in bytes. */ #endif +#if defined(__NetBSD__) +#include /* XXX autoconf this ? */ +#endif + /** * ntfs_device_alloc - allocate an ntfs device structure and pre-initialize it * @@name: name of the device (must be present) @@@@ -599,6 +603,23 @@@@ s64 ntfs_device_size_get(struct ntfs_dev } } #endif +#ifdef DIOCGDINFO + { + struct stat st; + if (dev->d_ops->stat(dev, &st) >= 0) { + struct disklabel disklabel; + int secsize; + s64 psize; + 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("DIOCGDINFO part %d nr %d byte blocks = %lld (0x%llx)\n", + DISKPART(st.st_rdev), secsize, psize, psize); + return psize * secsize / block_size; + } + } + } +#endif /* * We couldn't figure it out by using a specialized ioctl, * so do binary search to find the size of the device. @ 1.6 log @Consistently use DIOCGDINFO. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.5 2008/03/08 08:56:47 adam Exp $ @ 1.5 log @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. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- libntfs/device.c.orig 2007-09-26 20:28:34.000000000 +0200 d20 1 a20 1 +#ifdef DIOCGPART d30 2 a31 2 + ntfs_log_debug("DIOCGPART nr %d byte blocks = %lld (0x%llx)\n", + secsize, psize, psize); @ 1.4 log @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 @ text @d3 1 a3 1 --- libntfs/device.c.orig 2006-02-24 16:48:40.000000000 +0100 d5 1 a5 1 @@@@ -85,6 +87,10 @@@@ d16 1 a16 1 @@@@ -531,6 +537,23 @@@@ s64 ntfs_device_size_get(struct ntfs_dev @ 1.3 log @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. @ text @d3 1 a3 1 --- libntfs/device.c.orig 2005-09-28 15:46:04.000000000 +0200 d5 2 a6 11 @@@@ -55,6 +55,8 @@@@ # include #endif +#include "compat.h" + #include "types.h" #include "mst.h" #include "debug.h" @@@@ -70,6 +72,10 @@@@ #define HDIO_GETGEO 0x0301 /* Get device geometry. */ d15 2 a16 2 * name: name of the device (must be present) @@@@ -519,6 +525,23 @@@@ s64 ntfs_device_size_get(struct ntfs_dev d30 1 a30 1 + Dprintf("DIOCGPART nr %d byte blocks = %lld (0x%llx)\n", @ 1.2 log @Added some patches to make ntfsprogs compile on NetBSD-1.6.2, which does not have ENOTSUP. Approved by jlam. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.1.1.1 2004/10/05 12:39:38 agc Exp $ d3 3 a5 3 --- 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 @@@@ d14 1 a14 1 @@@@ -52,6 +54,10 @@@@ d25 4 a28 7 @@@@ -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 d43 6 a48 3 } } #endif @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 12 a14 3 --- libntfs/device.c.orig Sat Sep 4 06:16:32 2004 +++ libntfs/device.c @@@@ -52,6 +52,10 @@@@ d25 1 a25 1 @@@@ -498,6 +502,23 @@@@ s64 ntfs_device_size_get(struct ntfs_dev @ 1.1.1.1 log @Initial import of ntfsprogs-1.9.4 into the packages collection. The Linux-NTFS project (http://linux-ntfs.sf.net/) aims to bring full support for the NTFS filesystem to the Linux operating system. The ntfsprogs package currently consists of a static library and utilities such as mkntfs, ntfscat, ntfsls, ntfsresize, and ntfsundelete (for a full list of included utilities see man 8 ntfsprogs after installation). Provided in PR 27119 by Darrin B. Jewell, modified by myself to remove dylib files from PLIST, add NetBSD statvfs compatibility, and quieten a warning in one of the patches. Darrin's patches perform the following changes: . provide for redirection of error output without having an lvalue stderr . support for NetBSD disklabels . fix for ntfs_attr_pread to avoid reading a partial block . workaround for darwin sys/mount.h namespace pollution This package is currently configured with the gnome-vfs module disabled. @ text @@