gentoo resync : 17.08.2021

4 files changed, 8 insertions, 275 deletions

diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 9dcac866be4b..bf56a506b1ae 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -5,7 +5,6 @@ AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 B
 AUX hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch 3839 BLAKE2B 943ccc90d23c60eef15a336108d14e74909ecb782f772145ee48d049806c289c42867999e489fdfc0795846bf41a756303e6da81f4624d26043c618b8485cf43 SHA512 88608529763a6fd9e8cb1e9c9a35630dc2e311a260e023e2a69002d0db700d5f58fc7723a00433b4ea895b92c371cf1db221f38742490b4ed9b4b049892b65e1
 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-r5.ebuild 7507 BLAKE2B e4f59090b02c811636bffded01f16787f179546cce6ed1e8f30d1afc798df2a7d03a9980ba78bbd28a1785f8f8c62b84855bfa80f95fe715c42fd0c495509d41 SHA512 e45d5829086d715b6f37ae8172d91eadde5eccb254b106b106660090afacb5cba2bcebd2935f75f338f13926920028bc306a9f142d3e6932b6366d83bc75f18e
-EBUILD hostapd-2.9-r6.ebuild 7665 BLAKE2B 10436db0cd297ab9bf7d893cb4d0e2d0866a1a2e0a63d462b2a778dc03a867bca15514d9e4b65598c44aef8903567e50a24956f2647bdb47ca9d7f1429f4eb93 SHA512 f54df0cf1ab6f638c8fa9590599f16bcaf89863708744e62589a98da0c0846fb449b349cf596c7e4606fb2da2271b6a2d354aa08d045db7c3ff64d275495dcc9
-EBUILD hostapd-9999.ebuild 7131 BLAKE2B 953e76d26152cb3ebe8e4373be3991e157ab9deefc5046bff8bab64f463cd77ca0337170bd260683187591ae2d8d634da05af7e0055fe54deed4e3b97b526e4b SHA512 d8a86ec5088ba920dbc0e61bfb39ad4cee4d8e812ae9f218a9ea2d90a4705d3616fab70df2b44823717d7532f754f21c3aaeca54e0450b526e1b1006c27ba986
+EBUILD hostapd-2.9-r6.ebuild 7764 BLAKE2B ae08449d2e279ac1b0d26e53a2487f35ea2a1230699649427c2e67fef9ff5f626003c1b46752fdf0bf5b967de63ee5f635e57d517ffd7cd92be8fa974bf2f2e9 SHA512 83dc807a9e8bf561b370c5b7b0366788b8ff0a72f3f592c50767456e296dcf18e700e4dbac1661a8181cfd4e9c7dba7401ed74f2096f9aa1a72e9dd223e5bfc3
+EBUILD hostapd-9999.ebuild 7230 BLAKE2B 3ecfa68489a1aa03bb4afbc3bdcbe16778ee36cb87c111f91176cfc307448a86777ff964a6dde968a3972a63a5bc98c6dbc5bbcbeea59fdeca6934012c22c607 SHA512 657af4e8e7e25e1c228881c368ed3f0008d8b9f38e9612b3a6affa0d9462e01a9ca0e25e35584ba77d95bdd8d5959ffcd3269aa1d9cc43dabe172a940a5b9267
 MISC metadata.xml 1016 BLAKE2B 2582e31954d531776cdd315747006e1744c9a9f61faf6c73f251f8174d92e061a9dadb71152b9f666e210fe5478a5fe351bcd109b2804d94dfc268fc53004939 SHA512 27b8f32edde034f776c1538fd8e223f6963ab2a0bd760a9a3d5a3a08dd2c8549e990bfcaf5f197be47c4b92897ed13f07b111dec609a56c4268c1a659e493df1
diff --git a/net-wireless/hostapd/hostapd-2.9-r5.ebuild b/net-wireless/hostapd/hostapd-2.9-r5.ebuild
deleted file mode 100644
index 0e37a7314136..000000000000
--- a/net-wireless/hostapd/hostapd-2.9-r5.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs systemd savedconfig
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"
-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
-	inherit git-r3
-	EGIT_REPO_URI="https://w1.fi/hostap.git"
-else
-	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
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
-
-DEPEND="
-	internal-tls? ( dev-libs/libtommath )
-	!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
-	kernel_linux? (
-		dev-libs/libnl:3
-		crda? ( net-wireless/crda )
-	)
-	netlink? ( net-libs/libnfnetlink )
-	sqlite? ( >=dev-db/sqlite-3 )"
-RDEPEND="${DEPEND}"
-
-pkg_pretend() {
-	if use internal-tls; then
-		ewarn "internal-tls implementation is experimental and provides fewer features"
-	fi
-}
-
-src_unpack() {
-	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Allow users to apply patches to src/drivers for example,
-	# i.e. anything outside ${S}/${PN}
-	pushd ../ >/dev/null || die
-	default
-
-	# CVE-2019-16275 (bug #696032)
-	eapply "${FILESDIR}"/${P}-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" \
-		"${S}/hostapd.conf" || die
-}
-
-src_configure() {
-	local CONFIG="${S}"/.config
-
-	restore_config "${CONFIG}"
-	if [[ -f "${CONFIG}" ]]; then
-		default
-		return 0
-	fi
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG} || die
-
-	# EAP authentication methods
-	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} || die
-		echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
-	fi
-
-	if use internal-tls ; 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
-
-	if use wps; then
-		# Enable Wi-Fi Protected Setup
-		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} || 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} || die
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die
-	einfo "  None driver enabled"
-
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die
-
-	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die
-
-	# misc
-	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} || die
-	fi
-
-	if use ipv6; then
-		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG} || die
-	fi
-
-	if use sqlite; then
-		# Sqlite support
-		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} || die
-	fi
-
-	# TODO: Add support for BSD drivers
-
-	default
-}
-
-src_compile() {
-	emake V=1
-
-	if ! use internal-tls; then
-		emake V=1 nt_password_hash
-		emake V=1 hlr_auc_gw
-	fi
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
-
-	fperms -R 600 /etc/${PN}
-
-	dosbin ${PN}
-	dobin ${PN}_cli
-
-	if ! use internal-tls; then
-		dobin nt_password_hash hlr_auc_gw
-	fi
-
-	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
-	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
-	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
-
-	doman ${PN}{.8,_cli.1}
-
-	dodoc ChangeLog README
-	use wps && dodoc README-WPS
-
-	docinto examples
-	dodoc wired.conf
-
-	insinto /etc/log.d/conf/services/
-	doins logwatch/${PN}.conf
-
-	exeinto /etc/log.d/scripts/services/
-	doexe logwatch/${PN}
-
-	save_config .config
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are running OpenRC you need to follow this instructions:"
-	einfo "In order to use ${PN} you need to set up your wireless card"
-	einfo "for master mode in /etc/conf.d/net and then start"
-	einfo "/etc/init.d/${PN}."
-	einfo
-	einfo "Example configuration:"
-	einfo
-	einfo "config_wlan0=( \"192.168.1.1/24\" )"
-	einfo "channel_wlan0=\"6\""
-	einfo "essid_wlan0=\"test\""
-	einfo "mode_wlan0=\"master\""
-	einfo
-
-	#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."
-	#fi
-
-	if use wps; then
-		einfo "You have enabled Wi-Fi Protected Setup support, please"
-		einfo "read the README-WPS file in /usr/share/doc/${PF}"
-		einfo "for info on how to use WPS"
-	fi
-}
diff --git a/net-wireless/hostapd/hostapd-2.9-r6.ebuild b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
index 8878538c8860..1b8727055c94 100644
--- a/net-wireless/hostapd/hostapd-2.9-r6.ebuild
+++ b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs systemd savedconfig
+inherit flag-o-matic systemd savedconfig toolchain-funcs
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"
@@ -40,6 +40,7 @@ DEPEND="
 	netlink? ( net-libs/libnfnetlink )
 	sqlite? ( >=dev-db/sqlite-3 )"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
 	if use internal-tls; then
@@ -194,6 +195,7 @@ src_configure() {
 	# support it.
 	if has_version ">=dev-libs/libnl-3.2"; then
 		echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
+		append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0)
 	fi
 
 	# TODO: Add support for BSD drivers
diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index b9116b4cb252..dacd094e49ee 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs systemd savedconfig
+inherit flag-o-matic systemd savedconfig toolchain-funcs
 
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"
@@ -40,6 +40,7 @@ DEPEND="
 	netlink? ( net-libs/libnfnetlink )
 	sqlite? ( >=dev-db/sqlite-3 )"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 pkg_pretend() {
 	if use internal-tls; then
@@ -184,6 +185,7 @@ src_configure() {
 	# support it.
 	if has_version ">=dev-libs/libnl-3.2"; then
 		echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
+		append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0)
 	fi
 
 	# TODO: Add support for BSD drivers