commit:     249aca8efeb921f76a2a0491eca4fefe9e9686e6
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 04:20:08 2016 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 04:20:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=249aca8e

www-client/firefox - do not install sdk at all, mark jit pages
non-writable

 www-client/firefox/Manifest                  |  2 +-
 www-client/firefox/firefox-44.0_beta9.ebuild | 21 +++++----------------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 68f7dbe..e9b73a8 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -79,5 +79,5 @@ DIST firefox-43.0-xh.xpi 458719 SHA256 
f48562863c31cd8ec05cb0e79323fbd4b0c8426e7
 DIST firefox-43.0-zh-CN.xpi 493639 SHA256 
73c74a35f7862f6e583d2fd9edb6fcd3e565c564977897896761e2ba153e1b54 SHA512 
1298691174e95bd79dfa24602dec4d7cb5228e9544bdf404215ac4bbee1de7230b6c9989cf8305956d23136c10470a0779233124b3f3b5ffc695230bf43301d0
 WHIRLPOOL 
a6674405f7ec161391b7876d8f1168db2719d653411dfdd17c2373560dee243914565343c3d3d48587b7b4d07dd3edc9443385a2d5fe78e2b454961c068f6e60
 DIST firefox-43.0-zh-TW.xpi 485317 SHA256 
488fb84380b3729e2c78c2bb5c9d4046988f4c457727ac19c9458f92f1fe72fb SHA512 
e5a32805e3e68b54b3ebe19f5b1dc9a606df232cdc7df301a57d6ba39ab6d69347c27480c2162e30cbdcf1601364c47f3811398751ab4f63f94763772212bbbd
 WHIRLPOOL 
2273baf3e84b7f390a9c121a125902dcf1d625ebf4b96451f78642f16dd2e62b5abf4cda70a66daaec25d68e15e5bc1cd0cb460cde26f18c17008febf6198396
 DIST firefox-43.0.source.tar.xz 175414296 SHA256 
a5b16741dcce9344ca71e39e0efb0e7e1336ca5160cb9b6b12f8985f402d8fea SHA512 
3ca37428d1b02ba2609ec526e86ab96563b403a03efde8439cbb4acdb282b5970ccb6a14266483c839389d59e07f6b0297314890ee04a669ba2d4b10bc4cb738
 WHIRLPOOL 
14d8d90452bf6d0e3965f0c8050d0dd4771f1a00a6cc68f6ae9e26334e5a2c5cad9fae92d51f0f677b07aea3120e75686655cbd5c6bcf7f0b5f84d9a1ca4553f
-DIST firefox-44.0-patches-0.3.tar.xz 13724 SHA256 
f10d7b8009f720268ffd8ce4354a91ad8604b8eb67cf85fa97250915ac1de639 SHA512 
b4d93a506b2b1cc264e6407ec509b6fc6fa7543e99e90edb2ef1049ed087d50a1b36331c8dceb978f15de59483c737bac4f16753634418852a7beadff3834fa6
 WHIRLPOOL 
8a95ecdba91ace71ca250313f597eff87f845e9c33944ab7325690361b2eff449a346a90afd91d81bcdd39d1c541a0a67603f43be3c0b8828da1a81935c98aa6
+DIST firefox-44.0-patches-0.4.tar.xz 14240 SHA256 
cf17d24e19c8e64501582c77e010a10bf8cc65fc1d7620f7a8dd98706195eda0 SHA512 
4f597f9885366a6ccbd7cf424fd68bc7d2377eeb5de4741b21d6f51272a9f4f6a57ff2b5a848593097e79d51a7ae7e6e261aea9155f4b3d719e74ebbdf7279f1
 WHIRLPOOL 
097eb79a5aba97f76d50f5f51da8b089c3d85b34c6a41d6ca782a85381f024d8865062d95ff4bb2235426e3806b660344d3ddf067da0889cda66f0b24cb97912
 DIST firefox-44.0b9.source.tar.xz 182350164 SHA256 
c42908a17abba3420bd3035c9d4736ae6d71c0018f3eac3523ee7ad6be17bfe4 SHA512 
ce260ca9b632159180a11842a9dffd513ebdf1d1e8615f2efc306508b93ea01c185fe3051c837deb28ea0700eee28a7b8c4607bdd277202354e942dd7283bd97
 WHIRLPOOL 
767604e987d8d989d38c141f716964876dad2e28839e30c141ce116e515e5801032912627ae309e69d97e4c0f6c0a0efedd10c76fb44771e4ac8cae95c74c0c1

diff --git a/www-client/firefox/firefox-44.0_beta9.ebuild 
b/www-client/firefox/firefox-44.0_beta9.ebuild
index 8549e8e..0ea3f61 100644
--- a/www-client/firefox/firefox-44.0_beta9.ebuild
+++ b/www-client/firefox/firefox-44.0_beta9.ebuild
@@ -27,7 +27,7 @@ if [[ ${MOZ_ESR} == 1 ]]; then
 fi
 
 # Patch version
-PATCH="${PN}-44.0-patches-0.3"
+PATCH="${PN}-44.0-patches-0.4"
 MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases";
 
 MOZCONFIG_OPTIONAL_GTK3=1
@@ -35,7 +35,7 @@ MOZCONFIG_OPTIONAL_QT5=1
 MOZCONFIG_OPTIONAL_WIFI=1
 MOZCONFIG_OPTIONAL_JIT="enabled"
 
-inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils 
mozconfig-v6.44 multilib pax-utils fdo-mime autotools virtualx mozlinguas
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils 
mozconfig-v6.44 multilib fdo-mime autotools virtualx mozlinguas
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.com/firefox";
@@ -44,7 +44,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 
~amd64-linux ~x86-linu
 
 SLOT="0"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
-IUSE="bindist egl hardened +hwaccel +minimal pgo selinux +gmp-autoupdate test"
+IUSE="bindist egl hardened +hwaccel pgo selinux +gmp-autoupdate test"
 RESTRICT="!bindist? ( bindist )"
 
 # More URIs appended below...
@@ -276,9 +276,6 @@ src_install() {
 
        cd "${BUILD_OBJ_DIR}" || die
 
-       # Pax mark xpcshell for hardened support, only used for startupcache 
creation.
-       pax-mark m "${BUILD_OBJ_DIR}"/dist/bin/xpcshell
-
        # Add our default prefs for firefox
        cp "${FILESDIR}"/gentoo-default-prefs.js-1 \
                
"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
@@ -361,17 +358,9 @@ PROFILE_EOF
                        || die
        fi
 
-       # Required in order to use plugins and even run firefox on hardened.
-       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
+       # Only required for plugins such as adobe flash.
+       pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
 
-       if use minimal; then
-               rm -r "${ED}"/usr/include 
"${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
-                       || die "Failed to remove sdk and headers"
-       fi
 
        # very ugly hack to make firefox not sigbus on sparc
        # FIXME: is this still needed??

Reply via email to