From 340aa6434c11c476c6179de64bac2053d5b2f373 Mon Sep 17 00:00:00 2001
From: Animesh Sahu <animeshsahu19@yahoo.com>
Date: Fri, 19 Nov 2021 13:34:27 +0530
Subject: [PATCH] linux5.15/ntfs-3g: use mount.ntfs as alternative

---
 common/shlibs                 | 2 +-
 srcpkgs/linux5.15/files/ntfs3 | 3 +++
 srcpkgs/linux5.15/template    | 7 ++++++-
 srcpkgs/ntfs-3g/template      | 5 +++--
 4 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100755 srcpkgs/linux5.15/files/ntfs3

diff --git a/common/shlibs b/common/shlibs
index a7908585fbbd51..188e23325db524 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -438,7 +438,7 @@ libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1
 libKScreenLocker.so.5 kscreenlocker-5.8.4_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
-libntfs-3g.so.89 ntfs-3g-2021.8.22_1
+libntfs-3g.so.89 ntfs-3g-2021.8.22_2
 libruby.so.3.0 ruby-3.0.2_1
 librw.so.0 rankwidth-0.9_1
 libprocessui.so.9 libksysguard-5.18.90_1
diff --git a/srcpkgs/linux5.15/files/ntfs3 b/srcpkgs/linux5.15/files/ntfs3
new file mode 100755
index 00000000000000..28b6ad00e2f717
--- /dev/null
+++ b/srcpkgs/linux5.15/files/ntfs3
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec mount -t ntfs3 "$@"
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index 68ae0f465428f1..8a23db43879f81 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
 version=5.15.3
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -14,6 +14,8 @@ checksum="57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
 skip_extraction="patch-${version}.xz"
 python_version=3
 
+alternatives="ntfs:mount.ntfs:/usr/bin/ntfs3"
+
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
 archs="x86_64* i686* aarch64* ppc*"
 
@@ -153,6 +155,9 @@ do_install() {
 	vmkdir usr
 	mv ${DESTDIR}/lib ${DESTDIR}/usr
 
+	vmkdir usr/bin
+	vbin ${FILESDIR}/ntfs3
+
 	cd ${DESTDIR}/usr/lib/modules/${_kernver}
 	rm -f source build
 	ln -sf ../../../src/kernel-headers-${_kernver} build
diff --git a/srcpkgs/ntfs-3g/template b/srcpkgs/ntfs-3g/template
index 72a3fe2831533e..c09c0a87282b36 100644
--- a/srcpkgs/ntfs-3g/template
+++ b/srcpkgs/ntfs-3g/template
@@ -1,7 +1,7 @@
 # Template file for 'ntfs-3g'
 pkgname=ntfs-3g
 version=2021.8.22
-revision=1
+revision=2
 wrksrc="${pkgname}_ntfsprogs-${version}"
 build_style=gnu-configure
 configure_args="--exec-prefix=/usr --disable-static --with-fuse=external
@@ -20,6 +20,8 @@ changelog="https://raw.githubusercontent.com/wiki/tuxera/ntfs-3g/NTFS-3G-Release
 distfiles="https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"
 checksum=55b883aa05d94b2ec746ef3966cb41e66bed6db99f22ddd41d1b8b94bb202efb
 
+alternatives="ntfs:mount.ntfs:/usr/bin/ntfs-3g"
+
 build_options="crypto extras quarantined"
 desc_option_crypto="Enable crypto related code and utilities"
 desc_option_extras="Enable extra ntfsprogs utilities"
@@ -28,7 +30,6 @@ build_options_default="crypto extras"
 
 post_install() {
 	mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
-	ln -sf ntfs-3g ${DESTDIR}/usr/bin/mount.ntfs
 	if [ -z "$build_option_quarantined" ]; then
 		# Remove documentation for a non-existent executable file.
 		rm "${DESTDIR}/usr/share/man/man8/ntfsfallocate.8"