New ebuild with static tarball to solve =gnome-vfs-2.6* depend and gnome-vfs-problems, reported in bug 77239 thanks to Dylan Wakefield <dylanw@telpacific.com.au> and solve mount problems to allow other users to umount the device as reported in bug 75825 thanks to Thomas Bettler <bettlertho@sis.unibe.ch>, Alexander Schneider <A.Schneider@magicspace.de>, Marc Gallagher <marcgallagher@gmail.com>, Lars Petersen <lpetersen@gmx.net> and Alistair <alistair@stuffthatworks.com.au>

(Portage version: 2.0.51-r15)

6 files changed, 139 insertions, 6 deletions

diff --git a/sys-fs/captive/ChangeLog b/sys-fs/captive/ChangeLog
index 6507d1de0430..6bb7c7b75fa1 100644
--- a/sys-fs/captive/ChangeLog
+++ b/sys-fs/captive/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for sys-fs/captive
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.3 2004/12/05 22:01:49 genstef Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.4 2005/02/13 21:02:25 genstef Exp $
+
+*captive-1.1.5-r2 (13 Feb 2005)
+
+  13 Feb 2005; Stefan Schweizer <genstef@gentoo.org>
+  +files/add-extra-opts-for-user-access-to-mount-t-captive.patch,
+  +captive-1.1.5-r2.ebuild:
+  New ebuild with static tarball to solve =gnome-vfs-2.6* depend and
+  gnome-vfs-problems, reported in bug 77239 thanks to Dylan Wakefield
+  <dylanw@telpacific.com.au> and solve mount problems to allow other users to
+  umount the device as reported in bug 75825 thanks to Thomas Bettler
+  <bettlertho@sis.unibe.ch>, Alexander Schneider <A.Schneider@magicspace.de>,
+  Marc Gallagher <marcgallagher@gmail.com>, Lars Petersen <lpetersen@gmx.net>
+  and Alistair <alistair@stuffthatworks.com.au>
 
 *captive-1.1.5-r1 (05 Dec 2004)
 
diff --git a/sys-fs/captive/Manifest b/sys-fs/captive/Manifest
index 4f8dbd68c7a3..5c159f0ae4ee 100644
--- a/sys-fs/captive/Manifest
+++ b/sys-fs/captive/Manifest
@@ -1,6 +1,9 @@
-MD5 982fcd3cc04f54e2cc349f2e3e891855 captive-1.1.5-r1.ebuild 2880
-MD5 fb183c5bba98ec474ec47a717022888a ChangeLog 780
+MD5 930e6debf04e3227a2a82d87faff056a captive-1.1.5-r2.ebuild 2692
+MD5 601aa56bb928a37cb02753d28d4b9cb2 captive-1.1.5-r1.ebuild 2880
+MD5 cb899877a4af17af5647393cfd1dce7d ChangeLog 1452
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
+MD5 09de72e8ea997c51e2cdd999343d63ac files/add-extra-opts-for-user-access-to-mount-t-captive.patch 647
 MD5 8b3b77e73595843b6cf711b0355a8b07 files/digest-captive-1.1.5-r1 66
+MD5 00da6b972db84ffd52c945b07c3204d4 files/digest-captive-1.1.5-r2 148
 MD5 af3ab379ab00c1a99eaaa24e67007377 files/do-not-check-for-lufsd.patch 1090
 MD5 ec2f404ce7a254d2d75101c257fdd9ce files/use-lufis-for-mount-t-captive.patch 1041
diff --git a/sys-fs/captive/captive-1.1.5-r1.ebuild b/sys-fs/captive/captive-1.1.5-r1.ebuild
index 6855619655fc..c06762096f77 100644
--- a/sys-fs/captive/captive-1.1.5-r1.ebuild
+++ b/sys-fs/captive/captive-1.1.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.5-r1.ebuild,v 1.1 2004/12/05 22:01:49 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.5-r1.ebuild,v 1.2 2005/02/13 21:02:25 genstef Exp $
 
 inherit eutils
 
diff --git a/sys-fs/captive/captive-1.1.5-r2.ebuild b/sys-fs/captive/captive-1.1.5-r2.ebuild
new file mode 100644
index 000000000000..722db0e9499f
--- /dev/null
+++ b/sys-fs/captive/captive-1.1.5-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/captive-1.1.5-r2.ebuild,v 1.1 2005/02/13 21:02:25 genstef Exp $
+
+inherit eutils
+
+DESCRIPTION="Captive uses binary Windows drivers for full NTFS r/w access."
+HOMEPAGE="http://www.jankratochvil.net/project/captive/"
+SRC_URI="http://www.jankratochvil.net/project/captive/dist/${P}.tar.gz
+		mirror://gentoo/captive-install-static-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 -*"
+
+IUSE="debug static"
+
+RDEPEND="sys-libs/readline
+	>=gnome-base/orbit-2.8.2
+	gnome-base/gnome-vfs
+	dev-libs/popt
+	dev-libs/glib
+	>=dev-libs/openssl-0.9.7c
+	>=dev-libs/libxml2-2.4.29
+	sys-fs/lufis"
+
+DEPEND="${RDEPEND}
+	sys-fs/ntfsprogs"
+
+pkg_setup() {
+	einfo "Adding captive user and group"
+	enewgroup captive || die "enewgroup captive failed"
+	enewuser captive -1 /bin/false /dev/null captive \
+		|| die "enewuser captive failed"
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# This is needed because that scripts will cause an sandbox violation
+	# if Xvnc is installed and its not needed anyways
+	# if it breaks, use the virtualx eclass and Xeconf
+	cd ${S}
+	epatch ${FILESDIR}/do-not-check-for-lufsd.patch
+	epatch ${FILESDIR}/use-lufis-for-mount-t-captive.patch
+	epatch ${FILESDIR}/add-extra-opts-for-user-access-to-mount-t-captive.patch
+	cp -f configure configure.orig
+	grep -v 'sh ./macros/glade-w' configure.orig > configure
+}
+
+src_compile() {
+	# disable some tests to save time ;)
+	econf `use_enable debug bug-replay` \
+		`use_enable static` \
+		--disable-install-pkg \
+		--with-readline \
+		--enable-lufs \
+		--enable-sandbox-setuid=captive \
+		--enable-sandbox-setgid=captive \
+		--enable-sandbox-chroot=/var/lib/captive \
+		--enable-man-pages \
+		--enable-sbin-mountdir=/sbin \
+		--enable-sbin-mount-fs=ntfs:fastfat:cdfs:ext2fsd \
+		--disable-gtk-doc \
+		--with-orbit-line=link \
+		--disable-glibtest --disable-orbittest \
+		--with-tmpdir=/tmp --localstatedir=/var || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodir   /var/lib/captive
+	diropts -m1777
+	dodir   /var/lib/captive/tmp
+	keepdir /var/lib/captive/tmp
+
+	dodoc AUTHORS COPYING* ChangeLog* NEWS README* TODO \
+		|| die "dodoc failed"
+
+	dosbin ${WORKDIR}/captive-install*
+}
+
+pkg_postinst() {
+	einfo "Use /usr/sbin/captive-install-acquire to search for and"
+	einfo "install the needed drivers for captive NTFS."
+	einfo ""
+	einfo "Please use \"mount -t captive-ntfs /dev/hda1 /mnt/ntfs\" to mount ntfs partitions."
+}
+
+pkg_postrm() {
+	#einfo Removing captive user
+	#userdel captive
+	#einfo Removing captive group
+	#groupdel captive
+	einfo ""
+	einfo "You will have to remove captive user and group manually"
+	einfo ""
+}
diff --git a/sys-fs/captive/files/add-extra-opts-for-user-access-to-mount-t-captive.patch b/sys-fs/captive/files/add-extra-opts-for-user-access-to-mount-t-captive.patch
new file mode 100644
index 000000000000..19cc713d543a
--- /dev/null
+++ b/sys-fs/captive/files/add-extra-opts-for-user-access-to-mount-t-captive.patch
@@ -0,0 +1,16 @@
+This patch was introduced by me, to allow the access of other users to root-mounted captive-ntfs volumes.
+
+--- captive-1.1.5/src/client/lufs/mount.captive.in.orig	2004-12-05 21:59:19.561715008 +0100
++++ captive-1.1.5/src/client/lufs/mount.captive.in	2004-12-05 22:00:49.549034856 +0100
+@@ -127,8 +127,10 @@
+ 
+ warn "$0: '-n' not supported - ignored" if $nomtab;
+ 
++my $fuseopts="-oallow_other,fsname=$image";
++
+ # Use "'$oo'" to permit another expansion by bash(1) during lufsmnt(8) execution.
+-my @argv=($lufsd_bin,$oo,$dir,"-s");
++my @argv=($lufsd_bin,$oo,$dir,"-s",$fuseopts);
+ 
+ print STDERR "$0: @argv\n" if $verbose;
+ exec $lufsd_bin @argv;
diff --git a/sys-fs/captive/files/digest-captive-1.1.5-r2 b/sys-fs/captive/files/digest-captive-1.1.5-r2
new file mode 100644
index 000000000000..95b32005c5d8
--- /dev/null
+++ b/sys-fs/captive/files/digest-captive-1.1.5-r2
@@ -0,0 +1,2 @@
+MD5 dfb7ce617745695e7a908609b9370fd6 captive-1.1.5.tar.gz 2547676
+MD5 31b7337221b424cedc0cb9f7508c47d0 captive-install-static-1.1.5.tar.bz2 3012065