Date: Mon, 13 Oct 2014 12:56:05 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370769 - in head/security/wpa_supplicant: . files Message-ID: <201410131256.s9DCu5i2029636@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Oct 13 12:56:04 2014 New Revision: 370769 URL: https://svnweb.freebsd.org/changeset/ports/370769 QAT: https://qat.redports.org/buildarchive/r370769/ Log: wpa/supplicant: Fix driver list with NDIS, take 2 It turns out the driver list was only showing "null" for NDIS when -h (help) or an unknown switch was passed to wpa_supplicant. The cause is that the NDIS driver is the only that that has to be initialized, and the initialization wasn't occurring in the above case. The fix is the move the NDIS driver initialization before the command switches are examined in case wpa_supplicant aborts to usage early. Added: head/security/wpa_supplicant/files/patch-wpa__supplicant_main.c (contents, props changed) head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c (contents, props changed) Modified: head/security/wpa_supplicant/Makefile Modified: head/security/wpa_supplicant/Makefile ============================================================================== --- head/security/wpa_supplicant/Makefile Mon Oct 13 12:33:47 2014 (r370768) +++ head/security/wpa_supplicant/Makefile Mon Oct 13 12:56:04 2014 (r370769) @@ -2,7 +2,7 @@ PORTNAME= wpa_supplicant PORTVERSION= 2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net MASTER_SITES= http://w1.fi/releases/ Added: head/security/wpa_supplicant/files/patch-wpa__supplicant_main.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/wpa_supplicant/files/patch-wpa__supplicant_main.c Mon Oct 13 12:56:04 2014 (r370769) @@ -0,0 +1,14 @@ +--- wpa_supplicant/main.c.orig 2014-10-09 14:41:31 UTC ++++ wpa_supplicant/main.c +@@ -173,6 +173,11 @@ int main(int argc, char *argv[]) + + wpa_supplicant_fd_workaround(1); + ++#ifdef CONFIG_DRIVER_NDIS ++ void driver_ndis_init_ops(void); ++ driver_ndis_init_ops(); ++#endif /* CONFIG_DRIVER_NDIS */ ++ + for (;;) { + c = getopt(argc, argv, + "b:Bc:C:D:de:f:g:G:hi:I:KLm:No:O:p:P:qsTtuvW"); Added: head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/wpa_supplicant/files/patch-wpa__supplicant_wpa__supplicant.c Mon Oct 13 12:56:04 2014 (r370769) @@ -0,0 +1,11 @@ +--- wpa_supplicant/wpa_supplicant.c.orig 2014-10-09 14:41:31 UTC ++++ wpa_supplicant/wpa_supplicant.c +@@ -4098,7 +4098,7 @@ struct wpa_global * wpa_supplicant_init( + if (params == NULL) + return NULL; + +-#ifdef CONFIG_DRIVER_NDIS ++#ifdef XXXCONFIG_DRIVER_NDIS + { + void driver_ndis_init_ops(void); + driver_ndis_init_ops();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410131256.s9DCu5i2029636>