From 659fb008db1873762b27f7c18750447ab5aa7f67 Mon Sep 17 00:00:00 2001 From: dkwo Date: Fri, 14 Aug 2026 13:56:55 +0800 Subject: [PATCH] wpa_supplicant: readd patch, create _wpas user. --- srcpkgs/wpa_supplicant/INSTALL | 6 +++ .../brcmfmac-temporarily-revert-commit.patch | 47 +++++++++++++++++++ srcpkgs/wpa_supplicant/template | 3 +- 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/wpa_supplicant/INSTALL create mode 100644 srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch diff --git a/srcpkgs/wpa_supplicant/INSTALL b/srcpkgs/wpa_supplicant/INSTALL new file mode 100644 index 00000000000000..ea2282087deee9 --- /dev/null +++ b/srcpkgs/wpa_supplicant/INSTALL @@ -0,0 +1,6 @@ +# INSTALL +case "$ACTION" in +post) + chown root:_wpas etc/wpa_supplicant/*.conf + ;; +esac diff --git a/srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch b/srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch new file mode 100644 index 00000000000000..81a9acbaa77ba7 --- /dev/null +++ b/srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch @@ -0,0 +1,47 @@ +From 2514856652f9a393e505d542cb8f039f8bac10f5 Mon Sep 17 00:00:00 2001 +From: Janne Grunau +Date: Sun, 4 Aug 2024 13:24:42 +0200 +Subject: [PATCH 1/1] Revert "Mark authorization completed on driver indication + during 4-way HS offload" + +This reverts commit 41638606054a09867fe3f9a2b5523aa4678cbfa5. +--- + wpa_supplicant/events.c | 25 ++++++++----------------- + 1 file changed, 8 insertions(+), 17 deletions(-) + +diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c +index 46e7cf1ab..7b3ef7205 100644 +--- a/wpa_supplicant/events.c ++++ b/wpa_supplicant/events.c +@@ -4925,23 +4925,14 @@ + wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) || + ((wpa_s->drv_flags2 & WPA_DRIVER_FLAGS2_OWE_OFFLOAD_STA) && + wpa_s->key_mgmt == WPA_KEY_MGMT_OWE)) { +- if (already_authorized) { +- /* +- * We are done; the driver will take care of RSN 4-way +- * handshake. +- */ +- wpa_supplicant_cancel_auth_timeout(wpa_s); +- wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); +- eapol_sm_notify_portValid(wpa_s->eapol, true); +- eapol_sm_notify_eap_success(wpa_s->eapol, true); +- } else { +- /* Update port, WPA_COMPLETED state from the +- * EVENT_PORT_AUTHORIZED handler when the driver is done +- * with the 4-way handshake. +- */ +- wpa_msg(wpa_s, MSG_DEBUG, +- "ASSOC INFO: wait for driver port authorized indication"); +- } ++ /* ++ * We are done; the driver will take care of RSN 4-way ++ * handshake. ++ */ ++ wpa_supplicant_cancel_auth_timeout(wpa_s); ++ wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); ++ eapol_sm_notify_portValid(wpa_s->eapol, true); ++ eapol_sm_notify_eap_success(wpa_s->eapol, true); + } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) && + wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) { + /* diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index ba8c6c6ef285d8..3fe50bbd97e248 100644 --- a/srcpkgs/wpa_supplicant/template +++ b/srcpkgs/wpa_supplicant/template @@ -1,7 +1,7 @@ # Template file for 'wpa_supplicant' pkgname=wpa_supplicant version=2.12 -revision=1 +revision=2 build_wrksrc="${pkgname}" build_style=gnu-makefile make_build_args="V=1 BINDIR=/usr/bin" @@ -20,6 +20,7 @@ make_check=no # has no test suite build_options="dbus readline" build_options_default="dbus readline" conf_files="/etc/${pkgname}/${pkgname}.conf" +system_accounts="_wpas" pre_build() { cp -f ${FILESDIR}/config .config