Date: Monday, October 26, 2020 @ 10:34:31 Author: grazzolini Revision: 398805
upgpkg: openssh 8.4p1-2 Fix for FS#68117 Added: openssh/trunk/0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch Modified: openssh/trunk/PKGBUILD -----------------------------------------------------------+ 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch | 33 ++++++++++++ PKGBUILD | 13 +++- 2 files changed, 43 insertions(+), 3 deletions(-) Added: 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch =================================================================== --- 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch (rev 0) +++ 0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch 2020-10-26 10:34:31 UTC (rev 398805) @@ -0,0 +1,33 @@ +From d9e727dcc04a52caaac87543ea1d230e9e6b5604 Mon Sep 17 00:00:00 2001 +From: Oleg <fall...@users.noreply.github.com> +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 392f64f9..a7690771 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}" +-- +2.29.1 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-10-26 09:11:42 UTC (rev 398804) +++ PKGBUILD 2020-10-26 10:34:31 UTC (rev 398805) @@ -1,4 +1,5 @@ # Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Giancarlo Razzolini <grazzol...@archlinux.org> # Contributor: Gaetan Bisson <bis...@archlinux.org> # Contributor: Aaron Griffin <aa...@archlinux.org> # Contributor: judd <jvi...@zeroflux.org> @@ -5,7 +6,7 @@ pkgname=openssh pkgver=8.4p1 -pkgrel=1 +pkgrel=2 pkgdesc='Premier connectivity tool for remote login with the SSH protocol' url='https://www.openssh.com/portable.html' license=('custom:BSD') @@ -23,7 +24,8 @@ 'sshd.service' 'sshd.conf' 'sshd.pam' - 'glibc-2.31.patch') + 'glibc-2.31.patch' + '0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch') sha256sums=('5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24' 'SKIP' '4031577db6416fcbaacf8a26a024ecd3939e5c10fe6a86ee3f0eea5093d533b7' @@ -30,7 +32,8 @@ 'e40f8b7c8e5e2ecf3084b3511a6c36d5b5c9f9e61f2bb13e3726c71dc7d4fbc7' '4effac1186cc62617f44385415103021f72f674f8b8e26447fc1139c670090f6' '64576021515c0a98b0aaf0a0ae02e0f5ebe8ee525b1e647ab68f369f81ecd846' - '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93') + '25b4a4d9e2d9d3289ef30636a30e85fa1c71dd930d5efd712cca1a01a5019f93' + 'a9093693586ea1150ac50249ce8937f86cde7977efa54a324e3f1155110aff49') backup=('etc/ssh/ssh_config' 'etc/ssh/sshd_config' 'etc/pam.d/sshd') @@ -40,6 +43,10 @@ cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 -i ../glibc-2.31.patch + + # Fix `EOF: command not found` error in ssh-copy-id + patch -p1 -i ../0001-Fix-EOF-command-not-found-error-in-ssh-copy-id.patch + autoreconf }