2017.3.23AR.5

2 files changed, 25 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9a8817644a3..165bcd984784 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
 pkgbase = ntfs-3g-ar
 	pkgdesc = NTFS filesystem driver and utilities with experimental features
-	pkgver = 2017.3.23AR.4
-	pkgrel = 1
-	url = http://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html
+	pkgver = 2017.3.23AR.5
+	pkgrel = 4
+	url = https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html
 	arch = x86_64
 	license = GPL2
 	depends = util-linux
 	depends = fuse2
 	provides = ntfsprogs
-	provides = ntfs-3g=2017.3.23-1
+	provides = ntfs-3g=2017.3.23-4
 	conflicts = ntfsprogs
 	conflicts = ntfs-3g
 	source = https://tuxera.com/opensource/ntfs-3g_ntfsprogs-2017.3.23.tgz
-	source = http://pagesperso-orange.fr/jp-andre/ntfs-3g_ntfsprogs-2017.3.23AR.4.tgz
+	source = https://jp-andre.pagesperso-orange.fr/ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz
 	source = mftmirr.patch
 	sha256sums = 3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5
-	sha256sums = 46e1edb27362d2f24cbc04db7d81ae2241d8ff6a45bb72240a316b1635caca0b
+	sha256sums = 04ccf583b495806cefb71850e5899e50aed5e7bf23365259f2badaa9af21e5ed
 	sha256sums = 4166ff3021921d7a7ffac8f5de64b5735b1d5e365a024744bebc7260cf1ce726
 
 pkgname = ntfs-3g-ar
diff --git a/PKGBUILD b/PKGBUILD
index fce09a42b07d..3776108f6e0d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,4 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Tom Gundersen <teg@jklm.no>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
@@ -7,33 +6,33 @@
 
 pkgname=ntfs-3g-ar
 _pkgname=ntfs-3g_ntfsprogs
-_stablever=2017.3.23
-pkgver=${_stablever}AR.4
-pkgrel=1
+pkgver=2017.3.23AR.5
+pkgrel=4
 pkgdesc='NTFS filesystem driver and utilities with experimental features'
-url='http://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html'
+url='https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html'
 arch=('x86_64')
 license=('GPL2')
 depends=('util-linux' 'fuse2')
-source=("https://tuxera.com/opensource/${_pkgname}-${_stablever}.tgz"
-        "http://pagesperso-orange.fr/jp-andre/${_pkgname}-${pkgver}.tgz"
+source=("https://tuxera.com/opensource/${_pkgname}-${pkgver%AR*}.tgz"
+        "https://jp-andre.pagesperso-orange.fr/${_pkgname}-${pkgver}.tgz"
         'mftmirr.patch')
 sha256sums=('3e5a021d7b761261836dcb305370af299793eedbded731df3d6943802e1262d5'
-            '46e1edb27362d2f24cbc04db7d81ae2241d8ff6a45bb72240a316b1635caca0b'
+            '04ccf583b495806cefb71850e5899e50aed5e7bf23365259f2badaa9af21e5ed'
             '4166ff3021921d7a7ffac8f5de64b5735b1d5e365a024744bebc7260cf1ce726')
 
 conflicts=('ntfsprogs' 'ntfs-3g')
-provides=('ntfsprogs' "ntfs-3g=$_stablever-$pkgrel")
+provides=('ntfsprogs' "ntfs-3g=${pkgver%AR*}-$pkgrel")
 
 prepare() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	sed 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' -i {ntfsprogs,src}/Makefile.in
-	cd "../${_pkgname}-${_stablever}"
+	cd "../${_pkgname}-${pkgver%AR*}"
 	sed 's|$(DESTDIR)/sbin|$(DESTDIR)/usr/bin|' -i {ntfsprogs,src}/Makefile.in
 	patch -p1 -i ../mftmirr.patch
 }
 
-_configure() {
+_build() {
+	cd "${srcdir}/${_pkgname}-${1}"
 	./configure \
 		--prefix=/usr \
 		--sbin=/usr/bin \
@@ -41,26 +40,25 @@ _configure() {
 		--disable-ldconfig \
 		--disable-static \
 		--with-fuse=external \
+		--enable-xattr-mappings \
 		--enable-posix-acls \
 		--enable-extras \
-		"$@"
+		--enable-crypto \
+
+	make "${@:2}"
 }
 
 build() {
-	cd ${_pkgname}-${_stablever}
-	_configure
-	make -C libntfs-3g libntfs-3g.la
-
-	cd ../${_pkgname}-${pkgver}
-	_configure --enable-xattr-mappings
-	make
+	_build ${pkgver%AR*} -C libntfs-3g libntfs-3g.la
+	_build ${pkgver}
 }
 
 package_ntfs-3g-ar() {
 	cd "${srcdir}/${_pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" rootbindir=/usr/bin rootsbindir=/usr/bin rootlibdir=/usr/lib install
+	rm "${pkgdir}"/usr/share/man/man8/ntfsfallocate.8 # uninstalled binary
 	ln -s /usr/bin/ntfs-3g "${pkgdir}/usr/bin/mount.ntfs"
 
-	cd ../${_pkgname}-${_stablever}
+	cd ../${_pkgname}-${pkgver%AR*}
 	make -C libntfs-3g DESTDIR="${pkgdir}" rootlibdir=/usr/lib install-libLTLIBRARIES
 }