svn commit: r536208 - in branches/2020Q2: net/hostapd net/hostapd/files security/wpa_supplicant security/wpa_supplicant/files

[Cy Schubert]

Author: cy
Date: Fri May 22 15:49:18 2020
New Revision: 536208
URL: https://svnweb.freebsd.org/changeset/ports/536208

Log:
  MFH: r535967
  
  Chase src r361272:
  
  Silence the once per second CTRL-EVENT-SCAN-FAILED errors when the WiFi
  radio is disabled through the communication device toggle key (also known
  as the RF raidio kill button). Only the CTRL-EVENT-DISCONNECTED will be
  issued.
  
  Submitted by:	avg
  Reported by:	avg
  Approved by:	portmgr (joneum)

Added:
  branches/2020Q2/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c
     - copied unchanged from r535967, head/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c
Modified:
  branches/2020Q2/net/hostapd/Makefile
  branches/2020Q2/net/hostapd/files/patch-src_drivers_driver__bsd.c
  branches/2020Q2/security/wpa_supplicant/Makefile
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/net/hostapd/Makefile
==============================================================================
--- branches/2020Q2/net/hostapd/Makefile	Fri May 22 15:30:20 2020	(r536207)
+++ branches/2020Q2/net/hostapd/Makefile	Fri May 22 15:49:18 2020	(r536208)
@@ -3,6 +3,7 @@
 
 PORTNAME=	hostapd
 PORTVERSION=	2.9
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://w1.fi/releases/
 

Modified: branches/2020Q2/net/hostapd/files/patch-src_drivers_driver__bsd.c
==============================================================================
--- branches/2020Q2/net/hostapd/files/patch-src_drivers_driver__bsd.c	Fri May 22 15:30:20 2020	(r536207)
+++ branches/2020Q2/net/hostapd/files/patch-src_drivers_driver__bsd.c	Fri May 22 15:49:18 2020	(r536208)
@@ -1,8 +1,8 @@
---- src/drivers/driver_bsd.c.orig	2015-09-27 19:02:05 UTC
-+++ src/drivers/driver_bsd.c
-@@ -623,7 +623,11 @@ rtbuf_len(void)
+--- src/drivers/driver_bsd.c.orig2	2019-08-07 06:25:25.000000000 -0700
++++ src/drivers/driver_bsd.c	2020-05-19 21:11:18.891164000 -0700
+@@ -665,7 +665,11 @@
  static int bsd_sta_deauth(void *priv, const u8 *own_addr, const u8 *addr,
- 			  int reason_code);
+ 			  u16 reason_code);
  
 +#ifdef __DragonFly__
 +const char *
@@ -12,3 +12,25 @@
  ether_sprintf(const u8 *addr)
  {
  	static char buf[sizeof(MACSTR)];
+@@ -1336,14 +1340,18 @@
+ 		drv = bsd_get_drvindex(global, ifm->ifm_index);
+ 		if (drv == NULL)
+ 			return;
+-		if ((ifm->ifm_flags & IFF_UP) == 0 &&
+-		    (drv->flags & IFF_UP) != 0) {
++		if (((ifm->ifm_flags & IFF_UP) == 0 ||
++		    (ifm->ifm_flags & IFF_RUNNING) == 0) &&
++		    (drv->flags & IFF_UP) != 0 &&
++		    (drv->flags & IFF_RUNNING) != 0) {
+ 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' DOWN",
+ 				   drv->ifname);
+ 			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED,
+ 					     NULL);
+ 		} else if ((ifm->ifm_flags & IFF_UP) != 0 &&
+-		    (drv->flags & IFF_UP) == 0) {
++		    (ifm->ifm_flags & IFF_RUNNING) != 0 &&
++		    ((drv->flags & IFF_UP) == 0 ||
++		    (drv->flags & IFF_RUNNING)  == 0)) {
+ 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
+ 				   drv->ifname);
+ 			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,

Modified: branches/2020Q2/security/wpa_supplicant/Makefile
==============================================================================
--- branches/2020Q2/security/wpa_supplicant/Makefile	Fri May 22 15:30:20 2020	(r536207)
+++ branches/2020Q2/security/wpa_supplicant/Makefile	Fri May 22 15:49:18 2020	(r536208)
@@ -2,7 +2,7 @@
 
 PORTNAME=	wpa_supplicant
 PORTVERSION=	2.9
-PORTREVISION=	3
+PORTREVISION=	5
 CATEGORIES=	security net
 MASTER_SITES=	https://w1.fi/releases/
 

Copied: branches/2020Q2/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c (from r535967, head/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c	Fri May 22 15:49:18 2020	(r536208, copy of r535967, head/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c)
@@ -0,0 +1,24 @@
+--- src/drivers/driver_bsd.c.orig	2019-08-07 06:25:25.000000000 -0700
++++ src/drivers/driver_bsd.c	2020-05-19 18:17:48.607660000 -0700
+@@ -1336,14 +1336,18 @@
+ 		drv = bsd_get_drvindex(global, ifm->ifm_index);
+ 		if (drv == NULL)
+ 			return;
+-		if ((ifm->ifm_flags & IFF_UP) == 0 &&
+-		    (drv->flags & IFF_UP) != 0) {
++		if (((ifm->ifm_flags & IFF_UP) == 0 ||
++		    (ifm->ifm_flags & IFF_RUNNING) == 0) &&
++		    (drv->flags & IFF_UP) != 0 &&
++		    (drv->flags & IFF_RUNNING) != 0) {
+ 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' DOWN",
+ 				   drv->ifname);
+ 			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_DISABLED,
+ 					     NULL);
+ 		} else if ((ifm->ifm_flags & IFF_UP) != 0 &&
+-		    (drv->flags & IFF_UP) == 0) {
++		    (ifm->ifm_flags & IFF_RUNNING) != 0 &&
++		    ((drv->flags & IFF_UP) == 0 ||
++		    (drv->flags & IFF_RUNNING)  == 0)) {
+ 			wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
+ 				   drv->ifname);
+ 			wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,