rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.6, 1.7 NetworkManager-vpnc.spec, 1.40, 1.41 sources, 1.23, 1.24
Daniel Williams
dcbw at fedoraproject.org
Wed Aug 27 21:54:14 UTC 2008
- Previous message (by thread): rpms/python-sphinx/EL-5 python-sphinx.spec,1.3,1.4
- Next message (by thread): rpms/NetworkManager-vpnc/F-9 .cvsignore, 1.17, 1.18 NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.4, 1.5 NetworkManager-vpnc.spec, 1.38, 1.39 sources, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3226
Modified Files:
NetworkManager-vpnc-0.7.0-gppasswd.patch
NetworkManager-vpnc.spec sources
Log Message:
* Wed Aug 27 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4022
- Rebuild for updated NetworkManager
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NetworkManager-vpnc-0.7.0-gppasswd.patch 24 Jul 2008 21:01:12 -0000 1.6
+++ NetworkManager-vpnc-0.7.0-gppasswd.patch 27 Aug 2008 21:54:14 -0000 1.7
@@ -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-24 16:42:56.000000000 -0400
+--- 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
GtkWidget *remember_session_button;
@@ -42,7 +42,7 @@
}
}
-@@ -698,32 +705,46 @@ void
+@@ -698,32 +705,48 @@ void
gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog,
GnomeTwoPasswordDialogRemember remember)
{
@@ -65,6 +65,8 @@
+ 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),
@@ -95,7 +97,7 @@
}
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-24 16:42:56.000000000 -0400
++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-08-27 17:49:42.000000000 -0400
@@ -57,6 +57,7 @@ struct GnomeTwoPasswordDialogClass
typedef enum {
GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING,
@@ -105,263 +107,47 @@
} 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-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"
-
-+typedef struct {
-+ const char *password;
-+ const char *group_password;
-+ gboolean is_session;
-+} KeyringData;
-+
-+void keyring_data_init(KeyringData* d)
-+{
-+ memset(d, 0, sizeof(KeyringData));
-+}
-+
-+void keyring_data_free(KeyringData* d)
-+{
-+ /* For security reasons, Make sure to clear the data before freeing */
-+ if (d->password) {
-+ memset((void*)d->password, 0, strlen(d->password));
-+ g_free((void*)d->password);
-+ d->password = NULL;
-+ }
-+ if (d->group_password) {
-+ memset((void*)d->group_password, 0, strlen(d->group_password));
-+ g_free((void*)d->group_password);
-+ d->group_password = NULL;
-+ }
-+}
-+
- static char *
- find_one_password (const char *vpn_id,
- const char *vpn_name,
-@@ -79,27 +105,14 @@ find_one_password (const char *vpn_id,
- return secret;
- }
-
--static GSList *
--lookup_pass (const char *vpn_id, const char *vpn_name, const char *vpn_service, gboolean *is_session)
-+void
-+lookup_pass (const char *vpn_id, const char *vpn_name, const char *vpn_service, KeyringData *kdata)
- {
-- GSList *passwords = NULL;
-- char *password;
-- char *group_password;
--
-- password = find_one_password (vpn_id, vpn_name, vpn_service, "password", is_session);
-- if (!password)
-- return NULL;
--
-- group_password = find_one_password (vpn_id, vpn_name, vpn_service, "group-password", is_session);
-- if (!group_password) {
-- g_free (password);
-- return NULL;
-- }
-+ keyring_data_init(kdata);
-
-- /* Group password first */
-- passwords = g_slist_append (passwords, group_password);
-- passwords = g_slist_append (passwords, password);
-- return passwords;
-+ kdata->password = find_one_password (vpn_id, vpn_name, vpn_service, "password", &(kdata->is_session));
-+ kdata->group_password = find_one_password (vpn_id, vpn_name, vpn_service, "group-password",
-+ &(kdata->is_session));
- }
-
- static void
-@@ -142,42 +155,29 @@ save_vpn_password (const char *vpn_id,
- g_free (display_name);
- }
-
--static GSList *
-+gboolean
- get_passwords (const char *vpn_id,
- const char *vpn_name,
- const char *vpn_service,
-- gboolean retry)
-+ gboolean retry,
-+ KeyringData *kdata)
- {
- GSList *result;
- char *prompt;
- GtkWidget *dialog;
-- char *keyring_password;
-- char *keyring_group_password;
-- gboolean keyring_is_session;
-- GSList *keyring_result;
- GnomeTwoPasswordDialogRemember remember;
-
- result = NULL;
-- keyring_password = NULL;
-- keyring_group_password = NULL;
-- keyring_result = NULL;
--
-- g_return_val_if_fail (vpn_id != NULL, NULL);
-- g_return_val_if_fail (vpn_name != NULL, NULL);
--
-- /* Use the system user name, since the VPN might have a different user name */
-- if (!retry) {
-- if ((result = lookup_pass (vpn_id, vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-- return result;
-- }
-- } else {
-- if ((keyring_result = lookup_pass (vpn_id, vpn_name, vpn_service, &keyring_is_session)) != NULL) {
-- keyring_group_password = g_strdup ((char *) keyring_result->data);
-- keyring_password = g_strdup ((char *) (g_slist_next (keyring_result))->data);
-- }
-- g_slist_foreach (keyring_result, (GFunc)g_free, NULL);
-- g_slist_free (keyring_result);
-- }
-+
-+ g_return_val_if_fail (vpn_id != NULL, FALSE);
-+ g_return_val_if_fail (vpn_name != NULL, FALSE);
-+
-+ lookup_pass (vpn_id, vpn_name, vpn_service, kdata);
-+
-+ /* If this is not a retry and we have a keyring password,
-+ don't prompt and attempt to connect */
-+ if (!retry && kdata->password)
-+ return TRUE;
-
- 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);
-@@ -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;
-- if (keyring_result != NULL) {
-- if (keyring_is_session)
-- remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
-- else
-- remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
-- }
-+ if (kdata->group_password)
-+ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
-+ else if (kdata->is_session)
-+ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
-+ else if (kdata->password)
-+ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
-+
- gnome_two_password_dialog_set_remember (GNOME_TWO_PASSWORD_DIALOG (dialog), remember);
-
- /* if retrying, put in the passwords from the keyring */
-- if (keyring_password != NULL) {
-- gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_password);
-- }
-- if (keyring_group_password != NULL) {
-- gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_group_password);
-- }
-+ if (kdata->password)
-+ gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog),
-+ kdata->password);
-+
-+ if (kdata->group_password)
-+ gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog),
-+ kdata->group_password);
-
- gtk_widget_show (dialog);
-
-@@ -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));
-- result = g_slist_append (result, group_password);
-- result = g_slist_append (result, password);
-+ keyring_data_free(kdata);
-+ kdata->password = g_strdup(password);
-+ kdata->group_password = g_strdup(group_password);
-+
-
- switch (gnome_two_password_dialog_get_remember (GNOME_TWO_PASSWORD_DIALOG (dialog)))
- {
-+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP:
-+ save_vpn_password (vpn_id, vpn_name, vpn_service, NULL, "group-password", group_password);
-+ break;
- 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);
-@@ -234,18 +241,14 @@ get_passwords (const char *vpn_id,
-
+--- 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;
}
-- g_free (keyring_password);
-- g_free (keyring_group_password);
--
- gtk_widget_destroy (dialog);
-
-- return result;
-+ return TRUE;
+- return TRUE;
++ return (*password && *group_password);
}
- int
- main (int argc, char *argv[])
- {
-- GSList *passwords;
- static gboolean retry = FALSE;
- static gchar *vpn_name = NULL;
- static gchar *vpn_id = NULL;
-@@ -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;
-+ gboolean success = FALSE;
-
- bindtextdomain (GETTEXT_PACKAGE, NULL);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
-- passwords = NULL;
--
- context = g_option_context_new ("- vpnc auth dialog");
- g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
-
-@@ -278,7 +281,6 @@ main (int argc, char *argv[])
- GNOME_PARAM_GOPTION_CONTEXT, context,
- GNOME_PARAM_NONE);
-
--
- if (vpn_id == NULL || vpn_name == NULL || vpn_service == NULL) {
- fprintf (stderr, "Have to supply ID, name, and service\n");
- goto out;
-@@ -289,21 +291,22 @@ main (int argc, char *argv[])
- goto out;
- }
-
-- passwords = get_passwords (vpn_id, vpn_name, vpn_service, retry);
-- if (passwords == NULL)
-+ keyring_data_init(&keyring_data);
-+
-+ if (!get_passwords (vpn_id, vpn_name, vpn_service, retry, &keyring_data))
- goto out;
-
-+ success = TRUE;
- /* dump the passwords to stdout */
-
-- printf ("%s\n%s\n", NM_VPNC_KEY_SECRET, (char *) passwords->data);
-- printf ("%s\n%s\n", NM_VPNC_KEY_XAUTH_PASSWORD, (char *) passwords->next->data);
-+ printf ("%s\n%s\n", NM_VPNC_KEY_SECRET, keyring_data.group_password);
-+ printf ("%s\n%s\n", NM_VPNC_KEY_XAUTH_PASSWORD, keyring_data.password);
- printf ("\n\n");
-
- /* for good measure, flush stdout since Kansas is going Bye-Bye */
- fflush (stdout);
-
-- g_slist_foreach (passwords, (GFunc)g_free, NULL);
-- g_slist_free (passwords);
-+ keyring_data_free(&keyring_data);
-
- /* wait for data on stdin */
- ret = fread (buf, sizeof (char), sizeof (buf), stdin);
-@@ -311,5 +314,5 @@ main (int argc, char *argv[])
- out:
- g_object_unref (program);
+ static void
+@@ -177,9 +175,11 @@ get_secrets (const char *vpn_uuid,
+ gnome_two_password_dialog_set_password_secondary_label (dialog, _("_Group Password:"));
-- return passwords != NULL ? 0 : 1;
-+ return (success ? 0 : 1);
- }
+ /* 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);
+@@ -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);
+ break;
++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP:
++ save_vpn_password (vpn_uuid, vpn_name, vpn_service, NULL, "group-password", *group_password);
++ break;
+ default:
+ break;
+ }
Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- NetworkManager-vpnc.spec 11 Aug 2008 19:21:21 -0000 1.40
+++ NetworkManager-vpnc.spec 27 Aug 2008 21:54:14 -0000 1.41
@@ -1,10 +1,10 @@
-%define nm_version 1:0.7.0-0.11.svn3927
+%define nm_version 1:0.7.0-0.11.svn4022
%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 svn3928
+%define svn_snapshot svn4022
Summary: NetworkManager VPN integration for vpnc
Name: NetworkManager-vpnc
@@ -50,7 +50,7 @@
%build
-%configure
+%configure --enable-more-warnings=yes
make %{?_smp_mflags}
%install
@@ -91,8 +91,8 @@
%doc AUTHORS ChangeLog
%{_libdir}/NetworkManager/lib*.so*
%{_libexecdir}/nm-vpnc-auth-dialog
-%config(noreplace) %{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
-%config(noreplace) %{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
+%{_sysconfdir}/dbus-1/system.d/nm-vpnc-service.conf
+%{_sysconfdir}/NetworkManager/VPN/nm-vpnc-service.name
%{_libexecdir}/nm-vpnc-service
%{_libexecdir}/nm-vpnc-service-vpnc-helper
%{_datadir}/gnome-vpn-properties/vpnc/nm-vpnc-dialog.glade
@@ -100,6 +100,9 @@
%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
%changelog
+* Wed Aug 27 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4022
+- Rebuild for updated NetworkManager
+
* Mon Aug 11 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn3928
- Rebuild for updated NetworkManager
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 11 Aug 2008 19:21:21 -0000 1.23
+++ sources 27 Aug 2008 21:54:14 -0000 1.24
@@ -1 +1 @@
-c532a81599190acbaf87795123065aaf NetworkManager-vpnc-0.7.0.svn3928.tar.gz
+424acb655ffc78783c57735cde67c52c NetworkManager-vpnc-0.7.0.svn4022.tar.gz
- Previous message (by thread): rpms/python-sphinx/EL-5 python-sphinx.spec,1.3,1.4
- Next message (by thread): rpms/NetworkManager-vpnc/F-9 .cvsignore, 1.17, 1.18 NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.4, 1.5 NetworkManager-vpnc.spec, 1.38, 1.39 sources, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list