Import of pkgsrc-2013Q2

sysutils/ntfsprogs/DESCR

@@ -0,0 +1,5 @@
+The Linux-NTFS project 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).

sysutils/ntfsprogs/Makefile

@@ -0,0 +1,24 @@
+# $NetBSD: Makefile,v 1.10 2012/10/23 19:51:15 asau Exp $
+
+DISTNAME=	ntfsprogs-2.0.0
+PKGREVISION=	1
+CATEGORIES=	sysutils
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=linux-ntfs/}
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+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
+
+# XXX support for this should be possibly integrated with other
+# gnome pkgsrc and this could be a configurable option
+CONFIGURE_ARGS+=	--disable-gnome-vfs
+
+GCC_REQD+=	2.96
+
+.include "../../devel/libuuid/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"

sysutils/ntfsprogs/PLIST

@@ -0,0 +1,63 @@
+@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:16:11 joerg Exp $
+bin/ntfscat
+bin/ntfscluster
+bin/ntfscmp
+bin/ntfsfix
+bin/ntfsinfo
+bin/ntfsls
+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/crypto.h
+include/ntfs/debug.h
+include/ntfs/device.h
+include/ntfs/device_io.h
+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
+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/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/libntfs.8
+man/man8/mkfs.ntfs.8
+man/man8/mkntfs.8
+man/man8/ntfscat.8
+man/man8/ntfsclone.8
+man/man8/ntfscluster.8
+man/man8/ntfscmp.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

sysutils/ntfsprogs/distinfo

@@ -0,0 +1,12 @@
+$NetBSD: distinfo,v 1.12 2008/03/08 08:56:47 adam Exp $
+
+SHA1 (ntfsprogs-2.0.0.tar.bz2) = 75393dec021e73a922fe1fd034636de5a45f79a8
+RMD160 (ntfsprogs-2.0.0.tar.bz2) = aaef354ed7dab572c81f0eece89dd5994babfa8d
+Size (ntfsprogs-2.0.0.tar.bz2) = 678114 bytes
+SHA1 (patch-ab) = 2f277b21885c75c5ba63e9fcf37faca3bb0451dd
+SHA1 (patch-ac) = 94cf3266fb5109c8f6fd874e00c35b2ac642a9f1
+SHA1 (patch-ae) = 224e81c0ba3f530f52bbf646c1c66299b0519b3d
+SHA1 (patch-af) = e89fb98fb9b365a7f24f7c9bcafb655594523622
+SHA1 (patch-ah) = b6da89fc9b5bbc83fa503dd887f3f2ec493ad7c7
+SHA1 (patch-am) = 8dfca2bb615662a18230e6816729808733e1c2d4
+SHA1 (patch-an) = 894d4a11a8c7824120f78b329af4047b779f910b

sysutils/ntfsprogs/patches/patch-ab

@@ -0,0 +1,21 @@
+$NetBSD: patch-ab,v 1.4 2008/03/08 08:56:47 adam Exp $
+
+--- include/ntfs/types.h.orig	2007-09-26 20:28:40.000000000 +0200
++++ include/ntfs/types.h
+@@ -86,6 +86,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.
++ */
++#ifdef FALSE
++#undef FALSE
++#endif
++#ifdef TRUE
++#undef TRUE
++#endif
++
+ /*
+  * 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

sysutils/ntfsprogs/patches/patch-ac

@@ -0,0 +1,43 @@
+$NetBSD: patch-ac,v 1.4 2008/03/08 08:56:47 adam Exp $
+
+--- libntfs/attrib.c.orig	2007-09-26 20:28:34.000000000 +0200
++++ libntfs/attrib.c
+@@ -865,7 +865,7 @@ map_rl:
+  */
+ s64 ntfs_attr_pread(ntfs_attr *na, const s64 pos, s64 count, void *b)
+ {
+-	s64 br, to_read, ofs, total, total2;
++	s64 br, to_read, ofs, total, total2, origcount;
+ 	ntfs_volume *vol;
+ 	runlist_element *rl;
+ 
+@@ -892,6 +892,7 @@ s64 ntfs_attr_pread(ntfs_attr *na, const
+ 	vol = na->ni->vol;
+ 	if (!count)
+ 		return 0;
++	origcount = count;
+ 	/* Truncate reads beyond end of attribute. */
+ 	if (pos + count > na->data_size) {
+ 		if (pos >= na->data_size)
+@@ -982,7 +983,7 @@ res_err_out:
+ 			continue;
+ 		}
+ 		/* It is a real lcn, read it into @dst. */
+-		to_read = min(count, (rl->length << vol->cluster_size_bits) -
++		to_read = min(origcount, (rl->length << vol->cluster_size_bits) -
+ 				ofs);
+ retry:
+ 		ntfs_log_trace("Reading 0x%llx bytes from vcn 0x%llx, "
+@@ -990,6 +991,12 @@ retry:
+ 				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 */
++		if (br > count) {
++			memset(b + count, 0, br - count);
++			total += count;
++			return total + total2;
++		}
+ 		/* If everything ok, update progress counters and continue. */
+ 		if (br > 0) {
+ 			total += br;

sysutils/ntfsprogs/patches/patch-ae

@@ -0,0 +1,39 @@
+$NetBSD: patch-ae,v 1.5 2008/03/08 08:56:47 adam Exp $
+
+--- libntfs/device.c.orig	2007-09-26 20:28:34.000000000 +0200
++++ 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 <sys/disklabel.h> /* 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 DIOCGPART
++	{
++		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("DIOCGPART nr %d byte blocks = %lld (0x%llx)\n",
++						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.

sysutils/ntfsprogs/patches/patch-af

@@ -0,0 +1,54 @@
+$NetBSD: patch-af,v 1.7 2008/03/08 08:56:47 adam Exp $
+
+--- ntfsprogs/ntfsclone.c.orig	2007-09-19 18:51:09.000000000 +0200
++++ ntfsprogs/ntfsclone.c
+@@ -61,6 +61,19 @@
+  */
+ #define NTFS_DO_NOT_CHECK_ENDIANS
+ 
++#ifdef __NetBSD__
++#  include <sys/param.h>
++   /* 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
++#  else
++#    define F_TYPE	f_type
++#  endif
++#else
++#  define F_TYPE	f_type
++#endif
++
+ #include "debug.h"
+ #include "types.h"
+ #include "support.h"
+@@ -116,7 +129,11 @@ static struct {
+ 	int restore_image;
+ 	char *output;
+ 	char *volume;
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
++	struct statvfs stfs;
++#else
+ 	struct statfs stfs;
++#endif
+ } opt;
+ 
+ struct bitmap {
+@@ -590,7 +607,7 @@ static void copy_cluster(int rescue, u64
+ 	if (write_all(&fd_out, buff, csize) == -1) {
+ 		int err = errno;
+ 		perr_printf("Write failed");
+-		if (err == EIO && opt.stfs.f_type == 0x517b)
++		if (err == EIO && opt.stfs.F_TYPE == 0x517b)
+ 			Printf("Apparently you tried to clone to a remote "
+ 			       "Windows computer but they don't\nhave "
+ 			       "efficient sparse file handling by default. "
+@@ -1492,7 +1509,7 @@ static void set_filesize(s64 filesize)
+ 		Printf("WARNING: Couldn't get filesystem type: "
+ 		       "%s\n", strerror(errno));
+ 	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 "

sysutils/ntfsprogs/patches/patch-ah

@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 2005/03/15 20:24:30 rillig Exp $
+
+NetBSD-1.6.2 does not know about ENOTSUP.
+
+--- include/ntfs/compat.h.orig	Sat Sep  4 12:16:32 2004
++++ include/ntfs/compat.h	Sat Mar 12 10:13:43 2005
+@@ -50,5 +50,9 @@ extern int ffs(int i);
+ 
+ #endif /* defined WINDOWS */
+ 
++#ifndef ENOTSUP
++#define ENOTSUP EINVAL
++#endif
++
+ #endif /* defined _NTFS_COMPAT_H */
+ 

sysutils/ntfsprogs/patches/patch-am

@@ -0,0 +1,12 @@
+$NetBSD: patch-am,v 1.4 2008/03/08 08:56:47 adam Exp $
+
+--- ntfsprogs/Makefile.in.orig	2007-09-29 00:12:39.000000000 +0200
++++ ntfsprogs/Makefile.in
+@@ -999,7 +999,6 @@ install-dvi: install-dvi-am
+ 
+ install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ 
+ install-html: install-html-am
+ 

sysutils/ntfsprogs/patches/patch-an

@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.2 2008/03/08 08:56:47 adam Exp $
+
+--- configure.orig	2007-09-29 00:12:33.000000000 +0200
++++ configure
+@@ -2775,7 +2775,7 @@ fi
+ 
+ # Check whether --enable-default-device-io-ops was given.
+ if test "${enable_default_device_io_ops+set}" = set; then
+-  enableval=$enable_default_device_io_ops; if test "$enable_default_device_io_ops" == "no"; then
++  enableval=$enable_default_device_io_ops; if test "$enable_default_device_io_ops" = "no"; then
+ 		cat >>confdefs.h <<\_ACEOF
+ #define NO_NTFS_DEVICE_DEFAULT_IO_OPS 1
+ _ACEOF