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 7D751138350 for ; Wed, 5 Feb 2020 03:02:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 27DD4E0938; Wed, 5 Feb 2020 03:02:08 +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 E67DCE0938 for ; Wed, 5 Feb 2020 03:02:07 +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 503D134E6CA for ; Wed, 5 Feb 2020 03:02:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0301111 for ; Wed, 5 Feb 2020 03:02:03 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1580871714.f75f34c03ffcd96a36fa66a1d1c883b4290e82a8.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/openssh-8.1_p1-r2.ebuild X-VCS-Directories: net-misc/openssh/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: f75f34c03ffcd96a36fa66a1d1c883b4290e82a8 X-VCS-Branch: master Date: Wed, 5 Feb 2020 03:02:03 +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: d4576a7c-1cb0-4b5d-b0d0-9e9c04e11b9c X-Archives-Hash: 92633a7ced7aec0f17f657966631da5a commit: f75f34c03ffcd96a36fa66a1d1c883b4290e82a8 Author: Patrick McLean sony com> AuthorDate: Wed Feb 5 03:00:11 2020 +0000 Commit: Patrick McLean gentoo org> CommitDate: Wed Feb 5 03:01:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f75f34c0 net-misc/openssh-8.1_p1-r2: Fix CI issues Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.87, Repoman-2.3.20 Signed-off-by: Patrick McLean gentoo.org> net-misc/openssh/openssh-8.1_p1-r2.ebuild | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/net-misc/openssh/openssh-8.1_p1-r2.ebuild b/net-misc/openssh/openssh-8.1_p1-r2.ebuild index ca1b4c29ccf..fe7b7fb1bb4 100644 --- a/net-misc/openssh/openssh-8.1_p1-r2.ebuild +++ b/net-misc/openssh/openssh-8.1_p1-r2.ebuild @@ -121,7 +121,7 @@ pkg_pretend() { src_prepare() { sed -i \ - -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX%/}/usr/bin/xauth:" \ + -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \ pathnames.h || die # don't break .ssh/authorized_keys2 for fun @@ -283,17 +283,17 @@ src_configure() { --with-ldflags="${LDFLAGS}" --disable-strip --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run - --sysconfdir="${EPREFIX%/}"/etc/ssh - --libexecdir="${EPREFIX%/}"/usr/$(get_libdir)/misc - --datadir="${EPREFIX%/}"/usr/share/openssh - --with-privsep-path="${EPREFIX%/}"/var/empty + --sysconfdir="${EPREFIX}"/etc/ssh + --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc + --datadir="${EPREFIX}"/usr/share/openssh + --with-privsep-path="${EPREFIX}"/var/empty --with-privsep-user=sshd $(use_with audit audit linux) - $(use_with kerberos kerberos5 "${EPREFIX%/}"/usr) + $(use_with kerberos kerberos5 "${EPREFIX}"/usr) # We apply the sctp patch conditionally, so can't pass --without-sctp # unconditionally else we get unknown flag warnings. $(use sctp && use_with sctp) - $(use_with ldns ldns "${EPREFIX%/}"/usr) + $(use_with ldns ldns "${EPREFIX}"/usr) $(use_with libedit) $(use_with pam) $(use_with pie) @@ -355,7 +355,7 @@ tweak_ssh_configs() { ) # First the server config. - cat <<-EOF >> "${ED%/}"/etc/ssh/sshd_config + cat <<-EOF >> "${ED}"/etc/ssh/sshd_config # Allow client to pass locale environment variables. #367017 AcceptEnv ${locale_vars[*]} @@ -365,7 +365,7 @@ tweak_ssh_configs() { EOF # Then the client config. - cat <<-EOF >> "${ED%/}"/etc/ssh/ssh_config + cat <<-EOF >> "${ED}"/etc/ssh/ssh_config # Send locale environment variables. #367017 SendEnv ${locale_vars[*]} @@ -380,13 +380,13 @@ tweak_ssh_configs() { -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \ -e "/^#PrintMotd /s:.*:PrintMotd no:" \ -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \ - "${ED%/}"/etc/ssh/sshd_config || die + "${ED}"/etc/ssh/sshd_config || die fi if use livecd ; then sed -i \ -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \ - "${ED%/}"/etc/ssh/sshd_config || die + "${ED}"/etc/ssh/sshd_config || die fi }