zeus migration: wpa-supplicant: update recipe to version 2.9

https://jira.digi.com/browse/DEL-7013

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>

meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/0001-wpa_supplicant-enable-control-socket-interface-when-.patch

@@ -8,24 +8,13 @@ Otherwise trying to use the "wpa_cli" fails with:
 Failed to connect to non-global ctrl_ifname
 
 Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
 ---
- wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in | 2 +-
+ wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in | 2 +-
- wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in           | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
- 2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
-index a75918f9380b..9cce6331d92e 100644
---- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
-+++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in
-@@ -1,5 +1,5 @@
- [D-BUS Service]
- Name=fi.epitest.hostap.WPASupplicant
--Exec=@BINDIR@/wpa_supplicant -u
-+Exec=@BINDIR@/wpa_supplicant -u -O /var/run/wpa_supplicant
- User=root
- SystemdService=wpa_supplicant.service
 diff --git a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
-index d97ff392175d..98b72cf32481 100644
+index d97ff3921..98b72cf32 100644
 --- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
 +++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in
 @@ -1,5 +1,5 @@

meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/0002-wpa_supplicant-systemd-enable-control-socket-interfa.patch

@@ -1,5 +1,5 @@
 From: Arturo Buzarra <arturo.buzarra@digi.com>
-Date: Thu, 7 Mar 2019 09:47:52 +0100
+Date: Thu, 2 Apr 2020 16:26:48 +0200
 Subject: [PATCH] wpa_supplicant: systemd: enable control socket interface for
  systemd service
 
@@ -15,15 +15,18 @@ Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/wpa_supplicant/systemd/wpa_supplicant.service.in b/wpa_supplicant/systemd/wpa_supplicant.service.in
-index bc5d49a..6c38238 100644
+index 75a37a8cd..6d3a04a0e 100644
 --- a/wpa_supplicant/systemd/wpa_supplicant.service.in
 +++ b/wpa_supplicant/systemd/wpa_supplicant.service.in
-@@ -6,7 +6,7 @@ Wants=network.target
+@@ -4,10 +4,10 @@ Before=network.target
+ Wants=network.target
+
  [Service]
  Type=dbus
- BusName=@DBUS_INTERFACE@
+ BusName=fi.w1.wpa_supplicant1
 -ExecStart=@BINDIR@/wpa_supplicant -u
 +ExecStart=@BINDIR@/wpa_supplicant -u -O /var/run/wpa_supplicant
 
  [Install]
  WantedBy=multi-user.target
+ Alias=dbus-fi.w1.wpa_supplicant1.service

meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/0003-mesh-encapsulate-VHT-property-with-the-proper-CONFIG.patch

@@ -0,0 +1,35 @@
+From: Arturo Buzarra <arturo.buzarra@digi.com>
+Date: Mon, 9 Mar 2020 17:18:35 +0100
+Subject: [PATCH] mesh: Fix CONFIG_HT_OVERRIDES build without CONFIG_VHT_OVERRIDES
+
+Commit e5a9b1e8a3 ("mesh: Implement use of VHT20 config in mesh mode")
+introduced the possibility to check the disable_vht param. However, this
+entry is only available when CONFIG_VHT_OVERRIDES is enabled and as
+such, this broke the build for some cases.
+
+Fix this by encapsulating VHT property with the proper CONFIG entry.
+
+Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
+---
+ wpa_supplicant/wpa_supplicant.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c
+index 911d79d17..3fbcf2a70 100644
+--- a/wpa_supplicant/wpa_supplicant.c
++++ b/wpa_supplicant/wpa_supplicant.c
+@@ -2237,12 +2237,14 @@ void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
+ 
+ 	freq->channel = pri_chan->chan;
+ 
+ #ifdef CONFIG_HT_OVERRIDES
+ 	if (ssid->disable_ht40) {
++#ifdef CONFIG_VHT_OVERRIDES
+ 		if (ssid->disable_vht)
+ 			return;
++#endif /* CONFIG_VHT_OVERRIDES */
+ 		goto skip_ht40;
+ 	}
+ #endif /* CONFIG_HT_OVERRIDES */
+ 
+ 	/* Check/setup HT40+/HT40- */

meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/defconfig

@@ -39,6 +39,10 @@
 #LIBS = -lssl
 ###############################################################################
 
+
+# Driver interface for Host AP driver
+CONFIG_DRIVER_HOSTAP=y
+
 # Driver interface for Agere driver
 #CONFIG_DRIVER_HERMES=y
 # Change include directories to match with the local setup
@@ -396,10 +400,6 @@ CONFIG_PEERKEY=y
 #CONFIG_NDIS_EVENTS_INTEGRATED=y
 #PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
 
-# Add support for old DBus control interface
-# (fi.epitest.hostap.WPASupplicant)
-CONFIG_CTRL_IFACE_DBUS=y
-
 # Add support for new DBus control interface
 # (fi.w1.hostap.wpa_supplicant1)
 CONFIG_CTRL_IFACE_DBUS_NEW=y
@@ -538,6 +538,8 @@ CONFIG_IEEE80211N=y
 # external RADIUS server can be supported with hostapd.
 CONFIG_AP=y
 
+CONFIG_BGSCAN_SIMPLE=y
+
 # P2P (Wi-Fi Direct)
 # This can be used to enable P2P support in wpa_supplicant. See README-P2P for
 # more information on P2P operations.

meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend

@@ -7,6 +7,7 @@ PACKAGECONFIG ?= "openssl"
 SRC_URI += " \
     file://0001-wpa_supplicant-enable-control-socket-interface-when-.patch \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://0002-wpa_supplicant-systemd-enable-control-socket-interfa.patch', '', d)} \
+    file://0003-mesh-encapsulate-VHT-property-with-the-proper-CONFIG.patch \
     file://wpa_supplicant_p2p.conf \
 "