aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <basile@opensource.dyc.edu>2010-03-07 04:22:44 -0500
committerAnthony G. Basile <basile@opensource.dyc.edu>2010-03-07 04:22:44 -0500
commit4b24451f156c59044336f9cb83f025b9ccd92c4f (patch)
tree37260de776a7c7cbc0f1d80df6ef1ceac8458c4a /sys-boot
parentNew patch to fix grub with ssp. See bug #305283 (diff)
downloadhardened-dev-4b24451f156c59044336f9cb83f025b9ccd92c4f.tar.gz
hardened-dev-4b24451f156c59044336f9cb83f025b9ccd92c4f.tar.bz2
hardened-dev-4b24451f156c59044336f9cb83f025b9ccd92c4f.zip
Reintroduce grub-0.97-fpie_check.patch and remove filter-flags -fPIE
Diffstat (limited to 'sys-boot')
-rw-r--r--sys-boot/grub/Manifest2
-rw-r--r--sys-boot/grub/grub-0.97-r12.ebuild5
2 files changed, 4 insertions, 3 deletions
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 40d35e47..14726b42 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -7,6 +7,6 @@ DIST grub-0.97.tar.gz 971783 RMD160 7fb5674edf0c950bd38e94f85ff1e2909aa741f0 SHA
DIST splash.xpm.gz 33856 RMD160 2fead61f91c368429e80936248bb02af2bdf15ff SHA1 98e679f9698be43426f971f89a088c053e8c804a SHA256 b95600f777331b0dd31d51c68f60f0e846e4c8b628857a41165f4e6b30e6acaf
EBUILD grub-0.97-r10.ebuild 9101 RMD160 f7616847570e143952587dc1aa1dd2737c60041a SHA1 24110a0dbff3b596fcb8ef12afb7d6ad840138cd SHA256 46bf359b9805b1b4b06b46f3d4bef0903df61d41e296660c7ce0ea8d178c146a
EBUILD grub-0.97-r11.ebuild 9154 RMD160 f60f29d7090249ed6ba49a9f2ff1d49aea5d76f0 SHA1 626962c46cdf2223202cb09c01e81fcd15a28525 SHA256 ee631ec4d57686ba4ef992d723ffaee99189dd96a9e4265c6b0974c760389be8
-EBUILD grub-0.97-r12.ebuild 9203 RMD160 0b252dbda8da1ea8c71e1dd8140637b155293c9e SHA1 6437b378279c1acdf8c97f2b6e0922b393223125 SHA256 13d97193d61547224b516bf0b4b5b5f5abc7dabe94c03c3b6a7a802e6312b136
+EBUILD grub-0.97-r12.ebuild 9256 RMD160 6eea3ddd1f87ec3818cd294e7940881b5f65e075 SHA1 cd0c75736bda4b4b8caeaf0be88a8cb1886b0958 SHA256 9cef7ba9415f7db4a3f03f99bbc0ba449a4a492f809ee853f572f6877e4402ed
MISC ChangeLog 655 RMD160 7d28c47c369ae5cc3ec71262682102e7a36357e4 SHA1 7ef4331749c93a701e7bd3583a2d9b6eaf1eaf01 SHA256 365fb8ce186ca01bc358e5a085b7925605d2cbfc95e34b6d9949b00e850c09ef
MISC metadata.xml 262 RMD160 afabce9377772aefb54102e9ef237de6bb1561f5 SHA1 c38f9b99d8a84beb40c114283d8d7ddd4ac43d9e SHA256 35a9c56d9c8418806062854a360c27690d25159524df71f28bbd4d644e8706f3
diff --git a/sys-boot/grub/grub-0.97-r12.ebuild b/sys-boot/grub/grub-0.97-r12.ebuild
index cb52cc9d..d0ee0e9c 100644
--- a/sys-boot/grub/grub-0.97-r12.ebuild
+++ b/sys-boot/grub/grub-0.97-r12.ebuild
@@ -63,6 +63,9 @@ src_unpack() {
"${S}"/grub/asmstub.c \
|| die "Failed to hack memory size"
+ # Bugs #139277 #168834 #281246
+ epatch "${FILESDIR}"/grub-0.97-fpie_check.patch
+
if [[ -n ${PATCHVER} ]] ; then
EPATCH_SUFFIX="patch"
epatch "${WORKDIR}"/patch
@@ -77,8 +80,6 @@ src_unpack() {
}
src_compile() {
- filter-flags -fPIE #168834
-
use amd64 && multilib_toolchain_setup x86
unset BLOCK_SIZE #73499