| 1 |
commit: 9742e9fe290313f661c2b8ab920608f624396a6c |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Aug 4 03:38:20 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 4 03:38:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9742e9fe |
| 7 |
|
| 8 |
net-misc/mosh: add USE=nettle |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
net-misc/mosh/metadata.xml | 1 + |
| 13 |
net-misc/mosh/{mosh-1.4.0_rc1.ebuild => mosh-1.4.0_rc1-r1.ebuild} | 8 ++++++-- |
| 14 |
2 files changed, 7 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml |
| 17 |
index 065a0d495315..a93f5b0b0cb1 100644 |
| 18 |
--- a/net-misc/mosh/metadata.xml |
| 19 |
+++ b/net-misc/mosh/metadata.xml |
| 20 |
@@ -9,6 +9,7 @@ |
| 21 |
<flag name="client">Build network client</flag> |
| 22 |
<flag name="examples">Include example scripts</flag> |
| 23 |
<flag name="mosh-hardening">Enable compiler and linker options to frustrate memory corruption exploits</flag> |
| 24 |
+ <flag name="nettle">Use <pkg>dev-libs/nettle</pkg> for some cryptographic functions instead of <pkg>dev-libs/openssl</pkg>. With Nettle, some of mosh's own code is used for OCB.</flag> |
| 25 |
<flag name="server">Build network server</flag> |
| 26 |
<flag name="ufw">Install net-firewall/ufw rule set</flag> |
| 27 |
<flag name="utempter">Include libutempter support</flag> |
| 28 |
|
| 29 |
diff --git a/net-misc/mosh/mosh-1.4.0_rc1.ebuild b/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild |
| 30 |
similarity index 87% |
| 31 |
rename from net-misc/mosh/mosh-1.4.0_rc1.ebuild |
| 32 |
rename to net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild |
| 33 |
index cc24a1f0f45c..529f1f845ff8 100644 |
| 34 |
--- a/net-misc/mosh/mosh-1.4.0_rc1.ebuild |
| 35 |
+++ b/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild |
| 36 |
@@ -17,14 +17,13 @@ SLOT="0" |
| 37 |
if [[ ${PV} != *_rc* ]] ; then |
| 38 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" |
| 39 |
fi |
| 40 |
-IUSE="+client examples +mosh-hardening +server syslog ufw +utempter" |
| 41 |
+IUSE="+client examples +mosh-hardening nettle +server syslog ufw +utempter" |
| 42 |
|
| 43 |
REQUIRED_USE=" |
| 44 |
|| ( client server ) |
| 45 |
examples? ( client )" |
| 46 |
|
| 47 |
RDEPEND=" |
| 48 |
- dev-libs/openssl:= |
| 49 |
dev-libs/protobuf:= |
| 50 |
sys-libs/ncurses:= |
| 51 |
sys-libs/zlib |
| 52 |
@@ -33,6 +32,8 @@ RDEPEND=" |
| 53 |
dev-lang/perl |
| 54 |
dev-perl/IO-Tty |
| 55 |
) |
| 56 |
+ !nettle? ( dev-libs/openssl:= ) |
| 57 |
+ nettle? ( dev-libs/nettle:= ) |
| 58 |
utempter? ( |
| 59 |
sys-libs/libutempter |
| 60 |
)" |
| 61 |
@@ -67,6 +68,9 @@ src_configure() { |
| 62 |
$(use_enable mosh-hardening hardening) |
| 63 |
$(use_enable syslog) |
| 64 |
$(use_with utempter) |
| 65 |
+ |
| 66 |
+ # We default to OpenSSL as upstream do |
| 67 |
+ --with-crypto-library=$(usex nettle nettle openssl-with-openssl-ocb) |
| 68 |
) |
| 69 |
|
| 70 |
econf "${myeconfargs[@]}" |
Archives