commit:     9742e9fe290313f661c2b8ab920608f624396a6c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  4 03:38:20 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 03:38:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9742e9fe

net-misc/mosh: add USE=nettle

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/mosh/metadata.xml                                        | 1 +
 net-misc/mosh/{mosh-1.4.0_rc1.ebuild => mosh-1.4.0_rc1-r1.ebuild} | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 065a0d495315..a93f5b0b0cb1 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -9,6 +9,7 @@
                <flag name="client">Build network client</flag>
                <flag name="examples">Include example scripts</flag>
                <flag name="mosh-hardening">Enable compiler and linker options 
to frustrate memory corruption exploits</flag>
+               <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>
                <flag name="server">Build network server</flag>
                <flag name="ufw">Install net-firewall/ufw rule set</flag>
                <flag name="utempter">Include libutempter support</flag>

diff --git a/net-misc/mosh/mosh-1.4.0_rc1.ebuild 
b/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild
similarity index 87%
rename from net-misc/mosh/mosh-1.4.0_rc1.ebuild
rename to net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild
index cc24a1f0f45c..529f1f845ff8 100644
--- a/net-misc/mosh/mosh-1.4.0_rc1.ebuild
+++ b/net-misc/mosh/mosh-1.4.0_rc1-r1.ebuild
@@ -17,14 +17,13 @@ SLOT="0"
 if [[ ${PV} != *_rc* ]] ; then
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc 
~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
-IUSE="+client examples +mosh-hardening +server syslog ufw +utempter"
+IUSE="+client examples +mosh-hardening nettle +server syslog ufw +utempter"
 
 REQUIRED_USE="
        || ( client server )
        examples? ( client )"
 
 RDEPEND="
-       dev-libs/openssl:=
        dev-libs/protobuf:=
        sys-libs/ncurses:=
        sys-libs/zlib
@@ -33,6 +32,8 @@ RDEPEND="
                dev-lang/perl
                dev-perl/IO-Tty
        )
+       !nettle? ( dev-libs/openssl:= )
+       nettle? ( dev-libs/nettle:= )
        utempter? (
                sys-libs/libutempter
        )"
@@ -67,6 +68,9 @@ src_configure() {
                $(use_enable mosh-hardening hardening)
                $(use_enable syslog)
                $(use_with utempter)
+
+               # We default to OpenSSL as upstream do
+               --with-crypto-library=$(usex nettle nettle 
openssl-with-openssl-ocb)
        )
 
        econf "${myeconfargs[@]}"

Reply via email to