From 0a328d3ccee55752906d0a186760f14cd3bfe9b8 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Mon, 11 Jan 2016 06:04:09 -0500 Subject: networkmanager-consolekit-1.0.10-2: updating version --- ...ilure-to-configure-routes-due-to-wrong-de.patch | 54 ++++++++++++++++++++++ pcr/networkmanager-consolekit/PKGBUILD | 30 +++++++----- 2 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 pcr/networkmanager-consolekit/0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch diff --git a/pcr/networkmanager-consolekit/0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch b/pcr/networkmanager-consolekit/0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch new file mode 100644 index 000000000..164b27747 --- /dev/null +++ b/pcr/networkmanager-consolekit/0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch @@ -0,0 +1,54 @@ +From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001 +From: Thomas Haller +Date: Mon, 4 Jan 2016 18:54:26 +0100 +Subject: [PATCH] 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 +--- + src/nm-ip4-config.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +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; +-- +2.6.4 + diff --git a/pcr/networkmanager-consolekit/PKGBUILD b/pcr/networkmanager-consolekit/PKGBUILD index 22b62a7be..6cc2f42c6 100644 --- a/pcr/networkmanager-consolekit/PKGBUILD +++ b/pcr/networkmanager-consolekit/PKGBUILD @@ -1,18 +1,18 @@ -# Maintainer (Arch): artoo -# Contributor (Arch): Alexey D. -# Contributor (Arch): DaZ -# Contributor (Arch): Lukas Jirkovsky -# Contributor (Arch): Jan Alexander Steffens (heftig) -# Contributor (Arch): Jan de Groot -# Contributor (Arch): Wael Nasreddine -# Contributor (Arch): Tor Krill -# Contributor (Arch): Will Rea -# Contributor (Arch): Valentine Sinitsyn +# Maintainer (Manjaro): artoo +# Contributor (Manjaro): Alexey D. +# Contributor (Manjaro): DaZ +# Contributor (Manjaro): Lukas Jirkovsky +# Contributor (Manjaro): Jan Alexander Steffens (heftig) +# Contributor (Manjaro): Jan de Groot +# Contributor (Manjaro): Wael Nasreddine +# Contributor (Manjaro): Tor Krill +# Contributor (Manjaro): Will Rea +# Contributor (Manjaro): Valentine Sinitsyn # Maintainer: Omar Vega Ramos pkgname=networkmanager-consolekit _pkgname=NetworkManager -pkgver=1.0.8 +pkgver=1.0.10 pkgrel=2 _pppver=2.4.7 pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems" @@ -36,12 +36,14 @@ conflicts=('networkmanager') backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz" + '0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch' 'disable_set_hostname.patch' 'NetworkManager.conf' '01-org.freedesktop.ModemManager1.rules' '01-org.freedesktop.NetworkManager.settings.modify.system.rules' '50-org.freedesktop.NetworkManager.rules') -sha256sums=('8bb128950f8a79ff881afadb46dd55e16f952390cf7cb4e06063431e5144937f' +sha256sums=('1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc' + '27d84d45046826a25e861a126099d9ad39e84408530c1bb898287e4543eb84f7' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3' '17b5e3ead960a0d2c3cea3f1549d1e83ada9600f174ab9a96f083abe6d8f962d' @@ -49,8 +51,12 @@ sha256sums=('8bb128950f8a79ff881afadb46dd55e16f952390cf7cb4e06063431e5144937f' '02d9f7d836d297d6ddf39482d86a8573b3e41735b408aa2cd6df22048ec5f6c4') prepare() { + mkdir path + ln -s /usr/bin/python2 path/python + cd $_pkgname-$pkgver + patch -Np1 -i ../0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch patch -Np1 -i ../disable_set_hostname.patch NOCONFIGURE=1 ./autogen.sh } -- cgit v1.2.3-54-g00ecf