sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

*/*: Sync hostapd* and wpa_supplicant* with base ce276fe26d92010776

Browse source 
Use IFM_IEEE80211_ADHOC for now on FreeBSD for IBSS operation.

Base commit by adrian@ on Nov 26, 2015.

This commit syncs ports with base.

PR:		203086
Submitted by:	avos
MFH:		2020Q2
This commit is contained in:
Cy Schubert 2021-06-14 06:22:42 -07:00
parent c6f1867664
commit ed47e1ecc5
8 changed files with 74 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net/hostapd-devel/Makefile
View file

@ -3,6 +3,7 @@
PORTNAME= hostapd PORTNAME= hostapd
PORTVERSION= ${COMMIT_DATE} PORTVERSION= ${COMMIT_DATE}
CATEGORIES= net CATEGORIES= net
PORTREVISION= 1
PKGNAMESUFFIX= -devel PKGNAMESUFFIX= -devel
MAINTAINER= cy@FreeBSD.org MAINTAINER= cy@FreeBSD.org

21
net/hostapd-devel/files/patch-src_drivers_driver__bsd.c
View file

@ -1,6 +1,6 @@
--- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700 --- src/drivers/driver_bsd.c.orig 2021-06-02 14:11:18.000000000 -0700
+++ src/drivers/driver_bsd.c 2021-01-20 08:00:59.210974000 -0800 +++ src/drivers/driver_bsd.c 2021-06-13 23:11:15.089256000 -0700
@@ -1336,14 +1336,18 @@ @@ -853,14 +853,18 @@
drv = bsd_get_drvindex(global, ifm->ifm_index); drv = bsd_get_drvindex(global, ifm->ifm_index);
if (drv == NULL) if (drv == NULL)
return; return;
@ -22,3 +22,18 @@
wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP", wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
drv->ifname); drv->ifname);
wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED, wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,
@@ -1220,7 +1224,14 @@
mode = 0 /* STA */;
break;
case IEEE80211_MODE_IBSS:
+ /*
+ * Ref bin/203086 - FreeBSD's net80211 currently uses
+ * IFM_IEEE80211_ADHOC.
+ */
+#if 0
mode = IFM_IEEE80211_IBSS;
+#endif
+ mode = IFM_IEEE80211_ADHOC;
break;
case IEEE80211_MODE_AP:
mode = IFM_IEEE80211_HOSTAP;

2
net/hostapd/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= hostapd PORTNAME= hostapd
PORTVERSION= 2.9 PORTVERSION= 2.9
PORTREVISION= 3 PORTREVISION= 4
CATEGORIES= net CATEGORIES= net
MASTER_SITES= https://w1.fi/releases/ MASTER_SITES= https://w1.fi/releases/

19
net/hostapd/files/patch-src_drivers_driver__bsd.c
View file

@ -1,5 +1,5 @@
--- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700 --- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700
+++ src/drivers/driver_bsd.c 2021-01-20 08:04:07.589603000 -0800 +++ src/drivers/driver_bsd.c 2021-06-13 23:10:12.570253000 -0700
@@ -649,7 +649,7 @@ @@ -649,7 +649,7 @@
len = 2048; len = 2048;
} }
@ -21,7 +21,22 @@
ether_sprintf(const u8 *addr) ether_sprintf(const u8 *addr)
{ {
static char buf[sizeof(MACSTR)]; static char buf[sizeof(MACSTR)];
@@ -1336,14 +1340,18 @@ @@ -1080,7 +1084,14 @@
mode = 0 /* STA */;
break;
case IEEE80211_MODE_IBSS:
+ /*
+ * Ref bin/203086 - FreeBSD's net80211 currently uses
+ * IFM_IEEE80211_ADHOC.
+ */
+#if 0
mode = IFM_IEEE80211_IBSS;
+#endif
+ mode = IFM_IEEE80211_ADHOC;
break;
case IEEE80211_MODE_AP:
mode = IFM_IEEE80211_HOSTAP;
@@ -1336,14 +1347,18 @@
drv = bsd_get_drvindex(global, ifm->ifm_index); drv = bsd_get_drvindex(global, ifm->ifm_index);
if (drv == NULL) if (drv == NULL)
return; return;

1
security/wpa_supplicant-devel/Makefile
View file

@ -1,6 +1,7 @@
PORTNAME= wpa_supplicant PORTNAME= wpa_supplicant
PORTVERSION= ${COMMIT_DATE} PORTVERSION= ${COMMIT_DATE}
CATEGORIES= security net CATEGORIES= security net
PORTREVISION= 1
PKGNAMESUFFIX= -devel PKGNAMESUFFIX= -devel
MAINTAINER= cy@FreeBSD.org MAINTAINER= cy@FreeBSD.org

21
security/wpa_supplicant-devel/files/patch-src_drivers_driver__bsd.c
View file

@ -1,6 +1,6 @@
--- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700 --- src/drivers/driver_bsd.c.orig 2021-06-02 14:11:18.000000000 -0700
+++ src/drivers/driver_bsd.c 2021-01-20 08:00:59.210974000 -0800 +++ src/drivers/driver_bsd.c 2021-06-13 23:08:54.275496000 -0700
@@ -1336,14 +1336,18 @@ @@ -853,14 +853,18 @@
drv = bsd_get_drvindex(global, ifm->ifm_index); drv = bsd_get_drvindex(global, ifm->ifm_index);
if (drv == NULL) if (drv == NULL)
return; return;
@ -22,3 +22,18 @@
wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP", wpa_printf(MSG_DEBUG, "RTM_IFINFO: Interface '%s' UP",
drv->ifname); drv->ifname);
wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED, wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED,
@@ -1220,7 +1224,14 @@
mode = 0 /* STA */;
break;
case IEEE80211_MODE_IBSS:
+ /*
+ * Ref bin/203086 - FreeBSD's net80211 currently uses
+ * IFM_IEEE80211_ADHOC.
+ */
+#if 0
mode = IFM_IEEE80211_IBSS;
+#endif
+ mode = IFM_IEEE80211_ADHOC;
break;
case IEEE80211_MODE_AP:
mode = IFM_IEEE80211_HOSTAP;

2
security/wpa_supplicant/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= wpa_supplicant PORTNAME= wpa_supplicant
PORTVERSION= 2.9 PORTVERSION= 2.9
PORTREVISION= 10 PORTREVISION= 11
CATEGORIES= security net CATEGORIES= security net
MASTER_SITES= https://w1.fi/releases/ MASTER_SITES= https://w1.fi/releases/

19
security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c
View file

@ -1,5 +1,5 @@
--- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700 --- src/drivers/driver_bsd.c.orig 2019-08-07 06:25:25.000000000 -0700
+++ src/drivers/driver_bsd.c 2021-01-20 08:00:59.210974000 -0800 +++ src/drivers/driver_bsd.c 2021-06-13 23:07:14.016849000 -0700
@@ -649,7 +649,7 @@ @@ -649,7 +649,7 @@
len = 2048; len = 2048;
} }
@ -9,7 +9,22 @@
} }
#ifdef HOSTAPD #ifdef HOSTAPD
@@ -1336,14 +1336,18 @@ @@ -1080,7 +1080,14 @@
mode = 0 /* STA */;
break;
case IEEE80211_MODE_IBSS:
+ /*
+ * Ref bin/203086 - FreeBSD's net80211 currently uses
+ * IFM_IEEE80211_ADHOC.
+ */
+#if 0
mode = IFM_IEEE80211_IBSS;
+#endif
+ mode = IFM_IEEE80211_ADHOC;
break;
case IEEE80211_MODE_AP:
mode = IFM_IEEE80211_HOSTAP;
@@ -1336,14 +1343,18 @@
drv = bsd_get_drvindex(global, ifm->ifm_index); drv = bsd_get_drvindex(global, ifm->ifm_index);
if (drv == NULL) if (drv == NULL)
return; return;