rpms/NetworkManager-openconnect/devel NetworkManager-openconnect-passphrase-fsid.patch, NONE, 1.1 NetworkManager-openconnect.spec, 1.11, 1.12

[David Woodhouse]

Author: dwmw2

Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18437

Modified Files:
	NetworkManager-openconnect.spec 
Added Files:
	NetworkManager-openconnect-passphrase-fsid.patch 
Log Message:
accept pem_passphrase_fsid option in gconf

NetworkManager-openconnect-passphrase-fsid.patch:

--- NEW FILE NetworkManager-openconnect-passphrase-fsid.patch ---
commit 88701355d661b8011d054c63bf26705934c137d1
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Thu May 28 20:41:40 2009 +0100

    Allow 'pem_passphrase_fsid' option for auth-dialog

diff --git a/src/nm-openconnect-service.c b/src/nm-openconnect-service.c
index c4846ff..ea0d2c7 100644
--- a/src/nm-openconnect-service.c
+++ b/src/nm-openconnect-service.c
@@ -78,6 +78,7 @@ static ValidProperty valid_properties[] = {
 	{ NM_OPENCONNECT_KEY_LASTHOST,    G_TYPE_STRING, 0, 0 },
 	{ NM_OPENCONNECT_KEY_MTU,         G_TYPE_STRING, 0, 0 },
 	{ NM_OPENCONNECT_KEY_AUTOCONNECT, G_TYPE_BOOLEAN, 0, 0 },
+	{ NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID, G_TYPE_BOOLEAN, 0, 0 },
 	{ NULL,                           G_TYPE_NONE, 0, 0 }
 };
 
diff --git a/src/nm-openconnect-service.h b/src/nm-openconnect-service.h
index 98c5026..553f444 100644
--- a/src/nm-openconnect-service.h
+++ b/src/nm-openconnect-service.h
@@ -53,6 +53,7 @@
 #define NM_OPENCONNECT_KEY_LASTHOST "lasthost"
 #define NM_OPENCONNECT_KEY_MTU "mtu"
 #define NM_OPENCONNECT_KEY_AUTOCONNECT "autoconnect"
+#define NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID "pem_passphrase_fsid"
 
 #define NM_OPENCONNECT_AUTHTYPE_CERT "cert"
 #define NM_OPENCONNECT_AUTHTYPE_CERT_TPM "cert-tpm"


Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- NetworkManager-openconnect.spec	27 May 2009 12:46:22 -0000	1.11
+++ NetworkManager-openconnect.spec	1 Jun 2009 00:50:32 -0000	1.12
@@ -8,7 +8,7 @@
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.7.0.99
-Release:   4%{svn_snapshot}%{?dist}
+Release:   5%{svn_snapshot}%{?dist}
 License:   GPLv2+
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
@@ -18,6 +18,8 @@ Patch1:	   NetworkManager-openconnect-al
 Patch2:	   NetworkManager-openconnect-allow-form-opts.patch
 Patch3:	   NetworkManager-openconnect-mtu.patch
 Patch4:	   NetworkManager-openconnect-gwcert.patch
+Patch5:	   NetworkManager-openconnect-passphrase-fsid.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 BuildRequires: gtk2-devel             >= %{gtk2_version}
@@ -51,6 +53,7 @@ with NetworkManager and the GNOME deskto
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %configure --enable-more-warnings=yes
@@ -105,6 +108,9 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
 
 %changelog
+* Mon Jun  1 2009 David Woodhouse <David.Woodhouse at intel.com> 1:0.7.0.99-5
+- Accept 'pem_passphrase_fsid' key in gconf
+
 * Wed May 27 2009 David Woodhouse <David.Woodhouse at intel.com> 1:0.7.0.99-4
 - Handle 'gwcert' as a VPN secret, because openconnect might not be able
   to read the user's cacert file when it runs as an unprivileged user.