From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B24CA13835A for ; Tue, 1 Dec 2020 07:56:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8B5AE0855; Tue, 1 Dec 2020 07:56:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFD70E0855 for ; Tue, 1 Dec 2020 07:56:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5481340D30 for ; Tue, 1 Dec 2020 07:56:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 896BE475 for ; Tue, 1 Dec 2020 07:56:13 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1606809362.be181e0c76f2e0c99b4652f4be9d079010b2ebae.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/netkit-telnetd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild X-VCS-Directories: net-misc/netkit-telnetd/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: be181e0c76f2e0c99b4652f4be9d079010b2ebae X-VCS-Branch: master Date: Tue, 1 Dec 2020 07:56:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6396db60-51cd-4feb-8ac3-50ed9e0cbd19 X-Archives-Hash: 1daadaa99d3d952e707ff84e47ccc1c5 commit: be181e0c76f2e0c99b4652f4be9d079010b2ebae Author: PPed72 iol it> AuthorDate: Thu Nov 26 10:57:25 2020 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Tue Dec 1 07:56:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be181e0c net-misc/netkit-telnetd: change sed delimiter Closes: https://bugs.gentoo.org/715706 Signed-off-by: Paolo Pedroni iol.it> Package-Manager: Portage-3.0.9, Repoman-3.0.2 Closes: https://github.com/gentoo/gentoo/pull/18412 Signed-off-by: Joonas Niilola gentoo.org> net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild index c2f66be105d..defc1918c5c 100644 --- a/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild +++ b/net-misc/netkit-telnetd/netkit-telnetd-0.17-r12.ebuild @@ -36,17 +36,17 @@ src_prepare() { # 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_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}"/debian/patches + EPATCH_FORCE="yes" EPATCH_SUFFIX="diff" eapply "${WORKDIR}/debian/patches" # 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?) - eapply "${FILESDIR}"/netkit-telnetd-0.17-cflags-gnu_source.patch + eapply "${FILESDIR}/netkit-telnetd-0.17-cflags-gnu_source.patch" # Fix portability issues. sed -i \ - -e 's/echo -n/printf %s/' \ + -e 's@echo -n@printf %s@' \ configure || die default } @@ -58,9 +58,9 @@ src_configure() { ./configure --prefix=/usr || die sed -i \ - -e "s/-pipe -O2/${CFLAGS}/" \ - -e "s/^\(LDFLAGS=\).*/\1${LDFLAGS}/" \ - -e "s/-Wpointer-arith//" \ + -e "s@-pipe -O2@${CFLAGS}@" \ + -e "s@^\(LDFLAGS=\).*@\1${LDFLAGS}@" \ + -e "s@-Wpointer-arith@@" \ MCONFIG || die } @@ -81,9 +81,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 }