rpms/knetworkmanager/F-10 knetworkmanager-0.7-no-blank-psk.patch, NONE, 1.1 knetworkmanager.spec, 1.24, 1.25

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/knetworkmanager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1259

Modified Files:
	knetworkmanager.spec 
Added Files:
	knetworkmanager-0.7-no-blank-psk.patch 
Log Message:
* Tue Mar  3 2009 Dan Williams <dcbw at redhat.com> - 0.7-0.8.20080926svn
- don't send blank passwords in settings (rh #486877)



knetworkmanager-0.7-no-blank-psk.patch:

--- NEW FILE knetworkmanager-0.7-no-blank-psk.patch ---
diff -up knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp.fix knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp
--- knetworkmanager-0.7/src/knetworkmanager-connection_setting_wireless_security.cpp.fix	2009-03-02 15:28:38.000000000 -0500
+++ 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;
 }
 


Index: knetworkmanager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/knetworkmanager/F-10/knetworkmanager.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- knetworkmanager.spec	20 Oct 2008 17:21:35 -0000	1.24
+++ knetworkmanager.spec	3 Mar 2009 19:02:42 -0000	1.25
@@ -2,7 +2,7 @@
 
 Name:           knetworkmanager
 Version:        0.7
-Release:        0.7.%{svn}%{?dist}
+Release:        0.8.%{svn}%{?dist}
 Summary:        KDE applet for Network Manager
 
 Group:          Applications/Internet
@@ -13,6 +13,7 @@
 Source1:	knetworkmanager-svn_checkout.sh
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch0: knetworkmanager-0.7-no-blank-psk.patch
 
 BuildRequires:  automake libtool 
 BuildRequires:  dbus-qt3-devel >= 0.8.1
@@ -58,7 +59,7 @@
 
 %prep 
 %setup -q -n %{name}-%{version}
-
+%patch0 -p1
 
 make -f admin/Makefile.common 
 
@@ -167,6 +168,9 @@
 
 
 %changelog
+* Tue Mar  3 2009 Dan Williams <dcbw at redhat.com> - 0.7-0.8.20080926svn
+- don't send blank passwords in settings (rh #486877)
+
 * Mon Oct 20 2008 Rex Dieter <rdieter at fedoraproject.org> - 0.7-0.7.20080926svn
 - fix icon hack (from 0.7-0.4)