From nobody Mon Jun 20 15:12:50 2022 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6C88686839F; Mon, 20 Jun 2022 15:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LRY6q0YKMz4hBt; Mon, 20 Jun 2022 15:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655737971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1P2ddedSIBKlS0J5aCNbO8LpBuQtz65uXRQmIdcf3Cw=; b=QFg3+XJq3Hr56gx5X+hSGnCJpDflIDjRRd/kmBkzHUZlfVOTgomCeOQNieeTjVKPjdTiM6 C22rm8NHp3qbgtFOrvFgtM3tyLx6iGG6M9y+En4qDgQ34FIpdwBXeqNTCKZr+OzER/yRfD CTv4M6HYnDBh2g7ucoAOJnMy54yN9SCgDjUXZNE9FxHUx7e9STQzVqRffukt68r0Hr3oaR vPj0F8rcRdleI14PssUVMPjDA/2uLMhtjC8L+AcGsJJxN0LK7QhIHie2LGCZmR95eTSXT1 wRFq6d9Jo1pOs2QIAxc+MOXtVdUIqjQuVxIyuNPU9VDlwUm2IJmqCKZW4BuQtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7447A1FADB; Mon, 20 Jun 2022 15:12:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25KFCocU003921; Mon, 20 Jun 2022 15:12:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25KFCorv003920; Mon, 20 Jun 2022 15:12:50 GMT (envelope-from git) Date: Mon, 20 Jun 2022 15:12:50 GMT Message-Id: <202206201512.25KFCorv003920@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Cy Schubert Subject: git: 8a93cc9799a9 - 2022Q2 - */*: Restore non-IBSS part of wpa patches List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q2 X-Git-Reftype: branch X-Git-Commit: 8a93cc9799a9fd595a1c96428e08ba9f5802d94c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655737971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1P2ddedSIBKlS0J5aCNbO8LpBuQtz65uXRQmIdcf3Cw=; b=o36F2yP0t2fAukle8ctYuwz+wBdEHW9+ZEANtqVH7Dh/ANLCas4DG1OWNNcyooSptATXD6 m7pg+0Wa3oczwhRi5/1Pwf1oFD+ulEvRGtfyXYivKYPIhx7R5J5ap24A3i6tvyXVkIsclu ObcC50ixPGMeVPZyzbQxvFVwZBSX//xLfCzi78SVSRLOxXmq1ulIFX4cNcc8Yw2C3DIw8C cDLGHQ1OcbdclGihxXOCPhpm4sNeMq4Gxd5yYGHQdOUbFgfJ477fo3ML5fksxXZhpVjWMi E7Qj2tnljughROB4VXIMgdqjlDOlneKPIL5Mc9kKH4DTuKhZAgc0doNL7w4/Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655737971; a=rsa-sha256; cv=none; b=LT+Qo7v4aDQJXGuyKyaV4I3cWB9Z/XOk3O80yjNnQv9k+JRCbFqut/9Kd6IWqjYSEJq2sH h5CpNyLpLtj5O9k88JVVv4u15uWJyLnLBbsXvujTEW7O2ul+KXcOcVL2fSvOHI/4a3nc8W UZCK3gdIlx8ZaP4ny1Vq5oLoQQHdYyUMtnR1NH/knzrsIPuq/DJvtX0OuCHlplrmSRijpL wRQw6z3xEif8XYMxArKXWf91dLhT6PzWJFbAmw7Gq4Gobf2Z9OME6kdLwvRP1JsR/W7dms FEnhYC37PaZNamlqneR5KgSE8u+oZ/kz2MkpRnl0EnwzahBwt9n+tvszWUoebg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=8a93cc9799a9fd595a1c96428e08ba9f5802d94c commit 8a93cc9799a9fd595a1c96428e08ba9f5802d94c Author: Cy Schubert AuthorDate: 2022-06-09 21:53:18 +0000 Commit: Cy Schubert CommitDate: 2022-06-20 15:12:00 +0000 */*: 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(-) 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);