version 1.10.6-1

3 files changed, 7 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ff98ca0c586d..9484b5dbb1e1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Feb 16 06:49:12 UTC 2018
+# Wed Mar 21 05:40:06 UTC 2018
 pkgbase = networkmanager-consolekit
 	pkgdesc = NetworkManager with ConsoleKit support for non-systemd systems and user applications
-	pkgver = 1.10.5dev+3+g5159c34ea
+	pkgver = 1.10.6
 	pkgrel = 1
 	url = https://wiki.gnome.org/Projects/NetworkManager
 	install = networkmanager.install
@@ -25,7 +25,7 @@ pkgbase = networkmanager-consolekit
 	makedepends = jansson
 	makedepends = glib2-docs
 	makedepends = dhcpcd
-	depends = libnm-glib>=1.10.5dev+3+g5159c34ea
+	depends = libnm-glib>=1.10.6
 	depends = iproute2
 	depends = polkit-consolekit
 	depends = consolekit
@@ -44,17 +44,15 @@ pkgbase = networkmanager-consolekit
 	optdepends = bluez: bluetooth support
 	optdepends = openresolv: resolvconf support
 	optdepends = ppp: dialup connection support
-	provides = networkmanager=1.10.5dev+3+g5159c34ea
+	provides = networkmanager=1.10.6
 	conflicts = networkmanager
 	replaces = networkmanager
 	backup = etc/NetworkManager/NetworkManager.conf
-	source = git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=5159c34ea8923bf0c17fd31e183c5803b72b97f3
-	source = 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
+	source = git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=dd8cf21cea13fa1bbee11fd3e0e7519e4b4ba712
 	source = NetworkManager.conf
 	source = networkmanager.rc
 	source = 20-connectivity.conf
 	sha256sums = SKIP
-	sha256sums = 9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0
 	sha256sums = 535f9c54ee29c35ca7b44c15f8de2e781c10d6f3324338c483bef360ad777efc
 	sha256sums = e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc
 	sha256sums = 477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6
diff --git a/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch b/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
deleted file mode 100644
index 78726f824942..000000000000
--- a/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0acfc3e775b7ea3fccefd48f90644ef85fd76b3b Mon Sep 17 00:00:00 2001
-Message-Id: <0acfc3e775b7ea3fccefd48f90644ef85fd76b3b.1515702272.git.jan.steffens@gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 11 Jan 2018 21:23:38 +0100
-Subject: [PATCH] nmp-netns: Mount /proc in the new namespace
-
-The /proc inherited from the parent namespace might be read-only.
----
- src/platform/nmp-netns.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c
-index e31c881d6..7ec647241 100644
---- a/src/platform/nmp-netns.c
-+++ b/src/platform/nmp-netns.c
-@@ -503,12 +503,24 @@ nmp_netns_new (void)
- 		goto err_out;
- 	}
- 
-+	if (umount2 ("/proc", MNT_DETACH) != 0) {
-+		errsv = errno;
-+		_LOGE (NULL, "failed umount /proc: %s", g_strerror (errsv));
-+		goto err_out;
-+	}
-+
- 	if (mount ("sysfs", "/sys", "sysfs", 0, NULL) != 0) {
- 		errsv = errno;
- 		_LOGE (NULL, "failed mount /sys: %s", g_strerror (errsv));
- 		goto err_out;
- 	}
- 
-+	if (mount ("proc", "/proc", "proc", 0, NULL) != 0) {
-+		errsv = errno;
-+		_LOGE (NULL, "failed mount /proc: %s", g_strerror (errsv));
-+		goto err_out;
-+	}
-+
- 	self = _netns_new (&error);
- 	if (!self) {
- 		errsv = errno;
--- 
-2.15.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 5f7021aa4e6c..627711eb3006 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@
 # Contributor: Chris Cromer <chris@cromer.cl>
 
 pkgname=networkmanager-consolekit
-pkgver=1.10.5dev+3+g5159c34ea
+pkgver=1.10.6
 pkgrel=1
 _pppver=2.4.7
 pkgdesc="NetworkManager with ConsoleKit support for non-systemd systems and user applications"
@@ -36,16 +36,14 @@ conflicts=('networkmanager')
 backup=('etc/NetworkManager/NetworkManager.conf')
 groups=('gnome')
 install=networkmanager.install
-_commit=5159c34ea8923bf0c17fd31e183c5803b72b97f3  # nm-1-10
+_commit=dd8cf21cea13fa1bbee11fd3e0e7519e4b4ba712  # tags/1.10.6^0
 source=(#https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
         "git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit"
-        0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
         NetworkManager.conf
         networkmanager.rc
         20-connectivity.conf
         )
 sha256sums=('SKIP'
-            '9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0'
             '535f9c54ee29c35ca7b44c15f8de2e781c10d6f3324338c483bef360ad777efc'
             'e39a2a0401518abd1d1d060200e2ca0f0854cdc49a5cb286919be177a7cd90fc'
             '477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6')
@@ -53,9 +51,6 @@ sha256sums=('SKIP'
 prepare() {
   cd NetworkManager
 
-  # Fix test_netns_general in our containers
-  patch -Np1 -i ../0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
-
   NOCONFIGURE=1 ./autogen.sh
 }