commit: d9ea8a1a13c4168671d0f5ef9b4d698e0a535f09
Author: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 14:08:49 2016 +0000
Commit: Ian Stakenvicius <axs <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 14:08:55 2016 +0000
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=d9ea8a1a
bump firefox-46 to beta6, put back optional jit
Testing on hardened showed that despite upstream's declaration that all RWX
bits of code
are now W^X, there are still a number of mprotect related errors. Putting back
the jit flag
so that it can be disabled for hardened, and reintroducing the various patches
etc to support
non-jit builds.
www-client/firefox/Manifest | 4 ++--
...46.0_beta4.ebuild => firefox-46.0_beta6.ebuild} | 22 +++++++---------------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index d3536ed..6232e95 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -79,5 +79,5 @@ DIST firefox-45.0.1-xh.xpi 429734 SHA256
638b3ac560c1e61f410ff8ee53125e58d6a0fe7
DIST firefox-45.0.1-zh-CN.xpi 469931 SHA256
69dcf93c1e3ea55d248834f653d2d80706a1c91038f745b183f9f670116728e2 SHA512
21ad24eb635321ddf979217181c6f8c42b673ffc266e35d22078508ac7d6857986955299070b01ffb9a45938d3bf19905ce24c7ca4fc759b040491a8a4c2d4a8
WHIRLPOOL
eeed1f803a52558dfe48a0eab30dfbcad69652ff748355e76dcd6d0e7ad2bffbc74e9f91a12945aed08d668ae9cc09c57d634101ed29543bd3ec9ae1704fa8bc
DIST firefox-45.0.1-zh-TW.xpi 460795 SHA256
b5ed300a15623e1f8207e5b566864f2cba8772ddcec5fff460b8b37e5a9f2cbd SHA512
7ee83363c5f5b0317d50ba1ba90ad910a8e01a2d83ea3da0ba1a533bca413e32f4220dbc2ccdc2cdbb75dbcf7b23fa5c32a6fa5f9bec9416b6d06f188a5f061e
WHIRLPOOL
cc114e9aad479dec70eecf03c42c6f17965cdf96bec90011f4287d8bd2c865eefcc8fe040c28ce2812173922f53cc938cfeaad18e851b1f5f72b893e5f7dd3d8
DIST firefox-45.0.1.source.tar.xz 184009616 SHA256
d1814ac6d8cd687696bd0d98da3bb525f6df11fe655e0d668742b21fca57d9c8 SHA512
ff28116aff3dd07bf9c43724c7870cac8e4764639c5ee1248cc1003a4f6005f86b823a0f7969425970e2aeba3eca22e4aa88fa3c5d912c253373d398257d8438
WHIRLPOOL
10bf50ca841136a91410ea71de577f97b7a29c56258882a4a48d68ac872ad49bf0f900b8d5a2f19172346229bc83ffbfc87d5cf29080f3589b8fd372ffc2ca55
-DIST firefox-46.0-patches-0.2.tar.xz 14388 SHA256
f34c0b1550a356a231c307bb92386482e2a6531845fe88acd7cbcda645b64063 SHA512
27466e933eefa18f1a5d3ed27d57c0d1548c1106bc51275d7fa1acb43f30ed51e31be3d26806f9eddfc01f0526d0865b3e98a22c719b45dd3aa7029374c9d228
WHIRLPOOL
579b7bc67300557d2172de58539e9026d2806e1f6395f41fe956c98a17ccd7075094d412c4b5c8a53e247b69bcd1b3082d1c27fba5eef2059f4c898bffdc8715
-DIST firefox-46.0b4.source.tar.xz 186991436 SHA256
4b230040dbd16fdb51616a02ee97827a3299f1147b14086b4163c6f03fe24f79 SHA512
24d9a3f7b1c5fc757c769e2698ae0947df80aa366a555c853f3db494eaffbdb11fd170edacec3221bfd1b8ff9c8944ef3b28a80db62804e341228712a7ff2a69
WHIRLPOOL
7cd8d24294a2a3606ece0ce46d37023ad19f035bed970a246539588745457b0c854edc5379c5caad2f5ea90fa8453e1f964fada944b5b769d51b501cd200323f
+DIST firefox-46.0-patches-0.3.tar.xz 14376 SHA256
3db42f35a0b86e8b1621bbc3f499f4b6d3f317728faa468f7acfe2ec34162ef9 SHA512
e593bc6751cd88e6e004012292d8ff39008e5ed46bcea73702f88365ec714e17f468ba4c297e06b07052706ff98a13dca69b4a05b4f2c45f7070d2b1fd4571bd
WHIRLPOOL
6179d9f4e8e3a2c66632e15db3a4db4a79b8ea7c7a92d15754438f6fb5a38ad09c852e047952c99d37cff8f42b4ffc1ddbd4df6e8855a1d800561306d1320779
+DIST firefox-46.0b6.source.tar.xz 187289468 SHA256
9a265fa8a236b1f0f0878f667b4fd5f2b6931bddaffc2c4d8337b34f4e1be926 SHA512
b4f53fd59014f85f8c2ff0d115873a4ee4d75df0511168fe8489ed2ce20c178f218cd91f9d0b50d06b32eb482b4b9ef4a6e13996ea401646b626a22b0d190dc4
WHIRLPOOL
f857c0320e2c66c34a230044926f2d01ca09939c8059ab2c764922a53c91e96ae442d992397c1044698fc32f1fb0c8b6a581a79970bce53f4fb049180dbd4b09
diff --git a/www-client/firefox/firefox-46.0_beta4.ebuild
b/www-client/firefox/firefox-46.0_beta6.ebuild
similarity index 94%
rename from www-client/firefox/firefox-46.0_beta4.ebuild
rename to www-client/firefox/firefox-46.0_beta6.ebuild
index 99bda6c..6dd062f 100644
--- a/www-client/firefox/firefox-46.0_beta4.ebuild
+++ b/www-client/firefox/firefox-46.0_beta6.ebuild
@@ -27,13 +27,13 @@ if [[ ${MOZ_ESR} == 1 ]]; then
fi
# Patch version
-PATCH="${PN}-46.0-patches-0.2"
+PATCH="${PN}-46.0-patches-0.3"
MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases";
MOZCONFIG_OPTIONAL_GTK2ONLY=1
#MOZCONFIG_OPTIONAL_QT5=1 -- fails to build so leave it off until the code can
be patched
MOZCONFIG_OPTIONAL_WIFI=1
-#MOZCONFIG_OPTIONAL_JIT="enabled" -- forcing jit no matter what, hardened
should work due to W^X support
+MOZCONFIG_OPTIONAL_JIT="enabled"
inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils
mozconfig-v6.46 pax-utils fdo-mime autotools virtualx mozlinguas
@@ -130,14 +130,9 @@ src_unpack() {
}
src_prepare() {
- # Clear patches no longer needed
- rm -f
"${WORKDIR}"/firefox/8005_gtk3_fix_transparent_tooltip_bkg_bug1197165_moz47.patch
-
# Apply our patches
eapply "${WORKDIR}/firefox"
-# "${FILESDIR}"/${PN}-45-qt-widget-fix.patch \
-# "${FILESDIR}"/${P}-jitless-atomic-operations-ppc64.patch \
-# "${FILESDIR}"/${P}-jitless-atomic-operations-x86.patch
+# "${FILESDIR}"/${PN}-45-qt-widget-fix.patch
# Allow user to apply any additional patches without modifing ebuild
eapply_user
@@ -217,9 +212,6 @@ src_configure() {
echo -n "${_google_api_key}" > "${S}"/google-api-key
mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
- # upstream W^X support should mean we can enable jit all the time
- mozconfig_annotate '' --enable-ion
-
mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
mozconfig_annotate '' --disable-mailnews
@@ -366,11 +358,11 @@ PROFILE_EOF
fi
# Required in order to use plugins and even run firefox on hardened,
with jit useflag.
-# if use jit; then
-# pax-mark m
"${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
-# else
+ if use jit; then
+ pax-mark m
"${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+ else
pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
-# fi
+ fi
# very ugly hack to make firefox not sigbus on sparc
# FIXME: is this still needed??
