diff options
author | Pacho Ramos <pacho@gentoo.org> | 2016-07-09 20:37:40 +0200 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2016-07-09 20:39:29 +0200 |
commit | 5f1ed4ef8ff99ac6d8814f38d4f817a9425fd776 (patch) | |
tree | 289defbd7d2592639d46bb79d77a2b73e3029634 /net-misc/networkmanager/files | |
parent | kde-apps/marble: Restrict tests (diff) | |
download | gentoo-5f1ed4ef8ff99ac6d8814f38d4f817a9425fd776.tar.gz gentoo-5f1ed4ef8ff99ac6d8814f38d4f817a9425fd776.tar.bz2 gentoo-5f1ed4ef8ff99ac6d8814f38d4f817a9425fd776.zip |
net-misc/networkmanager: Drop old
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-misc/networkmanager/files')
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch | 51 | ||||
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch | 53 |
2 files changed, 0 insertions, 104 deletions
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch b/net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch deleted file mode 100644 index b7c2be695a0f..000000000000 --- a/net-misc/networkmanager/files/networkmanager-1.0.10-vpn-routes.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001 -From: Thomas Haller <thaller@redhat.com> -Date: Mon, 4 Jan 2016 18:54:26 +0100 -Subject: core: fix failure to configure routes due to wrong device-route for - IPv4 peer-addresses - -As in the case of a OpenVPN connection, we might add an address like: - 10.8.0.58/32 ptp 10.8.0.57 - -In this case, kernel would automatically add a device-route like: - 10.8.0.57/32 via 0.0.0.0 dev 32 metric 0 mss 0 src rtprot-kernel scope link pref-src 10.8.0.58 - -nm_ip4_config_commit() checks all IP addresses to figure out -the present device-routes. Then the routes are synced by NMRouteManager. -Due to a bug, we would not consider the peer-address, but the local-address -and configure a route 10.8.0.58/32, instead of 10.8.0.57/32. - -That stays mostly unnoticed, because usually the peer and the local-address are -in the same subnet, so that there is no difference (/32 is an example of the -peer-address being in a different subnet). - -It also seems that due to a bug fixed by df4e5357521 this issue didn't surface. -Probably because we would not notice the 10.8.0.57/32 right away and thus -nm_route_manager_ip4_route_sync() would not wrongly delete it. - -https://bugzilla.gnome.org/show_bug.cgi?id=759892 - -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809195 -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809494 -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=809526 -https://bugs.archlinux.org/task/47535 -https://bugzilla.redhat.com/show_bug.cgi?id=1294309 -https://mail.gnome.org/archives/networkmanager-list/2015-December/msg00059.html - -diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c -index f625d35..61e29af 100644 ---- a/src/nm-ip4-config.c -+++ b/src/nm-ip4-config.c -@@ -298,7 +298,8 @@ nm_ip4_config_commit (const NMIP4Config *config, int ifindex, gboolean routes_fu - - route.ifindex = ifindex; - route.source = NM_IP_CONFIG_SOURCE_KERNEL; -- route.network = nm_utils_ip4_address_clear_host_address (addr->address, addr->plen); -+ route.network = nm_utils_ip4_address_clear_host_address (addr->peer_address ? : addr->address, -+ addr->plen); - route.plen = addr->plen; - route.pref_src = addr->address; - route.metric = default_route_metric; --- -cgit v0.10.2 - diff --git a/net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch b/net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch deleted file mode 100644 index 6159972cb767..000000000000 --- a/net-misc/networkmanager/files/networkmanager-1.0.6-vpn-mtu.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 105e30efbaf422401902575749efdcd18706ace1 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel <lkundrak@v3.sk> -Date: Mon, 28 Sep 2015 20:57:09 +0200 -Subject: vpn-connection: set the MTU for the VPN IP interface - -The 9b79e6c73 commit moved setting of the MTU from IP4Config to NMDevice, but -VPN connections don't have a NMDevice instance (yet). Set the MTU also from the -VPN connection. Also, copying of the MTU to the IP4Config is no longer needed -as the ip4_config_commit no longer sets the MTU. - -Fixes: 9b79e6c732ffb2fb105647c1465070d36a6cc180 - -https://bugzilla.gnome.org/show_bug.cgi?id=754781 -(cherry picked from commit e0fa48f224abcb73a1a129f10050f7cd942ee629) - -diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c -index f0e6149..e2d3103 100644 ---- a/src/vpn-manager/nm-vpn-connection.c -+++ b/src/vpn-manager/nm-vpn-connection.c -@@ -980,6 +980,9 @@ nm_vpn_connection_apply_config (NMVpnConnection *connection) - TRUE)) - return FALSE; - } -+ -+ if (priv->mtu && priv->mtu != nm_platform_link_get_mtu (NM_PLATFORM_GET, priv->ip_ifindex)) -+ nm_platform_link_set_mtu (NM_PLATFORM_GET, priv->ip_ifindex, priv->mtu); - } - - apply_parent_device_config (connection); -@@ -1149,10 +1152,6 @@ process_generic_config (NMVpnConnection *connection, - } - } - -- /* MTU; this is a per-connection value, though NM's API treats it -- * like it's IP4-specific. So we store it for now and retrieve it -- * later in ip4_config_get. -- */ - priv->mtu = 0; - val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_CONFIG_MTU); - if (val) { -@@ -1328,9 +1327,6 @@ nm_vpn_connection_ip4_config_get (DBusGProxy *proxy, - if (val) - nm_ip4_config_set_mss (config, g_value_get_uint (val)); - -- if (priv->mtu) -- nm_ip4_config_set_mtu (config, priv->mtu, NM_IP_CONFIG_SOURCE_VPN); -- - val = (GValue *) g_hash_table_lookup (config_hash, NM_VPN_PLUGIN_IP4_CONFIG_DOMAIN); - if (val) - nm_ip4_config_add_domain (config, g_value_get_string (val)); --- -cgit v0.10.2 - |