- revision bump to debs unstable patchlevel 32

(Portage version: 2.0.54-r2)

5 files changed, 92 insertions, 16 deletions

diff --git a/net-misc/netkit-telnetd/ChangeLog b/net-misc/netkit-telnetd/ChangeLog
index ab1dfbe5cc33..f4e018f6ff4a 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.38 2005/04/03 11:24:19 hardave Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.39 2006/05/07 13:21:09 solar Exp $
+
+*netkit-telnetd-0.17-r7 (07 May 2006)
+
+  07 May 2006; <solar@gentoo.org> +netkit-telnetd-0.17-r7.ebuild:
+  - revision bump to debs unstable patchlevel 32
 
   03 Apr 2005; Hardave Riar <hardave@gentoo.org>
   netkit-telnetd-0.17-r6.ebuild:
diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest
index 38682feea4f4..6e163e3445e1 100644
--- a/net-misc/netkit-telnetd/Manifest
+++ b/net-misc/netkit-telnetd/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6f3722f76ebfb7799b865fe5622f9a93 ChangeLog 5341
+MD5 8f96fcb2c559c82f71777243203abb84 ChangeLog 5496
 MD5 999ed3fb65fa707dce76bca8f7f6727a files/digest-netkit-telnetd-0.17-r6 143
+MD5 14b9e40faf3355d1b40f088d7a02d579 files/digest-netkit-telnetd-0.17-r7 143
 MD5 6d23345a3ccb8e7b572752f14aee4860 files/net.issue.sample 117
 MD5 7dbf060bb9168e5f98621fe7c13a4965 files/netkit-telnetd-0.17-cflags-gnu_source.patch 830
 MD5 d741260d55b46b1e6ae6cf923b4542e5 files/netkit-telnetd-0.17-gentoo.patch 3155
 MD5 0bdd0131a5803a2e4a4ec8b3b9fb5039 files/telnetd.xinetd 205
 MD5 18641d94839066e87b8be43bbb27fd47 metadata.xml 408
-MD5 297e65810bc4a9a9d4cb714b41ec1a41 netkit-telnetd-0.17-r6.ebuild 2220
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDj4OAgIKl8Uu19MoRAmTWAJ9JY03P2L+Pftq7OuYffIVEy/GYCQCfZwAe
-YHg9K+HUAzTgIe0JHETtMK8=
-=id1R
------END PGP SIGNATURE-----
+MD5 151030313e572d558f42b3e71140b8cb netkit-telnetd-0.17-r6.ebuild 2220
+MD5 d1c680bfe64b9dd42f875d48dd72aad8 netkit-telnetd-0.17-r7.ebuild 2344
diff --git a/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r7 b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r7
new file mode 100644
index 000000000000..79597f3eba7e
--- /dev/null
+++ b/net-misc/netkit-telnetd/files/digest-netkit-telnetd-0.17-r7
@@ -0,0 +1,2 @@
+MD5 d6beabaaf53fe6e382c42ce3faa05a36 netkit-telnet-0.17.tar.gz 133749
+MD5 b740016f04047b95826f4e053c6405ca netkit-telnet_0.17-32.diff.gz 26464
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 506e7ace64f3..35ad0bab484d 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-2005 Gentoo Foundation
+# Copyright 1999-2006 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.11 2005/12/01 23:10:33 vapier Exp $
+# $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 $
 
 inherit eutils
 
diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild
new file mode 100644
index 000000000000..57ba449309d4
--- /dev/null
+++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 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.1 2006/05/07 13:21:09 solar Exp $
+
+inherit eutils
+
+PATCHLEVEL=32
+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
+	http://ftp.debian.org/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::" \
+		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
+}