rpms/NetworkManager-openconnect/devel NetworkManager-openconnect-allow-form-opts.patch, NONE, 1.1 NetworkManager-openconnect-mtu.patch, NONE, 1.1 NetworkManager-openconnect.spec, 1.8, 1.9
David Woodhouse
dwmw2 at fedoraproject.org
Sat May 9 16:51:30 UTC 2009
Author: dwmw2
Update of /cvs/pkgs/rpms/NetworkManager-openconnect/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28717
Modified Files:
NetworkManager-openconnect.spec
Added Files:
NetworkManager-openconnect-allow-form-opts.patch
NetworkManager-openconnect-mtu.patch
Log Message:
mtu setting support, don't barf on form: keys in gconf
NetworkManager-openconnect-allow-form-opts.patch:
--- NEW FILE NetworkManager-openconnect-allow-form-opts.patch ---
commit ba97bd5299e9a73e3d290591d7a6973040afce53
Author: David Woodhouse <David.Woodhouse at intel.com>
Date: Sat May 9 17:46:46 2009 +0100
Don't abort on form entries being cached
diff --git a/src/nm-openconnect-service.c b/src/nm-openconnect-service.c
index 46c6fe1..4b09c8d 100644
--- a/src/nm-openconnect-service.c
+++ b/src/nm-openconnect-service.c
@@ -133,7 +133,7 @@ validate_one_property (const char *key, const char *value, gpointer user_data)
}
/* Did not find the property from valid_properties or the type did not match */
- if (!info->table[i].name) {
+ if (!info->table[i].name && strncmp(key, "form:", 5)) {
g_set_error (info->error,
NM_VPN_PLUGIN_ERROR,
NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS,
NetworkManager-openconnect-mtu.patch:
--- NEW FILE NetworkManager-openconnect-mtu.patch ---
commit 6abbead21d7b4ca2c45294e41380690ed294028c
Author: David Woodhouse <David.Woodhouse at intel.com>
Date: Sat May 2 10:34:19 2009 +0100
Add support for setting MTU in gconf
diff --git a/src/nm-openconnect-service.c b/src/nm-openconnect-service.c
index 1eae138..46c6fe1 100644
--- a/src/nm-openconnect-service.c
+++ b/src/nm-openconnect-service.c
@@ -36,7 +36,6 @@ static const char *openconnect_binary_paths[] =
};
#define NM_OPENCONNECT_HELPER_PATH LIBEXECDIR"/nm-openconnect-service-openconnect-helper"
-#define NM_OPENCONNECT_UDP_ENCAPSULATION_PORT 0 /* random port */
typedef struct {
const char *name;
@@ -55,6 +54,7 @@ static ValidProperty valid_properties[] = {
{ NM_OPENCONNECT_KEY_PRIVKEY, G_TYPE_STRING, 0, 0 },
{ NM_OPENCONNECT_KEY_CERTSIGS, G_TYPE_STRING, 0, 0 },
{ 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 },
{ NULL, G_TYPE_NONE, 0, 0 }
};
@@ -236,7 +236,7 @@ nm_openconnect_start_openconnect_binary (NMOPENCONNECTPlugin *plugin,
GPtrArray *openconnect_argv;
GSource *openconnect_watch;
gint stdin_fd;
- const char *props_vpn_gw, *props_cookie, *props_cacert;
+ const char *props_vpn_gw, *props_cookie, *props_cacert, *props_mtu;
/* Find openconnect */
openconnect_binary = openconnect_binary_paths;
@@ -278,6 +278,7 @@ nm_openconnect_start_openconnect_binary (NMOPENCONNECTPlugin *plugin,
}
props_cacert = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_CACERT);
+ props_mtu = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_MTU);
openconnect_argv = g_ptr_array_new ();
g_ptr_array_add (openconnect_argv, (gpointer) (*openconnect_binary));
@@ -287,6 +288,11 @@ nm_openconnect_start_openconnect_binary (NMOPENCONNECTPlugin *plugin,
g_ptr_array_add (openconnect_argv, (gpointer) props_cacert);
}
+ if (props_mtu && strlen(props_mtu)) {
+ g_ptr_array_add (openconnect_argv, (gpointer) "--mtu");
+ g_ptr_array_add (openconnect_argv, (gpointer) props_mtu);
+ }
+
g_ptr_array_add (openconnect_argv, (gpointer) "--syslog");
g_ptr_array_add (openconnect_argv, (gpointer) "--cookie-on-stdin");
diff --git a/src/nm-openconnect-service.h b/src/nm-openconnect-service.h
index 71b74ba..67911b4 100644
--- a/src/nm-openconnect-service.h
+++ b/src/nm-openconnect-service.h
@@ -28,6 +28,7 @@
#define NM_OPENCONNECT_KEY_XMLCONFIG "xmlconfig"
#define NM_OPENCONNECT_KEY_CERTSIGS "certsigs"
#define NM_OPENCONNECT_KEY_LASTHOST "lasthost"
+#define NM_OPENCONNECT_KEY_MTU "mtu"
#define NM_OPENCONNECT_KEY_AUTOCONNECT "autoconnect"
#define NM_OPENCONNECT_AUTHTYPE_CERT "cert"
Index: NetworkManager-openconnect.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openconnect/devel/NetworkManager-openconnect.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- NetworkManager-openconnect.spec 1 Apr 2009 14:27:04 -0000 1.8
+++ NetworkManager-openconnect.spec 9 May 2009 16:50:59 -0000 1.9
@@ -8,7 +8,7 @@
Summary: NetworkManager VPN integration for openconnect
Name: NetworkManager-openconnect
Version: 0.7.0.99
-Release: 2%{svn_snapshot}%{?dist}
+Release: 3%{svn_snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://www.gnome.org/projects/NetworkManager/
@@ -20,6 +20,8 @@ URL: http://www.gnome.org/projects
Source: %{name}-%{version}%{svn_snapshot}.tar.gz
Patch0: NetworkManager-openconnect-update-translations.patch
Patch1: NetworkManager-openconnect-allow-lasthost-autoconnect.patch
+Patch2: NetworkManager-openconnect-allow-form-opts.patch
+Patch3: NetworkManager-openconnect-mtu.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -50,6 +52,8 @@ with NetworkManager and the GNOME deskto
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%configure --enable-more-warnings=yes
@@ -104,6 +108,10 @@ fi
%{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.glade
%changelog
+* Sat May 9 2009 David Woodhouse <David.Woodhouse at intel.com> 1:0.7.0.99-3
+- Accept 'form:*' keys in gconf
+- Allow setting of MTU option in gconf
+
* Wed Apr 1 2009 David Woodhouse <David.Woodhouse at intel.com> 1:0.7.0.99-2
- Update translations from SVN
- Accept 'lasthost' and 'autoconnect' keys in gconf
More information about the fedora-extras-commits
mailing list