[arch-commits] Commit in networkmanager/trunk (2 files)

[Jan Steffens]

    Date: Thursday, January 11, 2018 @ 21:04:37
  Author: heftig
Revision: 314619

1.10.3dev+38+g78ef57197-1

Added:
  networkmanager/trunk/0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
Modified:
  networkmanager/trunk/PKGBUILD

------------------------------------------------------+
 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch |   43 +++++++++++++++++
 PKGBUILD                                             |   10 +++
 2 files changed, 51 insertions(+), 2 deletions(-)

Added: 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
===================================================================
--- 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch	                        (rev 0)
+++ 0001-nmp-netns-Mount-proc-in-the-new-namespace.patch	2018-01-11 21:04:37 UTC (rev 314619)
@@ -0,0 +1,43 @@
+From 0acfc3e775b7ea3fccefd48f90644ef85fd76b3b Mon Sep 17 00:00:00 2001
+Message-Id: <0acfc3e775b7ea3fccefd48f90644ef85fd76b3b.1515702272.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-11 19:55:14 UTC (rev 314618)
+++ PKGBUILD	2018-01-11 21:04:37 UTC (rev 314619)
@@ -8,7 +8,7 @@
 
 pkgbase=networkmanager
 pkgname=(networkmanager libnm libnm-glib)
-pkgver=1.10.2
+pkgver=1.10.3dev+38+g78ef57197
 pkgrel=1
 pkgdesc="Network connection manager and user applications"
 arch=(x86_64)
@@ -20,10 +20,12 @@
              libnewt libndp libteam vala perl-yaml python-gobject git vala jansson bluez-libs
              glib2-docs)
 checkdepends=(libx11 python-dbus)
-_commit=7ebc9258452623679b9f1c27aee94c528c14b273  # tags/1.10.2^0
+_commit=78ef571972aa3bf81b287d767ae02471e2924027  # nm-1-10
 source=("git+https://anongit.freedesktop.org/git/NetworkManager/NetworkManager#commit=$_commit"
+        0001-nmp-netns-Mount-proc-in-the-new-namespace.patch
         NetworkManager.conf 20-connectivity.conf)
 sha256sums=('SKIP'
+            '9be1576cce4eb36697a13a1edd15faed66393f97ab5df2c19650989cd0b644a0'
             'dd2d3a9c8a08ce961e263e1847453890f1b24c72a806d8c83a5b69b227a5ccec'
             '477d609aefd991c48aca93dc7ea5a77ebebf46e0481184530cceda4c0d8d72c6')
 
@@ -31,6 +33,10 @@
   mkdir -p libnm{,-glib}/usr/{include,lib/{girepository-1.0,pkgconfig},share/{gir-1.0,gtk-doc/html,vala/vapi}}
 
   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
 }