Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=6cf2724b96fb123e308a99ae7d7bb1c8ab909b0e
commit 6cf2724b96fb123e308a99ae7d7bb1c8ab909b0e Author: crazy <[email protected]> Date: Wed Apr 27 18:18:14 2016 +0200 networkmanager-1.2.0-1-x86_64 * Version bump * kill not used patch diff --git a/source/base/networkmanager/FrugalBuild b/source/base/networkmanager/FrugalBuild index 71ae7ef..a29eb86 100644 --- a/source/base/networkmanager/FrugalBuild +++ b/source/base/networkmanager/FrugalBuild @@ -6,7 +6,7 @@ pkgname=networkmanager _F_gnome_name=NetworkManager _F_gnome_ext=.tar.xz _F_gnome_devel="y" -pkgver=1.1.94 +pkgver=1.2.0 pkgrel=1 pkgdesc="Network Management daemon" depends=('wireless_tools>=29-4' 'iproute2>=4.3.0-2' 'nss>=3.21-2' 'libgcrypt>=1.6.4-3' \ @@ -15,13 +15,12 @@ depends=('wireless_tools>=29-4' 'iproute2>=4.3.0-2' 'nss>=3.21-2' 'libgcrypt>=1. makedepends=('perl-xml-parser' 'intltool' 'gobject-introspection' 'dhcpcd' 'dhclient>=4.3.3' 'ppp>=2.4.7-2') rodepends=('mobile-broadband-provider-info') ## some 4G modems won't work without groups=('base') -archs=('i686' 'x86_64' 'arm') +archs=('i686' 'x86_64') _F_gnome_devel="y" Finclude gnome -#source=($source bug759892-fix.patch) options+=('scriptlet') backup=('etc/NetworkManager/NetworkManager.conf') -sha1sums=('822a9524d180c46933399127cfb6eb97e938136b') +sha1sums=('667090038f502d3ce4f3d870b30fa2764111508c') _F_cd_path=$_F_gnome_name-$pkgver replaces=('nm-openconnect') diff --git a/source/base/networkmanager/bug759892-fix.patch b/source/base/networkmanager/bug759892-fix.patch deleted file mode 100644 index b7c2be6..0000000 --- a/source/base/networkmanager/bug759892-fix.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 11aa07ed939193e85516c287a57dee1837242972 Mon Sep 17 00:00:00 2001 -From: Thomas Haller <[email protected]> -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 - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
