gentoo resync : 04.05.2021

4 files changed, 14 insertions, 32 deletions

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 273db6434152..3691a5bb2b4a 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -4,6 +4,6 @@ AUX hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
 AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38
 DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
-EBUILD hostapd-2.9-r3.ebuild 7871 BLAKE2B 50283fe6ba3d643ae7c84c3d47471a56f824ae6aa58cf78b565dc80c8180404f8946182217c74de511ea60cf2e0ab145d58d4e94b6c85a8c49b555b901104593 SHA512 66c092f0d79bff7614fadc0dda04093204de2b1b2afe4c5edc3848d6fb096c21a3abe0b8bf73264339dd67998ce5b7614642574007dbea228adf8f8d978e68c8
-EBUILD hostapd-9999.ebuild 7876 BLAKE2B 0a1fffc7904ade94302842b58f6fae75bf3ffbe0b8a474bbe484c0a5db9699b06d5c15d574664ba1f8b465b7d4ee7a01f394925cad50fbc203c236929dd35acb SHA512 9059af767eb0c61b07aca8d6aa7828e4342a5baef517248c4e88d39701048db694ba9160286636ba6c4dc67030f2f5be44f6c88f03c428cd353431b125ed663e
-MISC metadata.xml 1116 BLAKE2B 658e8397f7ebf2f5f265e1376ee87f29ed9fa81012f0269bf655f4f2647c58f27f7cafc3bcd61ddf312039cef59ad525baf8dcb52dccff8e16842952294da839 SHA512 451d5d71930a4624d2ffc70ee69671d2a2400b0b715a19d0b7f4c14e7ec0457147b068e6ca65fbcc6ff3d75eeb721047f399f55e01fa8d7072dc02c57985813d
+EBUILD hostapd-2.9-r3.ebuild 7550 BLAKE2B e779c6986b7205fe7499809eed0bd3b129b20b9c7d87b5ccbadd68df852b5142fd119ee8be4cd7f20c3b199399cfcebf1b2e37bbc333266e827592a9a89d3bf3 SHA512 df47ee822e74a0f6638846693bd54250e39b750d7e010a037a7e44020adf5f662d860b63c19d307a76f0a34bf75082d746c442768e32a51050156737995f459e
+EBUILD hostapd-9999.ebuild 7554 BLAKE2B 35f31a8f1c76573552f13c8f1370eea464f33ee865be1b669d7e947081cbfc2abb6b82fe9857b62ff8fbc0c2ea396d402ca4580ced38d3851c92f3c435591697 SHA512 898bfa0c1df91d394c83f9c22f1c6eef6202172f7b7651f7d39e73fbc0ebe7ba1ed8fc7c5fa818dc082e1665b66f87ee4d4d3feccbc90631b9cd4295b4538fb6
+MISC metadata.xml 1106 BLAKE2B 4b92b2eaa73222e60eb079522620e58991393296da9e981c742cd2b20fa38a5984c8c7b3d6242f0a27770af32caff148089eaa1ace27b4a152a751557ac0e0b9 SHA512 b0b6e8a9f72e01534770876d5a656360397d48d3736ec6aa5f799e65d414be4291729f78b4f2ebea1a2c55510d337adc0ae709021b3d360deef04f0ea2e32002
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
 
diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index 09503282fa44..d518c0ca0889 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -8,7 +8,7 @@
 	</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="internal-tls">Use internal TLSv1 implementation instead of depending on OpenSSL 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>