From nobody Thu Jun 09 21:58:33 2022 X-Original-To: dev-commits-ports-main@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 58C7F8314D2; Thu, 9 Jun 2022 21:58:34 +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 4LJyf214kQz4RvW; Thu, 9 Jun 2022 21:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654811914; 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=WeT5LU3h7N3Rw/oXVvxX81TMqt9FwoyL98FIv65C9D8=; b=dU5H1iY/wrgjWG55AXhaB1TzkxKsmzUUDua3F6LmbwkdTMJ83SBjzDrYNaBQKMXkmQNw8M lijgLs1gOo6NMLsKG8naDT6merFPzJREbCDEfvZtTC7O8f2XSdFaYU5h5f9bNvC2psEDg7 /drfDQWCkIdtZz2XZswPtd+piYM24wa5WBSLSCm/lx6r/6MdB2bXOUfiEhwS+7XoCwPlcd rwZ+IvD/+huJkXg/VzdIT0huNX0aAsGa3K+pwU1NVjCiQJ9ExitYIT26Dv9C8W2QchPlK8 UbnNwa1ST0TuJXxjgWXpjkt9XKH8E3TUdoCO6wZPEFNlSChew2GpsMb6YU+UaA== 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 035CA41F1; Thu, 9 Jun 2022 21:58:34 +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 259LwXvs032128; Thu, 9 Jun 2022 21:58:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 259LwXqR032127; Thu, 9 Jun 2022 21:58:33 GMT (envelope-from git) Date: Thu, 9 Jun 2022 21:58:33 GMT Message-Id: <202206092158.259LwXqR032127@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: c86f32d652eb - main - */*: Restore non-IBSS part of wpa patches List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: c86f32d652eb9dd023049122d8ca37cb13ed07b6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654811914; 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=WeT5LU3h7N3Rw/oXVvxX81TMqt9FwoyL98FIv65C9D8=; b=D/yn+gq/0f3S6/M+yAa7mUCQDFxHQ2wqa56+C5/5cHt6THC+7bjk1O8SVWNJJQbOlE833w xWNfjGDfrqBCXhynstgI4r/6pRH8xjZBYR+ygNyocfD1Ks7QeH/kGIAngQjUi50oFj0Qwv xu1iDiNl3tAPmSfmJQSpdY3BMftxnXc1+JD2J5kDB+o4dtKPb1z9DrRbYq4LEAx0U5luUI nbCFm4L3RdEblDnbV7XkmTINhT+7rKuquxAhia3BAkvIPk3CGz7sdFippJdBvfe15PPvLn zs38E2tt/woRa0m28gLSMtHYztPkXR6r85cBJVca1O5w2IYTdYP/XhR+CDc/lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654811914; a=rsa-sha256; cv=none; b=W2rH166H7hEOLswQg9xMh+wozNc5CF1tjgV2aqbN2sITN24hiN7hE0tup6WoezNxLd1FDs Kyoi4ntK2H/oMVq7G31EiUku3uUOs3ZZrbJ16xAGsG8OczWRD7zIBm6kCtswYX2cHsNtvJ QFXpUlm9MXSjwKBiGNOZJw6D5TDc5yGc7qHV810OJouR8V2NlDJESqLev2HZdQ6HUmV3fy 8vHpvnwAfUM/qmhz2G2oKHAArC/hQcBbLH0/7V5eFpSDDmCyXXXcu+H9iloCMW4+4lJp1Q ykuOOwk8H/jfmoh+DGKTVC/9RLWQpO5+a7yNgseae1BT9cxpFu6GgHYE/zbkvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=c86f32d652eb9dd023049122d8ca37cb13ed07b6 commit c86f32d652eb9dd023049122d8ca37cb13ed07b6 Author: Cy Schubert AuthorDate: 2022-06-09 21:53:18 +0000 Commit: Cy Schubert CommitDate: 2022-06-09 21:58:23 +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 --- 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);