From 37a8ac86e59fe8ec7e761f7c4c4b8858e12d4fe2 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Apr 28 2014 22:43:43 +0000 Subject: Fix interactions with GNOME Shell when no passwords are required (bgo #728681) --- diff --git a/.gitignore b/.gitignore index 1d198c3..b3125fc 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ NetworkManager-vpnc-0.8.1.tar.bz2 /NetworkManager-vpnc-0.8.999.tar.bz2 /NetworkManager-vpnc-0.9.9.0.git20140129.tar.bz2 /NetworkManager-vpnc-0.9.9.0.git20140131.tar.bz2 +/NetworkManager-vpnc-0.9.9.0.git20140428.tar.bz2 diff --git a/0000-core-fix-pid-file-argument-passed-to-vpnc.patch b/0000-core-fix-pid-file-argument-passed-to-vpnc.patch deleted file mode 100644 index 793101e..0000000 --- a/0000-core-fix-pid-file-argument-passed-to-vpnc.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 6a38ce67e68900b6f17832541806611c40023877 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 6 Feb 2014 23:18:22 +0100 -Subject: [PATCH 1/1] core: fix pid-file argument passed to vpnc - -Passing --pid-file option and its argument in a single string isn't -understood by vpnc's option parser - both have to be passed as separate -argv members. - -https://bugzilla.gnome.org/show_bug.cgi?id=723804 - -Signed-off-by: Thomas Haller ---- - src/nm-vpnc-service.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/nm-vpnc-service.c b/src/nm-vpnc-service.c -index 02d8bc8..d5bee61 100644 ---- a/src/nm-vpnc-service.c -+++ b/src/nm-vpnc-service.c -@@ -306,7 +306,6 @@ nm_vpnc_start_vpnc_binary (NMVPNCPlugin *plugin, GError **error) - GPtrArray *vpnc_argv; - GSource *vpnc_watch; - gint stdin_fd; -- char *pid_arg; - - /* Find vpnc */ - vpnc_binary = vpnc_binary_paths; -@@ -325,13 +324,12 @@ nm_vpnc_start_vpnc_binary (NMVPNCPlugin *plugin, GError **error) - return -1; - } - -- pid_arg = g_strdup_printf ("--pid-file %s", priv->pid_file); -- - vpnc_argv = g_ptr_array_new (); - g_ptr_array_add (vpnc_argv, (gpointer) (*vpnc_binary)); - g_ptr_array_add (vpnc_argv, (gpointer) "--non-inter"); - g_ptr_array_add (vpnc_argv, (gpointer) "--no-detach"); -- g_ptr_array_add (vpnc_argv, (gpointer) pid_arg); -+ g_ptr_array_add (vpnc_argv, (gpointer) "--pid-file"); -+ g_ptr_array_add (vpnc_argv, (gpointer) priv->pid_file); - g_ptr_array_add (vpnc_argv, (gpointer) "-"); - g_ptr_array_add (vpnc_argv, NULL); - -@@ -339,12 +337,10 @@ nm_vpnc_start_vpnc_binary (NMVPNCPlugin *plugin, GError **error) - G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &pid, &stdin_fd, - NULL, NULL, error)) { - g_ptr_array_free (vpnc_argv, TRUE); -- g_free (pid_arg); - g_warning ("vpnc failed to start. error: '%s'", (*error)->message); - return -1; - } - g_ptr_array_free (vpnc_argv, TRUE); -- g_free (pid_arg); - - g_message ("vpnc started with pid %d", pid); - --- -1.8.5.3 - diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec index e83524b..12f69e1 100644 --- a/NetworkManager-vpnc.spec +++ b/NetworkManager-vpnc.spec @@ -1,10 +1,10 @@ -%global snapshot .git20140131 +%global snapshot .git20140428 Summary: NetworkManager VPN plugin for vpnc Name: NetworkManager-vpnc Epoch: 1 Version: 0.9.9.0 -Release: 3%{snapshot}%{?dist} +Release: 4%{snapshot}%{?dist} License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ Group: System Environment/Base @@ -26,8 +26,6 @@ Requires: shared-mime-info Requires: gnome-keyring Obsoletes: NetworkManager-vpnc < 1:0.9.8.2-2 -Patch0: 0000-core-fix-pid-file-argument-passed-to-vpnc.patch - %global _privatelibs libnm-vpnc-properties[.]so.* %global __provides_exclude ^(%{_privatelibs})$ %global __requires_exclude ^(%{_privatelibs})$ @@ -50,7 +48,6 @@ the vpnc server with NetworkManager (GNOME files). %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .0000.core-fix-pid-file-argument-passed-to-vpnc.orig %build @@ -102,6 +99,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.ui %changelog +* Mon Apr 28 2014 Dan Williams - 1:0.9.9.0-4.git20140428 +- Fix interactions with GNOME Shell when no passwords are required (bgo #728681) + * Fri Feb 7 2014 Thomas Haller - 1:0.9.9.0-3.git20140131 - Fix passing --pid-file argument to vpnc as separate arguments (rh #1062555) diff --git a/sources b/sources index b973c65..d73dac0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d87db7021629cef7c110a371dd42b7a8 NetworkManager-vpnc-0.9.9.0.git20140131.tar.bz2 +ebb1cb9b2c459aced74af01b40ad5227 NetworkManager-vpnc-0.9.9.0.git20140428.tar.bz2