Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/netkit-telnetd/
Date: Tue, 01 Dec 2020 07:56:18
Message-Id: 1606809362.be181e0c76f2e0c99b4652f4be9d079010b2ebae.juippis@gentoo
1 commit: be181e0c76f2e0c99b4652f4be9d079010b2ebae
2 Author: PPed72 <paolo.pedroni <AT> iol <DOT> it>
3 AuthorDate: Thu Nov 26 10:57:25 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 1 07:56:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be181e0c
7
8 net-misc/netkit-telnetd: change sed delimiter
9
10 Closes: https://bugs.gentoo.org/715706
11 Signed-off-by: Paolo Pedroni <paolo.pedroni <AT> iol.it>
12 Package-Manager: Portage-3.0.9, Repoman-3.0.2
13 Closes: https://github.com/gentoo/gentoo/pull/18412
14 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
15
16 net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild | 16 ++++++++--------
17 1 file changed, 8 insertions(+), 8 deletions(-)
18
19 diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
20 index c2f66be105d..defc1918c5c 100644
21 --- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
22 +++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild
23 @@ -36,17 +36,17 @@ src_prepare() {
24 # better to just stay in sync with debian's own netkit-telnet
25 # package. Lots of bug fixes by them over time which were not in
26 # our telnetd.
27 - EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}"/debian/patches
28 + EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}/debian/patches"
29
30 # Patch: [1]
31 # after the deb patch we need to add a small patch that defines
32 # gnu source. This is needed for gcc-3.4.x (needs to be pushed
33 # back to the deb folk?)
34 - eapply "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch
35 + eapply "${FILESDIR}/netkit-telnetd-0.17-cflags-gnu_source.patch"
36
37 # Fix portability issues.
38 sed -i \
39 - -e 's/echo -n/printf %s/' \
40 + -e 's@echo -n@printf %s@' \
41 configure || die
42 default
43 }
44 @@ -58,9 +58,9 @@ src_configure() {
45 ./configure --prefix=/usr || die
46
47 sed -i \
48 - -e "s/-pipe -O2/${CFLAGS}/" \
49 - -e "s/^\(LDFLAGS=\).*/\1${LDFLAGS}/" \
50 - -e "s/-Wpointer-arith//" \
51 + -e "s@-pipe -O2@${CFLAGS}@" \
52 + -e "s@^\(LDFLAGS=\).*@\1${LDFLAGS}@" \
53 + -e "s@-Wpointer-arith@@" \
54 MCONFIG || die
55 }
56
57 @@ -81,9 +81,9 @@ src_install() {
58 dosym telnetd.8 /usr/share/man/man8/in.telnetd.8
59 doman telnetlogin/telnetlogin.8
60 dodoc BUGS ChangeLog README
61 - dodoc "${FILESDIR}"/net.issue.sample
62 + dodoc "${FILESDIR}/net.issue.sample"
63 newdoc telnet/README README.telnet
64 newdoc telnet/TODO TODO.telnet
65 insinto /etc/xinetd.d
66 - newins "${FILESDIR}"/telnetd.xinetd telnetd
67 + newins "${FILESDIR}/telnetd.xinetd" telnetd
68 }