- debian changes from 0.17-28: telnet/telnet.cc: Fixed buffer overflow in the handling of the LINEMODE suboptions in telnet clients (CAN-2005-0469). Thanks Martin 'Joey' Schulze for the patch.

(Portage version: 2.0.51.19)

4 files changed, 88 insertions, 14 deletions

diff --git a/net-misc/netkit-telnetd/ChangeLog b/net-misc/netkit-telnetd/ChangeLog
index ccaf0baf7cc5..003c8e757417 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.29 2005/03/15 03:47:54 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.30 2005/03/29 22:28:32 solar Exp $
+
+*netkit-telnetd-0.17-r6 (29 Mar 2005)
+
+  29 Mar 2005; <solar@gentoo.org> +netkit-telnetd-0.17-r6.ebuild:
+  - debian changes from 0.17-28: telnet/telnet.cc: Fixed buffer overflow in the
+  handling of the LINEMODE suboptions in telnet clients (CAN-2005-0469). Thanks
+  Martin 'Joey' Schulze for the patch.
 
   14 Mar 2005; <solar@gentoo.org>
   files/netkit-telnetd-0.17-cflags-gnu_source.patch:
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 763cd8e9a8a1..84ac4e01e8e5 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -1,24 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 52e0448fc3169d4271ca2725ab28b27c netkit-telnetd-0.17-r3.ebuild 1485
 MD5 e286a898f5dcedfd88328321001d9a17 netkit-telnetd-0.17-r5.ebuild 2217
 MD5 813c0a4e32a41651ad59a56a7dbe0b5c netkit-telnetd-0.17-r4.ebuild 2210
-MD5 194b12d4cb09f4adea903070c9a41953 ChangeLog 4117
+MD5 3a2c0033e17f8b568f09763a68d3c9f1 ChangeLog 4422
 MD5 18641d94839066e87b8be43bbb27fd47 metadata.xml 408
+MD5 d431c88a6285180eca8eb1e3c424ffd7 netkit-telnetd-0.17-r6.ebuild 2217
 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 999ed3fb65fa707dce76bca8f7f6727a files/digest-netkit-telnetd-0.17-r6 143
 MD5 7dbf060bb9168e5f98621fe7c13a4965 files/netkit-telnetd-0.17-cflags-gnu_source.patch 830
 MD5 d741260d55b46b1e6ae6cf923b4542e5 files/netkit-telnetd-0.17-gentoo.patch 3155
 MD5 6d23345a3ccb8e7b572752f14aee4860 files/net.issue.sample 117
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iQCVAwUBQjZbKJ4WFLgrx1GWAQLVPgQAgk5uHiroil/C1tp+A6A1492UQxb5oVtB
-tstMXtG0M590MbQFijluWGzezWF6d3BePGumRp+EDF/ldYQ26VQregUH2JatUmz+
-UrKCf4ntSK47c7WyMZkkfY7DzxUl23Bt7BSbI4/kheY6ZYc7i6PBSCd5DyVnjupD
-JrGwHZqPdKo=
-=t46a
------END PGP SIGNATURE-----
diff --git a/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r6 b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r6
new file mode 100644
index 000000000000..71d0851001cd
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r6
@@ -0,0 +1,2 @@
+MD5 d6beabaaf53fe6e382c42ce3faa05a36 netkit-telnet-0.17.tar.gz 133749
+MD5 32dfff6939e2c3e0d5fa727440b4085d netkit-telnet_0.17-28.diff.gz 25764
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.ebuild
new file mode 100644
index 000000000000..6328516cecf1
--- /dev/null
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r6.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-r6.ebuild,v 1.1 2005/03/29 22:28:32 solar Exp $
+
+inherit eutils
+
+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"
+
+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
+}