fix really old old telnetd security bugs. We now follow debs source lead for netkit-telnetd. bug 64632

6 files changed, 114 insertions, 14 deletions

diff --git a/net-misc/netkit-telnetd/ChangeLog b/net-misc/netkit-telnetd/ChangeLog
index 7cda0a225707..356a8c0dee9c 100644
--- a/net-misc/netkit-telnetd/ChangeLog
+++ b/net-misc/netkit-telnetd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.16 2004/06/24 23:59:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.17 2004/09/30 04:44:51 solar Exp $
+
+*netkit-telnetd-0.17-r4 (30 Sep 2004)
+
+  30 Sep 2004; <solar@gentoo.org> +metadata.xml,
+  +files/netkit-telnetd-0.17-cflags-gnu_source.patch,
+  +netkit-telnetd-0.17-r4.ebuild:
+  fix really old old telnetd security bugs. We now follow debs source lead for
+  netkit-telnetd. bug 64632
 
 *netkit-telnetd-0.17-r3 (1 May 2002)
 
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 185526418326..f52faab5a1c3 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -1,16 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6557c9833572d0cc193696a6aa4030bc ChangeLog 2409
 MD5 e4cfffd72d55d6943694b125bb63ae5b netkit-telnetd-0.17-r3.ebuild 1486
+MD5 77e31c20b9d578780bf64101cbf1b260 netkit-telnetd-0.17-r4.ebuild 2219
+MD5 6557c9833572d0cc193696a6aa4030bc ChangeLog 2409
+MD5 18641d94839066e87b8be43bbb27fd47 metadata.xml 408
+MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
 MD5 248ab0551e59a480cbe3d64657fa586f files/digest-netkit-telnetd-0.17-r3 70
-MD5 6d23345a3ccb8e7b572752f14aee4860 files/net.issue.sample 117
+MD5 a766f52cf4ac7ed020e1c3ba2816f4e5 files/digest-netkit-telnetd-0.17-r4 143
+MD5 26909bc7e50e047d1667c8f41b08892c files/netkit-telnetd-0.17-cflags-gnu_source.patch 449
 MD5 d741260d55b46b1e6ae6cf923b4542e5 files/netkit-telnetd-0.17-gentoo.patch 3155
-MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.8 (GNU/Linux)
-
-iD8DBQFA4LUGHTu7gpaalycRAqgnAJ9X6Vb9TNITuQSp6ZrS4oiAnrmayQCdGqEl
-yS1AotljSzx2h9B4cib+BB8=
-=bIDN
------END PGP SIGNATURE-----
+MD5 6d23345a3ccb8e7b572752f14aee4860 files/net.issue.sample 117
diff --git a/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r4 b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r4
new file mode 100644
index 000000000000..f67b93f6f0ce
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r4
@@ -0,0 +1,2 @@
+MD5 d6beabaaf53fe6e382c42ce3faa05a36 netkit-telnet-0.17.tar.gz 133749
+MD5 bd782bc1a02ac832d5f66f0ffc4a356e netkit-telnet_0.17-26.diff.gz 25188
diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
new file mode 100644
index 000000000000..be6a9c1d81ab
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch
@@ -0,0 +1,11 @@
+--- telnetd/Makefile.orig	2004-09-29 22:16:50.175839840 -0500
++++ telnetd/Makefile	2004-09-29 22:09:30.439689896 -0500
+@@ -10,7 +10,7 @@
+ 
+ CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \
+ 	   -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS \
+-	   -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\"
++	   -DLOGIN_WRAPPER=\"/usr/lib/telnetlogin\" -D_GNU_SOURCE
+ # LIBS += $(LIBTERMCAP)
+ 
+ OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \
diff --git a/net-misc/netkit-telnetd/metadata.xml b/net-misc/netkit-telnetd/metadata.xml
new file mode 100644
index 000000000000..bbb3824263ed
--- /dev/null
+++ b/net-misc/netkit-telnetd/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>no-herd</herd>
+	<maintainer>
+		<email>solar@gentoo.org</email>
+		<description>interim maintainer</description>
+	</maintainer>
+	<longdescription>The telnetd program is a server which supports the DARPA telnet interactive communication protocol.</longdescription>
+</pkgmetadata>
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild
new file mode 100644
index 000000000000..eda134ff5ce5
--- /dev/null
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r4.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 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.1 2004/09/30 04:44:51 solar Exp $
+
+inherit eutils
+
+PATCHLEVEL=26
+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
+}