Bug#699119: unblock: gnome-shell/3.4.2-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package gnome-shell
See also the corresponding unblock requests for gnome-control-center
(#697894) and network-manager-applet (#699115).
The full changelog is:
gnome-shell (3.4.2-6) unstable; urgency=low
[ Josselin Mouette ]
* 28_network_user_connections.patch: new patch. Set connections and
passwords as user-owned, following matching changes in nm-applet and
gnome-control-center. The logic is:
- Wired connections: always system-owned.
- Modem (GSM/UMTS) connections are created by the control center.
- Bluetooth PAN connections are now always user-owned.
- Wireless connections are system-owned if the user has permissions
(in Debian this means group sudo or netdev). Otherwise, it is
user-owned, with the password in the keyring only for WPA.
- 802.1x (wired or wireless) is always handled by the control
center.
Closes: #696257
[ Michael Biebl ]
* Refresh patches to apply without fuzz.
* 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.
-- Michael Biebl <biebl@debian.org> Thu, 17 Jan 2013 10:43:30 +0100
Complete debdiff is attached.
Cheers,
Michael
unblock gnome-shell/3.4.2-6
-- System Information:
Debian Release: 7.0
APT prefers unstable
APT policy: (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru gnome-shell-3.4.2/debian/changelog gnome-shell-3.4.2/debian/changelog
--- gnome-shell-3.4.2/debian/changelog 2013-01-03 00:59:57.000000000 +0100
+++ gnome-shell-3.4.2/debian/changelog 2013-01-17 10:43:33.000000000 +0100
@@ -1,3 +1,29 @@
+gnome-shell (3.4.2-6) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * 28_network_user_connections.patch: new patch. Set connections and
+ passwords as user-owned, following matching changes in nm-applet and
+ gnome-control-center. The logic is:
+ - Wired connections: always system-owned.
+ - Modem (GSM/UMTS) connections are created by the control center.
+ - Bluetooth PAN connections are now always user-owned.
+ - Wireless connections are system-owned if the user has permissions
+ (in Debian this means group sudo or netdev). Otherwise, it is
+ user-owned, with the password in the keyring only for WPA.
+ - 802.1x (wired or wireless) is always handled by the control
+ center.
+ Closes: #696257
+
+ [ Michael Biebl ]
+ * Refresh patches to apply without fuzz.
+ * 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.
+
+ -- Michael Biebl <biebl@debian.org> Thu, 17 Jan 2013 10:43:30 +0100
+
gnome-shell (3.4.2-5) unstable; urgency=low
* 30_lockup_gc.patch: update patch. Instead of completely dropping
diff -Nru gnome-shell-3.4.2/debian/patches/01_slist_cleanup.patch gnome-shell-3.4.2/debian/patches/01_slist_cleanup.patch
--- gnome-shell-3.4.2/debian/patches/01_slist_cleanup.patch 2012-06-23 20:49:39.000000000 +0200
+++ gnome-shell-3.4.2/debian/patches/01_slist_cleanup.patch 2013-01-15 00:14:41.000000000 +0100
@@ -5,11 +5,11 @@
https://bugzilla.gnome.org/show_bug.cgi?id=658176
---
-diff --git a/src/shell-app-system.c b/src/shell-app-system.c
-index 26718b3..6210220 100644
---- a/src/shell-app-system.c
-+++ b/src/shell-app-system.c
-@@ -123,8 +123,7 @@ shell_app_system_finalize (GObject *object)
+Index: gnome-shell-3.4.2/src/shell-app-system.c
+===================================================================
+--- gnome-shell-3.4.2.orig/src/shell-app-system.c 2013-01-15 00:14:38.335087898 +0100
++++ gnome-shell-3.4.2/src/shell-app-system.c 2013-01-15 00:14:38.331087862 +0100
+@@ -128,8 +128,7 @@
g_hash_table_destroy (priv->id_to_app);
g_hash_table_destroy (priv->setting_id_to_app);
@@ -19,7 +19,7 @@
priv->known_vendor_prefixes = NULL;
G_OBJECT_CLASS (shell_app_system_parent_class)->finalize (object);
-@@ -309,8 +308,7 @@ on_apps_tree_changed_cb (GMenuTree *tree,
+@@ -314,8 +313,7 @@
g_assert (tree == self->priv->apps_tree);
@@ -29,7 +29,7 @@
self->priv->known_vendor_prefixes = NULL;
if (!gmenu_tree_load_sync (self->priv->apps_tree, &error))
-@@ -761,8 +759,7 @@ search_tree (ShellAppSystem *self,
+@@ -754,8 +752,7 @@
&prefix_results,
&substring_results);
}
@@ -39,7 +39,7 @@
return sort_and_concat_results (self, prefix_results, substring_results);
-@@ -815,8 +812,7 @@ shell_app_system_subsearch (ShellAppSystem *system,
+@@ -808,8 +805,7 @@
&prefix_results,
&substring_results);
}
@@ -49,5 +49,3 @@
/* Note that a shorter term might have matched as a prefix, but
when extended only as a substring, so we have to redo the
---
-cgit v0.9.0.2
diff -Nru gnome-shell-3.4.2/debian/patches/02_filter_nodisplay_parents.patch gnome-shell-3.4.2/debian/patches/02_filter_nodisplay_parents.patch
--- gnome-shell-3.4.2/debian/patches/02_filter_nodisplay_parents.patch 2012-06-23 20:49:39.000000000 +0200
+++ gnome-shell-3.4.2/debian/patches/02_filter_nodisplay_parents.patch 2013-01-15 00:14:43.000000000 +0100
@@ -8,11 +8,11 @@
https://bugzilla.gnome.org/show_bug.cgi?id=658176
---
-diff --git a/src/shell-app-system.c b/src/shell-app-system.c
-index 6210220..7f34c28 100644
---- a/src/shell-app-system.c
-+++ b/src/shell-app-system.c
-@@ -41,6 +41,7 @@ struct _ShellAppSystemPrivate {
+Index: gnome-shell-3.4.2/src/shell-app-system.c
+===================================================================
+--- gnome-shell-3.4.2.orig/src/shell-app-system.c 2013-01-15 00:14:42.315123568 +0100
++++ gnome-shell-3.4.2/src/shell-app-system.c 2013-01-15 00:14:42.307123496 +0100
+@@ -46,6 +46,7 @@
GMenuTree *apps_tree;
GHashTable *running_apps;
@@ -20,7 +20,7 @@
GHashTable *id_to_app;
GSList *known_vendor_prefixes;
-@@ -92,14 +93,16 @@ shell_app_system_init (ShellAppSystem *self)
+@@ -97,14 +98,16 @@
priv->id_to_app = g_hash_table_new_full (g_str_hash, g_str_equal,
NULL,
(GDestroyNotify)g_object_unref);
@@ -41,7 +41,7 @@
priv->apps_tree = gmenu_tree_new ("applications.menu", GMENU_TREE_FLAGS_INCLUDE_NODISPLAY);
g_signal_connect (priv->apps_tree, "changed", G_CALLBACK (on_apps_tree_changed_cb), self);
-@@ -121,6 +124,7 @@ shell_app_system_finalize (GObject *object)
+@@ -126,6 +129,7 @@
g_hash_table_destroy (priv->running_apps);
g_hash_table_destroy (priv->id_to_app);
@@ -49,7 +49,7 @@
g_hash_table_destroy (priv->setting_id_to_app);
g_slist_free_full (priv->known_vendor_prefixes, g_free);
-@@ -308,6 +312,7 @@ on_apps_tree_changed_cb (GMenuTree *tree,
+@@ -313,6 +317,7 @@
g_assert (tree == self->priv->apps_tree);
@@ -57,7 +57,7 @@
g_slist_free_full (self->priv->known_vendor_prefixes, g_free);
self->priv->known_vendor_prefixes = NULL;
-@@ -369,6 +374,8 @@ on_apps_tree_changed_cb (GMenuTree *tree,
+@@ -374,6 +379,8 @@
* string is pointed to.
*/
g_hash_table_replace (self->priv->id_to_app, (char*)id, app);
@@ -66,7 +66,7 @@
if (old_entry)
gmenu_tree_item_unref (old_entry);
-@@ -778,7 +785,7 @@ GSList *
+@@ -771,7 +778,7 @@
shell_app_system_initial_search (ShellAppSystem *self,
GSList *terms)
{
@@ -75,5 +75,3 @@
}
/**
---
-cgit v0.9.0.2
diff -Nru gnome-shell-3.4.2/debian/patches/03_don-t-show-apps-in-NoDisplay-categories.patch gnome-shell-3.4.2/debian/patches/03_don-t-show-apps-in-NoDisplay-categories.patch
--- gnome-shell-3.4.2/debian/patches/03_don-t-show-apps-in-NoDisplay-categories.patch 2012-06-23 21:21:38.000000000 +0200
+++ gnome-shell-3.4.2/debian/patches/03_don-t-show-apps-in-NoDisplay-categories.patch 2013-01-15 00:14:47.000000000 +0100
@@ -21,11 +21,11 @@
src/shell-app-system.h | 2 --
4 files changed, 23 insertions(+), 51 deletions(-)
-diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
-index 5b2c75f..8634c00 100644
---- a/js/ui/appDisplay.js
-+++ b/js/ui/appDisplay.js
-@@ -22,6 +22,7 @@ const Search = imports.ui.search;
+Index: gnome-shell-3.4.2/js/ui/appDisplay.js
+===================================================================
+--- gnome-shell-3.4.2.orig/js/ui/appDisplay.js 2013-01-15 00:14:45.883155542 +0100
++++ gnome-shell-3.4.2/js/ui/appDisplay.js 2013-01-15 00:14:45.871155434 +0100
+@@ -22,6 +22,7 @@
const Tweener = imports.ui.tweener;
const Workspace = imports.ui.workspace;
const Params = imports.misc.params;
@@ -33,7 +33,7 @@
const MAX_APPLICATION_WORK_MILLIS = 75;
const MENU_POPUP_TIMEOUT = 600;
-@@ -36,6 +37,7 @@ const AlphabeticalView = new Lang.Class({
+@@ -36,6 +37,7 @@
this._pendingAppLaterId = 0;
this._appIcons = {}; // desktop file id
@@ -41,7 +41,7 @@
let box = new St.BoxLayout({ vertical: true });
box.add(this._grid.actor, { y_align: St.Align.START, expand: true });
-@@ -60,16 +62,22 @@ const AlphabeticalView = new Lang.Class({
+@@ -60,16 +62,22 @@
}));
},
@@ -68,7 +68,7 @@
appIcon.actor.connect('key-focus-in', Lang.bind(this, this._ensureIconVisible));
this._appIcons[id] = appIcon;
-@@ -120,14 +128,6 @@ const AlphabeticalView = new Lang.Class({
+@@ -120,14 +128,6 @@
icon.actor.visible = true;
}
}
@@ -83,7 +83,7 @@
}
});
-@@ -147,7 +147,6 @@ const ViewByCategories = new Lang.Class({
+@@ -147,7 +147,6 @@
// (used only before the actor is mapped the first time)
this._currentCategory = -2;
this._categories = [];
@@ -91,7 +91,7 @@
this._categoryBox = new St.BoxLayout({ vertical: true,
reactive: true,
-@@ -204,8 +203,10 @@ const ViewByCategories = new Lang.Class({
+@@ -204,8 +203,10 @@
if (nextType == GMenu.TreeItemType.ENTRY) {
var entry = iter.get_entry();
var app = this._appSystem.lookup_app_by_tree_entry(entry);
@@ -103,7 +103,7 @@
} else if (nextType == GMenu.TreeItemType.DIRECTORY) {
if (!dir.get_is_nodisplay())
this._loadCategory(iter.get_directory(), appList);
-@@ -213,7 +214,7 @@ const ViewByCategories = new Lang.Class({
+@@ -213,7 +214,7 @@
}
},
@@ -112,7 +112,7 @@
let button = new St.Button({ label: GLib.markup_escape_text (name, -1),
style_class: 'app-filter',
x_align: St.Align.START,
-@@ -225,7 +226,6 @@ const ViewByCategories = new Lang.Class({
+@@ -225,7 +226,6 @@
var apps;
if (dir == null) {
@@ -120,7 +120,7 @@
this._allCategoryButton = button;
} else {
apps = [];
-@@ -239,6 +239,7 @@ const ViewByCategories = new Lang.Class({
+@@ -239,6 +239,7 @@
},
_removeAll: function() {
@@ -128,7 +128,7 @@
this._categories = [];
this._categoryBox.destroy_all_children();
},
-@@ -246,13 +247,8 @@ const ViewByCategories = new Lang.Class({
+@@ -246,13 +247,8 @@
refresh: function() {
this._removeAll();
@@ -143,7 +143,7 @@
var tree = this._appSystem.get_tree();
var root = tree.get_root_directory();
-@@ -270,7 +266,6 @@ const ViewByCategories = new Lang.Class({
+@@ -270,7 +266,6 @@
}
}
@@ -151,11 +151,11 @@
this._selectCategory(-1);
if (this._focusDummy) {
-diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
-index ef71bc7..e4c4258 100644
---- a/js/ui/iconGrid.js
-+++ b/js/ui/iconGrid.js
-@@ -311,8 +311,11 @@ const IconGrid = new Lang.Class({
+Index: gnome-shell-3.4.2/js/ui/iconGrid.js
+===================================================================
+--- gnome-shell-3.4.2.orig/js/ui/iconGrid.js 2013-01-15 00:14:45.883155542 +0100
++++ gnome-shell-3.4.2/js/ui/iconGrid.js 2013-01-15 00:14:45.875155470 +0100
+@@ -311,8 +311,11 @@
}));
},
@@ -169,11 +169,11 @@
},
getItemAtIndex: function(index) {
-diff --git a/src/shell-app-system.c b/src/shell-app-system.c
-index 2528e9f..98a7644 100644
---- a/src/shell-app-system.c
-+++ b/src/shell-app-system.c
-@@ -608,30 +608,6 @@ shell_app_system_lookup_heuristic_basename (ShellAppSystem *system,
+Index: gnome-shell-3.4.2/src/shell-app-system.c
+===================================================================
+--- gnome-shell-3.4.2.orig/src/shell-app-system.c 2013-01-15 00:14:45.883155542 +0100
++++ gnome-shell-3.4.2/src/shell-app-system.c 2013-01-15 00:14:45.875155470 +0100
+@@ -613,30 +613,6 @@
return NULL;
}
@@ -204,11 +204,11 @@
void
_shell_app_system_notify_app_state_changed (ShellAppSystem *self,
ShellApp *app)
-diff --git a/src/shell-app-system.h b/src/shell-app-system.h
-index c26b728..3d36385 100644
---- a/src/shell-app-system.h
-+++ b/src/shell-app-system.h
-@@ -51,8 +51,6 @@ ShellApp *shell_app_system_lookup_heuristic_basename (ShellAppSystem *
+Index: gnome-shell-3.4.2/src/shell-app-system.h
+===================================================================
+--- gnome-shell-3.4.2.orig/src/shell-app-system.h 2013-01-15 00:14:45.883155542 +0100
++++ gnome-shell-3.4.2/src/shell-app-system.h 2013-01-15 00:14:45.875155470 +0100
+@@ -51,8 +51,6 @@
const char *id);
@@ -217,6 +217,3 @@
GSList *shell_app_system_get_running (ShellAppSystem *self);
GSList *shell_app_system_initial_search (ShellAppSystem *system,
---
-1.7.10
-
diff -Nru gnome-shell-3.4.2/debian/patches/28_network_user_connections.patch gnome-shell-3.4.2/debian/patches/28_network_user_connections.patch
--- gnome-shell-3.4.2/debian/patches/28_network_user_connections.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-shell-3.4.2/debian/patches/28_network_user_connections.patch 2013-01-16 11:38:42.000000000 +0100
@@ -0,0 +1,72 @@
+Index: gnome-shell-3.4.2/js/ui/status/network.js
+===================================================================
+--- 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;
+ }
+
++function default_to_private_connections(client) {
++ let perms = client.get_permission_result (NMClient.ClientPermission.SETTINGS_MODIFY_SYSTEM);
++ return (perms != NMClient.ClientPermissionResult.YES);
++}
++
+ const NMNetworkMenuItem = new Lang.Class({
+ Name: 'NMNetworkMenuItem',
+ Extends: PopupMenu.PopupBaseMenuItem,
+@@ -864,12 +869,14 @@ const NMDeviceBluetooth = new Lang.Class
+ let connection = new NetworkManager.Connection;
+ connection._uuid = NetworkManager.utils_uuid_generate();
+ connection.add_setting(new NetworkManager.SettingBluetooth);
+- connection.add_setting(new NetworkManager.SettingConnection({
++ let setting_conn = new NetworkManager.SettingConnection({
+ uuid: connection._uuid,
+ id: this._autoConnectionName,
+ type: NetworkManager.SETTING_BLUETOOTH_SETTING_NAME,
+ autoconnect: false
+- }));
++ });
++ setting_conn.add_permission('user', GLib.get_user_name(), null);
++ connection.add_setting(setting_conn);
+ return connection;
+ },
+
+@@ -950,6 +957,8 @@ const NMDeviceWireless = new Lang.Class(
+ this._overflowItem = null;
+ this._networks = [ ];
+
++ this._client = client;
++
+ // breaking the layers with this, but cannot call
+ // this.connectionValid until I have a device
+ this.device = device;
+@@ -1455,12 +1464,27 @@ const NMDeviceWireless = new Lang.Class(
+
+ let connection = new NetworkManager.Connection();
+ connection.add_setting(new NetworkManager.SettingWireless());
+- connection.add_setting(new NetworkManager.SettingConnection({
++ let setting_conn = new NetworkManager.SettingConnection({
+ id: name,
+ autoconnect: true, // NetworkManager will know to ignore this if appropriate
+ uuid: NetworkManager.utils_uuid_generate(),
+ type: NetworkManager.SETTING_WIRELESS_SETTING_NAME
+- }));
++ });
++ if (default_to_private_connections(this._client)) {
++ setting_conn.add_permission('user', GLib.get_user_name(), null);
++ if (apObj.security == NMAccessPointSecurity.WPA2_PSK ||
++ apObj.security == NMAccessPointSecurity.WPA_PSK) {
++ connection.add_setting(new NetworkManager.SettingWirelessSecurity({
++ 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;
+ },
+
diff -Nru gnome-shell-3.4.2/debian/patches/40-force-online.patch gnome-shell-3.4.2/debian/patches/40-force-online.patch
--- gnome-shell-3.4.2/debian/patches/40-force-online.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-shell-3.4.2/debian/patches/40-force-online.patch 2013-01-16 11:38:24.000000000 +0100
@@ -0,0 +1,26 @@
+Description: Show wired connection icon if NM has an active unmanaged device
+ 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
+Author: Michael Biebl <biebl@debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691436
+Index: gnome-shell-3.4.2/js/ui/status/network.js
+===================================================================
+--- gnome-shell-3.4.2.orig/js/ui/status/network.js 2013-01-16 11:38:16.741758023 +0100
++++ gnome-shell-3.4.2/js/ui/status/network.js 2013-01-16 11:38:16.733757953 +0100
+@@ -2028,9 +2028,14 @@ const NMApplet = new Lang.Class({
+ let mc = this._mainConnection;
+ let hasApIcon = false;
+ let hasMobileIcon = false;
++ let state = this._client.get_state();
+
+ if (!mc) {
+- this.setIcon('network-offline');
++ if (state == NetworkManager.State.CONNECTED_GLOBAL) {
++ this.setIcon('network-wired-connected');
++ } else {
++ this.setIcon('network-offline');
++ }
+ } else if (mc.state == NetworkManager.ActiveConnectionState.ACTIVATING) {
+ switch (mc._section) {
+ case NMConnectionCategory.WWAN:
diff -Nru gnome-shell-3.4.2/debian/patches/series gnome-shell-3.4.2/debian/patches/series
--- gnome-shell-3.4.2/debian/patches/series 2012-12-02 13:56:02.000000000 +0100
+++ gnome-shell-3.4.2/debian/patches/series 2013-01-15 16:53:43.000000000 +0100
@@ -9,6 +9,8 @@
25-close-the-recorder-instead-of-pausing-it.patch
26-networkAgent-use-absolute-path-if-configured.patch
27-nm-libexec-path.patch
+28_network_user_connections.patch
30_lockup_gc.patch
32-enable-the-screen-reader-menu-item.patch
33-screen-reader-l10n.patch
+40-force-online.patch
Reply to: