[pkg-wpa-devel] r937 - in /wpasupplicant/trunk/debian: changelog ifupdown/ifupdown.sh patches/01_debian_wpa_roam_example.patch

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Wed Dec 26 09:20:41 UTC 2007 

Author: kelmo-guest
Date: Wed Dec 26 09:20:41 2007
New Revision: 937

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=937
Log:
* Add useful comments to the new wpa-roam.conf example configuration file.
* If the path to ctrl_interface directory can be determined from the
  supplied configuration, do not append the -C option to wpa_supplicant
  start-stop-daemon command in ifupdown.sh. This breaks the new DIR= GROUP=
  ctrl_interface syntax.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
    wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=937&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Dec 26 09:20:41 2007
@@ -44,10 +44,15 @@
   * Impliment debian/examples/wpa_supplicant.conf.template in patch form. It
     is planned to expand this small template into a more usable and
     documented beginning point for the wpa-roam schema.
+  * Add useful comments to the new wpa-roam.conf example configuration file.
   * Impliment wpa_gui manpage as a patch against upstream. This will make it
     easier to submit to upstream for inclusion in the future.
-
- -- Kel Modderman <kel at otaku42.de>  Wed, 26 Dec 2007 14:49:31 +1000
+  * If the path to ctrl_interface directory can be determined from the
+    supplied configuration, do not append the -C option to wpa_supplicant
+    start-stop-daemon command in ifupdown.sh. This breaks the new DIR= GROUP=
+    ctrl_interface syntax.
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 26 Dec 2007 19:18:41 +1000
 
 wpasupplicant (0.6.1~git20071119-1) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/ifupdown.sh?rev=937&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/ifupdown.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/ifupdown.sh Wed Dec 26 09:20:41 2007
@@ -80,8 +80,10 @@
 		-e 's/^ctrl_interface=\(DIR=\)\?\(.*\)/\2/p' "$IF_WPA_CONF")
 	if [ -n "$WPA_SUP_CONF_CTRL_DIR" ]; then
 		WPA_CTRL_DIR="$WPA_SUP_CONF_CTRL_DIR"
+		WPA_SUP_CONF="-c $IF_WPA_CONF"
+	else
+		WPA_SUP_CONF="-c $IF_WPA_CONF -C $WPA_CTRL_DIR"
 	fi
-	WPA_SUP_CONF="-c $IF_WPA_CONF -C $WPA_CTRL_DIR"
 elif set | grep --quiet "^IF_WPA"; then
 	WPA_SUP_CONF="-C $WPA_CTRL_DIR"
 else

Modified: wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch?rev=937&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch (original)
+++ wpasupplicant/trunk/debian/patches/01_debian_wpa_roam_example.patch Wed Dec 26 09:20:41 2007
@@ -1,26 +1,108 @@
 --- /dev/null
 +++ b/wpa_supplicant/examples/wpa-roam.conf
-@@ -0,0 +1,23 @@
-+# Minimal /etc/wpa_supplicant.conf to associate with open
-+#  access points. Please see
-+#  /usr/share/doc/wpasupplicant/examples/README.wpa_supplicant.conf.gz
-+#  for more complete configuration parameters.
+@@ -0,0 +1,105 @@
++######################## Debian wpa-roam Template #############################
++#
++# Template configuration for wpa-roam mode of Debian's wpasupplicant package.
++# wpa-roam mode is described in detail in the wpa_action(8) manpage, and also
++# at /usr/share/doc/wpasupplicant/README.modes.gz
++#
++# For a detailed set of configuration examples for different networks, refer to
++# /usr/share/doc/wpasupplicant/examples/README.wpa_supplicant.conf.gz
 +#
 +# Also see the other files in /usr/share/doc/wpasupplicant/examples/ for
-+#  specific configuration examples.
++# specific network configuration examples.
++#
++# Empty lines and lines starting with # are ignored
++#
++# NOTE! This file may contain password information and should be made readable
++# only by root user or netdev group on multiuser systems.
++#
++######################## Global Configuration Options #########################
++#
++# The update_config option can be used to allow wpa_supplicant to overwrite
++# configuration file whenever configuration is changed (e.g., new network block
++# is added with wpa_cli or wpa_gui, or a password is changed). This is required
++# for wpa_cli/wpa_gui to be able to store the configuration changes
++# permanently.
++#
++# NOTE! Any comments will be removed from the configuration file when the
++# update_config option is used.
++#
++#update_config=1
 +
-+# path to UNIX socket control interface
-+ctrl_interface=/var/run/wpa_supplicant
++# The ctrl_interface specifies the path to a unix socket through which the
++# supplicant may be controlled and interacted with.
++#
++# DIR=   Path to UNIX socket control interface, mandatory for wpa-roam mode
++# GROUP= Users in this group to control wpa_supplicant via wpa_cli/wpa_gui
++#
++ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev
++#
++######################## Network Block Configurations #########################
++#
++# Each network is configured as a separate block in this configuration file.
++# The network blocks are listed in preference of order, the top most network
++# to be found in scan results is used.
++#
++# By default, all networks will get same priority (0). If some of the networks
++# are more desirable, the "priority=" network parameter can be used to change
++# the order in which wpa_supplicant goes through the network blocks when
++# selecting what network will be used. The priority groups will be iterated
++# in decreasing priority, the network with the highest priority value will be
++# considered for selection first and the network with the lowest priority value
++# will be considered last.
++#
++# NOTE! The scan_ssid=1 and ap_scan=2 modes ignore the priority field. Instead,
++# the networks will be considered in the order specified in this configuration
++# file.
++#
++# The "id_str=" network identifier string parameter is given to wpa_action when
++# a network has been selected, and contains this field in its configuration
++# block. The given id_str string will be used to select a logical interfaces
++# from ifupdown's /etc/network/interfaces file.
++#
++###############################################################################
++#
++# A note on WEP and WPA pre-shared keys:
++#
++# WEP/WPA ascii passphrases must be within quotation marks, a hex key must not
++# be.
++#
++# WEP ascii: wep_key0="abcde"
++# WEP hex:   wep_key0=6162636465
++#
++# NOTE: 5/13/16/29 ascii characters are needed for 64/128/152/256-bit
++#       WEP ascii passphrases.
++#       10/26/32/58 hex characters are needed for 64/128/152/256-bit
++#       WEP hex keys.
++#
++# WPA ascii: psk="mysecretpassphrase"
++# WPA hex  : psk=0efe134ea6f7033bdaa616f436dc3224dc433213e86b8b2ccab5da59d5ec8daa
++#
++# NOTE: ascii WPA passphrases must be at least 8 and no more than 63
++#       acsii characters long. Hex keys must be 64 hex characters in
++#       length.
++#
++###############################################################################
 +
-+### Example of basic WPA-PSK secured AP
 +#network={
-+#    ssid="ournet"
-+#    psk="w243sd5f324asdf5123sadf54324"
++#	ssid="Example WEP Network"
++#	key_mgmt=NONE
++#	wep_key0=6162636465
++#	wep_tx_keyidx=0
++#	id_str="wpa_network"
 +#}
 +
-+### Associate with any open access point
-+###  Scans/ESSID changes can be done with wpa_cli
++#network={
++#	ssid="Example WPA Network"
++#	psk="mysecretpassphrase"
++#}
++
++###############################################################################
++# Default behaviour is to associate with any open access point, further
++# networks can be configured with wpa_cli/wpa_gui.
++#
 +network={
-+        key_mgmt=NONE
++	key_mgmt=NONE
 +}
-+

More information about the Pkg-wpa-devel mailing list