[gentoo-commits] proj/hardened-dev:master commit in: sys-boot/tboot/, sys-boot/tboot/files/

["Jason Zaman" <perfinion@gentoo.org>]

commit:     7b54b19888a5f531159259c54e9fb402f879fedc
Author:     Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Mon May  4 22:23:55 2015 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon May  4 22:29:46 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=7b54b198

tboot: fstack-check=no on hardened

 ...-genkernel_arch.patch => tboot-1.8.2-genkernel_arch.patch} |  0
 sys-boot/tboot/files/tboot-1.8.2-stack-check-no.patch         | 11 +++++++++++
 sys-boot/tboot/metadata.xml                                   |  3 +--
 sys-boot/tboot/tboot-1.8.2.ebuild                             | 10 +++++-----
 4 files changed, 17 insertions(+), 7 deletions(-)

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
similarity index 100%
rename from sys-boot/tboot/files/1.8.2-genkernel_arch.patch
rename to 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 0000000..5d2ea62
--- /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 690f61c..51ab1be 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 9432230..389c93c 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() {