rpms/NetworkManager-vpnc/devel .cvsignore, 1.15, 1.16 NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.2, 1.3 NetworkManager-vpnc.spec, 1.34, 1.35 sources, 1.17, 1.18
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Thu Apr 10 03:55:23 UTC 2008
- Previous message (by thread): rpms/NetworkManager/devel .cvsignore, 1.71, 1.72 NetworkManager.spec, 1.209, 1.210 sources, 1.99, 1.100
- Next message (by thread): rpms/NetworkManager-openvpn/devel .cvsignore, 1.4, 1.5 NetworkManager-openvpn.spec, 1.11, 1.12 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32302
Modified Files:
.cvsignore NetworkManager-vpnc-0.7.0-gppasswd.patch
NetworkManager-vpnc.spec sources
Log Message:
* Wed Apr 09 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-6.7.svn3549
- Update for compat with new NM bits
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 25 Mar 2008 15:41:55 -0000 1.15
+++ .cvsignore 10 Apr 2008 03:54:43 -0000 1.16
@@ -11,3 +11,4 @@
NetworkManager-vpnc-0.7.0.svn3083.tar.gz
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-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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NetworkManager-vpnc-0.7.0-gppasswd.patch 27 Nov 2007 08:54:13 -0000 1.2
+++ NetworkManager-vpnc-0.7.0-gppasswd.patch 10 Apr 2008 03:54:43 -0000 1.3
@@ -38,19 +38,19 @@
}
-static GSList *
--lookup_pass (const char *vpn_name, const char *vpn_service, gboolean *is_session)
+-lookup_pass (const char *vpn_id, const char *vpn_name, const char *vpn_service, gboolean *is_session)
+void
-+lookup_pass (const char *vpn_name, const char *vpn_service, KeyringData *kdata)
++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_name, vpn_service, "password", is_session);
+- password = find_one_password (vpn_id, vpn_name, vpn_service, "password", is_session);
- if (!password)
- return NULL;
-
-- group_password = find_one_password (vpn_name, vpn_service, "group-password", is_session);
+- group_password = find_one_password (vpn_id, vpn_name, vpn_service, "group-password", is_session);
- if (!group_password) {
- g_free (password);
- return NULL;
@@ -61,20 +61,27 @@
- passwords = g_slist_append (passwords, group_password);
- passwords = g_slist_append (passwords, password);
- return passwords;
-+ kdata->password = find_one_password (vpn_name, vpn_service, "password", &(kdata->is_session));
-+ kdata->group_password = find_one_password (vpn_name, vpn_service, "group-password",
++ 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
-@@ -136,38 +149,24 @@
+@@ -136,42 +149,29 @@
g_free (display_name);
}
-static GSList *
--get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry)
+-get_passwords (const char *vpn_id,
+- const char *vpn_name,
+- const char *vpn_service,
+- gboolean retry)
+gboolean
-+get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry, KeyringData *kdata)
++get_passwords (const char *vpn_id,
++ const char *vpn_name,
++ const char *vpn_service,
++ gboolean retry,
++ KeyringData *kdata)
{
GSList *result;
char *prompt;
@@ -90,15 +97,16 @@
- 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_name, vpn_service, &keyring_is_session)) != NULL) {
+- if ((result = lookup_pass (vpn_id, vpn_name, vpn_service, &keyring_is_session)) != NULL) {
- return result;
- }
- } else {
-- if ((keyring_result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
+- 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);
- }
@@ -106,9 +114,10 @@
- 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_name, vpn_service, kdata);
++ 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 */
@@ -167,11 +176,11 @@
switch (gnome_two_password_dialog_get_remember (GNOME_TWO_PASSWORD_DIALOG (dialog)))
{
+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP:
-+ save_vpn_password (vpn_name, vpn_service, NULL, "group-password", group_password);
++ 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_name, vpn_service, "session", "password", password);
- save_vpn_password (vpn_name, vpn_service, "session", "group-password", group_password);
+ 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 @@
}
@@ -191,7 +200,7 @@
- GSList *passwords;
static gboolean retry = FALSE;
static gchar *vpn_name = NULL;
- static gchar *vpn_service = NULL;
+ static gchar *vpn_id = NULL;
@@ -249,13 +251,13 @@
{ NULL }
};
@@ -213,18 +222,18 @@
GNOME_PARAM_NONE);
-
- if (vpn_name == NULL || vpn_service == NULL) {
- fprintf (stderr, "Have to supply both name and service\n");
+ 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 @@
goto out;
}
-- passwords = get_passwords (vpn_name, vpn_service, retry);
+- passwords = get_passwords (vpn_id, vpn_name, vpn_service, retry);
- if (passwords == NULL)
+ keyring_data_init(&keyring_data);
+
-+ if (! get_passwords (vpn_name, vpn_service, retry, &keyring_data))
++ if (!get_passwords (vpn_id, vpn_name, vpn_service, retry, &keyring_data))
goto out;
+ success = TRUE;
Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- NetworkManager-vpnc.spec 25 Mar 2008 15:41:55 -0000 1.34
+++ NetworkManager-vpnc.spec 10 Apr 2008 03:54:43 -0000 1.35
@@ -1,10 +1,10 @@
-%define nm_version 1:0.7.0-0.6.7.svn3204
-%define dbus_version 1.0
+%define nm_version 1:0.7.0-0.9.1.svn3549
+%define dbus_version 1.1
%define gtk2_version 2.10.0
-%define vpnc_version 0.3.3-3
+%define vpnc_version 0.4
%define shared_mime_version 0.16-3
-%define svn_snapshot svn3502
+%define svn_snapshot svn3549
Summary: NetworkManager VPN integration for vpnc
Name: NetworkManager-vpnc
@@ -20,8 +20,8 @@
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: NetworkManager-devel >= %{nm_version}
-BuildRequires: NetworkManager-glib-devel >= %{nm_version}
+BuildRequires: NetworkManager-devel >= 1:0.7.0-0.9.1.svn3548
+BuildRequires: NetworkManager-glib-devel >= 1:0.7.0-0.9.1.svn3548
BuildRequires: GConf2-devel
BuildRequires: libgnomeui-devel
BuildRequires: gnome-keyring-devel
@@ -100,6 +100,9 @@
%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
%changelog
+* Wed Apr 09 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-6.7.svn3549
+- Update for compat with new NM bits
+
* Tue Mar 25 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.7.svn3502
- Send suggested MTU to NetworkManager
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 25 Mar 2008 15:41:55 -0000 1.17
+++ sources 10 Apr 2008 03:54:43 -0000 1.18
@@ -1 +1 @@
-f792ba7f8bf09678630d81ec8f70396c NetworkManager-vpnc-0.7.0.svn3502.tar.gz
+454d962c322f0da4de69d790b8967e04 NetworkManager-vpnc-0.7.0.svn3549.tar.gz
- Previous message (by thread): rpms/NetworkManager/devel .cvsignore, 1.71, 1.72 NetworkManager.spec, 1.209, 1.210 sources, 1.99, 1.100
- Next message (by thread): rpms/NetworkManager-openvpn/devel .cvsignore, 1.4, 1.5 NetworkManager-openvpn.spec, 1.11, 1.12 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list