Bump patch for kernel 2.6.31

Package-Manager: portage-2.2_rc67-r2/cvs/Linux x86_64

3 files changed, 34 insertions, 13 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index 52b6cabd990c..6e8089665ae4 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/aufs2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.15 2010/03/14 20:23:43 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.16 2010/03/16 20:12:05 tommy Exp $
+
+  16 Mar 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  files/aufs2-standalone-31.patch:
+  Bump patch for kernel 2.6.31
 
 *aufs2-0_p20100308 (14 Mar 2010)
 
diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest
index fde9dd446daa..b3bbfccdad35 100644
--- a/sys-fs/aufs2/Manifest
+++ b/sys-fs/aufs2/Manifest
@@ -11,7 +11,7 @@ AUX aufs2-standalone-27.patch 7441 RMD160 754f282fb14e1c8be0e1f4e84c131c4bdb50f1
 AUX aufs2-standalone-28.patch 3930 RMD160 40c2efb98084887425e3de60e44c893624e05802 SHA1 a66d3cf45b66a71c3848f593ac8a9ca084945d29 SHA256 84e1f4afb7897551f72661b4c2c5e459147309c8cf29be13821b7b5e695a489f
 AUX aufs2-standalone-29.patch 5748 RMD160 67fdda784ef736559e4b12038e625f5422351005 SHA1 8feb9ed859c239cda93863c8a965b3a13c563f71 SHA256 1b6d93c6b0fedbed48caa539ec231196f84cf697ca5bfe117f64a87aa17db33b
 AUX aufs2-standalone-30.patch 5432 RMD160 4a9979bb29164ee81e25c920df0dadbb6c496698 SHA1 1bcebf7b22f784834e5d5f0a25467de31f12320f SHA256 c2972ecca3562b34a2b68800b2322801f614d1945923b6fe7da711392ec37484
-AUX aufs2-standalone-31.patch 5826 RMD160 e7405edce064d3a163fccd390845442926b9c490 SHA1 e626a1632ba55b43b46449020b2a547e9572f417 SHA256 b6e61dd2cf5919879de6c668b8de6e0661dbaa0ac1ebe25868513360a6602601
+AUX aufs2-standalone-31.patch 6418 RMD160 53415fb890b17a972504ece963064a3f4dfe603b SHA1 368042b96fe1366152d0ab8a295b10a157907c38 SHA256 bac42a36c3fc8da97f9feb354d0a81fff3f02734434deb5c0ba14f009a223de0
 AUX aufs2-standalone-32.patch 5828 RMD160 8d525c7155df964a933bf6ec01bb6904211a33e2 SHA1 b1ee87a3fdc2a204b141afbb390ce65698349fbd SHA256 adb37eddf529631e0fc9dc04b79e1988581fc10fbe1dd883f32ecdca6d541654
 AUX aufs2-standalone-33.patch 6474 RMD160 afc691a54f87e86154781d2d68b0c9fb90ab0ed8 SHA1 9c85979cca3e3dea1672583f8f96025476afec91 SHA256 34bdd3c07cf38e21aa0ab02a0a2b708df85eb91b3fe9f5cf720a352a8fa766a5
 AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62
@@ -19,14 +19,14 @@ DIST aufs2-0_p20091214.tar.bz2 4253193 RMD160 df114f6e040bb3fb9a319e39313b59b519
 DIST aufs2-0_p20100308.tar.bz2 5279852 RMD160 d9399bcaf02037c0e6b9cff2c0e2c5430a4bb174 SHA1 d9e69bd75b7290dd661eebfea7c3e6e9643a13c5 SHA256 6216f67753dddb42fdcc5c54267be151e9acb9ee76d409f3a322128a12e91057
 EBUILD aufs2-0_p20091214.ebuild 2888 RMD160 c2e96ffb0012186a7d26744e44fbb086d9b2cae9 SHA1 3259c4b2d853382882e10f567f396e5bc22bab56 SHA256 89e7fd4899301c9f601861282c89227c922e52ea2045c2477defd471c51edd3f
 EBUILD aufs2-0_p20100308.ebuild 2929 RMD160 ddf26b35c829aa4d9747dbe98ba873b335d92975 SHA1 54eba4011657828fe0541e84e6f825e69bddf340 SHA256 63858e4169b38cf3cd2af727cd08a5fc18c364b40acde86f100fc9a0542ab891
-MISC ChangeLog 3604 RMD160 04c27489ef25910f6b209cb73470a58de746416d SHA1 c3bc8cdb280a5efe4e0d3daf6c678513ebdfaa38 SHA256 e267d12e8af8cd79bfb02cedb711535e083292ea101591d3867cef00ae8cbb99
+MISC ChangeLog 3730 RMD160 16f4076aa1227ded2d838bb109d5aaf89cb49174 SHA1 9c30b5aacced70e3dbf5b38ef86a80caea6521da SHA256 98c8bde26b1e00b4909ba6c129b2d8efe6f0b19d8bff070ab04078b0918b78c9
 MISC metadata.xml 550 RMD160 7269bc138013ec091e6025c4cb09148bd7740db5 SHA1 18b669d81765a665d50d3df22d14d77b576a89c1 SHA256 e9ea661a4a691f3c119d65ebab8ee933df91862f63a8cbfb8a1591307e49fc03
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iJwEAQECAAYFAkudRd0ACgkQG7kqcTWJkGcKcAP9Gw/uGHMFbJLI2HmSGSGsniHv
-KuQPVNmBX/HyThsP9ATOoSfIiCsZZ4dE0lREoudM13uZmFHOWh9hrtvXXuQOk/zU
-+yENum7lxMnMnhx66+nv3pLcShQF11UmkZSrGMHMIMK+2S7LuRBMIL75Dd+7wpJA
-lMqsgTa9Z0Mf8rbnhwo=
-=R82s
+iJwEAQECAAYFAkuf5iEACgkQG7kqcTWJkGf3DwP+LAKRGUGHxr7NNSPPgy7y/ddt
+WMegbf5393dp9wRFD1LhgfpyubaArMBiimbBCPkH/Fjri129dwCeGJik73X7GXaL
+CPRLEtQtYSt8V5bl5XTkZtLajdHsgOcDuCCpLRERDMfjD8SLeCB85stb1ZxWLtVe
+iqwHiU/LvuM+pnA1LJE=
+=KZ9X
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs2/files/aufs2-standalone-31.patch b/sys-fs/aufs2/files/aufs2-standalone-31.patch
index 946177513b1b..d9b492284011 100644
--- a/sys-fs/aufs2/files/aufs2-standalone-31.patch
+++ b/sys-fs/aufs2/files/aufs2-standalone-31.patch
@@ -1,7 +1,7 @@
-aufs2 standalone patch for linux-2.6.
+aufs2 standalone patch for linux-2.6.31
 
 diff --git a/fs/namei.c b/fs/namei.c
-index dcedad1..728a39b 100644
+index b49c2af..4521c70 100644
 --- a/fs/namei.c
 +++ b/fs/namei.c
 @@ -337,6 +337,7 @@ int deny_write_access(struct file * file)
@@ -72,6 +72,15 @@ index 0cb8873..0e7b0b9 100644
  
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/security/commoncap.c b/security/commoncap.c
+index e3097c0..96f9a66 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -1014,3 +1014,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+ 	}
+ 	return ret;
+ }
++EXPORT_SYMBOL(cap_file_mmap);
 diff --git a/security/device_cgroup.c b/security/device_cgroup.c
 index b8186ba..42208d8 100644
 --- a/security/device_cgroup.c
@@ -85,10 +94,10 @@ index b8186ba..42208d8 100644
  int devcgroup_inode_mknod(int mode, dev_t dev)
  {
 diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
-index 4732f5e..6fa13dd 100644
+index b85e61b..a23fad4 100644
 --- a/security/integrity/ima/ima_main.c
 +++ b/security/integrity/ima/ima_main.c
-@@ -320,6 +320,7 @@ int ima_file_mmap(struct file *file, unsigned long prot)
+@@ -324,6 +324,7 @@ int ima_file_mmap(struct file *file, unsigned long prot)
  					 MAY_EXEC, FILE_MMAP);
  	return 0;
  }
@@ -97,7 +106,7 @@ index 4732f5e..6fa13dd 100644
  /**
   * ima_bprm_check - based on policy, collect/store measurement.
 diff --git a/security/security.c b/security/security.c
-index dc7674f..b309f88 100644
+index dc7674f..5356129 100644
 --- a/security/security.c
 +++ b/security/security.c
 @@ -386,6 +386,7 @@ int security_path_mkdir(struct path *path, struct dentry *dentry, int mode)
@@ -180,3 +189,11 @@ index dc7674f..b309f88 100644
  
  int security_file_alloc(struct file *file)
  {
+@@ -641,6 +651,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ {
+ 	return security_ops->file_mmap(file, reqprot, prot, flags, addr, addr_only);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+ 
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ 			    unsigned long prot)