autofs support

5 files changed, 145 insertions, 47 deletions

diff --git a/net-fs/ftpfs/ChangeLog b/net-fs/ftpfs/ChangeLog
index 37155ccec92a..e82e3fc68198 100644
--- a/net-fs/ftpfs/ChangeLog
+++ b/net-fs/ftpfs/ChangeLog
@@ -1,16 +1,20 @@
 # ChangeLog for net-fs/ftpfs
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ftpfs/ChangeLog,v 1.5 2003/02/12 07:56:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ftpfs/ChangeLog,v 1.6 2003/08/26 03:26:14 vapier Exp $
+
+*ftpfs-0.6.2-r4 (25 Aug 2003)
+
+  25 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bump to add autofs support #27288.
 
 *ftpfs-0.6.2-r3 (03 Dec 2002)
 
   03 Dec 2002; Jon Nall <nall@gentoo.org> ftpfs-0.6.2-r3.ebuild :
   made patch for non-x86 ARCHs (though currently only patch if ppc)
 
-
 *ftpfs-0.6.2-r2 (10 Apr 2002)
-  8 May 2002; Jon Nelson <jnelson@gentoo.org>: ftpfs-0.6.2-r2.ebuild
 
+  8 May 2002; Jon Nelson <jnelson@gentoo.org>: ftpfs-0.6.2-r2.ebuild
   use check_KV and add dependency for portage >= 1.9.10
 
   10 Apr 2002; Spider <spider@gentoo.org> 
@@ -19,7 +23,6 @@
 *ftpfs-0.6.2-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/net-fs/ftpfs/files/digest-ftpfs-0.6.2-r2 b/net-fs/ftpfs/files/digest-ftpfs-0.6.2-r4
index f384845a3421..f384845a3421 100644
--- a/net-fs/ftpfs/files/digest-ftpfs-0.6.2-r2
+++ b/net-fs/ftpfs/files/digest-ftpfs-0.6.2-r4
diff --git a/net-fs/ftpfs/files/ftpfs-0.6.2-autofs-gentoo.patch b/net-fs/ftpfs/files/ftpfs-0.6.2-autofs-gentoo.patch
new file mode 100644
index 000000000000..b1ffcdd30cd4
--- /dev/null
+++ b/net-fs/ftpfs/files/ftpfs-0.6.2-autofs-gentoo.patch
@@ -0,0 +1,26 @@
+--- ftpmount/Makefile.orig	2001-08-14 19:03:22.000000000 +0200
++++ ftpmount/Makefile	2003-08-25 11:34:44.000000000 +0200
+@@ -2,7 +2,7 @@
+ FTPMOUNT := /usr/bin/ftpmount
+ 
+ AUTOMOUNTED_FTP_DIR := /mnt/ftpfs
+-AUTOMOUNT_FILES := /etc
++AUTOMOUNT_FILES := /etc/autofs
+ 
+ # Directories to search for header files
+ 
+@@ -114,11 +114,9 @@
+ 	rm -f ${FTPMOUNT}
+ 	
+ install_automount: automount
+-	install -m755 --owner=0 --group=0 -b -D automount ${AUTOMOUNT_FILES}/auto.ftp
+-	install -d -m755 --owner=0 --group=0 ${AUTOMOUNTED_FTP_DIR}
+-	cp ${AUTOMOUNT_FILES}/auto.master ${AUTOMOUNT_FILES}/auto.master.ftpfs
+-	echo "${AUTOMOUNTED_FTP_DIR} ${AUTOMOUNT_FILES}/auto.ftp" >> ${AUTOMOUNT_FILES}/auto.master
+-	service autofs restart
++	install -m755 --owner=0 --group=0 -b -D automount ${AUTOMOUNT_FILES_PORTAGE}/auto.ftp
++	install -d -m755 --owner=0 --group=0 ${AUTOMOUNTED_FTP_DIR_PORTAGE}
++	touch ${AUTOMOUNTED_FTP_DIR_PORTAGE}/.keep
+ 
+ uninstall_automount:
+ 	mv ${AUTOMOUNT_FILES}/auto.master.ftpfs ${AUTOMOUNT_FILES}/auto.master
diff --git a/net-fs/ftpfs/ftpfs-0.6.2-r2.ebuild b/net-fs/ftpfs/ftpfs-0.6.2-r2.ebuild
deleted file mode 100644
index af78d6ffa7fc..000000000000
--- a/net-fs/ftpfs/ftpfs-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/ftpfs/ftpfs-0.6.2-r2.ebuild,v 1.10 2003/02/13 14:00:02 vapier Exp $
-
-MY_P=${P}-k2.4
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="A filesystem for mounting FTP volumes"
-SRC_URI="http://ftp1.sourceforge.net/ftpfs/${MY_P}.tar.gz"
-HOMEPAGE="http://ftpfs.sourceforge.net"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="virtual/linux-sources
-	>=sys-apps/portage-1.9.10"
-
-src_compile() {
-	check_KV
-	cd ftpfs
-	make || die
-	cd ../ftpmount
-	make CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	mv ftpfs/Makefile ftpfs/Makefile.old
-	sed s:"depmod -aq"::g \
-	 ftpfs/Makefile.old > ftpfs/Makefile
-
-	make \
-		MODULESDIR=${D}/lib/modules/${KV} \
-		FTPMOUNT=${D}/usr/bin/ftpmount \
-		install || die
-
-	dodoc CHANGELOG
-	dohtml -r docs
-}
-
-pkg_postinst() {
-	echo "running depmod...."
-	depmod -aq || die
-}
diff --git a/net-fs/ftpfs/ftpfs-0.6.2-r4.ebuild b/net-fs/ftpfs/ftpfs-0.6.2-r4.ebuild
new file mode 100644
index 000000000000..efb43a9fda8e
--- /dev/null
+++ b/net-fs/ftpfs/ftpfs-0.6.2-r4.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-fs/ftpfs/ftpfs-0.6.2-r4.ebuild,v 1.1 2003/08/26 03:26:14 vapier Exp $
+
+MY_P=${P}-k2.4
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A filesystem for mounting FTP volumes"
+HOMEPAGE="http://ftpfs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ftpfs/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="autofs"
+
+DEPEND="virtual/linux-sources
+	autofs? ( net-fs/autofs )"
+
+pkg_setup() {
+	check_KV
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	[ "${ARCH}" = "ppc" ] && epatch ${FILESDIR}/${P}-makefile-fix.patch
+	[ `use autofs` ] && epatch ${FILESDIR}/${P}-autofs-gentoo.patch
+	sed -i 's:depmod -aq::g' ftpfs/Makefile
+}
+
+
+src_compile() {
+	cd ftpfs
+	make || die "make ftpfs failed"
+	cd ../ftpmount
+	make CFLAGS="${CFLAGS}" || die "make ftpmount failed"
+}
+
+src_install() {
+	make \
+		MODULESDIR=${D}/lib/modules/${KV} \
+		FTPMOUNT=${D}/usr/bin/ftpmount \
+		install || die
+	if [ `use autofs` ] ; then
+		make \
+			AUTOMOUNTED_FTP_DIR_PORTAGE=${D}/mnt/ftpfs \
+			AUTOMOUNT_FILES_PORTAGE=${D}/etc/autofs \
+			install_automount || die
+	fi
+
+	dodoc CHANGELOG
+	dohtml -r docs
+}
+
+pkg_postinst() {
+	depmod -aq || die "depmod failed"
+
+	if [ `use autofs` ] ; then
+		echo
+		einfo "To enable autofs functionality, please execute the command"
+		einfo " \"TIMEOUT=xx ebuild \\"
+		einfo "  /var/db/pkg/net-fs/${PF}/${PF}.ebuild config\""
+		einfo " TIMEOUT determines the autofs timeout (--timeout switch)."
+		einfo " If you don't provide a TIMEOUT, the --timeout switch won't be"
+		einfo " added, i.e. automounted ftp connections show up indefinitely."
+		einfo " Consult the manual page of autofs(5) for details."
+		echo
+	fi
+}
+
+pkg_postrm() {
+	if [ -f /etc/autofs/auto.master ] && [ -n "`grep ftpfs /etc/autofs/auto.master`" ] ; then
+		cp /etc/autofs/auto.master{,.ftpfs}
+		grep -v "ftpfs" /etc/autofs/auto.master.ftpfs > /etc/autofs/auto.master
+		echo
+		einfo "The ftpfs entries have been removed from the autofs configuration"
+		einfo " \"/etc/autofs/auto.master\"."
+		einfo "A backup containing your previous ftpfs entries has been created as"
+		einfo " \"/etc/autofs/auto.master.ftpfs\"."
+		echo
+		einfo "Don't forget to restart autofs via"
+		einfo " \"/etc/init.d/autofs restart\""
+	fi
+}
+
+pkg_config() {
+	if [ -x /etc/autofs/auto.ftp ] ; then
+		if [ -z "`grep auto.ftp /etc/autofs/auto.master`" ] ; then
+			echo "# Automagically mount ftp shares via ftpfs" >> /etc/autofs/auto.master
+			echo -n "/mnt/ftpfs	/etc/autofs/auto.ftp" >> /etc/autofs/auto.master
+			[ -n ${TIMEOUT} ] \
+				&& echo " --timeout ${TIMEOUT}" >> /etc/autofs/auto.master \
+				|| echo >> /etc/autofs/auto.master
+		fi
+
+		CHANGED_LINE="`grep auto.ftp /etc/autofs/auto.master`"
+
+		einfo "If you want, you can add further autofs options to the line"
+		einfo " \"${CHANGED_LINE}\""
+		einfo " in the file"
+		einfo " \"/etc/autofs/auto.master\"."
+		einfo " Consult the manual page of autofs(5) for details."
+		echo
+		einfo "Don't forget to issue a"
+		einfo " \"/etc/init.d/autofs restart\""
+	else
+		ewarn "The file"
+		ewarn " \"/etc/autofs/auto.ftp\""
+		ewarn "could not be found. Nothing has been done!"
+	fi
+}