From f72ff06ef8a83a78ad625fe50ee5bb618ea4f37c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Feb 2021 12:04:13 +0200 Subject: [PATCH] gnu: dropbear: Unbundle libraries. * gnu/packages/ssh.scm (dropbear)[source]: Add snippet to remove libtommath, libtomcrypt. [arguments]: Add configure-flag to not use bundled libraries. [inputs]: Add libtomcrypt, libtommath. --- gnu/packages/ssh.scm | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 04c8c6ceaa..c94631036b 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 - ;; 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