From nobody Mon Jun 20 15:12:49 2022 X-Original-To: dev-commits-ports-all@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 9D6ED8682C0; Mon, 20 Jun 2022 15:12:50 +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 4LRY6n3k6zz4gqf; Mon, 20 Jun 2022 15:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655737969; 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=SHaHUBdQV29ZkfQSjQAbTFHOBtYPMlgNJ6e4Ux1IfyQ=; b=renoY8Drtl50MZjbrwTi2pFXY60fuM+6yN821RsVNx14v8diazFB7dw3hWTyMFlKcw6kw9 weEY1EXfNKOysx3EksyJGQ8JsjryptTbWHhoX9nTfM7Lc1sY1ZV9yCFPYSJz+VB5i05FVv SrLvVNcO5XCLJnqHYxZ3oRrAIVo/w57a4QshHZ0Wvy1VqKwZBNazlSDsxhg7omNlqj+BRB l0stJ/+e7MVmh6fgsaL5AqskhYTalMdA40mvg6i66L0QcdkoI1uy+54qDx0UFiP09x6zT2 jyd+JNolj6aZIEMNIvl+1g8VykYaf81NlbBhTFGgsIQJ/bBkpjjoT79tw799Fw== 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 4BE811F672; Mon, 20 Jun 2022 15:12:49 +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 25KFCnhH003897; Mon, 20 Jun 2022 15:12:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25KFCneJ003896; Mon, 20 Jun 2022 15:12:49 GMT (envelope-from git) Date: Mon, 20 Jun 2022 15:12:49 GMT Message-Id: <202206201512.25KFCneJ003896@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: c4cbed89d034 - 2022Q2 - */*: FreeBSD's WPA does support IBSS mode List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: c4cbed89d034e74ce03561d313ccedd9c576a7cf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655737969; 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=SHaHUBdQV29ZkfQSjQAbTFHOBtYPMlgNJ6e4Ux1IfyQ=; b=dK03JGzyU62Zo7YV3m1htkfSuXyMj0iKB+g/q1bbpg3xJE2c7c2fdo13h29VOMImoqVCSr YXHdLQM01ir6g36vMPg3N2UxHDKeX897kXpKNOQfda04lfutv9M8sHt4bgNVr3RfdJ3BG9 cWzj7vE+gt8U8cEEP8yQ0HCLAUJfTorxNJAK0j0ogpJ70H33u3ry0oyxnwtUkzHohjhxQV pvTrlmeEdi7KEcdTK6TZzR2QqClPJG+IENq9J+iXc6jUmEhPVrurrswm+uCSdpoATV+jfE WGxF1SJ0coiEa9diXS0OAM3Gq8uHpKYlPqT07aPHUt984IuQRzHj6/1UEvvviQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655737969; a=rsa-sha256; cv=none; b=WgFFQIdoFtldSkb9cCDa1InWSiWWPchuX/yFsxj2rShdkXhHXnINYqAsiz5MxYMIYXhK+i 9nJfpEERBalBHSJ45a78o28R5ADDTLyTenmlPOpzqGr8KrP1lpx/AFnIzA8RGKqFGAyQ+7 yUn5ono7oFSXo3VZAwjXOWCPmHJHZJi01d1T+5PSI0rWNPwGDRIIh27GVf+wzMaQZrLjmw /6kRTHjDFuSu5Kpe1eIPOfrs6FvNWOVq60pkcXXIvtsZWB2MFCZa84ITtE3GXwQC/oP951 c4eHPG2/NUCfhK8P5u6oWxh/eo5F3Ib3qTq9bnEGPKXXc5jpdcbxQxySD9azEA== 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=c4cbed89d034e74ce03561d313ccedd9c576a7cf commit c4cbed89d034e74ce03561d313ccedd9c576a7cf Author: Cy Schubert AuthorDate: 2022-06-09 20:25:43 +0000 Commit: Cy Schubert 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;