New upstream version

3 files changed, 11 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d9f56bd24c62..6bd6fe4979d2 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.6.2
+	pkgver = 1.8.0
 	pkgrel = 2
 	url = https://wiki.gnome.org/Projects/NetworkManager
 	arch = i686
@@ -32,20 +32,19 @@ pkgbase = networkmanager-noscan
 	makedepends = perl-yaml
 	makedepends = python-gobject
 	makedepends = git
-	makedepends = vala
 	makedepends = jansson
 	makedepends = bluez-libs
 	makedepends = glib2-docs
 	provides = networkmanager
 	conflicts = networkmanager
 	replaces = networkmanager
-	source = git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=037a12f96eff09aa48481fda7ea602a3388afc74
+	source = git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=9c3df9caa3296a55fe54e6aa02fe8a11b27deaba
 	source = NetworkManager.conf
 	source = 20-connectivity.conf
 	source = disable_wifi_scan_when_connected.patch
 	sha256sums = SKIP
 	sha256sums = dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec
-	sha256sums = 1961f50c8ed2668052bb543a29a11ccf8a5a1226473234a915aa139ceb32d472
+	sha256sums = 477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6
 	sha256sums = 3dfabdccd97074c948c924ece87935576e64675bdfef478e800a6da882861c2d
 
 pkgname = networkmanager-noscan
@@ -58,6 +57,7 @@ pkgname = networkmanager-noscan
 	depends = libnewt
 	depends = libndp
 	depends = libteam
+	depends = curl
 	depends = bluez-libs
 	optdepends = dnsmasq: connection sharing
 	optdepends = bluez: Bluetooth support
diff --git a/20-connectivity.conf b/20-connectivity.conf
index 7c58de654002..9631eabdfef3 100644
--- a/20-connectivity.conf
+++ b/20-connectivity.conf
@@ -1,2 +1,2 @@
 [connectivity]
-uri=http://pkgbuild.com/check_network_status.txt
+uri=http://www.archlinux.org/check_network_status.txt
diff --git a/PKGBUILD b/PKGBUILD
index c5198f04ec7d..e960bf0809fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=networkmanager-noscan
 provides=('networkmanager')
 replaces=('networkmanager')
 conflicts=('networkmanager')
-pkgver=1.6.2
+pkgver=1.8.0
 pkgrel=2
 pkgdesc="Network Management daemon with Wi-Fi scanning disabled when already connected (improves reliability of the connection in several Wireless
 cards)"
@@ -16,16 +16,16 @@ url="https://wiki.gnome.org/Projects/NetworkManager"
 _pppver=2.4.7
 makedepends=(intltool dhclient iptables gobject-introspection gtk-doc "ppp=$_pppver" modemmanager
              dbus-glib iproute2 nss polkit wpa_supplicant libsoup systemd libgudev libmm-glib
-             libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
+             libnewt libndp libteam vala perl-yaml python-gobject git jansson bluez-libs
              glib2-docs)
 checkdepends=(libx11 python-dbus)
-_commit=037a12f96eff09aa48481fda7ea602a3388afc74  # tags/1.6.2^0
+_commit=9c3df9caa3296a55fe54e6aa02fe8a11b27deaba  # tags/1.8.0^0
 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'
-            '1961f50c8ed2668052bb543a29a11ccf8a5a1226473234a915aa139ceb32d472'
+            '477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6'
             '3dfabdccd97074c948c924ece87935576e64675bdfef478e800a6da882861c2d')
 
 prepare() {
@@ -38,7 +38,7 @@ prepare() {
 
 pkgver() {
   cd NetworkManager
-  git describe | sed 's/-dev/dev/;s/-/+/g'
+  git describe | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g'
 }
 
 build() {
@@ -110,8 +110,7 @@ build() {
 }
 
 package() {
-  depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib libnewt libndp libteam
-           bluez-libs)
+  depends=(libnm-glib iproute2 polkit wpa_supplicant libsoup libmm-glib libnewt libndp libteam	curl bluez-libs)
   optdepends=('dnsmasq: connection sharing'
               'bluez: Bluetooth support'
               'openresolv: resolvconf support'