- version bump to deb patchset 35 and make ebuilds use mirror://debian/ vs direct http:// links.

(Portage version: 2.1.2_pre1)

5 files changed, 100 insertions, 8 deletions

diff --git a/net-misc/netkit-telnetd/ChangeLog b/net-misc/netkit-telnetd/ChangeLog
index 68c1cc4eb3df..5cc093486ef2 100644
--- a/net-misc/netkit-telnetd/ChangeLog
+++ b/net-misc/netkit-telnetd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/netkit-telnetd
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.40 2006/12/25 01:55:54 solar Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.41 2007/01/22 20:32:24 solar Exp $
+
+*netkit-telnetd-0.17-r8 (22 Jan 2007)
+
+  22 Jan 2007; <solar@gentoo.org> netkit-telnetd-0.17-r6.ebuild,
+  netkit-telnetd-0.17-r7.ebuild, +netkit-telnetd-0.17-r8.ebuild:
+  - version bump to deb patchset 35 and make ebuilds use mirror://debian/ vs
+  direct http:// links.
 
   25 Dec 2006; <solar@gentoo.org> netkit-telnetd-0.17-r7.ebuild:
   - make sure we can cross compile
diff --git a/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r8 b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r8
new file mode 100644
index 000000000000..aa57761b90cb
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r8
@@ -0,0 +1,6 @@
+MD5 d6beabaaf53fe6e382c42ce3faa05a36 netkit-telnet-0.17.tar.gz 133749
+RMD160 faa273e6e4fbb31299d242d8329c597f402c7b83 netkit-telnet-0.17.tar.gz 133749
+SHA256 9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00 netkit-telnet-0.17.tar.gz 133749
+MD5 3f5d210d516f11d9379c209a28a819ea netkit-telnet_0.17-35.diff.gz 26609
+RMD160 630f1d9f61746e4cd6828bba69bda09d234aab73 netkit-telnet_0.17-35.diff.gz 26609
+SHA256 fa44ace8f3ab244ed13ce5c2057ae78d799539b03322aba8fc61936edd3c32c4 netkit-telnet_0.17-35.diff.gz 26609
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild
index 35ad0bab484d..0757d64d7a49 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild,v 1.12 2006/05/07 13:21:09 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild,v 1.13 2007/01/22 20:32:24 solar Exp $
 
 inherit eutils
 
@@ -8,7 +8,7 @@ PATCHLEVEL=28
 DESCRIPTION="Standard Linux telnet client and server"
 HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz
-	http://ftp.debian.org/debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.diff.gz"
+	mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.diff.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild
index b143ed484960..7908576c8673 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild,v 1.2 2006/12/25 01:55:54 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild,v 1.3 2007/01/22 20:32:24 solar Exp $
 
 inherit eutils toolchain-funcs
 
@@ -10,7 +10,7 @@ HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
 # http://packages.debian.org/stablesource/netkit-telnet
 # http://packages.debian.org/testing/source/netkit-telnet
 SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz
-	http://ftp.debian.org/debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.diff.gz"
+	mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.diff.gz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r8.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r8.ebuild
new file mode 100644
index 000000000000..f01063d4bb85
--- /dev/null
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r8.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r8.ebuild,v 1.1 2007/01/22 20:32:24 solar Exp $
+
+inherit eutils toolchain-funcs
+
+PATCHLEVEL=35
+DESCRIPTION="Standard Linux telnet client and server"
+HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/"
+# http://packages.debian.org/stablesource/netkit-telnet
+# http://packages.debian.org/testing/source/netkit-telnet
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz
+	mirror://debian/pool/main/n/netkit-telnet/netkit-telnet_0.17-${PATCHLEVEL}.diff.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="build"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	!net-misc/telnet-bsd"
+
+S=${WORKDIR}/netkit-telnet-${PV}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	# Patch: [0]
+	# Gentoo lacks a maintainer for this package right now. And a 
+	# security problem arose. While reviewing our options for how 
+	# should we proceed with the security bug we decided it would be 
+	# better to just stay in sync with debian's own netkit-telnet 
+	# package. Lots of bug fixes by them over time which were not in 
+	# our telnetd.
+	epatch ${WORKDIR}/netkit-telnet_0.17-${PATCHLEVEL}.diff || die
+
+	# Patch: [1]
+	# after the deb patch we need to add a small patch that defines 
+	# gnu source. This is needed for gcc-3.4.x (needs to be pushed 
+	# back to the deb folk?)
+	epatch ${FILESDIR}/netkit-telnetd-0.17-cflags-gnu_source.patch \
+		|| die
+}
+
+src_compile() {
+	./configure --prefix=/usr || die
+
+	sed -i \
+		-e "s:-pipe -O2:${CFLAGS}:" \
+		-e "s:-Wpointer-arith::" \
+		-e "s:^CC=.*:CC=$(tc-getCC):" \
+		-e "s:^CXX=.*:CXX=$(tc-getCXX):" \
+		MCONFIG
+
+	make || die
+	cd telnetlogin
+	make || die
+}
+
+src_install() {
+	dobin telnet/telnet || die
+	#that's it if we're going on a build image
+	use build && return 0
+
+	dosbin telnetd/telnetd || die
+	dosym telnetd /usr/sbin/in.telnetd
+	dosbin telnetlogin/telnetlogin || die
+	doman telnet/telnet.1
+	doman telnetd/*.8
+	doman telnetd/issue.net.5
+	dosym telnetd.8.gz /usr/share/man/man8/in.telnetd.8.gz
+	doman telnetlogin/telnetlogin.8
+	dodoc BUGS ChangeLog README
+	dodoc ${FILESDIR}/net.issue.sample
+	newdoc telnet/README README.telnet
+	newdoc telnet/TODO TODO.telnet
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/telnetd.xinetd telnetd
+}