renamed to netkit-ftpd

12 files changed, 62 insertions, 403 deletions

diff --git a/net-ftp/ftpd/ChangeLog b/net-ftp/ftpd/ChangeLog
deleted file mode 100644
index e4326afe88ba..000000000000
--- a/net-ftp/ftpd/ChangeLog
+++ /dev/null
@@ -1,123 +0,0 @@
-# ChangeLog for net-ftp/ftpd
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ChangeLog,v 1.34 2007/01/08 01:50:31 kugelfang Exp $
-
-  08 Jan 2007; Danny van Dyk <kugelfang@gentoo.org> -ftpd-0.17-r3.ebuild:
-  QA: Removed unused versions.
-
-  17 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org> ftpd-0.17-r4.ebuild:
-  sparc stable for real
-
-  15 Oct 2006; Jason Wever <weeve@gentoo.org> ChangeLog:
-  Stable on SPARC wrt security bug #150292.
-
-  14 Oct 2006; Aron Griffis <agriffis@gentoo.org> ftpd-0.17-r4.ebuild:
-  Mark 0.17-r4 ~ia64
-
-  14 Oct 2006; Thomas Cort <tcort@gentoo.org> ftpd-0.17-r4.ebuild:
-  Stable on alpha and amd64 wrt security Bug #150292.
-
-  12 Oct 2006; Paul Varner <fuzzyray@gentoo.org> ftpd-0.17-r4.ebuild:
-  Stable on x86 - Bug #150292
-
-  11 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> ftpd-0.17-r4.ebuild:
-  ppc stable, bug #150292
-
-*ftpd-0.17-r4 (11 Oct 2006)
-
-  11 Oct 2006; Chris White <chriswhite@gentoo.org>
-  +files/ftpd-0.17-setguid.patch, +ftpd-0.17-r4.ebuild:
-  Security bump for bug #384454.
-
-  05 Aug 2006; Chris White <chriswhite@gentoo.org> -ftpd-0.17.ebuild,
-  -ftpd-0.17-r1.ebuild, -ftpd-0.17-r2.ebuild:
-  Security punts for bug #140498.
-
-  20 Jun 2006; Stefan Schweizer <genstef@gentoo.org>
-  +files/ftpd-0.17-gcc41.patch, +metadata.xml, ftpd-0.17-r3.ebuild:
-  Gcc41 patch thanks to Piotr Jaroszynski <peper@aster.pl> in bug 135713
-  thanks to Frank T. Lofaro Jr. <ftlofaro@yahoo.com>, add maintainer-needed
-  metadata.xml
-
-  28 Jan 2006; Simon Stelling <blubb@gentoo.org> ftpd-0.17.ebuild,
-  ftpd-0.17-r1.ebuild, ftpd-0.17-r2.ebuild:
-  move binary files to mirrors
-
-  11 Nov 2005; Simon Stelling <blubb@gentoo.org> ftpd-0.17-r3.ebuild:
-  stable on amd64 wrt bug 111573
-
-  10 Nov 2005; Jose Luis Rivero <yoswink@gentoo.org> ftpd-0.17-r3.ebuild:
-  Stable on alpha wrt security bug #111573
-
-  10 Nov 2005; Jason Wever <weeve@gentoo.org> ftpd-0.17-r3.ebuild:
-  Stable on SPARC wrt bug #111573.
-
-  10 Nov 2005; Mark Loeser <halcy0n@gentoo.org> ftpd-0.17-r3.ebuild:
-  Stable on x86; bug #111573
-
-*ftpd-0.17-r3 (09 Nov 2005)
-
-  09 Nov 2005; Daniel Black <dragonheart@gentoo.org>
-  +ftpd-0.17-r3.ebuild:
-  bumped with a better patch from solar
-
-*ftpd-0.17-r2 (06 Nov 2005)
-
-  06 Nov 2005; Daniel Black <dragonheart@gentoo.org>
-  +files/ftpd-0.17+ssl-0.3-overflowpatch.diff, +ftpd-0.17-r2.ebuild:
-  fix remote hole in linux-ftpd-ssl - security bug #111573 - patch thanks to
-  James Longstreet, bug thanks to Wernfried Haas
-
-  26 Jul 2005; David Holm <dholm@gentoo.org> ftpd-0.17-r1.ebuild:
-  Added to ~ppc.
-
-  19 Oct 2004; Dylan Carlson <absinthe@gentoo.org> ftpd-0.17-r1.ebuild:
-  Stable on amd64.
-
-  14 Aug 2004; Sven Wegener <swegener@gentoo.org> files/ftp.xinetd:
-  Fixed CVS Header.
-
-  19 Jun 2004; Jason Wever <weeve@gentoo.org> ftpd-0.17-r1.ebuild:
-  Stable on sparc.
-
-  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> ftpd-0.17-r1.ebuild,
-  ftpd-0.17.ebuild:
-  Fix use invocation
-
-  13 Aug 2003; Aron Griffis <agriffis@gentoo.org> ftpd-0.17-r1.ebuild:
-  Mark stable on alpha for LiveCD
-
-  08 Jun 2003; Seemant Kulleen <seemant@gentoo.org> ftpd-0.17-r1.ebuild:
-  shadow fix patch is not ssl specific, moved out of ssl USE check. Thanks again
-  to: Frank Straetz
-
-*ftpd-0.17-r1 (07 Jun 2003)
-
-  07 Jun 2003; Seemant Kulleen <seemant@gentoo.org> ftpd-0.17-r1.ebuild,
-  files/ftpd-0.17-shadowfix.patch:
-  fix for shadow passwords, to close bug #12353 opened by Adam Bolte
-  <adam@vivid.net.au>. Fix provided by Frank Straetz <Frank@KTHXBYE.de>
-
-*ftpd-0.17 (25 Nov 2002)
-
-  29 Apr 2003; Jason Wever <weeve@gentoo.org> ftpd-0.17.ebuild:
-  Added ~sparc to keywords.
-
-  19 Apr 2003; Martin Holzer <mholzer@gentoo.org> ftpd-0.17.ebuild:
-  Changed to virtual/inetd depend.
-
-  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> ftpd-0.17.ebuild :
-
-  Sed expression delimiter from / to :, closing bug #15006 by Blu3
-  <david+gentoo.org@blue-labs.org>
-
-  15 Jan 2003; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild :
-  Fixed a typo in postinst and added xinetd as an RDEPEND and now
-  installing an /etc/xinetd.d/ftp.  Also changed to epatch.
-
-  05 Dec 2002; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild :
-  Marked stable.
-
-  25 Nov 2002; Nick Hadaway <raker@gentoo.org> ftpd-0.17.ebuild,
-  files/digest-ftpd-0.17.ebuild, files/ssl.diff.gz :
-  New ebuild.  Your basic netkit linux-ftpd patched for ssl support.
diff --git a/net-ftp/ftpd/Manifest b/net-ftp/ftpd/Manifest
deleted file mode 100644
index 2eace8a050a4..000000000000
--- a/net-ftp/ftpd/Manifest
+++ /dev/null
@@ -1,51 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX ftp.xinetd 313 RMD160 ff141a45ea3b93ccb56b595ce5a888fd94f29794 SHA1 9d33ac90722d87fc21d185078b4932ace610c7b1 SHA256 ee08270697e8880aa190de3453fb715a545febdf07071e0cf8d342f781748562
-MD5 c77f5bcf2f56d61c7e8845d94df88164 files/ftp.xinetd 313
-RMD160 ff141a45ea3b93ccb56b595ce5a888fd94f29794 files/ftp.xinetd 313
-SHA256 ee08270697e8880aa190de3453fb715a545febdf07071e0cf8d342f781748562 files/ftp.xinetd 313
-AUX ftpd-0.17+ssl-0.3-overflowpatch.diff 532 RMD160 9479136b001732871c866120ffbb58f44d487215 SHA1 0f03523d4d7f539e4b1806bef2fc288af6fdbc17 SHA256 3476479f9e355d0e9c2ff1822f8bc613dd932c827a1858075f554c9f80f637b8
-MD5 fb54312525ec906691ee16975f1658be files/ftpd-0.17+ssl-0.3-overflowpatch.diff 532
-RMD160 9479136b001732871c866120ffbb58f44d487215 files/ftpd-0.17+ssl-0.3-overflowpatch.diff 532
-SHA256 3476479f9e355d0e9c2ff1822f8bc613dd932c827a1858075f554c9f80f637b8 files/ftpd-0.17+ssl-0.3-overflowpatch.diff 532
-AUX ftpd-0.17-gcc41.patch 921 RMD160 f1e2348d98602c7ff3cbe7bb0a2777c08c9e52cd SHA1 c71743205e0ddbee3f2361e8be526c51d91c4978 SHA256 eb1e24e1dfd3443ee197a0f9f4eb44c66db463b67bf3fb427543d6ab5093eaaa
-MD5 835a4cb3e4b0fb1234f3b8cb66139a47 files/ftpd-0.17-gcc41.patch 921
-RMD160 f1e2348d98602c7ff3cbe7bb0a2777c08c9e52cd files/ftpd-0.17-gcc41.patch 921
-SHA256 eb1e24e1dfd3443ee197a0f9f4eb44c66db463b67bf3fb427543d6ab5093eaaa files/ftpd-0.17-gcc41.patch 921
-AUX ftpd-0.17-setguid.patch 1961 RMD160 c5ba8678127fdb5dbdd032aa33259251d1266fb7 SHA1 09e6ad7a482d5625e972cb7a998014de76ab3bd9 SHA256 5910195af528a42b37507304303e0fc3ae2e164803674b83c3dc1fb7f91c1944
-MD5 59d1eae5854b8730a05e8aee0d3776b3 files/ftpd-0.17-setguid.patch 1961
-RMD160 c5ba8678127fdb5dbdd032aa33259251d1266fb7 files/ftpd-0.17-setguid.patch 1961
-SHA256 5910195af528a42b37507304303e0fc3ae2e164803674b83c3dc1fb7f91c1944 files/ftpd-0.17-setguid.patch 1961
-AUX ftpd-0.17-shadowfix.patch 895 RMD160 64fc0211ae0f7b7760a7460a9d1044736833d7fc SHA1 23e77f0548f99c34ce1813529ee572eb1548caf4 SHA256 8c8b221554b713c7d842b2b10608010fbf264577cebfaf20c9f34e560e054886
-MD5 7e1217f2de231dda2c8e842a7d7dfb7b files/ftpd-0.17-shadowfix.patch 895
-RMD160 64fc0211ae0f7b7760a7460a9d1044736833d7fc files/ftpd-0.17-shadowfix.patch 895
-SHA256 8c8b221554b713c7d842b2b10608010fbf264577cebfaf20c9f34e560e054886 files/ftpd-0.17-shadowfix.patch 895
-AUX ssl.diff.gz 10444 RMD160 ac0476b8da7273b64dca9bf7ce7304261aff0043 SHA1 3547ee476309565da32604e1b5980ab560801258 SHA256 28566addb8271c7d77585019c7da4d853c157d42518652d5c3f450ba6a53ae20
-MD5 0630d5a4a420220cc8b912bdad705f6c files/ssl.diff.gz 10444
-RMD160 ac0476b8da7273b64dca9bf7ce7304261aff0043 files/ssl.diff.gz 10444
-SHA256 28566addb8271c7d77585019c7da4d853c157d42518652d5c3f450ba6a53ae20 files/ssl.diff.gz 10444
-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-r4.ebuild 1534 RMD160 31e872af8c7342df6eda47cee2aaff37367704a2 SHA1 4109179b68ba377531c96da77b893a634306568f SHA256 0d2fcf1539c2fc94453f35c5cd3aa8237781a5ac2a3368f7d07010ecebd690c3
-MD5 c4e7685a6974a57a2c45e68792176ea0 ftpd-0.17-r4.ebuild 1534
-RMD160 31e872af8c7342df6eda47cee2aaff37367704a2 ftpd-0.17-r4.ebuild 1534
-SHA256 0d2fcf1539c2fc94453f35c5cd3aa8237781a5ac2a3368f7d07010ecebd690c3 ftpd-0.17-r4.ebuild 1534
-MISC ChangeLog 4415 RMD160 f51058766f2b192758a3558ed43e15144bbe602e SHA1 16a920693e06a44c0c4a0dd909a248c488a48f61 SHA256 5b1f710959caad7b4a50d01fbc770686dade5dbcacd76d9ee29c8177033fb1f0
-MD5 79591cc791313e0c91d7496259f8701c ChangeLog 4415
-RMD160 f51058766f2b192758a3558ed43e15144bbe602e ChangeLog 4415
-SHA256 5b1f710959caad7b4a50d01fbc770686dade5dbcacd76d9ee29c8177033fb1f0 ChangeLog 4415
-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 a5158bf958d1411f9daefa3a43b7f12e files/digest-ftpd-0.17-r4 497
-RMD160 db856b5782788330427703698f410c205225d8e2 files/digest-ftpd-0.17-r4 497
-SHA256 193c18b7c4e2467ed5453bee8fc5e2b66ab314c429cc4a2daf79fbe652de26ba files/digest-ftpd-0.17-r4 497
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFFoaNw5mJXAu5GbtIRAr0wAJ9DaVZMlYSrFDEgUJlO5Bt2zMn0wwCcDZ3I
-bHgU0oRWRqmCMJjv366STsM=
-=ZxcS
------END PGP SIGNATURE-----
diff --git a/net-ftp/ftpd/files/digest-ftpd-0.17-r4 b/net-ftp/ftpd/files/digest-ftpd-0.17-r4
deleted file mode 100644
index 9c0de1ba222e..000000000000
--- a/net-ftp/ftpd/files/digest-ftpd-0.17-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 0b9185d5144904798b721354ea9ff156 linux-ftpd-0.17-ssl.patch 36459
-RMD160 5a0d7301f69b4c1714f36419f98134f9aa0ce874 linux-ftpd-0.17-ssl.patch 36459
-SHA256 0082ee6a71fdd83f61e63166f7bbba97c204cdc67f9e1bf10f2df31590fba780 linux-ftpd-0.17-ssl.patch 36459
-MD5 f5f491564812db5d8783daa538c49186 linux-ftpd-0.17.tar.gz 46763
-RMD160 869e410d8f063c764c04f1d3b41b625a9d679d22 linux-ftpd-0.17.tar.gz 46763
-SHA256 65a0b249e38bf3c3a16dbd4d3edd2657683ca8f47b307e92007f378b21d2fa65 linux-ftpd-0.17.tar.gz 46763
diff --git a/net-ftp/ftpd/files/ftp.xinetd b/net-ftp/ftpd/files/ftp.xinetd
deleted file mode 100644
index 22bca8e7cf32..000000000000
--- a/net-ftp/ftpd/files/ftp.xinetd
+++ /dev/null
@@ -1,13 +0,0 @@
-# default: off
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/files/ftp.xinetd,v 1.2 2004/08/14 13:41:20 swegener Exp $
-# description: The netkit ftp daemon with optional SSL support.
-
-service ftp
-{
-	socket_type		= stream
-	protocol		= tcp
-	wait			= no
-	user			= root
-	server			= /usr/bin/ftpd
-	disable			= yes
-}
diff --git a/net-ftp/ftpd/files/ftpd-0.17+ssl-0.3-overflowpatch.diff b/net-ftp/ftpd/files/ftpd-0.17+ssl-0.3-overflowpatch.diff
deleted file mode 100644
index 6290079a7062..000000000000
--- a/net-ftp/ftpd/files/ftpd-0.17+ssl-0.3-overflowpatch.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- linux-ftpd-0.17/ftpd/ftpd.c	2005-11-05 17:04:53.000000000 -0600
-+++ linux-ftpd-0.17-patched/ftpd/ftpd.c	2005-11-05 17:11:54.000000000 -0600
-@@ -2082,9 +2082,9 @@
- 	va_start(ap);
- #endif
- #ifdef USE_SSL
--        /* assemble the output into a buffer */
-+        /* assemble the output into a buffer, checking for length*/
- 	sprintf(outputbuf,"%d ",n);
--	vsprintf(outputbuf+strlen(outputbuf),fmt,ap);
-+	vsnprintf(outputbuf+strlen(outputbuf),2048-(strlen(outputbuf) + 3),fmt,ap);
- 	strcat(outputbuf,"\r\n");
- 
- 	if (ssl_debug_flag)
diff --git a/net-ftp/ftpd/files/ftpd-0.17-gcc41.patch b/net-ftp/ftpd/files/ftpd-0.17-gcc41.patch
deleted file mode 100644
index 11a0ae2cb6c1..000000000000
--- a/net-ftp/ftpd/files/ftpd-0.17-gcc41.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -ur linux-ftpd-0.17-orig/ftpd/ftpcmd.y linux-ftpd-0.17/ftpd/ftpcmd.y
---- linux-ftpd-0.17-orig/ftpd/ftpcmd.y	2006-06-06 15:00:29.000000000 +0200
-+++ linux-ftpd-0.17/ftpd/ftpcmd.y	2006-06-06 15:23:10.000000000 +0200
-@@ -125,7 +125,14 @@
- char	cbuf[512];
- char	*fromname;
- 
--struct tab;
-+struct tab {
-+	const char	*name;
-+	short	token;
-+	short	state;
-+	short	implemented;	/* 1 if command is implemented */
-+	const char	*help;
-+};
-+
- static int	 yylex __P((void));
- static void	 sizecmd __P((char *));
- static void	 help __P((struct tab *, char *));
-@@ -891,13 +898,6 @@
- #define	SITECMD	7	/* SITE command */
- #define	NSTR	8	/* Number followed by a string */
- 
--struct tab {
--	const char	*name;
--	short	token;
--	short	state;
--	short	implemented;	/* 1 if command is implemented */
--	const char	*help;
--};
- 
- struct tab cmdtab[] = {		/* In order defined in RFC 765 */
-         { "AUTH", AUTH, STR1, 1,	"<sp> auth_type" },
diff --git a/net-ftp/ftpd/files/ftpd-0.17-setguid.patch b/net-ftp/ftpd/files/ftpd-0.17-setguid.patch
deleted file mode 100644
index f25b2b3e4aa3..000000000000
--- a/net-ftp/ftpd/files/ftpd-0.17-setguid.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- linux-ftpd-0.17/ftpd/popen.c.bak	1999-07-16 11:12:54.000000000 +1000
-+++ linux-ftpd-0.17/ftpd/popen.c	2006-08-25 13:31:33.950447078 +1000
-@@ -169,8 +169,13 @@
- 		 * XXX: this doesn't seem right... and shouldn't
- 		 * we initgroups, or at least setgroups(0,0)?
- 		 */
--		setgid(getegid());
--		setuid(i);
-+
-+/*
-+ * PSz 25 Aug 06  Must check the return status of these setgid/setuid calls,
-+ * see  http://www.bress.net/blog/archives/34-setuid-madness.html
-+ */
-+		if ( setgid(geteuid())	!= 0 ) _exit(1);
-+		if ( setuid(i)		!= 0 ) _exit(1);
-  
- #ifndef __linux__
- /* 
---- linux-ftpd-0.17/ftpd/ftpd.c.bak	2006-08-25 12:53:25.277537000 +1000
-+++ linux-ftpd-0.17/ftpd/ftpd.c	2006-08-25 13:46:28.798975583 +1000
-@@ -1159,6 +1159,13 @@
- 		}
- 		strcpy(pw->pw_dir, "/");
- 		setenv("HOME", "/", 1);
-+	}
-+	/* PSz 25 Aug 06  chdir for real users done after setting UID */
-+	if (seteuid((uid_t)pw->pw_uid) < 0) {
-+		reply(550, "Can't set uid.");
-+		goto bad;
-+	}
-+	if (guest || dochroot) { /* do nothing, handled above */
- 	} else if (chdir(pw->pw_dir) < 0) {
- 		if (chdir("/") < 0) {
- 			reply(530, "User %s: can't change directory to %s.",
-@@ -1167,10 +1174,7 @@
- 		} else
- 			lreply(230, "No directory! Logging in with home=/");
- 	}
--	if (seteuid((uid_t)pw->pw_uid) < 0) {
--		reply(550, "Can't set uid.");
--		goto bad;
--	}
-+
- 	sigfillset(&allsigs);
- 	sigprocmask(SIG_UNBLOCK,&allsigs,NULL);
- 
-@@ -1408,7 +1412,8 @@
- 			goto bad;
- 		sleep(tries);
- 	}
--	(void) seteuid((uid_t)pw->pw_uid);
-+/* PSz 25 Aug 06  Check return status */
-+	if (seteuid((uid_t)pw->pw_uid) != 0) _exit(1);
- 	sigfillset(&allsigs);
- 	sigprocmask (SIG_UNBLOCK, &allsigs, NULL);
- 
-@@ -1440,7 +1445,8 @@
- bad:
- 	/* Return the real value of errno (close may change it) */
- 	t = errno;
--	(void) seteuid((uid_t)pw->pw_uid);
-+/* PSz 25 Aug 06  Check return status */
-+	if (seteuid((uid_t)pw->pw_uid) != 0) _exit(1);
- 	sigfillset (&allsigs);
- 	sigprocmask (SIG_UNBLOCK, &allsigs, NULL);
- 	(void) close(s);
diff --git a/net-ftp/ftpd/files/ftpd-0.17-shadowfix.patch b/net-ftp/ftpd/files/ftpd-0.17-shadowfix.patch
deleted file mode 100644
index 1287a6fcd06a..000000000000
--- a/net-ftp/ftpd/files/ftpd-0.17-shadowfix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur linux-ftpd-0.17/ftpd/Makefile linux-ftpd-0.17-patched/ftpd/Makefile
---- linux-ftpd-0.17/ftpd/Makefile	1999-12-12 19:04:58.000000000 +0100
-+++ linux-ftpd-0.17-patched/ftpd/Makefile	2003-04-06 11:52:17.000000000 +0200
-@@ -19,7 +19,11 @@
- all: ftpd
- 
- %.o: %.c
-+ ifdef USE_SHADOW
-+	$(CC) $(CFLAGS) -DUSE_SHADOW -DHASSETPROCTITLE $< -c
-+ else
- 	$(CC) $(CFLAGS) -DHASSETPROCTITLE $< -c
-+ endif
- 
- ftpcmd.c: %.c: %.y
- 	$(YACC) $<
-diff -Naur linux-ftpd-0.17/support/Makefile linux-ftpd-0.17-patched/support/Makefile
---- linux-ftpd-0.17/support/Makefile	1999-08-01 00:05:52.000000000 +0200
-+++ linux-ftpd-0.17-patched/support/Makefile	2003-04-06 11:54:50.000000000 +0200
-@@ -5,7 +5,11 @@
- all: libsupport.a
- 
- %.o: %.c
-+ ifdef USE_SHADOW
-+	$(CC) $(CFLAGS) -DUSE_SHADOW -DHASSETPROCTITLE $< -c
-+ else
- 	$(CC) $(CFLAGS) -DHASSETPROCTITLE $< -c
-+ endif
- 
- libsupport.a: $(OBJS)
- 	ar -cruv $@ $^
diff --git a/net-ftp/ftpd/files/ssl.diff.gz b/net-ftp/ftpd/files/ssl.diff.gz
deleted file mode 100644
index e7e80ac3d76a..000000000000
--- a/net-ftp/ftpd/files/ssl.diff.gz
+++ /dev/null
diff --git a/net-ftp/ftpd/ftpd-0.17-r4.ebuild b/net-ftp/ftpd/ftpd-0.17-r4.ebuild
deleted file mode 100644
index 427434740290..000000000000
--- a/net-ftp/ftpd/ftpd-0.17-r4.ebuild
+++ /dev/null
@@ -1,62 +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-r4.ebuild,v 1.6 2006/10/17 18:23:19 gustavoz Exp $
-
-inherit eutils ssl-cert
-
-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
-	mirror://gentoo/linux-${P}-ssl.patch"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc sparc x86"
-IUSE="ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-
-RDEPEND="${DEPEND}
-	virtual/inetd"
-
-S=${WORKDIR}/linux-${P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use ssl && epatch "${DISTDIR}/linux-${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-shadowfix.patch"
-
-	# fixes gcc 4.1 compatibility
-	epatch "${FILESDIR}/${P}-gcc41.patch"
-
-	# setguid fix
-	epatch "${FILESDIR}"/${P}-setguid.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
-	if use ssl; then
-		insinto /etc/ssl/certs/
-		docert ftpd
-	fi
-}
-
-pkg_postinst() {
-	if use ssl; then
-		einfo "In order to start the server with SSL support"
-		einfo "You need a certificate /etc/ssl/certs/ftpd.pem."
-		einfo "A temporary certificiate has been created."
-	fi
-}
diff --git a/net-ftp/ftpd/metadata.xml b/net-ftp/ftpd/metadata.xml
deleted file mode 100644
index 0e9416707c4e..000000000000
--- a/net-ftp/ftpd/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>maintainer-needed</herd> 
-</pkgmetadata>
diff --git a/net-ftp/netkit-ftpd/Manifest b/net-ftp/netkit-ftpd/Manifest
new file mode 100644
index 000000000000..cf28c4b1bf1f
--- /dev/null
+++ b/net-ftp/netkit-ftpd/Manifest
@@ -0,0 +1,62 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX ftp.xinetd 318 RMD160 fbb913e2ec08c7cbd08b1a520ca8893c21919cf3 SHA1 90b9af1d19230098a45d2995d5271d5343be0a16 SHA256 e55e99f3b978648f9e126f31caae7b7ab870e310dd29dc2120723bae9addd24f
+MD5 4a89aeceac5dd0b32bfa42c3103714ff files/ftp.xinetd 318
+RMD160 fbb913e2ec08c7cbd08b1a520ca8893c21919cf3 files/ftp.xinetd 318
+SHA256 e55e99f3b978648f9e126f31caae7b7ab870e310dd29dc2120723bae9addd24f files/ftp.xinetd 318
+AUX netkit-ftpd-0.17-build.patch 862 RMD160 601b57beddbc66386173721c4777084121c3f761 SHA1 49b3d2ebf5ee837a72c02757e7a08d1b9fd3490f SHA256 2dabb6d6df74c15a1f97ea6fa90ed9ed7f437c5ebeb26f6ba4183362119b769c
+MD5 4c696e29949aff21a55e00d785020953 files/netkit-ftpd-0.17-build.patch 862
+RMD160 601b57beddbc66386173721c4777084121c3f761 files/netkit-ftpd-0.17-build.patch 862
+SHA256 2dabb6d6df74c15a1f97ea6fa90ed9ed7f437c5ebeb26f6ba4183362119b769c files/netkit-ftpd-0.17-build.patch 862
+AUX netkit-ftpd-0.17-cleanup-ssl.patch 279 RMD160 3bfb7342b300749b2754828ad994043c45dce3f9 SHA1 d31f8108a5e0c311ad85b95dea4571e5782e032e SHA256 110d1de5c37f29de6e9e753114d97c03742793481f1f377fd91a7b4dc5483076
+MD5 acc667b819450ea8215d44e1cd978a37 files/netkit-ftpd-0.17-cleanup-ssl.patch 279
+RMD160 3bfb7342b300749b2754828ad994043c45dce3f9 files/netkit-ftpd-0.17-cleanup-ssl.patch 279
+SHA256 110d1de5c37f29de6e9e753114d97c03742793481f1f377fd91a7b4dc5483076 files/netkit-ftpd-0.17-cleanup-ssl.patch 279
+AUX netkit-ftpd-0.17-cleanup.patch 186 RMD160 4e9690b7d03cd49783bc8f2f1ca0c021eddce117 SHA1 476bbf54d6bb1a1abb373813a745dea10ada38ba SHA256 5eb8134a8be569f1fc448bb781193f1820bddd36e735b1d164de2dfd4071a12f
+MD5 c4967c150312787be69aaea3127feb88 files/netkit-ftpd-0.17-cleanup.patch 186
+RMD160 4e9690b7d03cd49783bc8f2f1ca0c021eddce117 files/netkit-ftpd-0.17-cleanup.patch 186
+SHA256 5eb8134a8be569f1fc448bb781193f1820bddd36e735b1d164de2dfd4071a12f files/netkit-ftpd-0.17-cleanup.patch 186
+AUX netkit-ftpd-0.17-gcc41.patch 770 RMD160 d9c69b0b8d1ded60b399ec36e0f975f8e14e57af SHA1 87db2260da0d0ae00d558de586853794b27c168e SHA256 d5ebda1221b9dbce3ba7ddccae846da65a0c7c5e544a0a8625d93396a3a1ea50
+MD5 7e94d8f9f93abba34bff5b358dead289 files/netkit-ftpd-0.17-gcc41.patch 770
+RMD160 d9c69b0b8d1ded60b399ec36e0f975f8e14e57af files/netkit-ftpd-0.17-gcc41.patch 770
+SHA256 d5ebda1221b9dbce3ba7ddccae846da65a0c7c5e544a0a8625d93396a3a1ea50 files/netkit-ftpd-0.17-gcc41.patch 770
+AUX netkit-ftpd-0.17-setguid.patch 1809 RMD160 971cb07d1060d6bc7c721d506bbabd3a2daa7e4d SHA1 90f0a2ca39b3cd24f0b990d280c16fa29f4d67ca SHA256 7cf4924713e629bce9f0e7c483332046b336480da16156d6db5fa094b6d38424
+MD5 118d4e8406cc2e3d0df3e865b9e10adf files/netkit-ftpd-0.17-setguid.patch 1809
+RMD160 971cb07d1060d6bc7c721d506bbabd3a2daa7e4d files/netkit-ftpd-0.17-setguid.patch 1809
+SHA256 7cf4924713e629bce9f0e7c483332046b336480da16156d6db5fa094b6d38424 files/netkit-ftpd-0.17-setguid.patch 1809
+AUX netkit-ftpd-0.17-shadowfix.patch 587 RMD160 118077a510b651086547693e0da7bf140573bd21 SHA1 9fd30dc953c996254205beae44b43aa29dccc27e SHA256 93c43a7033f24c3232438d81c5442e75cd4d38a2a6a9cf90ed73dc962d1203b6
+MD5 ada9181d7bbf4c0cd37be66a7fe6cae3 files/netkit-ftpd-0.17-shadowfix.patch 587
+RMD160 118077a510b651086547693e0da7bf140573bd21 files/netkit-ftpd-0.17-shadowfix.patch 587
+SHA256 93c43a7033f24c3232438d81c5442e75cd4d38a2a6a9cf90ed73dc962d1203b6 files/netkit-ftpd-0.17-shadowfix.patch 587
+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 netkit-ftpd-0.17-r4.ebuild 1480 RMD160 c88bc33294c6887b05adc624b9458d2759acb7f6 SHA1 d4e7a68dc9322c94c537113d76a25a27663089b3 SHA256 9b5a66faba2b695e4c081c14bd089b55e848949293316c10c20f3ec7249ca592
+MD5 01bb8aa57918901a767a893da7ee2e3b netkit-ftpd-0.17-r4.ebuild 1480
+RMD160 c88bc33294c6887b05adc624b9458d2759acb7f6 netkit-ftpd-0.17-r4.ebuild 1480
+SHA256 9b5a66faba2b695e4c081c14bd089b55e848949293316c10c20f3ec7249ca592 netkit-ftpd-0.17-r4.ebuild 1480
+EBUILD netkit-ftpd-0.17-r5.ebuild 1583 RMD160 9c9f5371a8a2a46a80a4657f213c2c02e1cdab38 SHA1 267811db09d9d1fd76b7aaf98a934ece1accc0fd SHA256 8e393920fab012572bbbdc096764a882e6570196b14152e63ba68b2ea778a3f4
+MD5 ff95bb4c58ab196196351b3d243ed9ce netkit-ftpd-0.17-r5.ebuild 1583
+RMD160 9c9f5371a8a2a46a80a4657f213c2c02e1cdab38 netkit-ftpd-0.17-r5.ebuild 1583
+SHA256 8e393920fab012572bbbdc096764a882e6570196b14152e63ba68b2ea778a3f4 netkit-ftpd-0.17-r5.ebuild 1583
+MISC ChangeLog 4711 RMD160 48832427add54c8bb24166b9247b03fa1d3fe0c4 SHA1 e09bb97b45a08f1bbf94d5c98691077455ca8579 SHA256 e3b083448d06fbb6482a172f329db7807fbe02e34a88cc0f4a16c11bc0ca2a88
+MD5 0f765d5eb2daf373c3461ec2b214cddd ChangeLog 4711
+RMD160 48832427add54c8bb24166b9247b03fa1d3fe0c4 ChangeLog 4711
+SHA256 e3b083448d06fbb6482a172f329db7807fbe02e34a88cc0f4a16c11bc0ca2a88 ChangeLog 4711
+MISC metadata.xml 165 RMD160 1c3eeab5c3fc7c211e19ce70d30db054b3448591 SHA1 e5bc9fac08f72762fdc827e1b520ed403667be37 SHA256 0879c713d0d1ea2f39c1088bf4717b1328b4ab06d6f5dd6968c5559750422ae6
+MD5 2fde084ac8d62be622a13e156d25f684 metadata.xml 165
+RMD160 1c3eeab5c3fc7c211e19ce70d30db054b3448591 metadata.xml 165
+SHA256 0879c713d0d1ea2f39c1088bf4717b1328b4ab06d6f5dd6968c5559750422ae6 metadata.xml 165
+MD5 a5158bf958d1411f9daefa3a43b7f12e files/digest-netkit-ftpd-0.17-r4 497
+RMD160 db856b5782788330427703698f410c205225d8e2 files/digest-netkit-ftpd-0.17-r4 497
+SHA256 193c18b7c4e2467ed5453bee8fc5e2b66ab314c429cc4a2daf79fbe652de26ba files/digest-netkit-ftpd-0.17-r4 497
+MD5 a5158bf958d1411f9daefa3a43b7f12e files/digest-netkit-ftpd-0.17-r5 497
+RMD160 db856b5782788330427703698f410c205225d8e2 files/digest-netkit-ftpd-0.17-r5 497
+SHA256 193c18b7c4e2467ed5453bee8fc5e2b66ab314c429cc4a2daf79fbe652de26ba files/digest-netkit-ftpd-0.17-r5 497
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFs7cR8bi6rjpTunYRAoXiAKCGDCgO+nOMkx/YsY73CDMGJ1T05wCggHkJ
+u+phAfVwxvuG4MVUUMeb+AM=
+=/IDs
+-----END PGP SIGNATURE-----