rpms/NetworkManager-vpnc/F-8 NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.3, 1.4 NetworkManager-vpnc.spec, 1.37, 1.38
Denis Leroy (denis)
fedora-extras-commits at redhat.com
Tue Nov 27 08:52:33 UTC 2007
Author: denis
Update of /cvs/pkgs/rpms/NetworkManager-vpnc/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7958
Modified Files:
NetworkManager-vpnc-0.7.0-gppasswd.patch
NetworkManager-vpnc.spec
Log Message:
Added PCF import patch. Fixed group password patch for svn 3109
NetworkManager-vpnc-0.7.0-gppasswd.patch:
Index: NetworkManager-vpnc-0.7.0-gppasswd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/F-8/NetworkManager-vpnc-0.7.0-gppasswd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NetworkManager-vpnc-0.7.0-gppasswd.patch 16 Nov 2007 18:54:38 -0000 1.3
+++ NetworkManager-vpnc-0.7.0-gppasswd.patch 27 Nov 2007 08:52:29 -0000 1.4
@@ -1,6 +1,6 @@
---- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig 2007-09-28 05:46:53.000000000 +0200
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2007-11-16 06:39:58.000000000 +0100
-@@ -32,6 +32,32 @@
+--- 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"
@@ -33,7 +33,7 @@
static char *
find_one_password (const char *vpn_name,
const char *vpn_service,
-@@ -71,27 +97,14 @@
+@@ -74,27 +100,14 @@
return secret;
}
@@ -67,7 +67,7 @@
}
static void
-@@ -133,38 +146,24 @@
+@@ -136,38 +149,24 @@
g_free (display_name);
}
@@ -117,7 +117,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);
-@@ -177,21 +176,23 @@
+@@ -180,21 +179,23 @@
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;
@@ -153,7 +153,7 @@
gtk_widget_show (dialog);
-@@ -202,11 +203,16 @@
+@@ -205,11 +206,16 @@
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));
@@ -172,7 +172,7 @@
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);
-@@ -221,18 +227,14 @@
+@@ -224,18 +230,14 @@
}
@@ -192,7 +192,7 @@
static gboolean retry = FALSE;
static gchar *vpn_name = NULL;
static gchar *vpn_service = NULL;
-@@ -246,13 +248,13 @@
+@@ -249,13 +251,13 @@
{ NULL }
};
char buf[1];
@@ -208,7 +208,7 @@
context = g_option_context_new ("- vpnc auth dialog");
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
-@@ -262,7 +264,6 @@
+@@ -265,7 +267,6 @@
GNOME_PARAM_GOPTION_CONTEXT, context,
GNOME_PARAM_NONE);
@@ -216,7 +216,7 @@
if (vpn_name == NULL || vpn_service == NULL) {
fprintf (stderr, "Have to supply both name and service\n");
goto out;
-@@ -273,21 +274,22 @@
+@@ -276,21 +277,22 @@
goto out;
}
@@ -245,25 +245,15 @@
/* wait for data on stdin */
fread (buf, sizeof (char), sizeof (buf), stdin);
-@@ -295,5 +297,5 @@
+@@ -298,5 +300,5 @@
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.h.orig 2007-11-16 06:38:47.000000000 +0100
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2007-11-16 06:39:07.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;
-
---- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig 2007-11-16 06:38:52.000000000 +0100
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2007-11-16 11:07:24.000000000 +0100
+--- 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;
@@ -356,3 +346,13 @@
}
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;
+
Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/F-8/NetworkManager-vpnc.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- NetworkManager-vpnc.spec 26 Nov 2007 22:02:43 -0000 1.37
+++ NetworkManager-vpnc.spec 27 Nov 2007 08:52:29 -0000 1.38
@@ -16,6 +16,7 @@
URL: http://www.gnome.org/projects/NetworkManager/
Source: %{name}-%{version}.%{svn_snapshot}.tar.gz
Patch0: NetworkManager-vpnc-0.7.0-gppasswd.patch
+Patch1: NetworkManager-vpnc-0.7.0-pcfimport.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -47,6 +48,7 @@
%prep
%setup -q
%patch0 -p1 -b .grouppswd
+%patch1 -p1 -b .pcfimport
%build
More information about the fedora-extras-commits
mailing list