diff options
Diffstat (limited to 'pcr/networkmanager-consolekit')
3 files changed, 4 insertions, 69 deletions
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 deleted file mode 100644 index 164b27747..000000000 --- a/pcr/networkmanager-consolekit/0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch +++ /dev/null @@ -1,54 +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: [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/01-org.freedesktop.ModemManager1.rules b/pcr/networkmanager-consolekit/01-org.freedesktop.ModemManager1.rules deleted file mode 100644 index 6df2427c5..000000000 --- a/pcr/networkmanager-consolekit/01-org.freedesktop.ModemManager1.rules +++ /dev/null @@ -1,6 +0,0 @@ -polkit.addRule(function(action, subject) { - if (/^org\.freedesktop\.ModemManager1\.(Device\.Control|Contacts|Messaging|Location)$/.test(action.id) && - subject.isInGroup("network")) { - return "yes"; - } -}); diff --git a/pcr/networkmanager-consolekit/PKGBUILD b/pcr/networkmanager-consolekit/PKGBUILD index 6cc2f42c6..b9a61fb35 100644 --- a/pcr/networkmanager-consolekit/PKGBUILD +++ b/pcr/networkmanager-consolekit/PKGBUILD @@ -12,8 +12,8 @@ pkgname=networkmanager-consolekit _pkgname=NetworkManager -pkgver=1.0.10 -pkgrel=2 +pkgver=1.0.12 +pkgrel=1 _pppver=2.4.7 pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems" arch=('i686' 'x86_64') @@ -36,17 +36,13 @@ 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=('1bcfce8441dfd9f432a100d06b54f3831a2275cccc3b74b1b4c09a011e179fbc' - '27d84d45046826a25e861a126099d9ad39e84408530c1bb898287e4543eb84f7' +sha256sums=('3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e' '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460' '759db295ddae7a6dc6b29211fc0ec08695f875584d456dd146d3679e2c33e2e3' - '17b5e3ead960a0d2c3cea3f1549d1e83ada9600f174ab9a96f083abe6d8f962d' '4b815f43de58379e68653d890f529485aec4d2f83f11d050b08b31489d2267c2' '02d9f7d836d297d6ddf39482d86a8573b3e41735b408aa2cd6df22048ec5f6c4') @@ -56,7 +52,6 @@ prepare() { 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 } @@ -110,7 +105,7 @@ package() { rm -r "${pkgdir}/var/run" install -dm 750 -o polkitd "${pkgdir}"/usr/share/polkit-1/rules.d - install -m 644 ${srcdir}/01-org.freedesktop.ModemManager1.rules $pkgdir/usr/share/polkit-1/rules.d/ + install -m 644 ${srcdir}/01-org.freedesktop.NetworkManager.settings.modify.system.rules $pkgdir/usr/share/polkit-1/rules.d/ install -m 644 ${srcdir}/50-org.freedesktop.NetworkManager.rules $pkgdir/usr/share/polkit-1/rules.d/ |