From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Wed, 21 Mar 2012 14:58:30 +0000 (+0000)
Subject: - rel 0.2; make vserver work with proc using option hidepid>0
X-Git-Tag: auto/th/kernel-3_3_0-1~2
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=0232a98e8d387532cf4d7934aca2df312e56732d;p=packages%2Fkernel.git

- rel 0.2; make vserver work with proc using option hidepid>0

Changed files:
    kernel-vserver-fixes.patch -> 1.28
    kernel.spec -> 1.1033
---

diff --git a/kernel-vserver-fixes.patch b/kernel-vserver-fixes.patch
index e707ef1d..5811b5c4 100644
--- a/kernel-vserver-fixes.patch
+++ b/kernel-vserver-fixes.patch
@@ -37,3 +37,14 @@ Missing header for routes patch, caused vs2.3 route.h mixing
  		init_utsname()->version);
 
 
+--- linux-3.3/fs/proc/base.c~	2012-03-19 21:44:42.000000000 +0100
++++ linux-3.3/fs/proc/base.c	2012-03-21 12:25:28.051092423 +0100
+@@ -568,6 +568,8 @@
+ 				 struct task_struct *task,
+ 				 int hide_pid_min)
+ {
++	if (vx_check(0, VS_WATCH_P))
++		return true;
+ 	if (pid->hide_pid < hide_pid_min)
+ 		return true;
+ 	if (in_group_p(pid->pid_gid))
diff --git a/kernel.spec b/kernel.spec
index 0fc6ddad..003a55a2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -89,7 +89,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		0.1
+%define		rel		0.2
 %define		basever		3.3
 %define		postver		.0