net-wireless/hostapd: make USE flag for Suite B

Suite B functionality in hostapd uses OpenSSL feature unavailable in
LibreSSL. So, enabling that functionality conflicts with using LibreSSL.

Before hostapd-2.9-r2 ebuild, Suite B was disabled.
hostapd-2.9-r2 ebuild has enablied Suite B was unconditionally.
This commit enables it based on suiteb USE flag, which is enabled by
default, and which is declared conflicting with libressl USE flag.

Bug: https://bugs.gentoo.org/710992
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Andrey Utkin <andrey_utkin@gentoo.org>

diff --git a/net-wireless/hostapd/hostapd-2.9-r2.ebuild b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
index 365c114a0165802d180767e7c5bf5e8ce85eeb2a..e14a5f1ff72a85e323fd56e2fca8a107a32a4787 100644 (file)
--- a/net-wireless/hostapd/hostapd-2.9-r2.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r2.ebuild
@@ -26,7 +26,10 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
+
+# suiteb impl uses openssl feature not available in libressl, see bug 710992
+REQUIRED_USE="?? ( libressl suiteb )"
 
 DEPEND="
        libressl? ( dev-libs/libressl:0= )
@@ -95,8 +98,11 @@ src_configure() {
        echo "CONFIG_SAE=y" >> ${CONFIG}
        echo "CONFIG_OWE=y" >> ${CONFIG}
        echo "CONFIG_DPP=y" >> ${CONFIG}
-       echo "CONFIG_SUITEB=y" >> ${CONFIG}
-       echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+
+       if use suiteb; then
+               echo "CONFIG_SUITEB=y" >> ${CONFIG}
+               echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+       fi
 
        if use internal-tls && ! use libressl; then
                echo "CONFIG_TLS=internal" >> ${CONFIG}

diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 6ab779890926a594a3df253e56b1dee3546d7efa..06ae239217e19f0a1f0cb26a0d0f2a74f5d0d0cb 100644 (file)
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -26,7 +26,10 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +wps +crda"
+IUSE="internal-tls ipv6 libressl logwatch netlink sqlite +suiteb +wps +crda"
+
+# suiteb impl uses openssl feature not available in libressl, see bug 710992
+REQUIRED_USE="?? ( libressl suiteb )"
 
 DEPEND="
        libressl? ( dev-libs/libressl:0= )
@@ -93,8 +96,11 @@ src_configure() {
        echo "CONFIG_SAE=y" >> ${CONFIG}
        echo "CONFIG_OWE=y" >> ${CONFIG}
        echo "CONFIG_DPP=y" >> ${CONFIG}
-       echo "CONFIG_SUITEB=y" >> ${CONFIG}
-       echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+
+       if use suiteb; then
+               echo "CONFIG_SUITEB=y" >> ${CONFIG}
+               echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+       fi
 
        if use internal-tls && ! use libressl; then
                echo "CONFIG_TLS=internal" >> ${CONFIG}

diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index b06f07f2352a71a09599d79617f2a9f3ab7a1e93..444076ebea2cf264c151501bb80a3b67636455de 100644 (file)
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -12,6 +12,7 @@
                <flag name="logwatch">Install support files for 
                        <pkg>sys-apps/logwatch</pkg></flag>
                <flag name="netlink">Adding support for using netlink to create VLANs</flag>
+               <flag name="suiteb">Adding support for NSA Suite B Cryptography</flag>
                <flag name="wps">Add support for Wi-Fi Protected Setup</flag>
        </use>
        <maintainer type="person">