From 3488820bab64b709d8f74a1487887a49adf5241a Mon Sep 17 00:00:00 2001
From: zlice <zlice555@gmail.com>
Date: Fri, 16 Aug 2024 11:05:14 -0400
Subject: [PATCH] hostapd: update to 2.11.

Closes: #51879 [via git-merge-pr]
---
 srcpkgs/hostapd/files/config      | 105 ------------------------------
 srcpkgs/hostapd/files/hostapd/run |   2 +-
 srcpkgs/hostapd/template          |  13 ++--
 3 files changed, 10 insertions(+), 110 deletions(-)
 delete mode 100644 srcpkgs/hostapd/files/config

diff --git a/srcpkgs/hostapd/files/config b/srcpkgs/hostapd/files/config
deleted file mode 100644
index 98c5dd2c29f..00000000000
--- a/srcpkgs/hostapd/files/config
+++ /dev/null
@@ -1,105 +0,0 @@
-# Example hostapd build time configuration
-#
-# This file lists the configuration options that are used when building the
-# hostapd binary. All lines starting with # are ignored. Configuration option
-# lines must be commented out complete, if they are not to be included, i.e.,
-# just setting VARIABLE=n is not disabling that variable.
-#
-# This file is included in Makefile, so variables like CFLAGS and LIBS can also
-# be modified from here. In most cass, these lines should use += in order not
-# to override previous values of the variables.
-
-# Driver interface for Host AP driver
-CONFIG_DRIVER_HOSTAP=y
-
-# Driver interface for wired authenticator
-CONFIG_DRIVER_WIRED=y
-
-# Driver interface for Prism54 driver
-CONFIG_DRIVER_PRISM54=y
-
-# IEEE 802.11F/IAPP
-CONFIG_IAPP=y
-
-# WPA2/IEEE 802.11i RSN pre-authentication
-CONFIG_RSN_PREAUTH=y
-
-# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
-CONFIG_PEERKEY=y
-
-# IEEE 802.11w (management frame protection)
-# This version is an experimental implementation based on IEEE 802.11w/D1.0
-# draft and is subject to change since the standard has not yet been finalized.
-# Driver support is also needed for IEEE 802.11w.
-CONFIG_IEEE80211W=y
-
-# Integrated EAP server
-CONFIG_EAP=y
-
-# EAP-MD5 for the integrated EAP server
-CONFIG_EAP_MD5=y
-
-# EAP-TLS for the integrated EAP server
-CONFIG_EAP_TLS=y
-
-# EAP-MSCHAPv2 for the integrated EAP server
-CONFIG_EAP_MSCHAPV2=y
-
-# EAP-PEAP for the integrated EAP server
-CONFIG_EAP_PEAP=y
-
-# EAP-GTC for the integrated EAP server
-CONFIG_EAP_GTC=y
-
-# EAP-TTLS for the integrated EAP server
-CONFIG_EAP_TTLS=y
-
-# EAP-SIM for the integrated EAP server
-CONFIG_EAP_SIM=y
-
-# EAP-AKA for the integrated EAP server
-CONFIG_EAP_AKA=y
-
-# EAP-PAX for the integrated EAP server
-CONFIG_EAP_PAX=y
-
-# EAP-PSK for the integrated EAP server (this is _not_ needed for WPA-PSK)
-CONFIG_EAP_PSK=y
-
-# EAP-SAKE for the integrated EAP server
-CONFIG_EAP_SAKE=y
-
-# EAP-GPSK for the integrated EAP server
-CONFIG_EAP_GPSK=y
-# Include support for optional SHA256 cipher suite in EAP-GPSK
-CONFIG_EAP_GPSK_SHA256=y
-
-# PKCS#12 (PFX) support (used to read private key and certificate file from
-# a file that usually has extension .p12 or .pfx)
-CONFIG_PKCS12=y
-
-# RADIUS authentication server. This provides access to the integrated EAP
-# server from external hosts using RADIUS.
-CONFIG_RADIUS_SERVER=y
-
-# Build IPv6 support for RADIUS operations
-CONFIG_IPV6=y
-
-CONFIG_DRIVER_NL80211=y
-
-CONFIG_IEEE80211N=y
-
-CONFIG_IEEE80211AC=y
-
-# Wi-Fi 6
-CONFIG_IEEE80211AX=y
-
-CONFIG_LIBNL32=y
-
-CONFIG_ACS=y
-
-# Support debug logging to syslog
-CONFIG_DEBUG_SYSLOG=y
-
-# Simultaneous Authentication of Equals (SAE), WPA3-Personal
-CONFIG_SAE=y
diff --git a/srcpkgs/hostapd/files/hostapd/run b/srcpkgs/hostapd/files/hostapd/run
index 39628755b42..0cf48a6738d 100644
--- a/srcpkgs/hostapd/files/hostapd/run
+++ b/srcpkgs/hostapd/files/hostapd/run
@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec hostapd -s /etc/hostapd/hostapd.conf 2>&1
+exec hostapd /etc/hostapd/hostapd.conf 2>&1
diff --git a/srcpkgs/hostapd/template b/srcpkgs/hostapd/template
index 6ec3bea2653..64bd1520b9b 100644
--- a/srcpkgs/hostapd/template
+++ b/srcpkgs/hostapd/template
@@ -1,7 +1,7 @@
 # Template file for 'hostapd'
 pkgname=hostapd
-version=2.10
-revision=3
+version=2.11
+revision=1
 build_wrksrc="$pkgname"
 conf_files="/etc/hostapd/hostapd.conf"
 hostmakedepends="pkg-config"
@@ -11,11 +11,16 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-3-Clause"
 homepage="http://w1.fi/hostapd/"
 distfiles="http://w1.fi/releases/${pkgname}-${version}.tar.gz"
-checksum=206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d
+checksum=2b3facb632fd4f65e32f4bf82a76b4b72c501f995a4f62e330219fe7aed1747a
 
 do_configure() {
-	cp -f ${FILESDIR}/config .config
 	sed -i 's#/etc/hostapd#/etc/hostapd/hostapd#' hostapd.conf
+	for c in RADIUS_SERVER DRIVER_WIRED DRIVER_NONE IEEE80211R \
+			IEEE80211AC IEEE80211AX FULL_DYNAMIC_VLAN ACS WEP SAE \
+			ELOOP_EPOLL FST MBO WPA_CLI_EDIT AIRTIME_POLICY ; do
+		vsed -e "/^#CONFIG_${c}/s/^#//" -i defconfig
+	done
+	cp defconfig .config
 }
 do_build() {
 	export CFLAGS+=" $(pkg-config --cflags libnl-3.0)"