diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-08-01 23:42:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-08-01 23:42:28 +0200 |
| commit | aa9780daf92131dc9ee19868f9621fd2be56ab78 (patch) | |
| tree | 39733db2ecad867c291d87d5d1cbf4e6de2eb845 /gnu/packages/patches/guile-ssh-channel-finalization.patch | |
| parent | 6484e82d4ce79b7b5ce72ecf77fb8d450eb0c401 (diff) | |
| parent | fc8f0631b4163d31a97fccb9a14201b5e861fa52 (diff) | |
| download | guix-aa9780daf92131dc9ee19868f9621fd2be56ab78.tar guix-aa9780daf92131dc9ee19868f9621fd2be56ab78.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/guile-ssh-channel-finalization.patch')
| -rw-r--r-- | gnu/packages/patches/guile-ssh-channel-finalization.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/gnu/packages/patches/guile-ssh-channel-finalization.patch b/gnu/packages/patches/guile-ssh-channel-finalization.patch deleted file mode 100644 index 54b5055a20..0000000000 --- a/gnu/packages/patches/guile-ssh-channel-finalization.patch +++ /dev/null @@ -1,28 +0,0 @@ -Avoid asynchronous channel finalization, which could lead to segfaults due to -libssh not being thread-safe: <https://bugs.gnu.org/26976>. - ---- guile-ssh-0.11.0/modules/ssh/dist/node.scm 2017-06-13 14:37:44.861671297 +0200 -+++ guile-ssh-0.11.0/modules/ssh/dist/node.scm 2017-06-13 14:38:02.841580565 +0200 -@@ -391,11 +391,18 @@ listens on an expected port, return #f o - "Evaluate QUOTED-EXP on the node and return the evaluated result." - (let ((repl-channel (node-open-rrepl node))) - (rrepl-skip-to-prompt repl-channel) -- (call-with-values (lambda () (rrepl-eval repl-channel quoted-exp)) -- (lambda vals -- (and (node-stop-repl-server? node) -+ (dynamic-wind -+ (const #t) -+ (lambda () -+ (rrepl-eval repl-channel quoted-exp)) -+ (lambda () -+ (when (node-stop-repl-server? node) - (node-stop-server node)) -- (apply values vals))))) -+ -+ ;; Close REPL-CHANNEL right away to prevent finalization from -+ ;; happening in another thread at the wrong time (see -+ ;; <https://bugs.gnu.org/26976>.) -+ (close-port repl-channel))))) - - (define (node-eval-1 node quoted-exp) - "Evaluate QUOTED-EXP on the node and return the evaluated result. The |