[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#775256: marked as done (unblock (pre-approval): mate-session-manager/1.8.1-6)

Your message dated Fri, 16 Jan 2015 23:05:28 +0000
with message-id <20150116230528.GI29709@lupin.home.powdarrmonkey.net>
and subject line Re: Bug#775256: unblock (pre-approval): mate-session-manager/1.8.1-6
has caused the Debian Bug report #775256,
regarding unblock (pre-approval): mate-session-manager/1.8.1-6
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
775256: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=775256
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please consider unblocking planned upload of package mate-session-manager

This upload fixes an RC bug (#775189) and provides a minor fix for
debian/copyright.

+  * debian/patches:
+    + Add 0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch.
+      Allow users to disable gnome-compat options (i.e. interaction with
+      gnome-keyring and/or gnome-smproxy). (Closes: #775189).

-> We received a complaint (#775189) about gnome-keyring force-fully
being started and clobbering environment variables (esp. those provided
by ssh-agent). In MATE it currently is not possible to deactivate
gnome-keyring.

With this new upload, people can deactivate gnome-keyring startup inside
MATE sessions (plus: people have to make the gnome-keyring*.desktop files
in /etc/xdg/autostart inaccessible to normal users).

+  * debian/copyright:
+    + Add missing entry for file mate-session/gsm-systemd.c.
+

-> /me forgot to add the above file in debian/copyright. To make the
package policy compliant, I want to add this minor fix with the upcoming
upload.

light+love,
Mike

unblock mate-session-manager/1.8.1-6

-- System Information:
Debian Release: 8.0
  APT prefers stable
  APT policy: (990, 'stable'), (500, 'testing-updates'), (500, 'testing-proposed-updates'), (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)

diff -Nru mate-session-manager-1.8.1/debian/changelog mate-session-manager-1.8.1/debian/changelog
--- mate-session-manager-1.8.1/debian/changelog	2014-10-24 21:07:47.000000000 +0200
+++ mate-session-manager-1.8.1/debian/changelog	2015-01-13 10:38:32.000000000 +0100
@@ -1,3 +1,14 @@
+mate-session-manager (1.8.1-6) unstable; urgency=medium
+
+  * debian/patches:
+    + Add 0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch.
+      Allow users to disable gnome-compat options (i.e. interaction with
+      gnome-keyring and/or gnome-smproxy). (Closes: #775189).
+  * debian/copyright:
+    + Add missing entry for file mate-session/gsm-systemd.c.
+
+ -- Mike Gabriel <sunweaver@debian.org>  Tue, 13 Jan 2015 10:04:21 +0100
+
 mate-session-manager (1.8.1-5) unstable; urgency=medium
 
   [ Vangelis Mouhtsis ]
diff -Nru mate-session-manager-1.8.1/debian/copyright mate-session-manager-1.8.1/debian/copyright
--- mate-session-manager-1.8.1/debian/copyright	2014-10-24 13:51:34.000000000 +0200
+++ mate-session-manager-1.8.1/debian/copyright	2015-01-13 10:05:54.000000000 +0100
@@ -122,7 +122,8 @@
            2007, William Jon McCann <mccann@jhu.edu>
 License: GPL-2+
 
-Files: mate-session/gsm-systemd.h
+Files: mate-session/gsm-systemd.c
+       mate-session/gsm-systemd.h
 Copyright: 2013, Stefano Karapetsas
 License: GPL-2+
 
diff -Nru mate-session-manager-1.8.1/debian/patches/0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch mate-session-manager-1.8.1/debian/patches/0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
--- mate-session-manager-1.8.1/debian/patches/0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-session-manager-1.8.1/debian/patches/0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch	2015-01-13 09:58:17.000000000 +0100
@@ -0,0 +1,97 @@
+From 38334a705a479b60c54f2481a14751bd41deeffb Mon Sep 17 00:00:00 2001
+From: infirit <infirit@gmail.com>
+Date: Mon, 12 Jan 2015 20:38:42 +0100
+Subject: [PATCH 1/1] msmgnome: Allow users to disable one or both
+ compatibility options
+
+---
+ data/org.mate.session.gschema.xml.in.in |  5 ++++
+ mate-session/msm-gnome.c                | 41 +++++++++++++++++++++++++++++----
+ 2 files changed, 41 insertions(+), 5 deletions(-)
+
+diff --git a/data/org.mate.session.gschema.xml.in.in b/data/org.mate.session.gschema.xml.in.in
+index 2415c67..14e8da4 100644
+--- a/data/org.mate.session.gschema.xml.in.in
++++ b/data/org.mate.session.gschema.xml.in.in
+@@ -30,6 +30,11 @@
+       <_summary>Required session components</_summary>
+       <_description>List of components that are required as part of the session. (Each element names a key under "/org/mate/desktop/session/required_components"). The Startup Applications preferences tool will not normally allow users to remove a required component from the session, and the session manager will automatically add the required components back to the session at login time if they do get removed.</_description>
+     </key>
++    <key name="gnome-compat-startup" type="as">
++      <default>[ 'keyring', 'smproxy' ]</default>
++      <_summary>Control gnome compatibility componnent startup</_summary>
++      <_description>Control which compatibility components to start.</_description>
++    </key>
+     <child name="required-components" schema="org.mate.session.required-components"/>
+   </schema>
+   <schema id="org.mate.session.required-components" path="/org/mate/desktop/session/required-components/">
+diff --git a/mate-session/msm-gnome.c b/mate-session/msm-gnome.c
+index 661d9e3..72f5493 100644
+--- a/mate-session/msm-gnome.c
++++ b/mate-session/msm-gnome.c
+@@ -37,9 +37,13 @@
+ 
+ #include <gtk/gtk.h>
+ #include <gdk/gdkx.h>
++#include <gio/gio.h>
+ 
+ #include "msm-gnome.h"
+ 
++#define GSM_SCHEMA "org.mate.session"
++#define GSM_GNOME_COMPAT_STARTUP_KEY "gnome-compat-startup"
++
+ #define GNOME_KEYRING_DAEMON "gnome-keyring-daemon"
+ 
+ 
+@@ -231,16 +235,43 @@ msm_compat_gnome_smproxy_shutdown (void)
+ void
+ msm_gnome_start (void)
+ {
++  GSettings* settings;
++  gchar **array;
++  GList *startup = NULL;
++  gint i;
++
+   if (gnome_compat_started == TRUE)
+     return;
+ 
+-  g_debug ("MsmGnome: starting");
+-
+-  msm_compat_gnome_smproxy_startup ();
++  settings = g_settings_new (GSM_SCHEMA);
++  array = g_settings_get_strv (settings, GSM_GNOME_COMPAT_STARTUP_KEY);
++  if (array) {
++    for (i = 0; array[i]; i++) {
++      startup = g_list_append (startup, g_strdup (array[i]));
++    }
++  }
++  g_strfreev (array);
++  g_object_unref (settings);
++
++  if (startup != NULL) {
++    if (g_list_find_custom (startup, "smproxy", (GCompareFunc) strcmp) != NULL) {
++      g_debug ("MsmGnome: starting smproxy");
++      msm_compat_gnome_smproxy_startup ();
++      gnome_compat_started = TRUE;
++    } else if (g_list_find_custom (startup, "keyring", (GCompareFunc) strcmp) != NULL) {
++      g_debug ("MsmGnome: starting keyring");
++      gnome_keyring_daemon_startup ();
++      gnome_compat_started = TRUE;
++    } else {
++      g_debug ("MsmGnome: unknown component, ignoring");
++    }
+ 
+-  gnome_keyring_daemon_startup ();
++  g_list_foreach (startup, (GFunc) g_free, NULL);
++  g_list_free (startup);
+ 
+-  gnome_compat_started = TRUE;
++  } else {
++    g_debug ("MsmGnome: No components found to start");
++  }
+ }
+ 
+ 
+-- 
+2.2.1
+
diff -Nru mate-session-manager-1.8.1/debian/patches/series mate-session-manager-1.8.1/debian/patches/series
--- mate-session-manager-1.8.1/debian/patches/series	2014-04-09 01:06:20.000000000 +0200
+++ mate-session-manager-1.8.1/debian/patches/series	2015-01-13 09:58:46.000000000 +0100
@@ -1 +1,2 @@
+0001_msmgnome-Allow-users-to-disable-one-or-both-compatib.patch
 1001_hypen-used-as-minus-sign-man-page-fix.patch

--- End Message ---
--- Begin Message --- 
On Thu, Jan 15, 2015 at 12:10:06PM +0000, Mike Gabriel wrote:
> Control: tags -1 - moreinfo
> 
> On  Mi 14 Jan 2015 21:14:02 CET, Ivo De Decker wrote:
> 
> >Control: tags -1 confirmed moreinfo
> >
> >Hi,
> >
> >On Tue, Jan 13, 2015 at 10:46:43AM +0100, Mike Gabriel wrote:
> >>Please consider unblocking planned upload of package mate-session-manager
> >
> >Please go ahead.
> >
> >Cheers,
> >
> >Ivo
> 
> Uploaded and accepted in unstable.

Unblocked.


-- 
Jonathan Wiltshire                                      jmw@debian.org
Debian Developer                         http://people.debian.org/~jmw

4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC  74C3 5394 479D D352 4C51

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: