Fix #97183 for real. The new init script had not been installed before.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

3 files changed, 47 insertions, 3 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index 20e89e389948..7039413ea34b 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/oftpd
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.25 2009/05/29 13:23:35 rbu Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.26 2009/05/29 14:00:05 rbu Exp $
+
+*oftpd-0.3.7-r4 (29 May 2009)
+
+  29 May 2009; Robert Buchholz <rbu@gentoo.org> files/init.d.oftpd-r1,
+  +oftpd-0.3.7-r4.ebuild:
+  Fix #97183 for real. The new init script had not been installed before.
 
   29 May 2009; Robert Buchholz <rbu@gentoo.org> -oftpd-0.3.7-r1.ebuild,
   -oftpd-0.3.7-r2.ebuild, oftpd-0.3.7-r3.ebuild:
diff --git a/net-ftp/oftpd/files/init.d.oftpd-r1 b/net-ftp/oftpd/files/init.d.oftpd-r1
index 057b1146cadf..43736cc594a2 100644
--- a/net-ftp/oftpd/files/init.d.oftpd-r1
+++ b/net-ftp/oftpd/files/init.d.oftpd-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd-r1,v 1.1 2005/07/02 23:15:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd-r1,v 1.2 2009/05/29 14:00:06 rbu Exp $
 
 depend() {
 	need net
@@ -9,7 +9,7 @@ depend() {
 
 checkconfig() {
 	if [[ -z ${FTPUSER} || -z ${FTPROOT} || -z ${FTPPORT} ] ; then
-		eerror "You need to setup FTPUSER and FTPROOT in /etc/conf.d/oftpd"
+		eerror "You need to setup FTPUSER, FTPROOT and FTPPORT in /etc/conf.d/oftpd"
 		return 1
 	fi
 }
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild
new file mode 100644
index 000000000000..0e90fea40bd1
--- /dev/null
+++ b/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild,v 1.1 2009/05/29 14:00:05 rbu Exp $
+
+EAPI=2
+inherit eutils
+
+DESCRIPTION="Secure, small, anonymous only ftpd"
+HOMEPAGE="http://www.time-travellers.org/oftpd"
+SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="net-ftp/ftpbase"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Don't crash when using an unsupported address family, #159178.
+	epatch "${FILESDIR}"/oftpd-0.3.7-family.patch
+}
+
+src_configure() {
+	# local myconf
+	# ipv6 support busted according to lamer
+	# use ipv6 && myconf="${myconf} --enable-ipv6"
+	econf --bindir=/usr/sbin || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS FAQ NEWS README TODO
+	keepdir /home/ftp
+	newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd
+	newconfd "${FILESDIR}"/conf.d.oftpd-r1 oftpd
+}