diff options
author | Peter Volkov <pva@gentoo.org> | 2008-08-13 14:02:07 +0000 |
---|---|---|
committer | Peter Volkov <pva@gentoo.org> | 2008-08-13 14:02:07 +0000 |
commit | b90eed64a8b4a13f60570466135caeb6d9b7b90a (patch) | |
tree | eb3f5f977b2a048305208c4b0587f79d62722e2d /net-misc/netkit-telnetd | |
parent | Add ~ia64/~sparc (diff) | |
download | gentoo-2-b90eed64a8b4a13f60570466135caeb6d9b7b90a.tar.gz gentoo-2-b90eed64a8b4a13f60570466135caeb6d9b7b90a.tar.bz2 gentoo-2-b90eed64a8b4a13f60570466135caeb6d9b7b90a.zip |
Respect LDFLAGS, bug #233759, thank Mart Raudsepp for report. Remove unused.
(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64)
Diffstat (limited to 'net-misc/netkit-telnetd')
-rw-r--r-- | net-misc/netkit-telnetd/ChangeLog | 8 | ||||
-rw-r--r-- | net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild (renamed from net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild) | 27 |
2 files changed, 19 insertions, 16 deletions
diff --git a/net-misc/netkit-telnetd/ChangeLog b/net-misc/netkit-telnetd/ChangeLog index 00f21270e396..5f73f282434a 100644 --- a/net-misc/netkit-telnetd/ChangeLog +++ b/net-misc/netkit-telnetd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-misc/netkit-telnetd # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.45 2008/08/02 16:58:11 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/ChangeLog,v 1.46 2008/08/13 14:02:07 pva Exp $ + +*netkit-telnetd-0.17-r10 (13 Aug 2008) + + 13 Aug 2008; Peter Volkov <pva@gentoo.org> -netkit-telnetd-0.17-r7.ebuild, + +netkit-telnetd-0.17-r10.ebuild: + Respect LDFLAGS, bug #233759, thank Mart Raudsepp for report. Remove unused. *netkit-telnetd-0.17-r9 (02 Aug 2008) diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild index defe4a641439..acfcad78ee71 100644 --- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r7.ebuild +++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2008 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.5 2007/06/26 02:33:56 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/netkit-telnetd/netkit-telnetd-0.17-r10.ebuild,v 1.1 2008/08/13 14:02:07 pva Exp $ inherit eutils toolchain-funcs -PATCHLEVEL=32 +PATCHLEVEL=36 DESCRIPTION="Standard Linux telnet client and server" HOMEPAGE="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/" # http://packages.debian.org/stablesource/netkit-telnet @@ -14,8 +14,8 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-telnet-${PV}. LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="build" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" DEPEND=">=sys-libs/ncurses-5.2 !net-misc/telnet-bsd" @@ -24,7 +24,7 @@ S=${WORKDIR}/netkit-telnet-${PV} src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # Patch: [0] # Gentoo lacks a maintainer for this package right now. And a # security problem arose. While reviewing our options for how @@ -32,14 +32,13 @@ src_unpack() { # 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 + 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 \ - || die + epatch "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch } src_compile() { @@ -47,20 +46,18 @@ src_compile() { sed -i \ -e "s:-pipe -O2:${CFLAGS}:" \ + -e "s:^\(LDFLAGS=\).*:\1${LDFLAGS}:" \ -e "s:-Wpointer-arith::" \ -e "s:^CC=.*:CC=$(tc-getCC):" \ -e "s:^CXX=.*:CXX=$(tc-getCXX):" \ MCONFIG make || die - cd telnetlogin - 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 @@ -71,9 +68,9 @@ src_install() { dosym telnetd.8 /usr/share/man/man8/in.telnetd.8 doman telnetlogin/telnetlogin.8 dodoc BUGS ChangeLog README - dodoc ${FILESDIR}/net.issue.sample + dodoc "${FILESDIR}"/net.issue.sample newdoc telnet/README README.telnet newdoc telnet/TODO TODO.telnet insinto /etc/xinetd.d - newins ${FILESDIR}/telnetd.xinetd telnetd + newins "${FILESDIR}"/telnetd.xinetd telnetd } |