Cleanup.

Package-Manager: portage-2.1.2_pre3-r1

7 files changed, 4 insertions, 265 deletions

diff --git a/net-misc/telnet-bsd/Manifest b/net-misc/telnet-bsd/Manifest
index 413b3d0a26b1..eaed80a6480c 100644
--- a/net-misc/telnet-bsd/Manifest
+++ b/net-misc/telnet-bsd/Manifest
@@ -1,57 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX telnet-bsd-1.0-overflow.patch 2362 RMD160 00e4aab074199b425a5e5d067d92c405fe3bb5fb SHA1 0fce72ca341c84620231a89d9942b4cd75ca34a3 SHA256 503d4695033acf754233108914eecda42dc6404ccbfe3e3b0528693915728d0a
-MD5 982c76cd605dc0ce46a43be968ac62ac files/telnet-bsd-1.0-overflow.patch 2362
-RMD160 00e4aab074199b425a5e5d067d92c405fe3bb5fb files/telnet-bsd-1.0-overflow.patch 2362
-SHA256 503d4695033acf754233108914eecda42dc6404ccbfe3e3b0528693915728d0a files/telnet-bsd-1.0-overflow.patch 2362
 AUX telnet-bsd-1.2-fbsd.patch 2566 RMD160 0fdd137d6e3052c0ad6d8f347c1cb421e58d1072 SHA1 263fafeb1578eb4d69f78d2878d5a6255748da2e SHA256 fdf4df0063d990519355a51f1ec75c401c71958178e75c9214457a973071923d
 MD5 014930be6653650a9a98de5950ddd022 files/telnet-bsd-1.2-fbsd.patch 2566
 RMD160 0fdd137d6e3052c0ad6d8f347c1cb421e58d1072 files/telnet-bsd-1.2-fbsd.patch 2566
 SHA256 fdf4df0063d990519355a51f1ec75c401c71958178e75c9214457a973071923d files/telnet-bsd-1.2-fbsd.patch 2566
-AUX telnet-bsd_gentoo.diff 2701 RMD160 b89d0c3bdeaa4dc294ae1e35872113670b8903d7 SHA1 f12f1b470fbf35166c0872c4cda72a1398c8fc99 SHA256 4be7180cfb6d1e8af52a812cba0f75b7b6aaa3be25404c276d6ee54704227c9a
-MD5 f473a05c70761f143d1486e162afdc9b files/telnet-bsd_gentoo.diff 2701
-RMD160 b89d0c3bdeaa4dc294ae1e35872113670b8903d7 files/telnet-bsd_gentoo.diff 2701
-SHA256 4be7180cfb6d1e8af52a812cba0f75b7b6aaa3be25404c276d6ee54704227c9a files/telnet-bsd_gentoo.diff 2701
 AUX telnetd.xinetd 205 RMD160 5d2260272db800af536e6226aad74a43a6f8d65c SHA1 fb1c5a0dabb658889d1417783f1f5dc3357a97c1 SHA256 cb8fe24c1f6113ca397e712898d3decc5ba901994c68262b0ff9e2b091e4576c
 MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
 RMD160 5d2260272db800af536e6226aad74a43a6f8d65c files/telnetd.xinetd 205
 SHA256 cb8fe24c1f6113ca397e712898d3decc5ba901994c68262b0ff9e2b091e4576c files/telnetd.xinetd 205
-DIST telnet-bsd-1.0.tar.bz2 173813 RMD160 0b7d29035fda7ae5168601daeb1f01b4e73bd244 SHA1 1560319edbb52673646212db70fe40f89e6bcd09 SHA256 8c2acadcba24ad5429567f79bab9797fb980d94471868266337f6cb5c44997b9
 DIST telnet-bsd-1.2.tar.bz2 194518 RMD160 3927ce86bbc4024c5a656f5d8f9ee0c8f90de70c SHA1 2f8b8894fa1eefc9929534e703d4eba4bdee1796 SHA256 d6a9d26740ef75565cb1ed8ff11e327d240e6734748b2d1d2e96c126849e4733
-EBUILD telnet-bsd-1.0-r1.ebuild 1064 RMD160 1f248221251b84fdf6c613f5cfff6a864291dd62 SHA1 aa99b53601ab7e78ea910ab43e3810bd68efac94 SHA256 61419d51b9392509b30424dd48607d337e6dec119f83278ee23eb2b6c9e724eb
-MD5 786f97f92092f1b116ce97842d20d255 telnet-bsd-1.0-r1.ebuild 1064
-RMD160 1f248221251b84fdf6c613f5cfff6a864291dd62 telnet-bsd-1.0-r1.ebuild 1064
-SHA256 61419d51b9392509b30424dd48607d337e6dec119f83278ee23eb2b6c9e724eb telnet-bsd-1.0-r1.ebuild 1064
 EBUILD telnet-bsd-1.2-r1.ebuild 1129 RMD160 488127530232052ea7015879e2a556e274ba85c6 SHA1 b1a69a27414c63f93e3620fa09b9d2868b4ad493 SHA256 f0f59894232b4fcd1104bf0598bd1a8b6b8cbae512cd47f7885d8d33c6c3baf8
 MD5 6bf13986eb81183f456539f8522f95db telnet-bsd-1.2-r1.ebuild 1129
 RMD160 488127530232052ea7015879e2a556e274ba85c6 telnet-bsd-1.2-r1.ebuild 1129
 SHA256 f0f59894232b4fcd1104bf0598bd1a8b6b8cbae512cd47f7885d8d33c6c3baf8 telnet-bsd-1.2-r1.ebuild 1129
-EBUILD telnet-bsd-1.2.ebuild 752 RMD160 422404ff69ee6ff31ac181c65b64eb457980a90b SHA1 bf441ca318ac69eb96d15611bda8e184eda8f808 SHA256 d962e9fba531daccf8e9de45d6069931a19ac8097c709923d8b18c50717858fe
-MD5 ff7e5662e92ca6feddd895beaac357d5 telnet-bsd-1.2.ebuild 752
-RMD160 422404ff69ee6ff31ac181c65b64eb457980a90b telnet-bsd-1.2.ebuild 752
-SHA256 d962e9fba531daccf8e9de45d6069931a19ac8097c709923d8b18c50717858fe telnet-bsd-1.2.ebuild 752
-MISC ChangeLog 4207 RMD160 8453fe9e8eb4a090dc4faff9165db866646b3fb8 SHA1 73d6ecce21f1ea5d39ae7c807cf027329b65abee SHA256 82d8c3b5cc3597a6a3173cf6a0d8d278d466ae13c156d0d97b818bc73dd03125
-MD5 e1eb6c762dd8ec5d531a7bd364410b7f ChangeLog 4207
-RMD160 8453fe9e8eb4a090dc4faff9165db866646b3fb8 ChangeLog 4207
-SHA256 82d8c3b5cc3597a6a3173cf6a0d8d278d466ae13c156d0d97b818bc73dd03125 ChangeLog 4207
+MISC ChangeLog 4393 RMD160 96d9fbcf9f35b3c65bbb653f08816c38d7f19e81 SHA1 6e90dcf65dd2f373950b4d574c411bc0c75a24b1 SHA256 29541faeaf54312c5b6705473ebec06bf3d6685a2831549326009405bc85df57
+MD5 1623a59ac650f6b5d450ac82d8efee55 ChangeLog 4393
+RMD160 96d9fbcf9f35b3c65bbb653f08816c38d7f19e81 ChangeLog 4393
+SHA256 29541faeaf54312c5b6705473ebec06bf3d6685a2831549326009405bc85df57 ChangeLog 4393
 MISC metadata.xml 162 RMD160 5c824235f1e4a7c8ef787db43136f0285955ae3b SHA1 cf1542a31296264abe609cf1d52a803902a73dd1 SHA256 dd95a1972c8af554246b7010b2f0097c60c60b2152034bf74ccf842a48c7670f
 MD5 25a39d92639858c521476ce631557d6c metadata.xml 162
 RMD160 5c824235f1e4a7c8ef787db43136f0285955ae3b metadata.xml 162
 SHA256 dd95a1972c8af554246b7010b2f0097c60c60b2152034bf74ccf842a48c7670f metadata.xml 162
-MD5 4f1570403a8986b7343b0b87c6b41ef9 files/digest-telnet-bsd-1.0-r1 247
-RMD160 988b271073bc32735f5ca43b23293541c4490bce files/digest-telnet-bsd-1.0-r1 247
-SHA256 a2c44e2763fd2ad11319823bb40548262b2246b74da5e2bce663a25b3af4c45f files/digest-telnet-bsd-1.0-r1 247
-MD5 6651749586a41d06b99accc30392ebad files/digest-telnet-bsd-1.2 247
-RMD160 93ed529bfaf0d6eb0096d46df17779fe0887b30f files/digest-telnet-bsd-1.2 247
-SHA256 b700a0c2c487b5132a4db1e40aa9cc55ea645d894baf3388b612cd8c1a529505 files/digest-telnet-bsd-1.2 247
 MD5 6651749586a41d06b99accc30392ebad files/digest-telnet-bsd-1.2-r1 247
 RMD160 93ed529bfaf0d6eb0096d46df17779fe0887b30f files/digest-telnet-bsd-1.2-r1 247
 SHA256 b700a0c2c487b5132a4db1e40aa9cc55ea645d894baf3388b612cd8c1a529505 files/digest-telnet-bsd-1.2-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFMUgPamhnQswr0vIRAqeUAKCIUgA67ToHTLKxs4TtPG6uLvrP0ACeJXEb
-Acwtd9eFfA8qTZPWdlKbtMM=
-=gyXr
------END PGP SIGNATURE-----
diff --git a/net-misc/telnet-bsd/files/digest-telnet-bsd-1.0-r1 b/net-misc/telnet-bsd/files/digest-telnet-bsd-1.0-r1
deleted file mode 100644
index e0eca2eb3163..000000000000
--- a/net-misc/telnet-bsd/files/digest-telnet-bsd-1.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 bf0cecc0c72a0e919cd02915d02d02bb telnet-bsd-1.0.tar.bz2 173813
-RMD160 0b7d29035fda7ae5168601daeb1f01b4e73bd244 telnet-bsd-1.0.tar.bz2 173813
-SHA256 8c2acadcba24ad5429567f79bab9797fb980d94471868266337f6cb5c44997b9 telnet-bsd-1.0.tar.bz2 173813
diff --git a/net-misc/telnet-bsd/files/digest-telnet-bsd-1.2 b/net-misc/telnet-bsd/files/digest-telnet-bsd-1.2
deleted file mode 100644
index 868e4f35af56..000000000000
--- a/net-misc/telnet-bsd/files/digest-telnet-bsd-1.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 72d72c65e7796dfec999f347da1c295f telnet-bsd-1.2.tar.bz2 194518
-RMD160 3927ce86bbc4024c5a656f5d8f9ee0c8f90de70c telnet-bsd-1.2.tar.bz2 194518
-SHA256 d6a9d26740ef75565cb1ed8ff11e327d240e6734748b2d1d2e96c126849e4733 telnet-bsd-1.2.tar.bz2 194518
diff --git a/net-misc/telnet-bsd/files/telnet-bsd-1.0-overflow.patch b/net-misc/telnet-bsd/files/telnet-bsd-1.0-overflow.patch
deleted file mode 100644
index 8f2042e11f6f..000000000000
--- a/net-misc/telnet-bsd/files/telnet-bsd-1.0-overflow.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-Patch adopted from upstream FreeBSD changes to fix client buffer overflows.
-
-http://bugs.gentoo.org/show_bug.cgi?id=87019
-
---- telnet/telnet.c
-+++ telnet/telnet.c
-@@ -1131,6 +1131,7 @@
- 
- 
- unsigned char slc_reply[128];
-+unsigned char const * const slc_reply_eom = &slc_reply[sizeof(slc_reply)];
- unsigned char *slc_replyp;
- 
- 	void
-@@ -1146,6 +1147,14 @@
- 	void
- slc_add_reply(unsigned char func, unsigned char flags, cc_t value)
- {
-+       /* A sequence of up to 6 bytes my be written for this member of the SLC
-+        * suboption list by this function.  The end of negotiation command,
-+        * which is written by slc_end_reply(), will require 2 additional
-+        * bytes.  Do not proceed unless there is sufficient space for these
-+        * items.
-+        */
-+	if (&slc_replyp[6+2] > slc_reply_eom)
-+		return;
- 	if ((*slc_replyp++ = func) == IAC)
- 		*slc_replyp++ = IAC;
- 	if ((*slc_replyp++ = flags) == IAC)
-@@ -1159,6 +1168,10 @@
- {
-     int len;
- 
-+	/* The end of negotiation command requires 2 bytes. */
-+	if (&slc_replyp[2] > slc_reply_eom)
-+		return;
-+
-     *slc_replyp++ = IAC;
-     *slc_replyp++ = SE;
-     len = slc_replyp - slc_reply;
-@@ -1236,8 +1249,8 @@
- 	}
- }
- 
--#define	OPT_REPLY_SIZE	256
--unsigned char *opt_reply;
-+#define	OPT_REPLY_SIZE	(2 * SUBBUFSIZE)
-+unsigned char *opt_reply = NULL;
- unsigned char *opt_replyp;
- unsigned char *opt_replyend;
- 
-@@ -1298,8 +1311,8 @@
- 		return;
- 	}
- 	vp = env_getvalue(ep);
--	if (opt_replyp + (vp ? strlen((char *)vp) : 0) +
--				strlen((char *)ep) + 6 > opt_replyend)
-+        if (opt_replyp + (vp ? 2 * strlen((char *)vp) : 0) +
-+                                2 * strlen((char *)ep) + 6 > opt_replyend)
- 	{
- 		int len;
- 		unsigned char *p;
-@@ -1323,6 +1336,8 @@
- 		*opt_replyp++ = ENV_USERVAR;
- 	for (;;) {
- 		while ((c = *ep++)) {
-+			if (opt_replyp + (2 + 2) > opt_replyend)
-+				return;
- 			switch(c&0xff) {
- 			case IAC:
- 				*opt_replyp++ = IAC;
-@@ -1337,6 +1352,8 @@
- 			*opt_replyp++ = c;
- 		}
- 		if ((ep = vp)) {
-+	                if (opt_replyp + (1 + 2 + 2) > opt_replyend)
-+				return;
- 		  *opt_replyp++ = ENV_VALUE;
- 		  vp = NULL;
- 		} else
-@@ -1361,7 +1378,10 @@
- {
- 	int len;
- 
--	len = opt_replyp - opt_reply + 2;
-+	if (opt_replyp + 2 > opt_replyend)
-+		return;
-+	len = opt_replyp + 2 - opt_reply;
-+
- 	if (emptyok || len > 6) {
- 		*opt_replyp++ = IAC;
- 		*opt_replyp++ = SE;
diff --git a/net-misc/telnet-bsd/files/telnet-bsd_gentoo.diff b/net-misc/telnet-bsd/files/telnet-bsd_gentoo.diff
deleted file mode 100644
index e59a5caaf033..000000000000
--- a/net-misc/telnet-bsd/files/telnet-bsd_gentoo.diff
+++ /dev/null
@@ -1,68 +0,0 @@
---- telnet-bsd-1.0/po/Makefile.in.in.old	Sat Apr 17 12:11:08 1999
-+++ telnet-bsd-1.0/po/Makefile.in.in	Tue Dec  3 11:32:42 2002
-@@ -111,9 +111,9 @@
- install-data-no: all
- install-data-yes: all
- 	if test -r "$(MKINSTALLDIRS)"; then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- 	else \
--	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
-@@ -125,27 +125,27 @@
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- 	  dir=$$destdir/$$lang/LC_MESSAGES; \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
--	    $(MKINSTALLDIRS) $$dir; \
-+	    $(MKINSTALLDIRS) $(DESTDIR)$$dir; \
- 	  else \
--	    $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
-+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$$dir; \
- 	  fi; \
- 	  if test -r $$cat; then \
--	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
--	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+	    $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
-+	    echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- 	  else \
--	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-+	    $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT); \
- 	    echo "installing $(srcdir)/$$cat as" \
--		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-+		 "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
- 	  fi; \
- 	  if test -r $$cat.m; then \
--	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
--	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+	    $(INSTALL_DATA) $$cat.m $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+	    echo "installing $$cat.m as $(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- 	  else \
- 	    if test -r $(srcdir)/$$cat.m ; then \
- 	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
--		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-+		$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
- 	      echo "installing $(srcdir)/$$cat as" \
--		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-+		   "$(DESTDIR)$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
- 	    else \
- 	      true; \
- 	    fi; \
-@@ -153,12 +153,12 @@
- 	done
- 	if test "$(PACKAGE)" = "gettext"; then \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
--	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-+	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
- 	  else \
--	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-+	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
- 	  fi; \
- 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
--			  $(gettextsrcdir)/Makefile.in.in; \
-+			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- 	else \
- 	  : ; \
- 	fi
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.0-r1.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.0-r1.ebuild
deleted file mode 100644
index 0910e857b480..000000000000
--- a/net-misc/telnet-bsd/telnet-bsd-1.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/telnet-bsd/telnet-bsd-1.0-r1.ebuild,v 1.3 2006/01/28 13:42:17 blubb Exp $
-
-inherit eutils
-
-DESCRIPTION="Telnet and telnetd ported from OpenBSD with IPv6 support"
-HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
-SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-DEPEND="!net-misc/netkit-telnetd"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/telnet-bsd_gentoo.diff
-	epatch "${FILESDIR}"/${P}-overflow.patch #87019
-	sed -i \
-		-e 's:destdir=:destdir=$(DESTDIR):' \
-		po/Makefile.in.in \
-		|| die "sed failed"
-}
-
-src_compile() {
-	econf $(use_enable nls) || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/telnetd.xinetd telnetd
-	dodoc README THANKS NEWS AUTHORS ChangeLog INSTALL
-}
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2.ebuild
deleted file mode 100644
index 7b742edca6ec..000000000000
--- a/net-misc/telnet-bsd/telnet-bsd-1.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/telnet-bsd/telnet-bsd-1.2.ebuild,v 1.8 2005/07/04 08:21:18 vapier Exp $
-
-inherit eutils
-
-DESCRIPTION="Telnet and telnetd ported from OpenBSD with IPv6 support"
-HOMEPAGE="ftp://ftp.suse.com/pub/people/kukuk/ipv6/"
-SRC_URI="ftp://ftp.suse.com/pub/people/kukuk/ipv6/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-IUSE="nls"
-
-DEPEND="!net-misc/netkit-telnetd"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/telnetd.xinetd telnetd
-	dodoc README THANKS NEWS AUTHORS ChangeLog INSTALL
-}