diff options
| author | Herman Rimm <herman@rimm.ee> | 2024-09-02 21:13:01 +0200 |
|---|---|---|
| committer | Guix Patches Tester <> | 2024-09-02 22:11:22 +0200 |
| commit | 4a853055f3282ca6bbee336d8a967599a4a0401c (patch) | |
| tree | cef1d5a79bc1a9816ef73aad16749d5b17e9afdd | |
| parent | 778dd796bff808f1f8520533bab239ecbe83cd87 (diff) | |
| download | guix-patches-issue-72988.tar guix-patches-issue-72988.tar.gz | |
guile-ssh: Update to 0.17.0 and use patch.issue-72988
* 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.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/patches/guile-ssh-rename-bool.patch | 40 | ||||
| -rw-r--r-- | gnu/packages/ssh.scm | 5 |
3 files changed, 44 insertions, 2 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 0c4ab96bf3..f410815806 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1494,6 +1494,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 9d3fe1f40a..47c2c5aada 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -326,7 +326,7 @@ Additionally, various channel-specific options can be negotiated.") (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 @@ Additionally, various channel-specific options can be negotiated.") (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 |