diff --git a/NetworkManager-vpnc-0.7.0-gppasswd.patch b/NetworkManager-vpnc-0.7.0-gppasswd.patch index c1074f9..8766265 100644 --- a/NetworkManager-vpnc-0.7.0-gppasswd.patch +++ b/NetworkManager-vpnc-0.7.0-gppasswd.patch @@ -1,6 +1,6 @@ diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c --- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd 2008-06-26 12:54:04.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-07-18 21:04:37.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-07-24 16:42:56.000000000 -0400 @@ -69,6 +69,7 @@ struct GnomeTwoPasswordDialogDetails GtkWidget *remember_session_button; @@ -95,7 +95,7 @@ diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.group } diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h --- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd 2008-06-26 12:54:04.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-07-18 21:04:37.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-07-24 16:42:56.000000000 -0400 @@ -57,6 +57,7 @@ struct GnomeTwoPasswordDialogClass typedef enum { GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, @@ -105,8 +105,8 @@ diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.group } GnomeTwoPasswordDialogRemember; diff -up NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/main.c ---- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd 2008-06-26 14:30:14.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-07-18 21:04:37.000000000 -0400 +--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd 2008-07-18 21:05:54.000000000 -0400 ++++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-07-24 16:42:56.000000000 -0400 @@ -39,6 +39,32 @@ #define KEYRING_SN_TAG "setting-name" #define KEYRING_SK_TAG "setting-key" @@ -305,7 +305,8 @@ diff -up NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd NetworkManager-v static gboolean retry = FALSE; static gchar *vpn_name = NULL; static gchar *vpn_id = NULL; -@@ -261,12 +264,12 @@ main (int argc, char *argv[]) +@@ -262,13 +265,13 @@ main (int argc, char *argv[]) + { "service", 's', 0, G_OPTION_ARG_STRING, &vpn_service, "VPN service type", NULL}, { NULL } }; + KeyringData keyring_data; @@ -320,7 +321,7 @@ diff -up NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd NetworkManager-v context = g_option_context_new ("- vpnc auth dialog"); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); -@@ -277,7 +280,6 @@ main (int argc, char *argv[]) +@@ -278,7 +281,6 @@ main (int argc, char *argv[]) GNOME_PARAM_GOPTION_CONTEXT, context, GNOME_PARAM_NONE); @@ -328,7 +329,7 @@ diff -up NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd NetworkManager-v if (vpn_id == NULL || vpn_name == NULL || vpn_service == NULL) { fprintf (stderr, "Have to supply ID, name, and service\n"); goto out; -@@ -288,21 +290,22 @@ main (int argc, char *argv[]) +@@ -289,21 +291,22 @@ main (int argc, char *argv[]) goto out; } @@ -356,8 +357,8 @@ diff -up NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd NetworkManager-v + keyring_data_free(&keyring_data); /* wait for data on stdin */ - fread (buf, sizeof (char), sizeof (buf), stdin); -@@ -310,5 +313,5 @@ main (int argc, char *argv[]) + ret = fread (buf, sizeof (char), sizeof (buf), stdin); +@@ -311,5 +314,5 @@ main (int argc, char *argv[]) out: g_object_unref (program);