tboot: fstack-check=no on hardened

5 files changed, 21 insertions, 10 deletions

diff --git a/sys-boot/tboot/Manifest b/sys-boot/tboot/Manifest
index a5d08314..a6419b3f 100644
--- a/sys-boot/tboot/Manifest
+++ b/sys-boot/tboot/Manifest
@@ -1,4 +1,5 @@
-AUX 1.8.2-genkernel_arch.patch 2318 SHA256 bb30746f3bed4fc1a3a942938e98e3f47581b2065d0a634bf3854a9489ebae03 SHA512 02af1ee0c31000766d0266c501bd7d1eed2ac338e7e7ef9d825221ec8010d995e3a74ac45be5de636bf946ac63ad593f0a7144a93ba72c8beca7bb3b94d8a711 WHIRLPOOL 9fcedbcc861906a83bc0235a410f69759efc25b7e3e3d70b81c5b7d8df665e5c4e7153377ab5ab80b697211f7396a3e36a0176106824ece09eb620d8bead8dc9
+AUX tboot-1.8.2-genkernel_arch.patch 2318 SHA256 bb30746f3bed4fc1a3a942938e98e3f47581b2065d0a634bf3854a9489ebae03 SHA512 02af1ee0c31000766d0266c501bd7d1eed2ac338e7e7ef9d825221ec8010d995e3a74ac45be5de636bf946ac63ad593f0a7144a93ba72c8beca7bb3b94d8a711 WHIRLPOOL 9fcedbcc861906a83bc0235a410f69759efc25b7e3e3d70b81c5b7d8df665e5c4e7153377ab5ab80b697211f7396a3e36a0176106824ece09eb620d8bead8dc9
+AUX tboot-1.8.2-stack-check-no.patch 718 SHA256 ed3459b326957f709bc05dbc4de70215913faa74dc6342a1bef2878d8ea9481a SHA512 b7295f4d152e11eb49fa61085b42389e3edf063182ebd8c681e06e2025744516a3386dc5688ce53cd87c024d7fdcdcb54f0f1b04898704613137ed8eaaf7781f WHIRLPOOL afc4564cd6b25e73f26332e6cb436a5284e52622403405b33a605a412039173ee873e13f05cbbf6b551c08c6aa56d28a9e5579b13b5211b2711b0bfc1d2a4c8e
 DIST tboot-1.8.2.tar.gz 566048 SHA256 358c7b22412087927d6d04b130c1268e5d00252b4caef0fe3cdaa5194f652cd1 SHA512 d79c28085dea7f986054d3a564c56320c071c6d36ef6fcb63f85d4ee53da461539c773ab0b604396957c2f1e90646f3d432e2acf2e23f18e5280be48328ffcd8 WHIRLPOOL da12b01133919565eb868ec7a2ccd4cf4032048649a93d7c937fb0213f00d15a92aebac5960e776d4a02e3dfe5ead8beafc798acd3dfedffe2469c138210a918
-EBUILD tboot-1.8.2.ebuild 1701 SHA256 be68b69453a76fed4ba36791b9de60d98ac5571c5278e3e9f2635ed5d01e6906 SHA512 e50f418fc16c05550a8d64a3b1a7c2784766cfabc84abb4d37b726f85ea3a3bf84c5e868b12095c88203f749a3ed402ea7b08ba0777f8355489956ec5af8005a WHIRLPOOL 302b36753a27043bee4b18312d330991e687fbe34da0e2b1120de8622c7e6193e7380cc502af536a95f2297bf47308581ed7f50ebd2d28826fe8c41b93300cda
-MISC metadata.xml 441 SHA256 557e1e60e74b36596f3dc85fc0cb0523685c32c26ec8f6444a2bb305e935e2f4 SHA512 c644649a998b901a33cd7e3452e20813b96e4331211d3d6a702237f4ca55e7bab2ad11cef80656e8097768ec3e8f1fbf1b01f3f07efa6b3b1c032787a25da38b WHIRLPOOL 501641a2c2dd5aa374bc09e2bb58bd1a3d1a7eef78c6f8e4fe15fe7ffc89ec086577697aa5d73ae145f5433e8d321e964ce78c41a7143b399d7b075204e850d7
+EBUILD tboot-1.8.2.ebuild 1773 SHA256 8e02fe11aa0e6132c3740f8ccd293e7c918dd1408ce736fee57a12bd318ca711 SHA512 21d5d5dbe4ee9463a5d39547996980c773cfd30f8779f3ffaf1bf5506f7173fadb165f60734397c8a2abec1178e6fcd54cc6defa6753aea0fa91a28d60578f18 WHIRLPOOL 022e628a0801cc8a8140f485e52053dc5763c9078d7a0691ff9e0278075018e537936f7e39cfd453257e4cdeab140eca576cd0bbab9f8954b60f73c71b1accc9
+MISC metadata.xml 419 SHA256 776ffd511903ed035840f13b8a6b6245e6e2300b5a4463bc08679d34c05f23fb SHA512 15307c17ba26bc6db917dc50497115bddfd537d3c3919b1ab39da553379840729d596eed8cc8168bcb660fa292f55916edef3efa2c45a6c7ae65cf755fee3536 WHIRLPOOL 1ad2d3e6d626d4725c465eb96253454e29a55be235ef9e991b1c1c1f0be7f71ac367cede5a8a15f982d6e138859105e4f1b75e2c9cdc91544f07e4448aaeebde
diff --git a/sys-boot/tboot/files/1.8.2-genkernel_arch.patch b/sys-boot/tboot/files/tboot-1.8.2-genkernel_arch.patch
index 7fdcad65..7fdcad65 100644
--- a/sys-boot/tboot/files/1.8.2-genkernel_arch.patch
+++ b/sys-boot/tboot/files/tboot-1.8.2-genkernel_arch.patch
diff --git a/sys-boot/tboot/files/tboot-1.8.2-stack-check-no.patch b/sys-boot/tboot/files/tboot-1.8.2-stack-check-no.patch
new file mode 100644
index 00000000..5d2ea629
--- /dev/null
+++ b/sys-boot/tboot/files/tboot-1.8.2-stack-check-no.patch
@@ -0,0 +1,11 @@
+diff -ur tboot-1.8.2.orig/tboot/Config.mk tboot-1.8.2/tboot/Config.mk
+--- tboot-1.8.2.orig/tboot/Config.mk	2014-07-28 12:24:21.000000000 +0400
++++ tboot-1.8.2/tboot/Config.mk	2015-05-05 02:14:26.333222301 +0400
+@@ -30,6 +30,7 @@
+ CFLAGS		+= $(call cc-option,$(CC),-nopie,)
+ CFLAGS		+= $(call cc-option,$(CC),-fno-stack-protector,)
+ CFLAGS		+= $(call cc-option,$(CC),-fno-stack-protector-all,)
++CFLAGS		+= $(call cc-option,$(CC),-fstack-check=no,)
+ 
+ # changeset variable for banner
+ CFLAGS		+= -DTBOOT_CHANGESET=\""$(shell ((hg parents --template "{isodate|isodate} {rev}:{node|short}" >/dev/null && hg parents --template "{isodate|isodate} {rev}:{node|short}") || echo "2014-07-28 12:00 +0800 1.8.2") 2>/dev/null)"\"
diff --git a/sys-boot/tboot/metadata.xml b/sys-boot/tboot/metadata.xml
index 690f61c3..51ab1be5 100644
--- a/sys-boot/tboot/metadata.xml
+++ b/sys-boot/tboot/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>hardened</herd>
 	<maintainer>
-		<email>jason@perfinion.com</email>
+		<email>perfinion@gentoo.org</email>
 		<name>Jason Zaman</name>
 	</maintainer>
 
diff --git a/sys-boot/tboot/tboot-1.8.2.ebuild b/sys-boot/tboot/tboot-1.8.2.ebuild
index 9432230e..389c93c1 100644
--- a/sys-boot/tboot/tboot-1.8.2.ebuild
+++ b/sys-boot/tboot/tboot-1.8.2.ebuild
@@ -26,14 +26,14 @@ sys-boot/grub:2"
 DOCS=(README COPYING CHANGELOG)
 
 src_prepare() {
-	epatch "${FILESDIR}/1.8.2-genkernel_arch.patch"
+	epatch "${FILESDIR}/${P}-genkernel_arch.patch"
+	epatch "${FILESDIR}/${P}-stack-check-no.patch" # breaks with ssp
+	sed -i 's/ -Werror//g' Config.mk
+	sed -i 's/^INSTALL_STRIP = -s$//' Config.mk # QA Errors
 
 	# the version number is wrong in the grub files
 	sed -i 's/tboot_version="1.8.1"/tboot_version="1.8.2"/' tboot/20_linux*tboot
 
-	sed -i 's/ -Werror//g' Config.mk
-	sed -i 's/^INSTALL_STRIP = -s$//' Config.mk # QA Errors
-
 	epatch_user
 }
 
@@ -46,7 +46,7 @@ src_compile() {
 		MAKEARGS="TARGET_ARCH=i686"
 	fi
 
-	emake ${MAKEARGS} build
+	emake debug=y ${MAKEARGS} build
 }
 
 src_install() {