Upgraded to 1.10

3 files changed, 23 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed1403211d2d..09589322b399 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = networkmanager-noscan
 	pkgdesc = Network Management daemon with Wi-Fi scanning disabled when already connected (improves reliability of the connection in several Wireless cards)
-	pkgver = 1.8.4
+	pkgver = 1.10.1dev+58+gd5dc3df20
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/NetworkManager
 	arch = i686
@@ -38,14 +38,14 @@ pkgbase = networkmanager-noscan
 	provides = networkmanager
 	conflicts = networkmanager
 	replaces = networkmanager
-	source = git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=51fdc50ab179a0582012d1b50e587761765ad15e
+	source = git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=d5dc3df20c742cbd196d3047767f99d0d7c2c5ca
 	source = NetworkManager.conf
 	source = 20-connectivity.conf
 	source = disable_wifi_scan_when_connected.patch
 	sha256sums = SKIP
 	sha256sums = dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec
 	sha256sums = 477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6
-	sha256sums = 3dfabdccd97074c948c924ece87935576e64675bdfef478e800a6da882861c2d
+	sha256sums = 50bc08476f9c799032230b909c4bdce58726f83cfc654aa3835c17ac99e500cc
 
 pkgname = networkmanager-noscan
 	depends = libnm-glib
diff --git a/PKGBUILD b/PKGBUILD
index 6b7badfec461..a48c911b9fe7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=networkmanager-noscan
 provides=('networkmanager')
 replaces=('networkmanager')
 conflicts=('networkmanager')
-pkgver=1.8.4
+pkgver=1.10.1dev+58+gd5dc3df20
 pkgrel=1
 pkgdesc="Network Management daemon with Wi-Fi scanning disabled when already connected (improves reliability of the connection in several Wireless cards)"
 arch=(i686 x86_64)
@@ -18,14 +18,14 @@ makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_ppp
              libnewt libndp libteam vala perl-yaml python-gobject git jansson bluez-libs
              glib2-docs)
 checkdepends=(libx11 python-dbus)
-_commit=51fdc50ab179a0582012d1b50e587761765ad15e  # tags/1.8.4^0
+_commit=d5dc3df20c742cbd196d3047767f99d0d7c2c5ca  # nm-1-10
 source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit"
         NetworkManager.conf 20-connectivity.conf
         disable_wifi_scan_when_connected.patch)
 sha256sums=('SKIP'
             'dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec'
             '477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6'
-            '3dfabdccd97074c948c924ece87935576e64675bdfef478e800a6da882861c2d')
+            '50bc08476f9c799032230b909c4bdce58726f83cfc654aa3835c17ac99e500cc')
 
 prepare() {
   mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
diff --git a/disable_wifi_scan_when_connected.patch b/disable_wifi_scan_when_connected.patch
index 8fc66482af7c..b4188ef98aae 100644
--- a/disable_wifi_scan_when_connected.patch
+++ b/disable_wifi_scan_when_connected.patch
@@ -1,23 +1,18 @@
---- NetworkManager-1.2.0.orig/src/devices/wifi/nm-device-wifi.c	
-2015-02-09 09:44:12.098688713 +0100
-+++ NetworkManager-1.2.0/src/devices/wifi/nm-device-wifi.c	
-2015-02-09 09:44:45.430954930 +0100
-@@ -1362,15 +1362,13 @@
- 	case NM_DEVICE_STATE_IP_CHECK:
- 	case NM_DEVICE_STATE_SECONDARIES:
- 	case NM_DEVICE_STATE_DEACTIVATING:
--		/* Don't scan when unusable or activating */
-+	case NM_DEVICE_STATE_ACTIVATED:
-+		/* Don't scan when unusable, or activating, or activated */
- 		return FALSE;
- 	case NM_DEVICE_STATE_DISCONNECTED:
- 	case NM_DEVICE_STATE_FAILED:
- 		/* Can always scan when disconnected */
- 		return TRUE;
--	case NM_DEVICE_STATE_ACTIVATED:
--		/* Need to do further checks when activated */
--		break;
- 	}
- 
- 	/* Don't scan if the supplicant is busy */
+--- a/src/devices/wifi/nm-device-wifi.c
++++ b/src/devices/wifi/nm-device-wifi.c
+@@ -1364,13 +1364,8 @@ scanning_prohibited (NMDeviceWifi *self,
+    /* Can always scan when disconnected */
+    return FALSE;
+  case NM_DEVICE_STATE_ACTIVATED:
+-   /* Prohibit periodic scans when connected; we ask the supplicant to
+-    * background scan for us, unless the connection is locked to a specifc
+-    * BSSID.
+-    */
+-   if (periodic)
+-     return TRUE;
+-   break;
++   /* Prohibit periodic scans when connected */
++   return TRUE;
+  }
 
+  /* Prohibit scans if the supplicant is busy */