[sys-boot/grub] Fix grub2 install on hardened systems

(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)

3 files changed, 45 insertions, 5 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index 101cc23faefd..554ea6e2cfa3 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.162 2011/08/30 06:45:04 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.163 2011/08/31 11:27:51 alexxy Exp $
+
+  31 Aug 2011; Alexey Shvetsov <alexxy@gentoo.org> grub-1.99-r1.ebuild,
+  grub-9999.ebuild:
+  Fix grub2 install on hardened systems
 
   30 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org> files/grub.default:
   Fix typo entrys -> entries.
diff --git a/sys-boot/grub/grub-1.99-r1.ebuild b/sys-boot/grub/grub-1.99-r1.ebuild
index f6142f833214..7d48192597aa 100644
--- a/sys-boot/grub/grub-1.99-r1.ebuild
+++ b/sys-boot/grub/grub-1.99-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild,v 1.1 2011/08/28 10:50:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild,v 1.2 2011/08/31 11:27:51 alexxy Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
+inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${LIVE_ECLASS}
 unset LIVE_ECLASS
 
 DESCRIPTION="GNU GRUB boot loader"
@@ -211,6 +211,24 @@ src_install() {
 	mv "${ED}"/usr/share/info/grub.info \
 		"${ED}"/usr/share/info/grub2.info || die
 
+	# Do pax marking
+	local PAX=(
+		"sbin/grub2-probe"
+		"sbin/grub2-setup"
+		"sbin/grub2-mkdevicemap"
+		"bin/grub2-script-check"
+		"bin/grub2-fstest"
+		"bin/grub2-mklayout"
+		"bin/grub2-menulst2cfg"
+		"bin/grub2-mkrelpath"
+		"bin/grub2-mkpasswd-pbkdf2"
+		"bin/grub2-editenv"
+		"bin/grub2-mkimage"
+	)
+	for e in ${PAX[@]}; do
+		pax-mark -mpx "${ED}/${e}"
+	done
+
 	# can't be in docs array as we use defualt_src_install in different builddir
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	insinto /etc/default
diff --git a/sys-boot/grub/grub-9999.ebuild b/sys-boot/grub/grub-9999.ebuild
index d379c1baca06..60f118802b45 100644
--- a/sys-boot/grub/grub-9999.ebuild
+++ b/sys-boot/grub/grub-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.39 2011/08/28 10:50:33 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v 1.40 2011/08/31 11:27:51 alexxy Exp $
 
 EAPI=4
 
@@ -15,7 +15,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-inherit mount-boot eutils flag-o-matic toolchain-funcs ${LIVE_ECLASS}
+inherit mount-boot eutils flag-o-matic pax-utils toolchain-funcs ${LIVE_ECLASS}
 unset LIVE_ECLASS
 
 DESCRIPTION="GNU GRUB boot loader"
@@ -211,6 +211,24 @@ src_install() {
 	mv "${ED}"/usr/share/info/grub.info \
 		"${ED}"/usr/share/info/grub2.info || die
 
+	# Do pax marking
+	local PAX=(
+		"sbin/grub2-probe"
+		"sbin/grub2-setup"
+		"sbin/grub2-mkdevicemap"
+		"bin/grub2-script-check"
+		"bin/grub2-fstest"
+		"bin/grub2-mklayout"
+		"bin/grub2-menulst2cfg"
+		"bin/grub2-mkrelpath"
+		"bin/grub2-mkpasswd-pbkdf2"
+		"bin/grub2-editenv"
+		"bin/grub2-mkimage"
+	)
+	for e in ${PAX[@]}; do
+		pax-mark -mpx "${ED}/${e}"
+	done
+
 	# can't be in docs array as we use defualt_src_install in different builddir
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 	insinto /etc/default