pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
update libntfs used for fuse-ntfs-3g to the latest version 2016.2.22
Module Name: pkgsrc-wip
Committed By: Daniel Oelschlegel <amoibos%gmail.com@localhost>
Pushed By: amoibos
Date: Sun Sep 11 17:53:52 2016 +0000
Changeset: 6dbc8a2130aaf3120adff15b5f686bdaacba8bd8
Added Files:
libntfs/DESCR
libntfs/Makefile
libntfs/Makefile.common
libntfs/PLIST
libntfs/buildlink3.mk
libntfs/distinfo
libntfs/patches/patch-Makefile.in
libntfs/patches/patch-include_ntfs-3g_compat.h
libntfs/patches/patch-include_ntfs-3g_types.h
libntfs/patches/patch-libntfs-3g_Makefile.in
libntfs/patches/patch-libntfs-3g_compat.c
libntfs/patches/patch-libntfs-3g_device.c
libntfs/patches/patch-ntfsprogs_Makefile.in
libntfs/patches/patch-ntfsprogs_ntfsclone.c
libntfs/patches/patch-src_Makefile.in
libntfs/patches/patch-src_ntfs-3g.c
Log Message:
update libntfs used for fuse-ntfs-3g to the latest version 2016.2.22
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6dbc8a2130aaf3120adff15b5f686bdaacba8bd8
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
libntfs/DESCR | 5 +
libntfs/Makefile | 13 +++
libntfs/Makefile.common | 23 +++++
libntfs/PLIST | 41 ++++++++
libntfs/buildlink3.mk | 12 +++
libntfs/distinfo | 16 ++++
libntfs/patches/patch-Makefile.in | 15 +++
libntfs/patches/patch-include_ntfs-3g_compat.h | 16 ++++
libntfs/patches/patch-include_ntfs-3g_types.h | 24 +++++
libntfs/patches/patch-libntfs-3g_Makefile.in | 13 +++
libntfs/patches/patch-libntfs-3g_compat.c | 20 ++++
libntfs/patches/patch-libntfs-3g_device.c | 40 ++++++++
libntfs/patches/patch-ntfsprogs_Makefile.in | 33 +++++++
libntfs/patches/patch-ntfsprogs_ntfsclone.c | 55 +++++++++++
libntfs/patches/patch-src_Makefile.in | 124 +++++++++++++++++++++++++
libntfs/patches/patch-src_ntfs-3g.c | 19 ++++
16 files changed, 469 insertions(+)
diffs:
diff --git a/libntfs/DESCR b/libntfs/DESCR
new file mode 100644
index 0000000..f19858a
--- /dev/null
+++ b/libntfs/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).
diff --git a/libntfs/Makefile b/libntfs/Makefile
new file mode 100644
index 0000000..a9de509
--- /dev/null
+++ b/libntfs/Makefile
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2014/05/19 12:22:06 adam 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
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/libntfs/Makefile.common b/libntfs/Makefile.common
new file mode 100644
index 0000000..eeab4ef
--- /dev/null
+++ b/libntfs/Makefile.common
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.common,v 1.3 2016/03/01 20:16:33 joerg Exp $
+# used by filesystems/fuse-ntfs-3g/Makefile
+# used by sysutils/ntfsprogs/Makefile
+
+DISTNAME= ntfs-3g_ntfsprogs-2016.2.22
+CATEGORIES= sysutils
+MASTER_SITES= http://tuxera.com/opensource/
+EXTRACT_SUFX= .tgz
+
+MAINTAINER?= pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE= http://www.tuxera.com/community/ntfs-3g-download/
+LICENSE= gnu-gpl-v2
+
+DISTINFO_FILE= ${.CURDIR}/../../filesystems/libntfs/distinfo
+PATCHDIR= ${.CURDIR}/../../filesystems/libntfs/patches
+
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --enable-posix-acls
+CONFIGURE_ARGS+= --enable-xattr-mappings
+
+CPPFLAGS.NetBSD+= -D_KERNTYPES
diff --git a/libntfs/PLIST b/libntfs/PLIST
new file mode 100644
index 0000000..b48cb1b
--- /dev/null
+++ b/libntfs/PLIST
@@ -0,0 +1,41 @@
+@comment $NetBSD: PLIST,v 1.2 2015/11/10 17:45:22 adam Exp $
+include/ntfs-3g/acls.h
+include/ntfs-3g/attrib.h
+include/ntfs-3g/attrlist.h
+include/ntfs-3g/bitmap.h
+include/ntfs-3g/bootsect.h
+include/ntfs-3g/cache.h
+include/ntfs-3g/collate.h
+include/ntfs-3g/compat.h
+include/ntfs-3g/compress.h
+include/ntfs-3g/debug.h
+include/ntfs-3g/device.h
+include/ntfs-3g/device_io.h
+include/ntfs-3g/dir.h
+include/ntfs-3g/ea.h
+include/ntfs-3g/efs.h
+include/ntfs-3g/endians.h
+include/ntfs-3g/index.h
+include/ntfs-3g/inode.h
+include/ntfs-3g/ioctl.h
+include/ntfs-3g/layout.h
+include/ntfs-3g/lcnalloc.h
+include/ntfs-3g/logfile.h
+include/ntfs-3g/logging.h
+include/ntfs-3g/mft.h
+include/ntfs-3g/misc.h
+include/ntfs-3g/mst.h
+include/ntfs-3g/ntfstime.h
+include/ntfs-3g/object_id.h
+include/ntfs-3g/param.h
+include/ntfs-3g/realpath.h
+include/ntfs-3g/reparse.h
+include/ntfs-3g/runlist.h
+include/ntfs-3g/security.h
+include/ntfs-3g/support.h
+include/ntfs-3g/types.h
+include/ntfs-3g/unistr.h
+include/ntfs-3g/volume.h
+include/ntfs-3g/xattrs.h
+lib/libntfs-3g.la
+lib/pkgconfig/libntfs-3g.pc
diff --git a/libntfs/buildlink3.mk b/libntfs/buildlink3.mk
new file mode 100644
index 0000000..1ea97f6
--- /dev/null
+++ b/libntfs/buildlink3.mk
@@ -0,0 +1,12 @@
+# $NetBSD: buildlink3.mk,v 1.1 2014/05/19 12:22:06 adam Exp $
+
+BUILDLINK_TREE+= libntfs
+
+.if !defined(LIBNTFS_BUILDLINK3_MK)
+LIBNTFS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libntfs+= libntfs>=2014.2.15
+BUILDLINK_PKGSRCDIR.libntfs?= ../../filesystems/libntfs
+.endif # LIBNTFS_BUILDLINK3_MK
+
+BUILDLINK_TREE+= -libntfs
diff --git a/libntfs/distinfo b/libntfs/distinfo
new file mode 100644
index 0000000..92e733a
--- /dev/null
+++ b/libntfs/distinfo
@@ -0,0 +1,16 @@
+$NetBSD: distinfo,v 1.3 2015/11/10 17:45:22 adam Exp $
+
+SHA1 (ntfs-3g_ntfsprogs-2016.2.22.tgz) = 382df40c366711003cf24d2342033c23e2580b42
+RMD160 (ntfs-3g_ntfsprogs-2016.2.22.tgz) = 3d84fc2724eb0a73ad8ed96816f949ada79a876d
+SHA512 (ntfs-3g_ntfsprogs-2016.2.22.tgz) = dbd36fadd2881db1d17fdbf5d2b4e50bbe11dc9dd0ad4917e7f8bc4032c2287346143756ce8754df0d46ce9209f2c0c41b626cad929d76a9bc881712c7101c15
+Size (ntfs-3g_ntfsprogs-2016.2.22.tgz) = 1264364 bytes
+SHA1 (patch-Makefile.in) = d79c5ce07757f7b2ea5d2cd51d8658ecff7638d2
+SHA1 (patch-include_ntfs-3g_compat.h) = 62f1a0e23faab267683985f72d8f6efeb97c2a14
+SHA1 (patch-include_ntfs-3g_types.h) = bfd378ccbafb266f60d5438bfde45efd63eb684e
+SHA1 (patch-libntfs-3g_Makefile.in) = abff3058ed1ff06a7a928af6b8c4560d64baad40
+SHA1 (patch-libntfs-3g_compat.c) = 176929b7d5af34d3d13cb830d564f866a08964f5
+SHA1 (patch-libntfs-3g_device.c) = cbfe076c81d336d491feaae99d813708ed029aa3
+SHA1 (patch-ntfsprogs_Makefile.in) = e632d29ca94a2603c8c2e009936f331174ea8e2e
+SHA1 (patch-ntfsprogs_ntfsclone.c) = 3848bcc8d8c39c6950689c43dec52177ed627b60
+SHA1 (patch-src_Makefile.in) = 9dc8ecf0dfa5ad8cf3429248767ef6e2b0451723
+SHA1 (patch-src_ntfs-3g.c) = 6242ae38ff7117381a3a1b22740645a22932c0e5
diff --git a/libntfs/patches/patch-Makefile.in b/libntfs/patches/patch-Makefile.in
new file mode 100644
index 0000000..0b98897
--- /dev/null
+++ b/libntfs/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Don't install README.
+
+--- Makefile.in.orig 2016-09-11 13:17:40.627105908 +0000
++++ Makefile.in 2016-09-11 13:17:54.193103497 +0000
+@@ -841,7 +841,7 @@
+
+ info-am:
+
+-install-data-am: install-docDATA
++install-data-am:
+
+ install-dvi: install-dvi-recursive
+
diff --git a/libntfs/patches/patch-include_ntfs-3g_compat.h b/libntfs/patches/patch-include_ntfs-3g_compat.h
new file mode 100644
index 0000000..09929af
--- /dev/null
+++ b/libntfs/patches/patch-include_ntfs-3g_compat.h
@@ -0,0 +1,16 @@
+$NetBSD$
+
+NetBSD-1.6.2 does not know about ENOTSUP.
+
+--- include/ntfs-3g/compat.h.orig 2016-09-11 13:20:39.912972713 +0000
++++ include/ntfs-3g/compat.h 2016-09-11 13:22:14.634709911 +0000
+@@ -71,5 +71,9 @@
+
+ #endif /* defined WINDOWS */
+
++#ifndef ENOTSUP
++#define ENOTSUP EINVAL
++#endif
++
+ #endif /* defined _NTFS_COMPAT_H */
+
diff --git a/libntfs/patches/patch-include_ntfs-3g_types.h b/libntfs/patches/patch-include_ntfs-3g_types.h
new file mode 100644
index 0000000..8da22a5
--- /dev/null
+++ b/libntfs/patches/patch-include_ntfs-3g_types.h
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Fix TRUE and FALSE definitons.
+
+--- include/ntfs-3g/types.h.orig 2016-09-11 14:41:15.893287643 +0000
++++ include/ntfs-3g/types.h 2016-09-11 14:44:17.222693852 +0000
+@@ -76,6 +76,17 @@
+ 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
diff --git a/libntfs/patches/patch-libntfs-3g_Makefile.in b/libntfs/patches/patch-libntfs-3g_Makefile.in
new file mode 100644
index 0000000..0b65039
--- /dev/null
+++ b/libntfs/patches/patch-libntfs-3g_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+
+--- libntfs-3g/Makefile.in.orig 2016-09-10 20:56:17.741899778 +0000
++++ libntfs-3g/Makefile.in 2016-09-10 20:58:08.408036431 +0000
+@@ -983,7 +983,6 @@
+
+ install-exec-am: install-libLTLIBRARIES
+ @$(NORMAL_INSTALL)
+- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-html: install-html-am
+
+ install-html-am:
diff --git a/libntfs/patches/patch-libntfs-3g_compat.c b/libntfs/patches/patch-libntfs-3g_compat.c
new file mode 100644
index 0000000..7f746e6
--- /dev/null
+++ b/libntfs/patches/patch-libntfs-3g_compat.c
@@ -0,0 +1,20 @@
+$NetBSD$
+
+Add missing function for NetBSD.
+
+--- libntfs-3g/compat.c.orig 2016-09-11 14:34:51.477253964 +0000
++++ libntfs-3g/compat.c 2016-09-11 14:36:43.021277316 +0000
+@@ -248,3 +248,12 @@
+ *************************************************************/
+ #endif /* HAVE_STRSEP */
+
++#if defined(__NetBSD__)
++#include <fuse.h>
++
++int fuse_version(void)
++{
++ return FUSE_VERSION;
++}
++
++#endif /* __NetBSD__ */
+\ No newline at end of file
diff --git a/libntfs/patches/patch-libntfs-3g_device.c b/libntfs/patches/patch-libntfs-3g_device.c
new file mode 100644
index 0000000..61825bb
--- /dev/null
+++ b/libntfs/patches/patch-libntfs-3g_device.c
@@ -0,0 +1,40 @@
+$NetBSD$
+
+--- libntfs-3g/device.c.orig 2016-02-22 07:34:33.000000000 +0000
++++ libntfs-3g/device.c 2016-09-11 16:02:26.312141785 +0000
+@@ -95,6 +95,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)
+@@ -596,6 +600,24 @@
+ }
+ }
+ #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 / blocksize;
++ }
++ }
++ }
++#endif
++
+ /*
+ * We couldn't figure it out by using a specialized ioctl,
+ * so do binary search to find the size of the device.
diff --git a/libntfs/patches/patch-ntfsprogs_Makefile.in b/libntfs/patches/patch-ntfsprogs_Makefile.in
new file mode 100644
index 0000000..13017d9
--- /dev/null
+++ b/libntfs/patches/patch-ntfsprogs_Makefile.in
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Link against already built and installed libntfs.
+
+--- ntfsprogs/Makefile.in.orig 2016-09-11 14:09:37.000123337 +0000
++++ ntfsprogs/Makefile.in 2016-09-11 14:14:11.904729788 +0000
+@@ -142,8 +142,7 @@
+ @ENABLE_NTFSPROGS_TRUE@ mkntfs-utils.$(OBJEXT)
+ mkntfs_OBJECTS = $(am_mkntfs_OBJECTS)
+ am__DEPENDENCIES_1 =
+-@REALLYSTATIC_FALSE@am__DEPENDENCIES_2 = \
+-@REALLYSTATIC_FALSE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
++am__DEPENDENCIES_2 =
+ @REALLYSTATIC_TRUE@am__DEPENDENCIES_2 = $(top_builddir)/libntfs-3g/.libs/libntfs-3g.a \
+ @REALLYSTATIC_TRUE@ $(am__DEPENDENCIES_1)
+ @ENABLE_NTFSPROGS_TRUE@mkntfs_DEPENDENCIES = $(am__DEPENDENCIES_2) \
+@@ -585,7 +584,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-@REALLYSTATIC_FALSE@AM_LIBS = $(top_builddir)/libntfs-3g/libntfs-3g.la
++@REALLYSTATIC_FALSE@AM_LIBS = -lntfs-3g
+ @REALLYSTATIC_TRUE@AM_LIBS = $(top_builddir)/libntfs-3g/.libs/libntfs-3g.a $(NTFSPROGS_STATIC_LIBS)
+ @REALLYSTATIC_FALSE@AM_LFLAGS = $(all_libraries)
+ # older builds may need -static instead of newer -all-static
+@@ -1296,7 +1295,6 @@
+
+ install-exec-am: install-binPROGRAMS install-sbinPROGRAMS
+ @$(NORMAL_INSTALL)
+- $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+ install-html: install-html-am
+
+ install-html-am:
diff --git a/libntfs/patches/patch-ntfsprogs_ntfsclone.c b/libntfs/patches/patch-ntfsprogs_ntfsclone.c
new file mode 100644
index 0000000..c412016
--- /dev/null
+++ b/libntfs/patches/patch-ntfsprogs_ntfsclone.c
@@ -0,0 +1,55 @@
+$NetBSD$
+
+--- ntfsprogs/ntfsclone.c.orig 2016-09-11 13:57:41.776108524 +0000
++++ ntfsprogs/ntfsclone.c 2016-09-11 14:08:04.560295452 +0000
+@@ -71,6 +71,19 @@
+ */
+ #define NTFS_DO_NOT_CHECK_ENDIANS
+
++#ifdef __NetBSD__
++# include <sys/param.h>
++ /* NetBSD version 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"
+@@ -164,8 +177,12 @@
+ char *output;
+ char *volume;
+ #ifndef NO_STATFS
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 299000900)
++ struct statvfs stfs;
++#else
+ struct statfs stfs;
+ #endif
++#endif
+ } opt;
+
+ struct bitmap {
+@@ -842,7 +859,7 @@
+ #ifndef NO_STATFS
+ 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. "
+@@ -2262,7 +2279,7 @@
+ 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 "
diff --git a/libntfs/patches/patch-src_Makefile.in b/libntfs/patches/patch-src_Makefile.in
new file mode 100644
index 0000000..e7e781d
--- /dev/null
+++ b/libntfs/patches/patch-src_Makefile.in
@@ -0,0 +1,124 @@
+$NetBSD$
+
+Add ENABLE_LOWNTFS condition.
+Link against already built and installed libntfs.
+Install binaries into PREFIX, not the root directory
+
+--- src/Makefile.in.orig 2016-09-11 13:35:04.436970819 +0000
++++ src/Makefile.in 2016-09-11 13:55:52.398666764 +0000
+@@ -84,7 +84,7 @@
+ @ENABLE_NTFS_3G_TRUE@ ntfs-3g.usermap$(EXEEXT) \
+ @ENABLE_NTFS_3G_TRUE@ ntfs-3g.secaudit$(EXEEXT)
+ @ENABLE_NTFS_3G_TRUE@rootbin_PROGRAMS = ntfs-3g$(EXEEXT) \
+-@ENABLE_NTFS_3G_TRUE@ lowntfs-3g$(EXEEXT)
++@ENABLE_LOWNTFS@@ENABLE_NTFS_3G_TRUE@ lowntfs-3g$(EXEEXT)
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(srcdir)/ntfs-3g.8.in $(srcdir)/ntfs-3g.probe.8.in \
+@@ -113,8 +113,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_2) \
+-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@lowntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -126,8 +125,7 @@
+ @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_OBJECTS = ntfs_3g-ntfs-3g.$(OBJEXT) \
+ @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_2) \
+-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2)
+ ntfs_3g_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(ntfs_3g_CFLAGS) \
+ $(CFLAGS) $(ntfs_3g_LDFLAGS) $(LDFLAGS) -o $@
+@@ -135,8 +133,7 @@
+ @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)
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_DEPENDENCIES = \
+-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_DEPENDENCIES =
+ 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 $@
+@@ -144,8 +141,7 @@
+ @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_secaudit_OBJECTS = \
+ @ENABLE_NTFS_3G_TRUE@ ntfs_3g_secaudit-secaudit.$(OBJEXT)
+ ntfs_3g_secaudit_OBJECTS = $(am_ntfs_3g_secaudit_OBJECTS)
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_DEPENDENCIES = \
+-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_DEPENDENCIES =
+ ntfs_3g_secaudit_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(ntfs_3g_secaudit_CFLAGS) $(CFLAGS) \
+@@ -154,8 +150,7 @@
+ @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_usermap_OBJECTS = \
+ @ENABLE_NTFS_3G_TRUE@ ntfs_3g_usermap-usermap.$(OBJEXT)
+ ntfs_3g_usermap_OBJECTS = $(am_ntfs_3g_usermap_OBJECTS)
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_DEPENDENCIES = \
+-@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_DEPENDENCIES =
+ ntfs_3g_usermap_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(ntfs_3g_usermap_CFLAGS) $(CFLAGS) $(ntfs_3g_usermap_LDFLAGS) \
+@@ -390,9 +385,9 @@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
+ psdir = @psdir@
+-rootbindir = @rootbindir@
+-rootlibdir = @rootlibdir@
+-rootsbindir = @rootsbindir@
++rootbindir = @bindir@
++rootlibdir = @libdir@
++rootsbindir = @sbindir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+@@ -416,7 +411,7 @@
+ @ENABLE_NTFS_3G_TRUE@ ntfs-3g.usermap.8 \
+ @ENABLE_NTFS_3G_TRUE@ ntfs-3g.secaudit.8
+
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_LDADD = $(FUSE_LIBS) -lntfs-3g
+ @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) \
+@@ -425,7 +420,7 @@
+ @ENABLE_NTFS_3G_TRUE@ -I$(top_srcdir)/include/ntfs-3g
+
+ @ENABLE_NTFS_3G_TRUE@ntfs_3g_SOURCES = ntfs-3g.c ntfs-3g_common.c
+-@ENABLE_NTFS_3G_TRUE@lowntfs_3g_LDADD = $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@lowntfs_3g_LDADD = $(FUSE_LIBS) -lntfs-3g
+ @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) \
+@@ -434,9 +429,9 @@
+ @ENABLE_NTFS_3G_TRUE@ -I$(top_srcdir)/include/ntfs-3g
+
+ @ENABLE_NTFS_3G_TRUE@lowntfs_3g_SOURCES = lowntfs-3g.c ntfs-3g_common.c
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
+-@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_LDADD = $(top_builddir)/libntfs-3g/libntfs-3g.la
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_LDADD = -lntfs-3g
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_usermap_LDADD = -lntfs-3g
++@ENABLE_NTFS_3G_TRUE@ntfs_3g_secaudit_LDADD = -lntfs-3g
+ @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_probe_LDFLAGS = $(AM_LDFLAGS) -all-static
+ @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_usermap_LDFLAGS = $(AM_LDFLAGS) -all-static
+ @ENABLE_NTFS_3G_TRUE@@REALLYSTATIC_TRUE@ntfs_3g_secaudit_LDFLAGS = $(AM_LDFLAGS) -all-static
+@@ -1042,9 +1037,9 @@
+ @ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@ $(LDCONFIG)
+
+ @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"
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/sbin/mount.ntfs-3g"
+-@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/sbin/mount.lowntfs-3g"
++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(MKDIR_P) "$(DESTDIR)/$(sbindir)"
++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/ntfs-3g" "$(DESTDIR)/$(sbindir)/mount.ntfs-3g"
++@ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f "$(rootbindir)/lowntfs-3g" "$(DESTDIR)/$(sbindir)/mount.lowntfs-3g"
+
+ @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@install-data-local: install-man8
+ @ENABLE_MOUNT_HELPER_TRUE@@ENABLE_NTFS_3G_TRUE@ $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8"
diff --git a/libntfs/patches/patch-src_ntfs-3g.c b/libntfs/patches/patch-src_ntfs-3g.c
new file mode 100644
index 0000000..3f2e137
--- /dev/null
+++ b/libntfs/patches/patch-src_ntfs-3g.c
@@ -0,0 +1,19 @@
+$NetBSD$
+
+NetBSD is missing some functions, so omit them.
+
+--- src/ntfs-3g.c.orig 2016-09-11 13:30:43.881461740 +0000
++++ src/ntfs-3g.c 2016-09-11 13:32:35.574063705 +0000
+@@ -3705,9 +3705,11 @@
+ fh = fuse_new(ctx->fc, &args , &ntfs_3g_ops, sizeof(ntfs_3g_ops), NULL);
+ if (!fh)
+ goto err;
+-
++
++#if !defined(__NetBSD__)
+ if (fuse_set_signal_handlers(fuse_get_session(fh)))
+ goto err_destory;
++#endif
+ out:
+ fuse_opt_free_args(&args);
+ return fh;
Home |
Main Index |
Thread Index |
Old Index