Package fix & rework

4 files changed, 80 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 978dbdd12ac7..3c066ae127fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,26 @@
 pkgbase = ntfs3-dkms-git
 	pkgdesc = NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1.
-	pkgver = r105.g22b05f1
+	pkgver = 5.15.r0.g8bb7eca
 	pkgrel = 1
+	epoch = 1
 	url = https://github.com/Paragon-Software-Group/linux-ntfs3
 	arch = any
 	license = GPL2
-	makedepends = subversion
 	depends = dkms
 	provides = NTFS3-MODULE
-	provides = ntfs3
-	provides = ntfs3-dkms
+	provides = ntfs3=5.15
+	provides = ntfs3-dkms=5.15
 	conflicts = ntfs3
 	options = !strip
 	source = Makefile.patch
 	source = dkms.conf
 	source = kernel-5.12-backport.patch
 	source = kernel-5.14-backport.patch
-	source = ntfs3::svn+https://github.com/Paragon-Software-Group/linux-ntfs3/branches/devel/fs/ntfs3
+	source = kernel-5.15-backport.patch
 	sha512sums = 533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb
-	sha512sums = ac00adb4a6d7fc685c39af054474631c930455e9ad0838338e6b3622b72451e81397506866b83a4a51dd0e34ed7752963c0fed9e8b017da5122e0dca3d345fb6
+	sha512sums = 5e2f2493fbf7a4d12e7cd7d3c0bb8fc3d8bd5d290f990e5b73c52bfa4ab58127c08eeff09fab7b0ba3a2c4ab1861fec68ce711b1cb57867bb61a81785f312677
 	sha512sums = 4b1976b40f67c210ee4052407a359ed8db0709a568387ffacc15e695b43af7c77b53fbe27a3365197521e5c9baa8bd9c7aaffa2f8345be17129216b1ac141fbe
 	sha512sums = 61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c
-	sha512sums = SKIP
+	sha512sums = 3a9395f5729c14cd8d8bf2ecda566730d90c6990319ed5e33310fa2dbe4d4a33df925950ff652fff338ef0135e5aeecf4b991603bba797847f8f1ef9130420c7
 
 pkgname = ntfs3-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index c74a85df791b..87a824bc3ff5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,17 @@
+_repo="Paragon-Software-Group/linux-ntfs3"
+_ver="5.15"
+_base="8bb7eca972ad531c9b149c0a51ab43a417385813"
+
 pkgname=ntfs3-dkms-git
-pkgver=r105.g22b05f1
+pkgver=5.15.r0.g8bb7eca
 pkgrel=1
+epoch=1
 pkgdesc="NTFS3 is fully functional NTFS Read-Write driver. The driver works with NTFS versions up to 3.1."
 arch=('any')
-url='https://github.com/Paragon-Software-Group/linux-ntfs3'
+url="https://github.com/${_repo}"
 license=('GPL2')
 depends=('dkms')
-makedepends=('subversion')
-provides=('NTFS3-MODULE' 'ntfs3' 'ntfs3-dkms')
+provides=('NTFS3-MODULE' "ntfs3=${_ver}" "ntfs3-dkms=${_ver}")
 conflicts=('ntfs3')
 options=('!strip')
 
@@ -16,39 +20,57 @@ source=(
     dkms.conf
     kernel-5.12-backport.patch
     kernel-5.14-backport.patch
-    "ntfs3::svn+https://github.com/Paragon-Software-Group/linux-ntfs3/branches/devel/fs/ntfs3"
+    kernel-5.15-backport.patch
 )
 
 sha512sums=(
     '533c249f0f6bd4833faf02d0d92ca1b5802a49afc5feb2e46a7d37275cfca7896db76cd83593f4f313977d278a9a7e92eda550667be2b93910c49cfb68ead4fb'
-    'ac00adb4a6d7fc685c39af054474631c930455e9ad0838338e6b3622b72451e81397506866b83a4a51dd0e34ed7752963c0fed9e8b017da5122e0dca3d345fb6'
+    '5e2f2493fbf7a4d12e7cd7d3c0bb8fc3d8bd5d290f990e5b73c52bfa4ab58127c08eeff09fab7b0ba3a2c4ab1861fec68ce711b1cb57867bb61a81785f312677'
     '4b1976b40f67c210ee4052407a359ed8db0709a568387ffacc15e695b43af7c77b53fbe27a3365197521e5c9baa8bd9c7aaffa2f8345be17129216b1ac141fbe'
     '61a1948e3e607dabaca47742777b4ea92fadf9f5416ebaef8c06f1e17aab0f3ced34e900c0cf1ed462303f391f4a4713b5b30a488b349839780bde3248e19f3c'
-    'SKIP'
+    '3a9395f5729c14cd8d8bf2ecda566730d90c6990319ed5e33310fa2dbe4d4a33df925950ff652fff338ef0135e5aeecf4b991603bba797847f8f1ef9130420c7'
 )
 
 pkgver() {
-    local rev=$(curl "https://api.github.com/repos/Paragon-Software-Group/linux-ntfs3/compare/6abaa83c7352b31450d7e8c173f674324c16b02b...devel" | perl -ne'/"total_commits":\s?(\d+),?/ && print $1')
-    local sha=$(curl -H "Accept: text/vnd.github.VERSION.sha" "https://api.github.com/repos/Paragon-Software-Group/linux-ntfs3/commits/devel")
-    echo "r${rev}.g${sha:0:7}"
+    local api="https://api.github.com/repos/${_repo}"
+    local rev=$(curl "${api}/compare/${_base}...master" | perl -ne'/"total_commits":\s?(\d+),?/ && print $1')
+    local sha=$(curl -H "Accept: text/vnd.github.VERSION.sha" "${api}/commits/master")
+    echo "${_ver}.r${rev}.g${sha:0:7}"
 }
 
 prepare() {
-    cd "ntfs3"
+    cd "${srcdir}"
+
+    rm -rf "repo" "ntfs3"
+
+    git clone --depth 1 --filter=tree:0 --sparse --no-checkout "${url}" "repo"
+
+    cd "repo"
+
+    git sparse-checkout set "fs/ntfs3"
+    git checkout master
+
+    ln -rs "fs/ntfs3" "${srcdir}/ntfs3"
+}
 
+build() {
+    cd "${srcdir}/ntfs3"
     patch -p0 -N -i "${srcdir}/Makefile.patch"
 
     # For testing
-    # patch -p1 -N -i "${srcdir}/kernel-5.12-backport.patch"
+    # patch -p1 -N -i "${srcdir}/kernel-5.15-backport.patch"
     # patch -p1 -N -i "${srcdir}/kernel-5.14-backport.patch"
+    # patch -p1 -N -i "${srcdir}/kernel-5.12-backport.patch"
 }
 
 package() {
-    local dest="${pkgdir}/usr/src/ntfs3-${pkgver}"
-    mkdir -p "${dest}"
-    cd "${dest}"
-    cp -r "${srcdir}/ntfs3/"* ./
-    cp "${srcdir}/dkms.conf" ./
-    mkdir -p "./patches"
-    cp "${srcdir}/kernel-"*.patch "./patches/"
+    cd "${srcdir}"
+
+    local dest=$(install -dm755 "${pkgdir}/usr/src/ntfs3-${pkgver}" && echo "$_")
+
+    cp -rt "${dest}" "ntfs3/"*
+
+    install -Dm644 -t "${dest}" "dkms.conf"
+
+    install -dm755 "${dest}/patches" && cp -t "$_" "kernel-"*.patch
 }
diff --git a/dkms.conf b/dkms.conf
index 9c7531ed9183..2d1e87dac8d3 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,10 +1,12 @@
 PACKAGE_NAME="ntfs3"
-PACKAGE_VERSION="27.0.0"
+PACKAGE_VERSION="5.15"
 BUILT_MODULE_NAME[0]="ntfs3"
 DEST_MODULE_LOCATION[0]="/kernel/fs/ntfs3"
 AUTOINSTALL="yes"
 MAKE[0]="KVERSION=$kernelver CONFIG_NTFS3_FS=m CONFIG_NTFS3_LZX_XPRESS=y CONFIG_NTFS3_FS_POSIX_ACL=y make KDIR=$kernel_source_dir"
-PATCH[0]="kernel-5.12-backport.patch"
-PATCH_MATCH[0]="^([0-4]\.|5\.[0-9]\.|5\.1[0-1]\.).*"
+PATCH[0]="kernel-5.15-backport.patch"
+PATCH_MATCH[0]="^([0-4]\.|5\.[0-9]\.|5\.1[0-4]\.).*"
 PATCH[1]="kernel-5.14-backport.patch"
 PATCH_MATCH[1]="^([0-4]\.|5\.[0-9]\.|5\.1[0-3]\.).*"
+PATCH[2]="kernel-5.12-backport.patch"
+PATCH_MATCH[2]="^([0-4]\.|5\.[0-9]\.|5\.1[0-1]\.).*"
diff --git a/kernel-5.15-backport.patch b/kernel-5.15-backport.patch
new file mode 100644
index 000000000000..3e4e013af2fa
--- /dev/null
+++ b/kernel-5.15-backport.patch
@@ -0,0 +1,27 @@
+--- a/ntfs_fs.h
++++ b/ntfs_fs.h
+@@ -836,7 +836,7 @@
+ 
+ /* globals from xattr.c */
+ #ifdef CONFIG_NTFS3_FS_POSIX_ACL
+-struct posix_acl *ntfs_get_acl(struct inode *inode, int type, bool rcu);
++struct posix_acl *ntfs_get_acl(struct inode *inode, int type);
+ int ntfs_set_acl(struct user_namespace *mnt_userns, struct inode *inode,
+ 		 struct posix_acl *acl, int type);
+ int ntfs_init_acl(struct user_namespace *mnt_userns, struct inode *inode,
+
+--- a/xattr.c
++++ b/xattr.c
+@@ -530,11 +530,8 @@
+ /*
+  * ntfs_get_acl - inode_operations::get_acl
+  */
+-struct posix_acl *ntfs_get_acl(struct inode *inode, int type, bool rcu)
++struct posix_acl *ntfs_get_acl(struct inode *inode, int type)
+ {
+-	if (rcu)
+-		return ERR_PTR(-ECHILD);
+-
+ 	/* TODO: init_user_ns? */
+ 	return ntfs_get_acl_ex(&init_user_ns, inode, type, 0);
+ }