commit: f24ef74b43a105f8b0ac8377db6526d4a05c2a36 Author: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org> AuthorDate: Tue Apr 21 22:01:28 2020 +0000 Commit: Andrey Utkin <andrey_utkin <AT> gentoo <DOT> org> CommitDate: Tue Apr 21 22:17:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24ef74b
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 <AT> gentoo.org> net-wireless/hostapd/hostapd-2.9-r2.ebuild | 12 +++++++++--- net-wireless/hostapd/hostapd-9999.ebuild | 12 +++++++++--- net-wireless/hostapd/metadata.xml | 1 + 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/net-wireless/hostapd/hostapd-2.9-r2.ebuild b/net-wireless/hostapd/hostapd-2.9-r2.ebuild index 365c114a016..e14a5f1ff72 100644 --- 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 6ab77989092..06ae239217e 100644 --- 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 b06f07f2352..444076ebea2 100644 --- 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">
