r36594 - in /desktop/unstable/gnome-shell/debian: changelog patches/28_network_user_connections.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Jan 17 09:42:36 2013
New Revision: 36594

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36594
Log:
28_network_user_connections.patch: Treat WEP keys like WPA-PSK secrets and
store them in the keyring for user-owned connections.

Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=36594&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Thu Jan 17 09:42:36 2013
@@ -19,6 +19,8 @@
   * 40-force-online.patch: If NM has an active unmanaged device it will
     forcefully set the online state to CONNECTED_GLOBAL. In that case show a
     wired connection icon instead of an offline icon. Closes: #691436
+  * 28_network_user_connections.patch: Treat WEP keys like WPA-PSK secrets and
+    store them in the keyring for user-owned connections.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 14 Jan 2013 16:22:43 +0100
 

Modified: desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch?rev=36594&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/28_network_user_connections.patch [utf-8] Thu Jan 17 09:42:36 2013
@@ -1,7 +1,7 @@
 Index: gnome-shell-3.4.2/js/ui/status/network.js
 ===================================================================
---- gnome-shell-3.4.2.orig/js/ui/status/network.js	2012-07-20 19:38:25.000000000 +0200
-+++ gnome-shell-3.4.2/js/ui/status/network.js	2013-01-14 16:16:07.806637098 +0100
+--- gnome-shell-3.4.2.orig/js/ui/status/network.js	2013-01-15 19:32:37.397724811 +0100
++++ gnome-shell-3.4.2/js/ui/status/network.js	2013-01-16 11:38:36.000000000 +0100
 @@ -97,6 +97,11 @@ function ssidToLabel(ssid) {
      return label;
  }
@@ -40,7 +40,7 @@
          // breaking the layers with this, but cannot call
          // this.connectionValid until I have a device
          this.device = device;
-@@ -1455,12 +1464,22 @@ const NMDeviceWireless = new Lang.Class(
+@@ -1455,12 +1464,27 @@ const NMDeviceWireless = new Lang.Class(
  
          let connection = new NetworkManager.Connection();
          connection.add_setting(new NetworkManager.SettingWireless());
@@ -60,6 +60,11 @@
 +                    psk_flags: NetworkManager.SettingSecretFlags.AGENT_OWNED
 +                }));
 +            }
++            if (apObj.security == NMAccessPointSecurity.WEP) {
++                connection.add_setting(new NetworkManager.SettingWirelessSecurity({
++                    wep_key_flags: NetworkManager.SettingSecretFlags.AGENT_OWNED
++                }));
++            }
 +        }
 +        connection.add_setting(setting_conn);
          return connection;