Add "hal" USE flag to install .fdi file so hal will mount NTFS with ntfs-3g rather than the kernel NTFS driver. Thanks to Malte Starostik <m-starostik@versanet.de> (bug #231376). Stabilize ntfs3g-1.2531 on amd64 (bug #231422).

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r6 x86_64

5 files changed, 78 insertions, 15 deletions

diff --git a/sys-fs/ntfs3g/ChangeLog b/sys-fs/ntfs3g/ChangeLog
index ff4af4588cdd..9ceb89692349 100644
--- a/sys-fs/ntfs3g/ChangeLog
+++ b/sys-fs/ntfs3g/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/ntfs3g
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.66 2008/06/03 17:58:13 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ChangeLog,v 1.67 2008/07/10 15:45:12 chutzpah Exp $
+
+*ntfs3g-1.2531-r1 (10 Jul 2008)
+
+  10 Jul 2008; Patrick McLean <chutzpah@gentoo.org> +files/10-ntfs3g.fdi,
+  ntfs3g-1.2531.ebuild, +ntfs3g-1.2531-r1.ebuild:
+  Add "hal" USE flag to install .fdi file so hal will mount NTFS with
+  ntfs-3g rather than the kernel NTFS driver. Thanks to Malte Starostik
+  <m-starostik@versanet.de> (bug #231376). Stabilize ntfs3g-1.2531 on amd64
+  (bug #231422).
 
 *ntfs3g-1.2531 (03 Jun 2008)
 
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index a4a8bc50771e..1795529d3f54 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 10-ntfs3g.fdi 397 RMD160 a09440a0d239db40ce7c6cada0008e425a0a5dc7 SHA1 d26af4f1dcdfad6da384b0e706c79a629fa893dd SHA256 bceb8474647e9dd8a1740d3d3af559cbd9f5ad428f335606f44f87b17c712de7
 DIST ntfs-3g-1.2310.tgz 647906 RMD160 f366ba46f638a09479b733dc8c5617e9cab33b38 SHA1 d8fd4827be5f4a80ae4e1684f107a5fdb296bcbc SHA256 3394bd1c9d0f3640803dc65ebbb42ee945db47e06f1a2b84ad257bad5e3c10f3
 DIST ntfs-3g-1.2412.tgz 650099 RMD160 b6144def516e3ad90daebbf7e18bcf3f860d0cc5 SHA1 f5ae72b087001e478c95dfec41f0bdc43d4ab02f SHA256 abec2b93b4cd941cf34b4bb8dca83a38420db0d9b1b122e5c5d3d8754122fa82
 DIST ntfs-3g-1.2506.tgz 650240 RMD160 5e2de47860712cf409f578209a272b2b271f4482 SHA1 faf53efe779a36dc11c77485542dfd233e8790fa SHA256 519e35600390baf462132cf0285af4c869c5b0e03f41750b5c885d843e7d89e8
@@ -8,13 +6,7 @@ DIST ntfs-3g-1.2531.tgz 651157 RMD160 be9bdb788f5ad2914ae417294d0027eed52e3bc7 S
 EBUILD ntfs3g-1.2310.ebuild 1151 RMD160 ae5036033a15ce5810e5b07d1da0e81b42e0fdd6 SHA1 8068d4c1545b0b0cc666241d27028c466d376b5f SHA256 6edd1d2dc31167644e2266c6e757294aafa1d4212385977bc60f49dfedcb4591
 EBUILD ntfs3g-1.2412.ebuild 1157 RMD160 9cfcea31e9bb37ae7f9553ccefcab8a01502bc10 SHA1 b1ebe84bac1dec189a00808d3d86b0d98da5d4d1 SHA256 f79affc0d7a0505556c609b5315ef99f53f548af1b889460f8644b5d0b464b17
 EBUILD ntfs3g-1.2506.ebuild 1152 RMD160 8adeb2c5cfee4724a4838f6b7590369379a2cf1f SHA1 8246f17db114a8ae34d0a77ceb06a294b953db1b SHA256 0e61d2f91221208fd2404d71408aa9bb1bf4911972090aaa7b2977f334f3ff78
-EBUILD ntfs3g-1.2531.ebuild 1152 RMD160 65997c38b27faf3bed0d5473c9e441727ef75931 SHA1 d5629da22dd2cd454ffbccbf2ebf8d7fa8000990 SHA256 9d777bbb34bd907bd9f0a7018e7c9c8c2be9e21e9b226353835fec22f214b5ee
-MISC ChangeLog 10481 RMD160 87c7d1318e35edf10486c0c961f4ce6bc6ca5534 SHA1 440b5e6450249ccf93844695b3a695fa4801cfee SHA256 ff06014cfc93fb56359475dcc807a4d03416acba7ec353fcad6882d0e2033384
+EBUILD ntfs3g-1.2531-r1.ebuild 1280 RMD160 11a163e427a73b3fbb4ba0668fd3826bb34ba6cd SHA1 959f941666d54bc1be3b4d8fa4a06e3ce1bbe990 SHA256 5972e66d1994b63910891a44b4d1ed7386fc039c380813d858789788a159a232
+EBUILD ntfs3g-1.2531.ebuild 1151 RMD160 aaf32aa7f0465554db1c091b986799b70a72f1ec SHA1 d6bacc1d00bca8da559c149fd5232cf965af7711 SHA256 6ac96a2a680cb6f2877db3b954051090829e58bad723a488b3fdeecc56a1f4da
+MISC ChangeLog 10874 RMD160 7f8615c6ebdc47b502f1898623fbc0cbde2dcd6d SHA1 5ce834fafb099bbe0e34ce7f865e1374b45c582c SHA256 395dc0c3b687fdfc902de817d9a251f0b07e27efa9a86826fcf2ee8d13857a33
 MISC metadata.xml 641 RMD160 361ae848a3012a236c512a5cfc71cc96026ba072 SHA1 9cc731cc7093ad04c8a3199948f24b2c5ff2cadb SHA256 bb0e59a4fde05b0fbad22547a263d7ef98bb5809fd00bf14c0d4d2c89cab05ed
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkhFh0gACgkQWt/XSf2CZdm60wCdHyrFwxwsYNWpfUOK8ngTxp4G
-gZAAnRzZ7uRjmeeOsaFGAj79s7RFXxj6
-=XH8l
------END PGP SIGNATURE-----
diff --git a/sys-fs/ntfs3g/files/10-ntfs3g.fdi b/sys-fs/ntfs3g/files/10-ntfs3g.fdi
new file mode 100644
index 000000000000..488f47bb72cd
--- /dev/null
+++ b/sys-fs/ntfs3g/files/10-ntfs3g.fdi
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deviceinfo version="0.2">
+    <device>
+        <match key="volume.fstype" string="ntfs">
+	    <merge key="volume.fstype" type="string">ntfs-3g</merge>
+    	    <merge key="volume.policy.mount_filesystem" type="string">ntfs-3g</merge>
+	    <append key="volume.mount.valid_options" type="strlist">locale=</append>
+        </match>
+    </device>
+</deviceinfo>
diff --git a/sys-fs/ntfs3g/ntfs3g-1.2531-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-1.2531-r1.ebuild
new file mode 100644
index 000000000000..efbc613f9e5f
--- /dev/null
+++ b/sys-fs/ntfs3g/ntfs3g-1.2531-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-1.2531-r1.ebuild,v 1.1 2008/07/10 15:45:12 chutzpah Exp $
+
+MY_PN="${PN/3g/-3g}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
+HOMEPAGE="http://www.ntfs-3g.org"
+SRC_URI="http://www.ntfs-3g.org/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug hal suid"
+
+RDEPEND="hal? ( sys-apps/hal )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	econf \
+		--docdir="/usr/share/doc/${PF}" \
+		--enable-ldscript \
+		--disable-ldconfig \
+		$(use_enable debug)
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	prepalldocs
+	dodoc AUTHORS ChangeLog CREDITS
+
+	use suid && fperms u+s "/bin/${MY_PN}"
+
+	if use hal; then
+		insinto /etc/hal/fdi/policy/
+		doins "${FILESDIR}/10-ntfs3g.fdi"
+	fi
+}
+
+pkg_postinst() {
+	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."
+		ewarn
+	fi
+}
diff --git a/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild b/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild
index 7ee94a5dc3ea..07b4fa95dbc1 100644
--- a/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild,v 1.1 2008/06/03 17:58:13 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/ntfs3g/ntfs3g-1.2531.ebuild,v 1.2 2008/07/10 15:45:12 chutzpah Exp $
 
 MY_PN="${PN/3g/-3g}"
 MY_P="${MY_PN}-${PV}"
@@ -11,7 +11,7 @@ SRC_URI="http://www.ntfs-3g.org/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug suid"
 
 RDEPEND=""