Thanks, applied as b4073bf67d38ae35e6181309e5ec909685aac0a5. Michael
[sent from post-receive hook] On Mon, 21 Sep 2026 08:38:41 +0200, Sven Püschel <[email protected]> wrote: > Adding the license file hashes showed that the license had been wrong > since 2012. COPYING explains the history: > > > This software was previously distributed under BSD/GPL v2 dual license > > terms that allowed either of those license alternatives to be > > selected. As of February 11, 2012, the project has chosen to use only > > the BSD license option for future distribution. > > As COPYING references to README for the current license terms, it has > also been added to the license files. Given that most of README is > related to the license, it is hashed entirely. > > As the patch context lines changed during the upgrade, the patch file > has been adjusted accordingly. > > Signed-off-by: Sven Püschel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/wpa_supplicant-2.11/0001-Revert-Mark-authorization-completed-on-driver-indica.patch > > b/patches/wpa_supplicant-2.12/0001-Revert-Mark-authorization-completed-on-driver-indica.patch > similarity index 86% > rename from > patches/wpa_supplicant-2.11/0001-Revert-Mark-authorization-completed-on-driver-indica.patch > rename to > patches/wpa_supplicant-2.12/0001-Revert-Mark-authorization-completed-on-driver-indica.patch > index 3c0fa4e52270..173ea595f2f6 100644 > --- > a/patches/wpa_supplicant-2.11/0001-Revert-Mark-authorization-completed-on-driver-indica.patch > +++ > b/patches/wpa_supplicant-2.12/0001-Revert-Mark-authorization-completed-on-driver-indica.patch > @@ -19,13 +19,13 @@ Signed-off-by: Sven Püschel <[email protected]> > 1 file changed, 8 insertions(+), 17 deletions(-) > > diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c > -index 49917f7aaf72..bbb3a3edae7d 100644 > +index 4f85da193608..919a0732b813 100644 > --- a/wpa_supplicant/events.c > +++ b/wpa_supplicant/events.c > -@@ -4327,23 +4327,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)) { > +@@ -4925,23 +4925,14 @@ static int wpa_supplicant_event_assoc(struct > wpa_supplicant *wpa_s, > + 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 > diff --git a/patches/wpa_supplicant-2.11/series > b/patches/wpa_supplicant-2.12/series > similarity index 100% > rename from patches/wpa_supplicant-2.11/series > rename to patches/wpa_supplicant-2.12/series > diff --git a/rules/wpa_supplicant.make b/rules/wpa_supplicant.make > index d7342228b566..a081247b0669 100644 > --- a/rules/wpa_supplicant.make > +++ b/rules/wpa_supplicant.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_WPA_SUPPLICANT) += wpa_supplicant > # Paths and names > # > WPA_SUPPLICANT_NAME := wpa_supplicant > -WPA_SUPPLICANT_VERSION := 2.11 > -WPA_SUPPLICANT_SHA256 := > 912ea06f74e30a8e36fbb68064d6cdff218d8d591db0fc5d75dee6c81ac7fc0a > +WPA_SUPPLICANT_VERSION := 2.12 > +WPA_SUPPLICANT_SHA256 := > 08e23937e16d0155e55cab2b51f51fbe10d80a1aa91c4e15442645059b737ef6 > WPA_SUPPLICANT := > $(WPA_SUPPLICANT_NAME)-$(WPA_SUPPLICANT_VERSION) > WPA_SUPPLICANT_SUFFIX := tar.gz > WPA_SUPPLICANT_URL := > https://w1.fi/releases/$(WPA_SUPPLICANT).$(WPA_SUPPLICANT_SUFFIX) > @@ -26,7 +26,10 @@ WPA_SUPPLICANT_SUBDIR := $(WPA_SUPPLICANT_NAME) > # Use '=' to delay $(shell ...) calls until this is needed > WPA_SUPPLICANT_CONFIG = $(call ptx/get-alternative, > config/wpasupplicant, defconfig) > WPA_SUPPLICANT_DOTCONFIG:= > $(BUILDDIR)/$(WPA_SUPPLICANT)/$(WPA_SUPPLICANT_SUBDIR)/.config > -WPA_SUPPLICANT_LICENSE := GPL-2.0-only > +WPA_SUPPLICANT_LICENSE := BSD-3-Clause > +WPA_SUPPLICANT_LICENSE_FILES := \ > + file://COPYING;md5=5ebcb90236d1ad640558c3d3cd3035df \ > + file://README;md5=155e35cb3d6ab0d6a17524f48f4e761c > > # > ---------------------------------------------------------------------------- > # Prepare
