sys-fs/ntfs3g-ar: Version bump of ntfs-3g AR , thx to Tommy[D]

3 files changed, 52 insertions, 28 deletions

diff --git a/sys-fs/ntfs3g-ar/ChangeLog b/sys-fs/ntfs3g-ar/ChangeLog
index eaf2d32f4..1457e1a3e 100644
--- a/sys-fs/ntfs3g-ar/ChangeLog
+++ b/sys-fs/ntfs3g-ar/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sys-fs/ntfs3g-ar
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ntfs3g-ar-2013.1.13.4 (23 Feb 2014)
+
+  23 Feb 2014; Ondřej Súkup (mimi_vx) <mimi.vx@gmail.com>
+  -ntfs3g-ar-2012.1.15.8.ebuild, +ntfs3g-ar-2013.1.13.4.ebuild:
+  Version bump of ntfs-3g AR , thx to Tommy[D]
+
   04 Jan 2013; Sergey Popov <pinkbyte@gentoo.org>
   -ntfs3g-ar-2011.4.12.7.ebuild, ntfs3g-ar-2012.1.15.8.ebuild:
   QA: replace rm -rf on sbin with rmdir, add missing 'die' statement, drop old
diff --git a/sys-fs/ntfs3g-ar/Manifest b/sys-fs/ntfs3g-ar/Manifest
index 866a799b4..dc998f178 100644
--- a/sys-fs/ntfs3g-ar/Manifest
+++ b/sys-fs/ntfs3g-ar/Manifest
@@ -1,5 +1,5 @@
 AUX 99-ntfs3g.rules 51 SHA256 912165f71bbcae4753cd10a74c78bfd98e49bd9adbf80b96c39fc6738b12d463 SHA512 9310dd1dceec9a6252d3e8b95a9a1002c84a6f077457892eefe1255c85557041defbd8dcf6acef86285b45abd8bbe85822dd59a9e4c307bba80dd2c17f971851 WHIRLPOOL 9a0439ceb3bb1f142ee1929c03dab22066fdb3dba85c216265f6f10f3e9e2416beb4f3a73c8965b621b8d7b34c467a81628b6656f59e4c51e9fd529007f7ca27
-DIST ntfs-3g_ntfsprogs-2012.1.15AR.8.tgz 1178240 SHA256 932534e2f0e6e2c8f8702d882c465507f6fd0a987709dc8577a3471568fe8c5b SHA512 867970ae2fd7f990d6f453693dbf90b104eadd1f44ef156bd51cbebd1861da05456e008a7089ac1be576c50464dc69dbf16b5e8c1d5b34e14d96c2d0e49ae9d8 WHIRLPOOL aff847ff3c55392f0ea9a94aa24b46db3ece42d2784a3ee04b0b50380db91ad8eac955bee15ba04156480a79be052ba3c764932bb46be2486b0493397578978e
-EBUILD ntfs3g-ar-2012.1.15.8.ebuild 2285 SHA256 8b0d8961937e48bb4f90a661da60ed031ca5cb854b89311d8e7a52358f818e2e SHA512 5af3a2f971124651b8125175c2e54a3d5d2aa7f7bb7b6cb3e782a6dcf7794a0d8a41acf6c9fd1cea69e337444a3cb1423fa8b62345ab8cc68110a91091d17e11 WHIRLPOOL 3e06b21ff36e917cfc1691759855a8f28df51dbd31b488e6d37535f00a004b1640fe8752dd5894a10e78ded11ff021c8bf3de315a89e0e9441aca485a9efcf57
-MISC ChangeLog 3058 SHA256 51af701f1e1d643c1aba34b63e5e75ee87e08ac65d7a5ecd96ce7b20e4d1c230 SHA512 45ac4e719429533b12ebbfac0bc47a45dc200774db2fbaddb3501e2dd184888d0f8adb83ddc700653ca1e1e424f6ebe98888758bebc7b073cef3f048e8c3232e WHIRLPOOL 4cede654b1e5c4746457f74e51506f27e6d84d570222a566662efe68ae1a3d8a10f2c4340fd9d9cd315fa34d0c46d1baaa88bb1fa08624ea0896a15cbf851c9e
+DIST ntfs-3g_ntfsprogs-2013.1.13AR.4.tgz 1210863 SHA256 87f1284431bc4a172101048e6e25b47e4b199e6ff01c13611d5eaf706f3e2456 SHA512 ae50544a9687f2dceb035154f0b5dd55fcabaa846359ade77f9bcf7f1af4f4bfe4e101720fe4897ca5e2d0acdea4b3b1a073c92b16f40e98e81c4c352a744f9c WHIRLPOOL 96f869310168306b3415ec233128db0e0ede0c186f888da6c144984b2b322fd2b75fc238804f6bb0773f6c2cfea94c5ff3f5a04f4ffa387ea8df58ae50ad7166
+EBUILD ntfs3g-ar-2013.1.13.4.ebuild 2891 SHA256 07256bef1a0252677819b78250f00a6920880c2a4acc18f88cbbfccac3b42217 SHA512 cb4b494d9396525b12bb9b57b5240fe3b4b9a7ea8c1dc0642cef0e7185f076cda4e536d344488e2c11c80ae3b74b83047e4b4f1d091c61b306101ed99054af54 WHIRLPOOL 01f71dc595e99a0da5c11df6f745792f5189c5d196a557facdc29b9da511c2a3ceb5bebf3fd4fd9d96099ac574e84dd69cc4acd29e4acb52fd963ffb732cafb2
+MISC ChangeLog 3268 SHA256 d10dba04cc9f8b6492d5dfe3ab6e37393425d28f7dd494830b5d8f4e0d098225 SHA512 cafc7b9972eb29f8b5042cc7e6cd5bc47771cb86cbb6d0a5327275ec6b0ec9afbedbe2139b162475f37bf6b998377c7094bd93ae44a1e89497de0dfe7d94cd37 WHIRLPOOL 7d4a1b2c898f4b086ffc14e47193bf113994c16fe99ce820145c12918e442f3141835376ea2bceff86cec99189b67545e46dda8c1e68bc1bcf432bc0e78fbd5b
 MISC metadata.xml 727 SHA256 462bddf4a2463fff1905df03150536b6e2bf2a07b44eac61c8a47b649ff6d65e SHA512 4b19b188bc7d5ca9af95a613e3d2cf9a6acb306a645ded81919f49763e7145c871ee0c0cbdaf1aed727b315800adc9c86853ce88655b94035f73b19d79e51946 WHIRLPOOL e28c1671a4f02c5d569b235dd111f9a97fb4d26c6e28f5f4c32c87c84399e97bde94fe0fcab7cacce2414b6a2e65bdbaff4f5f2e49d9487db3c3310a20ffccee
diff --git a/sys-fs/ntfs3g-ar/ntfs3g-ar-2012.1.15.8.ebuild b/sys-fs/ntfs3g-ar/ntfs3g-ar-2013.1.13.4.ebuild
index 8f8112dc0..f9b8a288f 100644
--- a/sys-fs/ntfs3g-ar/ntfs3g-ar-2012.1.15.8.ebuild
+++ b/sys-fs/ntfs3g-ar/ntfs3g-ar-2013.1.13.4.ebuild
@@ -1,24 +1,23 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
-inherit eutils linux-info versionator
+inherit eutils linux-info udev versionator
 
-MY_PN="${PN/3g-ar/-3g}"
 MY_PV="$(get_version_component_range 1-3)AR.$(get_version_component_range 4)"
-MY_P="${MY_PN}_ntfsprogs-${MY_PV}"
+MY_P="${PN/3g-ar/-3g_ntfsprogs}-${MY_PV}"
 
-DESCRIPTION="NTFS-3G variant supporting ACLs, junction points, compression and more"
+DESCRIPTION="NTFS-3G Advanced variant supporting ACLs, junction points, compression and more"
 HOMEPAGE="http://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html"
 SRC_URI="http://jp-andre.pagesperso-orange.fr/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="acl crypt debug +external-fuse extras +ntfsprogs static-libs suid +udev xattr"
+IUSE="acl crypt debug +external-fuse +ntfsprogs static-libs suid xattr"
 
-RDEPEND="!<sys-apps/util-linux-2.19
+RDEPEND="!<sys-apps/util-linux-2.20.1-r2
 	!sys-fs/ntfsprogs
 	crypt? (
 		>=dev-libs/libgcrypt-1.2.2
@@ -26,10 +25,10 @@ RDEPEND="!<sys-apps/util-linux-2.19
 		)
 	external-fuse? ( >=sys-fs/fuse-2.8.0 )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-apps/attr"
+	sys-apps/attr
+	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 DOCS="AUTHORS ChangeLog CREDITS README"
 
@@ -44,10 +43,17 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	# add missing $(sbindir) references
+	sed -e 's:sbin\($\|/\):$(sbindir)\1:g' \
+		-i ntfsprogs/Makefile.in src/Makefile.in || die
+}
+
 src_configure() {
 	econf \
-		--exec-prefix="${EPREFIX}/usr" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--prefix="${EPREFIX}"/usr \
+		--exec-prefix="${EPREFIX}"/usr \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		$(use_enable debug) \
 		--enable-ldscript \
 		--disable-ldconfig \
@@ -55,34 +61,46 @@ src_configure() {
 		$(use_enable xattr xattr-mappings) \
 		$(use_enable crypt crypto) \
 		$(use_enable ntfsprogs) \
-		$(use_enable extras) \
+		--without-uuid \
+		--enable-extras \
 		$(use_enable static-libs static) \
-		--with-fuse=$(use external-fuse && echo external || echo internal)
+		--with-fuse=$(usex external-fuse external internal)
 }
 
 src_install() {
 	default
 
 	use suid && fperms u+s /usr/bin/${MY_PN}
-
-	if use udev; then
-		insinto /lib/udev/rules.d
-		doins "${FILESDIR}"/99-ntfs3g.rules
-	fi
-
+	udev_dorules "${FILESDIR}"/99-ntfs3g.rules
 	prune_libtool_files
 
 	# http://bugs.gentoo.org/398069
-	dodir /usr/sbin
-	mv "${D}"/sbin/* "${ED}"/usr/sbin || die
-	rmdir "${D}"/sbin || die 'rmdir failed'
+	rmdir "${D}"/sbin
 
 	dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197
 }
 
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		# Bug 450024
+		if $(tc-getLD) --version | grep -q "GNU gold"; then
+			eerror "ntfs-3g does not function correctly when built with the gold linker."
+			eerror "Please select the bfd linker with binutils-config."
+			die "GNU gold detected"
+		fi
+	fi
+}
+
 pkg_postinst() {
 	ewarn "This is an advanced features release of the ntfs-3g package. It"
 	ewarn "passes standard tests on i386 and x86_64 CPUs but users should"
 	ewarn "still backup their data.  More info at:"
-	ewarn "http://pagesperso-orange.fr/b.andre/advanced-ntfs-3g.html"
+	ewarn "http://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html"
+
+	if use suid; then
+		ewarn
+		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
+		ewarn "means that if there any undetected vulnerabilities in the binary,"
+		ewarn "then local users may be able to gain root access on your machine."
+	fi
 }