Bug#681737: Bug#682960: unblock (pre-approval): gnome-shell/3.4.2-1

Laurent Bigonville bigon at debian.org
Sat Jul 28 09:51:06 UTC 2012


Le Fri, 27 Jul 2012 19:47:41 -0400,
Mike Miller <mtmiller at ieee.org> a écrit :

> On Sat, Jul 28, 2012 at 12:44:13AM +0200, Michael Biebl wrote:
> > Am 28.07.2012 00:31, schrieb Mike Miller:
> > > Just happened to spot this, sorry if I'm intruding, but how about
> > > fixing RC bug #681737 in this release? It's an easy cherry-pick
> > > patch, fuzz-free, I've been running with this patch applied for
> > > over a week with no problems.
> > 
> > While we should definitely fix this issue for wheezy, the upstream
> > patch only works, if we update *all* NM vpn plugins to supply an
> > absolute path in their corresponding .name file. (I assume you
> > manually patched the .name file on your local system?)
> 
> Yes.
> 
> > It might be easier to just change gnome-shell to look for the
> > vpn-auth-dialogs in /usr/lib/NetworkManager instead of
> > Config.LIBEXECDIR (which expands to /usr/lib/gnome-shell).
> 
> True enough. That was how I was looking at it until I ran across the
> upstream bug report. Solving it that way is slightly more coordination
> now, but it's future-proof and less coordination later.
> 
> If you all decide hardcoding gnome-shell to /usr/lib/NetworkManager is
> the best for wheezy, that's fine too.
> 

I think both should be done as some VPN modules (like nm-strongswan)
are already using a full path.

I've added the following patch to the package. I'm waiting RT ack
before pushing everything to the svn.

=====8<======

Description: Use Debian specific NM VPN helpers paths
Author: Laurent Bigonville <bigon at debian.org>
Forwarded: not-needed

--- a/js/ui/networkAgent.js
+++ b/js/ui/networkAgent.js
@@ -685,7 +685,7 @@ const NetworkAgent = new Lang.Class({
                     } catch(e) { } // ignore errors if key does not exist
                     let path = binary;
                     if (!GLib.path_is_absolute(path)) {
-                        path = GLib.build_filenamev([Config.LIBEXECDIR, path]);
+                        path = GLib.build_filenamev(['/usr/lib/NetworkManager/VPN', path]);
                     }
 
                     if (GLib.file_test(path, GLib.FileTest.IS_EXECUTABLE))

========>8=======

Cheers


Laurent Bigonville



More information about the pkg-gnome-maintainers mailing list