hostapd: update packaging and patches

Clean up conflicts/provides/depends hell and add PROVIDES for
eapol-test variants while at it.
Update mesh-DFS patchset from Peter Oh to v5 (with local fixes) which
allows to drop two revert-patches for upstream commits which previously
were necessary to un-break mesh-DFS support.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

1 files changed, 48 insertions, 20 deletions

diff --git a/package/network/services/hostapd/patches/010-mesh-consider-mesh-interface-on-dfs-event-handler.patch b/package/network/services/hostapd/patches/010-mesh-consider-mesh-interface-on-dfs-event-handler.patch
index e4711a8..3f5178a 100644
--- a/package/network/services/hostapd/patches/010-mesh-consider-mesh-interface-on-dfs-event-handler.patch
+++ b/package/network/services/hostapd/patches/010-mesh-consider-mesh-interface-on-dfs-event-handler.patch
@@ -1,16 +1,17 @@
-From 90aa570a894a907d11f85ced43a248198e24acc1 Mon Sep 17 00:00:00 2001
+From 9a8ca54a264a2820af614043e7af853166b320b0 Mon Sep 17 00:00:00 2001
 From: Peter Oh <peter.oh@bowerswilkins.com>
-Date: Tue, 17 Apr 2018 21:55:07 -0700
-Subject: [PATCH 10/16] mesh: consider mesh interface on dfs event handler
+Date: Tue, 29 May 2018 14:39:14 -0700
+Subject: [PATCH 10/18] mesh: consider mesh interface on dfs event handler
 
 Once mesh starts supporting DFS channels, it has to handle DFS related events
 from drivers, hence add mesh interface to the check list.
 
 Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
+Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
 ---
  wpa_supplicant/ap.c     | 71 ++++++++++++++++++++++++++++++-----------
- wpa_supplicant/events.c |  1 +
- 2 files changed, 54 insertions(+), 18 deletions(-)
+ wpa_supplicant/events.c |  7 ++--
+ 2 files changed, 57 insertions(+), 21 deletions(-)
 
 --- a/wpa_supplicant/ap.c
 +++ b/wpa_supplicant/ap.c
@@ -37,8 +38,8 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  }
  
 @@ -1540,10 +1545,16 @@ int wpas_ap_pmksa_cache_add_external(str
- void wpas_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
- 				   struct dfs_event *radar)
+ void wpas_ap_event_dfs_radar_detected(struct wpa_supplicant *wpa_s,
+ 				      struct dfs_event *radar)
  {
 -	if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
 -		return;
@@ -56,9 +57,9 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  				   radar->ht_enabled, radar->chan_offset,
  				   radar->chan_width,
  				   radar->cf1, radar->cf2);
-@@ -1553,10 +1564,16 @@ void wpas_event_dfs_radar_detected(struc
- void wpas_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
- 				struct dfs_event *radar)
+@@ -1553,10 +1564,16 @@ void wpas_ap_event_dfs_radar_detected(st
+ void wpas_ap_event_dfs_cac_started(struct wpa_supplicant *wpa_s,
+ 				   struct dfs_event *radar)
  {
 -	if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
 -		return;
@@ -76,9 +77,9 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  			      radar->ht_enabled, radar->chan_offset,
  			      radar->chan_width, radar->cf1, radar->cf2);
  }
-@@ -1565,10 +1582,16 @@ void wpas_event_dfs_cac_started(struct w
- void wpas_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
- 				 struct dfs_event *radar)
+@@ -1565,10 +1582,16 @@ void wpas_ap_event_dfs_cac_started(struc
+ void wpas_ap_event_dfs_cac_finished(struct wpa_supplicant *wpa_s,
+ 				    struct dfs_event *radar)
  {
 -	if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
 -		return;
@@ -96,9 +97,9 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  				 radar->ht_enabled, radar->chan_offset,
  				 radar->chan_width, radar->cf1, radar->cf2);
  }
-@@ -1577,10 +1600,16 @@ void wpas_event_dfs_cac_finished(struct
- void wpas_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
- 				struct dfs_event *radar)
+@@ -1577,10 +1600,16 @@ void wpas_ap_event_dfs_cac_finished(stru
+ void wpas_ap_event_dfs_cac_aborted(struct wpa_supplicant *wpa_s,
+ 				   struct dfs_event *radar)
  {
 -	if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
 -		return;
@@ -116,9 +117,9 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  				 radar->ht_enabled, radar->chan_offset,
  				 radar->chan_width, radar->cf1, radar->cf2);
  }
-@@ -1589,10 +1618,16 @@ void wpas_event_dfs_cac_aborted(struct w
- void wpas_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
- 				     struct dfs_event *radar)
+@@ -1589,10 +1618,16 @@ void wpas_ap_event_dfs_cac_aborted(struc
+ void wpas_ap_event_dfs_cac_nop_finished(struct wpa_supplicant *wpa_s,
+ 					struct dfs_event *radar)
  {
 -	if (!wpa_s->ap_iface || !wpa_s->ap_iface->bss[0])
 -		return;
@@ -138,7 +139,34 @@ Signed-off-by: Peter Oh <peter.oh@bowerswilkins.com>
  }
 --- a/wpa_supplicant/events.c
 +++ b/wpa_supplicant/events.c
-@@ -4203,6 +4203,7 @@ void wpa_supplicant_event(void *ctx, enu
+@@ -3802,7 +3802,7 @@ static void wpas_event_dfs_cac_started(s
+ 				       struct dfs_event *radar)
+ {
+ #if defined(NEED_AP_MLME) && defined(CONFIG_AP)
+-	if (wpa_s->ap_iface) {
++	if (wpa_s->ap_iface || wpa_s->ifmsh) {
+ 		wpas_ap_event_dfs_cac_started(wpa_s, radar);
+ 	} else
+ #endif /* NEED_AP_MLME && CONFIG_AP */
+@@ -3823,7 +3823,7 @@ static void wpas_event_dfs_cac_finished(
+ 					struct dfs_event *radar)
+ {
+ #if defined(NEED_AP_MLME) && defined(CONFIG_AP)
+-	if (wpa_s->ap_iface) {
++	if (wpa_s->ap_iface || wpa_s->ifmsh) {
+ 		wpas_ap_event_dfs_cac_finished(wpa_s, radar);
+ 	} else
+ #endif /* NEED_AP_MLME && CONFIG_AP */
+@@ -3839,7 +3839,7 @@ static void wpas_event_dfs_cac_aborted(s
+ 				       struct dfs_event *radar)
+ {
+ #if defined(NEED_AP_MLME) && defined(CONFIG_AP)
+-	if (wpa_s->ap_iface) {
++	if (wpa_s->ap_iface || wpa_s->ifmsh) {
+ 		wpas_ap_event_dfs_cac_aborted(wpa_s, radar);
+ 	} else
+ #endif /* NEED_AP_MLME && CONFIG_AP */
+@@ -4278,6 +4278,7 @@ void wpa_supplicant_event(void *ctx, enu
  #ifdef CONFIG_AP
  		if (wpa_s->current_ssid->mode == WPAS_MODE_AP ||
  		    wpa_s->current_ssid->mode == WPAS_MODE_P2P_GO ||