From owner-dev-commits-src-main@freebsd.org Tue Jan 26 00:01:46 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 94B1F4F71D5; Tue, 26 Jan 2021 00:01:46 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DPn2y0rGGz3sRr; Tue, 26 Jan 2021 00:01:45 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id 4BnilLwzs2SWT4BnkllJsj; Mon, 25 Jan 2021 17:01:44 -0700 X-Authority-Analysis: v=2.4 cv=fdJod2cF c=1 sm=1 tr=0 ts=600f5be8 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=EmqxpYm9HcoA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=y3olD_i8AAAA:8 a=BYXJYoKzEvhoFlLBWowA:9 a=CjuIK1q_8ugA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 a=2GdgqtpztZvaxdPX1XqS:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 864031A6E; Mon, 25 Jan 2021 16:01:41 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 10Q01ffs007336; Mon, 25 Jan 2021 16:01:41 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202101260001.10Q01ffs007336@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Brooks Davis cc: Cy Schubert , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1fc148624f50 - main - Fix build following bfc99943b04b46a6c1c885ce7bcc6f235b7422aa. In-reply-to: <20210125233757.GC73987@spindle.one-eyed-alien.net> References: <202101252247.10PMlCUh027280@gitrepo.freebsd.org> <20210125233757.GC73987@spindle.one-eyed-alien.net> Comments: In-reply-to Brooks Davis message dated "Mon, 25 Jan 2021 23:37:57 +0000." Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Mon, 25 Jan 2021 16:01:41 -0800 X-CMAE-Envelope: MS4xfPPB4HOi6c9zyklivDRN9AySzOl+6RS5gNyEM1Pnver/4PtEXBz2bbbafNYjbp2KmMUHsuJ4+uqP4q4YRzJz1etPFoXlBYHg9sWr5r/IKXsZ0wihHQ3P c9LU+8cx6au+5YzAHVmyprMauYIc9KL7CJ/cVnQcdcyHecK+tEVHKPIUMrVtwzmf1mcvS+OEtRct5W3P4iICKBG9ZknJdryNX3tIUw+4YRuWQoI49Z8FFzxz 3JHyJiMjvEp0ALRvMntANo9UjuSIOot/b07YFT6K/R0qyt7bXgXYkJoyf+jsqIqENMJEXiwJotesIybbyrv5YEkaX1LDHxiNUXwnJ91FhM3beNC5qsvQDAzx 1HCQEuhO X-Rspamd-Queue-Id: 4DPn2y0rGGz3sRr X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jan 2021 00:01:46 -0000 No worries. I've committed an options change to the wpa_supplicant port as well and will push (git svn dcommit) it next time I get a chance. I'll need to think about moving build_config.h from contrib to usr.sbin/wpa to avoid confusing people when merging updates from the vendor. Simpler is better. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. In message <20210125233757.GC73987@spindle.one-eyed-alien.net>, Brooks Davis wr ites: > > Thanks. I'd done a clean build in CI where wpa supplicant built so I'm > not sure how I missed this. > > -- Brooks > > On Mon, Jan 25, 2021 at 10:47:12PM +0000, Cy Schubert wrote: > > The branch main has been updated by cy: > >=20 > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D1fc148624f50cbf93365f6d56c= > 6587a7d268195b > >=20 > > commit 1fc148624f50cbf93365f6d56c6587a7d268195b > > Author: Cy Schubert > > AuthorDate: 2021-01-25 22:34:22 +0000 > > Commit: Cy Schubert > > CommitDate: 2021-01-25 22:46:45 +0000 > >=20 > > Fix build following bfc99943b04b46a6c1c885ce7bcc6f235b7422aa. > > =20 > > bfc99943b04b46a6c1c885ce7bcc6f235b7422aa removed ndis(4) support howe= > ver > > wpa as delivered by the wpa upstream (w1.fi) enables NDIS by default. > > This commit disables NDIS suppport in the w1.fi delivered build confi= > g, > > circumventing the build failure. > > --- > > contrib/wpa/src/utils/build_config.h | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > >=20 > > diff --git a/contrib/wpa/src/utils/build_config.h b/contrib/wpa/src/utils= > /build_config.h > > index c6f4e4379ae6..7d032373c8d3 100644 > > --- a/contrib/wpa/src/utils/build_config.h > > +++ b/contrib/wpa/src/utils/build_config.h > > @@ -26,8 +26,8 @@ > > #define PCSC_FUNCS > > #define CONFIG_CTRL_IFACE > > #define CONFIG_CTRL_IFACE_NAMED_PIPE > > -#define CONFIG_DRIVER_NDIS > > -#define CONFIG_NDIS_EVENTS_INTEGRATED > > +#undef CONFIG_DRIVER_NDIS > > +#undef CONFIG_NDIS_EVENTS_INTEGRATED > > #define CONFIG_DEBUG_FILE > > #define EAP_MD5 > > #define EAP_TLS > >=20