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 <cy.schub...@cschubert.com> FreeBSD UNIX: <c...@freebsd.org> Web: https://FreeBSD.org NTP: <c...@nwtime.org> Web: https://nwtime.org The need of the many outweighs the greed of the few. In message <20210125233757.gc73...@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 <c...@freebsd.org> > > AuthorDate: 2021-01-25 22:34:22 +0000 > > Commit: Cy Schubert <c...@freebsd.org> > > 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 _______________________________________________ dev-commits-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
