--- network-manager-openvpn-0.7.1.orig/debian/copyright
+++ network-manager-openvpn-0.7.1/debian/copyright
@@ -0,0 +1,63 @@
+This package was debianized by Soren Hansen <sh@linux2go.dk> on
+Fri, 19 Jan 2007 20:42:50 +0100
+
+It was downloaded from 
+http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/
+
+
+auth-dialog/gnome-two-password-dialog.[ch]
+
+Copyright:
+
+  Copyright (C) 1999, 2000 Eazel, Inc.
+  Copyright (C) 2005, Red Hat, Inc.
+
+License:
+
+  The Gnome Library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Library General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+
+  The Gnome Library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  Library General Public License for more details.
+
+  You should have received a copy of the GNU Library General Public
+  License along with the Gnome Library; see the file COPYING.LIB.  If not,
+  write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
+  Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.
+ 
+
+
+All other files are licensed as following
+
+Copyright:
+
+  Copyright (C) 2004 - 2008 Red Hat, Inc.
+  Copyright (C) 2008 Dan Williams <dcbw@redhat.com>
+  Copyright (C) 2008 Tambet Ingo <tambet@gmail.com>
+  Copyright (C) 2005 Tim Niemueller <tim@niemueller.de>
+
+License:
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
--- network-manager-openvpn-0.7.1.orig/debian/network-manager-openvpn.install
+++ network-manager-openvpn-0.7.1/debian/network-manager-openvpn.install
@@ -0,0 +1,3 @@
+etc
+usr/lib/NetworkManager/nm-openvpn-service
+usr/lib/NetworkManager/nm-openvpn-service-openvpn-helper
--- network-manager-openvpn-0.7.1.orig/debian/watch
+++ network-manager-openvpn-0.7.1/debian/watch
@@ -0,0 +1,3 @@
+version=3
+
+http://download.gnome.org/sources/NetworkManager-openvpn/([\d\.]+)/NetworkManager-openvpn-(.*)\.tar\.gz
--- network-manager-openvpn-0.7.1.orig/debian/control
+++ network-manager-openvpn-0.7.1/debian/control
@@ -0,0 +1,50 @@
+Source: network-manager-openvpn
+Section: net
+Priority: optional
+Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
+Uploaders: Soren Hansen <soren@ubuntu.com>, Michael Biebl <biebl@debian.org>
+Build-Depends: cdbs,
+ debhelper (>= 7),
+ network-manager-dev (>= 0.7.0),
+ libnm-util-dev (>= 0.7.0),
+ libnm-glib-dev (>= 0.7.0),
+ libnm-glib-vpn-dev (>= 0.7.0),
+ intltool,
+ libdbus-glib-1-dev (>= 0.30),
+ libgnome-keyring-dev,
+ libgtk2.0-dev,
+ libgconf2-dev,
+ libglib2.0-dev,
+ libglade2-dev,
+ quilt
+Standards-Version: 3.8.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/network-manager-openvpn
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn
+Homepage: http://www.gnome.org/projects/NetworkManager/
+
+Package: network-manager-openvpn
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, openvpn (>= 2.1~rc9)
+Description: network management framework (OpenVPN plugin core)
+ NetworkManager attempts to keep an active network connection available at
+ all times.  It is intended primarily for laptops where it allows easy
+ switching betwen local wireless networks, it's also useful on desktops
+ with a selection of different interfaces to use.  It is not intended for
+ usage on servers.
+ .
+ This package provides a VPN plugin for OpenVPN.
+
+Package: network-manager-openvpn-gnome
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager-openvpn (= ${binary:Version})
+Replaces: network-manager-openvpn (<< 0.3.2svn2855-1)
+Conflicts: network-manager-openvpn (<< 0.3.2svn2855-1)
+Description: network management framework (OpenVPN plugin GNOME GUI) 
+ NetworkManager attempts to keep an active network connection available at
+ all times.  It is intended primarily for laptops where it allows easy
+ switching betwen local wireless networks, it's also useful on desktops
+ with a selection of different interfaces to use.  It is not intended for
+ usage on servers.
+ .
+ This package provides the GNOME bits of NetworkManager's OpenVPN plugin.
+
--- network-manager-openvpn-0.7.1.orig/debian/network-manager-openvpn.postinst
+++ network-manager-openvpn-0.7.1/debian/network-manager-openvpn.postinst
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+	configure)
+		if [ -x "/etc/init.d/dbus" ]; then
+			if [ -x /usr/sbin/invoke-rc.d ]; then
+				invoke-rc.d dbus force-reload || true
+			else
+				/etc/init.d/dbus force-reload || true
+			fi
+		fi
+        ;;
+esac
+
+#DEBHELPER#
+
+exit 0
--- network-manager-openvpn-0.7.1.orig/debian/docs
+++ network-manager-openvpn-0.7.1/debian/docs
@@ -0,0 +1,2 @@
+README
+AUTHORS
--- network-manager-openvpn-0.7.1.orig/debian/compat
+++ network-manager-openvpn-0.7.1/debian/compat
@@ -0,0 +1 @@
+7
--- network-manager-openvpn-0.7.1.orig/debian/network-manager-openvpn-gnome.install
+++ network-manager-openvpn-0.7.1/debian/network-manager-openvpn-gnome.install
@@ -0,0 +1,6 @@
+usr/lib/NetworkManager/*.so*
+usr/lib/NetworkManager/nm-openvpn-auth-dialog
+usr/share/applications/nm-openvpn.desktop
+usr/share/gnome-vpn-properties
+usr/share/locale
+usr/share/icons
--- network-manager-openvpn-0.7.1.orig/debian/README.source
+++ network-manager-openvpn-0.7.1/debian/README.source
@@ -0,0 +1,3 @@
+This package uses the quilt patch management system.
+
+Please refer to /usr/share/doc/quilt/README.source for further information.
--- network-manager-openvpn-0.7.1.orig/debian/changelog
+++ network-manager-openvpn-0.7.1/debian/changelog
@@ -0,0 +1,112 @@
+network-manager-openvpn (0.7.1-1~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 21 Jul 2009 16:19:47 +0200
+
+network-manager-openvpn (0.7.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.8.1. No further changes.
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 16 Apr 2009 16:50:50 +0200
+
+network-manager-openvpn (0.7.0.99-1) unstable; urgency=low
+
+  * New upstream release (0.7.1 rc3).
+
+ -- Michael Biebl <biebl@debian.org>  Thu, 05 Mar 2009 13:35:17 +0100
+
+network-manager-openvpn (0.7.0.97-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/01_dbus_policy.patch
+    - Removed, merged upstream.
+  * debian/control
+    - Drop libgnomeui-dev from Build-Depends, no longer required.
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 25 Feb 2009 10:43:09 +0100
+
+network-manager-openvpn (0.7.0-2) experimental; urgency=low
+
+  * debian/control
+    - Wrap build dependencies.
+    - Bump build dependency on debhelper to (>= 7).
+  * debian/compat
+    - Bump to debhelper v7 compat mode.
+  * debian/patches/01_dbus_policy.patch
+    - Remove bare send_interface. (Closes: #510730)
+  * debian/rules
+    - Include gnome.mk cdbs class instead of autotools.mk.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 14 Feb 2009 13:50:13 +0100
+
+network-manager-openvpn (0.7.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control
+    - Add Vcs-* fields pointing to the Subversion repository of the package.
+    - Bump Standards-Version to 3.8.0. Add REAME.source as recommended by the
+      new policy.
+    - Fix GNOME spelling error in the package description.
+    - Set Utopia Maintenance Team as Maintainer, add myself and Soren to
+      Uploaders.
+    - Add Homepage: field.
+    - Update build dependencies.
+    - Bump dependency on openvpn to (>= 2.1~rc9) for the --script-security
+      option.
+  * debian/rules
+    - Do not run autogen.sh, the upstream tarball contains a proper build
+      system now.
+    - Install plugins into /usr/lib/NetworkManager, so NetworkManager can find
+      them.
+  * debian/*.install
+    - Update accordingly.
+  * Switch patch management system to quilt.
+  * Drop obsolete patches
+    - debian/patches/01_fix_dbus_signal_name.diff
+    - debian/patches/02_fix_wrong_awk_path.diff
+    - debian/patches/07_nm-openvpn-server-name.diff
+  * Disable patches which do not apply cleanly anymore
+    - debian/patches/03_allow_servercert_override.diff
+    - debian/patches/04_increase_timeout.diff
+    - debian/patches/06_pull_dns_domain.diff
+  * debian/network-manager-openvpn.postinst
+    - Do no longer restart NetworkManager, only tell dbus to reload the config
+      files.
+  * debian/watch
+    - Add watch file which allows to track new upstream releases.
+  * debian/copyright
+    - Revised and updated.
+
+ -- Michael Biebl <biebl@debian.org>  Mon, 15 Dec 2008 21:15:16 +0100
+
+network-manager-openvpn (0.3.2svn2855-1) unstable; urgency=low
+
+  * New SVN checkout (Closes: #444907)
+  * Fixed wrong awk path (Closes: #421381)
+  * Added libnm-util-dev to build-depends (Closes: #441188)
+  * Split package into n-m-o and n-m-o-gnome (added Replaces and
+    Conflicts accordingly) (Closes: #425126)
+  * Pick up patches from Ubuntu (Thanks to Philipp Kern for collecting these!)
+    - 03_allow_servercert_override.diff
+      + Allow the user to turn off the check for a proper nsCertType=server
+        extension bit set in the server's certificate.
+    - 04_increase_timeout.diff
+      + Increased the timeout before openvpn gets killed forcefully from 5s to
+        15s.
+    - 06_pull_dns_domain.diff
+      + Pull DNS domain setting from remote OpenVPN server.
+  * 06_pull_dns_domain.diff
+    - Don't crash if the server doesn't provide us with a DNS domain.
+  * Use /etc/init.d/network-manager instead of
+    /etc/dbus/event.d/25NetworkManager.
+
+ -- Soren Hansen <soren@ubuntu.com>  Tue, 02 Oct 2007 12:30:00 +0200
+
+network-manager-openvpn (0.3.2svn2342-1) unstable; urgency=low
+
+  * Initial upload to Debian (Closes: #368748)
+
+ -- Soren Hansen <sh@linux2go.dk>  Tue, 6 Mar 2007 15:50:48 +0100
+
--- network-manager-openvpn-0.7.1.orig/debian/rules
+++ network-manager-openvpn-0.7.1/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+  
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/NetworkManager"
+
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-static
+
+DEB_DH_MAKESHLIBS_ARGS_ALL := -X/usr/lib/NetworkManager/
+
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
+
--- network-manager-openvpn-0.7.1.orig/debian/patches/03_allow_servercert_override.diff
+++ network-manager-openvpn-0.7.1/debian/patches/03_allow_servercert_override.diff
@@ -0,0 +1,247 @@
+diff -Nur network-manager-openvpn-0.3.2svn2855/properties/nm-openvpn.c network-manager-openvpn-0.3.2svn2855.new/properties/nm-openvpn.c
+--- network-manager-openvpn-0.3.2svn2855/properties/nm-openvpn.c	2007-10-02 10:32:34.165566267 +0200
++++ network-manager-openvpn-0.3.2svn2855.new/properties/nm-openvpn.c	2007-10-02 10:37:58.817688004 +0200
+@@ -62,6 +62,7 @@
+   GtkCheckButton *w_use_lzo;
+   GtkCheckButton *w_use_tap;
+   GtkCheckButton *w_use_tcp;
++  GtkCheckButton *w_servercert_insecure;
+   GtkExpander    *w_opt_info_expander;
+   GtkButton      *w_advanced_button;
+   GtkButton      *w_import_button;
+@@ -122,6 +123,7 @@
+   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_lzo), FALSE);
+   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_tap), FALSE);
+   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_tcp), FALSE);
++  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_servercert_insecure), FALSE);
+   gtk_combo_box_set_active (GTK_COMBO_BOX (impl->w_connection_type), 0);
+   connection_type_changed (GTK_COMBO_BOX (impl->w_connection_type), impl);
+   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_cipher), FALSE);
+@@ -246,6 +248,10 @@
+ 		(strcmp (value, "tcp-client") == 0) ) {
+       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_tcp), TRUE);
+       should_expand = TRUE;
++    } else if ( (strcmp (key,   "servercert-insecure") == 0) &&
++		(strcmp (value, "yes") == 0) ) {
++      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_servercert_insecure), TRUE);
++      should_expand = TRUE;
+     } else if (strcmp (key, "cipher") == 0) {
+       set_cipher(impl->w_cipher, impl->w_use_cipher, value);
+     } else if (strcmp (key, "ta") == 0) {
+@@ -307,6 +313,7 @@
+   gboolean    use_lzo;
+   gboolean    use_tap;
+   gboolean    use_tcp;
++  gboolean    servercert_insecure;
+   gboolean    use_cipher;
+   gboolean    use_ta;
+ 
+@@ -319,6 +326,7 @@
+   use_lzo                = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_lzo));
+   use_tap                = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_tap));
+   use_tcp                = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_tcp));
++  servercert_insecure    = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_servercert_insecure));
+   shared_key             = gtk_entry_get_text (impl->w_shared_key);
+   local_ip               = gtk_entry_get_text (impl->w_local_ip);
+   remote_ip              = gtk_entry_get_text (impl->w_remote_ip);
+@@ -350,6 +358,8 @@
+   data = g_slist_append (data, g_strdup (port));
+   data = g_slist_append (data, g_strdup ("proto"));
+   data = g_slist_append (data, use_tcp ? g_strdup ("tcp-client") : g_strdup("udp"));
++  data = g_slist_append (data, g_strdup ("servercert-insecure"));
++  data = g_slist_append (data, servercert_insecure ? g_strdup ("yes") : g_strdup("no"));
+   data = g_slist_append (data, g_strdup ("ca"));
+   data = g_slist_append (data, g_strdup (ca));
+   data = g_slist_append (data, g_strdup ("cert"));
+@@ -764,6 +774,7 @@
+   gboolean use_lzo;
+   gboolean use_tap;
+   gboolean use_tcp;
++  gboolean servercert_insecure;
+   gint connection_type;
+   gboolean use_cipher;
+   const gchar *cipher;
+@@ -786,6 +797,7 @@
+   use_lzo                = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_lzo));
+   use_tap                = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_tap));
+   use_tcp                = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_tcp));
++  servercert_insecure    = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_servercert_insecure));
+   use_cipher             = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_cipher));
+   cipher                 = gtk_combo_box_get_active_text(impl->w_cipher);
+   use_ta                 = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impl->w_use_ta));
+@@ -878,6 +890,9 @@
+   g_string_append (buf, "\n\t");
+   g_string_append_printf( buf, _("Protocol: %s"), ((use_tcp) ? _("TCP") : _("UDP")));
+ 
++  g_string_append (buf, "\n\t");
++  g_string_append_printf( buf, _("Allow non-server-extension server cert: %s"), ((servercert_insecure) ? _("Yes") : _("No")));
++
+   if (use_routes) {
+     g_string_append (buf, "\n\t");
+     g_string_append_printf (buf, _("Routes:  %s"), routes);
+@@ -925,6 +940,7 @@
+     char *lzo = NULL;
+     char *dev = NULL;
+     char *proto = NULL;
++    char *servercert_insecure = NULL;
+     char *connection_type = NULL;
+     char *shared_key = NULL;
+     char *local_ip = NULL;
+@@ -942,6 +958,7 @@
+     port            = g_key_file_get_string (keyfile, "openvpn", "port", NULL);
+     dev             = g_key_file_get_string (keyfile, "openvpn", "dev", NULL);
+     proto           = g_key_file_get_string (keyfile, "openvpn", "proto", NULL);
++    servercert_insecure = g_key_file_get_string (keyfile, "openvpn", "servercert-insecure", NULL);
+     ca              = g_key_file_get_string (keyfile, "openvpn", "ca", NULL);
+     cert            = g_key_file_get_string (keyfile, "openvpn", "cert", NULL);
+     key             = g_key_file_get_string (keyfile, "openvpn", "key", NULL);
+@@ -964,6 +981,7 @@
+ 	 (port != NULL ) &&
+ 	 (dev != NULL) &&
+ 	 (proto != NULL) &&
++	 (servercert_insecure != NULL) &&
+ 	 (connection_type != NULL) &&
+ 	 (strlen (remote) > 0) &&
+ 	 (strlen (port) > 0) &&
+@@ -1108,6 +1126,11 @@
+ 	should_expand = TRUE;
+       }
+ 
++      if ( strcmp (servercert_insecure, "yes") == 0 ) {
++	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_servercert_insecure), TRUE);
++	should_expand = TRUE;
++      }
++
+       if ( strlen (routes) > 0 ) {
+ 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impl->w_use_routes), TRUE);
+ 	should_expand = TRUE;
+@@ -1136,6 +1159,7 @@
+     g_free (port);
+     g_free (dev);
+     g_free (proto);
++    g_free (servercert_insecure);
+     g_free (ca);
+     g_free (cert);
+     g_free (key);
+@@ -1307,6 +1331,7 @@
+   const char *port = "";
+   const char *dev = "";
+   const char *proto = "";
++  const char *servercert_insecure = "";
+   const char *ca = "";
+   const char *cert = "";
+   const char *key = "";
+@@ -1338,6 +1363,8 @@
+       dev = value;
+     } else if (strcmp (k, "proto") == 0) {
+       proto = value;
++    } else if (strcmp (k, "servercert-insecure") == 0) {
++      servercert_insecure = value;
+     } else if (strcmp (k, "ca") == 0) {
+       ca = value;
+     } else if (strcmp (k, "cert") == 0) {
+@@ -1396,6 +1423,7 @@
+ 	     "port=%s\n"
+ 	     "dev=%s\n"
+ 	     "proto=%s\n"
++	     "servercert-insecure=%s\n"
+ 	     "ca=%s\n"
+ 	     "cert=%s\n"
+ 	     "key=%s\n"
+@@ -1414,6 +1442,8 @@
+ 	     /* Port */        port,
+ 	     /* TUN or TAP */  dev,
+ 	     /* TCP or UDP */  proto,
++	                       servercert_insecure, /* Allow server certificate w/o
++						       "server" extension (insecure */
+ 	     /* CA */          ca,
+ 	     /* Cert */        cert,
+ 	     /* Key */         key,
+@@ -1577,6 +1607,8 @@
+     impl->w_use_tap                = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "openvpn-use-tap"));
+     impl->w_use_tcp                = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "openvpn-use-tcp"));
+ 
++    impl->w_servercert_insecure    = GTK_CHECK_BUTTON (glade_xml_get_widget (impl->xml, "openvpn-servercert-insecure"));
++
+     impl->w_connection_type        = GTK_COMBO_BOX (glade_xml_get_widget (impl->xml, "openvpn-connection-type"));
+     impl->w_settings_notebook      = GTK_NOTEBOOK (glade_xml_get_widget (impl->xml, "openvpn-settings"));
+ 
+diff -Nur network-manager-openvpn-0.3.2svn2855/properties/nm-openvpn-dialog.glade network-manager-openvpn-0.3.2svn2855.new/properties/nm-openvpn-dialog.glade
+--- network-manager-openvpn-0.3.2svn2855/properties/nm-openvpn-dialog.glade	2007-10-02 08:49:33.883102000 +0200
++++ network-manager-openvpn-0.3.2svn2855.new/properties/nm-openvpn-dialog.glade	2007-10-02 10:38:52.906374705 +0200
+@@ -2426,6 +2426,25 @@
+ 		      <property name="spacing">6</property>
+ 
+ 		      <child>
++		    <widget class="GtkCheckButton" id="openvpn-servercert-insecure">
++		      <property name="visible">True</property>
++		      <property name="can_focus">True</property>
++		      <property name="label" translatable="yes">X.509: Allow server certificate without server extension</property>
++		      <property name="use_underline">True</property>
++		      <property name="relief">GTK_RELIEF_NORMAL</property>
++		      <property name="focus_on_click">True</property>
++		      <property name="active">False</property>
++		      <property name="inconsistent">False</property>
++		      <property name="draw_indicator">True</property>
++		    </widget>
++		    <packing>
++		      <property name="padding">0</property>
++		      <property name="expand">False</property>
++		      <property name="fill">False</property>
++		    </packing>
++		  </child>
++
++		  <child>
+ 			<widget class="GtkHBox" id="hbox23">
+ 			  <property name="visible">True</property>
+ 			  <property name="homogeneous">False</property>
+diff -Nur network-manager-openvpn-0.3.2svn2855/src/nm-openvpn-service.c network-manager-openvpn-0.3.2svn2855.new/src/nm-openvpn-service.c
+--- network-manager-openvpn-0.3.2svn2855/src/nm-openvpn-service.c	2007-10-02 10:32:34.137565914 +0200
++++ network-manager-openvpn-0.3.2svn2855.new/src/nm-openvpn-service.c	2007-10-02 10:40:26.855567471 +0200
+@@ -663,6 +663,11 @@
+ 	ta = data_items[++i];
+       } else if ( (strcmp( data_items[i], "ta-dir") == 0) ) {
+ 	ta_dir = data_items[++i];
++      } else if ( (strcmp( data_items[i], "servercert-insecure" ) == 0) &&
++                  (strcmp( data_items[++i], "yes" ) != 0) ) {
++        // add check for server extension if servercert-insecure is not set
++        g_ptr_array_add (openvpn_argv, (gpointer) "--ns-cert-type");
++        g_ptr_array_add (openvpn_argv, (gpointer) "server");
+       }
+     }
+     g_ptr_array_add (openvpn_argv, (gpointer) "--nobind");
+@@ -739,8 +744,6 @@
+     case NM_OPENVPN_CONTYPE_X509:
+ 
+       g_ptr_array_add (openvpn_argv, (gpointer) "--client");
+-      g_ptr_array_add (openvpn_argv, (gpointer) "--ns-cert-type");
+-      g_ptr_array_add (openvpn_argv, (gpointer) "server");
+ 
+       for (i = 0; i < num_items; ++i) {
+ 	if ( strcmp( data_items[i], "ca" ) == 0) {
+@@ -790,8 +793,6 @@
+ 
+       // Client mode
+       g_ptr_array_add (openvpn_argv, (gpointer) "--client");
+-      g_ptr_array_add (openvpn_argv, (gpointer) "--ns-cert-type");
+-      g_ptr_array_add (openvpn_argv, (gpointer) "server");
+       // Use user/path authentication
+       g_ptr_array_add (openvpn_argv, (gpointer) "--auth-user-pass");
+ 
+@@ -807,8 +808,6 @@
+     case NM_OPENVPN_CONTYPE_X509USERPASS:
+ 
+       g_ptr_array_add (openvpn_argv, (gpointer) "--client");
+-      g_ptr_array_add (openvpn_argv, (gpointer) "--ns-cert-type");
+-      g_ptr_array_add (openvpn_argv, (gpointer) "server");
+ 
+       for (i = 0; i < num_items; ++i) {
+ 	if ( strcmp( data_items[i], "ca" ) == 0) {
+@@ -915,6 +914,7 @@
+     { "ca",				OPT_TYPE_ASCII },
+     { "dev",				OPT_TYPE_ASCII },
+     { "proto",				OPT_TYPE_ASCII },
++    { "servercert-insecure",		OPT_TYPE_ASCII },
+     { "port",				OPT_TYPE_INTEGER },
+     { "cert",				OPT_TYPE_ASCII },
+     { "key",				OPT_TYPE_ASCII },
--- network-manager-openvpn-0.7.1.orig/debian/patches/series
+++ network-manager-openvpn-0.7.1/debian/patches/series
@@ -0,0 +1 @@
+#03_allow_servercert_override.diff
