net-wireless/hostapd: move dead extra archive into files dir

The init and conf files were in the user dir of a now retired dev. Move
them into the files dir.

This also adds quotes around variables.

Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32561
Signed-off-by: Sam James <sam@gentoo.org>

1 files changed, 66 insertions, 69 deletions

diff --git a/net-wireless/hostapd/hostapd-9999.ebuild b/net-wireless/hostapd/hostapd-9999.ebuild
index 81c6f18518bb..b1ed58c052a2 100644
--- a/net-wireless/hostapd/hostapd-9999.ebuild
+++ b/net-wireless/hostapd/hostapd-9999.ebuild
@@ -5,11 +5,8 @@ EAPI=8
 
 inherit flag-o-matic systemd savedconfig toolchain-funcs
 
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
 DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
 HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
 S="${S}/${PN}"
 
 if [[ ${PV} == 9999 ]]; then
@@ -82,112 +79,112 @@ src_configure() {
 	fi
 
 	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG} || die
+	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
+	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
+		echo "CONFIG_SUITEB=y" >> "${CONFIG}" || die
+		echo "CONFIG_SUITEB192=y" >> "${CONFIG}" || die
 	fi
 
 	if use internal-tls ; then
-		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
+		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
+		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
+		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
+	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
+	echo "CONFIG_DRIVER_HOSTAP=y" >> "${CONFIG}" || die
 	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die
+	echo "CONFIG_DRIVER_WIRED=y" >> "${CONFIG}" || die
 	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die
+	echo "CONFIG_DRIVER_NONE=y" >> "${CONFIG}" || die
 	einfo "  None driver enabled"
 
 	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die
+	echo "CONFIG_DRIVER_NL80211=y" >> "${CONFIG}" || die
 
 	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die
+	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_IEEE80211AX=y" >> ${CONFIG} || die
-	echo "CONFIG_OCV=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
+	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_IEEE80211AX=y" >> "${CONFIG}" || die
+	echo "CONFIG_OCV=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
+		echo "CONFIG_VLAN_NETLINK=y" >> "${CONFIG}" || die
 	fi
 
 	if use ipv6; then
 		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG} || die
+		echo "CONFIG_IPV6=y" >> "${CONFIG}" || die
 	fi
 
 	if use sqlite; then
 		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG} || die
+		echo "CONFIG_SQLITE=y" >> "${CONFIG}" || die
 	fi
 
 	if use kernel_linux; then
-		echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
-		append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0)
+		echo "CONFIG_LIBNL32=y" >> "${CONFIG}" || die
+		append-cflags "$($(tc-getPKG_CONFIG) --cflags libnl-3.0)"
 	fi
 
 	# TODO: Add support for BSD drivers
@@ -217,9 +214,9 @@ src_install() {
 		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
+	newinitd "${FILESDIR}/${PN}-init.d" ${PN}
+	newconfd "${FILESDIR}/${PN}-conf.d" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	doman ${PN}{.8,_cli.1}