(address . guix-patches@gnu.org)
877c8hprjn.fsf@contorta
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
From 1630e401c11aa956e459a5320951935e80602511 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@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
Toggle diff (85 lines)
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@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
-----BEGIN PGP SIGNATURE-----
iHUEARYKAB0WIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCZ05JTQAKCRDcUY/If5cW
qp60AQCIVhV+clZsM434aFCgrvNJ9OtzN4aBatz7kr0WayNz4AD/UM/do9wxGC5D
YoVq28GPfNcKUKkAPgqbP98xekXtgQ4=
=y+pu
-----END PGP SIGNATURE-----