mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-01-19 05:57:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

guile-ssh: Update to 0.17.0 and use patch.

Browse source 
* 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.

Signed-off-by: Artyom V. Poptsov <poptsov.artyom@gmail.com>
Change-Id: Iafb5630430ba122861b7e2fe2c76c84739b4e00f
This commit is contained in:
Herman Rimm 2024-09-02 21:13:01 +02:00 committed by Artyom V. Poptsov
parent e032a0f38f
commit 36c794c0ed
No known key found for this signature in database
GPG key ID: 935EBE0736DC857E
3 changed files with 44 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1503,6 +1503,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 \

40
gnu/packages/patches/guile-ssh-rename-bool.patch Normal file
View file

@ -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

5
gnu/packages/ssh.scm
View file

@ -326,7 +326,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)
@ -334,9 +334,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