[packages/kernel/LINUX_3_14] - restore disabling USER_NS for vserver - rel 2

[baggins]

commit c1969851a6a6ac984cfd3abc40b9b4487789db14
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Sep 7 01:08:46 2014 +0200

    - restore disabling USER_NS for vserver
    - rel 2

 kernel-vserver-fixes.patch | 11 +++++++++++
 kernel.spec                |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/kernel.spec b/kernel.spec
index 64b8374..19d6908 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
+%define		rel		2
 %define		basever		3.14
 %define		postver		.18
 
diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index b46a561..d0dafc2 100644
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -9,3 +9,14 @@
  	if (pid->hide_pid < hide_pid_min)
  		return true;
  	if (in_group_p(pid->pid_gid))
+diff -NurpP --minimal linux-3.14.17/init/Kconfig linux-3.14.17-vs2.3.6.13/init/Kconfig
+--- linux-3.14.17/init/Kconfig	2014-08-14 01:38:34.000000000 +0000
++++ linux-3.14.17-vs2.3.6.13/init/Kconfig	2014-08-30 14:37:19.000000000 +0000
+@@ -1117,6 +1118,7 @@ config IPC_NS
+ 
+ config USER_NS
+ 	bool "User namespace"
++	depends on VSERVER_DISABLED
+ 	default n
+ 	help
+ 	  This allows containers, i.e. vservers, to use user namespaces
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/c1969851a6a6ac984cfd3abc40b9b4487789db14