Hello community, here is the log from the commit of package NetworkManager for openSUSE:12.1:Update:Test checked in at 2011-12-21 18:31:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/NetworkManager (Old) and /work/SRC/openSUSE:12.1:Update:Test/.NetworkManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1:Update:Test/NetworkManager/NetworkManager.changes 2011-12-01 16:54:20.000000000 +0100 +++ /work/SRC/openSUSE:12.1:Update:Test/.NetworkManager.new/NetworkManager.changes 2011-12-21 18:31:32.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 29 15:37:53 UTC 2011 - [email protected] + +- Add nm-ignore-virtual-ifindex.patch to fix nortelvpn + (bnc#730674) + +------------------------------------------------------------------- New: ---- nm-ignore-virtual-ifindex.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.7sL7nr/_old 2011-12-21 18:31:32.000000000 +0100 +++ /var/tmp/diff_new_pack.7sL7nr/_new 2011-12-21 18:31:32.000000000 +0100 @@ -43,6 +43,8 @@ Patch5: nm-handle-uchar-array-properly.patch # PATCH-FIX-UPSTREAM nm-probe-radius-server-cert.patch bnc#574266 [email protected] -- Probe the RADIUS server certificate Patch6: nm-probe-radius-server-cert.patch +# PATCH-FIX-UPSTREAM nm-ignore-virtual-ifindex.patch bnc#730674 [email protected] -- Fix nortelvpn +Patch7: nm-ignore-virtual-ifindex.patch BuildRequires: fdupes BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -145,6 +147,7 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 %build #NOCONFIGURE=1 ./autogen.sh ++++++ nm-ignore-virtual-ifindex.patch ++++++ Index: NetworkManager-0.9.1.90/src/nm-device.c =================================================================== --- NetworkManager-0.9.1.90.orig/src/nm-device.c +++ NetworkManager-0.9.1.90/src/nm-device.c @@ -412,7 +412,7 @@ nm_device_set_ip_iface (NMDevice *self, priv->ip_iface = g_strdup (iface); if (priv->ip_iface) { priv->ip_ifindex = nm_netlink_iface_to_index (priv->ip_iface); - if (!priv->ip_ifindex) { + if (priv->ip_ifindex < 0) { nm_log_warn (LOGD_HW, "(%s): failed to look up interface index", iface); } } Index: NetworkManager-0.9.1.90/src/vpn-manager/nm-vpn-connection.c =================================================================== --- NetworkManager-0.9.1.90.orig/src/vpn-manager/nm-vpn-connection.c +++ NetworkManager-0.9.1.90/src/vpn-manager/nm-vpn-connection.c @@ -428,9 +428,8 @@ nm_vpn_connection_ip4_config_get (DBusGP /* Grab the interface index for address/routing operations */ priv->ip_ifindex = nm_netlink_iface_to_index (priv->ip_iface); - if (!priv->ip_ifindex) { - nm_log_err (LOGD_VPN, "(%s): failed to look up VPN interface index", priv->ip_iface); - goto error; + if (priv->ip_ifindex < 0) { + nm_log_warn (LOGD_VPN, "(%s): failed to look up VPN interface index", priv->ip_iface); } addr = nm_ip4_address_new (); @@ -540,7 +539,12 @@ nm_vpn_connection_ip4_config_get (DBusGP nm_system_iface_set_up (priv->ip_ifindex, TRUE, NULL); - if (nm_system_apply_ip4_config (priv->ip_ifindex, config, 0, NM_IP4_COMPARE_FLAG_ALL)) { + /* NOTE: + * Strongswan or Novell VPN doesn't use any tundev or ipsec + * network devices, but handles encryption transparently in + * the networking stack, so need ignore the configuration */ + if (priv->ip_ifindex <= 0 || + nm_system_apply_ip4_config (priv->ip_ifindex, config, 0, NM_IP4_COMPARE_FLAG_ALL)) { NMDnsManager *dns_mgr; /* Add any explicit route to the VPN gateway through the parent device */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
