Update aufs2 patches for grsecurity

5 files changed, 59 insertions, 8 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index df1584c0..6ea8da39 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header $
 
+  09 Aug 2011; Martin Väth <martin@mvath.de>
+  Update patches for grsecurity.
+  Skip patches not named aufs* (unless USE=all-patches is set).
+  Only install the most current grsecurity patch by default.
+
   20 Jun 2011; Martin Väth <martin@mvath.de>
   Update patches for grsecurity.
 
diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest
index 5ba03851..ea6a75cb 100644
--- a/sys-fs/aufs2/Manifest
+++ b/sys-fs/aufs2/Manifest
@@ -1,6 +1,7 @@
 AUX grsecurity-2.2.0.patch 2848 RMD160 61142a27036467d48a66d4b590171c5fb72192c3 SHA1 0e3c495007b9c054990aaa4c1f1811f35cce93b3 SHA256 af56dc71ffb54a765eacdcd471b0a875be675234dbd2cdaf92ecd8eda56edc54
 AUX grsecurity-2.2.1.patch 2925 RMD160 52e4ab7239584b1e9d2fd46d0e6c577c3d1033ef SHA1 bf2da73972f4b30bf5a256495470481f60c25fc2 SHA256 57aa9ec3bb8e7907f0fc3c060d7c4cee938a8f55770927138ba891a04877a321
 AUX grsecurity-2.2.2.patch 2900 RMD160 e1db89f795c55c8a672e05381df8ce4ca0e3c331 SHA1 61facafac814f5b4f64a7a4011ec56207a8340ca SHA256 d4d7b8e1db85f57f77218d705a1f2e9de77da1e3c5b991da2704a1a405a40cf8
-EBUILD aufs2-99999999.ebuild 4366 RMD160 fbe344d510d6d1cde6d6c2a5224d831be90bb031 SHA1 d5afeafe856f95f9ebaf19fed4e4217dd8595bed SHA256 efecbbeb03eab440f4b5e79c46d4a045072915edaddf9122eda8de9cf6a4fd41
-MISC ChangeLog 1717 RMD160 4f0539827ea5e677138b8d7b1f7a62466e5c56c0 SHA1 dc3c6b4bd8b2d10fe54ba73b0050ddd8f897038f SHA256 00f6a4ca1b1b14eb3360953d5ba9afa65c2058311059d53907f2e7ccce3e386f
-MISC metadata.xml 264 RMD160 4c10b5dfc6857fcb2e9cdc91ff64bb5d4a5c2204 SHA1 69886f7e401bdf99a78d428ff4361991607e86c6 SHA256 dd28333300fc1ec2dbd96450bddbdd9e1061c1eff809e687442c53c91c05d86d
+AUX grsecurity-2.2.2.r1.patch 316 RMD160 d580bf8eb45c1d00885094d19a69236f515422fd SHA1 95c8837f1482088d1e63d2dedea652e815f1f5b9 SHA256 c1d0d05b999d709702dbc20afffb818881f7dd8c6a4f6b7e286ff88cd742728e
+EBUILD aufs2-99999999.ebuild 5184 RMD160 60e2b09dac8c3cafe51e8ca45b568825dc2e3d26 SHA1 404b7af880695d0e8ad23ada45ce737212aa8c02 SHA256 861b476c46427d5dcee46ee17adeb8b5951894733568be374a0e68f7fedd41df
+MISC ChangeLog 1940 RMD160 c278b39885b6002dbfc2e9ede08a6f3cd6da0368 SHA1 577bdafa5c2d5d0d7b8e528c36784eba1d80474b SHA256 01bd67aa81ac5cd15a9968ebbe4d4adfd73e8806db11f0c98b7ef27dfbc46117
+MISC metadata.xml 464 RMD160 c246d8bfe5ee95703e61a5d5a764205aba8178ab SHA1 55b3b6c2ae1f41fe2f20493a3db6bb634b431336 SHA256 4e8e84f03c714b651854a39ffb5b6b487bed1d5dab7d32837e955675a40063a9
diff --git a/sys-fs/aufs2/aufs2-99999999.ebuild b/sys-fs/aufs2/aufs2-99999999.ebuild
index 902599d7..63b271f5 100644
--- a/sys-fs/aufs2/aufs2-99999999.ebuild
+++ b/sys-fs/aufs2/aufs2-99999999.ebuild
@@ -21,7 +21,7 @@ SLOT="0"
 # that the user unmasks this ebuild with ACCEPT_KEYWORDS='**'
 #KEYWORDS="~amd64 ~x86"
 KEYWORDS=""
-IUSE="kernel-patch"
+IUSE="kernel-patch all-patches"
 PROPERTIES="live"
 
 RDEPEND=""
@@ -66,7 +66,13 @@ apply_my_patchlist() {
 	fi
 	set --
 	for i in "${my_patchlist[@]}"
-	do	apply_my_patch ${r} "${i}" || set -- "${@}" "${i}"
+	do	if use all-patches || case "${i}" in
+		aufs*)	:;;
+		*)	false;;
+		esac
+		then	apply_my_patch ${r} "${i}" || set -- "${@}" "${i}"
+		else	einfo "Kernel patch ${i} - skipping as all-patches is not set"
+		fi
 	done
 	for i
 	do	apply_my_patch ${r} "${i}" || \
@@ -113,13 +119,37 @@ pkg_setup() {
 	(
 		set --
 		cd -- "${KV_DIR}" >/dev/null 2>&1 && \
-		fill_my_patchlist aufs* && apply_my_patchlist -R
+		fill_my_patchlist *.patch *.diff && apply_my_patchlist -R
 	)
 }
 
 src_prepare() {
-	local i j
-	for i in 2.2.0 2.2.1 2.2.2
+	local i j w v newest all
+	all="2.2.0  2.2.1  2.2.2  2.2.2.r1"
+	newest="${all##* }"
+	v=''
+	for i in ${GRSECURITYPATCHVER-+}
+	do	case "${i}" in
+		'+')	j="${newest}";;
+		'*')	j="${all}";;
+		*)	w=:
+			for j in ${newest}
+			do	[ "${i}" = "${j}" ] && w=false && continue
+			done
+			${w} && ewarn "GRSECURITYPATCHVER contains bad version ${i}"
+			j="${i}";;
+		esac
+		v="${v} ${j}"
+	done
+	v="${v# }"
+	elog
+	elog "Using GRSECURITYPATCHVER: ${v}"
+	elog "If you want other patches, set GRSECURITYPATCHVER to some or more of:"
+	elog "${all}  +"
+	elog "The special value + means the newest version (${newest}) and is default."
+	elog "The special value * means all versions."
+	elog
+	for i in ${v}
 	do	j="grsecurity-${i}.patch"
 		cp -p -- "${FILESDIR}/${j}" "aufs2-${j}" || die "copying ${j} failed"
 	done
diff --git a/sys-fs/aufs2/files/grsecurity-2.2.2.r1.patch b/sys-fs/aufs2/files/grsecurity-2.2.2.r1.patch
new file mode 100644
index 00000000..25e9a1ed
--- /dev/null
+++ b/sys-fs/aufs2/files/grsecurity-2.2.2.r1.patch
@@ -0,0 +1,11 @@
+--- linux/include/linux/fs.h
++++ linux/include/linux/fs.h
+@@ -615,7 +615,7 @@
+ 	int (*is_partially_uptodate) (struct page *, read_descriptor_t *,
+ 					unsigned long);
+ 	int (*error_remove_page)(struct address_space *, struct page *);
+-};
++} __no_const;
+ 
+ extern const struct address_space_operations empty_aops;
+ 
diff --git a/sys-fs/aufs2/metadata.xml b/sys-fs/aufs2/metadata.xml
index 0c91bdcd..ff0d3bf7 100644
--- a/sys-fs/aufs2/metadata.xml
+++ b/sys-fs/aufs2/metadata.xml
@@ -6,4 +6,8 @@
 	<email>martin@mvath.de</email>
 	<name>Martin Väth</name>
 </maintainer>
+<use>
+	<flag name="kernel-patch">Apply the aufs2 kernel patches instead of just copying them</flag>
+	<flag name="all-patches">Apply all patches - also those which do not start with aufs</flag>
+</use>
 </pkgmetadata>