[pkg-wpa-devel] r1007 - in /wpasupplicant/trunk/debian: patches/10_wpa_supplicant_manpage_rearrange.patch patches/11_wpa_supplicant_manpage_improve.patch patches/12_wpa_supplicant_manpage_cull.patch patches/series wpasupplicant.docs
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun Jan 6 13:30:54 UTC 2008
Author: kelmo-guest
Date: Sun Jan 6 13:30:54 2008
New Revision: 1007
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1007
Log:
initial work to make wpa_supplicant(8) more end user friendly
Added:
wpasupplicant/trunk/debian/patches/10_wpa_supplicant_manpage_rearrange.patch
wpasupplicant/trunk/debian/patches/11_wpa_supplicant_manpage_improve.patch
wpasupplicant/trunk/debian/patches/12_wpa_supplicant_manpage_cull.patch
Modified:
wpasupplicant/trunk/debian/patches/series
wpasupplicant/trunk/debian/wpasupplicant.docs
Added: wpasupplicant/trunk/debian/patches/10_wpa_supplicant_manpage_rearrange.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/10_wpa_supplicant_manpage_rearrange.patch?rev=1007&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/10_wpa_supplicant_manpage_rearrange.patch (added)
+++ wpasupplicant/trunk/debian/patches/10_wpa_supplicant_manpage_rearrange.patch Sun Jan 6 13:30:54 2008
@@ -1,0 +1,811 @@
+--- a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
++++ b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
+@@ -21,6 +21,319 @@
+ </cmdsynopsis>
+ </refsynopsisdiv>
+ <refsect1>
++ <title>Command Line Options</title>
++ <variablelist>
++ <varlistentry>
++ <term>-b br_ifname</term>
++ <listitem>
++ <para>Optional bridge interface name.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-B</term>
++ <listitem>
++ <para>Run daemon in the background.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-c filename</term>
++ <listitem>
++ <para>Path to configuration file.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-C ctrl_interface</term>
++ <listitem>
++ <para>Path to ctrl_interface socket (only used if -c is not).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-i ifname</term>
++ <listitem>
++ <para>Interface to listen on.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-d</term>
++ <listitem>
++ <para>Increase debugging verbosity (-dd even more).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-D driver</term>
++ <listitem>
++ <para>Driver to use. See the available options below.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-f output file</term>
++ <listitem>
++ <para>Log output to specified file instead of stdout.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-g global ctrl_interface</term>
++ <listitem>
++ <para>Path to global ctrl_interface socket.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-K</term>
++ <listitem>
++ <para>Include keys (passwords, etc.) in debug output.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-t</term>
++ <listitem>
++ <para>Include timestamp in debug messages.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-h</term>
++ <listitem>
++ <para>Help. Show a usage message.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-L</term>
++ <listitem>
++ <para>Show license (GPL and BSD).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-p</term>
++ <listitem>
++ <para>Driver parameters.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-P PID_file</term>
++ <listitem>
++ <para>Path to PID file.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-q</term>
++ <listitem>
++ <para>Decrease debugging verbosity (-qq even less).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-u</term>
++ <listitem>
++ <para>Enabled DBus control interface.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-v</term>
++ <listitem>
++ <para>Show version.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-w</term>
++ <listitem>
++ <para>Wait for interface to be added, if needed. Normally,
++ <command>wpa_supplicant</command> will exit if the interface
++ is not there yet.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-W</term>
++ <listitem>
++ <para>Wait for a control interface monitor before starting.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>-N</term>
++ <listitem>
++ <para>Start describing new interface.</para>
++ </listitem>
++ </varlistentry>
++ </variablelist>
++ </refsect1>
++
++ <refsect1>
++ <title>Available Drivers</title>
++ <para>The available drivers to specify with the -D option are:</para>
++
++ <variablelist>
++ <varlistentry>
++ <term>hostap</term>
++ <listitem>
++ <para>(default) Host AP driver (Intersil Prism2/2.5/3).
++ (this can also be used with Linuxant DriverLoader).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>hermes</term>
++ <listitem>
++ <para>Agere Systems Inc. driver (Hermes-I/Hermes-II).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>madwifi</term>
++ <listitem>
++ <para>MADWIFI 802.11 support (Atheros, etc.).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>atmel</term>
++ <listitem>
++ <para>ATMEL AT76C5XXx (USB, PCMCIA).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>wext</term>
++ <listitem>
++ <para>Linux wireless extensions (generic).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>ndiswrapper</term>
++ <listitem>
++ <para>Linux ndiswrapper.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>broadcom</term>
++ <listitem>
++ <para>Broadcom wl.o driver.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>ipw</term>
++ <listitem>
++ <para>Intel ipw2100/2200 driver.</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>wired</term>
++ <listitem>
++ <para>wpa_supplicant wired Ethernet driver</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>bsd</term>
++ <listitem>
++ <para>BSD 802.11 support (Atheros, etc.).</para>
++ </listitem>
++ </varlistentry>
++
++ <varlistentry>
++ <term>ndis</term>
++ <listitem>
++ <para>Windows NDIS driver.</para>
++ </listitem>
++ </varlistentry>
++ </variablelist>
++ </refsect1>
++
++ <refsect1>
++ <title>Quick Start</title>
++
++ <para>First, make a configuration file, e.g.
++ <filename>/etc/wpa_supplicant.conf</filename>, that describes the networks
++ you are interested in. See <citerefentry>
++ <refentrytitle>wpa_supplicant.conf</refentrytitle>
++ <manvolnum>5</manvolnum>
++ </citerefentry>
++ for details.</para>
++
++ <para>Once the configuration is ready, you can test whether the
++ configuration works by running <command>wpa_supplicant</command>
++ with following command to start it on foreground with debugging
++ enabled:</para>
++
++ <blockquote><programlisting>
++wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.conf -d
++ </programlisting></blockquote>
++
++ <para>Assuming everything goes fine, you can start using following
++ command to start <command>wpa_supplicant</command> on background
++ without debugging:</para>
++
++ <blockquote><programlisting>
++wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.conf -B
++ </programlisting></blockquote>
++
++ <para>Please note that if you included more than one driver
++ interface in the build time configuration (.config), you may need
++ to specify which interface to use by including -D<driver
++ name> option on the command line.</para>
++
++ <!-- XXX at this point, the page could include a little script
++ based on wpa_cli to wait for a connection and then run
++ dhclient -->
++
++ </refsect1>
++
++ <refsect1>
++ <title>Examples</title>
++
++ <para>In most common cases, <command>wpa_supplicant</command> is
++ started with:</para>
++
++<blockquote><programlisting>
++wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -iwlan0
++</programlisting></blockquote>
++
++ <para>This makes the process fork into background and wait for the wlan0
++ interface if it is not available at startup time.</para>
++
++ <para>The easiest way to debug problems, and to get debug log for
++ bug reports, is to start <command>wpa_supplicant</command> on
++ foreground with debugging enabled:</para>
++
++<blockquote><programlisting>
++wpa_supplicant -c/etc/wpa_supplicant.conf -iwlan0 -d
++</programlisting></blockquote>
++
++ <para><command>wpa_supplicant</command> can control multiple
++ interfaces (radios) either by running one process for each
++ interface separately or by running just one process and list of
++ options at command line. Each interface is separated with -N
++ argument. As an example, following command would start
++ wpa_supplicant for two interfaces:</para>
++
++<blockquote><programlisting>
++wpa_supplicant \
++ -c wpa1.conf -i wlan0 -D hostap -N \
++ -c wpa2.conf -i ath0 -D madwifi
++</programlisting></blockquote>
++ </refsect1>
++
++ <refsect1>
+ <title>Overview</title>
+
+ <para>
+@@ -142,375 +455,101 @@
+
+ <listitem>
+ <para>WPA with EAP (e.g., with RADIUS authentication server)
+- ("WPA-Enterprise") Following authentication methods are
+- supported with an integrate IEEE 802.1X Supplicant:</para>
+-
+- <itemizedlist>
+- <listitem>
+- <para>EAP-TLS</para>
+- </listitem>
+- </itemizedlist>
+-
+- <itemizedlist>
+- <listitem>
+- <para>EAP-PEAP/MSCHAPv2 (both PEAPv0 and PEAPv1)</para>
+- </listitem>
+-
+-
+- <listitem>
+- <para>EAP-PEAP/TLS (both PEAPv0 and PEAPv1)</para>
+- </listitem>
+-
+- <listitem>
+- <para>EAP-PEAP/GTC (both PEAPv0 and PEAPv1)</para>
+- </listitem>
+-
+- <listitem>
+- <para>EAP-PEAP/OTP (both PEAPv0 and PEAPv1)</para>
+- </listitem>
+-
+- <listitem>
+- <para>EAP-PEAP/MD5-Challenge (both PEAPv0 and PEAPv1)</para>
+- </listitem>
+-
+- <listitem>
+- <para>EAP-TTLS/EAP-MD5-Challenge</para>
+- </listitem>
+-
+- <listitem>
+- <para>EAP-TTLS/EAP-GTC</para>
+- </listitem>
+-
+- <listitem><para>EAP-TTLS/EAP-OTP</para></listitem>
+-
+- <listitem><para>EAP-TTLS/EAP-MSCHAPv2</para></listitem>
+-
+- <listitem><para>EAP-TTLS/EAP-TLS</para></listitem>
+-
+- <listitem><para>EAP-TTLS/MSCHAPv2</para></listitem>
+-
+- <listitem><para>EAP-TTLS/MSCHAP</para></listitem>
+-
+- <listitem><para>EAP-TTLS/PAP</para></listitem>
+-
+- <listitem><para>EAP-TTLS/CHAP</para></listitem>
+-
+- <listitem><para>EAP-SIM</para></listitem>
+-
+- <listitem><para>EAP-AKA</para></listitem>
+-
+- <listitem><para>EAP-PSK</para></listitem>
+-
+- <listitem><para>EAP-PAX</para></listitem>
+-
+- <listitem><para>LEAP (note: requires special support from
+- the driver for IEEE 802.11 authentication)</para></listitem>
+-
+- <listitem><para>(following methods are supported, but since
+- they do not generate keying material, they cannot be used
+- with WPA or IEEE 802.1X WEP keying)</para></listitem>
+-
+- <listitem><para>EAP-MD5-Challenge </para></listitem>
+-
+- <listitem><para>EAP-MSCHAPv2</para></listitem>
+-
+- <listitem><para>EAP-GTC</para></listitem>
+-
+- <listitem><para>EAP-OTP</para></listitem>
+- </itemizedlist>
+- </listitem>
+-
+- <listitem>
+- <para>key management for CCMP, TKIP, WEP104, WEP40</para>
+- </listitem>
+-
+- <listitem>
+- <para>RSN/WPA2 (IEEE 802.11i)</para>
+- <itemizedlist>
+- <listitem>
+- <para>pre-authentication</para>
+- </listitem>
+-
+- <listitem>
+- <para>PMKSA caching</para>
+- </listitem>
+- </itemizedlist>
+- </listitem>
+- </itemizedlist>
+- </refsect1>
+-
+- <refsect1>
+- <title>Available Drivers</title>
+- <para>The available drivers to specify with the -D option are:</para>
+-
+- <variablelist>
+- <varlistentry>
+- <term>hostap</term>
+- <listitem>
+- <para>(default) Host AP driver (Intersil Prism2/2.5/3).
+- (this can also be used with Linuxant DriverLoader).</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>hermes</term>
+- <listitem>
+- <para>Agere Systems Inc. driver (Hermes-I/Hermes-II).</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>madwifi</term>
+- <listitem>
+- <para>MADWIFI 802.11 support (Atheros, etc.).</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>atmel</term>
+- <listitem>
+- <para>ATMEL AT76C5XXx (USB, PCMCIA).</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>wext</term>
+- <listitem>
+- <para>Linux wireless extensions (generic).</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>ndiswrapper</term>
+- <listitem>
+- <para>Linux ndiswrapper.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>broadcom</term>
+- <listitem>
+- <para>Broadcom wl.o driver.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>ipw</term>
+- <listitem>
+- <para>Intel ipw2100/2200 driver.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>wired</term>
+- <listitem>
+- <para>wpa_supplicant wired Ethernet driver</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>bsd</term>
+- <listitem>
+- <para>BSD 802.11 support (Atheros, etc.).</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>ndis</term>
+- <listitem>
+- <para>Windows NDIS driver.</para>
+- </listitem>
+- </varlistentry>
+- </variablelist>
+- </refsect1>
+-
+- <refsect1>
+- <title>Command Line Options</title>
+- <variablelist>
+- <varlistentry>
+- <term>-b br_ifname</term>
+- <listitem>
+- <para>Optional bridge interface name.</para>
+- </listitem>
+- </varlistentry>
++ ("WPA-Enterprise") Following authentication methods are
++ supported with an integrate IEEE 802.1X Supplicant:</para>
+
+- <varlistentry>
+- <term>-B</term>
+- <listitem>
+- <para>Run daemon in the background.</para>
+- </listitem>
+- </varlistentry>
++ <itemizedlist>
++ <listitem>
++ <para>EAP-TLS</para>
++ </listitem>
++ </itemizedlist>
+
+- <varlistentry>
+- <term>-c filename</term>
+- <listitem>
+- <para>Path to configuration file.</para>
+- </listitem>
+- </varlistentry>
++ <itemizedlist>
++ <listitem>
++ <para>EAP-PEAP/MSCHAPv2 (both PEAPv0 and PEAPv1)</para>
++ </listitem>
+
+- <varlistentry>
+- <term>-C ctrl_interface</term>
+- <listitem>
+- <para>Path to ctrl_interface socket (only used if -c is not).</para>
+- </listitem>
+- </varlistentry>
+
+- <varlistentry>
+- <term>-i ifname</term>
+- <listitem>
+- <para>Interface to listen on.</para>
+- </listitem>
+- </varlistentry>
++ <listitem>
++ <para>EAP-PEAP/TLS (both PEAPv0 and PEAPv1)</para>
++ </listitem>
+
+- <varlistentry>
+- <term>-d</term>
+- <listitem>
+- <para>Increase debugging verbosity (-dd even more).</para>
+- </listitem>
+- </varlistentry>
++ <listitem>
++ <para>EAP-PEAP/GTC (both PEAPv0 and PEAPv1)</para>
++ </listitem>
+
+- <varlistentry>
+- <term>-D driver</term>
+- <listitem>
+- <para>Driver to use. See the available options below.</para>
+- </listitem>
+- </varlistentry>
++ <listitem>
++ <para>EAP-PEAP/OTP (both PEAPv0 and PEAPv1)</para>
++ </listitem>
+
+- <varlistentry>
+- <term>-f output file</term>
+- <listitem>
+- <para>Log output to specified file instead of stdout.</para>
+- </listitem>
+- </varlistentry>
++ <listitem>
++ <para>EAP-PEAP/MD5-Challenge (both PEAPv0 and PEAPv1)</para>
++ </listitem>
+
+- <varlistentry>
+- <term>-g global ctrl_interface</term>
+- <listitem>
+- <para>Path to global ctrl_interface socket.</para>
+- </listitem>
+- </varlistentry>
++ <listitem>
++ <para>EAP-TTLS/EAP-MD5-Challenge</para>
++ </listitem>
+
+- <varlistentry>
+- <term>-K</term>
+- <listitem>
+- <para>Include keys (passwords, etc.) in debug output.</para>
+- </listitem>
+- </varlistentry>
++ <listitem>
++ <para>EAP-TTLS/EAP-GTC</para>
++ </listitem>
+
+- <varlistentry>
+- <term>-t</term>
+- <listitem>
+- <para>Include timestamp in debug messages.</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-TTLS/EAP-OTP</para></listitem>
+
+- <varlistentry>
+- <term>-h</term>
+- <listitem>
+- <para>Help. Show a usage message.</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-TTLS/EAP-MSCHAPv2</para></listitem>
+
+- <varlistentry>
+- <term>-L</term>
+- <listitem>
+- <para>Show license (GPL and BSD).</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-TTLS/EAP-TLS</para></listitem>
+
+- <varlistentry>
+- <term>-p</term>
+- <listitem>
+- <para>Driver parameters.</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-TTLS/MSCHAPv2</para></listitem>
+
+- <varlistentry>
+- <term>-P PID_file</term>
+- <listitem>
+- <para>Path to PID file.</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-TTLS/MSCHAP</para></listitem>
+
+- <varlistentry>
+- <term>-q</term>
+- <listitem>
+- <para>Decrease debugging verbosity (-qq even less).</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-TTLS/PAP</para></listitem>
+
+- <varlistentry>
+- <term>-u</term>
+- <listitem>
+- <para>Enabled DBus control interface.</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-TTLS/CHAP</para></listitem>
+
+- <varlistentry>
+- <term>-v</term>
+- <listitem>
+- <para>Show version.</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-SIM</para></listitem>
+
+- <varlistentry>
+- <term>-w</term>
+- <listitem>
+- <para>Wait for interface to be added, if needed. Normally,
+- <command>wpa_supplicant</command> will exit if the interface
+- is not there yet.</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-AKA</para></listitem>
+
+- <varlistentry>
+- <term>-W</term>
+- <listitem>
+- <para>Wait for a control interface monitor before starting.</para>
+- </listitem>
+- </varlistentry>
++ <listitem><para>EAP-PSK</para></listitem>
+
+- <varlistentry>
+- <term>-N</term>
+- <listitem>
+- <para>Start describing new interface.</para>
+- </listitem>
+- </varlistentry>
+- </variablelist>
+- </refsect1>
++ <listitem><para>EAP-PAX</para></listitem>
+
+- <refsect1>
+- <title>Examples</title>
++ <listitem><para>LEAP (note: requires special support from
++ the driver for IEEE 802.11 authentication)</para></listitem>
+
+- <para>In most common cases, <command>wpa_supplicant</command> is
+- started with:</para>
++ <listitem><para>(following methods are supported, but since
++ they do not generate keying material, they cannot be used
++ with WPA or IEEE 802.1X WEP keying)</para></listitem>
+
+-<blockquote><programlisting>
+-wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -iwlan0
+-</programlisting></blockquote>
++ <listitem><para>EAP-MD5-Challenge </para></listitem>
+
+- <para>This makes the process fork into background and wait for the wlan0
+- interface if it is not available at startup time.</para>
++ <listitem><para>EAP-MSCHAPv2</para></listitem>
+
+- <para>The easiest way to debug problems, and to get debug log for
+- bug reports, is to start <command>wpa_supplicant</command> on
+- foreground with debugging enabled:</para>
++ <listitem><para>EAP-GTC</para></listitem>
+
+-<blockquote><programlisting>
+-wpa_supplicant -c/etc/wpa_supplicant.conf -iwlan0 -d
+-</programlisting></blockquote>
++ <listitem><para>EAP-OTP</para></listitem>
++ </itemizedlist>
++ </listitem>
+
+- <para><command>wpa_supplicant</command> can control multiple
+- interfaces (radios) either by running one process for each
+- interface separately or by running just one process and list of
+- options at command line. Each interface is separated with -N
+- argument. As an example, following command would start
+- wpa_supplicant for two interfaces:</para>
++ <listitem>
++ <para>key management for CCMP, TKIP, WEP104, WEP40</para>
++ </listitem>
+
+-<blockquote><programlisting>
+-wpa_supplicant \
+- -c wpa1.conf -i wlan0 -D hostap -N \
+- -c wpa2.conf -i ath0 -D madwifi
+-</programlisting></blockquote>
++ <listitem>
++ <para>RSN/WPA2 (IEEE 802.11i)</para>
++ <itemizedlist>
++ <listitem>
++ <para>pre-authentication</para>
++ </listitem>
++
++ <listitem>
++ <para>PMKSA caching</para>
++ </listitem>
++ </itemizedlist>
++ </listitem>
++ </itemizedlist>
+ </refsect1>
+
+ <refsect1>
+@@ -702,45 +741,6 @@
+ </refsect1>
+
+ <refsect1>
+- <title>Quick Start</title>
+-
+- <para>First, make a configuration file, e.g.
+- <filename>/etc/wpa_supplicant.conf</filename>, that describes the networks
+- you are interested in. See <citerefentry>
+- <refentrytitle>wpa_supplicant.conf</refentrytitle>
+- <manvolnum>5</manvolnum>
+- </citerefentry>
+- for details.</para>
+-
+- <para>Once the configuration is ready, you can test whether the
+- configuration works by running <command>wpa_supplicant</command>
+- with following command to start it on foreground with debugging
+- enabled:</para>
+-
+- <blockquote><programlisting>
+-wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.conf -d
+- </programlisting></blockquote>
+-
+- <para>Assuming everything goes fine, you can start using following
+- command to start <command>wpa_supplicant</command> on background
+- without debugging:</para>
+-
+- <blockquote><programlisting>
+-wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.conf -B
+- </programlisting></blockquote>
+-
+- <para>Please note that if you included more than one driver
+- interface in the build time configuration (.config), you may need
+- to specify which interface to use by including -D<driver
+- name> option on the command line.</para>
+-
+- <!-- XXX at this point, the page could include a little script
+- based on wpa_cli to wait for a connection and then run
+- dhclient -->
+-
+- </refsect1>
+-
+- <refsect1>
+ <title>Interface to pcmcia-cs/cardmrg</title>
+
+ <para>For example, following small changes to pcmcia-cs scripts
Added: wpasupplicant/trunk/debian/patches/11_wpa_supplicant_manpage_improve.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/11_wpa_supplicant_manpage_improve.patch?rev=1007&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/11_wpa_supplicant_manpage_improve.patch (added)
+++ wpasupplicant/trunk/debian/patches/11_wpa_supplicant_manpage_improve.patch Sun Jan 6 13:30:54 2008
@@ -1,0 +1,47 @@
+--- a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
++++ b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
+@@ -68,7 +68,7 @@
+ <varlistentry>
+ <term>-D driver</term>
+ <listitem>
+- <para>Driver to use. See the available options below.</para>
++ <para>Driver to use. See the available driver options below.</para>
+ </listitem>
+ </varlistentry>
+
+@@ -218,7 +218,9 @@
+ <varlistentry>
+ <term>ndiswrapper</term>
+ <listitem>
+- <para>Linux ndiswrapper.</para>
++ <para>Linux ndiswrapper. The use of this driver is deprecated, and will
++ only work with very old versions of ndiswrapper (pre version 1.15). The
++ wext driver should be used.</para>
+ </listitem>
+ </varlistentry>
+
+@@ -232,7 +234,9 @@
+ <varlistentry>
+ <term>ipw</term>
+ <listitem>
+- <para>Intel ipw2100/2200 driver.</para>
++ <para>Intel ipw2100/2200 driver. The use of this driver is deprecated
++ and will not work on systems with Linux kernel version 2.6.14 or later.
++ The wext driver should be used for all modern Linux systems.</para>
+ </listitem>
+ </varlistentry>
+
+@@ -667,9 +671,10 @@
+ <varlistentry>
+ <term>Linux wireless extensions</term>
+ <listitem>
+- <para>In theory, any driver that supports Linux wireless
+- extensions can be used with IEEE 802.1X (i.e., not WPA) when
+- using ap_scan=0 option in configuration file.</para>
++ <para>Any driver that supports Linux wireless extensions version
++ 18 or later will work. In theory, any driver that supports Linux wireless
++ extensions less than version 18 can be used with IEEE 802.1X
++ (i.e., not WPA) when using ap_scan=0 option in configuration file.</para>
+ </listitem>
+ </varlistentry>
+
Added: wpasupplicant/trunk/debian/patches/12_wpa_supplicant_manpage_cull.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/12_wpa_supplicant_manpage_cull.patch?rev=1007&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/12_wpa_supplicant_manpage_cull.patch (added)
+++ wpasupplicant/trunk/debian/patches/12_wpa_supplicant_manpage_cull.patch Sun Jan 6 13:30:54 2008
@@ -1,0 +1,217 @@
+--- a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
++++ b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
+@@ -188,13 +188,6 @@
+ </varlistentry>
+
+ <varlistentry>
+- <term>hermes</term>
+- <listitem>
+- <para>Agere Systems Inc. driver (Hermes-I/Hermes-II).</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+ <term>madwifi</term>
+ <listitem>
+ <para>MADWIFI 802.11 support (Atheros, etc.).</para>
+@@ -216,50 +209,11 @@
+ </varlistentry>
+
+ <varlistentry>
+- <term>ndiswrapper</term>
+- <listitem>
+- <para>Linux ndiswrapper. The use of this driver is deprecated, and will
+- only work with very old versions of ndiswrapper (pre version 1.15). The
+- wext driver should be used.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>broadcom</term>
+- <listitem>
+- <para>Broadcom wl.o driver.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>ipw</term>
+- <listitem>
+- <para>Intel ipw2100/2200 driver. The use of this driver is deprecated
+- and will not work on systems with Linux kernel version 2.6.14 or later.
+- The wext driver should be used for all modern Linux systems.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+ <term>wired</term>
+ <listitem>
+ <para>wpa_supplicant wired Ethernet driver</para>
+ </listitem>
+ </varlistentry>
+-
+- <varlistentry>
+- <term>bsd</term>
+- <listitem>
+- <para>BSD 802.11 support (Atheros, etc.).</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>ndis</term>
+- <listitem>
+- <para>Windows NDIS driver.</para>
+- </listitem>
+- </varlistentry>
+ </variablelist>
+ </refsect1>
+
+@@ -593,25 +547,6 @@
+ </varlistentry>
+
+ <varlistentry>
+- <term>Linuxant DriverLoader</term>
+- <listitem>
+- <para>(http://www.linuxant.com/driverloader/)
+- with Windows NDIS driver for your wlan card supporting WPA.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>Agere Systems Inc. Linux Driver</term>
+- <listitem>
+- <para> (http://www.agere.com/support/drivers/) Please note
+- that the driver interface file (driver_hermes.c) and hardware
+- specific include files are not included in the wpa_supplicant
+- distribution. You will need to copy these from the source
+- package of the Agere driver.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+ <term>madwifi driver for cards based on Atheros chip set (ar521x)</term>
+ <listitem>
+ <para> (http://sourceforge.net/projects/madwifi/) Please
+@@ -630,45 +565,6 @@
+ </varlistentry>
+
+ <varlistentry>
+- <term>Linux ndiswrapper</term>
+- <listitem>
+- <para> (http://ndiswrapper.sourceforge.net/) with Windows
+- NDIS driver.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>Broadcom wl.o driver</term>
+- <listitem>
+- <para> This is a generic Linux driver for Broadcom IEEE
+- 802.11a/g cards. However, it is proprietary driver that is
+- not publicly available except for couple of exceptions, mainly
+- Broadcom-based APs/wireless routers that use Linux. The driver
+- binary can be downloaded, e.g., from Linksys support site
+- (http://www.linksys.com/support/gpl.asp) for Linksys
+- WRT54G. The GPL tarball includes cross-compiler and the needed
+- header file, wlioctl.h, for compiling wpa_supplicant. This
+- driver support in wpa_supplicant is expected to work also with
+- other devices based on Broadcom driver (assuming the driver
+- includes client mode support).</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term> Intel ipw2100 driver</term>
+- <listitem>
+- <para> (http://sourceforge.net/projects/ipw2100/)</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>Intel ipw2200 driver</term>
+- <listitem>
+- <para> (http://sourceforge.net/projects/ipw2200/)</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+ <term>Linux wireless extensions</term>
+ <listitem>
+ <para>Any driver that supports Linux wireless extensions version
+@@ -684,33 +580,7 @@
+ <para>Use ap_scan=0.</para>
+ </listitem>
+ </varlistentry>
+-
+- <varlistentry>
+- <term>BSD net80211 layer (e.g., Atheros driver)</term>
+- <listitem>
+- <para>At the moment, this is for FreeBSD 6-CURRENT branch.</para>
+- </listitem>
+- </varlistentry>
+-
+- <varlistentry>
+- <term>Windows NDIS</term>
+- <listitem>
+- <para>The current Windows port requires WinPcap
+- (http://winpcap.polito.it/). See README-Windows.txt for more
+- information.</para>
+- </listitem>
+- </varlistentry>
+ </variablelist>
+-
+-
+- <para>wpa_supplicant was designed to be portable for different
+- drivers and operating systems. Hopefully, support for more wlan
+- cards and OSes will be added in the future. See developer.txt for
+- more information about the design of wpa_supplicant and porting to
+- other drivers. One main goal is to add full WPA/WPA2 support to
+- Linux wireless extensions to allow new drivers to be supported
+- without having to implement new driver-specific interface code in
+- wpa_supplicant.</para>
+ </refsect1>
+
+ <refsect1>
+@@ -746,43 +616,6 @@
+ </refsect1>
+
+ <refsect1>
+- <title>Interface to pcmcia-cs/cardmrg</title>
+-
+- <para>For example, following small changes to pcmcia-cs scripts
+- can be used to enable WPA support:</para>
+-
+- <para>Add MODE="Managed" and WPA="y" to the network scheme in
+- <filename>/etc/pcmcia/wireless.opts</filename>.</para>
+-
+- <para>Add the following block to the end of 'start' action handler
+- in <filename>/etc/pcmcia/wireless</filename>:</para>
+-
+- <blockquote><programlisting>
+-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
+- /usr/local/bin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -i$DEVICE
+-fi
+- </programlisting></blockquote>
+-
+-
+- <para>Add the following block to the end of 'stop' action handler
+- (may need to be separated from other actions) in
+- <filename>/etc/pcmcia/wireless</filename>:</para>
+-
+- <blockquote><programlisting>
+-if [ "$WPA" = "y" -a -x /usr/local/bin/wpa_supplicant ]; then
+- killall wpa_supplicant
+-fi
+- </programlisting></blockquote>
+-
+- <para>This will make <command>cardmgr</command> start
+- <command>wpa_supplicant</command> when the card is plugged
+- in. <command>wpa_supplicant</command> will wait until the
+- interface is set up--either when a static IP address is configured
+- or when DHCP client is started--and will then negotiate keys with
+- the AP.</para>
+- </refsect1>
+-
+- <refsect1>
+ <title>See Also</title>
+ <para>
+ <citerefentry>
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1007&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sun Jan 6 13:30:54 2008
@@ -2,6 +2,9 @@
01_debian_wpa_roam_example.patch
02_dbus_group_policy.patch
03_dbus_service_activation_logfile.patch
+10_wpa_supplicant_manpage_rearrange.patch
+11_wpa_supplicant_manpage_improve.patch
+12_wpa_supplicant_manpage_cull.patch
20_madwifi_headers.patch
21_config_driver_madwifi.patch
30_scan_even_when_disconnected.patch
Modified: wpasupplicant/trunk/debian/wpasupplicant.docs
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/wpasupplicant.docs?rev=1007&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/wpasupplicant.docs (original)
+++ wpasupplicant/trunk/debian/wpasupplicant.docs Sun Jan 6 13:30:54 2008
@@ -1,2 +1,3 @@
debian/README.modes
wpa_supplicant/eap_testing.txt
+wpa_supplicant/README
More information about the Pkg-wpa-devel
mailing list