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

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 50 insertions, 5 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/Manifest b/net-ftp/oftpd/Manifest
index 8a262925bb94..fdc571dbcf66 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -1,9 +1,10 @@
 AUX conf.d.oftpd 469 RMD160 2e70e1d86efadaf72d0f6fe56bd8f07167a7badb SHA1 8e0d30aa2ecf77a58a3790ecc1fee32a420d22d9 SHA256 d1bab71ab0942df8dcb2f88bb50a3c318fe97676d278ccf26d540fdc9c4e69ba
 AUX conf.d.oftpd-r1 578 RMD160 84ba38720a6a2ac8f0873ebbc4cab82f0394232c SHA1 821a500ff9a3d8e35f7aaf39c4c3935546399ae1 SHA256 6ba360cac50935ee9c8ed2961b95e57d7c63c5f63dc0ce7befb942756e054f62
 AUX init.d.oftpd 676 RMD160 95af3c24dda70f631f487495d0a67f280ec1277a SHA1 e50c5f5b83ec97129aa6510d7ba957f565b36773 SHA256 96d69985013735c39e6e4913797fe753e8971cf836e4bc8e5a8f5ed3d8dc03a2
-AUX init.d.oftpd-r1 703 RMD160 aa950de215f93b9eacdbf7cd03b7cebe30c5d42a SHA1 1c883b7ab638b55249b623e84d7b5538ebb9df7c SHA256 b631b9a3b76cfcee2b13298150dbf0f72defa61affc25f8feb1783a17d153057
+AUX init.d.oftpd-r1 705 RMD160 41ea40e359e12bc885da9ffa4a86019da9177fbe SHA1 d252ac6594fd8fec7043084359b2153074a21acd SHA256 4fa929218676c576be2476395b075f53d3f75cdc26a2a8658427481311559ad3
 AUX oftpd-0.3.7-family.patch 550 RMD160 f99e24cda14e2a273564e1d637f9478b0c502c61 SHA1 4c2b80ea4e464458c480defdd2d1a791a3e6ac30 SHA256 f97f380705c42a215b2f4f094cce9b9ea6d5778a605bd532334a8fe07d829023
 DIST oftpd-0.3.7.tar.gz 97364 RMD160 9430607bf0c51847a4e4cc97c84be0495c931183 SHA1 d6d3ce43c009bb68736d50739e9a2f60bede99c1 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e
 EBUILD oftpd-0.3.7-r3.ebuild 1042 RMD160 469cda3176006ad6434c69eb21f998bd487fe586 SHA1 730851bdfd154d4242c45384dba08698e19c3fac SHA256 33677fd0c45af6bdf47cf873211a260483afa236432efe5c4f7fc717e89e9323
-MISC ChangeLog 3737 RMD160 391f23c422414ad5da198c4d4de80ded16922d51 SHA1 e4bbe7c4805e443f53c6a73f6d18ee05766303dd SHA256 2e78bfd3eff23bc01ee7d2988f96712d76e2e46c6c4aeae206618dc3512a5477
+EBUILD oftpd-0.3.7-r4.ebuild 1025 RMD160 11068cffccf61dab85f30e1f059ac24caad37f3a SHA1 9f5cd1db083b7955a05f9afa9c4d3ef2ea8d7e54 SHA256 956f0c9fbe359fcf1622776021b4a6ecc70a0b4b8edc1f0a68441b56bf12190f
+MISC ChangeLog 3940 RMD160 2294c07d567fcffca21f76715405f84dc716ec42 SHA1 7270bf5312ab20d748b94ad605076753f64e3575 SHA256 b6868adba52c7a428d2b44e5c8fda2b4843d94dab28945ce7fa16941223905d3
 MISC metadata.xml 241 RMD160 dbd39e15096a9c09432225b4dee87bcadcb33907 SHA1 1beb1a93e4526085c26b282271027ad508b29059 SHA256 950a704ea9fcebef2e688e8bd6e0f0d292c967e246d58e4778b9955b1d615ab4
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
+}