Hi,
this updates the ntfs-3g fuse port to the current stable version of
2014.2.15.
My tests involving multilpe reads/writes/deletes on an NTFS formatted
USB stick were all succesful. Tested both on OpenBSD/amd64 and Windows.
I found no differences between the two.
I would appreciate more tests before I commit this.
I'm also looking for okays.
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 5 Jan 2014 01:51:15 -0000 1.4
+++ Makefile 29 Apr 2014 09:42:29 -0000
@@ -2,12 +2,11 @@
COMMENT = FUSE NTFS driver with read/write support
-V = 2013.1.13
+V = 2014.2.15
DISTNAME = ntfs-3g_ntfsprogs-${V}
PKGNAME = ntfs_3g-${V}
SHARED_LIBS += ntfs-3g 0.0 # .84
CATEGORIES = sysutils
-REVISION = 2
HOMEPAGE = http://www.tuxera.com/
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 14 Jun 2013 13:49:50 -0000 1.1.1.1
+++ distinfo 29 Apr 2014 09:42:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (ntfs-3g_ntfsprogs-2013.1.13.tgz) =
Szg/AHSjq3aDM50fGCIrEHqutJg9sRkpLEPCsnXO+yc=
-SIZE (ntfs-3g_ntfsprogs-2013.1.13.tgz) = 1176304
+SHA256 (ntfs-3g_ntfsprogs-2014.2.15.tgz) =
TDCZQAyxSyMaPJ1xizqNFS04VVBZNBzl/G0CKSpKW1Y=
+SIZE (ntfs-3g_ntfsprogs-2014.2.15.tgz) = 1143575
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 14 Jun 2013 13:49:50 -0000 1.1.1.1
+++ patches/patch-configure 29 Apr 2014 09:42:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.1.1.1 2013/06/14 13:49:50 pirofti Exp $
---- configure.orig Thu Jun 13 09:23:47 2013
-+++ configure Thu Jun 13 09:24:04 2013
-@@ -20385,7 +20385,7 @@ else
+--- configure.orig Sat Feb 15 16:07:59 2014
++++ configure Tue Apr 29 11:29:37 2014
+@@ -11890,7 +11890,7 @@ else
fi
;;
Index: patches/patch-libntfs-3g_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-libntfs-3g_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libntfs-3g_Makefile_in
--- patches/patch-libntfs-3g_Makefile_in 14 Jun 2013 13:49:50 -0000
1.1.1.1
+++ patches/patch-libntfs-3g_Makefile_in 29 Apr 2014 09:42:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-libntfs-3g_Makefile_in,v 1.1.1.1 2013/06/14 13:49:50 pirofti
Exp $
---- libntfs-3g/Makefile.in.orig Sun Jan 13 08:46:46 2013
-+++ libntfs-3g/Makefile.in Fri Jun 14 12:23:11 2013
-@@ -852,15 +852,9 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
+--- libntfs-3g/Makefile.in.orig Sat Feb 15 16:08:00 2014
++++ libntfs-3g/Makefile.in Tue Apr 29 11:29:37 2014
+@@ -915,15 +915,9 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-local
# We may need to move .so files to root
# And create ldscript or symbolic link from /usr
install-exec-hook: install-rootlibLTLIBRARIES
Index: patches/patch-ntfsprogs_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-ntfsprogs_Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-ntfsprogs_Makefile_in
--- patches/patch-ntfsprogs_Makefile_in 14 Jun 2013 13:49:50 -0000 1.1.1.1
+++ patches/patch-ntfsprogs_Makefile_in 29 Apr 2014 09:42:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-ntfsprogs_Makefile_in,v 1.1.1.1 2013/06/14 13:49:50 pirofti
Exp $
---- ntfsprogs/Makefile.in.orig Sun Jan 13 08:46:46 2013
-+++ ntfsprogs/Makefile.in Fri Jun 14 11:59:19 2013
-@@ -1083,7 +1083,7 @@ uninstall-man: uninstall-man8
+--- ntfsprogs/Makefile.in.orig Sat Feb 15 16:08:00 2014
++++ ntfsprogs/Makefile.in Tue Apr 29 11:29:37 2014
+@@ -1184,7 +1184,7 @@ uninstall-man: uninstall-man8
@ENABLE_NTFSPROGS_TRUE@install-exec-hook:
@ENABLE_NTFSPROGS_TRUE@ $(INSTALL) -d $(DESTDIR)/sbin
Index: patches/patch-ntfsprogs_ntfsclone_c
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-ntfsprogs_ntfsclone_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-ntfsprogs_ntfsclone_c
--- patches/patch-ntfsprogs_ntfsclone_c 14 Jun 2013 13:49:50 -0000 1.1.1.1
+++ patches/patch-ntfsprogs_ntfsclone_c 29 Apr 2014 09:42:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-ntfsprogs_ntfsclone_c,v 1.1.1.1 2013/06/14 13:49:50 pirofti
Exp $
---- ntfsprogs/ntfsclone.c.orig Thu Jun 13 10:49:08 2013
-+++ ntfsprogs/ntfsclone.c Thu Jun 13 10:51:37 2013
-@@ -746,7 +746,7 @@ static void copy_cluster(int rescue, u64 rescue_lcn, u
+--- ntfsprogs/ntfsclone.c.orig Sat Feb 15 16:07:52 2014
++++ ntfsprogs/ntfsclone.c Tue Apr 29 11:29:37 2014
+@@ -818,7 +818,7 @@ static void copy_cluster(int rescue, u64 rescue_lcn, u
#ifndef NO_STATFS
int err = errno;
perr_printf("Write failed");
@@ -10,7 +10,7 @@ $OpenBSD: patch-ntfsprogs_ntfsclone_c,v
Printf("Apparently you tried to clone to a remote "
"Windows computer but they don't\nhave "
"efficient sparse file handling by default. "
-@@ -2056,7 +2056,7 @@ static void set_filesize(s64 filesize)
+@@ -2238,7 +2238,7 @@ static void set_filesize(s64 filesize)
Printf("WARNING: Couldn't get filesystem type: "
"%s\n", strerror(errno));
else
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/sysutils/ntfs-3g/patches/patch-src_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 15 Jun 2013 14:25:28 -0000 1.2
+++ patches/patch-src_Makefile_in 29 Apr 2014 09:42:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.2 2013/06/15 14:25:28 ajacoutot Exp $
---- src/Makefile.in.orig Sun Jan 13 07:46:46 2013
-+++ src/Makefile.in Sat Jun 15 16:23:19 2013
-@@ -37,8 +37,7 @@ target_triplet = @target@
+--- src/Makefile.in.orig Sat Feb 15 16:08:01 2014
++++ src/Makefile.in Tue Apr 29 11:32:40 2014
+@@ -39,8 +39,7 @@ target_triplet = @target@
@ENABLE_NTFS_3G_TRUE@bin_PROGRAMS = ntfs-3g.probe$(EXEEXT) \
@ENABLE_NTFS_3G_TRUE@ ntfs-3g.usermap$(EXEEXT) \
@ENABLE_NTFS_3G_TRUE@ ntfs-3g.secaudit$(EXEEXT)
@@ -11,16 +11,16 @@ $OpenBSD: patch-src_Makefile_in,v 1.2 20
subdir = src
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/ntfs-3g.8.in $(srcdir)/ntfs-3g.probe.8.in \
-@@ -395,7 +394,7 @@ install-rootbinPROGRAMS: $(rootbin_PROGRAMS)
- ; then \
- f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
- echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(rootbinPROGRAMS_INSTALL) '$$p'
'$(DESTDIR)$(rootbindir)/$$f'"; \
-- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(rootbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(rootbindir)/$$f"
|| exit 1; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS)
--mode=install $(rootbinPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" ||
exit 1; \
- else :; fi; \
- done
+@@ -449,7 +448,7 @@ install-rootbinPROGRAMS: $(rootbin_PROGRAMS)
+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ test -z "$$files" || { \
+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
'$(DESTDIR)$(rootbindir)$$dir'"; \
+- $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
"$(DESTDIR)$(rootbindir)$$dir" || exit $$?; \
++ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS)
$(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files
"$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+ } \
+ ; done
-@@ -834,7 +833,7 @@ uninstall-man: uninstall-man8
+@@ -922,7 +921,7 @@ uninstall-man: uninstall-man8
@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-exec-local:
install-rootbinPROGRAMS
@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(MKDIR_P)
"$(DESTDIR)/sbin"
