From 8a93cc9799a9fd595a1c96428e08ba9f5802d94c Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Thu, 9 Jun 2022 14:53:18 -0700 Subject: */*: Restore non-IBSS part of wpa patches b8477825c2dc42f6c595697a36f593c71f39fbad removed some non-IBSS patches. Restore them. We only want to remove the patches that make IBSS use ADHOC mode. Fixes: b8477825c2dc42f6c595697a36f593c71f39fbad (cherry picked from commit c86f32d652eb9dd023049122d8ca37cb13ed07b6) --- net/hostapd-devel/Makefile | 2 +- .../files/patch-src_drivers_driver__bsd.c | 23 ++++++++++++++++++++++ net/hostapd/Makefile | 2 +- net/hostapd/files/patch-src_drivers_driver__bsd.c | 23 ++++++++++++++++++++++ security/wpa_supplicant-devel/Makefile | 2 +- .../files/patch-src_drivers_driver__bsd.c | 23 ++++++++++++++++++++++ security/wpa_supplicant/Makefile | 2 +- .../files/patch-src_drivers_driver__bsd.c | 23 ++++++++++++++++++++++ 8 files changed, 96 insertions(+), 4 deletions(-) create mode 100644 net/hostapd-devel/files/patch-src_drivers_driver__bsd.c create mode 100644 net/hostapd/files/patch-src_drivers_driver__bsd.c create mode 100644 security/wpa_supplicant-devel/files/patch-src_drivers_driver__bsd.c create mode 100644 security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c diff --git a/net/hostapd-devel/Makefile b/net/hostapd-devel/Makefile index c5d7efdc0c3a..e3e48c5dc457 100644 --- a/net/hostapd-devel/Makefile +++ b/net/hostapd-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= hostapd PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 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 new file mode 100644 index 000000000000..f56c30c30ad3 --- /dev/null +++ b/net/hostapd-devel/files/patch-src_drivers_driver__bsd.c @@ -0,0 +1,23 @@ +--- 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); diff --git a/net/hostapd/Makefile b/net/hostapd/Makefile index dbdbe8cda9be..5cd5d4fea22f 100644 --- a/net/hostapd/Makefile +++ b/net/hostapd/Makefile @@ -2,7 +2,7 @@ PORTNAME= hostapd PORTVERSION= 2.10 -PORTREVISION= 2 +PORTREVISION= 3 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 new file mode 100644 index 000000000000..f56c30c30ad3 --- /dev/null +++ b/net/hostapd/files/patch-src_drivers_driver__bsd.c @@ -0,0 +1,23 @@ +--- 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); diff --git a/security/wpa_supplicant-devel/Makefile b/security/wpa_supplicant-devel/Makefile index 9c38ff679bad..6d83310e50da 100644 --- a/security/wpa_supplicant-devel/Makefile +++ b/security/wpa_supplicant-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= wpa_supplicant PORTVERSION= ${COMMIT_DATE} -PORTREVISION= 1 +PORTREVISION= 2 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 new file mode 100644 index 000000000000..decf9a3aebdc --- /dev/null +++ b/security/wpa_supplicant-devel/files/patch-src_drivers_driver__bsd.c @@ -0,0 +1,23 @@ +--- 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); diff --git a/security/wpa_supplicant/Makefile b/security/wpa_supplicant/Makefile index 060aa8d27fc5..0248141d32b2 100644 --- a/security/wpa_supplicant/Makefile +++ b/security/wpa_supplicant/Makefile @@ -1,6 +1,6 @@ PORTNAME= wpa_supplicant PORTVERSION= 2.10 -PORTREVISION= 2 +PORTREVISION= 3 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 new file mode 100644 index 000000000000..decf9a3aebdc --- /dev/null +++ b/security/wpa_supplicant/files/patch-src_drivers_driver__bsd.c @@ -0,0 +1,23 @@ +--- 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); -- cgit v1.2.3