Hello community, here is the log from the commit of package NetworkManager-openvpn checked in at Fri Mar 31 15:25:21 CEST 2006. -------- --- NetworkManager-openvpn/NetworkManager-openvpn.changes 2006-03-20 21:50:57.000000000 +0100 +++ NetworkManager-openvpn/NetworkManager-openvpn.changes 2006-03-29 21:22:50.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Mar 29 21:22:25 CEST 2006 - rml@suse.de + +- Send per-route MSS information to NetworkManager (bug #157988) + +------------------------------------------------------------------- New: ---- nm-openvpn-0.6-branch.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager-openvpn.spec ++++++ --- /var/tmp/diff_new_pack.l0NARQ/_old 2006-03-31 15:25:11.000000000 +0200 +++ /var/tmp/diff_new_pack.l0NARQ/_new 2006-03-31 15:25:11.000000000 +0200 @@ -17,13 +17,14 @@ %define sysconfdir /etc Summary: NetworkManager VPN support for OpenVPN Version: 0.3.2cvs20060202 -Release: 8 +Release: 10 License: GPL Group: Productivity/Networking/System URL: http://www.gnome.org/projects/NetworkManager Source0: %{name}-%{version}.tar.gz Source1: gnome-mime-application-x-openvpn-settings.png Patch0: nm-openvpn-desktop.patch +Patch1: nm-openvpn-0.6-branch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: openvpn NetworkManager NetworkManager-gnome @@ -39,7 +40,8 @@ %prep %setup -q -%patch0 +%patch0 -p0 +%patch1 -p1 %build autoreconf -f -i @@ -86,6 +88,8 @@ /opt/gnome/share/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png %changelog -n NetworkManager-openvpn +* Wed Mar 29 2006 - rml@suse.de +- Send per-route MSS information to NetworkManager (bug #157988) * Mon Mar 20 2006 - rml@suse.de - Require NetworkManager-gnome (Novell bug #158691) * Thu Feb 02 2006 - rml@suse.de ++++++ nm-openvpn-0.6-branch.patch ++++++ diff -urN NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service.c NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service.c --- NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service.c 2006-01-16 17:58:12.000000000 -0500 +++ NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service.c 2006-03-29 14:24:25.000000000 -0500 @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * $Id: nm-openvpn-service.c,v 1.9 2006/01/16 22:58:12 dcbw Exp $ + * $Id: nm-openvpn-service.c,v 1.10.2.2 2006/03/29 19:24:25 rml Exp $ * */ @@ -1007,6 +1007,8 @@ int num_items = -1; char ** password_items = NULL; int num_passwords = -1; + char ** user_routes = NULL; + int user_routes_count = -1; const char * name = NULL; const char * user_name = NULL; DBusError error; @@ -1024,6 +1026,7 @@ DBUS_TYPE_STRING, &user_name, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &password_items, &num_passwords, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &data_items, &num_items, + DBUS_TYPE_ARRAY, DBUS_TYPE_STRING, &user_routes, &user_routes_count, DBUS_TYPE_INVALID)) { nm_warning ("Could not process the request because its arguments were invalid. dbus said: '%s'", error.message); @@ -1047,6 +1050,8 @@ out: dbus_free_string_array (data_items); + dbus_free_string_array (password_items); + dbus_free_string_array (user_routes); if (!success) nm_openvpn_set_state (data, NM_VPN_STATE_STOPPED); return success; @@ -1240,6 +1245,7 @@ guint32 ip4_dns_len; guint32 * ip4_nbns; guint32 ip4_nbns_len; + guint32 mss; gboolean success = FALSE; char * empty = ""; @@ -1272,6 +1278,9 @@ goto out; } + /* OpenVPN does not care about the MSS */ + mss = 0; + dbus_message_append_args (signal, DBUS_TYPE_UINT32, &ip4_vpn_gateway, DBUS_TYPE_STRING, &tundev, @@ -1280,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_UINT32, &mss, DBUS_TYPE_STRING, &empty, DBUS_TYPE_STRING, &empty, DBUS_TYPE_INVALID); diff -urN NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service-openvpn-helper.c NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c --- NetworkManager-openvpn-0.3.2cvs20060202/src/nm-openvpn-service-openvpn-helper.c 2006-01-16 17:58:12.000000000 -0500 +++ NetworkManager-0.6-branch/vpn-daemons/openvpn/src/nm-openvpn-service-openvpn-helper.c 2006-03-30 12:20:57.000000000 -0500 @@ -21,7 +21,7 @@ * (C) Copyright 2005 Red Hat, Inc. * (C) Copyright 2005 Tim Niemueller * - * $Id: nm-openvpn-service-openvpn-helper.c,v 1.6 2006/01/16 22:58:12 dcbw Exp $ + * $Id: nm-openvpn-service-openvpn-helper.c,v 1.6.2.1 2006/03/30 17:20:57 rml Exp $ * */ @@ -175,7 +175,7 @@ goto out; } - if (! ipstr_to_uint32 (str_ip4_ptpaddr, &uint_ip4_ptpaddr) ) { + if (str_ip4_ptpaddr && ! ipstr_to_uint32 (str_ip4_ptpaddr, &uint_ip4_ptpaddr) ) { nm_warning ("nm-openvpn-service-openvpn-helper didn't receive a valid PtP IP4 Address from openvpn."); send_config_error (con, "IP4 PtP Address"); goto out; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...