This package now supports rc5 and rc6.

Man oh man Im glad I got to take a look at this program. Its totally
cool. It offers a secure, anonomous only, read-only ftpd environment.
It is such a breeze to configure, and seems pretty fast too.

Hehehe next time I need to setup public, read-only FTP, this is the
one I will be deploying. =). just thought some of the other devs
might be interested.. Cha Cha!

5 files changed, 65 insertions, 25 deletions

diff --git a/net-ftp/oftpd/files/digest-oftpd-0.3.6-r6 b/net-ftp/oftpd/files/digest-oftpd-0.3.6-r6
new file mode 100644
index 000000000000..bd6726479cb9
--- /dev/null
+++ b/net-ftp/oftpd/files/digest-oftpd-0.3.6-r6
@@ -0,0 +1 @@
+MD5 78b4139bb0108297b9814564db986852 oftpd-0.3.6.tar.gz
diff --git a/net-ftp/oftpd/files/oftpd b/net-ftp/oftpd/files/oftpd.rc5
index 1bc8d8d4a645..1612f482fff9 100755..100644
--- a/net-ftp/oftpd/files/oftpd
+++ b/net-ftp/oftpd/files/oftpd.rc5
@@ -12,7 +12,7 @@ EXE=/usr/sbin/oftpd
 start() {
 
 		ebegin "Starting $SERVICE"
-     		start-stop-daemon --start --quiet --exec $EXE $FTPUSER $FTPROOT
+     		start-stop-daemon --start --quiet --exec $EXE -- $FTPUSER $FTPROOT
 		eend $? "Started $SERVICE." "Error starting $SERVICE."
 }
 
diff --git a/net-ftp/oftpd/files/oftpd.rc6 b/net-ftp/oftpd/files/oftpd.rc6
new file mode 100644
index 000000000000..907bfd27d5e3
--- /dev/null
+++ b/net-ftp/oftpd/files/oftpd.rc6
@@ -0,0 +1,25 @@
+#!/sbin/runscript
+
+depend() {
+    need net
+}
+
+checkconfig() {
+    if [ -z "$FTPUSER" ] || [ -z "$FTPROOT" ] ; then
+	eerror "You need to setup FTPUSER and FTPROOT in /etc/rc.conf"
+	return 1
+    fi
+}
+
+start() {
+    checkconfig || return 1
+    ebegin "Starting oftpd"
+    start-stop-daemon --start --quiet --exec /usr/sbin/oftpd -- $FTPUSER $FTPROOT
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping oftpd"
+    start-stop-daemon --stop --quiet --exec /usr/sbin/oftpd
+    eend $?
+}
diff --git a/net-ftp/oftpd/oftpd-0.3.6-r6.ebuild b/net-ftp/oftpd/oftpd-0.3.6-r6.ebuild
new file mode 100644
index 000000000000..b1de2a987415
--- /dev/null
+++ b/net-ftp/oftpd/oftpd-0.3.6-r6.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Donny Davies <woodchip@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.6-r6.ebuild,v 1.1 2001/09/06 11:35:24 woodchip Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Secure, small, anonymous only ftpd"
+SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
+HOMEPAGE="http://www.time-travellers.org/oftpd"
+
+DEPEND="virtual/glibc"
+
+src_compile() {
+	local myconf
+	# ipv6 support busted according to lamer
+	# use ipv6 && myconf="${myconf} --enable-ipv6"
+	./configure --prefix=/usr --bindir=/usr/sbin --mandir=/usr/share/man \
+		--host=${CHOST} ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS BUGS COPYING INSTALL FAQ NEWS README TODO
+	dodir /home/ftp
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/oftpd.rc6 oftpd
+}
diff --git a/net-ftp/oftpd/oftpd-0.3.6.ebuild b/net-ftp/oftpd/oftpd-0.3.6.ebuild
index c69ded6b8b1c..4ea4f475bae7 100644
--- a/net-ftp/oftpd/oftpd-0.3.6.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.6.ebuild
@@ -1,20 +1,17 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Ben Lutgens <lamer@gentoo.org> 
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.6.ebuild,v 1.2 2001/07/07 17:53:18 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.6.ebuild,v 1.3 2001/09/06 11:35:24 woodchip Exp $
 
-#P=
-#A=${P}.tar.gz
 S=${WORKDIR}/${P}
-DESCRIPTION="Secure, small anonymous only ftpd"
+DESCRIPTION="Secure, small, anonymous only ftpd"
 SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
-HOMEPAGE="http://www.time-travellers.org/oftpd/"
+HOMEPAGE="http://www.time-travellers.org/oftpd"
 
-DEPEND=""
+DEPEND="virtual/glibc"
 
 src_compile() {
 
-
 # Broken upstream source. Won't compile with this enabled.
 #local myconf
 # if [ "`use ipv6`" ]; then
@@ -29,25 +26,14 @@ src_compile() {
 
 src_install () {
 
-    try make DESTDIR=${D} install
-	 dodoc AUTHORS BUGS COPYING INSTALL FAQ NEWS README TODO
-	 exeinto /etc/rc.d/init.d
-	 doexe ${FILESDIR}/oftpd
-
-# Am disabling this untill I can figure out how to make the daemon write a
-# pid file
-    doexe ${FILESDIR}/svc-oftpd
-    exeinto /var/lib/supervise/services/oftpd
-	 newexe ${FILESDIR}/oftpd-run run
-    dodir /var/lib/supervise/control
-    dosym /var/lib/supervise/services/oftpd \
-	 /var/lib/supervise/control/oftpd
-	 dodir /home/ftp
+	try make DESTDIR=${D} install
+	dodoc AUTHORS BUGS COPYING INSTALL FAQ NEWS README TODO
+	exeinto /etc/rc.d/init.d
+	newexe ${FILESDIR}/oftpd.rc5 oftpd
+	dodir /home/ftp
 }
 
 pkg_postinst() {
 	einfo "Run \"rc-update add svc-oftpd\" to make the daemon start at boot"
-	einfo "Add FTPUSER=\"ftp\" and FTPROOT=\"/home/ftp\" to
-/etc/rc.d/config/basic"
+	einfo "Add FTPUSER=\"ftp\" and FTPROOT=\"/home/ftp\" to /etc/rc.d/config/basic"
 }
-