From 7acb10fe274b0ca25fc92ac552093105e785870a Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Jul 19 2008 01:13:09 +0000 Subject: - Update for NM netmask -> prefix changes --- diff --git a/.cvsignore b/.cvsignore index 324a04f..e0e0e6c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -13,3 +13,4 @@ NetworkManager-vpnc-0.7.0.svn3109.tar.gz NetworkManager-vpnc-0.7.0.svn3502.tar.gz NetworkManager-vpnc-0.7.0.svn3549.tar.gz NetworkManager-vpnc-0.7.0.svn3801.tar.gz +NetworkManager-vpnc-0.7.0.svn3832.tar.gz diff --git a/NetworkManager-vpnc-0.7.0-gppasswd.patch b/NetworkManager-vpnc-0.7.0-gppasswd.patch index 0e832a7..45fa3c8 100644 --- a/NetworkManager-vpnc-0.7.0-gppasswd.patch +++ b/NetworkManager-vpnc-0.7.0-gppasswd.patch @@ -1,8 +1,115 @@ ---- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig 2007-11-07 19:05:57.000000000 +0100 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2007-11-27 09:24:17.000000000 +0100 -@@ -35,6 +35,32 @@ - #include "../src/nm-vpnc-service.h" - #include "gnome-two-password-dialog.h" +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 +@@ -69,6 +69,7 @@ struct GnomeTwoPasswordDialogDetails + + GtkWidget *remember_session_button; + GtkWidget *remember_forever_button; ++ GtkWidget *remember_group_button; + + GtkWidget *radio_vbox; + GtkWidget *connect_with_no_userpass_button; +@@ -462,14 +463,18 @@ gnome_two_password_dialog_new (const cha + gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox); + + password_dialog->details->remember_session_button = +- gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); ++ gtk_radio_button_new_with_mnemonic (NULL, _("_Remember passwords for this session")); + password_dialog->details->remember_forever_button = +- gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); ++ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("_Save passwords in keyring")); ++ password_dialog->details->remember_group_button = ++ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("S_ave group password in keyring")); + + gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, + FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, + FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_button, ++ FALSE, FALSE, 0); + + gnome_two_password_dialog_set_username (password_dialog, username); + gnome_two_password_dialog_set_password (password_dialog, password); +@@ -688,9 +693,11 @@ gnome_two_password_dialog_set_show_remem + if (show_remember) { + gtk_widget_show (password_dialog->details->remember_session_button); + gtk_widget_show (password_dialog->details->remember_forever_button); ++ gtk_widget_show (password_dialog->details->remember_group_button); + } else { + gtk_widget_hide (password_dialog->details->remember_session_button); + gtk_widget_hide (password_dialog->details->remember_forever_button); ++ gtk_widget_hide (password_dialog->details->remember_group_button); + } + } + +@@ -698,32 +705,46 @@ void + gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, + GnomeTwoPasswordDialogRemember remember) + { +- gboolean session, forever; ++ gboolean session, forever, group; + + session = FALSE; + forever = FALSE; +- if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) { ++ group = FALSE; ++ ++ switch (remember) { ++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: + session = TRUE; +- } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){ ++ break; ++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER: + forever = TRUE; ++ break; ++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP: ++ group = TRUE; ++ break; + } ++ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button), + session); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button), + forever); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button), ++ group); + } + + GnomeTwoPasswordDialogRemember + gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog) + { +- gboolean session, forever; ++ gboolean session, forever, group; + + session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button)); + forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button)); ++ group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button)); + if (forever) { + return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER; + } else if (session) { + return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION; ++ } else if (group) { ++ return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP; + } + return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; + } +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 +@@ -57,6 +57,7 @@ struct GnomeTwoPasswordDialogClass + typedef enum { + GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, + GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION, ++ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP, + GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER + } 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 +@@ -39,6 +39,32 @@ + #define KEYRING_SN_TAG "setting-name" + #define KEYRING_SK_TAG "setting-key" +typedef struct { + const char *password; @@ -31,9 +138,9 @@ +} + static char * - find_one_password (const char *vpn_name, - const char *vpn_service, -@@ -74,27 +100,14 @@ + find_one_password (const char *vpn_id, + const char *vpn_name, +@@ -79,27 +105,14 @@ find_one_password (const char *vpn_id, return secret; } @@ -67,19 +174,16 @@ } static void -@@ -136,42 +149,29 @@ +@@ -142,42 +155,29 @@ save_vpn_password (const char *vpn_id, g_free (display_name); } -static GSList * --get_passwords (const char *vpn_id, -- const char *vpn_name, -- const char *vpn_service, -- gboolean retry) +gboolean -+get_passwords (const char *vpn_id, -+ const char *vpn_name, -+ const char *vpn_service, + get_passwords (const char *vpn_id, + const char *vpn_name, + const char *vpn_service, +- gboolean retry) + gboolean retry, + KeyringData *kdata) { @@ -126,7 +230,7 @@ prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name); dialog = gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE); -@@ -180,21 +179,23 @@ +@@ -190,21 +190,23 @@ get_passwords (const char *vpn_id, gnome_two_password_dialog_set_password_secondary_label (GNOME_TWO_PASSWORD_DIALOG (dialog), _("_Group Password:")); /* use the same keyring storage options as from the items we put in the entry boxes */ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; @@ -162,7 +266,7 @@ gtk_widget_show (dialog); -@@ -205,11 +206,16 @@ +@@ -215,11 +217,16 @@ get_passwords (const char *vpn_id, password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog)); group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog)); @@ -181,7 +285,7 @@ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: save_vpn_password (vpn_id, vpn_name, vpn_service, "session", "password", password); save_vpn_password (vpn_id, vpn_name, vpn_service, "session", "group-password", group_password); -@@ -224,18 +230,14 @@ +@@ -234,18 +241,14 @@ get_passwords (const char *vpn_id, } @@ -201,7 +305,7 @@ static gboolean retry = FALSE; static gchar *vpn_name = NULL; static gchar *vpn_id = NULL; -@@ -249,13 +251,13 @@ +@@ -261,13 +264,13 @@ main (int argc, char *argv[]) { NULL } }; char buf[1]; @@ -217,7 +321,7 @@ context = g_option_context_new ("- vpnc auth dialog"); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); -@@ -265,7 +267,6 @@ +@@ -277,7 +280,6 @@ main (int argc, char *argv[]) GNOME_PARAM_GOPTION_CONTEXT, context, GNOME_PARAM_NONE); @@ -225,7 +329,7 @@ if (vpn_id == NULL || vpn_name == NULL || vpn_service == NULL) { fprintf (stderr, "Have to supply ID, name, and service\n"); goto out; -@@ -276,21 +277,22 @@ +@@ -288,21 +290,22 @@ main (int argc, char *argv[]) goto out; } @@ -254,114 +358,10 @@ /* wait for data on stdin */ fread (buf, sizeof (char), sizeof (buf), stdin); -@@ -298,5 +300,5 @@ +@@ -310,5 +313,5 @@ main (int argc, char *argv[]) out: g_object_unref (program); - return passwords != NULL ? 0 : 1; + return (success ? 0 : 1); } ---- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig 2007-11-27 09:23:30.000000000 +0100 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2007-11-27 09:24:17.000000000 +0100 -@@ -69,6 +69,7 @@ - - GtkWidget *remember_session_button; - GtkWidget *remember_forever_button; -+ GtkWidget *remember_group_button; - - GtkWidget *radio_vbox; - GtkWidget *connect_with_no_userpass_button; -@@ -462,14 +463,18 @@ - gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox); - - password_dialog->details->remember_session_button = -- gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session")); -+ gtk_radio_button_new_with_mnemonic (NULL, _("_Remember passwords for this session")); - password_dialog->details->remember_forever_button = -- gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring")); -+ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("_Save passwords in keyring")); -+ password_dialog->details->remember_group_button = -+ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("S_ave group password in keyring")); - - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button, - FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button, - FALSE, FALSE, 0); -+ gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_button, -+ FALSE, FALSE, 0); - - gnome_two_password_dialog_set_username (password_dialog, username); - gnome_two_password_dialog_set_password (password_dialog, password); -@@ -688,9 +693,11 @@ - if (show_remember) { - gtk_widget_show (password_dialog->details->remember_session_button); - gtk_widget_show (password_dialog->details->remember_forever_button); -+ gtk_widget_show (password_dialog->details->remember_group_button); - } else { - gtk_widget_hide (password_dialog->details->remember_session_button); - gtk_widget_hide (password_dialog->details->remember_forever_button); -+ gtk_widget_hide (password_dialog->details->remember_group_button); - } - } - -@@ -698,32 +705,46 @@ - gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog, - GnomeTwoPasswordDialogRemember remember) - { -- gboolean session, forever; -+ gboolean session, forever, group; - - session = FALSE; - forever = FALSE; -- if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) { -+ group = FALSE; -+ -+ switch (remember) { -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION: - session = TRUE; -- } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){ -+ break; -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER: - forever = TRUE; -+ break; -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP: -+ group = TRUE; -+ break; - } -+ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button), - session); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button), - forever); -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button), -+ group); - } - - GnomeTwoPasswordDialogRemember - gnome_two_password_dialog_get_remember (GnomeTwoPasswordDialog *password_dialog) - { -- gboolean session, forever; -+ gboolean session, forever, group; - - session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button)); - forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button)); -+ group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button)); - if (forever) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER; - } else if (session) { - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION; -+ } else if (group) { -+ return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP; - } - return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING; - } ---- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.orig 2007-11-27 09:23:26.000000000 +0100 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2007-11-27 09:24:17.000000000 +0100 -@@ -57,6 +57,7 @@ - typedef enum { - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION, -+ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP, - GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER - } GnomeTwoPasswordDialogRemember; - diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec index bd7117f..f458864 100644 --- a/NetworkManager-vpnc.spec +++ b/NetworkManager-vpnc.spec @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.10.svn3801 +%define nm_version 1:0.7.0-0.10.svn3830 %define dbus_version 1.1 %define gtk2_version 2.10.0 %define vpnc_version 0.4 %define shared_mime_version 0.16-3 -%define svn_snapshot svn3801 +%define svn_snapshot svn3832 Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc @@ -100,6 +100,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Fri Jul 18 2008 Dan Williams 1:0.7.0-10.svn3832 +- Update for NM netmask -> prefix changes + * Wed Jul 02 2008 Dan Williams 1:0.7.0-10.svn3801 - Update for moving VPN editing into connection manager - Add option to disable Dead Peer Detection diff --git a/sources b/sources index 50f81c9..276be70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -120fc7c68c3064a66c9c315f288550cc NetworkManager-vpnc-0.7.0.svn3801.tar.gz +c9d8fdf801536c57a3fe206086f3f519 NetworkManager-vpnc-0.7.0.svn3832.tar.gz