[notify] ntfs-3g: 2017.3.23 -> 2021.8.22; now depends on libgcrypt and gnutls

3 files changed, 26 insertions, 44 deletions

diff --git a/ntfs-3g/.footprint b/ntfs-3g/.footprint
index 4183e9f22..4aa54fc6c 100644
--- a/ntfs-3g/.footprint
+++ b/ntfs-3g/.footprint
@@ -1,18 +1,17 @@
 drwxr-xr-x	root/root	lib/
-drwxr-xr-x	root/root	sbin/
-lrwxrwxrwx	root/root	sbin/fsck.ntfs -> ../usr/bin/ntfsfix
-lrwxrwxrwx	root/root	sbin/mkfs.ntfs -> /usr/sbin/mkntfs
-lrwxrwxrwx	root/root	sbin/mount.lowntfs-3g -> /usr/bin/lowntfs-3g
-lrwxrwxrwx	root/root	sbin/mount.ntfs -> ../usr/bin/ntfs-3g
-lrwxrwxrwx	root/root	sbin/mount.ntfs-3g -> /usr/bin/ntfs-3g
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+lrwxrwxrwx	root/root	usr/bin/fsck.ntfs -> ../usr/bin/ntfsfix
 -rwxr-xr-x	root/root	usr/bin/lowntfs-3g
+lrwxrwxrwx	root/root	usr/bin/mount.lowntfs-3g -> /usr/bin/lowntfs-3g
+lrwxrwxrwx	root/root	usr/bin/mount.ntfs-3g -> /usr/bin/ntfs-3g
+lrwxrwxrwx	root/root	usr/bin/mount.ntfs -> ../usr/bin/ntfs-3g
 -rwxr-xr-x	root/root	usr/bin/ntfs-3g
 -rwxr-xr-x	root/root	usr/bin/ntfs-3g.probe
 -rwxr-xr-x	root/root	usr/bin/ntfscat
 -rwxr-xr-x	root/root	usr/bin/ntfscluster
 -rwxr-xr-x	root/root	usr/bin/ntfscmp
+-rwxr-xr-x	root/root	usr/bin/ntfsdecrypt
 -rwxr-xr-x	root/root	usr/bin/ntfsfix
 -rwxr-xr-x	root/root	usr/bin/ntfsinfo
 -rwxr-xr-x	root/root	usr/bin/ntfsls
@@ -63,15 +62,15 @@ drwxr-xr-x	root/root	usr/include/ntfs-3g/
 -rw-r--r--	root/root	usr/include/ntfs-3g/volume.h
 -rw-r--r--	root/root	usr/include/ntfs-3g/xattrs.h
 drwxr-xr-x	root/root	usr/lib/
--rw-r--r--	root/root	usr/lib/libntfs-3g.a
 -rwxr-xr-x	root/root	usr/lib/libntfs-3g.la
-lrwxrwxrwx	root/root	usr/lib/libntfs-3g.so -> libntfs-3g.so.88.0.0
-lrwxrwxrwx	root/root	usr/lib/libntfs-3g.so.88 -> libntfs-3g.so.88.0.0
--rwxr-xr-x	root/root	usr/lib/libntfs-3g.so.88.0.0
+-rwxr-xr-x	root/root	usr/lib/libntfs-3g.so.89.0.0
+lrwxrwxrwx	root/root	usr/lib/libntfs-3g.so.89 -> libntfs-3g.so.89.0.0
+lrwxrwxrwx	root/root	usr/lib/libntfs-3g.so -> libntfs-3g.so.89.0.0
 drwxr-xr-x	root/root	usr/lib/ntfs-3g/
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libntfs-3g.pc
 drwxr-xr-x	root/root	usr/sbin/
+lrwxrwxrwx	root/root	usr/sbin/mkfs.ntfs -> /usr/sbin/mkntfs
 -rwxr-xr-x	root/root	usr/sbin/mkntfs
 -rwxr-xr-x	root/root	usr/sbin/ntfsclone
 -rwxr-xr-x	root/root	usr/sbin/ntfscp
diff --git a/ntfs-3g/.signature b/ntfs-3g/.signature
index fde646013..3bca60731 100644
--- a/ntfs-3g/.signature
+++ b/ntfs-3g/.signature
@@ -1,11 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30lYGbu5d/3xQ+7xrcfEiO9vy0faOsREXOVqb6J0Cz6WSqQDZWt1w/XqYO0fh0MYLB7vrofBd6hsFOXEdBGcsgk=
-SHA256 (Pkgfile) = f40b03d6b3618c3b97f4d7f1d032ed2f36d09ab5be88345a22614aa4ca239c2b
-SHA256 (.footprint) = 21023f776f9072b8d534d7955dbbd8b2fa7a2ccb0dea0e87f5f3ab2f40592f3c
-SHA256 (ntfs-3g_ntfsprogs-2017.3.23.tgz) = 3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5
-SHA256 (ntfs3g-2014.2.15-no-split-usr.patch) = 3fdd9b2947e1ded82258a86d55d481d641613d8ff916f6eeacc6c0e68042beb8
-SHA256 (ntfs3g-2016.2.22-sysmacros.patch) = 9d9ed593acd23f01b2a862a86691d953253976c962e8b8cd52884bef86a2d342
-SHA256 (ntfs3g-2017.3.23-check-mftmirr.patch) = 479b6e9f5efb0d7029031bef5c504acd9762dd9674f1dbfcf12c3064e6d4f524
-SHA256 (ntfs3g-2017.3.23-big-sectors.patch) = f15c294cce26c813ab933291509d25d6bead87a99d75482bc4e28a2a8338a569
-SHA256 (ntfs3g-2017.3.23-full-clusters.patch) = 9b37edba1b1ec6fa5040626426d62494b1e36ea6419e748a25014707cce6abb4
-SHA256 (CVE-2019-9755.patch) = a1d400c2fa5c72328050056e3fac6d150b2b70527ae3200164cb157132880fd1
+RWSagIOpLGJF3wiyvdThx7h2EBnOkkZzSPMZ6xyTcsGpz6Fy13gkldcD8y5TYhpFdpDz8VnjYASPtvSis1NmJt85ZOUxFkPZbAY=
+SHA256 (Pkgfile) = 036f25f9f78761ae1e671d01717d0a2f667103274ec1be56bdee025b8707b17f
+SHA256 (.footprint) = 8c73a266daaae3a48af3fb34fc14f01a629c91d217557df71af14b8541a585bd
+SHA256 (ntfs-3g_ntfsprogs-2021.8.22.tgz) = 55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb
diff --git a/ntfs-3g/Pkgfile b/ntfs-3g/Pkgfile
index 72db4cd8c..33a69dcd6 100644
--- a/ntfs-3g/Pkgfile
+++ b/ntfs-3g/Pkgfile
@@ -1,49 +1,38 @@
 # Description: Freely available NTFS driver with read and write support.
 # URL: https://www.tuxera.com/company/open-source/
 # Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: fuse
+# Depends on: fuse gnutls libgcrypt
 
 name=ntfs-3g
-version=2017.3.23
-release=3
-source=(https://tuxera.com/opensource/ntfs-3g_ntfsprogs-$version.tgz
-	ntfs3g-2014.2.15-no-split-usr.patch
-	ntfs3g-2016.2.22-sysmacros.patch
-	ntfs3g-2017.3.23-check-mftmirr.patch
-	ntfs3g-2017.3.23-big-sectors.patch
-	ntfs3g-2017.3.23-full-clusters.patch
-	CVE-2019-9755.patch)
+version=2021.8.22
+release=1
+source=(https://tuxera.com/opensource/ntfs-3g_ntfsprogs-$version.tgz)
 
 build() {
 	cd ntfs-3g_ntfsprogs-$version
 
-	patch -p1 -i $SRC/ntfs3g-2014.2.15-no-split-usr.patch
-	patch -p1 -i $SRC/ntfs3g-2016.2.22-sysmacros.patch
-	patch -p1 -i $SRC/ntfs3g-2017.3.23-check-mftmirr.patch
-	patch -p1 -i $SRC/ntfs3g-2017.3.23-big-sectors.patch
-	patch -p1 -i $SRC/ntfs3g-2017.3.23-full-clusters.patch
-	patch -p1 -i $SRC/CVE-2019-9755.patch
-
+	sed 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' -i {ntfsprogs,src}/Makefile.in
 	install -d $PKG/lib
 
 	./configure \
 		--prefix=/usr \
 		--exec-prefix=/usr \
+		--enable-crypto \
+		--enable-extras \
 		--enable-ldscript \
-		--disable-ldconfig \
-		--with-fuse=external \
 		--enable-posix-acls \
 		--enable-xattr-mappings \
+		--with-fuse=external \
+		--disable-ldconfig \
+		--disable-static \
 		--without-uuid \
-		--without-hd \
-		--enable-extras
-		#--enable-crypto
+		--without-hd
 
 	make
 	make DESTDIR=$PKG install
 
-	ln -s ../usr/bin/ntfs-3g $PKG/sbin/mount.ntfs
-	ln -s ../usr/bin/ntfsfix $PKG/sbin/fsck.ntfs
+	ln -s ../usr/bin/ntfs-3g $PKG/usr/bin/mount.ntfs
+	ln -s ../usr/bin/ntfsfix $PKG/usr/bin/fsck.ntfs
 
 	ln -s ntfs-3g.8 $PKG/usr/share/man/man8/mount.ntfs.8
 	ln -s ntfsfix.8 $PKG/usr/share/man/man8/fsck.ntfs.8