[Pkg-utopia-commits] r1567 - in /packages/unstable/knetworkmanager/debian: changelog patches/05-leap_support.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Fri Jun 22 21:44:08 2007
New Revision: 1567

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1567
Log:
* debian/patches/05-leap_support.patch
  - Added. Do not fail to compile if LEAP support is not available.

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

Modified: packages/unstable/knetworkmanager/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/changelog?rev=1567&op=diff
==============================================================================
--- packages/unstable/knetworkmanager/debian/changelog (original)
+++ packages/unstable/knetworkmanager/debian/changelog Fri Jun 22 21:44:08 2007
@@ -22,6 +22,8 @@
   * debian/patches/04-dbus_access.patch
     - Do not remove the dbus at_console access check but make it an
       alternative to the Debian netdev group policy. Closes: #426467
+  * debian/patches/05-leap_support.patch
+    - Added. Do not fail to compile if LEAP support is not available.
 
  -- Michael Biebl <biebl at debian.org>  Fri, 22 Jun 2007 21:08:32 +0100
 

Added: packages/unstable/knetworkmanager/debian/patches/05-leap_support.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/knetworkmanager/debian/patches/05-leap_support.patch?rev=1567&op=file
==============================================================================
--- packages/unstable/knetworkmanager/debian/patches/05-leap_support.patch (added)
+++ packages/unstable/knetworkmanager/debian/patches/05-leap_support.patch Fri Jun 22 21:44:08 2007
@@ -1,0 +1,29 @@
+Index: src/knetworkmanager-encryption.cpp
+===================================================================
+--- knetworkmanager/src/knetworkmanager-encryption.cpp	(Revision 678983)
++++ knetworkmanager/src/knetworkmanager-encryption.cpp	(Arbeitskopie)
+@@ -651,7 +651,7 @@
+ 	dbus_message_iter_init_append (msg, &iter);
+ 	if (_method == EAP_LEAP )
+ 	{
+-#ifdef LEAP
++#ifdef HAVE_LEAP
+ 		status = nmu_security_serialize_leap_with_cipher(&iter, _identity.utf8(), _secret[IdPasswordKey] ,
+ 									_leapmethod );
+ #else
+@@ -689,12 +689,14 @@
+ 
+ 	if ( !iter )
+ 		return false;
+-	if ( !(we_cipher == NM_AUTH_TYPE_WPA_EAP || we_cipher == NM_AUTH_TYPE_LEAP))
++	if ( !(we_cipher == NM_AUTH_TYPE_WPA_EAP))
+ 		return false;
+ 
+ 	if (method == EAP_LEAP)
+ 	{
+ #ifdef HAVE_LEAP
++		if ( !(we_cipher == NM_AUTH_TYPE_LEAP))
++			return false;
+ 		if (!nmu_security_deserialize_leap (iter, &identity, &identityPassword, &leapmethod))
+ 			return false;
+ #else