[pkg-wpa-devel] r1354 - in /wpasupplicant/trunk/debian: changelog config/kfreebsd config/linux ifupdown/functions.sh patches/07_dbus_service_syslog.patch patches/12_syslog_supplement.patch patches/series
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Mon Apr 13 13:32:36 UTC 2009
Author: kelmo-guest
Date: Mon Apr 13 13:32:36 2009
New Revision: 1354
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1354
Log:
* Merge some differences from wpasupplicant_0.6.6-2ubuntu1.patch, with
very minor modification:
- 12_syslog_supplement.patch: Add a few more bits missing from the
upstream patch, based on
http://cvs.fedoraproject.org/viewvc/rpms/wpa_supplicant/OLPC-2/wpa_supplicant-0.5.7-use-syslog.patch.
Compile with -DCONFIG_DEBUG_SYSLOG if CONFIG_DEBUG_SYSLOG is set in
the configuration file.
- Enable CONFIG_DEBUG_SYSLOG in debian/config/* (rather than
CFLAGS += -DCONFIG_DEBUG_SYSLOG).
- debian/ifupdown/functions.sh: Silence wpa_log_* if /var/log is not yet
writable; there is little we can do in this case (logger is in /usr,
so may well also be unusable), and the user can always get more
information by reconnecting later.
- Thanks to Colin Watson <cjwatson at ubuntu.com>
* Sync common build configuration options between debian/config/kfreebsd and
debian/config/linux.
* Add patch description to
debian/patches/06_wpa_gui_menu_exec_path.patch.
Added:
wpasupplicant/trunk/debian/patches/12_syslog_supplement.patch
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/config/kfreebsd
wpasupplicant/trunk/debian/config/linux
wpasupplicant/trunk/debian/ifupdown/functions.sh
wpasupplicant/trunk/debian/patches/07_dbus_service_syslog.patch
wpasupplicant/trunk/debian/patches/series
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1354&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Apr 13 13:32:36 2009
@@ -4,8 +4,26 @@
logging when wpa_supplicant is started via D-Bus.
* Start wpa_supplicant with default level of verbosity via ifupdown
hooks, rather than in quiet mode.
-
- -- Kel Modderman <kel at otaku42.de> Fri, 03 Apr 2009 07:05:33 +1000
+ * Merge some differences from wpasupplicant_0.6.6-2ubuntu1.patch, with
+ very minor modification:
+ - 12_syslog_supplement.patch: Add a few more bits missing from the
+ upstream patch, based on
+ http://cvs.fedoraproject.org/viewvc/rpms/wpa_supplicant/OLPC-2/wpa_supplicant-0.5.7-use-syslog.patch.
+ Compile with -DCONFIG_DEBUG_SYSLOG if CONFIG_DEBUG_SYSLOG is set in
+ the configuration file.
+ - Enable CONFIG_DEBUG_SYSLOG in debian/config/* (rather than
+ CFLAGS += -DCONFIG_DEBUG_SYSLOG).
+ - debian/ifupdown/functions.sh: Silence wpa_log_* if /var/log is not yet
+ writable; there is little we can do in this case (logger is in /usr,
+ so may well also be unusable), and the user can always get more
+ information by reconnecting later.
+ - Thanks to Colin Watson <cjwatson at ubuntu.com>
+ * Sync common build configuration options between debian/config/kfreebsd and
+ debian/config/linux.
+ * Add patch description to
+ debian/patches/06_wpa_gui_menu_exec_path.patch.
+
+ -- Kel Modderman <kel at otaku42.de> Mon, 13 Apr 2009 23:25:17 +1000
wpasupplicant (0.6.9-1) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/config/kfreebsd
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/kfreebsd?rev=1354&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/kfreebsd (original)
+++ wpasupplicant/trunk/debian/config/kfreebsd Mon Apr 13 13:32:36 2009
@@ -327,5 +327,12 @@
# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
CONFIG_DEBUG_FILE=y
+# Enable syslog support
+CONFIG_DEBUG_SYSLOG=y
+
# Enable privilege separation (see README 'Privilege separation' for details)
#CONFIG_PRIVSEP=y
+
+# Enable mitigation against certain attacks against TKIP by delaying Michael
+# MIC error reports by a random amount of time between 0 and 60 seconds
+CONFIG_DELAYED_MIC_ERROR_REPORT=y
Modified: wpasupplicant/trunk/debian/config/linux
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/linux?rev=1354&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/linux (original)
+++ wpasupplicant/trunk/debian/config/linux Mon Apr 13 13:32:36 2009
@@ -342,7 +342,7 @@
CONFIG_DEBUG_FILE=y
# Enable syslog support
-CFLAGS += -DCONFIG_DEBUG_SYSLOG
+CONFIG_DEBUG_SYSLOG=y
# Enable privilege separation (see README 'Privilege separation' for details)
#CONFIG_PRIVSEP=y
Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1354&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Mon Apr 13 13:32:36 2009
@@ -852,20 +852,26 @@
# Log actions to file
#
wpa_log_init () {
- exec >> "$WPA_CLI_LOGFILE" 2>&1
+ if touch "$WPA_CLI_LOGFILE" 2>/dev/null; then
+ exec >> "$WPA_CLI_LOGFILE" 2>&1
+ fi
}
# log timestamp and wpa_action arguments
wpa_log_action () {
+ [ -w "$WPA_CLI_LOGFILE" ] || return 0
+
local DATE
-
DATE=$(date +"%H:%M:%S %Y-%m-%d")
+
echo "########## $DATE ##########"
echo "IFACE=$WPA_IFACE ACTION=$WPA_ACTION"
}
# log wpa_cli environment variables
wpa_log_environment () {
+ [ -w "$WPA_CLI_LOGFILE" ] || return 0
+
echo "WPA_ID=$WPA_ID WPA_ID_STR=$WPA_ID_STR"
echo "WPA_CTRL_DIR=$WPA_CTRL_DIR"
}
Modified: wpasupplicant/trunk/debian/patches/07_dbus_service_syslog.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/07_dbus_service_syslog.patch?rev=1354&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/07_dbus_service_syslog.patch (original)
+++ wpasupplicant/trunk/debian/patches/07_dbus_service_syslog.patch Mon Apr 13 13:32:36 2009
@@ -1,3 +1,5 @@
+Log wpa_supplicant messages to syslog.
+
--- a/wpa_supplicant/dbus-wpa_supplicant.service
+++ b/wpa_supplicant/dbus-wpa_supplicant.service
@@ -1,4 +1,4 @@
Added: wpasupplicant/trunk/debian/patches/12_syslog_supplement.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/12_syslog_supplement.patch?rev=1354&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/12_syslog_supplement.patch (added)
+++ wpasupplicant/trunk/debian/patches/12_syslog_supplement.patch Mon Apr 13 13:32:36 2009
@@ -1,0 +1,206 @@
+Description: Fix up a few missing bits from 07_syslog.patch.
+Ubuntu: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/44194
+Upstream: Not yet sent upstream, but should be. Based on
+ http://cvs.fedoraproject.org/viewvc/rpms/wpa_supplicant/OLPC-2/wpa_supplicant-0.5.7-use-syslog.patch
+
+--- a/src/utils/wpa_debug.c
++++ b/src/utils/wpa_debug.c
+@@ -130,37 +130,38 @@ static void _wpa_hexdump(int level, cons
+ size_t len, int show)
+ {
+ size_t i;
++ char out_buf[2048];
++ char *p = &out_buf[0];
++
+ if (level < wpa_debug_level)
+ return;
++ p += sprintf(p, "%s - hexdump(len=%lu):", title, (unsigned long) len);
++ if (buf == NULL) {
++ p += sprintf(p, " [NULL]");
++ } else if (show) {
++ for (i = 0; i < len; i++)
++ p += sprintf(p, " %02x", buf[i]);
++ } else {
++ p += sprintf(p, " [REMOVED]");
++ }
++#ifdef CONFIG_DEBUG_SYSLOG
++ if (wpa_debug_syslog) {
++ syslog(syslog_priority(level), "%s", out_buf);
++ } else {
++#endif /* CONFIG_DEBUG_SYSLOG */
+ wpa_debug_print_timestamp();
+ #ifdef CONFIG_DEBUG_FILE
+ if (out_file) {
+- fprintf(out_file, "%s - hexdump(len=%lu):",
+- title, (unsigned long) len);
+- if (buf == NULL) {
+- fprintf(out_file, " [NULL]");
+- } else if (show) {
+- for (i = 0; i < len; i++)
+- fprintf(out_file, " %02x", buf[i]);
+- } else {
+- fprintf(out_file, " [REMOVED]");
+- }
+- fprintf(out_file, "\n");
++ fprintf(out_file, "%s\n", out_buf);
+ } else {
+ #endif /* CONFIG_DEBUG_FILE */
+- printf("%s - hexdump(len=%lu):", title, (unsigned long) len);
+- if (buf == NULL) {
+- printf(" [NULL]");
+- } else if (show) {
+- for (i = 0; i < len; i++)
+- printf(" %02x", buf[i]);
+- } else {
+- printf(" [REMOVED]");
+- }
+- printf("\n");
++ printf("%s\n", out_buf);
+ #ifdef CONFIG_DEBUG_FILE
+ }
+ #endif /* CONFIG_DEBUG_FILE */
++#ifdef CONFIG_DEBUG_SYSLOG
++ }
++#endif /* CONFIG_DEBUG_SYSLOG */
+ }
+
+ void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len)
+@@ -181,82 +182,60 @@ static void _wpa_hexdump_ascii(int level
+ size_t i, llen;
+ const u8 *pos = buf;
+ const size_t line_len = 16;
++ char out_buf[2048];
++ char *p = &out_buf[0];
+
+ if (level < wpa_debug_level)
+ return;
++ if (!show) {
++ p += sprintf(p, "%s - hexdump_ascii(len=%lu): [REMOVED]\n",
++ title, (unsigned long) len);
++ goto out;
++ }
++ if (buf == NULL) {
++ p += sprintf(p, "%s - hexdump_ascii(len=%lu): [NULL]\n",
++ title, (unsigned long) len);
++ goto out;
++ }
++ p += sprintf(p, "%s - hexdump_ascii(len=%lu):\n", title, (unsigned long) len);
++ while (len) {
++ llen = len > line_len ? line_len : len;
++ p += sprintf(p, " ");
++ for (i = 0; i < llen; i++)
++ p += sprintf(p, " %02x", pos[i]);
++ for (i = llen; i < line_len; i++)
++ p += sprintf(p, " ");
++ p += sprintf(p, " ");
++ for (i = 0; i < llen; i++) {
++ if (isprint(pos[i]))
++ p += sprintf(p, "%c", pos[i]);
++ else
++ p += sprintf(p, "_");
++ }
++ for (i = llen; i < line_len; i++)
++ p += sprintf(p, " ");
++ pos += llen;
++ len -= llen;
++ }
++out:
++#ifdef CONFIG_DEBUG_SYSLOG
++ if (wpa_debug_syslog) {
++ syslog(syslog_priority(level), "%s", out_buf);
++ } else {
++#endif /* CONFIG_DEBUG_SYSLOG */
+ wpa_debug_print_timestamp();
+ #ifdef CONFIG_DEBUG_FILE
+ if (out_file) {
+- if (!show) {
+- fprintf(out_file,
+- "%s - hexdump_ascii(len=%lu): [REMOVED]\n",
+- title, (unsigned long) len);
+- return;
+- }
+- if (buf == NULL) {
+- fprintf(out_file,
+- "%s - hexdump_ascii(len=%lu): [NULL]\n",
+- title, (unsigned long) len);
+- return;
+- }
+- fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n",
+- title, (unsigned long) len);
+- while (len) {
+- llen = len > line_len ? line_len : len;
+- fprintf(out_file, " ");
+- for (i = 0; i < llen; i++)
+- fprintf(out_file, " %02x", pos[i]);
+- for (i = llen; i < line_len; i++)
+- fprintf(out_file, " ");
+- fprintf(out_file, " ");
+- for (i = 0; i < llen; i++) {
+- if (isprint(pos[i]))
+- fprintf(out_file, "%c", pos[i]);
+- else
+- fprintf(out_file, "_");
+- }
+- for (i = llen; i < line_len; i++)
+- fprintf(out_file, " ");
+- fprintf(out_file, "\n");
+- pos += llen;
+- len -= llen;
+- }
++ fprintf(out_file, "%s\n", out_buf);
+ } else {
+ #endif /* CONFIG_DEBUG_FILE */
+- if (!show) {
+- printf("%s - hexdump_ascii(len=%lu): [REMOVED]\n",
+- title, (unsigned long) len);
+- return;
+- }
+- if (buf == NULL) {
+- printf("%s - hexdump_ascii(len=%lu): [NULL]\n",
+- title, (unsigned long) len);
+- return;
+- }
+- printf("%s - hexdump_ascii(len=%lu):\n", title, (unsigned long) len);
+- while (len) {
+- llen = len > line_len ? line_len : len;
+- printf(" ");
+- for (i = 0; i < llen; i++)
+- printf(" %02x", pos[i]);
+- for (i = llen; i < line_len; i++)
+- printf(" ");
+- printf(" ");
+- for (i = 0; i < llen; i++) {
+- if (isprint(pos[i]))
+- printf("%c", pos[i]);
+- else
+- printf("_");
+- }
+- for (i = llen; i < line_len; i++)
+- printf(" ");
+- printf("\n");
+- pos += llen;
+- len -= llen;
+- }
++ printf("%s\n", out_buf);
+ #ifdef CONFIG_DEBUG_FILE
+ }
+ #endif /* CONFIG_DEBUG_FILE */
++#ifdef CONFIG_DEBUG_SYSLOG
++ }
++#endif /* CONFIG_DEBUG_SYSLOG */
+ }
+
+
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -1008,6 +1008,10 @@ ifdef CONFIG_DEBUG_FILE
+ CFLAGS += -DCONFIG_DEBUG_FILE
+ endif
+
++ifdef CONFIG_DEBUG_SYSLOG
++CFLAGS += -DCONFIG_DEBUG_SYSLOG
++endif
++
+ ifdef CONFIG_DELAYED_MIC_ERROR_REPORT
+ CFLAGS += -DCONFIG_DELAYED_MIC_ERROR_REPORT
+ endif
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1354&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Mon Apr 13 13:32:36 2009
@@ -5,3 +5,4 @@
07_dbus_service_syslog.patch
10_multi_driver.patch
11_syslog.patch
+12_syslog_supplement.patch
More information about the Pkg-wpa-devel
mailing list