commit: 6aad0c80f854a56147acceb4574d7f5f85cbd12b Author: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> AuthorDate: Sun May 2 23:56:01 2021 +0000 Commit: Quentin Retornaz <gentoo <AT> retornaz <DOT> com> CommitDate: Sun May 2 23:56:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=6aad0c80
net-wireless/hostapd: remove libressl USE flag Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com> net-wireless/hostapd/hostapd-2.6.ebuild | 9 ++--- net-wireless/hostapd/hostapd-2.9-r3.ebuild | 64 ++++++++---------------------- net-wireless/hostapd/metadata.xml | 2 - 3 files changed, 20 insertions(+), 55 deletions(-) diff --git a/net-wireless/hostapd/hostapd-2.6.ebuild b/net-wireless/hostapd/hostapd-2.6.ebuild index 68f116a..d85b6d4 100644 --- a/net-wireless/hostapd/hostapd-2.6.ebuild +++ b/net-wireless/hostapd/hostapd-2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -14,12 +14,9 @@ SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz"; LICENSE="|| ( GPL-2 BSD )" SLOT="0" KEYWORDS="amd64 ~arm ~mips ppc x86" -IUSE="ipv6 libressl logwatch netlink sqlite +ssl +wps +crda" +IUSE="ipv6 logwatch netlink sqlite +ssl +wps +crda" -DEPEND="ssl? ( - !libressl? ( dev-libs/openssl:*[-bindist] ) - libressl? ( dev-libs/libressl:= ) - ) +DEPEND="ssl? ( dev-libs/openssl:*[-bindist] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild index 61cac6a..a2a5bdf 100644 --- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild +++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild @@ -28,17 +28,10 @@ fi LICENSE="BSD" SLOT="0" -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 )" +IUSE="ipv6 logwatch netlink sqlite +wps +crda" DEPEND=" - libressl? ( dev-libs/libressl:0= ) - !libressl? ( - internal-tls? ( dev-libs/libtommath ) - !internal-tls? ( dev-libs/openssl:0=[-bindist] ) - ) + dev-libs/openssl:0=[-bindist] kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) @@ -48,16 +41,6 @@ DEPEND=" RDEPEND="${DEPEND}" -pkg_pretend() { - if use internal-tls; then - if use libressl; then - elog "libressl flag takes precedence over internal-tls" - else - ewarn "internal-tls implementation is experimental and provides fewer features" - fi - fi -} - src_unpack() { # Override default one because we need the SRC_URI ones even in case of 9999 ebuilds default @@ -102,27 +85,18 @@ src_configure() { echo "CONFIG_ERP=y" >> ${CONFIG} || die echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die - if use suiteb; then - echo "CONFIG_SUITEB=y" >> ${CONFIG} || die - echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die - fi - - if use internal-tls && ! use libressl; then - echo "CONFIG_TLS=internal" >> ${CONFIG} || die - else - # SSL authentication methods - echo "CONFIG_DPP=y" >> ${CONFIG} || die - echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die - echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die - echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die - echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die - echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die - echo "CONFIG_OWE=y" >> ${CONFIG} || die - echo "CONFIG_SAE=y" >> ${CONFIG} || die - echo "CONFIG_TLSV11=y" >> ${CONFIG} || die - echo "CONFIG_TLSV12=y" >> ${CONFIG} || die - fi + # SSL authentication methods + echo "CONFIG_DPP=y" >> ${CONFIG} || die + echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die + echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die + echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die + echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die + echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die + echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die + echo "CONFIG_OWE=y" >> ${CONFIG} || die + echo "CONFIG_SAE=y" >> ${CONFIG} || die + echo "CONFIG_TLSV11=y" >> ${CONFIG} || die + echo "CONFIG_TLSV12=y" >> ${CONFIG} || die if use wps; then # Enable Wi-Fi Protected Setup @@ -211,10 +185,8 @@ src_configure() { src_compile() { emake V=1 - if use libressl || ! use internal-tls; then - emake V=1 nt_password_hash - emake V=1 hlr_auc_gw - fi + emake V=1 nt_password_hash + emake V=1 hlr_auc_gw } src_install() { @@ -226,9 +198,7 @@ src_install() { dosbin ${PN} dobin ${PN}_cli - if use libressl || ! use internal-tls; then - dobin nt_password_hash hlr_auc_gw - fi + dobin nt_password_hash hlr_auc_gw newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN} newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN} diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml index b5dc25e..9de6b97 100644 --- a/net-wireless/hostapd/metadata.xml +++ b/net-wireless/hostapd/metadata.xml @@ -8,12 +8,10 @@ </longdescription> <use> <flag name="crda">Add CRDA support</flag> - <flag name="internal-tls">Use internal TLSv1 implementation instead of depending on OpenSSL, LibreSSL or GnuTLS</flag> <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="sqlite">Adding sqlite support</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">
