[pkg-wpa-devel] r1349 - in /wpasupplicant/trunk/debian: README.Debian changelog ifupdown/action_wpa.sh ifupdown/functions.sh ifupdown/ifupdown.sh ifupdown/wpa_action.sh patches/03_dbus_service_activation_logfile.patch patches/series
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Fri Mar 27 17:48:42 UTC 2009
Author: kelmo-guest
Date: Fri Mar 27 17:48:42 2009
New Revision: 1349
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1349
Log:
* Remove debian/patches/03_dbus_service_activation_logfile.patch,
wpa_supplicant can now log to syslog instead.
* Update copyright info in debian/ifupdown/*.
* When starting wpa_supplicant via ifupdown hook script, do not log to
file by default now that we have syslog support.
* Update README.Debian for nl80211 driver and change in logging behaviour.
Removed:
wpasupplicant/trunk/debian/patches/03_dbus_service_activation_logfile.patch
Modified:
wpasupplicant/trunk/debian/README.Debian
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/ifupdown/action_wpa.sh
wpasupplicant/trunk/debian/ifupdown/functions.sh
wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
wpasupplicant/trunk/debian/ifupdown/wpa_action.sh
wpasupplicant/trunk/debian/patches/series
Modified: wpasupplicant/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/README.Debian?rev=1349&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/README.Debian (original)
+++ wpasupplicant/trunk/debian/README.Debian Fri Mar 27 17:48:42 2009
@@ -50,6 +50,7 @@
Driver Description
====== ===========
atmel ATMEL AT76C5XXx (USB, PCMCIA)
+nl80211 Linux 802.11 netlink interface
wext Linux wireless extensions (generic)
wired wired Ethernet driver
@@ -502,8 +503,9 @@
==================
In order to debug connection, association and authentication problems,
-increase the verbosity level of wpa_supplicant to log debug output to
-/var/log/wpa_supplicant.$iface.log.
+increase the verbosity level of wpa_supplicant to log debug output by
+adding the wpa-debug-level option to /etc/network/interfaces like in
+the following example:
iface eth1 inet dhcp
wpa-debug-level 3
@@ -514,6 +516,15 @@
wpa_supplicant to be started with -q and -qq options respectively (quiet mode).
Any other wpa-debug-level value will cause the supplicant to be started
with default debug level.
+
+If wpa_supplicant is started via D-Bus, then you must edit
+/usr/share/dbus-1/system-services/fi.epitest.hostap.WPASupplicant.service and
+add the debugging command line option to the Exec field.
+
+It is also possible to have wpa_supplicant write all debug output to a text
+file with the -f command line option. You may specify a file to log to with
+the wpa-logfile in /etc/network/interfaces if starting wpa_supplicant via
+ifupdown.
Another method is to start `wpa_cli -i <interface>` in another shell before
starting the interface. Use the command 'level 0' first, to get all debug
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1349&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Mar 27 17:48:42 2009
@@ -28,8 +28,14 @@
* Backport patch from 0.7.X to allow multiple driver wrappers to be
tried until one works. This will allow some kind of transition
smoothing as drivers transition from wext -> nl80211 in the future.
-
- -- Kel Modderman <kel at otaku42.de> Tue, 24 Mar 2009 09:57:26 +1000
+ * Remove debian/patches/03_dbus_service_activation_logfile.patch,
+ wpa_supplicant can now log to syslog instead.
+ * Update copyright info in debian/ifupdown/*.
+ * When starting wpa_supplicant via ifupdown hook script, do not log to
+ file by default now that we have syslog support.
+ * Update README.Debian for nl80211 driver and change in logging behaviour.
+
+ -- Kel Modderman <kel at otaku42.de> Sat, 28 Mar 2009 03:46:12 +1000
wpasupplicant (0.6.7-1) experimental; urgency=low
Modified: wpasupplicant/trunk/debian/ifupdown/action_wpa.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/action_wpa.sh?rev=1349&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/action_wpa.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/action_wpa.sh Fri Mar 27 17:48:42 2009
@@ -3,7 +3,7 @@
# Action script to enable/disable wpa-roam interfaces in reaction to
# pm-action or ifplugd events.
#
-# Copyright: Copyright (c) 2008, Kel Modderman <kel at otaku42.de>
+# Copyright: Copyright (c) 2008-2009, Kel Modderman <kel at otaku42.de>
# License: GPL-2
#
Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1349&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Fri Mar 27 17:48:42 2009
@@ -10,7 +10,7 @@
# This file is provided by the wpasupplicant package.
#####################################################################
-# Copyright (C) 2006 - 2008 Debian/Ubuntu wpasupplicant Maintainers
+# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers
# <pkg-wpa-devel at lists.alioth.debian.org>
#
# This program is free software; you can redistribute it and/or
@@ -23,8 +23,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# On Debian GNU/Linux systems, the text of the GPL license can be
-# found in /usr/share/common-licenses/GPL.
+# On Debian GNU/Linux systems, the text of the GPL license,
+# version 2, can be found in /usr/share/common-licenses/GPL-2.
#####################################################################
## global variables
@@ -32,7 +32,6 @@
WPA_SUP_BIN="/sbin/wpa_supplicant"
WPA_SUP_PNAME="wpa_supplicant"
WPA_SUP_PIDFILE="/var/run/wpa_supplicant.${WPA_IFACE}.pid"
-WPA_SUP_LOGFILE="/var/log/wpa_supplicant.${WPA_IFACE}.log"
# wpa_cli variables
WPA_CLI_BIN="/sbin/wpa_cli"
@@ -176,13 +175,14 @@
# Start wpa_supplicant via start-stop-dameon with all required
# options. Will start if environment variable WPA_SUP_CONF is present
#
-# Required options:
+# Default options:
# -B dameonize/background process
# -D driver backend ('wext' if none given)
# -P process ID file
# -C path to ctrl_interface socket directory
-#
-# Optional options:
+# -s log to syslog
+#
+# Conditional options:
# -c configuration file
# -W wait for wpa_cli to attach to ctrl_interface socket
# -b bridge interface name
@@ -192,17 +192,16 @@
[ -n "$WPA_SUP_CONF" ] || return 0
local WPA_SUP_OPTIONS
+ WPA_SUP_OPTIONS="-s -B -P $WPA_SUP_PIDFILE -i $WPA_IFACE"
if [ -n "$WPA_ACTION_SCRIPT" ]; then
if [ -x "$WPA_ACTION_SCRIPT" ]; then
- WPA_SUP_OPTIONS="-W -B -P $WPA_SUP_PIDFILE -i $WPA_IFACE"
+ WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -W"
wpa_msg verbose "wait for wpa_cli to attach"
else
wpa_msg stderr "action script \"$WPA_ACTION_SCRIPT\" not executable"
return 1
fi
- else
- WPA_SUP_OPTIONS="-B -P $WPA_SUP_PIDFILE -i $WPA_IFACE"
fi
if [ -n "$IF_WPA_BRIDGE" ]; then
@@ -256,14 +255,9 @@
if [ -n "$IF_WPA_LOGFILE" ]; then
# custom log file
+ WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -f $IF_WPA_LOGFILE"
WPA_SUP_LOGFILE="$IF_WPA_LOGFILE"
wpa_msg verbose "logging to $IF_WPA_LOGFILE"
- fi
-
- if [ -d "${WPA_SUP_LOGFILE%/*}" ]; then
- WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -f $WPA_SUP_LOGFILE"
- else
- wpa_msg stderr "unable to log output to $WPA_SUP_LOGFILE"
fi
wpa_msg verbose "$WPA_SUP_BIN $WPA_SUP_OPTIONS $WPA_SUP_CONF"
Modified: wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/ifupdown.sh?rev=1349&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/ifupdown.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/ifupdown.sh Fri Mar 27 17:48:42 2009
@@ -12,7 +12,7 @@
# This file is provided by the wpasupplicant package.
#####################################################################
-# Copyright (C) 2006 - 2008 Debian/Ubuntu wpasupplicant Maintainers
+# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers
# <pkg-wpa-devel at lists.alioth.debian.org>
#
# This program is free software; you can redistribute it and/or
@@ -25,8 +25,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# On Debian GNU/Linux systems, the text of the GPL license can be
-# found in /usr/share/common-licenses/GPL.
+# On Debian GNU/Linux systems, the text of the GPL license,
+# version 2, can be found in /usr/share/common-licenses/GPL-2.
if [ -n "$IF_WPA_MAINT_DEBUG" ]; then
set -x
Modified: wpasupplicant/trunk/debian/ifupdown/wpa_action.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/wpa_action.sh?rev=1349&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/wpa_action.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/wpa_action.sh Fri Mar 27 17:48:42 2009
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright (C) 2006 - 2008 Debian/Ubuntu wpasupplicant Maintainers
+# Copyright (C) 2006 - 2009 Debian/Ubuntu wpasupplicant Maintainers
# <pkg-wpa-devel at lists.alioth.debian.org>
#
# This program is free software; you can redistribute it and/or
@@ -13,8 +13,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
-# On Debian GNU/Linux systems, the text of the GPL license can be
-# found in /usr/share/common-licenses/GPL.
+# On Debian GNU/Linux systems, the text of the GPL license,
+# version 2, can be found in /usr/share/common-licenses/GPL-2.
if [ -n "$IF_WPA_ROAM_MAINT_DEBUG" ]; then
set -x
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1349&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Fri Mar 27 17:48:42 2009
@@ -1,6 +1,5 @@
01_use_pkg-config_for_pcsc-lite_module.patch
02_dbus_group_policy.patch
-03_dbus_service_activation_logfile.patch
05_qmake_version_makefile.patch
06_wpa_gui_menu_exec_path.patch
10_multi_driver.patch
More information about the Pkg-wpa-devel
mailing list