- bump patch version. fixes debian bug #272312

(Portage version: 2.0.51-r15)

6 files changed, 95 insertions, 11 deletions

diff --git a/net-misc/netkit-telnetd/ChangeLog b/net-misc/netkit-telnetd/ChangeLog
index 053196456d82..fbbfd1c9df10 100644
--- a/net-misc/netkit-telnetd/ChangeLog
+++ b/net-misc/netkit-telnetd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/netkit-telnetd
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.27 2004/12/29 19:58:34 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.28 2005/03/12 22:36:23 solar Exp $
+
+*netkit-telnetd-0.17-r5 (12 Mar 2005)
+
+  12 Mar 2005; <solar@gentoo.org> +netkit-telnetd-0.17-r5.ebuild:
+  - bump patch version. fixes debian bug #272312
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index cef46e415b03..dd24a70eb026 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -1,10 +1,12 @@
-MD5 92b1a156ce3e90b4e1c2640324c43d58 netkit-telnetd-0.17-r4.ebuild 2211
-MD5 9c9d4d4a201fafd9ed49489a36aa96f0 ChangeLog 3833
-MD5 e4cfffd72d55d6943694b125bb63ae5b netkit-telnetd-0.17-r3.ebuild 1486
+MD5 8e7a6abfc4d22b8d634d0040606312c0 netkit-telnetd-0.17-r3.ebuild 1486
+MD5 39b1a3d775c95332cad83366fbb093de netkit-telnetd-0.17-r5.ebuild 2219
+MD5 e451f39c10380fa05690e5951b4e707c netkit-telnetd-0.17-r4.ebuild 2211
+MD5 5b73b392e34592b72967c3ef75337a72 ChangeLog 3988
 MD5 18641d94839066e87b8be43bbb27fd47 metadata.xml 408
-MD5 248ab0551e59a480cbe3d64657fa586f files/digest-netkit-telnetd-0.17-r3 70
 MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
+MD5 248ab0551e59a480cbe3d64657fa586f files/digest-netkit-telnetd-0.17-r3 70
 MD5 a766f52cf4ac7ed020e1c3ba2816f4e5 files/digest-netkit-telnetd-0.17-r4 143
+MD5 70a74deba066ae505a7ae79a04559986 files/digest-netkit-telnetd-0.17-r5 143
 MD5 106b04e8ad4b0c9be645577831386326 files/netkit-telnetd-0.17-cflags-gnu_source.patch 450
-MD5 6d23345a3ccb8e7b572752f14aee4860 files/net.issue.sample 117
 MD5 d741260d55b46b1e6ae6cf923b4542e5 files/netkit-telnetd-0.17-gentoo.patch 3155
+MD5 6d23345a3ccb8e7b572752f14aee4860 files/net.issue.sample 117
diff --git a/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r5 b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r5
new file mode 100644
index 000000000000..4edf025cf286
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r5
@@ -0,0 +1,2 @@
+MD5 d6beabaaf53fe6e382c42ce3faa05a36 netkit-telnet-0.17.tar.gz 133749
+MD5 1ecd942404d304a027e27189fa5a4df3 netkit-telnet_0.17-27.diff.gz 25426
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild
index ce85f6f93b29..b907f74ab217 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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-r3.ebuild,v 1.25 2004/06/29 00:16:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r3.ebuild,v 1.26 2005/03/12 22:36:23 solar Exp $
 
 inherit eutils
 
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild
index 04eb4d70a2d6..56a5979575ae 100644
--- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 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-r4.ebuild,v 1.9 2004/11/02 13:23:18 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild,v 1.10 2005/03/12 22:36:23 solar Exp $
 
 inherit eutils
 
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r5.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r5.ebuild
new file mode 100644
index 000000000000..e47fff5d2d03
--- /dev/null
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 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-r5.ebuild,v 1.1 2005/03/12 22:36:23 solar Exp $
+
+inherit eutils
+
+PATCHLEVEL=27
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ppc64"
+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::" \
+		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
+}