* [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r1.ebuild ChangeLog grub-9999.ebuild
@ 2011-08-31 11:27 Alexey Shvetsov (alexxy)
0 siblings, 0 replies; only message in thread
From: Alexey Shvetsov (alexxy) @ 2011-08-31 11:27 UTC (permalink / raw
To: gentoo-commits
alexxy 11/08/31 11:27:51
Modified: grub-1.99-r1.ebuild ChangeLog grub-9999.ebuild
Log:
[sys-boot/grub] Fix grub2 install on hardened systems
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Revision Changes Path
1.2 sys-boot/grub/grub-1.99-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild?r1=1.1&r2=1.2
Index: grub-1.99-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.99-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grub-1.99-r1.ebuild 28 Aug 2011 10:50:33 -0000 1.1
+++ grub-1.99-r1.ebuild 31 Aug 2011 11:27:51 -0000 1.2
@@ -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 @@
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 @@
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
1.163 sys-boot/grub/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.163&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?rev=1.163&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/ChangeLog?r1=1.162&r2=1.163
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- ChangeLog 30 Aug 2011 06:45:04 -0000 1.162
+++ ChangeLog 31 Aug 2011 11:27:51 -0000 1.163
@@ -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.
1.40 sys-boot/grub/grub-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.40&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?rev=1.40&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-boot/grub/grub-9999.ebuild?r1=1.39&r2=1.40
Index: grub-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-9999.ebuild,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- grub-9999.ebuild 28 Aug 2011 10:50:33 -0000 1.39
+++ grub-9999.ebuild 31 Aug 2011 11:27:51 -0000 1.40
@@ -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 @@
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 @@
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-08-31 11:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-31 11:27 [gentoo-commits] gentoo-x86 commit in sys-boot/grub: grub-1.99-r1.ebuild ChangeLog grub-9999.ebuild Alexey Shvetsov (alexxy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox