gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /net-wireless/hostapd
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
3 files changed, 153 insertions, 141 deletions
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 18cdda043f5c..02694bce66b9 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 7437 BLAKE2B a5f58c2e465cec4b95d945c078c3695fa86c1b5372458bf32465daadfc7ef912489db1ba148c842deaf94db9ef655ed7943ad0bb06414427ed43c932116abb8a SHA512 956b2344bb31ced7059cb16a22b0f653497c5c502bcbd66c2ca76483f025beaca9257b5824c7925edc9b54fd05deae8424ca6f0de0a43909d27ab9f2b920eec8
-EBUILD hostapd-9999.ebuild 7018 BLAKE2B e764ca677e98783701319bda67b8d7b1efb21994db193b07de71a775a6d2638ee0e78c32d4749de247a120f61a6fda47583cd3003baaacff21c5c0c88d86abb3 SHA512 d393440cdf12fefbb98e2e0aeb4001fc91fe456589d5cf4dca656906c66dc95b2eb8cfd3ab2bd7b50b68fa85751e5cc4140f2a7d4291bb00d61880cd6e8f41e9
+EBUILD hostapd-2.9-r3.ebuild 7842 BLAKE2B b4c1167dd0cc4073f93ebe2f2bc6d3492f616032050ea99d942a31328f48de378e4230df644ef445b2be1eb4d0fdb48cdf670583a96138ecfd0c099a864f8963 SHA512 d9db343ab082f49221b3b672d96507558257aa6b44f846a1c0f6cad19ea13705fc1bd860eca20d6ee3fff48951adfcd70c58ca37112deec6f67eaa2848134308
+EBUILD hostapd-9999.ebuild 7847 BLAKE2B 3229132f099983c1b9217d4e67df55ca7ec624f72694e5233ee2a34186300cd978bc9e901b6a86d2b099c573a875b4251d38809ad7883b693a348e6d463d017f SHA512 0ccb0816270a3b1fe69541028b952cc98a116fa6788252789546d956944540fad479e0fa26a7974919f300031ec50b6228d5f8ea526ba83ad71a3d2ad0d8e9f7
 MISC metadata.xml 1116 BLAKE2B 658e8397f7ebf2f5f265e1376ee87f29ed9fa81012f0269bf655f4f2647c58f27f7cafc3bcd61ddf312039cef59ad525baf8dcb52dccff8e16842952294da839 SHA512 451d5d71930a4624d2ffc70ee69671d2a2400b0b715a19d0b7f4c14e7ec0457147b068e6ca65fbcc6ff3d75eeb721047f399f55e01fa8d7072dc02c57985813d
diff --git a/net-wireless/hostapd/hostapd-2.9-r3.ebuild b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
index b93c40f9893c..61cac6a1e0c0 100644
--- a/net-wireless/hostapd/hostapd-2.9-r3.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs systemd savedconfig
 
@@ -10,16 +10,18 @@ HOMEPAGE="http://w1.fi"
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
+S="${S}/${PN}"
 
-if [[ $PV == 9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+	if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then
 		SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz"
 	else
 		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
 	fi
+
 	# Never stabilize snapshot ebuilds please
 	KEYWORDS="amd64 arm arm64 ~mips ppc x86"
 fi
@@ -46,8 +48,6 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-S="${S}/${PN}"
-
 pkg_pretend() {
 	if use internal-tls; then
 		if use libressl; then
@@ -71,12 +71,14 @@ src_prepare() {
 	# i.e. anything outside ${S}/${PN}
 	pushd ../ >/dev/null || die
 	default
-	#CVE-2019-16275 bug #696032
+
+	# CVE-2019-16275 bug #696032
 	eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
 	# CVE-2020-12695 bug #727542
 	eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"
 	eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"
 	eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
+
 	popd >/dev/null || die
 
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
@@ -88,122 +90,122 @@ src_configure() {
 
 	restore_config "${CONFIG}"
 	if [[ -f "${CONFIG}" ]]; then
-		default_src_configure
+		default
 		return 0
 	fi
 
 	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
+	echo "CC = $(tc-getCC)" > ${CONFIG} || die
 
 	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG}
-	echo "CONFIG_ERP=y" >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-	echo "CONFIG_SAE=y" >> ${CONFIG}
-	echo "CONFIG_OWE=y" >> ${CONFIG}
-	echo "CONFIG_DPP=y" >> ${CONFIG}
+	echo "CONFIG_EAP=y" >> ${CONFIG} || die
+	echo "CONFIG_ERP=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
 
 	if use suiteb; then
-		echo "CONFIG_SUITEB=y" >> ${CONFIG}
-		echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+		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}
+		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
 	else
 		# SSL authentication methods
-		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-		echo "CONFIG_TLSV11=y" >> ${CONFIG}
-		echo "CONFIG_TLSV12=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+		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
 
 	if use wps; then
 		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG}
-		echo "CONFIG_WPS2=y" >> ${CONFIG}
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+		echo "CONFIG_WPS=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS2=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die
 		einfo "Enabling Wi-Fi Protected Setup support"
 	fi
 
-	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} || die
 
 	einfo "Enabling drivers: "
 
 	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} || die
 	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die
 	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die
 	einfo "  None driver enabled"
 
 	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die
 
 	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die
 
 	# misc
-	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y" >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_IAPP=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
-	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
-	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
-	echo "CONFIG_HS20=y" >> ${CONFIG}
-	echo "CONFIG_WNM=y" >> ${CONFIG}
-	echo "CONFIG_FST=y" >> ${CONFIG}
-	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
-	echo "CONFIG_ACS=y" >> ${CONFIG}
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} || die
+	echo "CONFIG_PKCS12=y" >> ${CONFIG} || die
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} || die
+	echo "CONFIG_IAPP=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} || die
+	echo "CONFIG_HS20=y" >> ${CONFIG} || die
+	echo "CONFIG_WNM=y" >> ${CONFIG} || die
+	echo "CONFIG_FST=y" >> ${CONFIG} || die
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG} || die
+	echo "CONFIG_ACS=y" >> ${CONFIG} || die
 
 	if use netlink; then
 		# Netlink support
-		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} || die
 	fi
 
 	if use ipv6; then
 		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
+		echo "CONFIG_IPV6=y" >> ${CONFIG} || die
 	fi
 
 	if use sqlite; then
 		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+		echo "CONFIG_SQLITE=y" >> ${CONFIG} || die
 	fi
 
 	# If we are using libnl 2.0 and above, enable support for it
 	# Removed for now, since the 3.2 version is broken, and we don't
 	# support it.
 	if has_version ">=dev-libs/libnl-3.2"; then
-		echo "CONFIG_LIBNL32=y" >> .config
+		echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
 	fi
 
 	# TODO: Add support for BSD drivers
 
-	default_src_configure
+	default
 }
 
 src_compile() {
@@ -265,7 +267,8 @@ pkg_postinst() {
 	einfo "essid_wlan0=\"test\""
 	einfo "mode_wlan0=\"master\""
 	einfo
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+
+	#if [[ -e "${KV_DIR}"/net/mac80211 ]]; then
 	#	einfo "This package now compiles against the headers installed by"
 	#	einfo "the kernel source for the mac80211 driver. You should "
 	#	einfo "re-emerge ${PN} after upgrading your kernel source."
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 06ae239217e1..97a5fee6569a 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit toolchain-funcs systemd savedconfig
 
@@ -10,16 +10,18 @@ HOMEPAGE="http://w1.fi"
 EXTRAS_VER="2.7-r2"
 EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
+S="${S}/${PN}"
 
-if [[ $PV == 9999 ]]; then
+if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://w1.fi/hostap.git"
 else
-	if [[ $PV =~ ^.*_p[0-9]{8}$ ]]; then
+	if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then
 		SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz"
 	else
 		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
 	fi
+
 	# Never stabilize snapshot ebuilds please
 	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
 fi
@@ -46,8 +48,6 @@ DEPEND="
 
 RDEPEND="${DEPEND}"
 
-S="${S}/${PN}"
-
 pkg_pretend() {
 	if use internal-tls; then
 		if use libressl; then
@@ -71,6 +71,14 @@ src_prepare() {
 	# i.e. anything outside ${S}/${PN}
 	pushd ../ >/dev/null || die
 	default
+
+	# CVE-2019-16275 bug #696032
+	eapply "${FILESDIR}/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch"
+	# CVE-2020-12695 bug #727542
+	eapply "${FILESDIR}/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch"
+	eapply "${FILESDIR}/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch"
+	eapply "${FILESDIR}/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch"
+
 	popd >/dev/null || die
 
 	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
@@ -82,122 +90,122 @@ src_configure() {
 
 	restore_config "${CONFIG}"
 	if [[ -f "${CONFIG}" ]]; then
-		default_src_configure
+		default
 		return 0
 	fi
 
 	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG}
+	echo "CC = $(tc-getCC)" > ${CONFIG} || die
 
 	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG}
-	echo "CONFIG_ERP=y" >> ${CONFIG}
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG}
-	echo "CONFIG_SAE=y" >> ${CONFIG}
-	echo "CONFIG_OWE=y" >> ${CONFIG}
-	echo "CONFIG_DPP=y" >> ${CONFIG}
+	echo "CONFIG_EAP=y" >> ${CONFIG} || die
+	echo "CONFIG_ERP=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
 
 	if use suiteb; then
-		echo "CONFIG_SUITEB=y" >> ${CONFIG}
-		echo "CONFIG_SUITEB192=y" >> ${CONFIG}
+		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}
+		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
 	else
 		# SSL authentication methods
-		echo "CONFIG_EAP_FAST=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG}
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG}
-		echo "CONFIG_TLSV11=y" >> ${CONFIG}
-		echo "CONFIG_TLSV12=y" >> ${CONFIG}
-		echo "CONFIG_EAP_PWD=y" >> ${CONFIG}
+		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
 
 	if use wps; then
 		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG}
-		echo "CONFIG_WPS2=y" >> ${CONFIG}
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG}
-		echo "CONFIG_WPS_NFC=y" >> ${CONFIG}
+		echo "CONFIG_WPS=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS2=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die
+		echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die
 		einfo "Enabling Wi-Fi Protected Setup support"
 	fi
 
-	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG}
-	echo "CONFIG_EAP_TNC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG}
-	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG}
-	echo "CONFIG_EAP_EKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG}
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG}
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG}
+	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_PAX=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_PSK=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} || die
+	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} || die
 
 	einfo "Enabling drivers: "
 
 	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} || die
 	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die
 	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die
 	einfo "  None driver enabled"
 
 	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG}
+	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die
 
 	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG}
+	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die
 
 	# misc
-	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG}
-	echo "CONFIG_PKCS12=y" >> ${CONFIG}
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG}
-	echo "CONFIG_IAPP=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG}
-	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG}
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG}
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG}
-	echo "CONFIG_INTERWORKING=y" >> ${CONFIG}
-	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG}
-	echo "CONFIG_HS20=y" >> ${CONFIG}
-	echo "CONFIG_WNM=y" >> ${CONFIG}
-	echo "CONFIG_FST=y" >> ${CONFIG}
-	echo "CONFIG_FST_TEST=y" >> ${CONFIG}
-	echo "CONFIG_ACS=y" >> ${CONFIG}
+	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} || die
+	echo "CONFIG_PKCS12=y" >> ${CONFIG} || die
+	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} || die
+	echo "CONFIG_IAPP=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211R=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
+	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
+	echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
+	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
+	echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die
+	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} || die
+	echo "CONFIG_HS20=y" >> ${CONFIG} || die
+	echo "CONFIG_WNM=y" >> ${CONFIG} || die
+	echo "CONFIG_FST=y" >> ${CONFIG} || die
+	echo "CONFIG_FST_TEST=y" >> ${CONFIG} || die
+	echo "CONFIG_ACS=y" >> ${CONFIG} || die
 
 	if use netlink; then
 		# Netlink support
-		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG}
+		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} || die
 	fi
 
 	if use ipv6; then
 		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG}
+		echo "CONFIG_IPV6=y" >> ${CONFIG} || die
 	fi
 
 	if use sqlite; then
 		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG}
+		echo "CONFIG_SQLITE=y" >> ${CONFIG} || die
 	fi
 
 	# If we are using libnl 2.0 and above, enable support for it
 	# Removed for now, since the 3.2 version is broken, and we don't
 	# support it.
 	if has_version ">=dev-libs/libnl-3.2"; then
-		echo "CONFIG_LIBNL32=y" >> .config
+		echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
 	fi
 
 	# TODO: Add support for BSD drivers
 
-	default_src_configure
+	default
 }
 
 src_compile() {
@@ -259,7 +267,8 @@ pkg_postinst() {
 	einfo "essid_wlan0=\"test\""
 	einfo "mode_wlan0=\"master\""
 	einfo
-	#if [ -e "${KV_DIR}"/net/mac80211 ]; then
+
+	#if [[ -e "${KV_DIR}"/net/mac80211 ]]; then
 	#	einfo "This package now compiles against the headers installed by"
 	#	einfo "the kernel source for the mac80211 driver. You should "
 	#	einfo "re-emerge ${PN} after upgrading your kernel source."
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /net-wireless/hostapd
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)