sys-boot/grub: Fixing grub (again), this time hopefully fixing the segfaults.

svn path=/; revision=273

7 files changed, 32 insertions, 30 deletions

diff --git a/hardened/sys-boot/grub/Manifest b/hardened/sys-boot/grub/Manifest
index 67d22f6..1f38f51 100644
--- a/hardened/sys-boot/grub/Manifest
+++ b/hardened/sys-boot/grub/Manifest
@@ -16,14 +16,14 @@ EBUILD grub-0.92-r1.ebuild 2635 RMD160 8c11c17f30cdad3b49b368223ca8224ace6fc387
 MD5 dbe522bcddc446ce034e5a278d9d9fd8 grub-0.92-r1.ebuild 2635
 RMD160 8c11c17f30cdad3b49b368223ca8224ace6fc387 grub-0.92-r1.ebuild 2635
 SHA256 fdb5ce6d58b8cc78c2ecda25c9f2fd7015f7e1b34eadfe83e1b18877619e38d5 grub-0.92-r1.ebuild 2635
-EBUILD grub-0.94-r1.ebuild 3534 RMD160 e87d8f2a7104ad8ed96efe308d2f5f777e4d0135 SHA1 5e95ee2baf07315aaaeeb14df4ef65f4924ca433 SHA256 c04b30b5ccb8bb5b040b937ba54081ff0cfe429929cbe5fcc354ed31de15af55
-MD5 53d4edf8ec0689717e1884649d819b60 grub-0.94-r1.ebuild 3534
-RMD160 e87d8f2a7104ad8ed96efe308d2f5f777e4d0135 grub-0.94-r1.ebuild 3534
-SHA256 c04b30b5ccb8bb5b040b937ba54081ff0cfe429929cbe5fcc354ed31de15af55 grub-0.94-r1.ebuild 3534
-EBUILD grub-0.96-r1.ebuild 4763 RMD160 ebfa537404a6e80ad5f9daf11ce32654dcaa38fe SHA1 55c816a2dcf4cd748964cdebe5726ab86f3c7914 SHA256 7dc638412267f9298dfd7012b59073f3fd2885c99e41e49bc3d798e5b8bc7093
-MD5 4b35c924371d8be6b121baee582c34c2 grub-0.96-r1.ebuild 4763
-RMD160 ebfa537404a6e80ad5f9daf11ce32654dcaa38fe grub-0.96-r1.ebuild 4763
-SHA256 7dc638412267f9298dfd7012b59073f3fd2885c99e41e49bc3d798e5b8bc7093 grub-0.96-r1.ebuild 4763
+EBUILD grub-0.94-r1.ebuild 3567 RMD160 c941023b180adb6a04113096c141d6c2ab01b986 SHA1 e25a4abcf0d8bdd4093638a6553325b16d89ba1f SHA256 b426a53478a793b025c0cd0fe63dfa78ee6140c8f4aa999e56d05e96ab140fb5
+MD5 cc3d4f9e70bdb3a29fe1da218fc32498 grub-0.94-r1.ebuild 3567
+RMD160 c941023b180adb6a04113096c141d6c2ab01b986 grub-0.94-r1.ebuild 3567
+SHA256 b426a53478a793b025c0cd0fe63dfa78ee6140c8f4aa999e56d05e96ab140fb5 grub-0.94-r1.ebuild 3567
+EBUILD grub-0.96-r1.ebuild 4781 RMD160 f59508e89c6404de3ce6ca06fe1dedaaff6de474 SHA1 6e54e53873514d0515faec60df58f5d356ab0e3b SHA256 d466700e5fca91a2f41fcb0fa90196f99b7fcef24afde56b7d676c3f14d3dce9
+MD5 2d33ab8cd98870128971de5dd90db5be grub-0.96-r1.ebuild 4781
+RMD160 f59508e89c6404de3ce6ca06fe1dedaaff6de474 grub-0.96-r1.ebuild 4781
+SHA256 d466700e5fca91a2f41fcb0fa90196f99b7fcef24afde56b7d676c3f14d3dce9 grub-0.96-r1.ebuild 4781
 EBUILD grub-0.96-r2.ebuild 4343 RMD160 25a2d4263261501e48e6bbedb7fb4761f710778e SHA1 f326fa4e29af49e1a92e0e0604bfa2bf5fadd172 SHA256 3be87c06ae7f39ea3ac8c00befab972f5c1b56da31d9db7d1aede49a8ae1f246
 MD5 b7ac03c16036071c6f0b622e2ed814aa grub-0.96-r2.ebuild 4343
 RMD160 25a2d4263261501e48e6bbedb7fb4761f710778e grub-0.96-r2.ebuild 4343
@@ -32,22 +32,22 @@ EBUILD grub-0.96-r3.ebuild 4577 RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb
 MD5 80623fad414fd78bb04b0479b94d76df grub-0.96-r3.ebuild 4577
 RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb grub-0.96-r3.ebuild 4577
 SHA256 bbd95b515988ee477725067b1778d0c39665bdce66e61f2e7a9e374a425ac53c grub-0.96-r3.ebuild 4577
-EBUILD grub-0.97-r2.ebuild 4858 RMD160 15b1dfe6e21b4e89b367674ec66c2469e49cb309 SHA1 fcdd79d7b149b2385e4d1eb38c071378e7840601 SHA256 acdf57e9cc3f1f26595ea8a6db87cafebad6071fc361396a885ad8efdc34b66e
-MD5 738595dab9be6c3b4af4a632b7b794c7 grub-0.97-r2.ebuild 4858
-RMD160 15b1dfe6e21b4e89b367674ec66c2469e49cb309 grub-0.97-r2.ebuild 4858
-SHA256 acdf57e9cc3f1f26595ea8a6db87cafebad6071fc361396a885ad8efdc34b66e grub-0.97-r2.ebuild 4858
-EBUILD grub-0.97-r3.ebuild 4690 RMD160 d2bb9c1e32dcd23ece4d6f653a5a09a8ebba6e6e SHA1 71f5dd8b8256a5a0214394a86937aa2ba510c81f SHA256 1ff04a2f6d86541e4b916b51f75dbfa55c3f1b5341c0eb6c55d903f9b1d4f490
-MD5 3789208f487dd27ac25cdc4d4751489e grub-0.97-r3.ebuild 4690
-RMD160 d2bb9c1e32dcd23ece4d6f653a5a09a8ebba6e6e grub-0.97-r3.ebuild 4690
-SHA256 1ff04a2f6d86541e4b916b51f75dbfa55c3f1b5341c0eb6c55d903f9b1d4f490 grub-0.97-r3.ebuild 4690
-EBUILD grub-0.97.ebuild 4539 RMD160 0cf547b860260ed46104f5185297928f36f892c7 SHA1 4366f305f92f982ac908a7ca248edf30f6fe3910 SHA256 46b5658a199d269da2ff8a8261783e84509230ff91bba43ed635995356f129bb
-MD5 b297b3f3f9baca28d95a9e092ca62c8d grub-0.97.ebuild 4539
-RMD160 0cf547b860260ed46104f5185297928f36f892c7 grub-0.97.ebuild 4539
-SHA256 46b5658a199d269da2ff8a8261783e84509230ff91bba43ed635995356f129bb grub-0.97.ebuild 4539
-EBUILD grub-1.95.ebuild 965 RMD160 ffbbe0d5559de93bc80c58bf2565475e796c4ef8 SHA1 363041a533f26e85eefd48f14c40be2fc046b04c SHA256 fd0ef87c8ca025f78bb686f7a216707ab94e2d000121c39ea7f737014b739643
-MD5 204df1e1dc2745a29186832a66b25fe3 grub-1.95.ebuild 965
-RMD160 ffbbe0d5559de93bc80c58bf2565475e796c4ef8 grub-1.95.ebuild 965
-SHA256 fd0ef87c8ca025f78bb686f7a216707ab94e2d000121c39ea7f737014b739643 grub-1.95.ebuild 965
+EBUILD grub-0.97-r2.ebuild 4876 RMD160 ada1c2bdada2fbcebaf6502c2854fff8e6d256c0 SHA1 566dcea350ea246a0d9bc54521658ce5e54d749e SHA256 4086c3682e4e9a42163ea9e4537b73cbd716d219734bdb4de1063a38cb74dcaf
+MD5 becb393a218939ff051dd710c36a5081 grub-0.97-r2.ebuild 4876
+RMD160 ada1c2bdada2fbcebaf6502c2854fff8e6d256c0 grub-0.97-r2.ebuild 4876
+SHA256 4086c3682e4e9a42163ea9e4537b73cbd716d219734bdb4de1063a38cb74dcaf grub-0.97-r2.ebuild 4876
+EBUILD grub-0.97-r3.ebuild 4708 RMD160 5b8345fbc6f5d7d0b35c16e3e0835460ed6bd786 SHA1 903a32056747606ed92ae4aedfa08e290b53d8da SHA256 3f1eb6c792eab07e660286e5ff7b997c5ec6be63c1d0ab307e3091b5cc250259
+MD5 7a31c7ce4cd13208980b52860aa119cb grub-0.97-r3.ebuild 4708
+RMD160 5b8345fbc6f5d7d0b35c16e3e0835460ed6bd786 grub-0.97-r3.ebuild 4708
+SHA256 3f1eb6c792eab07e660286e5ff7b997c5ec6be63c1d0ab307e3091b5cc250259 grub-0.97-r3.ebuild 4708
+EBUILD grub-0.97.ebuild 4557 RMD160 00c8eabb318c7bfbb441220d80071e0de731b4c4 SHA1 52ea334e494eb8d03b233318e17fdec82f72878d SHA256 627804a672ca7b1693a4ea8c59d7315c7a67242e2e7f423e0bed2482ef39de2e
+MD5 053d688e3e1068842f48915f5c7d06e4 grub-0.97.ebuild 4557
+RMD160 00c8eabb318c7bfbb441220d80071e0de731b4c4 grub-0.97.ebuild 4557
+SHA256 627804a672ca7b1693a4ea8c59d7315c7a67242e2e7f423e0bed2482ef39de2e grub-0.97.ebuild 4557
+EBUILD grub-1.95.ebuild 983 RMD160 c06137346c6e513679820b263c52e2edef0e882d SHA1 aa5c2137ca1abc6e010b3b4005aa23869129d6fc SHA256 4aa90f95b36a794754723c9cd61d2ec00c4a092678064ba08bfb068368f8a125
+MD5 eacbf06f7e3288bf10643256ccfe9a2c grub-1.95.ebuild 983
+RMD160 c06137346c6e513679820b263c52e2edef0e882d grub-1.95.ebuild 983
+SHA256 4aa90f95b36a794754723c9cd61d2ec00c4a092678064ba08bfb068368f8a125 grub-1.95.ebuild 983
 MD5 a350d0404e6abe9097c314bde03d7b06 files/digest-grub-0.92-r1 708
 RMD160 dae709227b402c951ee6539812fb415d597d6708 files/digest-grub-0.92-r1 708
 SHA256 65ee4cd4417664ae5b5b7102978271a863f3f53b686e759d1285a859c9b3275b files/digest-grub-0.92-r1 708
diff --git a/hardened/sys-boot/grub/grub-0.94-r1.ebuild b/hardened/sys-boot/grub/grub-0.94-r1.ebuild
index 680e717..4665041 100644
--- a/hardened/sys-boot/grub/grub-0.94-r1.ebuild
+++ b/hardened/sys-boot/grub/grub-0.94-r1.ebuild
@@ -51,7 +51,7 @@ src_compile() {
 	### incompatible system.
 	unset CFLAGS
 
-	filter-ldflags -pie -fPIE
+	filter-ldflags -pie
 	append-flags -DNDEBUG
 	[ `gcc-major-version` -eq 3 ] && append-flags -minline-all-stringops
 	use static && append-ldflags -static
@@ -60,6 +60,8 @@ src_compile() {
 	aclocal || die
 	WANT_AUTOMAKE=1.7 automake || die
 
+	filter-flags -fPIE -fstack-protector
+
 	# build the net-bootable grub first
 	CFLAGS="" \
 	econf \
diff --git a/hardened/sys-boot/grub/grub-0.96-r1.ebuild b/hardened/sys-boot/grub/grub-0.96-r1.ebuild
index 6f071c7..5005139 100644
--- a/hardened/sys-boot/grub/grub-0.96-r1.ebuild
+++ b/hardened/sys-boot/grub/grub-0.96-r1.ebuild
@@ -71,7 +71,7 @@ src_compile() {
 	# -fno-stack-protector detected by configure, removed from netboot's emake.
 	use custom-cflags || unset CFLAGS
 
-	filter-flags -fPIE
+	filter-flags -fPIE -fstack-protector
 
 	export grub_cv_prog_objcopy_absolute=yes #79734
 	use static && append-ldflags -static
diff --git a/hardened/sys-boot/grub/grub-0.97-r2.ebuild b/hardened/sys-boot/grub/grub-0.97-r2.ebuild
index 6844a18..d099cb1 100644
--- a/hardened/sys-boot/grub/grub-0.97-r2.ebuild
+++ b/hardened/sys-boot/grub/grub-0.97-r2.ebuild
@@ -65,7 +65,7 @@ src_compile() {
 	# -fno-stack-protector detected by configure, removed from netboot's emake.
 	use custom-cflags || unset CFLAGS
 
-	filter-flags -fPIE
+	filter-flags -fPIE -fstack-protector
 
 	export grub_cv_prog_objcopy_absolute=yes #79734
 	use static && append-ldflags -static
diff --git a/hardened/sys-boot/grub/grub-0.97-r3.ebuild b/hardened/sys-boot/grub/grub-0.97-r3.ebuild
index 7abb68c..c68c51e 100644
--- a/hardened/sys-boot/grub/grub-0.97-r3.ebuild
+++ b/hardened/sys-boot/grub/grub-0.97-r3.ebuild
@@ -58,7 +58,7 @@ src_compile() {
 	export grub_cv_prog_objcopy_absolute=yes #79734
 	use static && append-ldflags -static
 
-	filter-flags -fPIE
+	filter-flags -fPIE -fstack-protector
 
 	# build the net-bootable grub first, but only if "netboot" is set
 	if use netboot ; then
diff --git a/hardened/sys-boot/grub/grub-0.97.ebuild b/hardened/sys-boot/grub/grub-0.97.ebuild
index 5a6e2e7..8158b18 100644
--- a/hardened/sys-boot/grub/grub-0.97.ebuild
+++ b/hardened/sys-boot/grub/grub-0.97.ebuild
@@ -70,7 +70,7 @@ src_compile() {
 	# -fno-stack-protector detected by configure, removed from netboot's emake.
 	use custom-cflags || unset CFLAGS
 
-	filter-flags -fPIE
+	filter-flags -fPIE -fstack-protector
 
 	export grub_cv_prog_objcopy_absolute=yes #79734
 	use static && append-ldflags -static
diff --git a/hardened/sys-boot/grub/grub-1.95.ebuild b/hardened/sys-boot/grub/grub-1.95.ebuild
index 9883e36..8b5a75a 100644
--- a/hardened/sys-boot/grub/grub-1.95.ebuild
+++ b/hardened/sys-boot/grub/grub-1.95.ebuild
@@ -23,7 +23,7 @@ src_compile() {
 	use custom-cflags || unset CFLAGS LDFLAGS
 	use static && append-ldflags -static
 
-	filter-flags -fPIE
+	filter-flags -fPIE -fstack-protector
 
 	econf \
 		--prefix=/ \