commit: 1eb56d9532c0a7a708492ce294448fccbe27ff29
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon May 3 09:37:25 2021 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon May 3 09:39:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb56d95
net-wireless/hostapd: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
net-wireless/hostapd/hostapd-2.9-r3.ebuild | 19 +++++--------------
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 6183c8c4e5f..7a63076e50a 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 3ceb1520bd8..515d2b26e21 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
