git: 25a9b4159e33 - main - bsdbox: fix the hostapd build, hook it back up

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=25a9b4159e33fb6024a4f832ce7d280481aca6b2

commit 25a9b4159e33fb6024a4f832ce7d280481aca6b2
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2025-04-21 03:44:53 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2025-04-21 03:45:01 +0000

    bsdbox: fix the hostapd build, hook it back up
    
    WPA stuff is now structured a little bit differently and requires a
    number of other libs now, so pull those in.  It also needs to be able to
    keep wpa_driver_bsd_ops exposed as part of the lib/program contract.
    
    Reviewed by:    adrian, imp
    Differential Revision:  https://reviews.freebsd.org/D42500
---
 tools/bsdbox/Makefile         | 2 +-
 tools/bsdbox/Makefile.hostapd | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile
index 37d6318ccbb3..35e37b31ea2f 100644
--- a/tools/bsdbox/Makefile
+++ b/tools/bsdbox/Makefile
@@ -94,7 +94,7 @@ CRUNCH_LIBS+= -lm
 
 .include "Makefile.base"
 .include "Makefile.net"
-#.include "Makefile.hostapd"
+.include "Makefile.hostapd"
 #.include "Makefile.textproc"
 .include "Makefile.login"
 .include "Makefile.kld"
diff --git a/tools/bsdbox/Makefile.hostapd b/tools/bsdbox/Makefile.hostapd
index 8c5d86d86704..95c6a7f7f45b 100644
--- a/tools/bsdbox/Makefile.hostapd
+++ b/tools/bsdbox/Makefile.hostapd
@@ -7,6 +7,8 @@ CRUNCH_PROGS_usr.sbin+=	hostapd hostapd_cli
 CRUNCH_SRCDIR_hostapd=	$(.CURDIR)/../../usr.sbin/wpa/hostapd
 CRUNCH_SRCDIR_hostapd_cli=	$(.CURDIR)/../../usr.sbin/wpa/hostapd_cli
 
+CRUNCH_KEEP_hostapd+=	wpa_driver_bsd_ops
+
 #CRUNCH_PROGS_usr.sbin+=	wpa_supplicant wpa_cli
 #CRUNCH_SRCDIR_wpa_supplicant=	$(.CURDIR)/../../usr.sbin/wpa/wpa_supplicant
 #CRUNCH_SRCDIR_wpa_cli=	$(.CURDIR)/../../usr.sbin/wpa/wpa_cli
@@ -17,3 +19,10 @@ CRUNCH_LIBS+=	-lmlx5 -libverbs
 .endif
 CRUNCH_LIBS+=	-lpcap
 
+wpalibs=	drivers ap l2_packet eap_server
+wpalibs+=	eapol_auth eap_common
+wpalibs+=	radius tls wps common crypto utils
+
+.for wpalib in ${wpalibs}
+CRUNCH_LIBS+=	${LIBWPA${wpalib:tu}}
+.endfor