diff options
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 2434a563c2c..d53d8d59e76 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -132,7 +132,7 @@ file names. (define-public libssh (package (name "libssh") - (version "0.10.5") + (version "0.10.6") (source (origin (method url-fetch) (uri (string-append "https://www.libssh.org/files/" @@ -140,7 +140,7 @@ file names. "/libssh-" version ".tar.xz")) (sha256 (base32 - "0d22gq77ga24ijlgr3d1wvhfvprx61iklkb3npifxfb7ygvjy3mn")) + "1hcxvsb4brznxqq6cjwxkk7yv4c48w4fcwxwd8dp9wdnyncd8q8q")) (modules '((guix build utils))) (snippet ;; 'PATH_MAX' is undefined on GNU/Hurd; work around it. @@ -198,19 +198,25 @@ a server that supports the SSH-2 protocol.") (define-public openssh (package (name "openssh") - (version "9.4p1") + (version "9.6p1") (source (origin (method url-fetch) (uri (string-append "mirror://openbsd/OpenSSH/portable/" "openssh-" version ".tar.gz")) - (patches (search-patches "openssh-trust-guix-store-directory.patch")) + (patches (search-patches "openssh-trust-guix-store-directory.patch" + ;; Can be removed with next openssh update + ;; https://issues.guix.gnu.org/67948#2 + "openssh-gcc-13-ppc64le-fzero-call-used-regs.patch")) (sha256 - (base32 "11bahrik5qi337m954g5479f63cxnxdch076ng7668fvi28gs21n")))) + (base32 "0z3pgam8b4z05lvdb78iv06p204qwl7b94a3cnnwba2mfb0120li")))) (build-system gnu-build-system) (arguments (list #:test-target "tests" + ;; Not all of the tests can be run in parallel, see + ;; <https://marc.info/?l=openssh-unix-dev&m=170313565518842>. + #:parallel-tests? #f ;; Otherwise, the test scripts try to use a nonexistent directory and fail. #:make-flags #~(list "REGRESSTMP=\"$${BUILDDIR}/regress\"") @@ -321,7 +327,7 @@ Additionally, various channel-specific options can be negotiated.") (define-public guile-ssh (package (name "guile-ssh") - (version "0.16.3") + (version "0.16.4") (home-page "https://github.com/artyom-poptsov/guile-ssh") (source (origin (method git-fetch) @@ -331,7 +337,7 @@ Additionally, various channel-specific options can be negotiated.") (file-name (git-file-name name version)) (sha256 (base32 - "0b03aizjdj3g15xfkspgvy8k5jl8bgv4q7gwjwr3l2ibqkrm8vrz")))) + "127yhjaywais3h2g3cxhqmhdmqgxf9j1jwb6wzx92j0z7asrjqwr")))) (build-system gnu-build-system) (outputs '("out" "debug")) (arguments @@ -359,8 +365,7 @@ Additionally, various channel-specific options can be negotiated.") (parallel-job-count))) (substitute* (find-files "." "\\.scm$") (("\"libguile-ssh\"") - (string-append "\"" lib "/libguile-ssh\""))) - #t))) + (string-append "\"" lib "/libguile-ssh\"")))))) ,@(if (%current-target-system) '() '((add-before 'check 'fix-guile-path @@ -368,8 +373,7 @@ Additionally, various channel-specific options can be negotiated.") (let ((guile (assoc-ref inputs "guile"))) (substitute* "tests/common.scm" (("/usr/bin/guile") - (string-append guile "/bin/guile"))) - #t))))) + (string-append guile "/bin/guile")))))))) (add-after 'install 'remove-bin-directory (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -381,8 +385,7 @@ Additionally, various channel-specific options can be negotiated.") (string-append examples "/ssshd.scm")) (rename-file (string-append bin "/sssh.scm") (string-append examples "/sssh.scm")) - (delete-file-recursively bin) - #t)))))) + (delete-file-recursively bin))))))) (native-inputs (list autoconf automake libtool |