#72988 [PATCH] guile-ssh: Update to 0.17.0 and use patch.

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

From: Herman Rimm <herman@rimm.ee>

To: guix-patches@gnu.org

Subject: [PATCH] guile-ssh: Update to 0.17.0 and use patch.

Date: Mon, 2 Sep 2024 21:13:01 +0200

* gnu/packages/ssh.scm (guile-ssh): Update to 0.17.0 and apply patch.
* gnu/packages/patches/guile-ssh-rename-bool.patch: Add file.
* gnu/local.mk (dist_patch_DATA): Register patch.
---
 gnu/local.mk                                  |  1 +
 .../patches/guile-ssh-rename-bool.patch       | 40 +++++++++++++++++++
 gnu/packages/ssh.scm                          |  5 ++-
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 gnu/packages/patches/guile-ssh-rename-bool.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index d674acd7ca..cb328a85cc 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1463,6 +1463,7 @@ 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
new file mode 100644
index 0000000000..17697dacb2
--- /dev/null
+++ b/gnu/packages/patches/guile-ssh-rename-bool.patch
@@ -0,0 +1,40 @@
+From ad0af631250ce3399127d42995cc0bef6ad3ee5e Mon Sep 17 00:00:00 2001
+From: Herman Rimm <herman@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 b45885ff87..237d731883 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -325,7 +325,7 @@ (define-public openssh-sans-x
 (define-public guile-ssh
   (package
     (name "guile-ssh")
-    (version "0.16.4")
+    (version "0.17.0")
     (home-page "https://github.com/artyom-poptsov/guile-ssh")
     (source (origin
               (method git-fetch)
@@ -333,9 +333,10 @@ (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
-                "127yhjaywais3h2g3cxhqmhdmqgxf9j1jwb6wzx92j0z7asrjqwr"))))
+                "1lkhpgbzvh6i1sc4nmdc9rx9yzrdyjxxjb8x6nvq2zif8xy9y9vg"))))
     (build-system gnu-build-system)
     (outputs '("out" "debug"))
     (arguments
-- 
2.45.2

Message #8 received at 72988@debbugs.gnu.org (full text, mbox, reply):

From: Ludovic Courtès <ludo@gnu.org>

To: Herman Rimm <herman@rimm.ee>, "Artyom V. Poptsov" <poptsov.artyom@gmail.com>

Cc: 72988@debbugs.gnu.org

Subject: Re: [bug#72988] [PATCH] guile-ssh: Update to 0.17.0 and use patch.

Date: Thu, 19 Sep 2024 17:48:53 +0200

Hey Artyom,

Herman Rimm <herman@rimm.ee> skribis:

> * gnu/packages/ssh.scm (guile-ssh): Update to 0.17.0 and apply patch.
> * gnu/packages/patches/guile-ssh-rename-bool.patch: Add file.
> * gnu/local.mk (dist_patch_DATA): Register patch.

I’ll let you handle this patch, given that you’re both upstream and
downstream now.  :-)

Cheers,
Ludo’.

Message #13 received at 72988-done@debbugs.gnu.org (full text, mbox, reply):

From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>

To: 72988-done@debbugs.gnu.org

Cc: Herman Rimm <herman@rimm.ee>, guix-patches@gnu.org

Subject: Re: [PATCH] guile-ssh: Update to 0.17.0 and use patch.

Date: Sun, 13 Oct 2024 12:29:10 +0300

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

Pushed to the "master" as 36c794c0ed058ee414cbb90c577f6ade5170470a.

Thanks!

- avp

-- 
Artyom "avp" Poptsov <poptsov.artyom@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)]

Send a report that this bug log contains spam.