From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gESkIwd4w2HxFAAAgWs5BA (envelope-from ) for ; Wed, 22 Dec 2021 20:09:59 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id AL5KHwd4w2HgdgAAbx9fmQ (envelope-from ) for ; Wed, 22 Dec 2021 19:09:59 +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 1FF99FB05 for ; Wed, 22 Dec 2021 20:09:59 +0100 (CET) Received: from localhost ([::1]:41240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n06zs-0000zH-MK for larch@yhetil.org; Wed, 22 Dec 2021 14:09:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n06z0-0000wo-9B for guix-patches@gnu.org; Wed, 22 Dec 2021 14:09:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n06yz-0006tP-Vu for guix-patches@gnu.org; Wed, 22 Dec 2021 14:09:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n06yz-0005jc-OX for guix-patches@gnu.org; Wed, 22 Dec 2021 14:09:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52739] gnu: guile-ssh: Update to 0.14.0 Resent-From: poptsov.artyom@gmail.com (Artyom V. Poptsov) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Dec 2021 19:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52739 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 52739@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164020011422007 (code B ref -1); Wed, 22 Dec 2021 19:09:01 +0000 Received: (at submit) by debbugs.gnu.org; 22 Dec 2021 19:08:34 +0000 Received: from localhost ([127.0.0.1]:59744 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n06yV-0005io-BY for submit@debbugs.gnu.org; Wed, 22 Dec 2021 14:08:34 -0500 Received: from lists.gnu.org ([209.51.188.17]:42146) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n06yS-0005ig-VC for submit@debbugs.gnu.org; Wed, 22 Dec 2021 14:08:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:49110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n06yR-0000Q7-T4 for guix-patches@gnu.org; Wed, 22 Dec 2021 14:08:27 -0500 Received: from [2a00:1450:4864:20::229] (port=39930 helo=mail-lj1-x229.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n06yP-0006q8-D4 for guix-patches@gnu.org; Wed, 22 Dec 2021 14:08:27 -0500 Received: by mail-lj1-x229.google.com with SMTP id m12so5330836ljj.6 for ; Wed, 22 Dec 2021 11:08:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:user-agent:mime-version; bh=B3+f4ZlZmYfJvNONcJvl85Dy7XUWCbQaWd1oIlS7YKw=; b=PZPWcipPGecdMI33DoAAwjqTtj197VK7/WtDSgfwo4PpUkQnaKzxWnpCNYY4okLMg8 LVH2AEmdc0zEraMpbydTb05YCah6HVNwB0DrAt8oDbUTLrfP9ZW23FRs/NRKccEb6Ov9 64Towf8nBiTLsvcdz/uvXh/hYsCiy4We674ybdpL2y6xg8kO7UMOC7PoQUn8IS70c+gW 5h7+Ovq7OnzYob9M5Rp60pcrsShJ0e9VfBj+PMchGMtBTtcz/sGQNUncae95tiA3gCbr RSueMnLOZykK4Unslb3uJKDAZzauSEXLtIdWavF+ew3YI9MFeQU2k/UJsSh9pBMOLuYk uoBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:user-agent :mime-version; bh=B3+f4ZlZmYfJvNONcJvl85Dy7XUWCbQaWd1oIlS7YKw=; b=WMxEZyKHzFaJLAFs7WhKgQAr2P64eCu808gNHp1EfMwAxcIYiWuarl+CLoDoxfHIdV S5+fK154gNDkPNabAy6t0vgz3O8C4AWHoB0aToSuxodU3qdKjp5Zj+x1exYi694UDx5w P2HEUKGaC82broMpx+u0wd8dgoFPU9NkEiIVfeBAHUk16XeS8p7c+nxXTk0FB0hIgI3X 1je9hvPFc0X7+bMb7oasqxoqmLmEtNl0JKo3M5RVmHe7qxzVFtCdGthapyxDdLy0hWFh B3x94OUE0q2gf/y6eDceEgGRo+qrMNZ+kp8ycnMtiKpB7u5iD+vKC4Myh5FhgKKH0E44 VNCw== X-Gm-Message-State: AOAM531N/4LSYW6/PGOPibjqaeoZIjfoEiz3lDCdUANayDsmFKAE1JuO OJh551KX1l9Qi+rkIsBmZ/y1RiY189A= X-Google-Smtp-Source: ABdhPJxCf/cSh4QGaHRjAYGaj/1wwD+Fn0FfAHZbW3nAblnlbShMeSwU1Ha7+jrtT0ap8lBfxd49Sw== X-Received: by 2002:a2e:e1a:: with SMTP id 26mr3010310ljo.199.1640200102891; Wed, 22 Dec 2021 11:08:22 -0800 (PST) Received: from elephant ([5.164.193.196]) by smtp.gmail.com with ESMTPSA id br37sm290742lfb.99.2021.12.22.11.08.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Dec 2021 11:08:22 -0800 (PST) From: poptsov.artyom@gmail.com (Artyom V. Poptsov) Date: Wed, 22 Dec 2021 22:08:18 +0300 Message-ID: <87fsqk5ufx.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::229 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::229; envelope-from=poptsov.artyom@gmail.com; helo=mail-lj1-x229.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640200199; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=QaRcAZ/JuUx3WBZ2z3GmURJyrUQ2zbLsZ44lQXl0wDI=; b=CStyTCNkDK0Ffns0Ci9541COsvWbOUEHdhxUgcJiUdgs0R6bumKAuH4ZdhtAOhvZKMkhH5 Lo/2RQ+rExgyD6FKc+3tVBJgQS5xsTn3bKyO+l6Ra1J7wsYa206H4Z9u1mVb9armd4nDlS OoYtzskKrWJMW3fRXvm1YW4mwlcXHEUHJ/+rb2XGzeRJapbb+3lZoSHgGAVk3MeWWCyc08 6aiZIcPIfKxPxwvoNZku1J7Hg9m+X43tO5zMSUwHnDkaN7otySy3J8VqNqu1CBpaUK1aY6 9zmE/aqbhtLtH8bApinHKIVuSHlqNJzQ7yXl1rQK2SvepwWTH0Bp23hCX2H43A== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640200199; a=rsa-sha256; cv=none; b=rTVZ7zL5irciW74qjBiShpC/MLKrBW86Oqs56SrZEtWP3SvTH4Xr3mlyWNK/5CA2UjoNNf NfzqgaPJ241U3bSjwkwnyauwlXd6+2otU4MZXRJsVwzC0MB7Au6+OGHh3u1lCUkJn2lvmP zNRM5cI+dyEF3BKxe/VwcDQKYvTfJQ7UYtPWSa6j6Ji7ivHmXbtao2Dg2u0RrpalWB4fya Wb+WXTkPr3Lu2yO2FKX6JIDtvAmFR5Ink6Cw1jGTDhzQd50zhbUahx9OorCKxwf9buOB8o ay3u2tsfdoM5YZRGQmWB6AievNKbGyeaIS8IGR393hkPxrbDh+S7tj3gqMhMKw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=PZPWcipP; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -4.74 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=gmail.com header.s=20210112 header.b=PZPWcipP; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 1FF99FB05 X-Spam-Score: -4.74 X-Migadu-Scanner: scn0.migadu.com X-TUID: 0gl6+YseAkRw --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain Hello, this patch updates Guile-SSH[1] to version 0.14.0. - Artyom References: 1: https://github.com/artyom-poptsov/guile-ssh --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename=0001-gnu-guile-ssh-Update-to-0.14.0.patch Content-Transfer-Encoding: quoted-printable From=202a30fcbf55f8d099187c825774748ae7a2d0b82b Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Wed, 22 Dec 2021 22:03:24 +0300 Subject: [PATCH] gnu: guile-ssh: Update to 0.14.0 * gnu/packages/ssh.scm (guile-ssh): Update to 0.14.0. (guile2.0-ssh, guile2.2-ssh): Likewise. * gnu/packages/patches/guile-ssh-fix-test-suite.patch, gnu/packages/patches/guile-ssh-read-error.patch: Remove. =2D-- .../patches/guile-ssh-fix-test-suite.patch | 217 ------------------ .../patches/guile-ssh-read-error.patch | 18 -- gnu/packages/ssh.scm | 19 +- 3 files changed, 11 insertions(+), 243 deletions(-) delete mode 100644 gnu/packages/patches/guile-ssh-fix-test-suite.patch delete mode 100644 gnu/packages/patches/guile-ssh-read-error.patch diff --git a/gnu/packages/patches/guile-ssh-fix-test-suite.patch b/gnu/pack= ages/patches/guile-ssh-fix-test-suite.patch deleted file mode 100644 index dc10e08b0f..0000000000 =2D-- a/gnu/packages/patches/guile-ssh-fix-test-suite.patch +++ /dev/null @@ -1,217 +0,0 @@ =2DFrom f7942cded8b65341916a555186e2219efe174cd0 Mon Sep 17 00:00:00 2001 =2DFrom: Maxim Cournoyer =2DDate: Thu, 4 Feb 2021 14:38:25 -0500 =2DSubject: [PATCH] tests: Fix test suite for Guile 3.0.5. =2D =2DThe test-runner object is now reset to #f when calling the 'test-end' =2Dprocedure. See the commit de5d1a7f99b8e952b115237ebc29633062f99bb9 in =2DGuile (srfi-64: Reset test-runner-current if done) which introduced this =2Dchange. =2D =2D* tests/client-server.scm (exit-status): New variable. Use it when call= ing =2Dexit. =2D* tests/dist.scm: Likewise. =2D* tests/key.scm: Likewise. =2D* tests/log.scm: Likewise. =2D* tests/popen.scm: Likewise. =2D* tests/server-client.scm: Likewise. =2D* tests/server.scm: Likewise. =2D* tests/session.scm: Likewise. =2D* tests/shell.scm: Likewise. =2D* tests/sssh-ssshd.scm: Likewise. =2D* tests/tunnel.scm: Likewise. =2D--- =2D tests/client-server.scm | 4 +++- =2D tests/dist.scm | 4 +++- =2D tests/key.scm | 3 ++- =2D tests/log.scm | 5 ++++- =2D tests/popen.scm | 4 +++- =2D tests/server-client.scm | 4 +++- =2D tests/server.scm | 4 +++- =2D tests/session.scm | 4 +++- =2D tests/shell.scm | 3 ++- =2D tests/sssh-ssshd.scm | 4 +++- =2D tests/tunnel.scm | 4 +++- =2D 11 files changed, 32 insertions(+), 11 deletions(-) =2D =2Ddiff --git a/tests/client-server.scm b/tests/client-server.scm =2Dindex 432a48c..fc46140 100644 =2D--- a/tests/client-server.scm =2D+++ b/tests/client-server.scm =2D@@ -743,8 +743,10 @@ =2D =2D ;;; =2D=20 =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D+ =2D (test-end "client-server") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; client-server.scm ends here. =2Ddiff --git a/tests/dist.scm b/tests/dist.scm =2Dindex 2a3a75f..79f9e23 100644 =2D--- a/tests/dist.scm =2D+++ b/tests/dist.scm =2D@@ -269,8 +269,10 @@ $4 =3D #@#:22 (disc= onnected) 453fff>" =2D ;;; =2D=20 =2D =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D+ =2D (test-end "dist") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; dist.scm ends here. =2Ddiff --git a/tests/key.scm b/tests/key.scm =2Dindex be31378..e1678f4 100644 =2D--- a/tests/key.scm =2D+++ b/tests/key.scm =2D@@ -170,9 +170,10 @@ =2D (eq? (get-key-type key) 'ecdsa-p256))))))) =2D=20 =2D ;;; =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D=20 =2D (test-end "key") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; key.scm ends here. =2Ddiff --git a/tests/log.scm b/tests/log.scm =2Dindex f547202..d528251 100644 =2D--- a/tests/log.scm =2D+++ b/tests/log.scm =2D@@ -64,8 +64,11 @@ =2D (get-log-verbosity)) =2D=20 =2D =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D+ =2D (test-end "log") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D+ =2D=20 =2D ;;; log.scm ends here =2Ddiff --git a/tests/popen.scm b/tests/popen.scm =2Dindex e063e0b..fe77108 100644 =2D--- a/tests/popen.scm =2D+++ b/tests/popen.scm =2D@@ -129,8 +129,10 @@ =2D (format-log/scm 'nolog "open-remote-output-pipe" "channel: ~= A" channel) =2D (output-only? channel))))))) =2D=20 =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D+ =2D (test-end "popen") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; popen.scm ends here. =2Ddiff --git a/tests/server-client.scm b/tests/server-client.scm =2Dindex 920aa22..b6ed3eb 100644 =2D--- a/tests/server-client.scm =2D+++ b/tests/server-client.scm =2D@@ -148,8 +148,10 @@ =2D (equal? x session)))))) =2D=20 =2D =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D+ =2D (test-end "server-client") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; server-client.scm ends here. =2Ddiff --git a/tests/server.scm b/tests/server.scm =2Dindex c7f8b6c..1a6daea 100644 =2D--- a/tests/server.scm =2D+++ b/tests/server.scm =2D@@ -157,9 +157,11 @@ =2D (server-listen server) =2D #t)) =2D=20 =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D+ =2D (test-end "server") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; server.scm ends here. =2D=20 =2Ddiff --git a/tests/session.scm b/tests/session.scm =2Dindex 8caa039..7310647 100644 =2D--- a/tests/session.scm =2D+++ b/tests/session.scm =2D@@ -210,8 +210,10 @@ =2D (let ((session (%make-session))) =2D (not (connected? session)))) =2D=20 =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D+ =2D (test-end "session") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; session.scm ends here. =2Ddiff --git a/tests/shell.scm b/tests/shell.scm =2Dindex 7d613fb..e36e661 100644 =2D--- a/tests/shell.scm =2D+++ b/tests/shell.scm =2D@@ -113,9 +113,10 @@ =2D=20 =2D =2D ;;; =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D=20 =2D (test-end "shell") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; shell.scm ends here. =2Ddiff --git a/tests/sssh-ssshd.scm b/tests/sssh-ssshd.scm =2Dindex 2fe23db..edb53fc 100644 =2D--- a/tests/sssh-ssshd.scm =2D+++ b/tests/sssh-ssshd.scm =2D@@ -118,8 +118,10 @@ =2D result))) =2D=20 =2D =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D+ =2D (test-end "sssh-ssshd") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; sssh-ssshd.scm ends here. =2Ddiff --git a/tests/tunnel.scm b/tests/tunnel.scm =2Dindex ef5a568..d6453b7 100644 =2D--- a/tests/tunnel.scm =2D+++ b/tests/tunnel.scm =2D@@ -191,8 +191,10 @@ =2D (=3D pnum portnum))) =2D (eq? (channel-cancel-forward session "localhost" portnum) 'o= k)))))))) =2D=20 =2D+(define exit-status (test-runner-fail-count (test-runner-current))) =2D+ =2D (test-end "tunnel") =2D=20 =2D-(exit (=3D (test-runner-fail-count (test-runner-current)) 0)) =2D+(exit (=3D 0 exit-status)) =2D=20 =2D ;;; tunnel.scm ends here. =2D--=20 =2D2.30.0 =2D diff --git a/gnu/packages/patches/guile-ssh-read-error.patch b/gnu/packages= /patches/guile-ssh-read-error.patch deleted file mode 100644 index 9cc6b048a0..0000000000 =2D-- a/gnu/packages/patches/guile-ssh-read-error.patch +++ /dev/null @@ -1,18 +0,0 @@ =2DThis patch adjusts to slightly different 'read-error' in Guile 3.0.6 =2Dcompared to earlier versions: =2D =2D https://github.com/artyom-poptsov/guile-ssh/issues/28 =2D =2D--- a/tests/dist.scm =2D+++ b/tests/dist.scm =2D@@ -183,8 +183,8 @@ Unbound variable: e" =2D rrepl-get-result)) =2D=20 =2D (test-error-with-log/=3D "rrepl-get-result, unknown # object error" =2D- 'node-repl-error "Reader error: scm_lreadr: #:1:3: \ =2D-Unknown # object: (#\\<): scheme@(guile-user)> \ =2D+ 'node-repl-error "Reader error: #f: #:1:3: \ =2D+Unknown # object: (\"#<\"): scheme@(guile-user)> \ =2D $4 =3D #@#:22 (disconnected) 453fff>" =2D (call-with-input-string =2D (string-append "scheme@(guile-user)> $4 =3D " diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ae64e99948..cb789078ec 100644 =2D-- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -17,6 +17,7 @@ ;;; Copyright =C2=A9 2020 Oleg Pykhalov ;;; Copyright =C2=A9 2020, 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2021 Brice Waegeneire +;;; Copyright =C2=A9 2021 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -308,7 +309,7 @@ Additionally, various channel-specific options can be n= egotiated.") (define-public guile-ssh (package (name "guile-ssh") =2D (version "0.13.1") + (version "0.14.0") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -318,9 +319,7 @@ Additionally, various channel-specific options can be n= egotiated.") (file-name (git-file-name name version)) (sha256 (base32 =2D "1xpxkvgj7wgcl450djkcrmrf957mcy2f36hfs5g6kpla1gax2d1g")) =2D (patches (search-patches "guile-ssh-fix-test-suite.patch" =2D "guile-ssh-read-error.patch")))) + "17fh9xw3byh684bb4n9vdgd03rxqflbgk9xb5a4x4rblz8lf4zd4")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments @@ -328,6 +327,12 @@ Additionally, various channel-specific options can be = negotiated.") #:configure-flags '("--disable-static") =20 #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs outputs #:allow-other-keys) + (substitute* "build-aux/am/snarf" + (("\\$\\(shell whereis guile-snarf \\| cut -d' ' -= f2\\)") + (format #f "~a/bin/guile-snarf" + (assoc-ref inputs "guile")))))) (add-before 'build 'fix-libguile-ssh-file-name (lambda* (#:key outputs #:allow-other-keys) ;; Build and install libguile-ssh.so so that we can = use @@ -385,8 +390,7 @@ libssh library.") (inherit guile-ssh) (name "guile2.0-ssh") (source (origin =2D (inherit (package-source guile-ssh)) =2D (patches (search-patches "guile-ssh-fix-test-suite.patch")= ))) + (inherit (package-source guile-ssh)))) (native-inputs (modify-inputs (package-native-inputs guile-ssh) (delete "guile") @@ -400,8 +404,7 @@ libssh library.") (inherit guile-ssh) (name "guile2.2-ssh") (source (origin =2D (inherit (package-source guile-ssh)) =2D (patches (search-patches "guile-ssh-fix-test-suite.patch")= ))) + (inherit (package-source guile-ssh)))) (native-inputs (modify-inputs (package-native-inputs guile-ssh) (delete "guile") =2D-=20 2.25.1 --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable =2D-=20 Artyom "avp" Poptsov Home page: https://memory-heap.org/~avp/ CADR Hackerspace co-founder: https://cadrspace.ru/ GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmHDd6IACgkQ6cWi2QiY oC/JGgf/U94JIG0iHlsXxXCPq6+ysSvCcSiGlvEn1ktEELesZz9DQn+oZQ0BPhIM pqTwyUxeiElzAxFtGtEbE6zz9IYXZUd58w/YQPm2nslpmfWVkNG26SFyrvv6rVHU IOd/DzQts3OTjeuQjZaSppI7yOS1e6o17ZPMvnqpt2K/XtpEZQHLZ5vgUvz5hMcU 6msfqvnQqAGnrFgsjCjBeedalOzOUj2jVMEi6Pw/4b5Efp0BCFC65hPO2fivVbwo LbZaeEGFpiwq1/PMbjESmlLpocostCyQVz2mlGXm/MqwNBH0wgRuqwMQOaIq9SBi tDsK7FwMuy9+QzeJPOfpTuMBXX2GHw== =0I7o -----END PGP SIGNATURE----- --==-=-=--