sys-boot/grub: Adding an modified ebuild to my overlay, that should fix the bug I was seeing with the new hardened toolchain (#168834 - thanks to Kevin).

svn path=/; revision=272

19 files changed, 1374 insertions, 0 deletions

diff --git a/hardened/sys-boot/grub/Manifest b/hardened/sys-boot/grub/Manifest
new file mode 100644
index 0000000..67d22f6
--- /dev/null
+++ b/hardened/sys-boot/grub/Manifest
@@ -0,0 +1,77 @@
+DIST grub-0.92-gentoo-0.2.tar.bz2 21727 RMD160 f420e3352d46fdfb77a1121879382265805bc3ef SHA1 1bb1463067679aab909d1bd96996cfa72556de81 SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe
+DIST grub-0.92.tar.gz 877112 RMD160 97b377a542d415a73c681f2d4c2f57d28e708644 SHA1 15bd5aaa816728583235ab0d5477c1ac32855583 SHA256 197e690faed45bcbf854ab5dc591053d6f6ed1a5b8e5596c4ba27d6f0d50eb37
+DIST grub-0.94-gentoo-0.1.tar.bz2 40585 RMD160 49ddf70f7f1b3c5ac0d72408d5cfcb924df07a4c SHA1 f59333af3d4fc7b8d77c876ef956681f7cc335cb SHA256 6f5ac30e0495917cd062c48568bab582f68f288bb3fe4fb968869fdefcd012e3
+DIST grub-0.94.tar.gz 923518 RMD160 144e085e2eb139f135a7e6eb65d15489da4cf225 SHA1 12e0a2b7b6ee998232b057a8182ae54c33a6e0c5 SHA256 010d15c823cbccc7b5943735799bf8412ae18391307d4c2d5f8dbed158cc4a1b
+DIST grub-0.96-patches-1.0.tar.bz2 49828 RMD160 baa7cadabff9896bb784e32f3283c008fa3d05db SHA1 d10c873c3f94deca3f49645f39b44672193be69c SHA256 3d31cab8131d728673d1b866890a54f7652cab23dc2c4b9499e1f51f0ea6e956
+DIST grub-0.96-r1-gentoo-0.1.tar.bz2 47051 RMD160 6dea68ba610fd68c99cf2080648df9a66469450b SHA1 1bffd82bd6afdf0e568ca2006fe5f0219182a5cf SHA256 3457a18707a0c733cc9e6caea5b41ce182b55add08bc69aa5b4e2fb92676431e
+DIST grub-0.96-r2-gentoo-0.1.tar.bz2 47639 RMD160 fceb2193a32e8657390045cfc390829aa056fd5d SHA1 9fcb15861e9c9ec4d46fa80a6c91402c7f3e05dc SHA256 78fabb16c53518a3e96b9984ee49258ed5cdf23b8c33591c38ddf84912ea7e6c
+DIST grub-0.96.tar.gz 985761 RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa SHA1 2520b03c8990ffe900cfc4fabd800d1056014f48 SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba
+DIST grub-0.97-patches-1.0.tar.bz2 46259 RMD160 8c16108b1bf75d373f4d9a2f083699139ff62753 SHA1 36184739f02b582bbe76857d83aae7ea81a06e7e SHA256 b3b9f1998e42684b452cf9793523a1654af8fdf82ab208a8731a32c8eeaacb8f
+DIST grub-0.97-patches-1.2.tar.bz2 20872 RMD160 7d91e01873f52daad271eda85e67f031e72570c9 SHA1 d9a11b6142931baeb8d13adb06fc86706ea17e3d SHA256 0a41e076ce1c1dd92b4eaac2905ebd5624162b5258ed0cb234889fa8beb38049
+DIST grub-0.97-patches-1.4.tar.bz2 24693 RMD160 6afefff73b5f3ab5c6d05563c4f67f37dbfce16c SHA1 7c26a941467b58380747c9d1e07c14dfc3998b10 SHA256 290dd96fdeb9471c516f061f4949ccda33f8d03ab81a6e2beb5005b3022e71da
+DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA1 2580626c4579bd99336d3af4482c346c95dac4fb SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b
+DIST grub-1.95.tar.gz 519269 RMD160 bce7d8790b47f3ce7fa4ce7ac61242cc242ad5da SHA1 6691f7c2f64a1de03f3bc2304fa2c83e92050cc3 SHA256 d40c88f1da2919c252500c4cae0de6e9e1a368695117a7a23c4e07d2b4b9b769
+DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
+EBUILD grub-0.92-r1.ebuild 2635 RMD160 8c11c17f30cdad3b49b368223ca8224ace6fc387 SHA1 e8b9e97af148ddbaaacc50d783600076d067a93c SHA256 fdb5ce6d58b8cc78c2ecda25c9f2fd7015f7e1b34eadfe83e1b18877619e38d5
+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.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
+SHA256 3be87c06ae7f39ea3ac8c00befab972f5c1b56da31d9db7d1aede49a8ae1f246 grub-0.96-r2.ebuild 4343
+EBUILD grub-0.96-r3.ebuild 4577 RMD160 4a1ac26fd3cce98617883b620255761b98cc8deb SHA1 04c61e8f7e638c3ecf8753ea02bd997f759726b9 SHA256 bbd95b515988ee477725067b1778d0c39665bdce66e61f2e7a9e374a425ac53c
+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
+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
+MD5 1658acdeeb7a6eaf980db2ffc2f70049 files/digest-grub-0.94-r1 708
+RMD160 7dc436c7328a63d1365b9e4a52e04fb3761b1821 files/digest-grub-0.94-r1 708
+SHA256 a127a84f5a12c2708dcabac4119a19cd19a7ba44c7ab4473e10a386b6b6dd421 files/digest-grub-0.94-r1 708
+MD5 2347e1b33cda6434b239a3f8376ec474 files/digest-grub-0.96-r1 717
+RMD160 7a2f3a08bd41817a86ad98bf1337890a17008f6d files/digest-grub-0.96-r1 717
+SHA256 f77224d915ffe62e13296661f6d685397c63ea57c3a5edca7d7930c28357337c files/digest-grub-0.96-r1 717
+MD5 ff60dcc93226df482438b1c9f96368ec files/digest-grub-0.96-r2 717
+RMD160 182926c763a82488353c94a5df954c265abc9a17 files/digest-grub-0.96-r2 717
+SHA256 d0f1f8709be17bacc9ec91604209c2fdf7296e21f965880c98f60412741fa954 files/digest-grub-0.96-r2 717
+MD5 500f29f90648b5f4e33b585a82a1ef4b files/digest-grub-0.96-r3 711
+RMD160 a456fe359eec1d90be612a77d51823e0026852d5 files/digest-grub-0.96-r3 711
+SHA256 5d0b53de0abf2a102afcf9a87e1d39a507c6eb4955c60dfb3c6cb0e9a92c7027 files/digest-grub-0.96-r3 711
+MD5 3ec625383a1d66c82b6896db9a23c050 files/digest-grub-0.97 711
+RMD160 3050ceb246ff64cf39a512cc96c7c5122ed4b600 files/digest-grub-0.97 711
+SHA256 a9b9d0d6eda41218f5011138aa52a4bb1bcab702da1b1342fed3d275d1d1bd9c files/digest-grub-0.97 711
+MD5 660ca8ffb71c2a1008754fc599c5dc32 files/digest-grub-0.97-r2 711
+RMD160 17ed023bb1e3e7eb935ae3b5d6f46a1447ae4ae7 files/digest-grub-0.97-r2 711
+SHA256 b0934e5e43d1417abb03e4adc7fbe5b3b6c36bc4db651ceaf832a6eff42bb931 files/digest-grub-0.97-r2 711
+MD5 95650f97ede7437cc0f34b5a519fafd1 files/digest-grub-0.97-r3 711
+RMD160 f89bb19df1610b09fae5ffed1c4b06572ee38ce9 files/digest-grub-0.97-r3 711
+SHA256 8d0b3d6a65d423c40eb72ac88673e653204c2aa4c579e5284f2c327b6b782342 files/digest-grub-0.97-r3 711
+MD5 5b751b3561077f157fe7ce25daceaa3f files/digest-grub-1.95 229
+RMD160 85c7f6ef9d260dfe9049ed77c2d473086548e969 files/digest-grub-1.95 229
+SHA256 fe0d1d73c9724dd4653eb68231878133e6d00f1e33bb3f38dc73c249efa02631 files/digest-grub-1.95 229
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.92-r1 b/hardened/sys-boot/grub/files/digest-grub-0.92-r1
new file mode 100644
index 0000000..bb0332e
--- /dev/null
+++ b/hardened/sys-boot/grub/files/digest-grub-0.92-r1
@@ -0,0 +1,9 @@
+MD5 a74911d3f1a25d06b3243df70bf6e892 grub-0.92-gentoo-0.2.tar.bz2 21727
+RMD160 f420e3352d46fdfb77a1121879382265805bc3ef grub-0.92-gentoo-0.2.tar.bz2 21727
+SHA256 f579b49b2d24702905c333ce2b6170a554ce26d0232c65478a21a1fd2eb8b8fe grub-0.92-gentoo-0.2.tar.bz2 21727
+MD5 50f2786e7bf96b1115ee82b9c101a816 grub-0.92.tar.gz 877112
+RMD160 97b377a542d415a73c681f2d4c2f57d28e708644 grub-0.92.tar.gz 877112
+SHA256 197e690faed45bcbf854ab5dc591053d6f6ed1a5b8e5596c4ba27d6f0d50eb37 grub-0.92.tar.gz 877112
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.94-r1 b/hardened/sys-boot/grub/files/digest-grub-0.94-r1
new file mode 100644
index 0000000..9d6727a
--- /dev/null
+++ b/hardened/sys-boot/grub/files/digest-grub-0.94-r1
@@ -0,0 +1,9 @@
+MD5 636201ec318c19987d59c762abcf78f6 grub-0.94-gentoo-0.1.tar.bz2 40585
+RMD160 49ddf70f7f1b3c5ac0d72408d5cfcb924df07a4c grub-0.94-gentoo-0.1.tar.bz2 40585
+SHA256 6f5ac30e0495917cd062c48568bab582f68f288bb3fe4fb968869fdefcd012e3 grub-0.94-gentoo-0.1.tar.bz2 40585
+MD5 299672a99cf59656e653d8ffd7851b56 grub-0.94.tar.gz 923518
+RMD160 144e085e2eb139f135a7e6eb65d15489da4cf225 grub-0.94.tar.gz 923518
+SHA256 010d15c823cbccc7b5943735799bf8412ae18391307d4c2d5f8dbed158cc4a1b grub-0.94.tar.gz 923518
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.96-r1 b/hardened/sys-boot/grub/files/digest-grub-0.96-r1
new file mode 100644
index 0000000..22bfc4f
--- /dev/null
+++ b/hardened/sys-boot/grub/files/digest-grub-0.96-r1
@@ -0,0 +1,9 @@
+MD5 46235df4ac250f586a07076cd6e907b9 grub-0.96-r1-gentoo-0.1.tar.bz2 47051
+RMD160 6dea68ba610fd68c99cf2080648df9a66469450b grub-0.96-r1-gentoo-0.1.tar.bz2 47051
+SHA256 3457a18707a0c733cc9e6caea5b41ce182b55add08bc69aa5b4e2fb92676431e grub-0.96-r1-gentoo-0.1.tar.bz2 47051
+MD5 47c228c88f848873288ad1cd04cc93f0 grub-0.96.tar.gz 985761
+RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa grub-0.96.tar.gz 985761
+SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba grub-0.96.tar.gz 985761
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.96-r2 b/hardened/sys-boot/grub/files/digest-grub-0.96-r2
new file mode 100644
index 0000000..cf60991
--- /dev/null
+++ b/hardened/sys-boot/grub/files/digest-grub-0.96-r2
@@ -0,0 +1,9 @@
+MD5 6a7a342fecc62e2d54fa3764b91efa7d grub-0.96-r2-gentoo-0.1.tar.bz2 47639
+RMD160 fceb2193a32e8657390045cfc390829aa056fd5d grub-0.96-r2-gentoo-0.1.tar.bz2 47639
+SHA256 78fabb16c53518a3e96b9984ee49258ed5cdf23b8c33591c38ddf84912ea7e6c grub-0.96-r2-gentoo-0.1.tar.bz2 47639
+MD5 47c228c88f848873288ad1cd04cc93f0 grub-0.96.tar.gz 985761
+RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa grub-0.96.tar.gz 985761
+SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba grub-0.96.tar.gz 985761
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.96-r3 b/hardened/sys-boot/grub/files/digest-grub-0.96-r3
new file mode 100644
index 0000000..f79f08f
--- /dev/null
+++ b/hardened/sys-boot/grub/files/digest-grub-0.96-r3
@@ -0,0 +1,9 @@
+MD5 12665487d79f73748d9c6769b3d9dbbf grub-0.96-patches-1.0.tar.bz2 49828
+RMD160 baa7cadabff9896bb784e32f3283c008fa3d05db grub-0.96-patches-1.0.tar.bz2 49828
+SHA256 3d31cab8131d728673d1b866890a54f7652cab23dc2c4b9499e1f51f0ea6e956 grub-0.96-patches-1.0.tar.bz2 49828
+MD5 47c228c88f848873288ad1cd04cc93f0 grub-0.96.tar.gz 985761
+RMD160 33d0cbfaed2dc59975c0ffd9eef55ef46ab34aaa grub-0.96.tar.gz 985761
+SHA256 58ba90b7256b1d2a920a7d89eac73ccab01916745f698cbe4fe1c853637ab9ba grub-0.96.tar.gz 985761
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.97 b/hardened/sys-boot/grub/files/digest-grub-0.97
new file mode 100644
index 0000000..bacf19c
--- /dev/null
+++ b/hardened/sys-boot/grub/files/digest-grub-0.97
@@ -0,0 +1,9 @@
+MD5 5e6d0bb61fd731753493c1ec39375073 grub-0.97-patches-1.0.tar.bz2 46259
+RMD160 8c16108b1bf75d373f4d9a2f083699139ff62753 grub-0.97-patches-1.0.tar.bz2 46259
+SHA256 b3b9f1998e42684b452cf9793523a1654af8fdf82ab208a8731a32c8eeaacb8f grub-0.97-patches-1.0.tar.bz2 46259
+MD5 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 971783
+RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 grub-0.97.tar.gz 971783
+SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b grub-0.97.tar.gz 971783
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.97-r2 b/hardened/sys-boot/grub/files/digest-grub-0.97-r2
new file mode 100644
index 0000000..b53dc9d
--- /dev/null
+++ b/hardened/sys-boot/grub/files/digest-grub-0.97-r2
@@ -0,0 +1,9 @@
+MD5 6bb56aebcb3add62a725f0137cebc9df grub-0.97-patches-1.2.tar.bz2 20872
+RMD160 7d91e01873f52daad271eda85e67f031e72570c9 grub-0.97-patches-1.2.tar.bz2 20872
+SHA256 0a41e076ce1c1dd92b4eaac2905ebd5624162b5258ed0cb234889fa8beb38049 grub-0.97-patches-1.2.tar.bz2 20872
+MD5 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 971783
+RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 grub-0.97.tar.gz 971783
+SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b grub-0.97.tar.gz 971783
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-0.97-r3 b/hardened/sys-boot/grub/files/digest-grub-0.97-r3
new file mode 100644
index 0000000..26b24df
--- /dev/null
+++ b/hardened/sys-boot/grub/files/digest-grub-0.97-r3
@@ -0,0 +1,9 @@
+MD5 995985c7bd6d9680b36d6efd677fb751 grub-0.97-patches-1.4.tar.bz2 24693
+RMD160 6afefff73b5f3ab5c6d05563c4f67f37dbfce16c grub-0.97-patches-1.4.tar.bz2 24693
+SHA256 290dd96fdeb9471c516f061f4949ccda33f8d03ab81a6e2beb5005b3022e71da grub-0.97-patches-1.4.tar.bz2 24693
+MD5 cd3f3eb54446be6003156158d51f4884 grub-0.97.tar.gz 971783
+RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 grub-0.97.tar.gz 971783
+SHA256 4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b grub-0.97.tar.gz 971783
+MD5 cdd6c89d48982ecd544c0b4774755afd splash.xpm.gz 33856
+RMD160 2fead61f91c368429e80936248bb02af2bdf15ff splash.xpm.gz 33856
+SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf splash.xpm.gz 33856
diff --git a/hardened/sys-boot/grub/files/digest-grub-1.95 b/hardened/sys-boot/grub/files/digest-grub-1.95
new file mode 100644
index 0000000..c1e0de7
--- /dev/null
+++ b/hardened/sys-boot/grub/files/digest-grub-1.95
@@ -0,0 +1,3 @@
+MD5 4ea234d8fc5d551f61bc65e553e51399 grub-1.95.tar.gz 519269
+RMD160 bce7d8790b47f3ce7fa4ce7ac61242cc242ad5da grub-1.95.tar.gz 519269
+SHA256 d40c88f1da2919c252500c4cae0de6e9e1a368695117a7a23c4e07d2b4b9b769 grub-1.95.tar.gz 519269
diff --git a/hardened/sys-boot/grub/grub-0.92-r1.ebuild b/hardened/sys-boot/grub/grub-0.92-r1.ebuild
new file mode 100644
index 0000000..3b5112d
--- /dev/null
+++ b/hardened/sys-boot/grub/grub-0.92-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.92-r1.ebuild,v 1.13 2005/07/28 17:53:38 seemant Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+PATCHVER=0.2
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="ftp://alpha.gnu.org/gnu/grub/${P}.tar.gz
+	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2
+	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
+	mirror://gentoo/splash.xpm.gz
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* x86"
+IUSE=""
+
+DEPEND=">=sys-libs/ncurses-5.2-r5"
+PROVIDE="virtual/bootloader"
+
+PATCHDIR=${WORKDIR}/gentoo
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	EPATCH_SUFFIX="patch"
+
+	epatch ${PATCHDIR}
+
+	if [ "`gcc-version`" = "3.3" ]
+	then
+		epatch ${PATCHDIR}/gcc-3.3
+	fi
+}
+
+src_compile() {
+	filter-flags "-fstack-protector -fPIE"
+
+	unset BLOCK_SIZE #73499
+
+	#i686-specific code in the boot loader is a bad idea; disabling to ensure
+	#at least some compatibility if the hard drive is moved to an older or
+	#incompatible system.
+	unset CFLAGS
+	./configure --prefix=/usr \
+		--sbindir=/sbin \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--disable-auto-linux-mem-opt \
+		|| die "Configuration of package failed."
+
+	#the vga16.patch changes configure.in but not configure so
+	#--enable-vga16 doesnt work.  config.h gets overwritten by make.
+	echo "#define VGA16 1" >> config.h.in
+
+	emake || die "Building failed!"
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		sbindir=${D}/sbin \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		install || die "Installation failed."
+
+	insinto /boot/grub
+	doins ${DISTDIR}/splash.xpm.gz
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
+}
+
+pkg_postinst() {
+	[ "$ROOT" != "/" ] && return 0
+	if [ ! -e /boot/grub/stage1 ]
+	then
+		#if the boot loader files aren't in place, copy them over.
+		cd /usr/share/grub/i386-pc
+		cp stage1 stage2 *stage1_5 /boot/grub
+	else
+		einfo '*** A new GRUB has been installed. If you need to reinstall'
+		einfo '*** GRUB to a boot record on your drive, please remember to'
+		einfo '*** "cp /usr/share/grub/i386-pc/*stage* /boot/grub" first.'
+		einfo "*** If you're using XFS, unmount and remount /boot as well."
+	fi
+
+	# change menu.lst to grub.conf
+	if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
+	then
+		mv /boot/grub/menu.lst /boot/grub/grub.conf
+		ln -s grub.conf /boot/grub/menu.lst
+		einfo "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+	fi
+}
diff --git a/hardened/sys-boot/grub/grub-0.94-r1.ebuild b/hardened/sys-boot/grub/grub-0.94-r1.ebuild
new file mode 100644
index 0000000..680e717
--- /dev/null
+++ b/hardened/sys-boot/grub/grub-0.94-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.94-r1.ebuild,v 1.24 2005/08/21 02:24:04 vapier Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+PATCHVER=0.1
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="ftp://alpha.gnu.org/gnu/grub/${P}.tar.gz
+	http://dev.gentoo.org/~seemant/distfiles/${P}-gentoo-${PATCHVER}.tar.bz2
+	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
+	mirror://gentoo/splash.xpm.gz
+	mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* x86 amd64"
+IUSE="static"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+PATCHDIR="${WORKDIR}/gentoo"
+
+pkg_setup() {
+	if use amd64; then
+		has_m32 || die "your compiler seems to be unable to compile 32bit code. if you are on amd64, make sure you compile gcc with USE=multilib FEATURES=-sandbox"
+
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	EPATCH_SUFFIX="patch"
+
+	epatch ${PATCHDIR}
+}
+
+src_compile() {
+	unset BLOCK_SIZE #73499
+
+	### i686-specific code in the boot loader is a bad idea; disabling to ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+	unset CFLAGS
+
+	filter-ldflags -pie -fPIE
+	append-flags -DNDEBUG
+	[ `gcc-major-version` -eq 3 ] && append-flags -minline-all-stringops
+	use static && append-ldflags -static
+
+	autoconf || die
+	aclocal || die
+	WANT_AUTOMAKE=1.7 automake || die
+
+	# build the net-bootable grub first
+	CFLAGS="" \
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		--enable-diskless \
+		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+		--enable-{tulip,via-rhine,w89c840} || die
+
+	emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+	mv stage2/{nbgrub,pxegrub} ${S}
+	mv stage2/stage2 stage2/stage2.netboot
+
+	make clean || die
+
+	# now build the regular grub
+	CFLAGS="${CFLAGS}" \
+	econf \
+			--libdir=/lib \
+			--datadir=/usr/lib/grub \
+			--exec-prefix=/ \
+			--disable-auto-linux-mem-opt || die
+	emake || die "making regular stuff"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	exeinto /usr/lib/grub/${CHOST}
+	doexe nbgrub pxegrub stage2/stage2 stage2/stage2.netboot
+
+	insinto /boot/grub
+	doins ${DISTDIR}/splash.xpm.gz
+	newins docs/menu.lst grub.conf.sample
+
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
+	newdoc docs/menu.lst grub.conf.sample
+
+	docinto gentoo
+	dodoc ${PATCHDIR}/README*
+}
+
+pkg_postinst() {
+	[ "$ROOT" != "/" ] && return 0
+
+	# change menu.lst to grub.conf
+	if [ ! -e /boot/grub/grub.conf -a -e /boot/grub/menu.lst ]
+	then
+		mv /boot/grub/menu.lst /boot/grub/grub.conf
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+	einfo "Linking from new grub.conf name to menu.lst"
+	ln -s grub.conf /boot/grub/menu.lst
+
+	[ -e /boot/grub/stage2 ] && mv /boot/grub/stage2{,.old}
+
+	einfo "Copying files from /usr/lib/grub to /boot"
+	cp -p /usr/lib/grub/* /boot/grub
+	cp -p /usr/lib/grub/grub/*/* /boot/grub
+
+	[ -e /boot/grub/grub.conf ] \
+		&& /usr/sbin/grub \
+			--batch \
+			--device-map=/boot/grub/device.map \
+			< /boot/grub/grub.conf > /dev/null 2>&1
+}
diff --git a/hardened/sys-boot/grub/grub-0.96-r1.ebuild b/hardened/sys-boot/grub/grub-0.96-r1.ebuild
new file mode 100644
index 0000000..6f071c7
--- /dev/null
+++ b/hardened/sys-boot/grub/grub-0.96-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r1.ebuild,v 1.15 2005/08/21 02:24:04 vapier Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+PATCHVER=0.1
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~seemant/distfiles/${PF}-gentoo-${PATCHVER}.tar.bz2
+	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
+	mirror://gentoo/splash.xpm.gz
+	mirror://gentoo/${PF}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static netboot custom-cflags"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+PATCHDIR="${WORKDIR}/gentoo"
+
+pkg_setup() {
+	if use amd64; then
+		if ! has_m32; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "If you are on amd64, make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit objects!"
+		fi
+
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
+}
+
+src_unpack() {
+	unpack ${A} ; cd "${S}"
+
+	EPATCH_SUFFIX="patch"
+	epatch ${PATCHDIR}
+
+	# a bunch of patches apply to raw autotool files
+	autoconf || die "autoconf failed"
+	aclocal || die "aclocal failed"
+	automake || die "automake failed"
+}
+
+src_compile() {
+	unset BLOCK_SIZE #73499
+
+	### i686-specific code in the boot loader is a bad idea; disabling to ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# but the objcopy's (faulty) test fails if -fstack-protector is default.
+	# create a cache telling configure that objcopy is ok, and add -C to econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	use custom-cflags || unset CFLAGS
+
+	filter-flags -fPIE
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	# build the net-bootable grub first, but only if "netboot" is set
+	if use netboot ; then
+		econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		--enable-diskless \
+		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
+
+		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+		mv -f stage2/{nbgrub,pxegrub} "${S}"/
+		mv -f stage2/stage2 stage2/stage2.netboot
+
+		make clean || die "make clean failed"
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt || die "econf failed"
+	emake || die "making regular stuff"
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	exeinto /usr/lib/grub/${CHOST}
+	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
+
+	insinto /boot/grub
+	doins ${DISTDIR}/splash.xpm.gz
+	newins docs/menu.lst grub.conf.sample
+
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
+	newdoc docs/menu.lst grub.conf.sample
+
+	docinto gentoo
+	dodoc ${PATCHDIR}/README.Gentoo.patches
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+
+	# change menu.lst to grub.conf
+	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
+		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+	einfo "Linking from new grub.conf name to menu.lst"
+	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
+
+	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
+
+	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
+	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
+		[[ -f ${x} ]] && cp -p ${x} /boot/grub
+	done
+
+	# hardened voodoo
+	[[ -x /sbin/chpax ]] && /sbin/chpax -spme /sbin/grub
+	[[ -x /sbin/paxctl ]] && /sbin/paxctl -spme /sbin/grub
+
+	[[ -e /boot/grub/grub.conf ]] \
+		&& /sbin/grub \
+			--batch \
+			--device-map=/boot/grub/device.map \
+			< /boot/grub/grub.conf > /dev/null 2>&1
+}
diff --git a/hardened/sys-boot/grub/grub-0.96-r2.ebuild b/hardened/sys-boot/grub/grub-0.96-r2.ebuild
new file mode 100644
index 0000000..f5856e3
--- /dev/null
+++ b/hardened/sys-boot/grub/grub-0.96-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r2.ebuild,v 1.10 2006/02/05 14:44:52 blubb Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+PATCHVER=0.1
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~seemant/distfiles/${PF}-gentoo-${PATCHVER}.tar.bz2
+	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
+	mirror://gentoo/splash.xpm.gz
+	mirror://gentoo/${PF}-gentoo-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static netboot custom-cflags"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+PATCHDIR="${WORKDIR}/gentoo"
+
+pkg_setup() {
+	if use amd64; then
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
+}
+
+src_unpack() {
+	unpack ${A} ; cd "${S}"
+
+	EPATCH_SUFFIX="patch"
+	epatch ${PATCHDIR}
+
+	# a bunch of patches apply to raw autotool files
+	autoconf || die "autoconf failed"
+	aclocal || die "aclocal failed"
+	automake || die "automake failed"
+}
+
+src_compile() {
+	unset BLOCK_SIZE #73499
+
+	### i686-specific code in the boot loader is a bad idea; disabling to ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# but the objcopy's (faulty) test fails if -fstack-protector is default.
+	# create a cache telling configure that objcopy is ok, and add -C to econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	use custom-cflags || unset CFLAGS
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	# build the net-bootable grub first, but only if "netboot" is set
+	if use netboot ; then
+		econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		--enable-diskless \
+		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
+
+		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+		mv -f stage2/{nbgrub,pxegrub} "${S}"/
+		mv -f stage2/stage2 stage2/stage2.netboot
+
+		make clean || die "make clean failed"
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt || die "econf failed"
+	emake || die "making regular stuff"
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	exeinto /usr/lib/grub/${CHOST}
+	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
+
+	insinto /boot/grub
+	doins ${DISTDIR}/splash.xpm.gz
+	newins docs/menu.lst grub.conf.sample
+
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
+	newdoc docs/menu.lst grub.conf.sample
+
+	docinto gentoo
+	dodoc ${PATCHDIR}/README*
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+
+	# change menu.lst to grub.conf
+	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
+		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+	einfo "Linking from new grub.conf name to menu.lst"
+	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
+
+	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
+
+	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
+	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
+		[[ -f ${x} ]] && cp -p ${x} /boot/grub
+	done
+
+	[[ -e /boot/grub/grub.conf ]] \
+		&& /sbin/grub \
+			--batch \
+			--device-map=/boot/grub/device.map \
+			< /boot/grub/grub.conf > /dev/null 2>&1
+}
diff --git a/hardened/sys-boot/grub/grub-0.96-r3.ebuild b/hardened/sys-boot/grub/grub-0.96-r3.ebuild
new file mode 100644
index 0000000..28145f4
--- /dev/null
+++ b/hardened/sys-boot/grub/grub-0.96-r3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.96-r3.ebuild,v 1.3 2005/08/21 02:24:04 vapier Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+PATCHVER=1.0
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~seemant/distfiles/${P}-patches-${PATCHVER}.tar.bz2
+	http://dev.gentoo.org/~seemant/distfiles/splash.xpm.gz
+	mirror://gentoo/splash.xpm.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static netboot custom-cflags"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+pkg_setup() {
+	if use amd64 ; then
+		if ! has_m32 ; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "If you are on amd64, make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit objects!"
+		fi
+
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	EPATCH_SUFFIX="patch"
+	epatch "${WORKDIR}"/patch
+
+	# a bunch of patches apply to raw autotool files
+	autoconf || die "autoconf failed"
+	aclocal || die "aclocal failed"
+	automake || die "automake failed"
+}
+
+src_compile() {
+	unset BLOCK_SIZE #73499
+
+	### i686-specific code in the boot loader is a bad idea; disabling to ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# but the objcopy's (faulty) test fails if -fstack-protector is default.
+	# create a cache telling configure that objcopy is ok, and add -C to econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	use custom-cflags || unset CFLAGS
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	# build the net-bootable grub first, but only if "netboot" is set
+	if use netboot ; then
+		econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		--enable-diskless \
+		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
+
+		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+		mv -f stage2/{nbgrub,pxegrub} "${S}"/
+		mv -f stage2/stage2 stage2/stage2.netboot
+
+		make clean || die "make clean failed"
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt || die "econf failed"
+	emake || die "making regular stuff"
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	exeinto /usr/lib/grub/${CHOST}
+	use netboot && doexe nbgrub pxegrub stage2/stage2.netboot
+
+	insinto /boot/grub
+	doins ${DISTDIR}/splash.xpm.gz
+	newins docs/menu.lst grub.conf.sample
+
+	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO
+	newdoc docs/menu.lst grub.conf.sample
+
+	docinto gentoo
+	dodoc ${PATCHDIR}/README*
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+
+	# change menu.lst to grub.conf
+	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
+		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+	einfo "Linking from new grub.conf name to menu.lst"
+	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
+
+	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
+
+	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
+	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
+		[[ -f ${x} ]] && cp -p ${x} /boot/grub
+	done
+
+	[[ -e /boot/grub/grub.conf ]] \
+		&& /sbin/grub \
+			--batch \
+			--device-map=/boot/grub/device.map \
+			< /boot/grub/grub.conf > /dev/null 2>&1
+}
diff --git a/hardened/sys-boot/grub/grub-0.97-r2.ebuild b/hardened/sys-boot/grub/grub-0.97-r2.ebuild
new file mode 100644
index 0000000..6844a18
--- /dev/null
+++ b/hardened/sys-boot/grub/grub-0.97-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r2.ebuild,v 1.10 2006/11/27 00:35:21 vapier Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+PATCHVER="1.2"
+DESCRIPTION="GNU GRUB Legacy boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/splash.xpm.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static netboot custom-cflags"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
+	=sys-devel/automake-1.9*
+	>=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+pkg_setup() {
+	if use amd64 ; then
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# patch breaks booting for some people #111885
+	rm "${WORKDIR}"/patch/400_*
+
+	if [[ -n ${PATCHVER} ]] ; then
+		EPATCH_SUFFIX="patch"
+		epatch "${WORKDIR}"/patch
+
+		# a bunch of patches apply to raw autotool files
+		autoconf || die "autoconf failed"
+		aclocal || die "aclocal failed"
+		automake || die "automake failed"
+	fi
+}
+
+src_compile() {
+	unset BLOCK_SIZE #73499
+
+	### i686-specific code in the boot loader is a bad idea; disabling to ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# but the objcopy's (faulty) test fails if -fstack-protector is default.
+	# create a cache telling configure that objcopy is ok, and add -C to econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	use custom-cflags || unset CFLAGS
+
+	filter-flags -fPIE
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	# build the net-bootable grub first, but only if "netboot" is set
+	if use netboot ; then
+		econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		--enable-diskless \
+		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
+
+		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+		mv -f stage2/{nbgrub,pxegrub} "${S}"/
+		mv -f stage2/stage2 stage2/stage2.netboot
+
+		make clean || die "make clean failed"
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt || die "econf failed"
+	emake || die "making regular stuff"
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	if use netboot ; then
+		exeinto /usr/lib/grub/${CHOST}
+		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
+	fi
+
+	insinto /boot/grub
+	doins "${DISTDIR}"/splash.xpm.gz
+	newins docs/menu.lst grub.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
+	newdoc docs/menu.lst grub.conf.sample
+}
+
+setup_boot_dir() {
+	local dir="${1}"
+
+	[[ ! -e ${dir} ]] && die "${dir} does not exist!"
+	[[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub"
+
+	# change menu.lst to grub.conf
+	if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then
+		mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+
+	if [[ ! -e "${dir}"/grub/menu.lst ]]; then
+	einfo "Linking from new grub.conf name to menu.lst"
+		ln -snf grub.conf "${dir}/grub/menu.lst"
+	fi
+
+	[[ -e "${dir}"/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
+
+	einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
+	for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
+		[[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
+	done
+
+	if [[ -e "${dir}"/grub/grub.conf ]] ; then
+		egrep -v '^[[:space:]]*(#|$|default|fallback|splashimage|timeout|title)' "${dir}"/grub/grub.conf | \
+		/sbin/grub --batch \
+			--device-map="${dir}"/grub/device.map \
+			> /dev/null
+	fi
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+	setup_boot_dir /boot
+	einfo "To install grub files to another device (like a usb stick), just run:"
+	einfo "   emerge --config =${PF}"
+}
+
+pkg_config() {
+	local dir
+	einfo "Enter the directory where you want to setup grub:"
+	read dir
+	setup_boot_dir ${dir}
+}
diff --git a/hardened/sys-boot/grub/grub-0.97-r3.ebuild b/hardened/sys-boot/grub/grub-0.97-r3.ebuild
new file mode 100644
index 0000000..7abb68c
--- /dev/null
+++ b/hardened/sys-boot/grub/grub-0.97-r3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97-r3.ebuild,v 1.7 2007/01/15 01:50:09 metalgod Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+inherit mount-boot eutils flag-o-matic toolchain-funcs autotools
+
+PATCHVER="1.4"
+DESCRIPTION="GNU GRUB Legacy boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/splash.xpm.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static netboot custom-cflags"
+
+DEPEND=">=sys-libs/ncurses-5.2-r5"
+PROVIDE="virtual/bootloader"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# patch breaks booting for some people #111885
+	rm "${WORKDIR}"/patch/400_*
+
+	if [[ -n ${PATCHVER} ]] ; then
+		EPATCH_SUFFIX="patch"
+		epatch "${WORKDIR}"/patch
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	use amd64 && multilib_toolchain_setup x86
+
+	unset BLOCK_SIZE #73499
+
+	### i686-specific code in the boot loader is a bad idea; disabling to ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# but the objcopy's (faulty) test fails if -fstack-protector is default.
+	# create a cache telling configure that objcopy is ok, and add -C to econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	use custom-cflags || unset CFLAGS
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	filter-flags -fPIE
+
+	# build the net-bootable grub first, but only if "netboot" is set
+	if use netboot ; then
+		econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		--enable-diskless \
+		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
+
+		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+		mv -f stage2/{nbgrub,pxegrub} "${S}"/
+		mv -f stage2/stage2 stage2/stage2.netboot
+
+		make clean || die "make clean failed"
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt || die "econf failed"
+	emake || die "making regular stuff"
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	if use netboot ; then
+		exeinto /usr/lib/grub/${CHOST}
+		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
+	fi
+
+	insinto /boot/grub
+	doins "${DISTDIR}"/splash.xpm.gz
+	newins docs/menu.lst grub.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
+	newdoc docs/menu.lst grub.conf.sample
+}
+
+setup_boot_dir() {
+	local dir="${1}"
+
+	[[ ! -e ${dir} ]] && die "${dir} does not exist!"
+	[[ ! -e ${dir}/grub ]] && mkdir "${dir}/grub"
+
+	# change menu.lst to grub.conf
+	if [[ ! -e ${dir}/grub/grub.conf ]] && [[ -e ${dir}/grub/menu.lst ]] ; then
+		mv -f "${dir}"/grub/menu.lst "${dir}"/grub/grub.conf
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+
+	if [[ ! -e ${dir}/grub/menu.lst ]]; then
+	einfo "Linking from new grub.conf name to menu.lst"
+		ln -snf grub.conf "${dir}"/grub/menu.lst
+	fi
+
+	[[ -e ${dir}/grub/stage2 ]] && mv "${dir}"/grub/stage2{,.old}
+
+	einfo "Copying files from /lib/grub and /usr/lib/grub to "${dir}""
+	for x in /lib*/grub/*/* /usr/lib*/grub/*/* ; do
+		[[ -f ${x} ]] && cp -p ${x} "${dir}"/grub/
+	done
+
+	if [[ -e ${dir}/grub/grub.conf ]] ; then
+		egrep \
+			-v '^[[:space:]]*(#|$|default|fallback|initrd|password|splashimage|timeout|title)' \
+			"${dir}"/grub/grub.conf | \
+		/sbin/grub --batch \
+			--device-map="${dir}"/grub/device.map \
+			> /dev/null
+	fi
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+	setup_boot_dir /boot
+	einfo "To install grub files to another device (like a usb stick), just run:"
+	einfo "   emerge --config =${PF}"
+}
+
+pkg_config() {
+	local dir
+	einfo "Enter the directory where you want to setup grub:"
+	read dir
+	setup_boot_dir ${dir}
+}
diff --git a/hardened/sys-boot/grub/grub-0.97.ebuild b/hardened/sys-boot/grub/grub-0.97.ebuild
new file mode 100644
index 0000000..5a6e2e7
--- /dev/null
+++ b/hardened/sys-boot/grub/grub-0.97.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-0.97.ebuild,v 1.2 2005/08/21 02:24:04 vapier Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+PATCHVER=1.0
+DESCRIPTION="GNU GRUB boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/splash.xpm.gz
+	mirror://gentoo/${P}-patches-${PATCHVER}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static netboot custom-cflags"
+
+RDEPEND=">=sys-libs/ncurses-5.2-r5"
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.5"
+PROVIDE="virtual/bootloader"
+
+pkg_setup() {
+	if use amd64 ; then
+		if ! has_m32 ; then
+			eerror "Your compiler seems to be unable to compile 32bit code."
+			eerror "If you are on amd64, make sure you compile gcc with:"
+			echo
+			eerror "    USE=multilib FEATURES=-sandbox"
+			die "Cannot produce 32bit objects!"
+		fi
+
+		ABI_ALLOW="x86"
+		ABI="x86"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	if [[ -n ${PATCHVER} ]] ; then
+		EPATCH_SUFFIX="patch"
+		epatch "${WORKDIR}"/patch
+
+		# a bunch of patches apply to raw autotool files
+		autoconf || die "autoconf failed"
+		aclocal || die "aclocal failed"
+		automake || die "automake failed"
+	fi
+}
+
+src_compile() {
+	unset BLOCK_SIZE #73499
+
+	### i686-specific code in the boot loader is a bad idea; disabling to ensure
+	### at least some compatibility if the hard drive is moved to an older or
+	### incompatible system.
+
+	# grub-0.95 added -fno-stack-protector detection, to disable ssp for stage2,
+	# but the objcopy's (faulty) test fails if -fstack-protector is default.
+	# create a cache telling configure that objcopy is ok, and add -C to econf
+	# to make use of the cache.
+	#
+	# CFLAGS has to be undefined running econf, else -fno-stack-protector detection fails.
+	# STAGE2_CFLAGS is not allowed to be used on emake command-line, it overwrites
+	# -fno-stack-protector detected by configure, removed from netboot's emake.
+	use custom-cflags || unset CFLAGS
+
+	filter-flags -fPIE
+
+	export grub_cv_prog_objcopy_absolute=yes #79734
+	use static && append-ldflags -static
+
+	# build the net-bootable grub first, but only if "netboot" is set
+	if use netboot ; then
+		econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt \
+		--enable-diskless \
+		--enable-{3c{5{03,07,09,29,95},90x},cs89x0,davicom,depca,eepro{,100}} \
+		--enable-{epic100,exos205,ni5210,lance,ne2100,ni{50,65}10,natsemi} \
+		--enable-{ne,ns8390,wd,otulip,rtl8139,sis900,sk-g16,smc9000,tiara} \
+		--enable-{tulip,via-rhine,w89c840} || die "netboot econf failed"
+
+		emake w89c840_o_CFLAGS="-O" || die "making netboot stuff"
+
+		mv -f stage2/{nbgrub,pxegrub} "${S}"/
+		mv -f stage2/stage2 stage2/stage2.netboot
+
+		make clean || die "make clean failed"
+	fi
+
+	# Now build the regular grub
+	# Note that FFS and UFS2 support are broken for now - stage1_5 files too big
+	econf \
+		--libdir=/lib \
+		--datadir=/usr/lib/grub \
+		--exec-prefix=/ \
+		--disable-auto-linux-mem-opt || die "econf failed"
+	emake || die "making regular stuff"
+}
+
+src_test() {
+	# non-default block size also give false pass/fails.
+	unset BLOCK_SIZE
+	make check || die "make check failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	if use netboot ; then
+		exeinto /usr/lib/grub/${CHOST}
+		doexe nbgrub pxegrub stage2/stage2.netboot || die "netboot install"
+	fi
+
+	insinto /boot/grub
+	doins "${DISTDIR}"/splash.xpm.gz
+	newins docs/menu.lst grub.conf.sample
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README THANKS TODO
+	newdoc docs/menu.lst grub.conf.sample
+
+	docinto gentoo
+	dodoc ${PATCHDIR}/README*
+}
+
+pkg_postinst() {
+	[[ ${ROOT} != "/" ]] && return 0
+
+	# change menu.lst to grub.conf
+	if [[ ! -e /boot/grub/grub.conf && -e /boot/grub/menu.lst ]] ; then
+		mv -f /boot/grub/menu.lst /boot/grub/grub.conf
+		ewarn
+		ewarn "*** IMPORTANT NOTE: menu.lst has been renamed to grub.conf"
+		ewarn
+	fi
+	einfo "Linking from new grub.conf name to menu.lst"
+	[[ ! -e /boot/grub/menu.lst ]] && ln -snf grub.conf /boot/grub/menu.lst
+
+	[[ -e /boot/grub/stage2 ]] && mv /boot/grub/stage2{,.old}
+
+	einfo "Copying files from /lib/grub and /usr/lib/grub to /boot"
+	for x in /lib/grub/*/* /usr/lib/grub/*/* ; do
+		[[ -f ${x} ]] && cp -p ${x} /boot/grub
+	done
+
+	[[ -e /boot/grub/grub.conf ]] \
+		&& /sbin/grub \
+			--batch \
+			--device-map=/boot/grub/device.map \
+			< /boot/grub/grub.conf > /dev/null 2>&1
+}
diff --git a/hardened/sys-boot/grub/grub-1.95.ebuild b/hardened/sys-boot/grub/grub-1.95.ebuild
new file mode 100644
index 0000000..9883e36
--- /dev/null
+++ b/hardened/sys-boot/grub/grub-1.95.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-1.95.ebuild,v 1.1 2006/10/21 22:46:44 vapier Exp $
+
+inherit mount-boot eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="GNU GRUB 2 boot loader"
+HOMEPAGE="http://www.gnu.org/software/grub/"
+SRC_URI="mirror://gentoo/${P}.tar.gz
+	ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="-*"
+IUSE="static netboot custom-cflags"
+
+DEPEND=">=sys-libs/ncurses-5.2-r5
+	dev-libs/lzo"
+PROVIDE="virtual/bootloader"
+
+src_compile() {
+	use amd64 && multilib_toolchain_setup x86
+	use custom-cflags || unset CFLAGS LDFLAGS
+	use static && append-ldflags -static
+
+	filter-flags -fPIE
+
+	econf \
+		--prefix=/ \
+		--datadir=/usr/lib \
+		|| die "econf failed"
+	emake || die "making regular stuff"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}