Adding a patch to make "mount -t captive-ntfs" working, bumping the revision to send it out.

5 files changed, 39 insertions, 9 deletions

diff --git a/sys-fs/captive/ChangeLog b/sys-fs/captive/ChangeLog
index 7c544b187178..6507d1de0430 100644
--- a/sys-fs/captive/ChangeLog
+++ b/sys-fs/captive/ChangeLog
@@ -1,6 +1,14 @@
 # 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.2 2004/12/03 13:56:42 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/captive/ChangeLog,v 1.3 2004/12/05 22:01:49 genstef Exp $
+
+*captive-1.1.5-r1 (05 Dec 2004)
+
+  05 Dec 2004; Stefan Schweizer <genstef@gentoo.org>
+  +files/use-lufis-for-mount-t-captive.patch, +captive-1.1.5-r1.ebuild,
+  -captive-1.1.5.ebuild:
+  Adding a patch to make "mount -t captive-ntfs" working, bumping the revision
+  to send it out.
 
   03 Dec 2004; Stefan Schweizer <genstef@gentoo.org>
   +files/do-not-check-for-lufsd.patch:
diff --git a/sys-fs/captive/Manifest b/sys-fs/captive/Manifest
index 6f4248cfd38f..f543eb5b088c 100644
--- a/sys-fs/captive/Manifest
+++ b/sys-fs/captive/Manifest
@@ -1,5 +1,6 @@
-MD5 eda18b48143b348c5fee46466e165a03 captive-1.1.5.ebuild 3132
-MD5 b144c663a99a54dbea0845714c4ad397 ChangeLog 499
+MD5 49325b64059d9b6cf724ff9cc97ec5ec captive-1.1.5-r1.ebuild 2877
+MD5 80cffaca7082e5c540f4724e1f8d6741 ChangeLog 780
 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264
-MD5 8b3b77e73595843b6cf711b0355a8b07 files/digest-captive-1.1.5 66
+MD5 8b3b77e73595843b6cf711b0355a8b07 files/digest-captive-1.1.5-r1 66
 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.ebuild b/sys-fs/captive/captive-1.1.5-r1.ebuild
index 6bd69c495e21..6855619655fc 100644
--- a/sys-fs/captive/captive-1.1.5.ebuild
+++ b/sys-fs/captive/captive-1.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.1 2004/12/02 19:46:38 genstef Exp $
+# $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 $
 
 inherit eutils
 
@@ -48,6 +48,7 @@ src_unpack() {
 	# 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
 	cp -f configure configure.orig
 	grep -v 'sh ./macros/glade-w' configure.orig > configure
 }
@@ -88,11 +89,8 @@ pkg_postinst() {
 		einfo "Use /usr/sbin/captive-install-acquire to search for and"
 		einfo "install the needed drivers for captive NTFS."
 		einfo ""
-		einfo "Use /usr/sbin/captive-install-fstab to install captive"
-		einfo "entries into your /etc/fstab."
 	fi
-	einfo "Please emerge lufis and use it to mount captive, e.g.:"
-	einfo 'lufis "fs=captivefs,dir_cache_entries=0,image=/dev/hda1,captive_options=--rw;--load-module=/var/lib/captive/ntoskrnl.exe;--filesystem=/var/lib/captive/ntfs.sys;--sandbox-server=/usr/sbin/captive-sandbox-server;" /mnt/ntfs -s'
+	einfo "Please use \"mount -t captive-ntfs /dev/hda1 /mnt/ntfs\" to mount ntfs partitions."
 }
 
 pkg_postrm() {
diff --git a/sys-fs/captive/files/digest-captive-1.1.5 b/sys-fs/captive/files/digest-captive-1.1.5-r1
index a61cef8f5473..a61cef8f5473 100644
--- a/sys-fs/captive/files/digest-captive-1.1.5
+++ b/sys-fs/captive/files/digest-captive-1.1.5-r1
diff --git a/sys-fs/captive/files/use-lufis-for-mount-t-captive.patch b/sys-fs/captive/files/use-lufis-for-mount-t-captive.patch
new file mode 100644
index 000000000000..7dc979b50631
--- /dev/null
+++ b/sys-fs/captive/files/use-lufis-for-mount-t-captive.patch
@@ -0,0 +1,23 @@
+This patch was introduced by me, to make "mount -t captive-ntfs" working with lufis.
+
+--- 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
+@@ -28,8 +28,7 @@
+ my $vardir='@localstatedir@/lib/captive';
+ $vardir=~s#\$\Q{prefix}\E#'@prefix@';#ge;
+ $vardir="/var/lib/captive" if $vardir=~/^@/;
+-my $lufsd_bin='@PATH_LUFSD@';
+-$lufsd_bin="/usr/bin/lufsd" if $lufsd_bin=~/^@/;
++my $lufsd_bin="/usr/bin/lufis";
+ my $captive_sandbox_server_bin='@sbindir@/captive-sandbox-server';
+ $captive_sandbox_server_bin=~s#\$\Q{exec_prefix}\E#'@exec_prefix@';#ge;
+ $captive_sandbox_server_bin=~s#\$\Q{prefix}\E#'@prefix@';#ge;
+@@ -129,7 +128,7 @@
+ warn "$0: '-n' not supported - ignored" if $nomtab;
+ 
+ # Use "'$oo'" to permit another expansion by bash(1) during lufsmnt(8) execution.
+-my @argv=($lufsd_bin,"none",$dir,"-o",$oo);
++my @argv=($lufsd_bin,$oo,$dir,"-s");
+ 
+ print STDERR "$0: @argv\n" if $verbose;
+ exec $lufsd_bin @argv;