[pkg-wpa-devel] r1571 - in /wpasupplicant/trunk/debian: ./ config/ patches/
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Mon Mar 7 10:48:06 UTC 2011
Author: kelmo-guest
Date: Mon Mar 7 10:48:02 2011
New Revision: 1571
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1571
Log:
* ACK NMU (Closes: #582917) and integrate changelog.
* Establish control interface when D-Bus activated wpa_supplicant
daemon starts. (Closes: #606051)
* Update all patches with DEP-3 compliant header information.
* Cherry pick upstream commit which fixes up emission of change events
over D-bus. (Closes: #617199)
* Add patch to load libpcsclite1 via dlopen(), making pcsc support
optional. (Closes: #612842, #612715, #583671, #531592)
* Set build config option CONFIG_PCSC=dyn to use above mentioned feature.
* Add patch to wpa_gui to use KDE's KNotify when running under KDE.
(Closes: #582793)
* Non-maintainer upload approved by Kel Modderman.
* Added patch 31_fallback_to_full_EAP_authentication.patch (closes: #582917).
Added:
wpasupplicant/trunk/debian/patches/08_pcsc_dynamic.patch
wpasupplicant/trunk/debian/patches/09_dbus_emit_change_events.patch
wpasupplicant/trunk/debian/patches/12_wpa_gui_knotify_support.patch
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/config/kfreebsd
wpasupplicant/trunk/debian/config/linux
wpasupplicant/trunk/debian/control
wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
wpasupplicant/trunk/debian/patches/02_dbus_group_policy.patch
wpasupplicant/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch
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=1571&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Mar 7 10:48:02 2011
@@ -1,6 +1,7 @@
-wpasupplicant (0.7.3-1) UNRELEASED; urgency=low
+wpasupplicant (0.7.3-1) experimental; urgency=low
[ Kel Modderman ]
+ * ACK NMU (Closes: #582917) and integrate changelog.
* New upstream release (Closes: #591371).
- nl80211 driver interface doesn't use WEXT compat layer
(Closes: #570688)
@@ -33,6 +34,16 @@
this software under BSD license and link with openssl.
* Override lintian in the case of possible-gpl-code-linked-with-
openssl.
+ * Establish control interface when D-Bus activated wpa_supplicant
+ daemon starts. (Closes: #606051)
+ * Update all patches with DEP-3 compliant header information.
+ * Cherry pick upstream commit which fixes up emission of change events
+ over D-bus. (Closes: #617199)
+ * Add patch to load libpcsclite1 via dlopen(), making pcsc support
+ optional. (Closes: #612842, #612715, #583671, #531592)
+ * Set build config option CONFIG_PCSC=dyn to use above mentioned feature.
+ * Add patch to wpa_gui to use KDE's KNotify when running under KDE.
+ (Closes: #582793)
[ Stefan Lippers-Hollmann ]
* Add myself to uploaders.
@@ -48,11 +59,15 @@
- patches/11_wpa_supplicant_enable_network_tweak.patch
* update machine readable debian/copyright to be compatible with DEP5 r135.
* initial update of existing debian/copyright entries.
- * disable PCSC for now, given that it indirectly adds a dependency on hal
- through libpcsclite1, at a time when hal is going to be removed
- (Closes: #612715, #583671).
-
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de> Fri, 11 Feb 2011 01:12:22 +0100
+
+ -- Kel Modderman <kel at otaku42.de> Mon, 07 Mar 2011 20:00:59 +1000
+
+wpasupplicant (0.6.10-2.1) unstable; urgency=low
+
+ * Non-maintainer upload approved by Kel Modderman.
+ * Added patch 31_fallback_to_full_EAP_authentication.patch (closes: #582917).
+
+ -- Micha Lenk <micha at debian.org> Sun, 28 Nov 2010 12:22:01 +0100
wpasupplicant (0.6.10-2) unstable; urgency=low
Modified: wpasupplicant/trunk/debian/config/kfreebsd
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/kfreebsd?rev=1571&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/kfreebsd (original)
+++ wpasupplicant/trunk/debian/config/kfreebsd Mon Mar 7 10:48:02 2011
@@ -20,7 +20,7 @@
CONFIG_WPS=y
CONFIG_PKCS12=y
CONFIG_SMARTCARD=y
-#CONFIG_PCSC=y
+CONFIG_PCSC=dyn
CONFIG_CTRL_IFACE=y
CONFIG_READLINE=y
CONFIG_BACKEND=file
Modified: wpasupplicant/trunk/debian/config/linux
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/linux?rev=1571&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/linux (original)
+++ wpasupplicant/trunk/debian/config/linux Mon Mar 7 10:48:02 2011
@@ -21,7 +21,7 @@
CONFIG_WPS=y
CONFIG_PKCS12=y
CONFIG_SMARTCARD=y
-#CONFIG_PCSC=y
+CONFIG_PCSC=dyn
CONFIG_CTRL_IFACE=y
CONFIG_READLINE=y
CONFIG_BACKEND=file
Modified: wpasupplicant/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/control?rev=1571&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/control (original)
+++ wpasupplicant/trunk/debian/control Mon Mar 7 10:48:02 2011
@@ -10,6 +10,7 @@
libreadline-dev,
libqt4-dev,
libdbus-1-dev,
+ libpcsclite-dev,
libnl-dev [!kfreebsd-i386 !kfreebsd-amd64],
libpcap-dev [kfreebsd-i386 kfreebsd-amd64],
libbsd-dev [kfreebsd-i386 kfreebsd-amd64],
@@ -24,7 +25,7 @@
Package: wpasupplicant
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base (>= 3.0-6), adduser
-Suggests: wpagui, libengine-pkcs11-openssl
+Suggests: wpagui, libengine-pkcs11-openssl, libpcsclite1
Description: client support for WPA and WPA2 (IEEE 802.11i)
WPA and WPA2 are methods for securing wireless networks, the former
using IEEE 802.1X, and the latter using IEEE 802.11i. This software
Modified: wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch?rev=1571&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch (original)
+++ wpasupplicant/trunk/debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch Mon Mar 7 10:48:02 2011
@@ -1,9 +1,8 @@
-From: Reinhard Tartler <siretart at tauware.de>
-References: none
Description: Use pkg-config for libpcsclite linkage flags
At least in debian, we can rely on pkg-config being available and
returning more accurate ldflags.
-
+Author: Reinhard Tartler <siretart at tauware.de>
+---
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -691,7 +691,7 @@ ifdef CONFIG_NATIVE_WINDOWS
Modified: wpasupplicant/trunk/debian/patches/02_dbus_group_policy.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/02_dbus_group_policy.patch?rev=1571&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/02_dbus_group_policy.patch (original)
+++ wpasupplicant/trunk/debian/patches/02_dbus_group_policy.patch Mon Mar 7 10:48:02 2011
@@ -1,9 +1,9 @@
-From: Michael Biebl <biebl at debian.org>
-Reference: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;bug=412179
Description: Debian does not use pam_console but uses group membership
to control access to D-Bus. Activating both options in the conf file
makes it work on Debian and Ubuntu.
-
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=15;bug=412179
+---
--- a/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
+++ b/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
@@ -14,6 +14,14 @@
Modified: wpasupplicant/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch?rev=1571&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch (original)
+++ wpasupplicant/trunk/debian/patches/06_wpa_gui_menu_exec_path.patch Mon Mar 7 10:48:02 2011
@@ -1,5 +1,6 @@
-Debian specific patch to desktop meny entry, so that we may exec wpa_gui
-with best estimated privilege level via /usr/share/netdev_wrapper.
+Description: Debian specific patch to desktop meny entry, so that we may exec
+ wpa_gui with best estimated privilege level via /usr/share/netdev_wrapper.
+Author: Kel Modderman <kel at otaku42.de>
---
--- a/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
+++ b/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
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=1571&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/07_dbus_service_syslog.patch (original)
+++ wpasupplicant/trunk/debian/patches/07_dbus_service_syslog.patch Mon Mar 7 10:48:02 2011
@@ -1,12 +1,16 @@
-Log wpa_supplicant messages to syslog.
-
+Description: Tweak D-Bus service activation configuration file:
+ * log wpa_supplicant messages to syslog
+ * activate control socket interface so that wpa_cli can be used by D-Bus
+ activated wpa_supplicant daemon
+Author: Kel Modderman <kel at otaku42.de>
+---
--- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
+++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
-Exec=/sbin/wpa_supplicant -u
-+Exec=/sbin/wpa_supplicant -u -s
++Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
User=root
--- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
+++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
@@ -14,5 +18,5 @@
[D-BUS Service]
Name=fi.w1.wpa_supplicant1
-Exec=/sbin/wpa_supplicant -u
-+Exec=/sbin/wpa_supplicant -u -s
++Exec=/sbin/wpa_supplicant -u -s -O /var/run/wpa_supplicant
User=root
Added: wpasupplicant/trunk/debian/patches/08_pcsc_dynamic.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/08_pcsc_dynamic.patch?rev=1571&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/08_pcsc_dynamic.patch (added)
+++ wpasupplicant/trunk/debian/patches/08_pcsc_dynamic.patch Mon Mar 7 10:48:02 2011
@@ -1,0 +1,68 @@
+Description: Load libpcsclite dynamically
+Origin: http://w1.fi/bugz/attachment.cgi?id=149
+Bug: http://w1.fi/bugz/show_bug.cgi?id=315
+Bug-Debian: http://bugs.debian.org/531592
+Author: Ludovic Rousseau <ludovic.rousseau at gmail.com>
+
+Modified by Kel Modderman <kel at otaku42.de>:
+* reduce ifdef's which #define stuff to one block
+* make dynamic load optional via configuration option
+
+Please note that neither of the patch "author's" have any means of testing
+the end result.
+---
+--- a/src/utils/pcsc_funcs.c
++++ b/src/utils/pcsc_funcs.c
+@@ -97,11 +97,25 @@ struct scard_data {
+ int pin1_required;
+ };
+
+-#ifdef __MINGW32_VERSION
++#if defined( __MINGW32_VERSION) || defined(PCSC_DYNAMIC)
+ /* MinGW does not yet support WinScard, so load the needed functions
+ * dynamically from winscard.dll for now. */
+
++#ifdef __MINGW32_VERSION
+ static HINSTANCE dll = NULL; /* winscard.dll */
++#else
++#include <dlfcn.h>
++#define WINSCARDAPI
++#define WINAPI
++#define IN
++#define OUT
++#define SCardListReadersA SCardListReaders
++#define SCardConnectA SCardConnect
++#define LoadLibrary(lib) dlopen("libpcsclite.so.1", RTLD_LAZY)
++#define GetProcAddress dlsym
++#define FreeLibrary dlclose
++static void* dll = NULL;
++#endif
+
+ static const SCARD_IO_REQUEST *dll_g_rgSCardT0Pci, *dll_g_rgSCardT1Pci;
+ #undef SCARD_PCI_T0
+--- a/wpa_supplicant/Makefile
++++ b/wpa_supplicant/Makefile
+@@ -691,9 +691,13 @@ ifdef CONFIG_NATIVE_WINDOWS
+ #dynamic symbol loading that is now used in pcsc_funcs.c
+ #LIBS += -lwinscard
+ else
++ifeq ($(CONFIG_PCSC), dyn)
++CFLAGS += -DPCSC_DYNAMIC
++else
+ LIBS += $(shell pkg-config --libs libpcsclite)
+ endif
+ endif
++endif
+
+ ifdef CONFIG_SIM_SIMULATOR
+ CFLAGS += -DCONFIG_SIM_SIMULATOR
+--- a/wpa_supplicant/defconfig
++++ b/wpa_supplicant/defconfig
+@@ -204,6 +204,7 @@ CONFIG_SMARTCARD=y
+
+ # PC/SC interface for smartcards (USIM, GSM SIM)
+ # Enable this if EAP-SIM or EAP-AKA is included
++# If CONFIG_PCSC=dyn pcsc library is loaded dynamically
+ #CONFIG_PCSC=y
+
+ # Development testing
Added: wpasupplicant/trunk/debian/patches/09_dbus_emit_change_events.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/09_dbus_emit_change_events.patch?rev=1571&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/09_dbus_emit_change_events.patch (added)
+++ wpasupplicant/trunk/debian/patches/09_dbus_emit_change_events.patch Mon Mar 7 10:48:02 2011
@@ -1,0 +1,44 @@
+Description: Emit property changed events when adding/removing BSSes
+Origin: http://hostap.epitest.fi/gitweb/gitweb.cgi?p=hostap-07.git;a=commit;h=b80b5639935d37b95d00f86b57f2844a9c775f57
+Author: Dan Williams <dcbw at redhat.com>
+Bug-Debian: http://bugs.debian.org/617199
+---
+--- a/wpa_supplicant/dbus/dbus_new.c
++++ b/wpa_supplicant/dbus/dbus_new.c
+@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struc
+ wpas_dbus_getter_current_network;
+ prop = "CurrentNetwork";
+ break;
++ case WPAS_DBUS_PROP_BSSS:
++ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss;
++ prop = "BSSs";
++ break;
+ default:
+ wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d",
+ __func__, property);
+@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_
+ }
+
+ wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path);
++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+
+ return 0;
+ }
+@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_su
+ }
+
+ wpas_dbus_signal_bss_added(wpa_s, bss_obj_path);
++ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS);
+
+ return 0;
+
+--- a/wpa_supplicant/dbus/dbus_new.h
++++ b/wpa_supplicant/dbus/dbus_new.h
+@@ -30,6 +30,7 @@ enum wpas_dbus_prop {
+ WPAS_DBUS_PROP_STATE,
+ WPAS_DBUS_PROP_CURRENT_BSS,
+ WPAS_DBUS_PROP_CURRENT_NETWORK,
++ WPAS_DBUS_PROP_BSSS,
+ };
+
+ enum wpas_dbus_bss_prop {
Added: wpasupplicant/trunk/debian/patches/12_wpa_gui_knotify_support.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/12_wpa_gui_knotify_support.patch?rev=1571&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/12_wpa_gui_knotify_support.patch (added)
+++ wpasupplicant/trunk/debian/patches/12_wpa_gui_knotify_support.patch Mon Mar 7 10:48:02 2011
@@ -1,0 +1,44 @@
+Description: Use KDE's KNotify when running under KDE
+Author: Raphael Geissert <geissert at debian.org>
+Bug-Debian: http://bugs.debian.org/582793
+---
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -22,10 +22,13 @@
+ #endif /* CONFIG_NATIVE_WINDOWS */
+
+ #include <cstdio>
++#include <cstdlib>
+ #include <QMessageBox>
+ #include <QCloseEvent>
+ #include <QImageReader>
++#include <QProcess>
+ #include <QSettings>
++#include <QStringList>
+
+ #include "wpagui.h"
+ #include "dirent.h"
+@@ -1327,10 +1330,21 @@ void WpaGui::createTrayIcon(bool trayOnl
+ void WpaGui::showTrayMessage(QSystemTrayIcon::MessageIcon type, int sec,
+ const QString & msg)
+ {
+- if (!QSystemTrayIcon::supportsMessages())
++ if (isVisible() || !tray_icon || !tray_icon->isVisible())
+ return;
+
+- if (isVisible() || !tray_icon || !tray_icon->isVisible())
++ /* first try to use KDE's notifications system if running under
++ * a KDE session */
++ if (getenv("KDE_FULL_SESSION") != NULL) {
++ QStringList args;
++ args << "--passivepopup" << msg << QString::number(sec);
++ args << "--title" << "wpa_gui";
++
++ if (QProcess::execute("/usr/bin/kdialog", args) == 0)
++ return;
++ }
++
++ if (!QSystemTrayIcon::supportsMessages())
+ return;
+
+ tray_icon->showMessage(qAppName(), msg, type, sec * 1000);
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1571&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Mon Mar 7 10:48:02 2011
@@ -2,3 +2,6 @@
02_dbus_group_policy.patch
06_wpa_gui_menu_exec_path.patch
07_dbus_service_syslog.patch
+08_pcsc_dynamic.patch
+09_dbus_emit_change_events.patch
+12_wpa_gui_knotify_support.patch
More information about the Pkg-wpa-devel
mailing list