Bug #330745: Grub needs executable stack. No version bump yet, new revbump with patchset coming in a few days.

Package-Manager: portage-2.2_rc71/cvs/Linux x86_64

3 files changed, 12 insertions, 15 deletions

diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog
index a1a5713633e2..21b7610565ba 100644
--- a/sys-boot/grub/ChangeLog
+++ b/sys-boot/grub/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-boot/grub
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.143 2010/08/24 22:52:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.144 2010/09/02 21:18:09 robbat2 Exp $
+
+  02 Sep 2010; Robin H. Johnson <robbat2@gentoo.org> grub-0.97-r10.ebuild:
+  Bug #330745: Grub needs executable stack. No version bump yet, new revbump
+  with patchset coming in a few days.
 
   24 Aug 2010; Mike Frysinger <vapier@gentoo.org> grub-9999.ebuild:
   Redo autotool generation now that upstream uses python/autogen #334333.
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index b6a4c0e1c57c..4760fbedc183 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX grub-0.97-gpt.patch 10682 RMD160 53dd38d52f2b38fb28dfb670d6fd27e47a562bbb SHA1 6057a076110d469fb63e56e57711d281221f9b42 SHA256 5e38046cfb727420e5b4b19d71c7fb4ddff22cbcc356c9f888763b0c1963d389
 AUX grub-1.96-genkernel.patch 634 RMD160 bc1fdaa51e3f0e3b777a303e0f1c76987c7e69e5 SHA1 e79384a3ac32bfd74c884ead8133b1691a743316 SHA256 8ee327465d9b6d704a78b0c7b31cfdee7c6e7e9f9897e8d0a86198430f0c6ea0
 AUX grub-1.99-genkernel.patch 703 RMD160 81af10caf107087fd65ee3710806fd4eb6b94b72 SHA1 c09ea4c94ed3fd8aaaefafa319f5d0bcc29c8c04 SHA256 04b0d6a30502d365fd5b320b666a8439f29061d788c74abeca1ebfaaf1c81774
@@ -28,7 +25,7 @@ EBUILD grub-0.94-r1.ebuild 3533 RMD160 d8c0867e559d32f667257436a82739cf76f7692a
 EBUILD grub-0.96-r1.ebuild 4747 RMD160 1fbaf2c1e712baf3cd7124b6e9ba58ba63ce631a SHA1 3e877e57f4a7618c7a3ebe374fa9f5ae39aae3f4 SHA256 a000bb83287a7d46a5637b60e477d8fedbf8c2b465074edf1ba3b21bca95a374
 EBUILD grub-0.96-r2.ebuild 4349 RMD160 8b59e7b7bcf02f6e6698bf785950988c71907e26 SHA1 5f068f5fcfd05a7769814d6fae868f77dea2ccf9 SHA256 cbaae5c519231d853e28e9a2799b08544e8b2a97c93d1905a21244d385b0e20c
 EBUILD grub-0.96-r3.ebuild 4580 RMD160 f0c3d0697bf808afa9e24c9a0acb007b8473e53b SHA1 2d7dd82a379afd847be5b129a090bb1e954ffd71 SHA256 2278f36b971d091471f39acd68902edf5e54fc88bc2d417e033fbf8128159e13
-EBUILD grub-0.97-r10.ebuild 8986 RMD160 8da885b4a9422b9b988042ed99e9bc6c8cf1028b SHA1 3f96aa9f8d1184b5d5aa453ba5283ad00e6121dd SHA256 60811d3ed28fdcea295a8c0ca4d94240abff2d5fdc5074d406b5c2a5c6aa288b
+EBUILD grub-0.97-r10.ebuild 9041 RMD160 222c0b84a3bd18b8f7fb26e7d543b607e569065d SHA1 1fddadda0e300f76dee11219159d235637196957 SHA256 61c67e65c657b621a265b02f4f6b90e2340d55427881c8528e4955f26908deae
 EBUILD grub-0.97-r2.ebuild 4854 RMD160 e78aaa77647ba2d658b9a89e1926110997ce4b2b SHA1 a63f69d34080940651bd3cd928cd18a0ac9402ab SHA256 d15e83fdb06d5a9d4cce0a84352ca4a20bc3cc5dd7861a12f1a1a500dea25429
 EBUILD grub-0.97-r3.ebuild 4723 RMD160 0becf2078d55ca28738106765ea54742c2aa209b SHA1 c0ce849f7273c070fed44cc4acddb2fecce6c2e5 SHA256 5f96e99ae205c151ea672842b5fd1708541d4efe16f79c03baf70fac5b1301b9
 EBUILD grub-0.97-r4.ebuild 4967 RMD160 a24281663a2b5ca3452a044f18dcd1a231870812 SHA1 01cecc3f8505585fc28519ead7d524c3ace778b5 SHA256 1c40a3df3ba6b09ecce9f9d4bc934d342e23d19c5fc1c5eccda589e219bf6e8e
@@ -39,12 +36,5 @@ EBUILD grub-0.97-r9.ebuild 8975 RMD160 14ff47a8de303aa73e2571ee1fcb1aae3f433be0
 EBUILD grub-0.97.ebuild 4527 RMD160 bc8dec8916cd52bbd0403d3e504f8a407d9e897c SHA1 7fc00e33d980842ed65b242ac53522b51894fa7c SHA256 2c20b9c10a242d15b17b48d73e5136c7f350cd313f77dd177c54a08f663be02a
 EBUILD grub-1.98.ebuild 2966 RMD160 63d5199e13c846ccc2a257ed66660c60859e40fa SHA1 0eaf688ac4eae081564d9a45cc7f55462c40bf32 SHA256 347de9c95cbf56754fccc6f47f340245bf15b630a4992ffe1f15ddb9fe71f004
 EBUILD grub-9999.ebuild 2994 RMD160 4b20e1e5ee4aa3df18a39e5c6bc1c19d1df88e0a SHA1 e4b823c306b84defe48a22b5d0601e7e150f916a SHA256 90317b69b81814be4a07f1a127e2c0dd3ff2c4eb560817259e9a97c306fe0b02
-MISC ChangeLog 29687 RMD160 6fb159fd1d3965256af33f30b547e5e270c27316 SHA1 c38750cc1b77e6856f4af63da0146d7fb8e67130 SHA256 5f0b34fe55d273d06adb612dbbaeb0140d62328f5854bf9aef5a39062663a94c
+MISC ChangeLog 29879 RMD160 ef45b25d2fea1c854140a0b14256777d2345de63 SHA1 20e32749ebff3d424ce69f5976094c69930fcc3c SHA256 8b92fee98f8d90d19e5cc9bd30f286853de6b1af90660efbb7903db0cded5c2a
 MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iF4EAREIAAYFAkx0TQYACgkQTwhj9JtAlp58nQEAoWEyNtu6fE28/tWNdwakzfFc
-x/HAJkjPZxbT2nnGsUcA/3Jt61lN8ZjX/EDfL6sbIUcPZPBAk2/7KUDrHgI4e5zh
-=aPgl
------END PGP SIGNATURE-----
diff --git a/sys-boot/grub/grub-0.97-r10.ebuild b/sys-boot/grub/grub-0.97-r10.ebuild
index 97b33ba23058..b07369ca9aea 100644
--- a/sys-boot/grub/grub-0.97-r10.ebuild
+++ b/sys-boot/grub/grub-0.97-r10.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r10.ebuild,v 1.4 2010/07/31 22:26:42 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r10.ebuild,v 1.5 2010/09/02 21:18:09 robbat2 Exp $
 
 # XXX: we need to review menu.lst vs grub.conf handling.  We've been converting
 #      all systems to grub.conf (and symlinking menu.lst to grub.conf), but
 #      we never updated any of the source code (it still all wants menu.lst),
 #      and there is no indication that upstream is making the transition.
 
-inherit mount-boot eutils flag-o-matic toolchain-funcs autotools linux-info
+inherit mount-boot eutils flag-o-matic toolchain-funcs autotools linux-info pax-utils
 
 PATCHVER="1.10" # Should match the revision ideally
 DESCRIPTION="GNU GRUB Legacy boot loader"
@@ -157,6 +157,9 @@ src_install() {
 		exeinto /usr/lib/grub/${CHOST}
 		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
 	fi
+	
+	# bug 330745
+	pax-mark -m "${D}"/sbin/grub
 
 	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
 	newdoc docs/menu.lst grub.conf.sample