[arch-commits] Commit in networkmanager/trunk (3 files)
Jan Steffens
heftig at archlinux.org
Fri Apr 1 23:44:51 UTC 2016
Date: Saturday, April 2, 2016 @ 01:44:50
Author: heftig
Revision: 263738
1.0.12
Modified:
networkmanager/trunk/PKGBUILD
Deleted:
networkmanager/trunk/0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
networkmanager/trunk/networkmanager.install
-----------------------------------------------------------------+
0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch | 54 ----------
PKGBUILD | 22 +---
networkmanager.install | 9 -
3 files changed, 6 insertions(+), 79 deletions(-)
Deleted: 0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
===================================================================
--- 0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch 2016-04-01 22:12:59 UTC (rev 263737)
+++ 0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch 2016-04-01 23:44:50 UTC (rev 263738)
@@ -1,54 +0,0 @@
-From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001
-From: Thomas Haller <thaller at redhat.com>
-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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-04-01 22:12:59 UTC (rev 263737)
+++ PKGBUILD 2016-04-01 23:44:50 UTC (rev 263738)
@@ -8,8 +8,8 @@
pkgbase=networkmanager
pkgname=(networkmanager libnm-glib)
-pkgver=1.0.10
-pkgrel=2
+pkgver=1.0.12
+pkgrel=1
pkgdesc="Network Management daemon"
arch=(i686 x86_64)
license=(GPL2 LGPL2.1)
@@ -18,30 +18,22 @@
makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver"
modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant libsoup
systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala perl-yaml
- python2-gobject)
-checkdepends=(libx11 python2-dbus)
-#_commit=ba46efd07777350be737dbdac9df9becb86e8f77
-#source=("git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=$_commit"
+ python-gobject)
+checkdepends=(libx11 python-dbus)
source=(https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
- 0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc'
- '27d84d45046826a25e861a126099d9ad39e84408530c1bb898287e4543eb84f7'
+sha256sums=('3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e'
'2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
'25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
prepare() {
- mkdir path
- ln -s /usr/bin/python2 path/python
-
cd NetworkManager-$pkgver
- patch -Np1 -i ../0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch
patch -Np1 -i ../disable_set_hostname.patch
+ 2to3 -w libnm src tools
NOCONFIGURE=1 ./autogen.sh
}
build() {
- export PATH="$srcdir/path:$PATH"
cd NetworkManager-$pkgver
./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -73,7 +65,6 @@
}
check() {
- export PATH="$srcdir/path:$PATH"
cd NetworkManager-$pkgver
make -k check
}
@@ -87,7 +78,6 @@
'ppp: dialup connection support'
'rp-pppoe: ADSL support'
'modemmanager: cellular network support')
- install=networkmanager.install
backup=('etc/NetworkManager/NetworkManager.conf')
cd NetworkManager-$pkgver
Deleted: networkmanager.install
===================================================================
--- networkmanager.install 2016-04-01 22:12:59 UTC (rev 263737)
+++ networkmanager.install 2016-04-01 23:44:50 UTC (rev 263738)
@@ -1,9 +0,0 @@
-post_upgrade() {
- (( $(vercmp $2 0.8.3) < 0 )) && cat <<MSG
-ATTENTION:
- /etc/NetworkManager/nm-system-settings.conf has been replaced
- by /etc/NetworkManager/NetworkManager.conf. Make sure you move
- any custom settings to the new config file.
-MSG
- true
-}
More information about the arch-commits
mailing list