diff options
| author |   Mikle Kolyada <zlogene@gentoo.org> | 2021-05-03 12:37:25 +0300 |
|---|---|---|
| committer | Mikle Kolyada <zlogene@gentoo.org> | 2021-05-03 12:39:17 +0300 |
| commit | 1eb56d9532c0a7a708492ce294448fccbe27ff29 (patch) | |
| tree | 842d3c769286af2437180c87bde790919ce016d9 /net-wireless/hostapd | |
| parent | games-arcade/sdb: tweak for gcc-11 (diff) | |
| download | gentoo-1eb56d9532c0a7a708492ce294448fccbe27ff29.tar.gz gentoo-1eb56d9532c0a7a708492ce294448fccbe27ff29.tar.bz2 gentoo-1eb56d9532c0a7a708492ce294448fccbe27ff29.zip | |
net-wireless/hostapd: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Diffstat (limited to 'net-wireless/hostapd')
| -rw-r--r-- | net-wireless/hostapd/hostapd-2.9-r3.ebuild | 19 | ||||
| -rw-r--r-- | net-wireless/hostapd/hostapd-9999.ebuild | 19 |
2 files changed, 10 insertions, 28 deletions
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild index 6183c8c4e5f6..7a63076e50a7 100644 --- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild +++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild @@ -28,17 +28,12 @@ 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="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda" DEPEND=" - libressl? ( dev-libs/libressl:0= ) - !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) - ) + kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) @@ -50,11 +45,7 @@ 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 } @@ -107,7 +98,7 @@ src_configure() { echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die fi - if use internal-tls && ! use libressl; then + if use internal-tls ; then echo "CONFIG_TLS=internal" >> ${CONFIG} || die else # SSL authentication methods @@ -211,7 +202,7 @@ src_configure() { src_compile() { emake V=1 - if use libressl || ! use internal-tls; then + if ! use internal-tls; then emake V=1 nt_password_hash emake V=1 hlr_auc_gw fi @@ -226,7 +217,7 @@ src_install() { dosbin ${PN} dobin ${PN}_cli - if use libressl || ! use internal-tls; then + if ! use internal-tls; then dobin nt_password_hash hlr_auc_gw fi diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild index 3ceb1520bd8d..515d2b26e214 100644 --- a/net-wireless/hostapd/hostapd-9999.ebuild +++ b/net-wireless/hostapd/hostapd-9999.ebuild @@ -28,17 +28,12 @@ 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="internal-tls ipv6 logwatch netlink sqlite +suiteb +wps +crda" DEPEND=" - libressl? ( dev-libs/libressl:0= ) - !libressl? ( internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist] ) - ) + kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) @@ -50,11 +45,7 @@ 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 } @@ -107,7 +98,7 @@ src_configure() { echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die fi - if use internal-tls && ! use libressl; then + if use internal-tls ; then echo "CONFIG_TLS=internal" >> ${CONFIG} || die else # SSL authentication methods @@ -211,7 +202,7 @@ src_configure() { src_compile() { emake V=1 - if use libressl || ! use internal-tls; then + if use internal-tls; then emake V=1 nt_password_hash emake V=1 hlr_auc_gw fi @@ -226,7 +217,7 @@ src_install() { dosbin ${PN} dobin ${PN}_cli - if use libressl || ! use internal-tls; then + if ! use internal-tls; then dobin nt_password_hash hlr_auc_gw fi |