From patchwork Mon Jan 3 11:06:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 35910 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E3A9C27BBE9; Mon, 3 Jan 2022 11:07:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8573D27BBEA for ; Mon, 3 Jan 2022 11:07:11 +0000 (GMT) Received: from localhost ([::1]:60862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4LBG-0003lj-H0 for patchwork@mira.cbaines.net; Mon, 03 Jan 2022 06:07:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46800) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4LB8-0003j6-4D for guix-patches@gnu.org; Mon, 03 Jan 2022 06:07:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:50921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4LB7-0002EZ-R3 for guix-patches@gnu.org; Mon, 03 Jan 2022 06:07:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4LB7-0005Pm-NI for guix-patches@gnu.org; Mon, 03 Jan 2022 06:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52975] [PATCH] gnu: guile-ssh: Update to 0.15.0 Resent-From: poptsov.artyom@gmail.com (Artyom V. Poptsov) Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 03 Jan 2022 11:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52975 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52975@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164120800420782 (code B ref -1); Mon, 03 Jan 2022 11:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 3 Jan 2022 11:06:44 +0000 Received: from localhost ([127.0.0.1]:34234 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4LAk-0005P1-KS for submit@debbugs.gnu.org; Mon, 03 Jan 2022 06:06:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:33340) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4LAg-0005Oo-NG for submit@debbugs.gnu.org; Mon, 03 Jan 2022 06:06:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4LAg-00036Z-5m for guix-patches@gnu.org; Mon, 03 Jan 2022 06:06:34 -0500 Received: from [2a00:1450:4864:20::12d] (port=35646 helo=mail-lf1-x12d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4LAY-000211-SV for guix-patches@gnu.org; Mon, 03 Jan 2022 06:06:30 -0500 Received: by mail-lf1-x12d.google.com with SMTP id g11so74352643lfu.2 for ; Mon, 03 Jan 2022 03:06:26 -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=sHiyHVsZiM6iJsLIlhfRijrR59gDLkmHpy4Ee3opDjc=; b=SXxgV8rePHDzmCYfZvQqhdaRzT58g70agrhGKKqk3hLWNO5XWJm28SeA3E5qlNGHWL rS/V8eM8O5Oui4mUvhmOdAuGVvz1XJF4ZgO+DbXS6YL7SkpHHdLOCaVREXhUWV8nYB77 AEGOCC+UBCO5v1jd/tId/i8uyWCVXgsFwaRyaZtSIgELaTJTO8Wu4+FgFy5DFAEIeNn+ IHdZU62AjvEhKBRXkWKgibfuHgHoyP03/y1juw21tpQHfqb9oL1OhN+2e8qUbfvQofmF nOjsDxquT1D9JRH7yNr5NCA22AZBUzfYN2nUrD07jJ078fAy98NttMYo8Z9tK5QlntTK DbiA== 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=sHiyHVsZiM6iJsLIlhfRijrR59gDLkmHpy4Ee3opDjc=; b=GD3HPrpKcb21FMYZoJV6C8fvO0TkrK+qP5hUwlQXlm27oTNGOwWvvBfnE0LS7JaRi8 3xabtUDj6d/iFXFPz6Rq+YB1R2BHQAhiKL30vSrHDrB5TkRyIxmhpf2U2tuo+AC113Eh IcqApdn5oYh67j1wvRi6yPlPv7eHg3VEeyeVvBVuhFRE7gvUsXP1aZJQYKqU1lhaakw6 PoqjERtPcSls0+15iYeSykg0GE1PQfsk/6MFQ2T6Rs+PspSLL9tBd0c29MZAlEPT4eNU 7rZLZU/o66lLYPK3DHFi6p67OfJj5260MjgyQuUDOthdiv+qrf23NiZmZ7zPIzrXxOSC EhKg== X-Gm-Message-State: AOAM533RjjwyAL+cn4GXob8pqBUkrFO51pnbbkBmtvNwtc+g9WJU0qF0 L00dbER5Ar2DcE+KNzzWm6YrP6HpY/k= X-Google-Smtp-Source: ABdhPJySEtrTRmjhtwkgClNS8a/ZZjOA/3hGFE8tUk0BGaml1+5tJjs5G1JxUUbunWzdbihc0ffd8A== X-Received: by 2002:a05:6512:12c9:: with SMTP id p9mr29486388lfg.120.1641207984163; Mon, 03 Jan 2022 03:06:24 -0800 (PST) Received: from elephant ([5.166.207.112]) by smtp.gmail.com with ESMTPSA id p11sm3337257lfu.186.2022.01.03.03.06.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jan 2022 03:06:23 -0800 (PST) From: poptsov.artyom@gmail.com (Artyom V. Poptsov) Date: Mon, 03 Jan 2022 14:06:18 +0300 Message-ID: <87mtkd3wph.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::12d (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::12d; envelope-from=poptsov.artyom@gmail.com; helo=mail-lf1-x12d.google.com X-Spam_score_int: 6 X-Spam_score: 0.6 X-Spam_bar: / X-Spam_report: (0.6 / 5.0 requ) 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello, this patch updates Guile-SSH[1] to version 0.15.0. In Guile-SSH 0.15.0 I fixed libguile-ssh library version that I forgot to bump before the 0.14.0. Now the library version is properly bumped to "0:14:0" according to libtool rules. Also I removed a hidden build-time dependency on 'whereis' program from 'util-linux' package. Note that I haven't properly tested GNU Guix with the new release of Guile-SSH. As Guix itself uses Guile-SSH and my update may break something, please check if it works as expected before merging the update and report any bugs to me. - Artyom References: 1: https://github.com/artyom-poptsov/guile-ssh From 9417b4755dec780d851cefac858b99438958e7b4 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.15.0 * gnu/packages/ssh.scm (guile-ssh): Update to 0.15.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. * gnu/local.mk: Update. --- gnu/local.mk | 3 +- .../patches/guile-ssh-fix-test-suite.patch | 217 ------------------ .../patches/guile-ssh-read-error.patch | 18 -- gnu/packages/ssh.scm | 13 +- 4 files changed, 6 insertions(+), 245 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/local.mk b/gnu/local.mk index d63978f705..77590560b0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -47,6 +47,7 @@ # Copyright © 2021 Dmitry Polyakov # Copyright © 2021 Andrew Tropin # Copyright © 2021 Simon Tournier +# Copyright © 2022 Artyom V. Poptsov # # This file is part of GNU Guix. # @@ -1230,8 +1231,6 @@ dist_patch_DATA = \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ %D%/packages/patches/guile-email-fix-tests.patch \ - %D%/packages/patches/guile-ssh-fix-test-suite.patch \ - %D%/packages/patches/guile-ssh-read-error.patch \ %D%/packages/patches/gtk2-fix-builder-test.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ diff --git a/gnu/packages/patches/guile-ssh-fix-test-suite.patch b/gnu/packages/patches/guile-ssh-fix-test-suite.patch deleted file mode 100644 index dc10e08b0f..0000000000 --- a/gnu/packages/patches/guile-ssh-fix-test-suite.patch +++ /dev/null @@ -1,217 +0,0 @@ -From f7942cded8b65341916a555186e2219efe174cd0 Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Thu, 4 Feb 2021 14:38:25 -0500 -Subject: [PATCH] tests: Fix test suite for Guile 3.0.5. - -The test-runner object is now reset to #f when calling the 'test-end' -procedure. See the commit de5d1a7f99b8e952b115237ebc29633062f99bb9 in -Guile (srfi-64: Reset test-runner-current if done) which introduced this -change. - -* tests/client-server.scm (exit-status): New variable. Use it when calling -exit. -* tests/dist.scm: Likewise. -* tests/key.scm: Likewise. -* tests/log.scm: Likewise. -* tests/popen.scm: Likewise. -* tests/server-client.scm: Likewise. -* tests/server.scm: Likewise. -* tests/session.scm: Likewise. -* tests/shell.scm: Likewise. -* tests/sssh-ssshd.scm: Likewise. -* tests/tunnel.scm: Likewise. ---- - tests/client-server.scm | 4 +++- - tests/dist.scm | 4 +++- - tests/key.scm | 3 ++- - tests/log.scm | 5 ++++- - tests/popen.scm | 4 +++- - tests/server-client.scm | 4 +++- - tests/server.scm | 4 +++- - tests/session.scm | 4 +++- - tests/shell.scm | 3 ++- - tests/sssh-ssshd.scm | 4 +++- - tests/tunnel.scm | 4 +++- - 11 files changed, 32 insertions(+), 11 deletions(-) - -diff --git a/tests/client-server.scm b/tests/client-server.scm -index 432a48c..fc46140 100644 ---- a/tests/client-server.scm -+++ b/tests/client-server.scm -@@ -743,8 +743,10 @@ - - ;;; - -+(define exit-status (test-runner-fail-count (test-runner-current))) -+ - (test-end "client-server") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; client-server.scm ends here. -diff --git a/tests/dist.scm b/tests/dist.scm -index 2a3a75f..79f9e23 100644 ---- a/tests/dist.scm -+++ b/tests/dist.scm -@@ -269,8 +269,10 @@ $4 = #@#:22 (disconnected) 453fff>" - ;;; - - -+(define exit-status (test-runner-fail-count (test-runner-current))) -+ - (test-end "dist") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; dist.scm ends here. -diff --git a/tests/key.scm b/tests/key.scm -index be31378..e1678f4 100644 ---- a/tests/key.scm -+++ b/tests/key.scm -@@ -170,9 +170,10 @@ - (eq? (get-key-type key) 'ecdsa-p256))))))) - - ;;; -+(define exit-status (test-runner-fail-count (test-runner-current))) - - (test-end "key") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; key.scm ends here. -diff --git a/tests/log.scm b/tests/log.scm -index f547202..d528251 100644 ---- a/tests/log.scm -+++ b/tests/log.scm -@@ -64,8 +64,11 @@ - (get-log-verbosity)) - - -+(define exit-status (test-runner-fail-count (test-runner-current))) -+ - (test-end "log") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) -+ - - ;;; log.scm ends here -diff --git a/tests/popen.scm b/tests/popen.scm -index e063e0b..fe77108 100644 ---- a/tests/popen.scm -+++ b/tests/popen.scm -@@ -129,8 +129,10 @@ - (format-log/scm 'nolog "open-remote-output-pipe" "channel: ~A" channel) - (output-only? channel))))))) - -+(define exit-status (test-runner-fail-count (test-runner-current))) -+ - (test-end "popen") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; popen.scm ends here. -diff --git a/tests/server-client.scm b/tests/server-client.scm -index 920aa22..b6ed3eb 100644 ---- a/tests/server-client.scm -+++ b/tests/server-client.scm -@@ -148,8 +148,10 @@ - (equal? x session)))))) - - -+(define exit-status (test-runner-fail-count (test-runner-current))) -+ - (test-end "server-client") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; server-client.scm ends here. -diff --git a/tests/server.scm b/tests/server.scm -index c7f8b6c..1a6daea 100644 ---- a/tests/server.scm -+++ b/tests/server.scm -@@ -157,9 +157,11 @@ - (server-listen server) - #t)) - -+(define exit-status (test-runner-fail-count (test-runner-current))) -+ - (test-end "server") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; server.scm ends here. - -diff --git a/tests/session.scm b/tests/session.scm -index 8caa039..7310647 100644 ---- a/tests/session.scm -+++ b/tests/session.scm -@@ -210,8 +210,10 @@ - (let ((session (%make-session))) - (not (connected? session)))) - -+(define exit-status (test-runner-fail-count (test-runner-current))) -+ - (test-end "session") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; session.scm ends here. -diff --git a/tests/shell.scm b/tests/shell.scm -index 7d613fb..e36e661 100644 ---- a/tests/shell.scm -+++ b/tests/shell.scm -@@ -113,9 +113,10 @@ - - - ;;; -+(define exit-status (test-runner-fail-count (test-runner-current))) - - (test-end "shell") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; shell.scm ends here. -diff --git a/tests/sssh-ssshd.scm b/tests/sssh-ssshd.scm -index 2fe23db..edb53fc 100644 ---- a/tests/sssh-ssshd.scm -+++ b/tests/sssh-ssshd.scm -@@ -118,8 +118,10 @@ - result))) - - -+(define exit-status (test-runner-fail-count (test-runner-current))) -+ - (test-end "sssh-ssshd") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; sssh-ssshd.scm ends here. -diff --git a/tests/tunnel.scm b/tests/tunnel.scm -index ef5a568..d6453b7 100644 ---- a/tests/tunnel.scm -+++ b/tests/tunnel.scm -@@ -191,8 +191,10 @@ - (= pnum portnum))) - (eq? (channel-cancel-forward session "localhost" portnum) 'ok)))))))) - -+(define exit-status (test-runner-fail-count (test-runner-current))) -+ - (test-end "tunnel") - --(exit (= (test-runner-fail-count (test-runner-current)) 0)) -+(exit (= 0 exit-status)) - - ;;; tunnel.scm ends here. --- -2.30.0 - 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 --- a/gnu/packages/patches/guile-ssh-read-error.patch +++ /dev/null @@ -1,18 +0,0 @@ -This patch adjusts to slightly different 'read-error' in Guile 3.0.6 -compared to earlier versions: - - https://github.com/artyom-poptsov/guile-ssh/issues/28 - ---- a/tests/dist.scm -+++ b/tests/dist.scm -@@ -183,8 +183,8 @@ Unbound variable: e" - rrepl-get-result)) - - (test-error-with-log/= "rrepl-get-result, unknown # object error" -- 'node-repl-error "Reader error: scm_lreadr: #:1:3: \ --Unknown # object: (#\\<): scheme@(guile-user)> \ -+ 'node-repl-error "Reader error: #f: #:1:3: \ -+Unknown # object: (\"#<\"): scheme@(guile-user)> \ - $4 = #@#:22 (disconnected) 453fff>" - (call-with-input-string - (string-append "scheme@(guile-user)> $4 = " diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index ae64e99948..5d22d8ba1e 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2020 Oleg Pykhalov ;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2021 Brice Waegeneire +;;; Copyright © 2022 Artyom V. Poptsov ;;; ;;; This file is part of GNU Guix. ;;; @@ -308,7 +309,7 @@ Additionally, various channel-specific options can be negotiated.") (define-public guile-ssh (package (name "guile-ssh") - (version "0.13.1") + (version "0.15.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 negotiated.") (file-name (git-file-name name version)) (sha256 (base32 - "1xpxkvgj7wgcl450djkcrmrf957mcy2f36hfs5g6kpla1gax2d1g")) - (patches (search-patches "guile-ssh-fix-test-suite.patch" - "guile-ssh-read-error.patch")))) + "179l6nl25r28w5h2g5qsxc0ppvj2fwk5j57165mjrz5ma91vghbm")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments @@ -385,8 +384,7 @@ libssh library.") (inherit guile-ssh) (name "guile2.0-ssh") (source (origin - (inherit (package-source guile-ssh)) - (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 +398,7 @@ libssh library.") (inherit guile-ssh) (name "guile2.2-ssh") (source (origin - (inherit (package-source guile-ssh)) - (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") -- 2.25.1