Attachment #114888 for bug #156615

View | Details | Raw Unified | Return to bug 156615
Collapse All | Expand All




#

PORTNAME=	ntfs
PORTVERSION=	2011.4.12
CATEGORIES=	sysutils
MASTER_SITES=	http://tuxera.com/opensource/
PKGNAMEPREFIX=	fusefs-
DISTNAME=	${PORTNAME}-3g_ntfsprogs-${PORTVERSION}
EXTRACT_SUFX=	.tgz

MAINTAINER=	ports@FreeBSD.org

USE_ICONV=	yes
CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --disable-mount-helper \
		--disable-mtab --with-fuse=external
CPPFLAGS=-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
CONFIGURE_ENV="LDFLAGS=-L${LOCALBASE}/lib"

OPTIONS=	LOCK "Lock the device when mounting (avoids access)" on \
		UBLIO "Enable user space cache for improved speed" on

Lines 1-2 Link Here

(-)/usr/home/bart/fusefs-ntfs/distinfo (-2 / +2 lines)
1	SHA256 (ntfs-3g-2010.10.2.tgz) = 17c7e7f1ea22951bdefaa8aa0e36a011f65fbc76fc3511d16433c46d899e9e71	1	SHA256 (ntfs-3g_ntfsprogs-2011.4.12.tgz) = aa8c747f0bfe819b2387b05e12db8d35e4ac96dcb2432873a0b939e248b2ee05
2	SIZE (ntfs-3g-2010.10.2.tgz) = 875186	2	SIZE (ntfs-3g_ntfsprogs-2011.4.12.tgz) = 1126704




--- libntfs-3g/Makefile.in.orig	2011-04-10 20:04:51.000000000 +0200
+++ libntfs-3g/Makefile.in	2011-04-25 18:54:01.000000000 +0200
@@ -250,6 +250,7 @@
 libntfs_3g_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
 libntfs_3g_la_LDFLAGS = -version-info $(LIBNTFS_3G_VERSION) -no-undefined
 @FUSE_INTERNAL_TRUE@libntfs_3g_la_LIBADD = $(top_builddir)/libfuse-lite/libfuse-lite.la

 libntfs_3g_la_SOURCES = acls.c attrib.c attrlist.c bitmap.c bootsect.c \
 	cache.c collate.c compat.c compress.c debug.c device.c dir.c \
 	efs.c index.c inode.c lcnalloc.c logfile.c logging.c mft.c \
--- src/ntfs-3g.c.orig	2011-04-10 20:04:41.000000000 +0200
+++ src/ntfs-3g.c	2011-04-25 18:56:07.000000000 +0200
@@ -3262,9 +3262,13 @@
 #else
 	.utime		= ntfs_fuse_utime,
 #endif
+#ifndef __FreeBSD__
+ 	.bmap		= ntfs_fuse_bmap,
+#else
+	.bmap		= NULL,
+#endif
 	.fsync		= ntfs_fuse_fsync,
 	.fsyncdir	= ntfs_fuse_fsync,
-	.bmap		= ntfs_fuse_bmap,
 	.destroy        = ntfs_fuse_destroy2,
 #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
 	.access		= ntfs_fuse_access,




--- ntfsprogs/ntfsclone.3	2011-04-10 20:04:41.000000000 +0200
+++ ntfsprogs/ntfsclone.c	2011-04-25 14:06:11.000000000 +0200
@@ -89,6 +89,10 @@
 #define BLKGETSIZE64	_IOR(0x12,114,size_t)	/* Get device size in bytes. */
 #endif
 
+#ifdef __sun
+#define NO_STATFS 1	/* statfs(2) and f_type are not universal */
+#endif
+
 static const char *EXEC_NAME = "ntfsclone";
 
 static const char *bad_sectors_warning_msg =
@@ -119,7 +123,9 @@
 	int restore_image;
 	char *output;
 	char *volume;
+#ifndef NO_STATFS
 	struct statfs stfs;
+#endif
 } opt;
 
 struct bitmap {
@@ -629,6 +635,7 @@
 	}
 
 	if (write_all(&fd_out, buff, csize) == -1) {
+#ifndef NO_STATFS
 		int err = errno;
 		perr_printf("Write failed");
 		if (err == EIO && opt.stfs.f_type == 0x517b)
@@ -637,6 +644,9 @@
 			       "efficient sparse file handling by default. "
 			       "Please try a different method.\n");
 		exit(1);
+#else
+		perr_printf("Write failed");
+#endif
 	}
 }
 
@@ -1565,6 +1575,7 @@
 
 static void set_filesize(s64 filesize)
 {
+#ifndef NO_STATFS
 	long fs_type = 0; /* Unknown filesystem type */
 
 	if (fstatfs(fd_out, &opt.stfs) == -1)
@@ -1582,22 +1593,27 @@
 		Printf("WARNING: You're using SMBFS and if the remote share "
 		       "isn't Samba but a Windows\ncomputer then the clone "
 		       "operation will be very inefficient and may fail!\n");
+#endif
 
 	if (ftruncate(fd_out, filesize) == -1) {
 		int err = errno;
 		perr_printf("ftruncate failed for file '%s'", opt.output);
+#ifndef NO_STATFS
 		if (fs_type)
 			Printf("Destination filesystem type is 0x%lx.\n",
 			       (unsigned long)fs_type);
+#endif
 		if (err == E2BIG) {
 			Printf("Your system or the destination filesystem "
 			       "doesn't support large files.\n");
+#ifndef NO_STATFS
 			if (fs_type == 0x517b) {
 				Printf("SMBFS needs minimum Linux kernel "
 				       "version 2.4.25 and\n the 'lfs' option"
 				       "\nfor smbmount to have large "
 				       "file support.\n");
 			}
+#endif
 		} else if (err == EPERM) {
 			Printf("Apparently the destination filesystem doesn't "
 			       "support sparse files.\nYou can overcome this "




--- ntfsprogs/ntfsresize.2	2011-04-10 20:04:41.000000000 +0200
+++ ntfsprogs/ntfsresize.c	2011-04-24 08:34:35.000000000 +0200
@@ -48,6 +48,9 @@
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif




--- src/ntfs-3g_common.9	2011-04-23 09:17:21.000000000 +0200
+++ src/ntfs-3g_common.c	2011-04-24 08:24:33.000000000 +0200
@@ -32,6 +32,10 @@
 #include <string.h>
 #endif

+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
 #endif
--- src/ntfs-3g_common.c.ref	2011-04-23 08:25:28.000000000 +0200
+++ src/ntfs-3g_common.c	2011-04-23 08:32:16.000000000 +0200
@@ -58,8 +58,6 @@

 static const char nf_ns_alt_xattr_efsinfo[] = "user.ntfs.efsinfo";

-#ifdef HAVE_SETXATTR
-
 static const char def_opts[] = "allow_other,nonempty,";

 	/*
@@ -573,6 +571,8 @@
 	return 0;
 }

+#ifdef HAVE_SETXATTR
+
 int ntfs_fuse_listxattr_common(ntfs_inode *ni, ntfs_attr_search_ctx *actx,
 			char *list, size_t size, BOOL prefixing)
 {

Return to bug 156615

Lines 5-15 Link Here

(-)/usr/home/bart/fusefs-ntfs/Makefile (-4 / +4 lines)
5	#	5	#
6		6
7	PORTNAME= ntfs	7	PORTNAME= ntfs
8	PORTVERSION= 2010.10.2	8	PORTVERSION= 2011.4.12
9	CATEGORIES= sysutils	9	CATEGORIES= sysutils
10	MASTER_SITES= http://tuxera.com/opensource/	10	MASTER_SITES= http://tuxera.com/opensource/
11	PKGNAMEPREFIX= fusefs-	11	PKGNAMEPREFIX= fusefs-
12	DISTNAME= ${PORTNAME}-3g-${PORTVERSION}	12	DISTNAME= ${PORTNAME}-3g_ntfsprogs-${PORTVERSION}
13	EXTRACT_SUFX= .tgz	13	EXTRACT_SUFX= .tgz
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
Lines 25-32 Link Here
25	USE_ICONV= yes	25	USE_ICONV= yes
26	CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \	26	CONFIGURE_ARGS= --exec-prefix=${PREFIX} --disable-mount-helper \
27	--disable-mtab --with-fuse=external	27	--disable-mtab --with-fuse=external
28	CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include" \	28	CPPFLAGS=-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
29	LDFLAGS="-L${LOCALBASE}/lib"	29	CONFIGURE_ENV="LDFLAGS=-L${LOCALBASE}/lib"
30		30
31	OPTIONS= LOCK "Lock the device when mounting (avoids access)" on \	31	OPTIONS= LOCK "Lock the device when mounting (avoids access)" on \
32	UBLIO "Enable user space cache for improved speed" on	32	UBLIO "Enable user space cache for improved speed" on

Lines 1-6 Link Here

(-)/usr/home/bart/fusefs-ntfs/files/extra-patch-ublio (-7 / +10 lines)
1	--- libntfs-3g/Makefile.in.orig 2010-03-06 13:12:36.000000000 -0300	1	--- libntfs-3g/Makefile.in.orig 2011-04-10 20:04:51.000000000 +0200
2	+++ libntfs-3g/Makefile.in 2010-10-04 15:10:43.000000000 -0300	2	+++ libntfs-3g/Makefile.in 2011-04-25 18:54:01.000000000 +0200
3	@@ -241,6 +241,7 @@	3	@@ -250,6 +250,7 @@
4	libntfs_3g_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g	4	libntfs_3g_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g
5	libntfs_3g_la_LDFLAGS = -version-info $(LIBNTFS_3G_VERSION) -no-undefined	5	libntfs_3g_la_LDFLAGS = -version-info $(LIBNTFS_3G_VERSION) -no-undefined
6	@FUSE_INTERNAL_TRUE@libntfs_3g_la_LIBADD = $(top_builddir)/libfuse-lite/libfuse-lite.la	6	@FUSE_INTERNAL_TRUE@libntfs_3g_la_LIBADD = $(top_builddir)/libfuse-lite/libfuse-lite.la
Lines 8-24 Link Here
8	libntfs_3g_la_SOURCES = acls.c attrib.c attrlist.c bitmap.c bootsect.c \	8	libntfs_3g_la_SOURCES = acls.c attrib.c attrlist.c bitmap.c bootsect.c \
9	cache.c collate.c compat.c compress.c debug.c device.c dir.c \	9	cache.c collate.c compat.c compress.c debug.c device.c dir.c \
10	efs.c index.c inode.c lcnalloc.c logfile.c logging.c mft.c \	10	efs.c index.c inode.c lcnalloc.c logfile.c logging.c mft.c \
11	--- src/ntfs-3g.c.orig 2010-03-06 13:12:25.000000000 -0300	11	--- src/ntfs-3g.c.orig 2011-04-10 20:04:41.000000000 +0200
12	+++ src/ntfs-3g.c 2010-10-04 15:11:57.000000000 -0300	12	+++ src/ntfs-3g.c 2011-04-25 18:56:07.000000000 +0200
13	@@ -3508,7 +3508,11 @@	13	@@ -3262,9 +3262,13 @@
14	#else	14	#else
15	.utime = ntfs_fuse_utime,	15	.utime = ntfs_fuse_utime,
16	#endif	16	#endif
17	+#ifndef __FreeBSD__	17	+#ifndef __FreeBSD__
18	.bmap = ntfs_fuse_bmap,	18	+ .bmap = ntfs_fuse_bmap,
19	+#else	19	+#else
20	+ .bmap = NULL,	20	+ .bmap = NULL,
21	+#endif	21	+#endif
		22	.fsync = ntfs_fuse_fsync,
		23	.fsyncdir = ntfs_fuse_fsync,
		24	- .bmap = ntfs_fuse_bmap,
22	.destroy = ntfs_fuse_destroy2,	25	.destroy = ntfs_fuse_destroy2,
23	#if !KERNELPERMS \| (POSIXACLS & !KERNELACLS)	26	#if !KERNELPERMS \| (POSIXACLS & !KERNELACLS)
24	.access = ntfs_fuse_access,	27	.access = ntfs_fuse_access,

Line 0 Link Here

(-)/usr/home/bart/fusefs-ntfs/files/patch-ntfsprogs__ntfsclone.c (+77 lines)
		1	--- ntfsprogs/ntfsclone.3 2011-04-10 20:04:41.000000000 +0200
		2	+++ ntfsprogs/ntfsclone.c 2011-04-25 14:06:11.000000000 +0200
		3	@@ -89,6 +89,10 @@
		4	#define BLKGETSIZE64 _IOR(0x12,114,size_t) /* Get device size in bytes. */
		5	#endif
		6
		7	+#ifdef __sun
		8	+#define NO_STATFS 1 /* statfs(2) and f_type are not universal */
		9	+#endif
		10	+
		11	static const char *EXEC_NAME = "ntfsclone";
		12
		13	static const char *bad_sectors_warning_msg =
		14	@@ -119,7 +123,9 @@
		15	int restore_image;
		16	char *output;
		17	char *volume;
		18	+#ifndef NO_STATFS
		19	struct statfs stfs;
		20	+#endif
		21	} opt;
		22
		23	struct bitmap {
		24	@@ -629,6 +635,7 @@
		25	}
		26
		27	if (write_all(&fd_out, buff, csize) == -1) {
		28	+#ifndef NO_STATFS
		29	int err = errno;
		30	perr_printf("Write failed");
		31	if (err == EIO && opt.stfs.f_type == 0x517b)
		32	@@ -637,6 +644,9 @@
		33	"efficient sparse file handling by default. "
		34	"Please try a different method.\n");
		35	exit(1);
		36	+#else
		37	+ perr_printf("Write failed");
		38	+#endif
		39	}
		40	}
		41
		42	@@ -1565,6 +1575,7 @@
		43
		44	static void set_filesize(s64 filesize)
		45	{
		46	+#ifndef NO_STATFS
		47	long fs_type = 0; /* Unknown filesystem type */
		48
		49	if (fstatfs(fd_out, &opt.stfs) == -1)
		50	@@ -1582,22 +1593,27 @@
		51	Printf("WARNING: You're using SMBFS and if the remote share "
		52	"isn't Samba but a Windows\ncomputer then the clone "
		53	"operation will be very inefficient and may fail!\n");
		54	+#endif
		55
		56	if (ftruncate(fd_out, filesize) == -1) {
		57	int err = errno;
		58	perr_printf("ftruncate failed for file '%s'", opt.output);
		59	+#ifndef NO_STATFS
		60	if (fs_type)
		61	Printf("Destination filesystem type is 0x%lx.\n",
		62	(unsigned long)fs_type);
		63	+#endif
		64	if (err == E2BIG) {
65	Printf("Your system or the destination filesystem "
66	"doesn't support large files.\n");
67	+#ifndef NO_STATFS
68	if (fs_type == 0x517b) {
69	Printf("SMBFS needs minimum Linux kernel "
70	"version 2.4.25 and\n the 'lfs' option"
71	"\nfor smbmount to have large "
72	"file support.\n");
73	}
74	+#endif
75	} else if (err == EPERM) {
76	Printf("Apparently the destination filesystem doesn't "
77	"support sparse files.\nYou can overcome this "

Line 0 Link Here

(-)/usr/home/bart/fusefs-ntfs/files/patch-ntfsprogs__ntfsresize.c (+12 lines)
	1	--- ntfsprogs/ntfsresize.2 2011-04-10 20:04:41.000000000 +0200
	2	+++ ntfsprogs/ntfsresize.c 2011-04-24 08:34:35.000000000 +0200
	3	@@ -48,6 +48,9 @@
	4	#ifdef HAVE_ERRNO_H
	5	#include <errno.h>
	6	#endif
	7	+#ifdef HAVE_LIMITS_H
	8	+#include <limits.h>
	9	+#endif
	10	#ifdef HAVE_GETOPT_H
	11	#include <getopt.h>
	12	#endif

Line 0 Link Here

(-)/usr/home/bart/fusefs-ntfs/files/patch-src__ntfs-3g_common.c (+33 lines)
	1	--- src/ntfs-3g_common.9 2011-04-23 09:17:21.000000000 +0200
	2	+++ src/ntfs-3g_common.c 2011-04-24 08:24:33.000000000 +0200
	3	@@ -32,6 +32,10 @@
	4	#include <string.h>
	5	#endif
	6
	7	+#ifdef HAVE_LIMITS_H
	8	+#include <limits.h>
	9	+#endif
	10	+
	11	#ifdef HAVE_ERRNO_H
	12	#include <errno.h>
	13	#endif
	14	--- src/ntfs-3g_common.c.ref 2011-04-23 08:25:28.000000000 +0200
	15	+++ src/ntfs-3g_common.c 2011-04-23 08:32:16.000000000 +0200
	16	@@ -58,8 +58,6 @@
	17
	18	static const char nf_ns_alt_xattr_efsinfo[] = "user.ntfs.efsinfo";
	19
	20	-#ifdef HAVE_SETXATTR
	21	-
	22	static const char def_opts[] = "allow_other,nonempty,";
	23
	24	/*
	25	@@ -573,6 +571,8 @@
	26	return 0;
	27	}
	28
	29	+#ifdef HAVE_SETXATTR
	30	+
	31	int ntfs_fuse_listxattr_common(ntfs_inode ni, ntfs_attr_search_ctx actx,
	32	char *list, size_t size, BOOL prefixing)
	33	{