[Pkg-utopia-commits] r1245 - in packages/unstable/networkmanager/debian: . patches

[Michael Biebl]

Author: biebl
Date: 2007-03-03 02:55:22 +0000 (Sat, 03 Mar 2007)
New Revision: 1245

Added:
   packages/unstable/networkmanager/debian/patches/13-wep_capabilities.patch
Modified:
   packages/unstable/networkmanager/debian/changelog
   packages/unstable/networkmanager/debian/control
Log:
Add patch by Andy Whitcroft. "|" the wep capabilities instead of "&".


Modified: packages/unstable/networkmanager/debian/changelog
===================================================================
--- packages/unstable/networkmanager/debian/changelog	2007-03-01 13:09:12 UTC (rev 1244)
+++ packages/unstable/networkmanager/debian/changelog	2007-03-03 02:55:22 UTC (rev 1245)
@@ -1,9 +1,15 @@
 network-manager (0.6.4-7) unstable; urgency=low
 
   * debian/control
-    - Add recommends on network-manager-gnome | network-manager-kde.
+    - Add Recommends: network-manager-gnome | network-manager-kde to
+      network-manager.
+    - Add Recommends: libpam-keyring to network-manager-gnome. This allows to
+      unlock the gnome-keyring automatically upon login. 
   * debian/patches/12_dbus1.0.patch
     - Updated to unref rather than close the connection.
+  * debian/patches/13-wep_capabilities.patch
+    - Correctly set the available WEP capabilities. (Closes: #411867)
+      Thanks to Andy Whitcroft for the patch!
 
  -- Michael Biebl <biebl at debian.org>  Wed, 10 Jan 2007 22:03:15 +0100
 

Modified: packages/unstable/networkmanager/debian/control
===================================================================
--- packages/unstable/networkmanager/debian/control	2007-03-01 13:09:12 UTC (rev 1244)
+++ packages/unstable/networkmanager/debian/control	2007-03-03 02:55:22 UTC (rev 1245)
@@ -26,7 +26,7 @@
 Architecture: any
 Section: gnome
 Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager (= ${Source-Version})
-Recommends: notification-daemon
+Recommends: notification-daemon, libpam-keyring
 Description: network management framework (GNOME frontend)
  NetworkManager attempts to keep an active network connection available at all
  times. It is intended only for the desktop use-case, and is not intended for

Added: packages/unstable/networkmanager/debian/patches/13-wep_capabilities.patch
===================================================================
--- packages/unstable/networkmanager/debian/patches/13-wep_capabilities.patch	2007-03-01 13:09:12 UTC (rev 1244)
+++ packages/unstable/networkmanager/debian/patches/13-wep_capabilities.patch	2007-03-03 02:55:22 UTC (rev 1245)
@@ -0,0 +1,21 @@
+Index: src/NetworkManagerAP.c
+===================================================================
+--- src/NetworkManagerAP.c	(Revision 2356)
++++ src/NetworkManagerAP.c	(Revision 2357)
+@@ -572,12 +572,14 @@
+ {
+ 	if (cipher & IW_AUTH_CIPHER_WEP40)
+ 	{
+-		caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP40);
++		caps |= NM_802_11_CAP_PROTO_WEP;
++		caps |= NM_802_11_CAP_CIPHER_WEP40;
+ 		caps &= ~NM_802_11_CAP_PROTO_NONE;
+ 	}
+ 	if (cipher & IW_AUTH_CIPHER_WEP104)
+ 	{
+-		caps |= (NM_802_11_CAP_PROTO_WEP & NM_802_11_CAP_CIPHER_WEP104);
++		caps |= NM_802_11_CAP_PROTO_WEP;
++		caps |= NM_802_11_CAP_CIPHER_WEP104;
+ 		caps &= ~NM_802_11_CAP_PROTO_NONE;
+ 	}
+ 	if (cipher & IW_AUTH_CIPHER_TKIP)