Version bump, drop old

Package-Manager: portage-2.2.0_alpha6-r1/cvs/Linux x86_64

6 files changed, 400 insertions, 15 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index eac3e70cbed0..1e2c547b0bd2 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,13 @@
 # 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.27 2010/08/11 21:11:37 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.28 2010/11/30 21:25:04 tommy Exp $
+
+*aufs2-0_p20101122 (30 Nov 2010)
+
+  30 Nov 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -aufs2-0_p20100726.ebuild, +aufs2-0_p20101122.ebuild,
+  +files/aufs2-base-36.patch, +files/aufs2-standalone-36.patch:
+  Version bump, remove old
 
   11 Aug 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   aufs2-0_p20100809.ebuild:
diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest
index a7a0c8e35c6f..04241e9fd665 100644
--- a/sys-fs/aufs2/Manifest
+++ b/sys-fs/aufs2/Manifest
@@ -10,6 +10,7 @@ AUX aufs2-base-32.patch 3088 RMD160 d2225a227dcee3ceb166dcbb52757c07da93621c SHA
 AUX aufs2-base-33.patch 3049 RMD160 227353c3964819b745c57d404df80e5dea393bf9 SHA1 aaa0b1a41d513cd939db9e6d4369b188f25b79df SHA256 3e602dfd1791d21d9067b95698ab123c00b89b63e2147e8c2f62959c7d39c2ee
 AUX aufs2-base-34.patch 3049 RMD160 ef1e9613801baafb198fe7708ad91e4302dd4a0a SHA1 97bdaf3dbb860a4ee2d13c2d639424d7ef83b3f7 SHA256 717d41a01a596789a976ce79a04fe130efd1b0f59a7dd5d1625d338fc95e83f0
 AUX aufs2-base-35.patch 3053 RMD160 80ae1fbc4e7cb2161563071a92cf9cb00964ef3f SHA1 23aaf973d74ab53f5057c9a0929cdd0b2f0eee14 SHA256 7ed3225d9c79bdec1aef76a65c80cb2797cdd11ea80bafbb731993d1ac972169
+AUX aufs2-base-36.patch 3055 RMD160 6a45e93ff9eb49462491457955abb70815d6a2e3 SHA1 b8bf77f81fb0bc732e075304128ec80598058316 SHA256 f5ee2c878fff11e93f73846439c883da9d9087fcecb9433d6560ccfdf46dad68
 AUX aufs2-standalone-27.patch 4322 RMD160 a3b0adae7a34369d5835848b32c8bdb90ceb1f14 SHA1 9677eea003fad79255ad876e132d3c5b436f9c14 SHA256 2db4ce52e67f31aeac41010279dd3bc680218ad3080437834caaddd6397a0353
 AUX aufs2-standalone-28.patch 4322 RMD160 5bab72a393a5a5878930d25d20d9c916cd374ba3 SHA1 f9cd11351679e3f759d9e4cccdcb3adfc2590157 SHA256 272bc7bd5873de054370868588646de9a0a71430570c7670cb9201d27268b0a7
 AUX aufs2-standalone-29.patch 6140 RMD160 f97d4bb7a27c83a7de40bf37754f51ccddd962fd SHA1 22d7ed995a5efa3d5c57835b6496c857e91eda92 SHA256 237bedbfc270c0042e62aebd0caa79a0372150f884492435503e6d838fc04d4c
@@ -19,20 +20,21 @@ AUX aufs2-standalone-32.patch 8573 RMD160 47958e632664dd24dab86102b11cd897dc1a3e
 AUX aufs2-standalone-33.patch 8629 RMD160 948926f2067e122a075a5aa03d5a4d5b2d3cf11a SHA1 510fc63ab879377227f036f73841f69b411f79ad SHA256 ce3414ac7976ac2a357d0a20ccd0c5a0d5d1a4a1154b4c24f017ded3aebb8341
 AUX aufs2-standalone-34.patch 8602 RMD160 c39575d284e355d98148907689ca115b23cbf492 SHA1 9dd81c20ab21f35e544c5e966b6eb7423199fc78 SHA256 185f7948c4fdefa0687edfcc7de73836690a3bfae5c28ab06e7fbf4101cb4139
 AUX aufs2-standalone-35.patch 8600 RMD160 de4a653b59ac1ac6759b16260700d02f7ce6cd98 SHA1 f63f44a3b59e154a4689d2342c753f824c6b3768 SHA256 85ffcba2692f66a1e221b47f14272cd080bc8c6c277d11c48c3916398475669f
+AUX aufs2-standalone-36.patch 8747 RMD160 e7ec313fee92087e9c9c0aea9054b88b08d56d41 SHA1 ab799b635b0165e78de03e4394d3fb863e6e8dee SHA256 4cfff8eb5cebafc897a1f9e45cd92fa5483893e30b6a4add8c0fdd9df64775c7
 AUX pax.patch 4821 RMD160 9576b969b6c5d893b40c76e4bb297a34bcbf13e9 SHA1 bd06819d7b01959a8ed5756c78d29255923287c6 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad
 AUX utils-2.6.31.patch 444 RMD160 b89f0373c7d9537cc3124e7d8beaa0eda411a6f3 SHA1 8dcb097c0ddb4a325aef7f043db6809dcbef4035 SHA256 d10f948b03dd47cf2e5635a064c02231d4b7af2c28d45e0368fb0470b15cae62
-DIST aufs2-0_p20100726.tar.bz2 10966433 RMD160 5ade31c11aa089165bbf74d5029f01ac800be7ef SHA1 283d789b7a5d23e5f887e946b23b76ebfbe87549 SHA256 2f928beb8b498306a9a9f6bba6c2c3bd5a406bb7c16a229cad9924cda8e8c104
 DIST aufs2-0_p20100809.tar.bz2 12227959 RMD160 92f33cd69399ef249c59a79991fae22b71e85415 SHA1 69d6d696f84c27adf3b5f4e663ef3489c20e6186 SHA256 5b4441c709e3e41c03319172facaed60f9a83f46e8045a68882a27efef6eaa6b
-EBUILD aufs2-0_p20100726.ebuild 3245 RMD160 2be66005685ad1d2da0c01373946151f92ae8376 SHA1 c0245554c43d567ca63007f5521138e524304a5d SHA256 5dd51852a71be38d29304df35194e3818fcb26f0bdde410956efb7dbe22ed243
+DIST aufs2-0_p20101122.tar.bz2 14124185 RMD160 b4b94438b916bb3972c55e6c3edc37eec2298e6f SHA1 0e216e6063dbfa34a9dfb5c77f4cf5cac8e76a9c SHA256 49e98b334d5d93772782049d9fa902fdd50ae05b8cfbde7196cb83d6634a7c0a
 EBUILD aufs2-0_p20100809.ebuild 3245 RMD160 ff67859fc8de68a1ea7619611a5d4789af8ad761 SHA1 201f05fa9a4115a5bc44cc35d552ae399045edcc SHA256 6327f4b6d7df4c5a0af9ee96b1cd8398054a829c770bfb42cb26ea0d762d4497
-MISC ChangeLog 5798 RMD160 f13d6c1afd297fa6cddc2fbf846b23da38d587d4 SHA1 c03452f931ea7e8b5b9b29b342d9823654f647c8 SHA256 7ebaf66fd6d10ec76e3deffb4ae197efcd97f361e18b348881336bc24cfaf315
-MISC metadata.xml 550 RMD160 7269bc138013ec091e6025c4cb09148bd7740db5 SHA1 18b669d81765a665d50d3df22d14d77b576a89c1 SHA256 e9ea661a4a691f3c119d65ebab8ee933df91862f63a8cbfb8a1591307e49fc03
+EBUILD aufs2-0_p20101122.ebuild 3410 RMD160 bbb4954cc696310c76b1efcbf30fc242ac348a54 SHA1 9d367a9f08deade33527943279c72b6999a82f33 SHA256 2a84fce3fa0edef7b2fe9c92da5246eb4a04e636521f4478877c7c60d075e37b
+MISC ChangeLog 6039 RMD160 8e1824a802592a24cc8a3d9f7454c65b5b4fb086 SHA1 47d7c78ba748b3fe62e7216e2415f53bef2e0b61 SHA256 595b39ccf35b16b1478788693e6cee455549eec197745679e0a0ef311319df18
+MISC metadata.xml 612 RMD160 8b0fad337fa9c7cfe15d5df8476c752474b94466 SHA1 ff5b59fb8074503bb92edb4a505a507342ef0364 SHA256 ba5e97b93e7430f26b4be1574ef25955de0298e03ff2566f2eeb21dfecc0cd45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkxjEhYACgkQG7kqcTWJkGe9kQQAjtwqHL6vRlqwCQXHNl6yFx9q
-h+FDpQWc8KWMpp7/3oUFECi1J84rLlLgRtxdXM1xv7bwn5YyxZW7LTu9RdYQQ8PU
-jF15qMyp+XCgkubidwDf2pt0K8xlgTBVVQyDw5aqpW44lKy+C96RD81VZaWDB0ku
-I1l+KgB4iVT9GRKe2lY=
-=oGao
+iJwEAQECAAYFAkz1bH4ACgkQG7kqcTWJkGcbYwQAgPXvEmMDTWnI60shzfbkpfHe
+wCmBMqN0QuqlzmMq/1bpTY4ka2MSISH27UkwiqMjXpL/S3xdTdF7ZGoDpF0sySMB
+yIrmdLIURdelV2Kc4Isl1pNhEReqgfPML8hhyy/RJrpcAQ42QD3+FycgoygfLkLj
+Tx7GNPjDBe/AFaY5bYE=
+=B4pH
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs2/aufs2-0_p20100726.ebuild b/sys-fs/aufs2/aufs2-0_p20101122.ebuild
index c3ac3d083fc8..5a25565a221d 100644
--- a/sys-fs/aufs2/aufs2-0_p20100726.ebuild
+++ b/sys-fs/aufs2/aufs2-0_p20101122.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100726.ebuild,v 1.1 2010/07/26 11:33:14 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20101122.ebuild,v 1.1 2010/11/30 21:25:04 tommy Exp $
 
 EAPI="2"
 
@@ -27,9 +27,10 @@ pkg_setup() {
 	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
 
 	get_version
-	kernel_is lt 2 6 27 && die "kernel too old"
-	kernel_is gt 2 6 34 && die "kernel too new"
+	kernel_is lt 2 6 31 && die "kernel too old"
+	kernel_is gt 2 6 36 && die "kernel too new"
 
+	linux-mod_pkg_setup
 	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \
 		patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null ); then
 		if use kernel-patch; then
@@ -48,12 +49,11 @@ pkg_setup() {
 			die "missing kernel patch, please apply it first"
 		fi
 	fi
-	linux-mod_pkg_setup
 	export PKG_SETUP_HAS_BEEN_RAN=1
 }
 
 src_prepare() {
-	local branch=origin/aufs2-${KV_PATCH}
+	local branch=origin/aufs2.1-${KV_PATCH}
 	git checkout -q $branch || die
 	if ! use debug; then
 		sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die
@@ -69,7 +69,10 @@ src_prepare() {
 		epatch "${FILESDIR}"/pax.patch
 	fi
 
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+	sed -i "s:__user::g" include/linux/aufs_type.h || die
 	cd "${WORKDIR}"/${PN}-util
+	git checkout -q origin/aufs2.1
 	sed -i "/LDFLAGS += -static -s/d" Makefile || die
 	sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
 }
diff --git a/sys-fs/aufs2/files/aufs2-base-36.patch b/sys-fs/aufs2/files/aufs2-base-36.patch
new file mode 100644
index 000000000000..9003e67620c6
--- /dev/null
+++ b/sys-fs/aufs2/files/aufs2-base-36.patch
@@ -0,0 +1,81 @@
+aufs2.1 base patch for linux-2.6.36
+
+diff --git a/fs/namei.c b/fs/namei.c
+index 24896e8..19d69c5 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1159,7 +1159,7 @@ out:
+  * needs parent already locked. Doesn't follow mounts.
+  * SMP-safe.
+  */
+-static struct dentry *lookup_hash(struct nameidata *nd)
++struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ 	int err;
+ 
+@@ -1169,7 +1169,7 @@ static struct dentry *lookup_hash(struct nameidata *nd)
+ 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
+ 
+-static int __lookup_one_len(const char *name, struct qstr *this,
++int __lookup_one_len(const char *name, struct qstr *this,
+ 		struct dentry *base, int len)
+ {
+ 	unsigned long hash;
+diff --git a/fs/splice.c b/fs/splice.c
+index 8f1dfae..278c94f 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1092,8 +1092,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+  * Attempt to initiate a splice from pipe to file.
+  */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+-			   loff_t *ppos, size_t len, unsigned int flags)
++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++		    loff_t *ppos, size_t len, unsigned int flags)
+ {
+ 	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ 				loff_t *, size_t, unsigned int);
+@@ -1120,9 +1120,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+  */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+-			 struct pipe_inode_info *pipe, size_t len,
+-			 unsigned int flags)
++long do_splice_to(struct file *in, loff_t *ppos,
++		  struct pipe_inode_info *pipe, size_t len,
++		  unsigned int flags)
+ {
+ 	ssize_t (*splice_read)(struct file *, loff_t *,
+ 			       struct pipe_inode_info *, size_t, unsigned int);
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index 05b441d..91bc74e 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -73,6 +73,9 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ 		int (*open)(struct inode *, struct file *));
+ 
++extern struct dentry *lookup_hash(struct nameidata *nd);
++extern int __lookup_one_len(const char *name, struct qstr *this,
++			    struct dentry *base, int len);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+ 
+ extern int follow_down(struct path *);
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 997c3b4..be9a153 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -89,4 +89,10 @@ extern int splice_grow_spd(struct pipe_inode_info *, struct splice_pipe_desc *);
+ extern void splice_shrink_spd(struct pipe_inode_info *,
+ 				struct splice_pipe_desc *);
+ 
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++			   loff_t *ppos, size_t len, unsigned int flags);
++extern long do_splice_to(struct file *in, loff_t *ppos,
++			 struct pipe_inode_info *pipe, size_t len,
++			 unsigned int flags);
++
+ #endif
diff --git a/sys-fs/aufs2/files/aufs2-standalone-36.patch b/sys-fs/aufs2/files/aufs2-standalone-36.patch
new file mode 100644
index 000000000000..6869dc544648
--- /dev/null
+++ b/sys-fs/aufs2/files/aufs2-standalone-36.patch
@@ -0,0 +1,289 @@
+aufs2.1 standalone patch for linux-2.6.36
+
+diff --git a/fs/file_table.c b/fs/file_table.c
+index a04bdd8..f51588f 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -394,6 +394,8 @@ void file_sb_list_del(struct file *file)
+ 	}
+ }
+ 
++EXPORT_SYMBOL(file_sb_list_del);
++
+ #ifdef CONFIG_SMP
+ 
+ /*
+diff --git a/fs/inode.c b/fs/inode.c
+index 8646433..d84944d 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -83,6 +83,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
+  * the i_state of an inode while it is in use..
+  */
+ DEFINE_SPINLOCK(inode_lock);
++EXPORT_SYMBOL(inode_lock);
+ 
+ /*
+  * iprune_sem provides exclusion between the kswapd or try_to_free_pages
+diff --git a/fs/namei.c b/fs/namei.c
+index 19d69c5..944842e 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -347,6 +347,7 @@ int deny_write_access(struct file * file)
+ 
+ 	return 0;
+ }
++EXPORT_SYMBOL(deny_write_access);
+ 
+ /**
+  * path_get - get a reference to a path
+@@ -1168,6 +1169,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+ 		return ERR_PTR(err);
+ 	return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
++EXPORT_SYMBOL(lookup_hash);
+ 
+ int __lookup_one_len(const char *name, struct qstr *this,
+ 		struct dentry *base, int len)
+@@ -1190,6 +1192,7 @@ int __lookup_one_len(const char *name, struct qstr *this,
+ 	this->hash = end_name_hash(hash);
+ 	return 0;
+ }
++EXPORT_SYMBOL(__lookup_one_len);
+ 
+ /**
+  * lookup_one_len - filesystem helper to lookup single pathname component
+diff --git a/fs/namespace.c b/fs/namespace.c
+index a72eaab..36107eb 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1322,6 +1322,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ 	}
+ 	return 0;
+ }
++EXPORT_SYMBOL(iterate_mounts);
+ 
+ static void cleanup_group_ids(struct vfsmount *mnt, struct vfsmount *end)
+ {
+diff --git a/fs/notify/group.c b/fs/notify/group.c
+index d309f38..f0e9568 100644
+--- a/fs/notify/group.c
++++ b/fs/notify/group.c
+@@ -22,6 +22,7 @@
+ #include <linux/srcu.h>
+ #include <linux/rculist.h>
+ #include <linux/wait.h>
++#include <linux/module.h>
+ 
+ #include <linux/fsnotify_backend.h>
+ #include "fsnotify.h"
+@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+ 	if (atomic_dec_and_test(&group->refcnt))
+ 		fsnotify_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_put_group);
+ 
+ /*
+  * Create a new fsnotify_group and hold a reference for the group returned.
+@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+ 
+ 	return group;
+ }
++EXPORT_SYMBOL(fsnotify_alloc_group);
+diff --git a/fs/notify/mark.c b/fs/notify/mark.c
+index 325185e..adede09 100644
+--- a/fs/notify/mark.c
++++ b/fs/notify/mark.c
+@@ -113,6 +113,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
+ 	if (atomic_dec_and_test(&mark->refcnt))
+ 		mark->free_mark(mark);
+ }
++EXPORT_SYMBOL(fsnotify_put_mark);
+ 
+ /*
+  * Any time a mark is getting freed we end up here.
+@@ -190,6 +191,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
+ 	if (unlikely(atomic_dec_and_test(&group->num_marks)))
+ 		fsnotify_final_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_destroy_mark);
+ 
+ void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
+ {
+@@ -277,6 +279,7 @@ err:
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(fsnotify_add_mark);
+ 
+ /*
+  * clear any marks in a group in which mark->flags & flags is true
+@@ -332,6 +335,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+ 	atomic_set(&mark->refcnt, 1);
+ 	mark->free_mark = free_mark;
+ }
++EXPORT_SYMBOL(fsnotify_init_mark);
+ 
+ static int fsnotify_mark_destroy(void *ignored)
+ {
+diff --git a/fs/open.c b/fs/open.c
+index d74e198..53ef25e 100644
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+ 	mutex_unlock(&dentry->d_inode->i_mutex);
+ 	return ret;
+ }
++EXPORT_SYMBOL(do_truncate);
+ 
+ static long do_sys_truncate(const char __user *pathname, loff_t length)
+ {
+diff --git a/fs/splice.c b/fs/splice.c
+index 278c94f..033f7ac 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1116,6 +1116,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ 
+ 	return splice_write(pipe, out, ppos, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_from);
+ 
+ /*
+  * Attempt to initiate a splice from a file to a pipe.
+@@ -1142,6 +1143,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+ 
+ 	return splice_read(in, ppos, pipe, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_to);
+ 
+ /**
+  * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/security/commoncap.c b/security/commoncap.c
+index 9d172e6..8a61084 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -951,3 +951,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 8d9c48f..29108aa 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -515,6 +515,7 @@ found:
+ 
+ 	return -EPERM;
+ }
++EXPORT_SYMBOL(devcgroup_inode_permission);
+ 
+ int devcgroup_inode_mknod(int mode, dev_t dev)
+ {
+diff --git a/security/security.c b/security/security.c
+index c53949f..0ae5b91 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -376,6 +376,7 @@ int security_path_mkdir(struct path *dir, struct dentry *dentry, int mode)
+ 		return 0;
+ 	return security_ops->path_mkdir(dir, dentry, mode);
+ }
++EXPORT_SYMBOL(security_path_mkdir);
+ 
+ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+ {
+@@ -383,6 +384,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->path_rmdir(dir, dentry);
+ }
++EXPORT_SYMBOL(security_path_rmdir);
+ 
+ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ {
+@@ -390,6 +392,7 @@ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->path_unlink(dir, dentry);
+ }
++EXPORT_SYMBOL(security_path_unlink);
+ 
+ int security_path_symlink(struct path *dir, struct dentry *dentry,
+ 			  const char *old_name)
+@@ -398,6 +401,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+ 		return 0;
+ 	return security_ops->path_symlink(dir, dentry, old_name);
+ }
++EXPORT_SYMBOL(security_path_symlink);
+ 
+ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ 		       struct dentry *new_dentry)
+@@ -406,6 +410,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ 		return 0;
+ 	return security_ops->path_link(old_dentry, new_dir, new_dentry);
+ }
++EXPORT_SYMBOL(security_path_link);
+ 
+ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ 			 struct path *new_dir, struct dentry *new_dentry)
+@@ -416,6 +421,7 @@ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ 	return security_ops->path_rename(old_dir, old_dentry, new_dir,
+ 					 new_dentry);
+ }
++EXPORT_SYMBOL(security_path_rename);
+ 
+ int security_path_truncate(struct path *path)
+ {
+@@ -423,6 +429,7 @@ int security_path_truncate(struct path *path)
+ 		return 0;
+ 	return security_ops->path_truncate(path);
+ }
++EXPORT_SYMBOL(security_path_truncate);
+ 
+ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ 			mode_t mode)
+@@ -431,6 +438,7 @@ int security_path_chmod(struct dentry *dentry, struct vfsmount *mnt,
+ 		return 0;
+ 	return security_ops->path_chmod(dentry, mnt, mode);
+ }
++EXPORT_SYMBOL(security_path_chmod);
+ 
+ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ {
+@@ -438,6 +446,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ 		return 0;
+ 	return security_ops->path_chown(path, uid, gid);
+ }
++EXPORT_SYMBOL(security_path_chown);
+ 
+ int security_path_chroot(struct path *path)
+ {
+@@ -514,6 +523,7 @@ int security_inode_readlink(struct dentry *dentry)
+ 		return 0;
+ 	return security_ops->inode_readlink(dentry);
+ }
++EXPORT_SYMBOL(security_inode_readlink);
+ 
+ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+@@ -528,6 +538,7 @@ int security_inode_permission(struct inode *inode, int mask)
+ 		return 0;
+ 	return security_ops->inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(security_inode_permission);
+ 
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -627,6 +638,7 @@ int security_file_permission(struct file *file, int mask)
+ 
+ 	return fsnotify_perm(file, mask);
+ }
++EXPORT_SYMBOL(security_file_permission);
+ 
+ int security_file_alloc(struct file *file)
+ {
+@@ -654,6 +666,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ 		return ret;
+ 	return ima_file_mmap(file, prot);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+ 
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ 			    unsigned long prot)
diff --git a/sys-fs/aufs2/metadata.xml b/sys-fs/aufs2/metadata.xml
index cba945f55e7d..3cc038886cb1 100644
--- a/sys-fs/aufs2/metadata.xml
+++ b/sys-fs/aufs2/metadata.xml
@@ -5,6 +5,9 @@
 	<maintainer>
 		<email>tommy@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
 	<use>
 		<flag name='debug'>Enable additional debugging support</flag>
 		<flag name='inotify'>Enable inotify support</flag>