commit:     d8e456cac87696610baa728264698a6aae95aa64
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  4 20:02:31 2015 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sun Jan  4 20:02:31 2015 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=d8e456ca

Pax mark only when jit useflag enabled, add full relro support

---
 mail-client/thunderbird/thunderbird-31.3.0.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mail-client/thunderbird/thunderbird-31.3.0.ebuild 
b/mail-client/thunderbird/thunderbird-31.3.0.ebuild
index aca5d07..8dbf1e4 100644
--- a/mail-client/thunderbird/thunderbird-31.3.0.ebuild
+++ b/mail-client/thunderbird/thunderbird-31.3.0.ebuild
@@ -39,7 +39,7 @@ HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/";
 KEYWORDS="~alpha amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist crypt ldap +lightning +minimal mozdom selinux"
+IUSE="bindist crypt hardened ldap +lightning +minimal mozdom selinux"
 
 PATCH="thunderbird-31.0-patches-0.1"
 PATCHFF="firefox-31.0-patches-0.2"
@@ -202,6 +202,9 @@ src_configure() {
        # It doesn't compile on alpha without this LDFLAGS
        use alpha && append-ldflags "-Wl,--no-relax"
 
+       # Add full relro support for hardened
+       use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
        mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
        mozconfig_annotate '' --disable-mailnews
 
@@ -363,9 +366,8 @@ src_install() {
                        -i "${ED}"/usr/share/applications/${PN}.desktop || die
        fi
 
-       pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird}
        # Required in order for jit to work on hardened, for mozilla-31
-       use jit && pax-mark p 
"${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
+       use jit && pax-mark pm 
"${ED}"${MOZILLA_FIVE_HOME}/{thunderbird,thunderbird-bin}
 
        # Plugin-container needs to be pax-marked for hardened to ensure 
plugins such as flash
        # continue to work as expected.

Reply via email to