rpms/NetworkManager-vpnc/devel .cvsignore, 1.20, 1.21 NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.7, 1.8 NetworkManager-vpnc.spec, 1.42, 1.43 sources, 1.25, 1.26
Daniel Williams
dcbw at fedoraproject.org
Sun Oct 12 17:05:44 UTC 2008
Author: dcbw
Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15103
Modified Files:
.cvsignore NetworkManager-vpnc-0.7.0-gppasswd.patch
NetworkManager-vpnc.spec sources
Log Message:
* Sun Oct 12 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4175
- Rebuild for updated NetworkManager
- Allow changing passwords from the connection editor
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore 11 Aug 2008 19:21:21 -0000 1.20
+++ .cvsignore 12 Oct 2008 17:05:14 -0000 1.21
@@ -16,3 +16,4 @@
NetworkManager-vpnc-0.7.0.svn3832.tar.gz
NetworkManager-vpnc-0.7.0.svn3846.tar.gz
NetworkManager-vpnc-0.7.0.svn3928.tar.gz
+NetworkManager-vpnc-0.7.0.svn4175.tar.gz
NetworkManager-vpnc-0.7.0-gppasswd.patch:
Index: NetworkManager-vpnc-0.7.0-gppasswd.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc-0.7.0-gppasswd.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetworkManager-vpnc-0.7.0-gppasswd.patch 27 Aug 2008 21:54:14 -0000 1.7
+++ NetworkManager-vpnc-0.7.0-gppasswd.patch 12 Oct 2008 17:05:14 -0000 1.8
@@ -1,7 +1,7 @@
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-08-11 09:09:11.000000000 -0400
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-08-27 17:50:52.000000000 -0400
-@@ -69,6 +69,7 @@ struct GnomeTwoPasswordDialogDetails
+--- 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-12 12:25:08.000000000 -0400
+@@ -70,6 +70,7 @@ struct GnomeTwoPasswordDialogDetails
GtkWidget *remember_session_button;
GtkWidget *remember_forever_button;
@@ -9,7 +9,7 @@
GtkWidget *radio_vbox;
GtkWidget *connect_with_no_userpass_button;
-@@ -462,14 +463,18 @@ gnome_two_password_dialog_new (const cha
+@@ -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 =
@@ -30,7 +30,7 @@
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
+@@ -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);
@@ -42,7 +42,7 @@
}
}
-@@ -698,32 +705,48 @@ void
+@@ -699,32 +706,48 @@ void
gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog,
GnomeTwoPasswordDialogRemember remember)
{
@@ -96,8 +96,8 @@
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-08-27 17:49:42.000000000 -0400
+--- 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-12 12:25:08.000000000 -0400
@@ -57,6 +57,7 @@ struct GnomeTwoPasswordDialogClass
typedef enum {
GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING,
@@ -107,27 +107,9 @@
} 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-08-26 22:58:47.000000000 -0400
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-08-27 17:49:42.000000000 -0400
-@@ -89,8 +89,6 @@ lookup_secrets (const char *vpn_uuid,
- g_return_val_if_fail (*group_password == NULL, FALSE);
-
- *password = find_one_password (vpn_uuid, "password", is_session);
-- if (!*password)
-- return FALSE;
-
- *group_password = find_one_password (vpn_uuid, "group-password", is_session);
- if (!*group_password) {
-@@ -99,7 +97,7 @@ lookup_secrets (const char *vpn_uuid,
- return FALSE;
- }
-
-- return TRUE;
-+ return (*password && *group_password);
- }
-
- static void
-@@ -177,9 +175,11 @@ get_secrets (const char *vpn_uuid,
+--- 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-12 12:31:57.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 */
@@ -141,13 +123,53 @@
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);
-@@ -213,6 +213,9 @@ get_secrets (const char *vpn_uuid,
- save_vpn_password (vpn_uuid, vpn_name, vpn_service, NULL, "password", *password);
- save_vpn_password (vpn_uuid, vpn_name, vpn_service, NULL, "group-password", *group_password);
+@@ -97,8 +99,8 @@ get_secrets (const char *vpn_uuid,
+
+ gtk_widget_show (GTK_WIDGET (dialog));
+
+- if (gnome_two_password_dialog_run_and_block (dialog)) {
+ *password = gnome_two_password_dialog_get_password (dialog);
++ if (gnome_two_password_dialog_run_and_block (dialog)) {
+ *group_password = gnome_two_password_dialog_get_password_secondary (dialog);
+
+ switch (gnome_two_password_dialog_get_remember (dialog)) {
+@@ -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:
-+ save_vpn_password (vpn_uuid, vpn_name, vpn_service, NULL, "group-password", *group_password);
++ 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-10-12 12:30:24.000000000 -0400
++++ NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c 2008-10-12 12:30:53.000000000 -0400
+@@ -84,8 +84,6 @@ 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) {
+@@ -95,7 +93,7 @@ keyring_helpers_lookup_secrets (const ch
+ return FALSE;
+ }
+
+- return TRUE;
++ return (*password && *group_password);
+ }
+
+ GnomeKeyringResult
Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- NetworkManager-vpnc.spec 29 Aug 2008 13:36:28 -0000 1.42
+++ NetworkManager-vpnc.spec 12 Oct 2008 17:05:14 -0000 1.43
@@ -1,10 +1,10 @@
-%define nm_version 1:0.7.0-0.11.svn4022
+%define nm_version 1:0.7.0-0.11.svn4174
%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 svn4024
+%define svn_snapshot svn4175
Summary: NetworkManager VPN integration for vpnc
Name: NetworkManager-vpnc
@@ -100,6 +100,10 @@
%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
%changelog
+* Sun Oct 12 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4175
+- Rebuild for updated NetworkManager
+- Allow changing passwords from the connection editor
+
* Fri Aug 29 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4024
- Fix regression where username radio buttons were mistakenly shown in the
auth dialog
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 29 Aug 2008 13:36:28 -0000 1.25
+++ sources 12 Oct 2008 17:05:14 -0000 1.26
@@ -1 +1 @@
-bce0a85452a934787698abb2b0deba21 NetworkManager-vpnc-0.7.0.svn4024.tar.gz
+a1818145fac936dd5b956ee5b33a166c NetworkManager-vpnc-0.7.0.svn4175.tar.gz
More information about the scm-commits
mailing list