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 55768138359 for ; Wed, 14 Oct 2020 21:14:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1151E093B; Wed, 14 Oct 2020 21:14:41 +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 89B36E093B for ; Wed, 14 Oct 2020 21:14:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 6E25F340EA4 for ; Wed, 14 Oct 2020 21:14:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59F8D388 for ; Wed, 14 Oct 2020 21:14:38 +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: <1602710072.5483ca01f8bbc1d6ad960d1ef7846a10ab5044d9.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/, net-misc/openssh/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch net-misc/openssh/openssh-8.4_p1-r1.ebuild net-misc/openssh/openssh-8.4_p1-r2.ebuild X-VCS-Directories: net-misc/openssh/ net-misc/openssh/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: 5483ca01f8bbc1d6ad960d1ef7846a10ab5044d9 X-VCS-Branch: master Date: Wed, 14 Oct 2020 21:14:38 +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: 261ebbff-bcb6-463a-aa55-2fb233b533ec X-Archives-Hash: 9ade301da764dbb41495d1f685717812 commit: 5483ca01f8bbc1d6ad960d1ef7846a10ab5044d9 Author: Patrick McLean sony com> AuthorDate: Wed Oct 14 21:14:24 2020 +0000 Commit: Patrick McLean gentoo org> CommitDate: Wed Oct 14 21:14:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5483ca01 net-misc/openssh-8.4_p1-r2: Pull in fix for ssh-copy-id (bug #749026) Closes: https://bugs.gentoo.org/749026 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Patrick McLean gentoo.org> .../files/openssh-8.4_p1-fix-ssh-copy-id.patch | 30 ++++++++++++++++++++++ ...h-8.4_p1-r1.ebuild => openssh-8.4_p1-r2.ebuild} | 3 +++ 2 files changed, 33 insertions(+) diff --git a/net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch b/net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch new file mode 100644 index 00000000000..32713d43ff3 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.4_p1-fix-ssh-copy-id.patch @@ -0,0 +1,30 @@ +From d9e727dcc04a52caaac87543ea1d230e9e6b5604 Mon Sep 17 00:00:00 2001 +From: Oleg +Date: Thu, 1 Oct 2020 12:09:08 +0300 +Subject: [PATCH] Fix `EOF: command not found` error in ssh-copy-id + +--- + contrib/ssh-copy-id | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/contrib/ssh-copy-id b/contrib/ssh-copy-id +index 392f64f94..a76907717 100644 +--- a/contrib/ssh-copy-id ++++ b/contrib/ssh-copy-id +@@ -247,7 +247,7 @@ installkeys_sh() { + # the -z `tail ...` checks for a trailing newline. The echo adds one if was missing + # the cat adds the keys we're getting via STDIN + # and if available restorecon is used to restore the SELinux context +- INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF) ++ INSTALLKEYS_SH=$(tr '\t\n' ' ' <<-EOF + cd; + umask 077; + mkdir -p $(dirname "${AUTH_KEY_FILE}") && +@@ -258,6 +258,7 @@ installkeys_sh() { + restorecon -F .ssh ${AUTH_KEY_FILE}; + fi + EOF ++ ) + + # to defend against quirky remote shells: use 'exec sh -c' to get POSIX; + printf "exec sh -c '%s'" "${INSTALLKEYS_SH}" diff --git a/net-misc/openssh/openssh-8.4_p1-r1.ebuild b/net-misc/openssh/openssh-8.4_p1-r2.ebuild similarity index 99% rename from net-misc/openssh/openssh-8.4_p1-r1.ebuild rename to net-misc/openssh/openssh-8.4_p1-r2.ebuild index 6c183e64862..09691782910 100644 --- a/net-misc/openssh/openssh-8.4_p1-r1.ebuild +++ b/net-misc/openssh/openssh-8.4_p1-r2.ebuild @@ -138,6 +138,9 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-8.0_p1-fix-putty-tests.patch eapply "${FILESDIR}"/${PN}-8.0_p1-deny-shmget-shmat-shmdt-in-preauth-privsep-child.patch + # https://bugs.gentoo.org/749026 + use X509 || eapply "${FILESDIR}"/${PN}-8.4_p1-fix-ssh-copy-id.patch + # workaround for https://bugs.gentoo.org/734984 use X509 || eapply "${FILESDIR}"/${PN}-8.3_p1-sha2-include.patch