packages: kernel/kernel-apparmor.patch - reorder so without grsecurity works

[arekm]

Author: arekm                        Date: Tue Nov  9 08:31:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reorder so without grsecurity works

---- Files affected:
packages/kernel:
   kernel-apparmor.patch (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-apparmor.patch
diff -u packages/kernel/kernel-apparmor.patch:1.10 packages/kernel/kernel-apparmor.patch:1.11
--- packages/kernel/kernel-apparmor.patch:1.10	Sun Nov  7 08:43:08 2010
+++ packages/kernel/kernel-apparmor.patch	Tue Nov  9 09:31:04 2010
@@ -147,7 +147,7 @@
  #include "include/path.h"
  #include "include/policy.h"
  #include "include/procattr.h"
-@@ -619,6 +620,104 @@ static int apparmor_task_setrlimit(struct task_struct *task,
+@@ -607,6 +608,103 @@ static int apparmor_setprocattr(struct t
  	return error;
  }
  
@@ -248,10 +248,9 @@
 +
 +	return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk);
 +}
-+
- static struct security_operations apparmor_ops __read_only = {
- 	.name =				"apparmor",
- 
+ static int apparmor_task_setrlimit(struct task_struct *task,
+ 		unsigned int resource, struct rlimit *new_rlim)
+ {
 @@ -650,6 +749,19 @@ static struct security_operations apparmor_ops = {
  	.getprocattr =			apparmor_getprocattr,
  	.setprocattr =			apparmor_setprocattr,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-apparmor.patch?r1=1.10&r2=1.11&f=u