7 files changed, 13 insertions, 215 deletions
diff --git a/net-ftp/ftpd/Manifest b/net-ftp/ftpd/Manifest
index e42cf4740d1a..744a93d41645 100644
--- a/net-ftp/ftpd/Manifest
+++ b/net-ftp/ftpd/Manifest
@@ -21,49 +21,27 @@ AUX ssl.diff.gz 10444 RMD160 ac0476b8da7273b64dca9bf7ce7304261aff0043 SHA1 3547e
 MD5 0630d5a4a420220cc8b912bdad705f6c files/ssl.diff.gz 10444
 RMD160 ac0476b8da7273b64dca9bf7ce7304261aff0043 files/ssl.diff.gz 10444
 SHA256 28566addb8271c7d77585019c7da4d853c157d42518652d5c3f450ba6a53ae20 files/ssl.diff.gz 10444
-DIST ftpd-0.17-ssl.diff.gz 10444
-DIST linux-ftpd-0.17-ssl.patch 36459
-DIST linux-ftpd-0.17.tar.gz 46763
-EBUILD ftpd-0.17-r1.ebuild 1506 RMD160 b83bc52911b0e0a28ed250eec3dc8e7721669423 SHA1 9d38a7e1fce8b328e1e7ca28bac4dba00c6a2d9c SHA256 3d3b32fc9b0ce4437b0521951878115a620e6054826ba1a7da123f63ed05deb2
-MD5 1f7d479a8229d7c736b0b9d11027e501 ftpd-0.17-r1.ebuild 1506
-RMD160 b83bc52911b0e0a28ed250eec3dc8e7721669423 ftpd-0.17-r1.ebuild 1506
-SHA256 3d3b32fc9b0ce4437b0521951878115a620e6054826ba1a7da123f63ed05deb2 ftpd-0.17-r1.ebuild 1506
-EBUILD ftpd-0.17-r2.ebuild 1562 RMD160 0214c0622b8c19cb4311210a7a7032f3b67a8847 SHA1 7d710ac93c885a6808b0dd50df38e4489bc615bb SHA256 dae7ca4c726bc6cdd12116dcbca12de887cc23395169ad45cb805acbc432b5fe
-MD5 0138f8ac1c5a7b92ea739bc6401d61d5 ftpd-0.17-r2.ebuild 1562
-RMD160 0214c0622b8c19cb4311210a7a7032f3b67a8847 ftpd-0.17-r2.ebuild 1562
-SHA256 dae7ca4c726bc6cdd12116dcbca12de887cc23395169ad45cb805acbc432b5fe ftpd-0.17-r2.ebuild 1562
+DIST linux-ftpd-0.17-ssl.patch 36459 RMD160 5a0d7301f69b4c1714f36419f98134f9aa0ce874 SHA1 a684c075dbc7603b40704713350c1bb95d98a4c5 SHA256 0082ee6a71fdd83f61e63166f7bbba97c204cdc67f9e1bf10f2df31590fba780
+DIST linux-ftpd-0.17.tar.gz 46763 RMD160 869e410d8f063c764c04f1d3b41b625a9d679d22 SHA1 b348e2c9561d746a42b7a24ba8730a3adc203dfb SHA256 65a0b249e38bf3c3a16dbd4d3edd2657683ca8f47b307e92007f378b21d2fa65
 EBUILD ftpd-0.17-r3.ebuild 1471 RMD160 ccc78f31a55ae8b366819b0cf80b84d7589fb668 SHA1 c140cdb8583559f2d29d2ea356e54dd3d7c9ab3c SHA256 9d13e34351b1845a4de5b9d55c70b4e6a1df6870a68c0f019311cf4bce34d4a5
 MD5 09b6a60973d7efdeed923d5485afddd9 ftpd-0.17-r3.ebuild 1471
 RMD160 ccc78f31a55ae8b366819b0cf80b84d7589fb668 ftpd-0.17-r3.ebuild 1471
 SHA256 9d13e34351b1845a4de5b9d55c70b4e6a1df6870a68c0f019311cf4bce34d4a5 ftpd-0.17-r3.ebuild 1471
-EBUILD ftpd-0.17.ebuild 1452 RMD160 0a5218e6075388200b81706631683e91cff78157 SHA1 98401767ee2a14644037c3273da570d09544690d SHA256 c3c9199cd15efdbc89b66d021071186fb0c833969f099ccdaa5e313d9bb04a96
-MD5 6138af5c00327fa26f61c2a7bcfee67a ftpd-0.17.ebuild 1452
-RMD160 0a5218e6075388200b81706631683e91cff78157 ftpd-0.17.ebuild 1452
-SHA256 c3c9199cd15efdbc89b66d021071186fb0c833969f099ccdaa5e313d9bb04a96 ftpd-0.17.ebuild 1452
-MISC ChangeLog 3364 RMD160 c0c28114d1f325d83229315b3498ab274b3f242c SHA1 fa93928094e5368e52633876a169f03c86089256 SHA256 2d6fff9c460e173f8b5f6111349b028bd274961ed3b22b773f375ab3d7f27951
-MD5 08fe243dbf5fafb031f8dbc9005f79d3 ChangeLog 3364
-RMD160 c0c28114d1f325d83229315b3498ab274b3f242c ChangeLog 3364
-SHA256 2d6fff9c460e173f8b5f6111349b028bd274961ed3b22b773f375ab3d7f27951 ChangeLog 3364
+MISC ChangeLog 3518 RMD160 021c5c638dac138fc8066f3df9be68c3d612f853 SHA1 3f9bb9c2fcbec67f16381732b0a638622dc36228 SHA256 f3ed2c4585e5d0898edeae422266e5138b0b1ab27150554644713660b4bbb1f7
+MD5 6573a25c1b6f5d41c0693873ca040b1e ChangeLog 3518
+RMD160 021c5c638dac138fc8066f3df9be68c3d612f853 ChangeLog 3518
+SHA256 f3ed2c4585e5d0898edeae422266e5138b0b1ab27150554644713660b4bbb1f7 ChangeLog 3518
 MISC metadata.xml 171 RMD160 5a4d3e8a2c9e0358aa437eb0c76569f91b857ef3 SHA1 ebdc031ba92333fa3e0f93e723dbb09334d819d6 SHA256 35e9133d78efd3d08a76e7e7542de5053f7bbf9bd4b8d15a85c3406086aa4ee5
 MD5 097850a9c53cf1e70cecd8b06234b8e4 metadata.xml 171
 RMD160 5a4d3e8a2c9e0358aa437eb0c76569f91b857ef3 metadata.xml 171
 SHA256 35e9133d78efd3d08a76e7e7542de5053f7bbf9bd4b8d15a85c3406086aa4ee5 metadata.xml 171
-MD5 51361d4bb46991f9469d3d0fe1b37d92 files/digest-ftpd-0.17 131
-RMD160 12ca406253b702c5c7b1d296c40d898f1f0671c8 files/digest-ftpd-0.17 131
-SHA256 16ab745374835bd48f3816f0df2d9e95090b1481ec21d97236f4e7894beeafbf files/digest-ftpd-0.17 131
-MD5 51361d4bb46991f9469d3d0fe1b37d92 files/digest-ftpd-0.17-r1 131
-RMD160 12ca406253b702c5c7b1d296c40d898f1f0671c8 files/digest-ftpd-0.17-r1 131
-SHA256 16ab745374835bd48f3816f0df2d9e95090b1481ec21d97236f4e7894beeafbf files/digest-ftpd-0.17-r1 131
-MD5 51361d4bb46991f9469d3d0fe1b37d92 files/digest-ftpd-0.17-r2 131
-RMD160 12ca406253b702c5c7b1d296c40d898f1f0671c8 files/digest-ftpd-0.17-r2 131
-SHA256 16ab745374835bd48f3816f0df2d9e95090b1481ec21d97236f4e7894beeafbf files/digest-ftpd-0.17-r2 131
-MD5 d6140676fe7acab811160aa574573e83 files/digest-ftpd-0.17-r3 135
-RMD160 e2465adda0c7dd17fb92bb10b44c5d2f32040193 files/digest-ftpd-0.17-r3 135
-SHA256 3540ff7d3d95b6f9b2b963b2aab1473cbc41636a0ac6227d6a453589ca0351ab files/digest-ftpd-0.17-r3 135
+MD5 a5158bf958d1411f9daefa3a43b7f12e files/digest-ftpd-0.17-r3 497
+RMD160 db856b5782788330427703698f410c205225d8e2 files/digest-ftpd-0.17-r3 497
+SHA256 193c18b7c4e2467ed5453bee8fc5e2b66ab314c429cc4a2daf79fbe652de26ba files/digest-ftpd-0.17-r3 497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEmBn6NJowsmZ/PzARAtkVAJ4oWJEwLVsc0zXQYOMKhA2tUDpRqQCgqBe7
-AY7tzjuTmXltB0EP/Yw+cDA=
-=b47w
+iD8DBQFE1EUpFdQwWVoAgN4RAqMEAKDtEbUoqh6ZHBSSzctHNXNHjlVOmgCcCkan
+GT6gKEgBV8wouI1h274PL4A=
+=s4AS
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/ftpd/files/digest-ftpd-0.17 b/net-ftp/ftpd/files/digest-ftpd-0.17
deleted file mode 100644
index 407f59256ef8..000000000000
--- a/net-ftp/ftpd/files/digest-ftpd-0.17
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0630d5a4a420220cc8b912bdad705f6c ftpd-0.17-ssl.diff.gz 10444
-MD5 f5f491564812db5d8783daa538c49186 linux-ftpd-0.17.tar.gz 46763
diff --git a/net-ftp/ftpd/files/digest-ftpd-0.17-r1 b/net-ftp/ftpd/files/digest-ftpd-0.17-r1
deleted file mode 100644
index 407f59256ef8..000000000000
--- a/net-ftp/ftpd/files/digest-ftpd-0.17-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0630d5a4a420220cc8b912bdad705f6c ftpd-0.17-ssl.diff.gz 10444
-MD5 f5f491564812db5d8783daa538c49186 linux-ftpd-0.17.tar.gz 46763
diff --git a/net-ftp/ftpd/files/digest-ftpd-0.17-r2 b/net-ftp/ftpd/files/digest-ftpd-0.17-r2
deleted file mode 100644
index 407f59256ef8..000000000000
--- a/net-ftp/ftpd/files/digest-ftpd-0.17-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0630d5a4a420220cc8b912bdad705f6c ftpd-0.17-ssl.diff.gz 10444
-MD5 f5f491564812db5d8783daa538c49186 linux-ftpd-0.17.tar.gz 46763
diff --git a/net-ftp/ftpd/ftpd-0.17-r1.ebuild b/net-ftp/ftpd/ftpd-0.17-r1.ebuild
deleted file mode 100644
index ddaa75f1cc95..000000000000
--- a/net-ftp/ftpd/ftpd-0.17-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17-r1.ebuild,v 1.11 2006/01/30 19:03:56 blubb Exp $
-
-inherit eutils
-
-IUSE="ssl"
-
-S=${WORKDIR}/linux-${P}
-DESCRIPTION="The netkit FTP server with optional SSL support"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-${P}.tar.gz
-		ssl? ( mirror://gentoo/${P}-ssl.diff.gz )"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="alpha amd64 ~ppc sparc x86"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	virtual/inetd"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use ssl; then
-		epatch ${WORKDIR}/${P}-ssl.diff
-	fi
-	epatch ${FILESDIR}/${P}-shadowfix.patch
-}
-
-src_compile() {
-	./configure --prefix=/usr || die "configure failed"
-	cp MCONFIG MCONFIG.orig
-	sed -e "s:-pipe -O2:${CFLAGS}:" MCONFIG.orig > MCONFIG
-	emake || die "parallel make failed"
-}
-
-src_install() {
-	dobin ftpd/ftpd
-	doman ftpd/ftpd.8
-	dodoc README ChangeLog
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/ftp.xinetd ftp
-}
-
-pkg_postinst() {
-	einfo "In order to start the server with SSL support"
-	einfo "You need to create a certificate and place it"
-	einfo "in SSLCERTDIR..."
-	einfo "<=openssl-0.9.6g - SSLCERTDIR=/usr/lib/ssl/certs"
-	einfo ">=openssl-0.9.6g-r1 - SSLCERTDIR=/etc/ssl/certs"
-	einfo ""
-	einfo "cd SSLCERTDIR"
-	einfo "openssl req -new -x509 -nodes -out ftpd.pem -keyout ftpd.pem"
-	einfo ""
-}
diff --git a/net-ftp/ftpd/ftpd-0.17-r2.ebuild b/net-ftp/ftpd/ftpd-0.17-r2.ebuild
deleted file mode 100644
index e794ad4f7c6f..000000000000
--- a/net-ftp/ftpd/ftpd-0.17-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17-r2.ebuild,v 1.2 2006/01/30 19:03:56 blubb Exp $
-
-inherit eutils
-
-IUSE="ssl"
-
-S=${WORKDIR}/linux-${P}
-DESCRIPTION="The netkit FTP server with optional SSL support"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-${P}.tar.gz
-		ssl? ( mirror://gentoo/${P}-ssl.diff.gz )"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	virtual/inetd"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use ssl; then
-		epatch ${WORKDIR}/${P}-ssl.diff
-		epatch ${FILESDIR}/${P}+ssl-0.3-overflowpatch.diff
-	fi
-	epatch ${FILESDIR}/${P}-shadowfix.patch
-}
-
-src_compile() {
-	./configure --prefix=/usr || die "configure failed"
-	cp MCONFIG MCONFIG.orig
-	sed -e "s:-pipe -O2:${CFLAGS}:" MCONFIG.orig > MCONFIG
-	emake || die "parallel make failed"
-}
-
-src_install() {
-	dobin ftpd/ftpd
-	doman ftpd/ftpd.8
-	dodoc README ChangeLog
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/ftp.xinetd ftp
-}
-
-pkg_postinst() {
-	einfo "In order to start the server with SSL support"
-	einfo "You need to create a certificate and place it"
-	einfo "in SSLCERTDIR..."
-	einfo "<=openssl-0.9.6g - SSLCERTDIR=/usr/lib/ssl/certs"
-	einfo ">=openssl-0.9.6g-r1 - SSLCERTDIR=/etc/ssl/certs"
-	einfo ""
-	einfo "cd SSLCERTDIR"
-	einfo "openssl req -new -x509 -nodes -out ftpd.pem -keyout ftpd.pem"
-	einfo ""
-}
diff --git a/net-ftp/ftpd/ftpd-0.17.ebuild b/net-ftp/ftpd/ftpd-0.17.ebuild
deleted file mode 100644
index 7dc9bd641d45..000000000000
--- a/net-ftp/ftpd/ftpd-0.17.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17.ebuild,v 1.13 2006/01/30 19:03:56 blubb Exp $
-
-inherit eutils
-
-IUSE="ssl"
-
-S=${WORKDIR}/linux-${P}
-DESCRIPTION="The netkit FTP server with optional SSL support"
-HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
-SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-${P}.tar.gz
-		ssl? ( mirror://gentoo/${P}-ssl.diff.gz )"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ~sparc amd64"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	virtual/inetd"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use ssl; then
-		epatch ${WORKDIR}/${P}-ssl.diff
-	fi
-}
-
-src_compile() {
-	./configure --prefix=/usr || die "configure failed"
-	cp MCONFIG MCONFIG.orig
-	sed -e "s:-pipe -O2:${CFLAGS}:" MCONFIG.orig > MCONFIG
-	emake || die "parallel make failed"
-}
-
-src_install() {
-	dobin ftpd/ftpd
-	doman ftpd/ftpd.8
-	dodoc README ChangeLog
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/ftp.xinetd ftp
-}
-
-pkg_postinst() {
-	einfo "In order to start the server with SSL support"
-	einfo "You need to create a certificate and place it"
-	einfo "in SSLCERTDIR..."
-	einfo "<=openssl-0.9.6g - SSLCERTDIR=/usr/lib/ssl/certs"
-	einfo ">=openssl-0.9.6g-r1 - SSLCERTDIR=/etc/ssl/certs"
-	einfo ""
-	einfo "cd SSLCERTDIR"
-	einfo "openssl req -new -x509 -nodes -out ftpd.pem -keyout ftpd.pem"
-	einfo ""
-}