diff --git a/NetworkManager-vpnc-0.7.0-gppasswd.patch b/NetworkManager-vpnc-0.7.0-gppasswd.patch deleted file mode 100644 index f23ba9e..0000000 --- a/NetworkManager-vpnc-0.7.0-gppasswd.patch +++ /dev/null @@ -1,172 +0,0 @@ -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-09-13 16:47:27.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-10-14 12:25:40.000000000 -0400 -@@ -70,6 +70,7 @@ struct GnomeTwoPasswordDialogDetails - - GtkWidget *remember_session_button; - GtkWidget *remember_forever_button; -+ GtkWidget *remember_group_button; - - GtkWidget *radio_vbox; - GtkWidget *connect_with_no_userpass_button; -@@ -463,14 +464,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); -@@ -689,9 +694,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); - } - } - -@@ -699,32 +706,48 @@ 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; -+ default: -+ 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-09-13 16:47:27.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-10-14 12:25:40.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-09-13 16:47:27.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-10-14 13:47:38.000000000 -0400 -@@ -74,9 +74,11 @@ get_secrets (const char *vpn_uuid, - gnome_two_password_dialog_set_password_secondary_label (dialog, _("_Group Password:")); - - /* If nothing was found in the keyring, default to not remembering any secrets */ -- if (found) { -+ if (found || *group_password) { - /* Otherwise set default remember based on which keyring the secrets were found in */ -- if (is_session) -+ if (!*password && *group_password) -+ gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP); -+ else if (is_session) - gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION); - else - gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER); -@@ -110,6 +112,9 @@ get_secrets (const char *vpn_uuid, - keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_USER_PASSWORD, *password); - keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_GROUP_PASSWORD, *group_password); - break; -+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP: -+ keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_GROUP_PASSWORD, *group_password); -+ break; - default: - break; - } -@@ -119,7 +124,7 @@ get_secrets (const char *vpn_uuid, - gtk_widget_hide (GTK_WIDGET (dialog)); - gtk_widget_destroy (GTK_WIDGET (dialog)); - -- return TRUE; -+ return (*password && *group_password); - } - - int -diff -up NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c.grouppswd NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c ---- NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c.grouppswd 2008-09-13 16:47:27.000000000 -0400 -+++ NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c 2008-10-14 12:25:40.000000000 -0400 -@@ -84,18 +84,18 @@ keyring_helpers_lookup_secrets (const ch - g_return_val_if_fail (*group_password == NULL, FALSE); - - *password = find_one_password (vpn_uuid, VPNC_USER_PASSWORD, is_session); -- if (!*password) -- return FALSE; - - *group_password = find_one_password (vpn_uuid, VPNC_GROUP_PASSWORD, is_session); - if (!*group_password) { -- memset (*password, 0, strlen (*password)); -- gnome_keyring_memory_free (*password); -- *password = NULL; -+ if (*password) { -+ memset (*password, 0, strlen (*password)); -+ gnome_keyring_memory_free (*password); -+ *password = NULL; -+ } - return FALSE; - } - -- return TRUE; -+ return (*password && *group_password); - } - - GnomeKeyringResult diff --git a/NetworkManager-vpnc.spec b/NetworkManager-vpnc.spec index b17969e..d0d3480 100644 --- a/NetworkManager-vpnc.spec +++ b/NetworkManager-vpnc.spec @@ -1,10 +1,10 @@ -%define nm_version 1:0.7.0-0.11.svn4229 +%define nm_version 1:0.7.0-0.12.svn4293 %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 svn4229 +%define svn_snapshot svn4293 Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc @@ -15,7 +15,6 @@ License: GPLv2+ Group: System Environment/Base URL: http://www.gnome.org/projects/NetworkManager/ Source: %{name}-%{version}.%{svn_snapshot}.tar.gz -Patch0: NetworkManager-vpnc-0.7.0-gppasswd.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gtk2-devel >= %{gtk2_version} @@ -46,7 +45,6 @@ with NetworkManager and the GNOME desktop %prep %setup -q -%patch0 -p1 -b .grouppswd %build @@ -100,6 +98,12 @@ fi %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Mon Nov 17 2008 Dan Williams 1:0.7.0-0.11.svn4293 +- Ensure errors are shown when connection fails (rh #331141) +- Fix failures to ask for passwords on connect (rh #429287) +- Fix routing when concentrator specifies routes (rh #449283) +- Pull in upstream support for tokens and not saving passwords + * Mon Oct 27 2008 Dan Williams 1:0.7.0-0.11.svn4229 - Rebuild for updated NetworkManager diff --git a/sources b/sources index 143aaf2..a244a18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4815bdd263e807b2e986d4f1c9931d0 NetworkManager-vpnc-0.7.0.svn4229.tar.gz +18a5f427fdc6b483c4fec406ca302edb NetworkManager-vpnc-0.7.0.svn4293.tar.gz