GNU bug report logs - #74659
Update guile-ssh to 0.18.0

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 74659 in the body.
You can then email your comments to 74659 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> debian.org>
To: guix-patches <at> gnu.org
Cc: Josselin Poiret <dev <at> jpoiret.xyz>,
 Simon Tournier <zimon.toutoune <at> gmail.com>, Mathieu Othacehe <othacehe <at> gnu.org>,
 Ludovic Courtès <ludo <at> gnu.org>,
 Tobias Geerinckx-Rice <me <at> tobias.gr>, Christopher Baines <guix <at> cbaines.net>,
 "Artyom V. Poptsov" <poptsov.artyom <at> gmail.com>
Subject: Update guile-ssh to 0.18.0
Date: Mon, 02 Dec 2024 15:57:00 -0800

[Message part 1 (text/plain, inline)]

The attached patch updates guile-ssh to 0.18.0.

This allows it to build successfully with libssh 0.11.x, which is not
yet in guix master but paves the way for an easier upgrade of libssh.

I have not yet tested all other dependents.

live well,
  vagrant

[0001-gnu-guile-ssh-Update-to-0.18.0.patch (text/x-diff, inline)]

From 1630e401c11aa956e459a5320951935e80602511 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant <at> debian.org>
Date: Mon, 2 Dec 2024 13:38:06 -0800
Subject: [PATCH] gnu: guile-ssh: Update to 0.18.0.

* gnu/packages/ssh.scm (guile-ssh): Update to 0.18.0.
[source]: Drop patch, fixed upstream.
* gnu/packages/patches/guile-ssh-rename-bool.patch: Remove patch.
* gnu/local.mk (dist_patch_DATA): Update with removed patch.
---
 gnu/local.mk                                  |  1 -
 .../patches/guile-ssh-rename-bool.patch       | 40 -------------------
 gnu/packages/ssh.scm                          |  5 +--
 3 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 gnu/packages/patches/guile-ssh-rename-bool.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 1b699af259a..25ba0e2bf02 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1511,7 +1511,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/guile-hurd-posix-spawn.patch		\
   %D%/packages/patches/guile-present-coding.patch		\
   %D%/packages/patches/guile-rsvg-pkgconfig.patch		\
-  %D%/packages/patches/guile-ssh-rename-bool.patch		\
   %D%/packages/patches/guile-emacs-fix-configure.patch		\
   %D%/packages/patches/gtk2-fix-builder-test.patch		\
   %D%/packages/patches/gtk2-harden-list-store.patch		\
diff --git a/gnu/packages/patches/guile-ssh-rename-bool.patch b/gnu/packages/patches/guile-ssh-rename-bool.patch
deleted file mode 100644
index 17697dacb22..00000000000
--- a/gnu/packages/patches/guile-ssh-rename-bool.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ad0af631250ce3399127d42995cc0bef6ad3ee5e Mon Sep 17 00:00:00 2001
-From: Herman Rimm <herman <at> rimm.ee>
-Date: Sun, 18 Aug 2024 16:05:44 +0200
-Subject: [PATCH] libguile-ssh/session-func: Fix variable name
-
-* libguile-ssh/session-func.c (set_bool_opt): Rename bool to boolean.
----
- libguile-ssh/session-func.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libguile-ssh/session-func.c b/libguile-ssh/session-func.c
-index 7006b62..b379472 100644
---- a/libguile-ssh/session-func.c
-+++ b/libguile-ssh/session-func.c
-@@ -228,18 +228,18 @@ set_int32_opt (ssh_session session, int type, SCM value)
-   return ssh_options_set (session, type, &c_value);
- }
- 
--/* Convert VALUE to integer that represents a boolan value (0
-+/* Convert VALUE to integer that represents a boolean value (0
-    considered as false, any other value is true), and pass it to
-    ssh_options_set */
- static inline int
- set_bool_opt (ssh_session session, int type, SCM value)
- {
--  int32_t bool;
-+  int32_t boolean;
- 
-   SCM_ASSERT (scm_is_bool (value), value, SCM_ARG3, "session-set!");
- 
--  bool = scm_to_bool (value);
--  return ssh_options_set (session, type, &bool);
-+  boolean = scm_to_bool (value);
-+  return ssh_options_set (session, type, &boolean);
- }
- 
- /* Convert VALUE to a socket file descriptor and pass it to
--- 
-2.45.2
-
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index a29a10e954b..0204d148cd5 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -327,7 +327,7 @@ (define-public openssh-sans-x
 (define-public guile-ssh
   (package
     (name "guile-ssh")
-    (version "0.17.0")
+    (version "0.18.0")
     (home-page "https://github.com/artyom-poptsov/guile-ssh")
     (source (origin
               (method git-fetch)
@@ -335,10 +335,9 @@ (define-public guile-ssh
                     (url home-page)
                     (commit (string-append "v" version))))
               (file-name (git-file-name name version))
-              (patches (search-patches "guile-ssh-rename-bool.patch"))
               (sha256
                (base32
-                "1lkhpgbzvh6i1sc4nmdc9rx9yzrdyjxxjb8x6nvq2zif8xy9y9vg"))))
+                "0zh1spkjl5q778y4rd6ml68fvz1r62xmk03khi4kp74z2rxgzcxb"))))
     (build-system gnu-build-system)
     (outputs '("out" "debug"))
     (arguments
-- 
2.39.5

[signature.asc (application/pgp-signature, inline)]

Message #8 received at 74659 <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> debian.org>
To: 74659 <at> debbugs.gnu.org
Cc: Josselin Poiret <dev <at> jpoiret.xyz>,
 Simon Tournier <zimon.toutoune <at> gmail.com>, Mathieu Othacehe <othacehe <at> gnu.org>,
 Ludovic Courtès <ludo <at> gnu.org>,
 Tobias Geerinckx-Rice <me <at> tobias.gr>, Christopher Baines <guix <at> cbaines.net>,
 "Artyom V. Poptsov" <poptsov.artyom <at> gmail.com>
Subject: Re: Update guile-ssh to 0.18.0
Date: Wed, 04 Dec 2024 14:37:50 -0800

[Message part 1 (text/plain, inline)]

On 2024-12-02, Vagrant Cascadian wrote:
> The attached patch updates guile-ssh to 0.18.0.
>
> This allows it to build successfully with libssh 0.11.x, which is not
> yet in guix master but paves the way for an easier upgrade of libssh.
>
> I have not yet tested all other dependents.

Well, successfully built with:

  $ guix build --dependents guile-ssh

  guix build: computing dependents of package guile-ssh <at> 0.18.0...
  /gnu/store/sj70asacssv90s6mws0fgddmnhwxrlz2-guile-ssh-0.18.0-debug
  /gnu/store/32np71imyihxy4gz05rgh6z6fwydlkhj-guile-ssh-0.18.0
  /gnu/store/5j9yl55b2sv168zgfhppm64f36qvnmw3-guix-daemon-1.4.0-27.1eead56
  /gnu/store/vv7779fqi9hpjarfqnvpnaygvzxf42af-guix-1.4.0-27.1eead56
  /gnu/store/a3ck4k0zspv6cfmmnfipqmgsidsgr0ix-swineherd-0.0.4
  /gnu/store/419yzjiw6xb0d398nbpajywizsiw5j4r-cuirass-1.2.0-11.e96f088
  /gnu/store/kn35cw1vgxq7xjnji7524gyik4yb84rk-emacs-guix-0.5.2-7.455272c
  /gnu/store/vxv5w7kshsnnr57grzyf38l7b5gdc964-guile-imanifest-0.0.0-0.ccd5a21
  /gnu/store/wqpak3mgkpg14zsil0w7px8v1gawphpr-cl-ospm-0.0.2
  /gnu/store/6vq5zhv4k5qvwilhq611dldwax38jkny-sbcl-ospm-0.0.2
  /gnu/store/1f2glzbg3zklxnwxppfldr5hsbi9nx42-gwl-0.5.1
  /gnu/store/p39p5rbwa5qvj42zxliwgwycr8x1qfzx-gwl-next-0.5.0-1.706a089
  /gnu/store/vfb6jgxsf8z9s174cf9w9zs7wm4ynx7c-guix-build-coordinator-0-111.037eac0
  /gnu/store/6f3sfd0dwyq7vg0psazi887j2bsks6bn-bffe-0-8.06bed47
  /gnu/store/3hks8wpbx15sfv4is13j6bqczmhrn8sp-guix-build-coordinator-agent-only-0-111.037eac0
  /gnu/store/ni0ycq5nw4nq9lwl59wv1rjmmin8pjm8-guix-modules-0.2.0
  /gnu/store/9x7wnx3w8cchx9wzzxmpsp7ch42qbid7-nar-herder-0-38.59d2b8a
  /gnu/store/x6fnm69z7mkp4w450mzjavv2fkm2wncy-guix-jupyter-0.3.0
  /gnu/store/qcajbkir23wa7lwzk5wnl0hm9zly85hh-guix-data-service-0.0.1-55.64aeeff
  /gnu/store/id9j8bn00krqr9jal2dkb0rw7ldqzbh9-hpcguix-web-0.4.1

Yay, guix build --dependents!


For good measure I also tried with libssh 0.11.1 applied too, and
guile-ssh still builds. Some other things fail(x2goclient), but may be
failing on master, so maybe no a regression?

live well,
  vagrant

[signature.asc (application/pgp-signature, inline)]

Message #11 received at 74659 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Vagrant Cascadian <vagrant <at> debian.org>
Cc: Josselin Poiret <dev <at> jpoiret.xyz>,
 Simon Tournier <zimon.toutoune <at> gmail.com>, Mathieu Othacehe <othacehe <at> gnu.org>,
 Tobias Geerinckx-Rice <me <at> tobias.gr>, 74659 <at> debbugs.gnu.org,
 Christopher Baines <guix <at> cbaines.net>,
 "Artyom V. Poptsov" <poptsov.artyom <at> gmail.com>
Subject: Re: bug#74659: Update guile-ssh to 0.18.0
Date: Sat, 07 Dec 2024 22:30:52 +0100

Hi,

Vagrant Cascadian <vagrant <at> debian.org> skribis:

> The attached patch updates guile-ssh to 0.18.0.
>
> This allows it to build successfully with libssh 0.11.x, which is not
> yet in guix master but paves the way for an easier upgrade of libssh.

Nice.

> From 1630e401c11aa956e459a5320951935e80602511 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <vagrant <at> debian.org>
> Date: Mon, 2 Dec 2024 13:38:06 -0800
> Subject: [PATCH] gnu: guile-ssh: Update to 0.18.0.
>
> * gnu/packages/ssh.scm (guile-ssh): Update to 0.18.0.
> [source]: Drop patch, fixed upstream.
> * gnu/packages/patches/guile-ssh-rename-bool.patch: Remove patch.
> * gnu/local.mk (dist_patch_DATA): Update with removed patch.

LGTM! :-)

Ludo’.

Message #16 received at 74659-done <at> debbugs.gnu.org (full text, mbox):

From: Vagrant Cascadian <vagrant <at> debian.org>
To: 74659-done <at> debbugs.gnu.org
Cc: Josselin Poiret <dev <at> jpoiret.xyz>,
 Simon Tournier <zimon.toutoune <at> gmail.com>,
 Vagrant Cascadian <vagrant <at> debian.org>, Mathieu Othacehe <othacehe <at> gnu.org>,
 Ludovic Courtès <ludo <at> gnu.org>,
 Tobias Geerinckx-Rice <me <at> tobias.gr>, Christopher Baines <guix <at> cbaines.net>,
 "Artyom V. Poptsov" <poptsov.artyom <at> gmail.com>
Subject: Re: bug#74659: Update guile-ssh to 0.18.0
Date: Mon, 09 Dec 2024 12:17:24 -0800

[Message part 1 (text/plain, inline)]

On 2024-12-07, Ludovic Courtès wrote:
> Vagrant Cascadian <vagrant <at> debian.org> skribis:
>
>> The attached patch updates guile-ssh to 0.18.0.
>>
>> This allows it to build successfully with libssh 0.11.x, which is not
>> yet in guix master but paves the way for an easier upgrade of libssh.
>
> Nice.
>
>> From 1630e401c11aa956e459a5320951935e80602511 Mon Sep 17 00:00:00 2001
>> From: Vagrant Cascadian <vagrant <at> debian.org>
>> Date: Mon, 2 Dec 2024 13:38:06 -0800
>> Subject: [PATCH] gnu: guile-ssh: Update to 0.18.0.
>>
>> * gnu/packages/ssh.scm (guile-ssh): Update to 0.18.0.
>> [source]: Drop patch, fixed upstream.
>> * gnu/packages/patches/guile-ssh-rename-bool.patch: Remove patch.
>> * gnu/local.mk (dist_patch_DATA): Update with removed patch.
>
> LGTM! :-)

Pushed as da3c8a963f83c044568d99921480259eaa26a923.

live well,
  vagrant

[signature.asc (application/pgp-signature, inline)]

Message #19 received at 74659-done <at> debbugs.gnu.org (full text, mbox):

From: "Artyom V. Poptsov" <poptsov.artyom <at> gmail.com>
To: Vagrant Cascadian <vagrant <at> debian.org>
Cc: 74659-done <at> debbugs.gnu.org, Josselin Poiret <dev <at> jpoiret.xyz>,
 Simon Tournier <zimon.toutoune <at> gmail.com>, Mathieu Othacehe <othacehe <at> gnu.org>,
 Ludovic Courtès <ludo <at> gnu.org>,
 Tobias Geerinckx-Rice <me <at> tobias.gr>, Christopher Baines <guix <at> cbaines.net>
Subject: Re: bug#74659: Update guile-ssh to 0.18.0
Date: Mon, 09 Dec 2024 23:24:59 +0300

[Message part 1 (text/plain, inline)]

Hello Vagrant!

Thanks for preparing and merging the patch!

If you notice any hiccups in Guix deploy/copy commands due to the
Guile-SSH update -- please let me know.

- avp

-- 
Artyom "avp" Poptsov <poptsov.artyom <at> gmail.com>
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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.