[pkg-wpa-devel] r1152 - in /wpasupplicant/trunk/debian: changelog patches/11_avoid_dbus_version_namespace.patch patches/12_fix_potential_use_after_free.patch patches/20_wpa_gui_qt4_link_pkgconfig.patch patches/42_manpage_explain_available_drivers.patch patches/series

kelmo-guest at users.alioth.debian.org kelmo-guest at users.alioth.debian.org
Tue Mar 11 13:45:40 UTC 2008 

Author: kelmo-guest
Date: Tue Mar 11 13:45:40 2008
New Revision: 1152

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1152
Log:
* Cherry pick two upstream git commits concerning the dbus interface:
  - debian/patches/11_avoid_dbus_version_namespace.patch
  - debian/patches/12_fix_potential_use_after_free.patch
* Add debian/patches/42_manpage_explain_available_drivers.patch to explain
  that not all of the driver backends are available in the provided
  wpa_supplicant binary, and that the canonical list of supported driver
  backends can be retrieved from the wpa_supplicant -h (help) output.
  (Closes: #466910)
* Add debian/patches/20_wpa_gui_qt4_link_pkgconfig.patch to combat against
  the excess linkage by selecting precise CONFIG project configuration and
  compiler options.

Added:
    wpasupplicant/trunk/debian/patches/11_avoid_dbus_version_namespace.patch
    wpasupplicant/trunk/debian/patches/12_fix_potential_use_after_free.patch
    wpasupplicant/trunk/debian/patches/20_wpa_gui_qt4_link_pkgconfig.patch
    wpasupplicant/trunk/debian/patches/42_manpage_explain_available_drivers.patch
Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/patches/series

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1152&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Tue Mar 11 13:45:40 2008
@@ -19,8 +19,19 @@
     needed.
   * Add debian/patches/10_silence_siocsiwauth_icotl_failure.patch to disable
     ioctl failure messages that occur under normal conditions.
-
- -- Kel Modderman <kel at otaku42.de>  Sat, 23 Feb 2008 14:06:17 +1000
+  * Cherry pick two upstream git commits concerning the dbus interface:
+    - debian/patches/11_avoid_dbus_version_namespace.patch
+    - debian/patches/12_fix_potential_use_after_free.patch
+  * Add debian/patches/42_manpage_explain_available_drivers.patch to explain
+    that not all of the driver backends are available in the provided
+    wpa_supplicant binary, and that the canonical list of supported driver
+    backends can be retrieved from the wpa_supplicant -h (help) output.
+    (Closes: #466910)
+  * Add debian/patches/20_wpa_gui_qt4_link_pkgconfig.patch to combat against
+    the excess linkage by selecting precise CONFIG project configuration and
+    compiler options.
+
+ -- Kel Modderman <kel at otaku42.de>  Tue, 11 Mar 2008 23:44:57 +1000
 
 wpasupplicant (0.6.2+git20080206.g8c0dad4-1) unstable; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/11_avoid_dbus_version_namespace.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/11_avoid_dbus_version_namespace.patch?rev=1152&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/11_avoid_dbus_version_namespace.patch (added)
+++ wpasupplicant/trunk/debian/patches/11_avoid_dbus_version_namespace.patch Tue Mar 11 13:45:40 2008
@@ -1,0 +1,23 @@
+From: Jouni Malinen <j at w1.fi>
+Date: Wed, 5 Mar 2008 14:05:26 +0000 (+0200)
+Subject: Renamed local DBUS_VERSION define to avoid conflict with dbus 1.1 headers
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=c673c5fc0ff51e8ff216c633a713fb49608887e0
+
+Renamed local DBUS_VERSION define to avoid conflict with dbus 1.1 headers
+---
+
+--- a/wpa_supplicant/ctrl_iface_dbus.c
++++ b/wpa_supplicant/ctrl_iface_dbus.c
+@@ -21,10 +21,10 @@
+ #include "ctrl_iface_dbus.h"
+ #include "ctrl_iface_dbus_handlers.h"
+ 
+-#define DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR)
++#define _DBUS_VERSION (DBUS_VERSION_MAJOR << 8 | DBUS_VERSION_MINOR)
+ #define DBUS_VER(major, minor) ((major) << 8 | (minor))
+ 
+-#if DBUS_VERSION < DBUS_VER(1,1)
++#if _DBUS_VERSION < DBUS_VER(1,1)
+ #define dbus_watch_get_unix_fd dbus_watch_get_fd
+ #endif
+ 

Added: wpasupplicant/trunk/debian/patches/12_fix_potential_use_after_free.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/12_fix_potential_use_after_free.patch?rev=1152&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/12_fix_potential_use_after_free.patch (added)
+++ wpasupplicant/trunk/debian/patches/12_fix_potential_use_after_free.patch Tue Mar 11 13:45:40 2008
@@ -1,0 +1,22 @@
+From: Dan Williams <dcbw at redhat.com>
+Date: Wed, 5 Mar 2008 14:15:10 +0000 (+0200)
+Subject: Fix potential use-after-free in dbus byte array demarshaling code
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=cf7a576f67fd814e4cd407c9828a72e5cf4b83c4
+
+Fix potential use-after-free in dbus byte array demarshaling code
+
+The byte array code should be clearing its own pointer, not the string
+array pointer.
+---
+
+--- a/wpa_supplicant/dbus_dict_helpers.c
++++ b/wpa_supplicant/dbus_dict_helpers.c
+@@ -674,7 +674,7 @@
+ 	/* Zero-length arrays are valid. */
+ 	if (entry->array_len == 0) {
+ 		free(entry->bytearray_value);
+-		entry->strarray_value = NULL;
++		entry->bytearray_value = NULL;
+ 	}
+ 
+ 	success = TRUE;

Added: wpasupplicant/trunk/debian/patches/20_wpa_gui_qt4_link_pkgconfig.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/20_wpa_gui_qt4_link_pkgconfig.patch?rev=1152&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/20_wpa_gui_qt4_link_pkgconfig.patch (added)
+++ wpasupplicant/trunk/debian/patches/20_wpa_gui_qt4_link_pkgconfig.patch Tue Mar 11 13:45:40 2008
@@ -1,0 +1,18 @@
+From: Kel Modderman <kel at otaku42.de>
+Reference: none
+Description: avoid ridiculous amount of excess linkage with newer qt
+
+Signed-off-by: Kel Modderman <kel at otaku42.de>
+---
+
+--- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
++++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
+@@ -1,7 +1,7 @@
+ TEMPLATE	= app
+ LANGUAGE	= C++
+ 
+-CONFIG	+= qt warn_on release
++CONFIG	= qt uic warn_on release
+ 
+ DEFINES += CONFIG_CTRL_IFACE
+ 

Added: wpasupplicant/trunk/debian/patches/42_manpage_explain_available_drivers.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/42_manpage_explain_available_drivers.patch?rev=1152&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/42_manpage_explain_available_drivers.patch (added)
+++ wpasupplicant/trunk/debian/patches/42_manpage_explain_available_drivers.patch Tue Mar 11 13:45:40 2008
@@ -1,0 +1,15 @@
+--- a/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
++++ b/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
+@@ -238,7 +238,11 @@
+ 
+   <refsect1>
+     <title>Available Drivers</title>
+-    <para>The available drivers to specify with the -D option are:</para>
++    <para>A summary of available driver backends is below. Support for each
++    of the driver backends is chosen at wpa_supplicant compile time. For a
++    list of supported driver backends that may be used with the -D option on
++    your system, refer to the help output of wpa_supplicant
++    (<emphasis>wpa_supplicant -h</emphasis>).</para>
+ 
+     <variablelist>
+       <varlistentry>

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1152&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Tue Mar 11 13:45:40 2008
@@ -4,4 +4,8 @@
 04_append_mmd_to_default_cflags.patch
 05_qmake_version_makefile.patch
 10_silence_siocsiwauth_icotl_failure.patch
+11_avoid_dbus_version_namespace.patch
+12_fix_potential_use_after_free.patch
+20_wpa_gui_qt4_link_pkgconfig.patch
 41_manpage_format_fixes.patch
+42_manpage_explain_available_drivers.patch

More information about the Pkg-wpa-devel mailing list