From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YPg5BCYRv19PdAAA0tVLHw (envelope-from ) for ; Thu, 26 Nov 2020 02:21:26 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gKmVOyURv1+2EQAAbx9fmQ (envelope-from ) for ; Thu, 26 Nov 2020 02:21:25 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BC3C69402DD for ; Thu, 26 Nov 2020 02:21:24 +0000 (UTC) Received: from localhost ([::1]:55994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ki6uR-0003ia-II for larch@yhetil.org; Wed, 25 Nov 2020 21:21:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ki6u6-0003iS-O9 for guix-patches@gnu.org; Wed, 25 Nov 2020 21:21:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:54285) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ki6u6-0007Vo-H9 for guix-patches@gnu.org; Wed, 25 Nov 2020 21:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ki6u6-00047w-Df for guix-patches@gnu.org; Wed, 25 Nov 2020 21:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44878] [PATCH] openssl: Fix `EOF: command not found` error in ssh-copy-id Resent-From: Jesse Gibbons Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 26 Nov 2020 02:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 44878 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44878@debbugs.gnu.org X-Debbugs-Original-To: Guix Patches Received: via spool by submit@debbugs.gnu.org id=B.160635725115824 (code B ref -1); Thu, 26 Nov 2020 02:21:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Nov 2020 02:20:51 +0000 Received: from localhost ([127.0.0.1]:37598 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ki6tt-000478-Hu for submit@debbugs.gnu.org; Wed, 25 Nov 2020 21:20:51 -0500 Received: from lists.gnu.org ([209.51.188.17]:55400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ki6tn-00046v-Dy for submit@debbugs.gnu.org; Wed, 25 Nov 2020 21:20:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ki6tl-0003fn-RD for guix-patches@gnu.org; Wed, 25 Nov 2020 21:20:43 -0500 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]:44224) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ki6tf-0007EL-QQ for guix-patches@gnu.org; Wed, 25 Nov 2020 21:20:41 -0500 Received: by mail-pl1-x636.google.com with SMTP id b23so367025pls.11 for ; Wed, 25 Nov 2020 18:20:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=3VLNyLhlOSrjcAKGdYVqqDURLjf21tUslU0jptlY31E=; b=G4awYsBcZqjCpo9D3FvOqrGtiwJSRS66JQ7ZVcCWYn+uiKQyt2iNff5duzXdIi75h5 xKE7IdEpKF+XoPSeJSg1gMA9jp9fW/V5NnrrXCSTHFD8UPXax4FYLT/4zx1kRA/pWqe8 TplSE7zwEkIGa8+MYoPQZ9weInlyQA76U+K3ES6zC+grbXxllVxYHnEH8NeuwIemFMGN hMHWGN4M+A+B9s9x5sQaHJAydRBdBvOJDB+6u3DuYwB30vkLzidnaKIPq2hIkoY22RfD NxxFb/D0kRslm1MohwYOD746tHxj4iM8X9Wjg6MUtAKdZ2GQFjVA6ChU5/pMDOkreXbl c50A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=3VLNyLhlOSrjcAKGdYVqqDURLjf21tUslU0jptlY31E=; b=ALDa9q8eJ0+f1Sa3O11gG/hl+puRVo40JaVHiBz/sGhGiXeXGBohE18R8UqNAi79Tc fwjtckWBRW8e9JBxbQAFVs1z6T+PE8reAFSAqRV5JlV9sk6FAN0ARzpMMHUBUDNWEZ5q HkaG+6ZB+WOzubbD6IGqEdDp3WaSHE/YOEDeHD5a9LoTU+nsk7PpT94QKULzdx89Eg/W 6CLsIPoGAim6K+pGgCyhp2tMXpYMNq2LspyVTRTdDKF/f38daCCYBbJsGk8ETLXatrZ6 wazGeL5uRxaW80nV8iCgjyORQtNJwaIAXD6hOVBhiIeqnZwReYmSMCiz9n5p1JLJMljF NHwQ== X-Gm-Message-State: AOAM530veGhucKfK+uQNG4lG8igN85hDBtw5m1S3Vzx2tVBAk/ZVS/D5 Xj3RcCeoAvZgiB0R8SHLEOXZOtETzYo= X-Google-Smtp-Source: ABdhPJwyYAzdQftzj7vtUZEcNJFGLti+Tb8acqEs4AKnRyYkKZJuBKejshdfz0DQFHvS3Rt8p7EYPw== X-Received: by 2002:a17:902:b905:b029:d8:ad03:8c93 with SMTP id bf5-20020a170902b905b02900d8ad038c93mr826970plb.15.1606357233417; Wed, 25 Nov 2020 18:20:33 -0800 (PST) Received: from [192.168.1.25] ([38.141.58.134]) by smtp.gmail.com with ESMTPSA id z206sm3190305pfc.3.2020.11.25.18.20.31 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 25 Nov 2020 18:20:32 -0800 (PST) From: Jesse Gibbons Message-ID: <4868e2cc-3e00-90ee-c3b1-16692d6320a3@gmail.com> Date: Wed, 25 Nov 2020 19:20:30 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Icedove/78.4.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------FF59E95C4AD2D5DA709B691A" Content-Language: en-US Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=jgibbons2357@gmail.com; helo=mail-pl1-x636.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.1 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: inc X-Scanner: ns3122888.ip-94-23-21.eu Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=gmail.com header.s=20161025 header.b=G4awYsBc; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: XD3a2dpLMIRW This is a multi-part message in MIME format. --------------FF59E95C4AD2D5DA709B691A Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit The attached patch fixes ssh-copy-id. -Jesse --------------FF59E95C4AD2D5DA709B691A Content-Type: text/x-patch; charset=UTF-8; name="0001-gnu-openssh-Add-upstream-bugfix-patch.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-openssh-Add-upstream-bugfix-patch.patch" >From 32fc0e9a5a23cbb31f1965bd58d050c1cdd5c28b Mon Sep 17 00:00:00 2001 From: Jesse Gibbons Date: Wed, 25 Nov 2020 19:12:08 -0700 Subject: [PATCH] gnu: openssh: Add upstream bugfix patch. This fixes ssh-copy-id. * gnu/packages/nssh.scm (openssh)[source]: Add patch. * gnu/packages/patches/openssh-fix-eof-command-not-found.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + .../openssh-fix-eof-command-not-found.patch | 30 +++++++++++++++++++ gnu/packages/ssh.scm | 3 +- 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/openssh-fix-eof-command-not-found.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5277403196..6fc7b3f51d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1412,6 +1412,7 @@ dist_patch_DATA = \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ + %D%/packages/patches/openssh-fix-eof-command-not-found.patch \ %D%/packages/patches/openssh-hurd.patch \ %D%/packages/patches/openresolv-restartcmd-guix.patch \ %D%/packages/patches/openscad-parser-boost-1.72.patch \ diff --git a/gnu/packages/patches/openssh-fix-eof-command-not-found.patch b/gnu/packages/patches/openssh-fix-eof-command-not-found.patch new file mode 100644 index 0000000000..32713d43ff --- /dev/null +++ b/gnu/packages/patches/openssh-fix-eof-command-not-found.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/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index e5bcac33f2..d55c37844c 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -189,7 +189,8 @@ a server that supports the SSH-2 protocol.") (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" "openssh-" version ".tar.gz")) - (patches (search-patches "openssh-hurd.patch")) + (patches (search-patches "openssh-hurd.patch" + "openssh-fix-eof-command-not-found.patch")) (sha256 (base32 "091b3pxdlj47scxx6kkf4agkx8c8sdacdxx8m1dw1cby80pd40as")))) -- 2.29.2 --------------FF59E95C4AD2D5DA709B691A--