https://bugs.dragonflybsd.org/https://bugs.dragonflybsd.org/favicon.ico?16293952082014-05-27T14:35:48ZDragonFlyBSD bugtrackerDragonFlyBSD - Submit #2673: hostapd and wpa_supplicant vendor update (2.1)https://bugs.dragonflybsd.org/issues/2673?journal_id=119662014-05-27T14:35:48ZkAworualex@kaworu.ch
<ul><li><strong>File</strong> <a href="/attachments/1096">vendor.HOSTAPD.tar.bz2</a> <a class="icon-only icon-download" title="Download" href="/attachments/download/1096/vendor.HOSTAPD.tar.bz2">vendor.HOSTAPD.tar.bz2</a> added</li><li><strong>Tracker</strong> changed from <i>Bug</i> to <i>Submit</i></li></ul><p>patch against the vendor/HOSTAPD branch (archived because they were too big for the tracker)</p> DragonFlyBSD - Submit #2673: hostapd and wpa_supplicant vendor update (2.1)https://bugs.dragonflybsd.org/issues/2673?journal_id=119672014-05-27T14:37:16ZkAworualex@kaworu.ch
<ul><li><strong>File</strong> <a href="/attachments/1097">vendor.WPA_SUPPLICANT.tar.bz2</a> <a class="icon-only icon-download" title="Download" href="/attachments/download/1097/vendor.WPA_SUPPLICANT.tar.bz2">vendor.WPA_SUPPLICANT.tar.bz2</a> added</li></ul><p>patch against the vendor/WPA_SUPPLICANT branch (archived because they were too big for the tracker)</p> DragonFlyBSD - Submit #2673: hostapd and wpa_supplicant vendor update (2.1)https://bugs.dragonflybsd.org/issues/2673?journal_id=119682014-05-27T14:39:45ZkAworualex@kaworu.ch
<ul><li><strong>File</strong> <a href="/attachments/1098">0001-hostapd-wpa_supplicant-local-modifications-to-contri.patch</a> <a class="icon-only icon-download" title="Download" href="/attachments/download/1098/0001-hostapd-wpa_supplicant-local-modifications-to-contri.patch">0001-hostapd-wpa_supplicant-local-modifications-to-contri.patch</a> added</li><li><strong>File</strong> <a href="/attachments/1099">0002-hostapd-wpa_supplicant-update-to-2.1.patch</a> <a class="icon-only icon-download" title="Download" href="/attachments/download/1099/0002-hostapd-wpa_supplicant-update-to-2.1.patch">0002-hostapd-wpa_supplicant-update-to-2.1.patch</a> added</li></ul><p>patch against master once both vendor branch have been merged in.</p>
<p>Note that vendor/HOSTAPD and vendor/WPA_SUPPLICANT were not cleanly merged in master.</p> DragonFlyBSD - Submit #2673: hostapd and wpa_supplicant vendor update (2.1)https://bugs.dragonflybsd.org/issues/2673?journal_id=119692014-05-27T14:57:00Zmarino
<ul><li><strong>Assignee</strong> set to <i>marino</i></li></ul><p>I'll take it.</p> DragonFlyBSD - Submit #2673: hostapd and wpa_supplicant vendor update (2.1)https://bugs.dragonflybsd.org/issues/2673?journal_id=119702014-05-28T07:11:14ZkAworualex@kaworu.ch
<ul></ul><p>Sorry for the lack of comments, I wanted to complete a full buildworld / kernel beforehand.</p>
<p>1. The vendors patches remove and contrib/wpa_supplicant-0.4.9 contrib/hostapd-0.4.9. They're both are unchanged since their import from 2006, so I figured they're not used nor needed anymore.</p>
<p>2. The vendors branches were not cleanly merged before, so a bit of conflict solving is needed for a clean merge.</p>
<p>3. both hostapd and wpa_supplicant now ship default configuration files (with a lot of documentation in comments). The patch install them under /etc/wpa_supplicant.conf, /etc/hostapd.conf and /usr/share/initrd/etc/wpa_supplicant.conf.</p>
<p>4. I've imported minor changes to the man pages from FreeBSD making sure to adapt where needed.</p>
<p>5. usr.sbin/802_11 Makefile were adapted from FreeBSD because they're using hostapd / wpa_supplicant 2.0 (which is closer to 2.1 than our previous 0.6.10 version). I've tested both to build without any option (default) and with all options (requires devel/pcsc-lite, see comments in usr.sbin/802_11/wpa_supplicant/Makefile).</p>
<p>6. usr.sbin/802_11/wpa_supplicant/driver_wired.c was removed because it is now provided by the vendor.</p>
<p>7. usr.sbin/802_11/wpa_supplicant/driver_dragonfly.c was removed and we use driver_bsd.c from the vendor which is DragonFly ready (no modification were needed and there was already ifdef <i>DragonFly</i> code).</p>
<p>8. `usr.sbin/802_11/l2_packet.c` is a copy of the vendor's `l2_packet_freebsd.c`. The changes are minimal between them and I think we should ask hostapd/wpa_supplicant to have a copy of `l2_packet_dragonfly.c`.</p>
<p>9. hostapd, wpa_cli and wpa_supplicant needs WARNS=0 in order to compile or small modifications. See comments below.</p> DragonFlyBSD - Submit #2673: hostapd and wpa_supplicant vendor update (2.1)https://bugs.dragonflybsd.org/issues/2673?journal_id=119712014-05-28T07:49:41ZkAworualex@kaworu.ch
<ul><li><strong>File</strong> <a href="/attachments/1100">wpa_supplicant.warning.txt</a> <a class="icon-only icon-download" title="Download" href="/attachments/download/1100/wpa_supplicant.warning.txt">wpa_supplicant.warning.txt</a> added</li><li><strong>File</strong> <a href="/attachments/1101">hostapd.warning.txt</a> <a class="icon-only icon-download" title="Download" href="/attachments/download/1101/hostapd.warning.txt">hostapd.warning.txt</a> added</li></ul><p>hostapd and wpa_supplicant needs WARNS=0 because otherwise WPA_OUI_TYPE gets redefined (see attachment). I am uneasy because the dragonfly definition in /usr/include/netproto/802_11/ieee80211.h is very different from the vendor's in common/wpa_common.h and I am clueless about its purpose.</p>
<p>In addition wpa_supplicant/wpa_supplicant/scan.c redefine <abbr title="">MIN</abbr> but that is trivial to ignore.</p> DragonFlyBSD - Submit #2673: hostapd and wpa_supplicant vendor update (2.1)https://bugs.dragonflybsd.org/issues/2673?journal_id=119722014-05-28T08:13:39ZkAworualex@kaworu.ch
<ul></ul><p>I've done a full buildworld, buildkernel, installkernel, installworld, and upgrade. All seems ok (config files executables and manuals) except the wpa_passphrase manual (which does not show).</p>
<p>Also I don't have the hardware to properly test hostapd / wpa_supplicant :( So wireless tester are welcome.</p> DragonFlyBSD - Submit #2673: hostapd and wpa_supplicant vendor update (2.1)https://bugs.dragonflybsd.org/issues/2673?journal_id=119732014-05-28T08:22:21ZkAworualex@kaworu.ch
<ul><li><strong>File</strong> <a href="/attachments/1102">0001-wpa_cli-Makefile-changes-to-compile-without-WARNS-0.patch</a> <a class="icon-only icon-download" title="Download" href="/attachments/download/1102/0001-wpa_cli-Makefile-changes-to-compile-without-WARNS-0.patch">0001-wpa_cli-Makefile-changes-to-compile-without-WARNS-0.patch</a> added</li></ul><p>small fix</p> DragonFlyBSD - Submit #2673: hostapd and wpa_supplicant vendor update (2.1)https://bugs.dragonflybsd.org/issues/2673?journal_id=119772014-05-28T15:44:01Zmarino
<ul><li><strong>Status</strong> changed from <i>New</i> to <i>Closed</i></li></ul><p>It's pull in over several commits. Here is the final one:<br />2513f15e538945986e9817bb648eee2cb9b09494</p>
<p>Thanks!<br />John</p>