From e3b7e3f9c19411975f6efaa911ba0361691defb1 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin Date: Mon, 27 May 2013 22:21:33 +0200 Subject: net-misc/netkit-telnetd: handle cross compile by exporting CC --- net-misc/netkit-telnetd/Manifest | 7 ++ net-misc/netkit-telnetd/files/net.issue.sample | 4 ++ .../netkit-telnetd-0.17-cflags-gnu_source.patch | 23 ++++++ .../files/netkit-telnetd-0.17-gentoo.patch | 81 ++++++++++++++++++++++ net-misc/netkit-telnetd/files/telnetd.xinetd | 10 +++ .../netkit-telnetd/netkit-telnetd-0.17-r10.ebuild | 81 ++++++++++++++++++++++ 6 files changed, 206 insertions(+) create mode 100644 net-misc/netkit-telnetd/Manifest create mode 100644 net-misc/netkit-telnetd/files/net.issue.sample create mode 100644 net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch create mode 100644 net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch create mode 100644 net-misc/netkit-telnetd/files/telnetd.xinetd create mode 100644 net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild (limited to 'net-misc') diff --git a/net-misc/netkit-telnetd/Manifest b/net-misc/netkit-telnetd/Manifest new file mode 100644 index 00000000..0bedfa0a --- /dev/null +++ b/net-misc/netkit-telnetd/Manifest @@ -0,0 +1,7 @@ +AUX net.issue.sample 117 SHA256 14c92d55c12c680c69f557bbfbeaa4d03e652d4e06d1bedd8fecf7faaf076706 SHA512 f290b0fc214dd58acfb186c269180aae29c42768bfeab21aa72604ad8ce50c354f18d9b568d04885554c5d1c27017dd7132e406933050450d8605d16d9263b79 WHIRLPOOL 776ca20ccc850124378750354c44943938c8f7d93e2aba30793022b267c393bd17c56cf9e3daf979d5b4fdf98c5909a0efc4fc05034dd1e5e6c7ce0c853e5b2f +AUX netkit-telnetd-0.17-cflags-gnu_source.patch 830 SHA256 14da0f4796691e0a7e656e72cb78bfd599d5f83b1f6aadd4c2870bcfd6e1cfaa SHA512 881065a2156414381e5cb3776ea91e4de0ad2d09065ba8ebecf8001b7f6a87278e6724dd5aa6d43f66554aed38fb0eb1b9103c2720ccc1a6aba4f074a5ec0f8a WHIRLPOOL eac690495c1a05db7da5d7d715a635987a6340afa9f8db9826ea530515d606840b249619ba17a6a74840e0388a841af59d8137a596571e98acbbef7f5576a83d +AUX netkit-telnetd-0.17-gentoo.patch 3155 SHA256 afb71952eb9b02c8abad59c6eb348175d195229c0f91068dd51d95b439429330 SHA512 595a4c39d0285feb168d16ea6e8fc44ba981d433d2ee1735ee6b25242ec7ba3e32ad4511e856d03e14b75af0cc49da6628316fd8a5870d2543ae6a14884b1349 WHIRLPOOL 37d2c94039b94791df4ea79407a00b8a5242f52384d01ce068eebdedbca1ea050e312a71766209789fe1bd0b30683e56de35dec91239c0a3eeed98aa5fad2c6a +AUX telnetd.xinetd 205 SHA256 cb8fe24c1f6113ca397e712898d3decc5ba901994c68262b0ff9e2b091e4576c SHA512 c587988b5dc1d1bf5ce99df9035d2388990fa799ba3d6be8f895fd5ee2c32c5ca4777815c6a1e29178753734caf7ea19e8f64b2e312ba49dcb002e0d9f97953c WHIRLPOOL f38f70e9cefd57878088867babf3831b46063851fc116fb45a51e0e2c41a1398498cacd8dde2d4d4a1c21f968c26c539e7629eb88727f253a3cd677f44afedbc +DIST netkit-telnet-0.17.tar.gz 133749 SHA256 9c80d5c7838361a328fb6b60016d503def9ce53ad3c589f3b08ff71a2bb88e00 SHA512 e2cfabed12326af5e288def1821353eacffb4586008263dcd1bed1a9dd9d8548e51e68d7ede58ea75927783ba534ea8807ec722271843a77146f064f3d826dd3 WHIRLPOOL 0a04763f8d42b1985295f9db3472aa80f4f1cc96a151ab66e34275c18809dcbc1a072c4754c0a989cca576a7d7ff6d8795865f6b372b1fe4953dbe0e87665728 +DIST netkit-telnet_0.17-36.diff.gz 27226 SHA256 cd192e3acbef83a3e8fbacfa26e1f6ededfe50587e9b372b5a38ce5928d746f7 SHA512 7cd1ec5f96fcacee551700d65f62b6c217e0d9b5220a218aa60fceb3883d0754831606a247355dc2bf6486a02175b8d9b27058d6bc788de8e1b80545fdedbf9a WHIRLPOOL c651f4cacabe5b42fefb9f9fa1f306d5aafad7c8b3e0c5eb6afcf15609487ef726991a1e5eb88c7f95364a1e166b26f01814b3671b72ffec14673e5927898a7b +EBUILD netkit-telnetd-0.17-r10.ebuild 2599 SHA256 6743b3ee723c3ee744a7527882044bb9e14b80efc2f4f50e98b9e469317ff1b0 SHA512 61af0d8ef4cc3cfda9e4b30d9a1aac01844251a5915701a0d5dfa52b4cae3c20723d1fa2dfab54b86de4c80700764dc69cfea94414f2e725c8d4b9257082a7fa WHIRLPOOL bd6588b318ad4005e4ed583368a3b86dcaee894d2349deeb28c8853abaca62dc53d5ebb6488713cde3f8fa60f707f5ba25ffc50a73f48027fe6fad6f7f57f22c diff --git a/net-misc/netkit-telnetd/files/net.issue.sample b/net-misc/netkit-telnetd/files/net.issue.sample new file mode 100644 index 00000000..79a4f212 --- /dev/null +++ b/net-misc/netkit-telnetd/files/net.issue.sample @@ -0,0 +1,4 @@ +# Example /etc/issue.net(5) + +# This is %h running %s:%r on a %m +# You are on /dev/ttyp%t at %d' > ${D}/etc/issue.net 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 00000000..1ebbda77 --- /dev/null +++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-cflags-gnu_source.patch @@ -0,0 +1,23 @@ +--- 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/sbin/telnetlogin\" -D_GNU_SOURCE + # LIBS += $(LIBTERMCAP) + + OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \ +--- telnet/Makefile.orig 2004-11-01 15:23:29 -0500 ++++ telnet/Makefile 2004-11-01 16:05:05 -0500 +@@ -6,7 +6,7 @@ + #CXXFLAGS:=$(patsubst -O2, -g, $(CXXFLAGS)) + + # -DAUTHENTICATE +-CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE ++CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE -D_GNU_SOURCE + LIBS = $(LIBTERMCAP) + + SRCS = commands.cc main.cc network.cc ring.cc sys_bsd.cc telnet.cc \ + diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch new file mode 100644 index 00000000..d8845bad --- /dev/null +++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch @@ -0,0 +1,81 @@ +diff -r -u netkit-telnet-0.17_orig/telnet/main.cc netkit-telnet-0.17/telnet/main.cc +--- netkit-telnet-0.17_orig/telnet/main.cc 1999-08-01 07:06:37.000000000 +0200 ++++ netkit-telnet-0.17/telnet/main.cc 2002-04-05 09:22:35.000000000 +0200 +@@ -43,6 +43,7 @@ + + #include "../version.h" + ++#include + #include + #include + #include +diff -r -u netkit-telnet-0.17_orig/telnet/Makefile netkit-telnet-0.17/telnet/Makefile +--- netkit-telnet-0.17_orig/telnet/Makefile 1999-08-01 07:06:37.000000000 +0200 ++++ netkit-telnet-0.17/telnet/Makefile 2002-04-05 09:26:01.000000000 +0200 +@@ -7,7 +7,7 @@ + + # -DAUTHENTICATE + CXXFLAGS += -DUSE_TERMIO -DKLUDGELINEMODE +-LIBS += $(LIBTERMCAP) ++LIBS += $(LIBTERMCAP) -lcurses + + SRCS = commands.cc main.cc network.cc ring.cc sys_bsd.cc telnet.cc \ + terminal.cc tn3270.cc utilities.cc genget.cc environ.cc netlink.cc +diff -r -u netkit-telnet-0.17_orig/telnet/netlink.cc netkit-telnet-0.17/telnet/netlink.cc +--- netkit-telnet-0.17_orig/telnet/netlink.cc 2000-07-23 06:16:25.000000000 +0200 ++++ netkit-telnet-0.17/telnet/netlink.cc 2002-04-05 09:24:35.000000000 +0200 +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include + #include +diff -r -u netkit-telnet-0.17_orig/telnet/network.cc netkit-telnet-0.17/telnet/network.cc +--- netkit-telnet-0.17_orig/telnet/network.cc 1996-08-13 10:09:58.000000000 +0200 ++++ netkit-telnet-0.17/telnet/network.cc 2002-04-05 09:22:52.000000000 +0200 +@@ -37,6 +37,7 @@ + char net_rcsid[] = + "$Id: netkit-telnetd-0.17-gentoo.patch,v 1.1 2002/04/05 07:48:02 gbevin Exp $"; + ++#include + #include + #include + #include +diff -r -u netkit-telnet-0.17_orig/telnet/terminal.cc netkit-telnet-0.17/telnet/terminal.cc +--- netkit-telnet-0.17_orig/telnet/terminal.cc 1999-12-12 20:48:05.000000000 +0100 ++++ netkit-telnet-0.17/telnet/terminal.cc 2002-04-05 09:23:53.000000000 +0200 +@@ -41,6 +41,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + #include +diff -r -u netkit-telnet-0.17_orig/telnet/utilities.cc netkit-telnet-0.17/telnet/utilities.cc +--- netkit-telnet-0.17_orig/telnet/utilities.cc 1999-12-12 16:33:40.000000000 +0100 ++++ netkit-telnet-0.17/telnet/utilities.cc 2002-04-05 09:24:14.000000000 +0200 +@@ -46,6 +46,8 @@ + #include + #include + #include ++#include ++#include + #include + + #include "ring.h" +diff -r -u netkit-telnet-0.17_orig/telnetd/Makefile netkit-telnet-0.17/telnetd/Makefile +--- netkit-telnet-0.17_orig/telnetd/Makefile 1999-12-14 01:43:30.000000000 +0100 ++++ netkit-telnet-0.17/telnetd/Makefile 2002-04-05 09:36:47.000000000 +0200 +@@ -10,7 +10,7 @@ + + CFLAGS += '-DISSUE_FILE="/etc/issue.net"' -DPARANOID_TTYS \ + -DNO_REVOKE -DKLUDGELINEMODE -DDIAGNOSTICS +-# LIBS += $(LIBTERMCAP) ++LIBS += -lutil + + OBJS = telnetd.o state.o termstat.o slc.o sys_term.o utility.o \ + global.o setproctitle.o diff --git a/net-misc/netkit-telnetd/files/telnetd.xinetd b/net-misc/netkit-telnetd/files/telnetd.xinetd new file mode 100644 index 00000000..63dd6dac --- /dev/null +++ b/net-misc/netkit-telnetd/files/telnetd.xinetd @@ -0,0 +1,10 @@ +service telnet +{ + flags = REUSE + socket_type = stream + wait = no + user = root + server = /usr/sbin/in.telnetd + log_on_failure += USERID + disable = yes +} diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild new file mode 100644 index 00000000..ce444a12 --- /dev/null +++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2012 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-r10.ebuild,v 1.9 2012/05/28 17:18:05 armin76 Exp $ + +inherit eutils toolchain-funcs + +PATCHLEVEL=36 +DESCRIPTION="Standard Linux telnet client and server" +#old HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" +# This might be the best HOMEPAGE now? +HOMEPAGE="https://launchpad.net/netkit-telnet" +# http://packages.debian.org/stablesource/netkit-telnet +# http://packages.debian.org/testing/source/netkit-telnet +# No upstream mirror exists anymore? +# old ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}.tar.gz +SRC_URI="mirror://gentoo/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 s390 sh sparc x86" +IUSE="" + +DEPEND=">=sys-libs/ncurses-5.2 + !net-misc/telnet-bsd" +RDEPEND="${DEPEND}" + +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 + + # 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 +} + +src_compile() { + tc-export CC CXX + + ./configure --prefix=/usr || die + + sed -i \ + -e "s:-pipe -O2:${CFLAGS}:" \ + -e "s:^\(LDFLAGS=\).*:\1${LDFLAGS}:" \ + -e "s:-Wpointer-arith::" \ + MCONFIG || die + + emake || die + cd telnetlogin && emake || die +} + +src_install() { + dobin telnet/telnet || die + + dosbin telnetd/telnetd || die + dosym telnetd /usr/sbin/in.telnetd || die + dosbin telnetlogin/telnetlogin || die + doman telnet/telnet.1 || die + doman telnetd/*.8 || die + doman telnetd/issue.net.5 || die + dosym telnetd.8 /usr/share/man/man8/in.telnetd.8 || die + doman telnetlogin/telnetlogin.8 || die + dodoc BUGS ChangeLog README || die + dodoc "${FILESDIR}"/net.issue.sample || die + newdoc telnet/README README.telnet || die + newdoc telnet/TODO TODO.telnet || die + insinto /etc/xinetd.d + newins "${FILESDIR}"/telnetd.xinetd telnetd || die +} -- cgit v1.2.3