diff options
| author | Danny Milosavljevic <dannym@scratchpost.org> | 2021-02-11 19:12:36 +0100 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2021-02-11 19:12:36 +0100 |
| commit | abd318ff4b741eac11227778bf2e569ee7b186ff (patch) | |
| tree | 6abc09a3e01914d891124e9d0dda0f4e0979c485 /gnu/packages/ssh.scm | |
| parent | 71cb6dfe10540718eb337e7e2248fc809394894b (diff) | |
| parent | c5dc87fee840ad620b01637dc4f9ffa5efc9270c (diff) | |
| download | guix-patches-abd318ff4b741eac11227778bf2e569ee7b186ff.tar guix-patches-abd318ff4b741eac11227778bf2e569ee7b186ff.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/ssh.scm')
| -rw-r--r-- | gnu/packages/ssh.scm | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index d8a0d777ba..11ced03f81 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -505,13 +505,23 @@ responsive, especially over Wi-Fi, cellular, and long-distance links.") "https://matt.ucc.asn.au/dropbear/releases/" "dropbear-" version ".tar.bz2")) (sha256 - (base32 "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8")))) + (base32 "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "libtommath") + (delete-file-recursively "libtomcrypt") + (substitute* "configure" + (("-ltomcrypt") "-ltomcrypt -ltommath")) + #t)))) (build-system gnu-build-system) - (arguments `(#:tests? #f)) ; there is no "make check" or anything similar - ;; TODO: Investigate unbundling libtommath and libtomcrypt or at least - ;; cherry-picking important bug fixes from them. See <bugs.gnu.org/24674> - ;; for more information. - (inputs `(("zlib" ,zlib))) + (arguments + `(#:configure-flags '("--disable-bundled-libtom") + #:tests? #f)) ; there is no "make check" or anything similar + (inputs + `(("libtomcrypt" ,libtomcrypt) + ("libtommath" ,libtommath) + ("zlib" ,zlib))) (synopsis "Small SSH server and client") (description "Dropbear is a relatively small SSH server and client. It runs on a variety of POSIX-based platforms. Dropbear is |