[Pkg-utopia-commits] r2920 - in /packages/unstable/knetworkmanager/debian: changelog patches/05-no_blank_psk.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Mar  2 23:33:37 2009
New Revision: 2920

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2920
Log:
* debian/patches/05-no_blank_psk.patch
  - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
    to validate them. Closes: #517213
    Patch by Dan Williams, thanks!

Added:
    packages/unstable/knetworkmanager/debian/patches/05-no_blank_psk.patch
Modified:
    packages/unstable/knetworkmanager/debian/changelog
    packages/unstable/knetworkmanager/debian/patches/series

Modified: packages/unstable/knetworkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/changelog?rev=2920&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/changelog (original)
+++ packages/unstable/knetworkmanager/debian/changelog Mon Mar  2 23:33:37 2009
@@ -1,3 +1,12 @@
+knetworkmanager (1:0.7~~svn931033-2) UNRELEASED; urgency=low
+
+  * debian/patches/05-no_blank_psk.patch
+    - Do not set zero-length PSK and LEAP passwords otherwise libnm-util fails
+      to validate them. Closes: #517213
+      Patch by Dan Williams, thanks!
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 03 Mar 2009 00:29:42 +0100
+
 knetworkmanager (1:0.7~~svn931033-1) unstable; urgency=low
 
   * Merge experimental branch into unstable. Remaining changes:

Added: packages/unstable/knetworkmanager/debian/patches/05-no_blank_psk.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/patches/05-no_blank_psk.patch?rev=2920&op=file
==============================================================================
--- packages/unstable/knetworkmanager/debian/patches/05-no_blank_psk.patch (added)
+++ packages/unstable/knetworkmanager/debian/patches/05-no_blank_psk.patch Mon Mar  2 23:33:37 2009
@@ -1,0 +1,18 @@
+diff -up knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp.fix knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp
+--- knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp.fix	2009-03-02 15:28:38.000000000 -0500
++++ knetworkmanager/knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp	2009-03-02 15:30:01.000000000 -0500
+@@ -290,14 +290,9 @@ WirelessSecurity::toMap() const
+ 			map.insert(NM_SETTING_WIRELESS_SECURITY_PAIRWISE, QDBusData::fromQValueList(ciphers));
+ 	}
+ 
+-	if (!_psk.isNull())
+-		map.insert(NM_SETTING_WIRELESS_SECURITY_PSK, QDBusData::fromString(""));
+-
+ 	if (!_leapUsername.isEmpty())
+ 		map.insert(NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, QDBusData::fromString(_leapUsername));
+ 
+-	if (!_leapPassword.isEmpty())
+-		map.insert(NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, QDBusData::fromString(""));
+ 	return map;
+ }
+ 

Modified: packages/unstable/knetworkmanager/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/patches/series?rev=2920&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/patches/series (original)
+++ packages/unstable/knetworkmanager/debian/patches/series Mon Mar  2 23:33:37 2009
@@ -1,2 +1,3 @@
 01-configure_package_name.patch
 04-dbus_access.patch
+05-no_blank_psk.patch