r41200 - in /desktop/unstable/gnome-control-center/debian: changelog control patches/07-vpn-plugin-properties-paths.patch patches/series

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Wed Apr 2 22:53:29 UTC 2014 

Author: biebl
Date: Wed Apr  2 22:53:29 2014
New Revision: 41200

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=41200
Log:
* debian/patches/07-vpn-plugin-properties-paths.patch:
  - Use VPN plugin paths as specified in the .name files. Since LIBDIR of
    gnome-control-center and the VPN plugins aren't necessarily the same,
    use the paths as specified by the VPN plugins and only reconstruct the
    path if it is not absolute or we fail to load the plugin.
    Closes: #743333

Added:
    desktop/unstable/gnome-control-center/debian/patches/07-vpn-plugin-properties-paths.patch
Modified:
    desktop/unstable/gnome-control-center/debian/changelog
    desktop/unstable/gnome-control-center/debian/control
    desktop/unstable/gnome-control-center/debian/patches/series

Modified: desktop/unstable/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/changelog?rev=41200&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/changelog	[utf-8] Wed Apr  2 22:53:29 2014
@@ -1,3 +1,14 @@
+gnome-control-center (1:3.8.3-5) UNRELEASED; urgency=medium
+
+  * debian/patches/07-vpn-plugin-properties-paths.patch:
+    - Use VPN plugin paths as specified in the .name files. Since LIBDIR of
+      gnome-control-center and the VPN plugins aren't necessarily the same,
+      use the paths as specified by the VPN plugins and only reconstruct the
+      path if it is not absolute or we fail to load the plugin.
+      Closes: #743333
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 03 Apr 2014 00:48:29 +0200
+
 gnome-control-center (1:3.8.3-4) unstable; urgency=low
 
   * debian/control.in:

Modified: desktop/unstable/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/control?rev=41200&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/control	[utf-8] Wed Apr  2 22:53:29 2014
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.9.4
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.41),

Added: desktop/unstable/gnome-control-center/debian/patches/07-vpn-plugin-properties-paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/07-vpn-plugin-properties-paths.patch?rev=41200&op=file
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/07-vpn-plugin-properties-paths.patch	(added)
+++ desktop/unstable/gnome-control-center/debian/patches/07-vpn-plugin-properties-paths.patch	[utf-8] Wed Apr  2 22:53:29 2014
@@ -0,0 +1,55 @@
+Description: Use VPN plugin paths as specified in the .name files
+ Since LIBDIR of gnome-control-center and the VPN plugins aren't necessarily
+ the same, use the paths as specified by the VPN plugins and only
+ reconstruct the path if it is not absolute or we fail to load the plugin
+Author: Michael Biebl <biebl at debian.org>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=743333
+Index: gnome-control-center-3.8.3/panels/network/connection-editor/vpn-helpers.c
+===================================================================
+--- gnome-control-center-3.8.3.orig/panels/network/connection-editor/vpn-helpers.c	2014-04-03 00:45:24.297705388 +0200
++++ gnome-control-center-3.8.3/panels/network/connection-editor/vpn-helpers.c	2014-04-03 00:45:48.994026328 +0200
+@@ -75,7 +75,7 @@
+ 		char *path = NULL, *service = NULL;
+ 		char *so_path = NULL, *so_name = NULL;
+ 		GKeyFile *keyfile = NULL;
+-		GModule *module;
++		GModule *module = NULL;
+ 		NMVpnPluginUiFactory factory = NULL;
+ 
+ 		if (!g_str_has_suffix (f, ".name"))
+@@ -95,19 +95,24 @@
+ 		if (!so_path)
+ 			goto next;
+ 
+-		/* Remove any path and extension components, then reconstruct path
+-		 * to the SO in LIBDIR
+-		 */
+-		so_name = g_path_get_basename (so_path);
+-		g_free (so_path);
+-		so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
+-		g_free (so_name);
++		if (g_path_is_absolute (so_path))
++			module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+ 
+-		module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+ 		if (!module) {
+-			g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "
+-			             "service '%s'.", service);
+-			goto next;
++			/* Remove any path and extension components, then reconstruct path
++			 * to the SO in LIBDIR
++			 */
++			so_name = g_path_get_basename (so_path);
++			g_free (so_path);
++			so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
++			g_free (so_name);
++
++			module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
++			if (!module) {
++				g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "
++				             "service '%s'.", service);
++				goto next;
++			}
+ 		}
+ 
+ 		if (g_module_symbol (module, "nm_vpn_plugin_ui_factory", (gpointer) &factory)) {

Modified: desktop/unstable/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-control-center/debian/patches/series?rev=41200&op=diff
==============================================================================
--- desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-control-center/debian/patches/series	[utf-8] Wed Apr  2 22:53:29 2014
@@ -1,2 +1,3 @@
 01_menu_category.patch
 06_handle_passwd_with_ldap.patch
+07-vpn-plugin-properties-paths.patch

More information about the pkg-gnome-commits mailing list