[Pkg-utopia-commits] r1752 - in /packages/unstable/network-manager-openvpn/debian: ./ patches/
shawarma-guest at users.alioth.debian.org
shawarma-guest at users.alioth.debian.org
Tue Oct 2 10:38:07 UTC 2007
Author: shawarma-guest
Date: Tue Oct 2 10:38:07 2007
New Revision: 1752
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1752
Log:
New SVN checkout
Fixed wrong awk path
Fixed build-depends
Split package into core and gnome
Pick up patches from Ubuntu
- 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.
- 05_fix_nm-vpn-properties_path.diff
+ Corrected the path to nm-vpn-properties in the desktop file.
- 06_pull_dns_domain.diff
+ Pull DNS domain setting from remote OpenVPN server.
Fixed 06_pull_dns_domain.diff to not break when no DNS domains is given by server.
Added:
packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install
packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.install
packages/unstable/network-manager-openvpn/debian/patches/03_allow_servercert_override.diff
packages/unstable/network-manager-openvpn/debian/patches/04_increase_timeout.diff
packages/unstable/network-manager-openvpn/debian/patches/05_fix_nm-vpn-properties_path.diff
packages/unstable/network-manager-openvpn/debian/patches/06_pull_dns_domain.diff
packages/unstable/network-manager-openvpn/debian/patches/07_nm-openvpn-server-name.diff
Modified:
packages/unstable/network-manager-openvpn/debian/changelog
packages/unstable/network-manager-openvpn/debian/control
packages/unstable/network-manager-openvpn/debian/rules
Modified: packages/unstable/network-manager-openvpn/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/changelog?rev=1752&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/changelog (original)
+++ packages/unstable/network-manager-openvpn/debian/changelog Tue Oct 2 10:38:07 2007
@@ -1,10 +1,24 @@
-network-manager-openvpn (0.3.2svn2569-1) unstable; urgency=low
+network-manager-openvpn (0.3.2svn2855-1) unstable; urgency=low
- * New SVN checkout
+ * New SVN checkout (Closes: #444907)
* Fixed wrong awk path (Closes: #421381)
- * Remove gnome dependencies (Closes: #425126)
+ * Added libnm-util-dev to build-depends (Closes: #441188)
+ * Split package into n-m-o and n-m-o-gnome (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.
+ - 05_fix_nm-vpn-properties_path.diff
+ + Corrected the path to nm-vpn-properties in the desktop file.
+ - 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.
- -- Soren Hansen <sh at linux2go.dk> Thu, 10 May 2007 12:01:18 +0200
+ -- Soren Hansen <soren at ubuntu.com> Tue, 02 Oct 2007 12:30:00 +0200
network-manager-openvpn (0.3.2svn2342-1) unstable; urgency=low
Modified: packages/unstable/network-manager-openvpn/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/control?rev=1752&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/control (original)
+++ packages/unstable/network-manager-openvpn/debian/control Tue Oct 2 10:38:07 2007
@@ -1,14 +1,14 @@
Source: network-manager-openvpn
Section: net
Priority: optional
-Maintainer: Soren Hansen <sh at linux2go.dk>
-Build-Depends: cdbs, debhelper (>= 5), network-manager-dev, automake1.9, gnome-common, intltool, libgnomeui-dev, libdbus-glib-1-dev, patchutils
+Maintainer: Soren Hansen <soren at ubuntu.com>
+Build-Depends: cdbs, debhelper (>= 5), network-manager-dev (>= 0.6.2), libnm-util-dev (>= 0.6.2), automake1.9, gnome-common, intltool, libgnomeui-dev, libdbus-glib-1-dev, patchutils
Standards-Version: 3.7.2
Package: network-manager-openvpn
Architecture: any
Depends: ${shlibs:Depends}, openvpn
-Description: network management framework (OpenVPN plugin)
+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
@@ -16,3 +16,16 @@
usage on servers.
.
This package provides a VPN plugin for OpenVPN.
+
+Package: network-manager-openvpn-gnome
+Architecture: any
+Depends: ${shlibs:Depends}, network-manager-openvpn
+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.
+
Added: packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install?rev=1752&op=file
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install (added)
+++ packages/unstable/network-manager-openvpn/debian/network-manager-openvpn-gnome.install Tue Oct 2 10:38:07 2007
@@ -1,0 +1,7 @@
+usr/lib/network-manager-openvpn/*.so*
+usr/lib/network-manager-openvpn/nm-openvpn-auth-dialog
+usr/share/applications/nm-openvpn.desktop
+usr/share/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade
+usr/share/gnome-vpn-properties
+usr/share/locale
+usr/share/icons
Added: packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.install?rev=1752&op=file
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.install (added)
+++ packages/unstable/network-manager-openvpn/debian/network-manager-openvpn.install Tue Oct 2 10:38:07 2007
@@ -1,0 +1,3 @@
+etc
+usr/lib/network-manager-openvpn/nm-openvpn-service
+usr/lib/network-manager-openvpn/nm-openvpn-service-openvpn-helper
Added: packages/unstable/network-manager-openvpn/debian/patches/03_allow_servercert_override.diff
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/patches/03_allow_servercert_override.diff?rev=1752&op=file
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/patches/03_allow_servercert_override.diff (added)
+++ packages/unstable/network-manager-openvpn/debian/patches/03_allow_servercert_override.diff Tue Oct 2 10:38:07 2007
@@ -1,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 },
Added: packages/unstable/network-manager-openvpn/debian/patches/04_increase_timeout.diff
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/patches/04_increase_timeout.diff?rev=1752&op=file
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/patches/04_increase_timeout.diff (added)
+++ packages/unstable/network-manager-openvpn/debian/patches/04_increase_timeout.diff Tue Oct 2 10:38:07 2007
@@ -1,0 +1,13 @@
+Index: network-manager-openvpn/src/nm-openvpn-service.c
+===================================================================
+--- network-manager-openvpn.orig/src/nm-openvpn-service.c 2007-09-24 23:13:09.000000000 +0200
++++ network-manager-openvpn/src/nm-openvpn-service.c 2007-09-24 23:13:22.000000000 +0200
+@@ -316,7 +316,7 @@
+ g_return_if_fail (data != NULL);
+
+ if (data->helper_timer == 0)
+- data->helper_timer = g_timeout_add (10000, (GSourceFunc) nm_openvpn_helper_timer_cb, data);
++ data->helper_timer = g_timeout_add (15000, (GSourceFunc) nm_openvpn_helper_timer_cb, data);
+ }
+
+
Added: packages/unstable/network-manager-openvpn/debian/patches/05_fix_nm-vpn-properties_path.diff
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/patches/05_fix_nm-vpn-properties_path.diff?rev=1752&op=file
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/patches/05_fix_nm-vpn-properties_path.diff (added)
+++ packages/unstable/network-manager-openvpn/debian/patches/05_fix_nm-vpn-properties_path.diff Tue Oct 2 10:38:07 2007
@@ -1,0 +1,13 @@
+Index: network-manager-openvpn/nm-openvpn.desktop.in
+===================================================================
+--- network-manager-openvpn.orig/nm-openvpn.desktop.in 2007-09-24 02:05:40.000000000 +0200
++++ network-manager-openvpn/nm-openvpn.desktop.in 2007-09-24 02:04:56.000000000 +0200
+@@ -3,7 +3,7 @@
+ _Name=VPN Connection Manager (OpenVPN)
+ _GenericName=VPN Connection Manager (OpenVPN)
+ _Comment=Add, Remove, and Edit VPN Connections
+-Exec=nm-vpn-properties --import-service org.freedesktop.NetworkManager.openvpn --import-file %f
++Exec=/usr/lib/network-manager/nm-vpn-properties --import-service org.freedesktop.NetworkManager.openvpn --import-file %f
+ Icon=gnome-mime-application-x-openvpn-settings
+ Terminal=false
+ Type=Application
Added: packages/unstable/network-manager-openvpn/debian/patches/06_pull_dns_domain.diff
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/patches/06_pull_dns_domain.diff?rev=1752&op=file
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/patches/06_pull_dns_domain.diff (added)
+++ packages/unstable/network-manager-openvpn/debian/patches/06_pull_dns_domain.diff Tue Oct 2 10:38:07 2007
@@ -1,0 +1,94 @@
+diff -Nur network-manager-openvpn-0.3.2svn2855/src/nm-openvpn-service-openvpn-helper.c network-manager-openvpn-0.3.2svn2855.new/src/nm-openvpn-service-openvpn-helper.c
+--- network-manager-openvpn-0.3.2svn2855/src/nm-openvpn-service-openvpn-helper.c 2007-10-02 12:13:37.482545216 +0200
++++ network-manager-openvpn-0.3.2svn2855.new/src/nm-openvpn-service-openvpn-helper.c 2007-10-02 12:18:02.249906668 +0200
+@@ -202,7 +202,8 @@
+ const char *str_ip4_ptpaddr,
+ const char *str_ip4_netmask,
+ const GPtrArray *gpa_ip4_dns,
+- const GPtrArray *gpa_ip4_nbns
++ const GPtrArray *gpa_ip4_nbns,
++ const char *str_ip4_dnsdomain
+ )
+ {
+ DBusMessage * message;
+@@ -215,6 +216,8 @@
+ guint32 uint_ip4_dns_len = 0;
+ guint32 * uint_ip4_nbns = NULL;
+ guint32 uint_ip4_nbns_len = 0;
++ char * empty = "";
++
+ gboolean success = FALSE;
+
+ g_return_val_if_fail (con != NULL, FALSE);
+@@ -257,6 +260,7 @@
+ DBUS_TYPE_UINT32, &uint_ip4_netmask,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &uint_ip4_dns, uint_ip4_dns_len,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &uint_ip4_nbns, uint_ip4_nbns_len,
++ DBUS_TYPE_STRING, str_ip4_dnsdomain ? &str_ip4_dnsdomain : &empty,
+ DBUS_TYPE_INVALID);
+ if (dbus_connection_send (con, message, NULL))
+ success = TRUE;
+@@ -310,6 +314,7 @@
+ char *ip4_netmask = NULL;
+ GPtrArray *ip4_dns = NULL;
+ GPtrArray *ip4_nbns = NULL;
++ char *ip4_dnsdomain = NULL;
+
+ char **split = NULL;
+ char **item;
+@@ -347,7 +352,8 @@
+
+ ip4_dns = g_ptr_array_new();
+ ip4_nbns = g_ptr_array_new();
+-
++ ip4_dnsdomain = NULL;
++
+ while (1) {
+ sprintf(envname, "foreign_option_%i", i++);
+ tmp = getenv( envname );
+@@ -368,6 +374,8 @@
+ if (strcmp( split[1], "DNS") == 0) {
+ // DNS, push it!
+ g_ptr_array_add( ip4_dns, (gpointer) split[2] );
++ } else if (strcmp( split[1], "DOMAIN") == 0) {
++ ip4_dnsdomain = split[2];
+ } else if (strcmp( split[1], "WINS") == 0) {
+ // WINS, push it!
+ g_ptr_array_add( ip4_nbns, (gpointer) split[2] );
+@@ -410,7 +418,7 @@
+
+ if (!send_config_info (con, vpn_gateway, tundev,
+ ip4_address, ip4_ptp, ip4_netmask,
+- ip4_dns, ip4_nbns)) {
++ ip4_dns, ip4_nbns, ip4_dnsdomain)) {
+ exit_code = 1;
+ }
+
+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 12:13:43.190617688 +0200
++++ network-manager-openvpn-0.3.2svn2855.new/src/nm-openvpn-service.c 2007-10-02 12:13:43.490621495 +0200
+@@ -1266,6 +1266,7 @@
+ guint32 * ip4_nbns;
+ guint32 ip4_nbns_len;
+ guint32 mss;
++ char * ip4_dnsdomain;
+ gboolean success = FALSE;
+ char * empty = "";
+
+@@ -1288,6 +1289,7 @@
+ DBUS_TYPE_UINT32, &ip4_netmask,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_dns, &ip4_dns_len,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_nbns, &ip4_nbns_len,
++ DBUS_TYPE_STRING, &ip4_dnsdomain,
+ DBUS_TYPE_INVALID))
+ {
+ DBusMessage *signal;
+@@ -1310,7 +1312,7 @@
+ DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_dns, ip4_dns_len,
+ DBUS_TYPE_ARRAY, DBUS_TYPE_UINT32, &ip4_nbns, ip4_nbns_len,
+ DBUS_TYPE_UINT32, &mss,
+- DBUS_TYPE_STRING, &empty,
++ DBUS_TYPE_STRING, &ip4_dnsdomain,
+ DBUS_TYPE_STRING, &empty,
+ DBUS_TYPE_INVALID);
+
Added: packages/unstable/network-manager-openvpn/debian/patches/07_nm-openvpn-server-name.diff
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/patches/07_nm-openvpn-server-name.diff?rev=1752&op=file
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/patches/07_nm-openvpn-server-name.diff (added)
+++ packages/unstable/network-manager-openvpn/debian/patches/07_nm-openvpn-server-name.diff Tue Oct 2 10:38:07 2007
@@ -1,0 +1,11 @@
+diff -Nur network-manager-openvpn-0.3.2svn2855/nm-openvpn-service.name.in network-manager-openvpn-0.3.2svn2855.new/nm-openvpn-service.name.in
+--- network-manager-openvpn-0.3.2svn2855/nm-openvpn-service.name.in 2007-10-02 11:16:49.607279000 +0200
++++ network-manager-openvpn-0.3.2svn2855.new/nm-openvpn-service.name.in 2007-10-02 11:17:17.507633574 +0200
+@@ -4,5 +4,5 @@
+ program=@bindir@/nm-openvpn-service
+
+ [GNOME]
+-auth-dialog=@libexecdir@/nm-openvpn-auth-dialog
+-properties=@prefix@/${LIB}/libnm-openvpn-properties
++auth-dialog=@bindir@/nm-openvpn-auth-dialog
++properties=@bindir@/libnm-openvpn-properties
Modified: packages/unstable/network-manager-openvpn/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/network-manager-openvpn/debian/rules?rev=1752&op=diff
==============================================================================
--- packages/unstable/network-manager-openvpn/debian/rules (original)
+++ packages/unstable/network-manager-openvpn/debian/rules Tue Oct 2 10:38:07 2007
@@ -7,8 +7,7 @@
DEB_CONFIGURE_EXTRA_FLAGS=--bindir=/usr/lib/network-manager-openvpn --libdir=/usr/lib/network-manager-openvpn --disable-static
DEB_DH_MAKESHLIBS_ARGS_network-manager-openvpn := -n
-
-DEB_DH_SHLIBDEPS_ARGS_network-manager-openvpn := -Xnm-openvpn-auth-dialog -Xlibnm-openvpn-properties
+DEB_DH_INSTALL_SOURCEDIR := debian/tmp
makebuilddir/network-manager-openvpn:: debian/stamp-bootstrap
More information about the Pkg-utopia-commits
mailing list