sys-fs/aufs3: Version Bump, take latest pax patch from pentoo, thanks Zero_Chaos for it

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

4 files changed, 241 insertions, 5 deletions

diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index ec58e30cea9e..2244c370018c 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/aufs3
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.56 2013/04/27 10:03:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.57 2013/05/01 11:30:27 jlec Exp $
+
+*aufs3-3_p20130429 (01 May 2013)
+
+  01 May 2013; Justin Lecher <jlec@gentoo.org> +aufs3-3_p20130429.ebuild,
+  +files/pax-3.patch:
+  Version Bump, take latest pax patch from pentoo, thanks Zero_Chaos for it
 
 *aufs3-3_p20130422 (27 Apr 2013)
 
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 601ff762dfa0..5fab1ed90ca4 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -55,6 +55,7 @@ AUX aufs3-standalone-6.patch 8103 SHA256 5c03d5444b9bf24bf17a166ecd42ce4d8094036
 AUX aufs3-standalone-x-rcN.patch 8254 SHA256 2ed5fcb851e5b77549f5bfacae327059508c0b6fb4248de5dac948e56d3e9e3f SHA512 a2a6dc0e838a4be6255f99846a2af6d109f6edcde043ac112cd00c2508a4f7fe6aad32ca54128c96be110c3e38a082478c907e2a0f68be87ced6e13ad14f2c95 WHIRLPOOL be04a933077fd2826cc3be68a13ecb2f728f48113db1c7938119e20de68e9a58c7419c5f53d50c8e1b34f10badabd7f831a2342b78f57ac8978b6413063a52a1
 AUX parallel.patch 725 SHA256 99f93cffb09a0d2ab14fb9cb68fea0f8e87d34d681db642a8a375e045853d8a6 SHA512 c15a3a6319c4545bf5249036aecc0504a1f2ca5ffde5f7a11967089a3b3374c44544fbe801c30684d3edfd9a38c9552a02a8e0d34fed7f38f8bf3cfa8834a686 WHIRLPOOL 11b31499f1df710750328f5ad0c06a92623316e485cd173d47151e1c65545b25c8cc582cab1f98226804ceb9be24ba32d0336dc65325eaa0e81f7ee0c587cdb7
 AUX pax-2.patch 2589 SHA256 893f8eed7f9e504215ef7336bf2c9e86a0724b4b1943ea1d40c2a665d019b2ef SHA512 e2afc96f19f09ebd4f3e15bdd1ff3bafc8fe47b9653fb4376adb0c557bcf54d1a9f1835507f0375f8b0576fda80676b0979111cc717a5582bc6d409fd549b282 WHIRLPOOL e80411ff6c2102afe5f984fa1dc38f6ff372f37947d9c48be591fa6081d31e75576cfe3ff7caacb53f5189c137096a5201f7e919c3b964604e6baa1e19745d82
+AUX pax-3.patch 2856 SHA256 511ddca31106798b0890fdffeb05b4149b734cd0c73432610d9afc438f397cf3 SHA512 086cfdd649fda53d6c0740ab95e2ba59052f378ef32658b02876c6e4a5fee0cb3ee845afa111e4ac6e1a1b6666d7595169056920170ee0dfb8fdf66f094695ff WHIRLPOOL 47a2ba83166f9cc6044b205069be4cdb945c8dd020fb8496ed68fe1d947f89028ffe32ec185363d96048cbf82fcdaf07eb02f1eae1cd6a2e61d27e89267f5b43
 AUX pax.patch 4821 SHA256 c82946d79fd3826803aacf5533aa398c8c7e7516a0c8c88a56aa75e27af3c7ad SHA512 96c9f131da09fb138d60ff8d4c2a0ccb2518f8477b3dd04f81db4b53be006dfa21a487b9ba524ea479a4621b8678ed073467932b6c9ca10c8abb0af5ec9e9330 WHIRLPOOL 99bc6cae56608b8fbc0ff81b1822a76dfa9307b6c18a7ba2708dc5e6771cfad136906821b1cabf584012afe1683f5b74ff6da3d85a08c83226a070b4d192b333
 DIST aufs3-3_p20121210.tar.xz 1932988 SHA256 931488f2880d2ea26108328777d56ab0ad56764af15f3094fcc02263f9b75e4a SHA512 436719a0a92ca9732edbca19953d586ae3517c1884965ad4e2fccb2638065a51086184e4a0fd1abe1039b8345b2c19b7c5949468c978570e9517549459566c4d WHIRLPOOL d0bdf0c10217dce7dd255f8be7f53b87ce77d403ae099ad87a3ba2dcec107d39e408232501c997baaa3d37921922f2d34b6b62e9fe8af4ab4ce52712148b8072
 DIST aufs3-3_p20130107.tar.xz 2311936 SHA256 6a40835128ca30233035dc08dca4eee0e37218e61e8cdfdd7fef6d3b660e4052 SHA512 a900543b8ca2ee7ebe39371963622d59c14a5ba1be95c045dd067cb9500912f3347064bbe1234c5774f958430b5b807b6c32633c650b155c399c16fc13fea73b WHIRLPOOL e429d0617123ce0a5ce943269474da0996d9fdb80cd4fe8a00190b8c37f993a22c73c8a33cda82b2507ed7f9207f04e9ee01d694f348cbffb7cc04733a6311d8
@@ -65,6 +66,7 @@ DIST aufs3-standalone-3_p20130318.tar.xz 2396080 SHA256 1c2e473581e64597c8ba3937
 DIST aufs3-standalone-3_p20130325.tar.xz 2431800 SHA256 750230406ae41bb381c65a8cc74066f3259d4add369f7d0b74ef5bc3e4d47a93 SHA512 d00527be2bdecd1466b6200365976de4b0fdc498406565053da0893aad282f8149efdbf1ca1b4ca95c033c1ba92643c22af87e464c63bd28a03fd9d5bac39d15 WHIRLPOOL 0c3a1db4486202b1d819f233c4754d4afcce5e0b881e15072ce1da72b40820ee95b24ea1d04e15e2df5da9868f4fadae9cda3ae866fed95049a7cd9ed55432cb
 DIST aufs3-standalone-3_p20130401.tar.xz 2504256 SHA256 787405a1135ba5f95bf3980d6e7801be1c016b447241be6ef282b4d09762478e SHA512 f72a4c724f5ee49761d5d2366a4f47491a2a0a4d1f1beeb31b7b9f8b4f98e2691e0bd771ae7fe4a6cc4a354f7736c987eb515250ee7cbcac8ba357bccb10aafa WHIRLPOOL f5ccf3346e189d8cb56441cbfd9560d22a6ae84955a6f94db296963cdfb83afd5c6448ccd38974914bdaee1bcafcb4c38163b453d088a0c54cedbc14ece92456
 DIST aufs3-standalone-3_p20130422.tar.xz 1023220 SHA256 f5fb6a98feadf2ecafe44865716bd8e6be32a529b735f8a2f3302e9ce83a8c78 SHA512 9e3d2f19ff0d7ce1f876dc2e041e1113a493ade4e05ebfb1aba1df7483afb7812861c21dd331dcc4ecc5806f66791f8efd1fa0cd238c7c2627908a40ec91b85e WHIRLPOOL 78b2f86f53f183b3921b5e57d0217230ea7a269e26e7e4041cfff4c9626b05f531c0fa6f8a3093c315b33fd44ec1af5fb7a7c81994af70e4f6d97c927e3d3acc
+DIST aufs3-standalone-3_p20130429.tar.xz 1107196 SHA256 37138fe099c2cd4f79e665887fe8c53147a08d422e00e3a714f3931c0935d278 SHA512 570cbac6d296f1f2a8a6307b83aaa554030c53e98fe9802991837ff3b6384098088b680b16c3e434367c600def03d2d5da253e5430fb1ec7222199ab7f1f9e80 WHIRLPOOL fe796f7afcfec7e798d6ad6241775a69ed08c6bdd6bce8ad605849cdca8951c919a5ca7d958c2c21a6fd0f875d2ed0b858356d4631ce166454d59a0302042914
 EBUILD aufs3-3_p20121210.ebuild 4840 SHA256 1d6c10de0f810598997b5c20c4e57e1277f99e29dcf632a3d07a0a2c01735843 SHA512 1286b95e209381391f3e9d6670979fceb162a1bd11361024d4d3b9105c98bf7486ee55bb7b4a0294a4f379b66e2ca5e2f458c76152ba27238675a3f27f4b18b2 WHIRLPOOL 3cb7e2444a5632db73b13b7f0849f930663c3a1fa08d8c19f52d0e9df3c6ba2a30dc2d04097849195f240133976c30c5cf9fdc3c8f14eef01e82fa641fda3ee6
 EBUILD aufs3-3_p20130107.ebuild 4949 SHA256 62437ba8b78bf5ff7414b91a7d4890e4373b7e4cb7efc213b8a5167b3b22581c SHA512 233889afe9e035f9af3ea83d95396ff22b23205b4d8e65f89ec30a2a30866857ba49969af62d8485747535401496b276ac86cb2a9a75f753057f19b2f425a8a1 WHIRLPOOL 3e31c06cd17cba042f66b3d3d0dde2f1648cf562247ced757d1a69c7acbd76ad4a4440e8b56c1150a2b3db279159be84cac8c1b8b930e1d8296e5bd3a8c51b8f
 EBUILD aufs3-3_p20130114.ebuild 5047 SHA256 087b4b9a69879eb1938675f99359ee6571fd88c5bc24609d6e44a23ab17c80b5 SHA512 ec94c997fd5ef33a5947d65dcbdc4d40fa44f3e74518131bbfef76d2f4784ad520f9a37c4012f1479bdf0fd0e5d5633c5f2b9a48a3436d695d96a1082365eb6a WHIRLPOOL d55e7bc8a3ecd72dfaf53896c4a19bfcb190a91ed7e6848ffa03380889fd257fa3c81173abc61cbeea22ed6a74fca667f17fabd58fd6683a01669126d12c716e
@@ -74,12 +76,13 @@ EBUILD aufs3-3_p20130318.ebuild 4386 SHA256 b254577db75f150b9ec931085f2702d5b92e
 EBUILD aufs3-3_p20130325.ebuild 4386 SHA256 a8004547727160fac8879f197f42aec3530cb5902e0dbebea069224b28381073 SHA512 982257f0bbf23ade7c990c5d6356308040be605dc5775177918299d98787777864a373fc3005e92eb2428aa594b8cb8e36a3f26f0da5608b31fed189497fe2f8 WHIRLPOOL d3fb3fa41dea96d0e8e57a28065d596ee151a9e3797b9d76175350898c6671980b2aa082a54ba26b239786a4f426ad94102b4fbdc471402bf051de35ca4d99fd
 EBUILD aufs3-3_p20130401.ebuild 4386 SHA256 2ce359775560b895869365eeafb54a1fc035606c32e9683473c1c1b2039b6ac6 SHA512 b52259615d6e70075a91bae7a2b6360d717c3a1b68bcbb5f626a9a541daf07a4add0a88539d307fc854a71811af642eb9933c8ab2092af45de21dffabcc6995b WHIRLPOOL 6ad3c2c44bcc5f1b9ee25855c817a3d9815a942e7ae7da55381bcad54ef981945fe50a2dd80029f6ea4d03ee5128e7357228f190884cf23f20875fd99d196406
 EBUILD aufs3-3_p20130422.ebuild 4102 SHA256 8a1efea0bcf4e737bf9d6dadc8f1a1e8a728dcd7f271f61096dad66e169fbc87 SHA512 ce992fdef3b9d0f162040fa476b8a0924962ba1c8b43d068b6fe347f85baf9dccdb733b13216c58a32988612bd5fbaf4bb9abd05f66f38518106ad02aece2681 WHIRLPOOL a9abd6f2080e87b789f522ca69da1a59d19e8e62a03c2666fe067aaf3cc920d8707d47ccc8e434127b64247eb868aaceff75b1aed380b40707e5449d9ee1c312
-MISC ChangeLog 15017 SHA256 4fad874005aecc065d2e47375d54bc5e0bac75a49e45ea643869c0a6ba329bef SHA512 1439a1e94fdc192226087b82ad7c55eb615a3ba3e4479433a71327a0fca544a2919d124991c4ab74ead841d384ee3782cb8362e0b0abda04ecc6fe8b1a26a7d7 WHIRLPOOL a2c6632c9181256b2157c565e9ccbc70ad90c99d32ee80f7fa60c85760871dc52d0852f2212acfb5983d19a54315b65a1e6a38cef3bc70b44340cfb197571213
+EBUILD aufs3-3_p20130429.ebuild 4102 SHA256 ad6fe777f5d5b7d29c5f3a5cc5bc402c58e6737f517a33708fe295b24eef6b2f SHA512 fc6691a2db8a8f70bac7d30e65b090f05a2dca3c83a4ebccd8a9a746970bec45e1779d01b3ab9fe77dbc9c82de5b1a8f6f27f4fa923dbf04d86a241cca03f4d2 WHIRLPOOL 0a0886b5121c73c53b4ef180059c802c883bb84275c4227005d275c1026620bde49ee33cceae5f5f049f9207d057b3ad9935f15cc32fc17194a6d9b4cb97270f
+MISC ChangeLog 15224 SHA256 9a481d0ac7578292b085582d51f1a1c7d05962b722e5c80eee75561812176163 SHA512 601efae40908d13da7e948c19b07b91005c1ec29aef83fc9ee337ac17e9677e9d9c41d926970933469591ec8fdd6c1434247ffbb26492b79bf76d6aa6351a332 WHIRLPOOL ed67f74ded50c1f2cf1eccbe5cb4059200119c45d4447e9c66e912cc5b0b1d7b75697e89764a1b22222b34bab9b5f1bc85cb1704166f0cf9b336c94c495ffe6c
 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlF7pu4ACgkQgAnW8HDreRaf3QCfTfGbUsAiPQQNpz+NIDQ+enUl
-nZkAn0LT0AVsuIYj1HsbRobFkZA9qFvv
-=b7NS
+iEYEAREKAAYFAlGA/NQACgkQgAnW8HDreRYUOACgwXwfJhAx3BpfeNh3fLsuMEvu
+AIAAnAuio4vgJ341DWwds8cyCGuWbmfH
+=i/uH
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/aufs3/aufs3-3_p20130429.ebuild b/sys-fs/aufs3/aufs3-3_p20130429.ebuild
new file mode 100644
index 000000000000..fdb38b58c7fc
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20130429.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20130429.ebuild,v 1.1 2013/05/01 11:30:27 jlec Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=8
+# highest supported version
+KERN_MAX_VER=9
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
+
+DEPEND="
+	dev-util/patchutils
+	dev-vcs/git"
+RDEPEND="
+	sys-fs/aufs-util
+	!sys-fs/aufs
+	!sys-fs/aufs2"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+	CONFIG_CHECK+=" ~EXPERIMENTAL !AUFS_FS"
+	use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
+	use nfs && CONFIG_CHECK+=" EXPORTFS"
+	use fuse && CONFIG_CHECK+=" ~FUSE_FS"
+	use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
+	use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
+
+	# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
+	[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
+
+	get_version
+	kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
+	kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
+
+	linux-mod_pkg_setup
+
+	if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
+		PATCH_BRANCH="x-rcN"
+	else
+		PATCH_BRANCH="${KV_MINOR}"
+	fi
+
+	pushd "${T}" &> /dev/null
+	unpack ${A}
+	cd ${PN}-standalone || die
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+	git checkout -q -b local-gentoo ${module_branch} || die
+	combinediff ${PN}-base.patch ${PN}-standalone.patch > ${PN}-standalone-base-combined.patch
+	if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-combined.patch > /dev/null ); then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch >/dev/null
+			epatch "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch
+			ewarn "You need to compile your kernel with the applied patch"
+			ewarn "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply ${EPRFIX}/usr/share/doc/${PF}/${PN}-standalone-base-combined.patch by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	popd &> /dev/null
+	export PKG_SETUP_HAS_BEEN_RAN=1
+}
+
+set_config() {
+	for option in $*; do
+		grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
+		sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
+	done
+}
+
+src_prepare() {
+	local module_branch=origin/${PN}.${PATCH_BRANCH}
+
+	einfo "Using for module creation branch ${module_branch}"
+	git checkout -q -b local-gentoo ${module_branch} || die
+
+	# All config options to off
+	sed "s:= y:=:g" -i config.mk || die
+
+	set_config RDU BRANCH_MAX_127 SBILIST
+
+	use debug && set_config DEBUG
+	use fuse && set_config BR_FUSE POLL
+	use hfs && set_config BR_HFSPLUS
+	use inotify && set_config HNOTIFY HFSNOTIFY
+	use nfs && set_config EXPORT
+	use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
+	use ramfs && set_config BR_RAMFS
+
+	use pax_kernel && epatch "${FILESDIR}"/pax-3.patch
+
+	sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
+}
+
+src_compile() {
+	local ARCH=x86
+
+	emake \
+		CC=$(tc-getCC) \
+		LD=$(tc-getLD) \
+		LDFLAGS="$(raw-ldflags)" \
+		ARCH=$(tc-arch-kernel) \
+		CONFIG_AUFS_FS=m \
+		KDIR="${KV_OUT_DIR}"
+}
+
+src_install() {
+	linux-mod_src_install
+
+	insinto /usr/share/doc/${PF}
+
+	use doc && doins -r Documentation
+
+	use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch
+
+	dodoc Documentation/filesystems/aufs/README
+}
diff --git a/sys-fs/aufs3/files/pax-3.patch b/sys-fs/aufs3/files/pax-3.patch
new file mode 100644
index 000000000000..584fa6ace5b5
--- /dev/null
+++ b/sys-fs/aufs3/files/pax-3.patch
@@ -0,0 +1,90 @@
+--- a/fs/aufs/dynop.c	2012-10-09 15:41:32.652989534 -0400
++++ b/fs/aufs/dynop.c	2012-10-09 15:41:58.562989820 -0400
+@@ -149,9 +149,11 @@
+ #define DySet(func, dst, src, h_op, h_sb) do {				\
+ 	DyDbgInc(cnt);							\
+ 	if (h_op->func) {						\
+-		if (src.func)						\
+-			dst.func = src.func;				\
+-		else							\
++		if (src.func) {						\
++			pax_open_kernel();				\
++			*(void **)&dst.func = src.func;			\
++			pax_close_kernel();				\
++		} else							\
+ 			AuDbg("%s %s\n", au_sbtype(h_sb), #func);	\
+ 	}								\
+ } while (0)
+@@ -159,7 +161,9 @@
+ #define DySetForce(func, dst, src) do {		\
+ 	AuDebugOn(!src.func);			\
+ 	DyDbgInc(cnt);				\
+-	dst.func = src.func;			\
++	pax_open_kernel();			\
++	*(void **)&dst.func = src.func;		\
++	pax_close_kernel();			\
+ } while (0)
+ 
+ #define DySetAop(func) \
+@@ -266,15 +270,17 @@
+  */
+ static void dy_adx(struct au_dyaop *dyaop, int do_dx)
+ {
++	pax_open_kernel();
+ 	if (!do_dx) {
+-		dyaop->da_op.direct_IO = NULL;
+-		dyaop->da_op.get_xip_mem = NULL;
++		*(void **)&dyaop->da_op.direct_IO = NULL;
++		*(void **)&dyaop->da_op.get_xip_mem = NULL;
+ 	} else {
+-		dyaop->da_op.direct_IO = aufs_aop.direct_IO;
+-		dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
++		*(void **)&dyaop->da_op.direct_IO = aufs_aop.direct_IO;
++		*(void **)&dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
+ 		if (!dyaop->da_get_xip_mem)
+-			dyaop->da_op.get_xip_mem = NULL;
++			*(void **)&dyaop->da_op.get_xip_mem = NULL;
+ 	}
++	pax_close_kernel();
+ }
+ 
+ static struct au_dyaop *dy_aget(struct au_branch *br,
+--- a/fs/aufs/f_op_sp.c	2012-10-09 15:41:32.652989534 -0400
++++ b/fs/aufs/f_op_sp.c	2012-10-09 15:41:58.562989820 -0400
+@@ -104,7 +104,7 @@
+ static int aufs_open_sp(struct inode *inode, struct file *file);
+ static struct au_sp_fop {
+ 	int			done;
+-	struct file_operations	fop;	/* not 'const' */
++	file_operations_no_const	fop;	/* not 'const' */
+ 	spinlock_t		spin;
+ } au_sp_fop[AuSp_Last] = {
+ 	[AuSp_FIFO] = {
+@@ -157,8 +157,10 @@
+ 		h_file = au_hf_top(file);
+ 		spin_lock(&p->spin);
+ 		if (!p->done) {
+-			p->fop = *h_file->f_op;
++			pax_open_kernel();
++			memcpy((void *)&p->fop, h_file->f_op, sizeof(p->fop));
+ 			p->fop.owner = THIS_MODULE;
++			pax_close_kernel();
+ 			if (p->fop.aio_read)
+ 				p->fop.aio_read = aufs_aio_read_sp;
+ 			if (p->fop.aio_write)
+diff -Naur linux-3.8.3-pentoo/fs/aufs/sysfs.c linux-3.8.3-pentoo-aufsfix/fs/aufs/sysfs.c
+--- linux-3.8.3-pentoo/fs/aufs/sysfs.c	2013-04-29 00:07:50.478827567 -0400
++++ linux-3.8.3-pentoo-aufsfix/fs/aufs/sysfs.c	2013-04-28 23:46:23.724793109 -0400
+@@ -208,8 +208,10 @@
+ 	struct attribute *attr = &br->br_attr;
+ 
+ 	sysfs_attr_init(attr);
+-	attr->name = br->br_name;
+-	attr->mode = S_IRUGO;
++	pax_open_kernel();
++	*(void **)&attr->name = br->br_name;
++	*(void **)&attr->mode = S_IRUGO;
++	pax_close_kernel();
+ }
+ 
+ void sysaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex)