diff options
| -rw-r--r-- | filesystems/libntfs/Makefile.common | 4 | ||||
| -rw-r--r-- | filesystems/libntfs/PLIST | 3 | ||||
| -rw-r--r-- | filesystems/libntfs/distinfo | 13 | ||||
| -rw-r--r-- | filesystems/libntfs/patches/patch-src_Makefile.in | 94 | ||||
| -rw-r--r-- | sysutils/ntfsprogs/PLIST | 6 |
5 files changed, 45 insertions, 75 deletions
diff --git a/filesystems/libntfs/Makefile.common b/filesystems/libntfs/Makefile.common index bb41f916c49..ffeac5b0b2f 100644 --- a/filesystems/libntfs/Makefile.common +++ b/filesystems/libntfs/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.3 2016/03/01 20:16:33 joerg Exp $ +# $NetBSD: Makefile.common,v 1.4 2018/04/02 13:14:08 adam Exp $ # used by filesystems/fuse-ntfs-3g/Makefile # used by sysutils/ntfsprogs/Makefile -DISTNAME= ntfs-3g_ntfsprogs-2015.3.14 +DISTNAME= ntfs-3g_ntfsprogs-2017.3.23 CATEGORIES= sysutils MASTER_SITES= http://tuxera.com/opensource/ EXTRACT_SUFX= .tgz diff --git a/filesystems/libntfs/PLIST b/filesystems/libntfs/PLIST index b48cb1b24db..d887bc0a3c4 100644 --- a/filesystems/libntfs/PLIST +++ b/filesystems/libntfs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2015/11/10 17:45:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2018/04/02 13:14:08 adam Exp $ include/ntfs-3g/acls.h include/ntfs-3g/attrib.h include/ntfs-3g/attrlist.h @@ -28,6 +28,7 @@ include/ntfs-3g/mst.h include/ntfs-3g/ntfstime.h include/ntfs-3g/object_id.h include/ntfs-3g/param.h +include/ntfs-3g/plugin.h include/ntfs-3g/realpath.h include/ntfs-3g/reparse.h include/ntfs-3g/runlist.h diff --git a/filesystems/libntfs/distinfo b/filesystems/libntfs/distinfo index 5f7ef3f9362..fc3a2d2ad25 100644 --- a/filesystems/libntfs/distinfo +++ b/filesystems/libntfs/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.3 2015/11/10 17:45:22 adam Exp $ +$NetBSD: distinfo,v 1.4 2018/04/02 13:14:08 adam Exp $ -SHA1 (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 0ebd9adffd5a6ddcfbacade6be8efe1eba4b1a08 -RMD160 (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 67cbb81ab619c0941fe23a73e9a187a73008d51e -SHA512 (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 9744dee814e89a97050bc8beb76f1a7d8a585e7d7740e8041e393c6912c93e49803f9b41af84e8315b3162e58b19ca8d155d435395cb07ecaa7de9caaf2af441 -Size (ntfs-3g_ntfsprogs-2015.3.14.tgz) = 1210069 bytes +SHA1 (ntfs-3g_ntfsprogs-2017.3.23.tgz) = 160a836274c38d92e5c3a55256f404c8dd8f3cc1 +RMD160 (ntfs-3g_ntfsprogs-2017.3.23.tgz) = aae0cd7a2560ad87ba41832f1b34af5aaaa38739 +SHA512 (ntfs-3g_ntfsprogs-2017.3.23.tgz) = 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef +Size (ntfs-3g_ntfsprogs-2017.3.23.tgz) = 1259054 bytes SHA1 (patch-Makefile.in) = 874ba5084b5eea312a24d7a6b339f83a3f7896d8 SHA1 (patch-include_ntfs-3g_compat.h) = 78ea127359416c9106eef7025a2ccc84fd0b4447 SHA1 (patch-include_ntfs-3g_types.h) = bb6414b8991e8a05f32fce88d4915448bc498d58 @@ -12,5 +12,6 @@ SHA1 (patch-libntfs-3g_compat.c) = 5cecaa8f8d4fe463094592f11f4757a434e903dd SHA1 (patch-libntfs-3g_device.c) = 3ad49d69b03cdd500246f77d9f6e30ca3d2e2ec6 SHA1 (patch-ntfsprogs_Makefile.in) = 9acd073006c54009cedeafc766c964e9b5f11468 SHA1 (patch-ntfsprogs_ntfsclone.c) = 3306b501e94ce71a709f394516829a727aa743ad -SHA1 (patch-src_Makefile.in) = eaa83166f98d2a2c9b2116abab6fe315faf545ac +SHA1 (patch-src_Makefile.in) = 7f733c4b2b09e81978a736217da9a2162bc7a844 +SHA1 (patch-src_lowntfs-3g.c) = 12c2e1d96327b0deb9eff213399dc4ffcc77f7e3 SHA1 (patch-src_ntfs-3g.c) = 9ae108fec22dc2a4219cd4ae5077d9eea17ab700 diff --git a/filesystems/libntfs/patches/patch-src_Makefile.in b/filesystems/libntfs/patches/patch-src_Makefile.in index 94363c152f9..d0c93badaec 100644 --- a/filesystems/libntfs/patches/patch-src_Makefile.in +++ b/filesystems/libntfs/patches/patch-src_Makefile.in @@ -1,41 +1,31 @@ -$NetBSD: patch-src_Makefile.in,v 1.2 2015/11/10 17:45:22 adam Exp $ +$NetBSD: patch-src_Makefile.in,v 1.3 2018/04/02 13:14:08 adam Exp $ -Add ENABLE_LOWNTFS condition. Link against already built and installed libntfs. Install binaries into PREFIX, not the root directory. ---- src/Makefile.in.orig 2015-03-14 14:10:28.000000000 +0000 +--- src/Makefile.in.orig 2017-03-23 09:43:00.000000000 +0000 +++ src/Makefile.in -@@ -84,7 +84,7 @@ target_triplet = @target@ - @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 @@ lowntfs_3g_OBJECTS = $(am_lowntfs_3g_OBJ - am__DEPENDENCIES_1 = +@@ -110,8 +110,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@lowntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +-@ENABLE_NTFS_3G_TRUE@ $(am__DEPENDENCIES_2) \ -@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la -+@ENABLE_NTFS_3G_TRUE@lowntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2) ++@ENABLE_NTFS_3G_TRUE@ $(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 @@ am__ntfs_3g_SOURCES_DIST = ntfs-3g.c ntf - @ENABLE_NTFS_3G_TRUE@am_ntfs_3g_OBJECTS = ntfs_3g-ntfs-3g.$(OBJEXT) \ +@@ -124,8 +123,7 @@ am__ntfs_3g_SOURCES_DIST = ntfs-3g.c ntf @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@ntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_1) \ +-@ENABLE_NTFS_3G_TRUE@ $(am__DEPENDENCIES_2) \ -@ENABLE_NTFS_3G_TRUE@ $(top_builddir)/libntfs-3g/libntfs-3g.la -+@ENABLE_NTFS_3G_TRUE@ntfs_3g_DEPENDENCIES = $(am__DEPENDENCIES_2) ++@ENABLE_NTFS_3G_TRUE@ $(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 @@ am__ntfs_3g_probe_SOURCES_DIST = ntfs-3g +@@ -133,8 +131,7 @@ am__ntfs_3g_probe_SOURCES_DIST = ntfs-3g @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) @@ -45,27 +35,7 @@ Install binaries into PREFIX, not the root directory. 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 @@ am__ntfs_3g_secaudit_SOURCES_DIST = seca - @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 @@ am__ntfs_3g_usermap_SOURCES_DIST = userm - @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 @@ pkgconfigdir = @pkgconfigdir@ +@@ -366,9 +363,9 @@ pkgconfigdir = @pkgconfigdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -78,39 +48,35 @@ Install binaries into PREFIX, not the root directory. sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ -@@ -416,7 +411,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil - @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 +@@ -391,7 +388,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil + @DISABLE_PLUGINS_FALSE@PLUGIN_CFLAGS = -DPLUGIN_DIR=\"$(plugindir)\" + @ENABLE_NTFS_3G_TRUE@rootsbin_DATA = #Create directory + @ENABLE_NTFS_3G_TRUE@man_MANS = ntfs-3g.8 ntfs-3g.probe.8 +-@ENABLE_NTFS_3G_TRUE@ntfs_3g_LDADD = $(LIBDL) $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la ++@ENABLE_NTFS_3G_TRUE@ntfs_3g_LDADD = $(LIBDL) $(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 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil - @ENABLE_NTFS_3G_TRUE@ -I$(top_srcdir)/include/ntfs-3g +@@ -401,7 +398,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil + @ENABLE_NTFS_3G_TRUE@ $(PLUGIN_CFLAGS) @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@lowntfs_3g_LDADD = $(LIBDL) $(FUSE_LIBS) $(top_builddir)/libntfs-3g/libntfs-3g.la ++@ENABLE_NTFS_3G_TRUE@lowntfs_3g_LDADD = $(LIBDL) $(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 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil - @ENABLE_NTFS_3G_TRUE@ -I$(top_srcdir)/include/ntfs-3g +@@ -411,7 +408,7 @@ MAINTAINERCLEANFILES = $(srcdir)/Makefil + @ENABLE_NTFS_3G_TRUE@ $(PLUGIN_CFLAGS) @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 -@@ -1040,9 +1035,9 @@ uninstall-man: uninstall-man8 - @ENABLE_NTFS_3G_TRUE@@RUN_LDCONFIG_TRUE@ $(LDCONFIG) + @ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/include/ntfs-3g + @ENABLE_NTFS_3G_TRUE@ntfs_3g_probe_SOURCES = ntfs-3g.probe.c +@@ -969,9 +966,9 @@ uninstall-man: uninstall-man8 + @DISABLE_PLUGINS_FALSE@@ENABLE_NTFS_3G_TRUE@ $(MKDIR_P) $(DESTDIR)/$(plugindir) @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" @@ -120,5 +86,5 @@ Install binaries into PREFIX, not the root directory. +@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_NTFS_3G_TRUE@install-data-local: install-man8 - @ENABLE_NTFS_3G_TRUE@ $(LN_S) -f ntfs-3g.8 "$(DESTDIR)$(man8dir)/mount.ntfs-3g.8" + @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/sysutils/ntfsprogs/PLIST b/sysutils/ntfsprogs/PLIST index bfaaae61bd7..3cd73c89c68 100644 --- a/sysutils/ntfsprogs/PLIST +++ b/sysutils/ntfsprogs/PLIST @@ -1,11 +1,10 @@ -@comment $NetBSD: PLIST,v 1.8 2015/11/10 17:45:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.9 2018/04/02 13:14:08 adam Exp $ bin/ntfscat bin/ntfscluster bin/ntfscmp bin/ntfsfix bin/ntfsinfo bin/ntfsls -man/man8/mkfs.ntfs.8 man/man8/mkntfs.8 man/man8/ntfscat.8 man/man8/ntfsclone.8 @@ -19,9 +18,12 @@ man/man8/ntfsinfo.8 man/man8/ntfslabel.8 man/man8/ntfsls.8 man/man8/ntfsprogs.8 +man/man8/ntfsrecover.8 man/man8/ntfsresize.8 +man/man8/ntfssecaudit.8 man/man8/ntfstruncate.8 man/man8/ntfsundelete.8 +man/man8/ntfsusermap.8 man/man8/ntfswipe.8 sbin/mkntfs sbin/ntfsclone |