git: c4cbed89d034 - 2022Q2 - */*: FreeBSD's WPA does support IBSS mode
Date: Mon, 20 Jun 2022 15:12:49 UTC
The branch 2022Q2 has been updated by cy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=c4cbed89d034e74ce03561d313ccedd9c576a7cf
commit c4cbed89d034e74ce03561d313ccedd9c576a7cf
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-06-09 20:25:43 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-06-20 15:12:00 +0000
*/*: FreeBSD's WPA does support IBSS mode
FreeBSD's WPA does support IBSS mode. Remove the hack that forces ADHOC
mode when IBSS is requested.
(cherry picked from commit b8477825c2dc42f6c595697a36f593c71f39fbad)
---
net/hostapd-devel/Makefile | 1 +
.../files/patch-src_drivers_driver__bsd.c | 39 ----------------------
net/hostapd/Makefile | 2 +-
net/hostapd/files/patch-src_drivers_driver__bsd.c | 39 ----------------------
security/wpa_supplicant-devel/Makefile | 1 +
.../files/patch-src_drivers_driver__bsd.c | 39 ----------------------
security/wpa_supplicant/Makefile | 2 +-
.../files/patch-src_drivers_driver__bsd.c | 39 ----------------------
8 files changed, 4 insertions(+), 158 deletions(-)
diff --git a/net/hostapd-devel/Makefile b/net/hostapd-devel/Makefile
index f477d805c3be..c5d7efdc0c3a 100644
--- a/net/hostapd-devel/Makefile
+++ b/net/hostapd-devel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= hostapd
PORTVERSION= ${COMMIT_DATE}
+PORTREVISION= 1
CATEGORIES= net
PKGNAMESUFFIX= -devel
diff --git a/net/hostapd-devel/files/patch-src_drivers_driver__bsd.c b/net/hostapd-devel/files/patch-src_drivers_driver__bsd.c
deleted file mode 100644
index 9a37a1de0174..000000000000
--- a/net/hostapd-devel/files/patch-src_drivers_driver__bsd.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/drivers/driver_bsd.c.orig 2021-06-02 14:11:18.000000000 -0700
-+++ src/drivers/driver_bsd.c 2021-06-13 23:11:15.089256000 -0700
-@@ -853,14 +853,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,
-@@ -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;
diff --git a/net/hostapd/Makefile b/net/hostapd/Makefile
index 26b97a5fd502..dbdbe8cda9be 100644
--- a/net/hostapd/Makefile
+++ b/net/hostapd/Makefile
@@ -2,7 +2,7 @@
PORTNAME= hostapd
PORTVERSION= 2.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= https://w1.fi/releases/
diff --git a/net/hostapd/files/patch-src_drivers_driver__bsd.c b/net/hostapd/files/patch-src_drivers_driver__bsd.c
deleted file mode 100644
index 9a37a1de0174..000000000000
--- a/net/hostapd/files/patch-src_drivers_driver__bsd.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/drivers/driver_bsd.c.orig 2021-06-02 14:11:18.000000000 -0700
-+++ src/drivers/driver_bsd.c 2021-06-13 23:11:15.089256000 -0700
-@@ -853,14 +853,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,
-@@ -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;
diff --git a/security/wpa_supplicant-devel/Makefile b/security/wpa_supplicant-devel/Makefile
index dc4956d80993..9c38ff679bad 100644
--- a/security/wpa_supplicant-devel/Makefile
+++ b/security/wpa_supplicant-devel/Makefile
@@ -1,5 +1,6 @@
PORTNAME= wpa_supplicant
PORTVERSION= ${COMMIT_DATE}
+PORTREVISION= 1
CATEGORIES= security net
PKGNAMESUFFIX= -devel
diff --git a/security/wpa_supplicant-devel/files/patch-src_drivers_driver__bsd.c b/security/wpa_supplicant-devel/files/patch-src_drivers_driver__bsd.c
deleted file mode 100644
index 702e60d3b95c..000000000000
--- a/security/wpa_supplicant-devel/files/patch-src_drivers_driver__bsd.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/drivers/driver_bsd.c.orig 2021-06-02 14:11:18.000000000 -0700
-+++ src/drivers/driver_bsd.c 2021-06-13 23:08:54.275496000 -0700
-@@ -853,14 +853,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,
-@@ -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;
diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile
index aaeda909f826..060aa8d27fc5 100644
--- a/security/wpa_supplicant/Makefile
+++ b/security/wpa_supplicant/Makefile
@@ -1,6 +1,6 @@
PORTNAME= wpa_supplicant
PORTVERSION= 2.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security net
MASTER_SITES= https://w1.fi/releases/
diff --git a/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c b/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c
deleted file mode 100644
index 702e60d3b95c..000000000000
--- a/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- src/drivers/driver_bsd.c.orig 2021-06-02 14:11:18.000000000 -0700
-+++ src/drivers/driver_bsd.c 2021-06-13 23:08:54.275496000 -0700
-@@ -853,14 +853,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,
-@@ -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;