diff --git a/srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch b/srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch deleted file mode 100644 index b42cba1088ddd6..00000000000000 --- a/srcpkgs/wpa_supplicant/patches/brcmfmac-temporarily-revert-commit.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 -@@ -4441,23 +4441,14 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s, - eapol_sm_notify_eap_success(wpa_s->eapol, true); - } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) && - wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) { -- 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)) { - /* --- -2.45.2 - diff --git a/srcpkgs/wpa_supplicant/patches/nl80211-add-extra-ies-only-if-allowed-by-driver.patch b/srcpkgs/wpa_supplicant/patches/nl80211-add-extra-ies-only-if-allowed-by-driver.patch deleted file mode 100644 index e853461e5f9bad..00000000000000 --- a/srcpkgs/wpa_supplicant/patches/nl80211-add-extra-ies-only-if-allowed-by-driver.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: David Bauer -Date: Sun, 30 Jan 2022 20:22:00 +0100 -Subject: [PATCH] nl80211: add extra-ies only if allowed by driver -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upgrading wpa_supplicant from 2.9 to 2.10 breaks broadcom-wl -based adapters. The reason for it is hostapd tries to install additional -IEs for scanning while the driver does not support this. - -The kernel indicates the maximum number of bytes for additional scan IEs -using the NL80211_ATTR_MAX_SCAN_IE_LEN attribute. Save this value and -only add additional scan IEs in case the driver can accommodate these -additional IEs. - -Reported-by: Étienne Morice -Tested-by: Étienne Morice -Signed-off-by: David Bauer - -Bug: http://lists.infradead.org/pipermail/hostap/2022-January/040178.html -Bug-ArchLinux: https://bugs.archlinux.org/task/73495 -Bug-Debian: https://bugs.debian.org/1004524 -Origin: http://lists.infradead.org/pipermail/hostap/2022-January/040185.html ---- - src/drivers/driver.h | 3 +++ - src/drivers/driver_nl80211_capa.c | 4 ++++ - src/drivers/driver_nl80211_scan.c | 2 +- - 3 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/drivers/driver.h b/src/drivers/driver.h -index 4331782d897a..243e9b5cc4d8 100644 ---- a/src/drivers/driver.h -+++ b/src/drivers/driver.h -@@ -2357,6 +2357,9 @@ struct wpa_driver_capa { - /** Maximum number of iterations in a single scan plan */ - u32 max_sched_scan_plan_iterations; - -+ /** Maximum number of extra IE bytes for scans */ -+ u16 max_scan_ie_len; -+ - /** Whether sched_scan (offloaded scanning) is supported */ - int sched_scan_supported; - -diff --git a/src/drivers/driver_nl80211_capa.c b/src/drivers/driver_nl80211_capa.c -index 26c1f41406d2..d5ba66b1073e 100644 ---- a/src/drivers/driver_nl80211_capa.c -+++ b/src/drivers/driver_nl80211_capa.c -@@ -976,6 +976,10 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg) - nla_get_u32(tb[NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS]); - } - -+ if (tb[NL80211_ATTR_MAX_SCAN_IE_LEN]) -+ capa->max_scan_ie_len = -+ nla_get_u16(tb[NL80211_ATTR_MAX_SCAN_IE_LEN]); -+ - if (tb[NL80211_ATTR_MAX_MATCH_SETS]) - capa->max_match_sets = - nla_get_u8(tb[NL80211_ATTR_MAX_MATCH_SETS]); -diff --git a/src/drivers/driver_nl80211_scan.c b/src/drivers/driver_nl80211_scan.c -index b055e684a9f8..a8ea8f2cf1d7 100644 ---- a/src/drivers/driver_nl80211_scan.c -+++ b/src/drivers/driver_nl80211_scan.c -@@ -221,7 +221,7 @@ nl80211_scan_common(struct i802_bss *bss, u8 cmd, - wpa_printf(MSG_DEBUG, "nl80211: Passive scan requested"); - } - -- if (params->extra_ies) { -+ if (params->extra_ies && drv->capa.max_scan_ie_len >= params->extra_ies_len) { - wpa_hexdump(MSG_MSGDUMP, "nl80211: Scan extra IEs", - params->extra_ies, params->extra_ies_len); - if (nla_put(msg, NL80211_ATTR_IE, params->extra_ies_len, - diff --git a/srcpkgs/wpa_supplicant/patches/patch-src_utils_eloop_c.diff b/srcpkgs/wpa_supplicant/patches/patch-src_utils_eloop_c.diff deleted file mode 100644 index bab2cee4e59063..00000000000000 --- a/srcpkgs/wpa_supplicant/patches/patch-src_utils_eloop_c.diff +++ /dev/null @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_utils_eloop_c,v 1.5 2015/09/29 11:57:54 dcoppa Exp $ - -don't try to access list members to free them unless already initialised - ---- a/src/utils/eloop.c.orig Sun Sep 27 21:02:05 2015 -+++ b/src/utils/eloop.c Mon Sep 28 09:35:05 2015 -@@ -1064,6 +1064,9 @@ void eloop_destroy(void) - struct eloop_timeout *timeout, *prev; - struct os_reltime now; - -+ if (eloop.timeout.prev == NULL) -+ return; -+ - os_get_reltime(&now); - dl_list_for_each_safe(timeout, prev, &eloop.timeout, - struct eloop_timeout, list) { diff --git a/srcpkgs/wpa_supplicant/patches/unsurprising-ext-password.patch b/srcpkgs/wpa_supplicant/patches/unsurprising-ext-password.patch deleted file mode 100644 index d971acaeb7b950..00000000000000 --- a/srcpkgs/wpa_supplicant/patches/unsurprising-ext-password.patch +++ /dev/null @@ -1,66 +0,0 @@ -From e5ac0dd1af48e085bb824082ef3b64afba673ded Mon Sep 17 00:00:00 2001 -From: rnhmjoj -Date: Wed, 18 Sep 2024 13:43:44 +0200 -Subject: [PATCH] ext_password_file: do not use wpa_config_get_line -To: hostap@lists.infradead.org - -The file-based backed of the ext_password framework uses -`wpa_config_get_line` to read the passwords line-by-line from a file. -This function is meant to parse a single line from the -wpa_supplicant.conf file, so it handles whitespace, quotes and other -characters specially. - -Its behavior, however, it's not compatible with the rest of the -ext_password framework implementation. For example, if a passphrase -contains a `#` character it must be quoted to prevent parsing the -remaining characters as an inline comment, but the code handling the -external password in `wpa_supplicant_get_psk` does not handle quotes. -The result is that either it will hash the enclosing quotes, producing a -wrong PSK, or if the passphrase is long enough, fail the length check. -As a consequence, some passphrases are impossible to input correctly. - -To solve this and other issues, this patch changes the behaviour of the -`ext_password_file_get` function (which was not documented in details, -at least w.r.t. special characters) to simply treat all characters -literally: including trailing whitespaces (except CR and LF), `#` for -inline comments, etc. Empty lines and full-line comments are still -supported. - -Signed-off-by: Michele Guerini Rocco ---- - src/utils/ext_password_file.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/src/utils/ext_password_file.c b/src/utils/ext_password_file.c -index 4bb0095f3..f631ff15c 100644 ---- a/src/utils/ext_password_file.c -+++ b/src/utils/ext_password_file.c -@@ -9,7 +9,6 @@ - #include "includes.h" - - #include "utils/common.h" --#include "utils/config.h" - #include "ext_password_i.h" - - -@@ -97,7 +96,16 @@ static struct wpabuf * ext_password_file_get(void *ctx, const char *name) - - wpa_printf(MSG_DEBUG, "EXT PW FILE: get(%s)", name); - -- while (wpa_config_get_line(buf, sizeof(buf), f, &line, &pos)) { -+ while ((pos = fgets(buf, sizeof(buf), f))) { -+ line++; -+ -+ /* Strip newline characters */ -+ pos[strcspn(pos, "\r\n")] = 0; -+ -+ /* Skip comments and empty lines */ -+ if (*pos == '#' || *pos == '\0') -+ continue; -+ - char *sep = os_strchr(pos, '='); - - if (!sep) { --- -2.44.1 - diff --git a/srcpkgs/wpa_supplicant/template b/srcpkgs/wpa_supplicant/template index 850e075d6948e3..ba8c6c6ef285d8 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.11 -revision=4 +version=2.12 +revision=1 build_wrksrc="${pkgname}" build_style=gnu-makefile make_build_args="V=1 BINDIR=/usr/bin" @@ -15,7 +15,7 @@ maintainer="Enno Boland " license="BSD-3-Clause" homepage="http://w1.fi/wpa_supplicant/" distfiles="http://w1.fi/releases/${pkgname}-${version}.tar.gz" -checksum=912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a +checksum=08e23937e16d0155e55cab2b51f51fbe10d80a1aa91c4e15442645059b737ef6 make_check=no # has no test suite build_options="dbus readline" build_options_default="dbus readline"