packages: kernel/kernel-vserver-2.3.patch, kernel/kernel-vserver-fixes.patc...

[baggins]

Author: baggins                      Date: Mon Sep 27 12:55:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- revert last commit, moved fix to kernel-vserver-fixes.patch

---- Files affected:
packages/kernel:
   kernel-vserver-2.3.patch (1.45 -> 1.46) , kernel-vserver-fixes.patch (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-vserver-2.3.patch
diff -u packages/kernel/kernel-vserver-2.3.patch:1.45 packages/kernel/kernel-vserver-2.3.patch:1.46
--- packages/kernel/kernel-vserver-2.3.patch:1.45	Mon Sep 27 14:50:29 2010
+++ packages/kernel/kernel-vserver-2.3.patch	Mon Sep 27 14:54:56 2010
@@ -27147,6 +27147,11 @@
  		return -EPERM;
  	return 0;
  }
+@@ -951,3 +969,4 @@ int cap_file_mmap(struct file *file, uns
+ 	}
+ 	return ret;
+ }
++
 diff -NurpP --minimal linux-2.6.35.4/security/selinux/av_permissions.h linux-2.6.35.4-vs2.3.0.36.32/security/selinux/av_permissions.h
 --- linux-2.6.35.4/security/selinux/av_permissions.h	1970-01-01 01:00:00.000000000 +0100
 +++ linux-2.6.35.4-vs2.3.0.36.32/security/selinux/av_permissions.h	2010-08-02 17:05:06.000000000 +0200

================================================================
Index: packages/kernel/kernel-vserver-fixes.patch
diff -u packages/kernel/kernel-vserver-fixes.patch:1.15 packages/kernel/kernel-vserver-fixes.patch:1.16
--- packages/kernel/kernel-vserver-fixes.patch:1.15	Thu Aug  5 21:52:26 2010
+++ packages/kernel/kernel-vserver-fixes.patch	Mon Sep 27 14:54:57 2010
@@ -37,3 +37,10 @@
  		init_utsname()->version);
 
 
+--- linux-2.6.35.4/security/commoncap.c	2010-08-02 16:53:03.000000000 +0200
++++ linux-2.6.35.4-vs2.3.0.36.32/security/commoncap.c	2010-08-02 17:05:06.000000000 +0200
+@@ -951,3 +969,4 @@ int cap_file_mmap(struct file *file, uns
+ 	}
+ 	return ret;
+ }
+-
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-2.3.patch?r1=1.45&r2=1.46&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-vserver-fixes.patch?r1=1.15&r2=1.16&f=u