diff options
author | Ian Stakenvicius <axs@gentoo.org> | 2015-10-22 14:05:44 -0400 |
---|---|---|
committer | Ian Stakenvicius <axs@gentoo.org> | 2015-10-22 14:05:44 -0400 |
commit | e523f3623a71c92739775476319a72bec6d97637 (patch) | |
tree | fca7cd6895a54770075f5f68d3a94312360c27fe | |
parent | Firefox 42.0b8, nspr-4.10.10, nss-3.20.1 (diff) | |
download | mozilla-e523f3623a71c92739775476319a72bec6d97637.tar.gz mozilla-e523f3623a71c92739775476319a72bec6d97637.tar.bz2 mozilla-e523f3623a71c92739775476319a72bec6d97637.zip |
Removed 41.0.2-r1, the experiment failed.
-rw-r--r-- | www-client/firefox/Manifest | 2 | ||||
-rw-r--r-- | www-client/firefox/files/jit-hardened.patch | 11 | ||||
-rw-r--r-- | www-client/firefox/firefox-41.0.2-r1.ebuild | 420 |
3 files changed, 1 insertions, 432 deletions
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest index df16049f..d581e145 100644 --- a/www-client/firefox/Manifest +++ b/www-client/firefox/Manifest @@ -80,4 +80,4 @@ DIST firefox-41.0.2-zh-CN.xpi 486222 SHA256 8c49c52b80937a00da8953ecb1bdd1c6505e DIST firefox-41.0.2-zh-TW.xpi 479033 SHA256 a1b3661c004ead49b5b1adac7515de402319ae82b06121313deb51b1ec7fcb20 SHA512 08a7e516fb556b1134a9a05c782b0312c5b4d8907d671be47a0aeedd1a0933fb22b0fd5ab6fcc7888a00258b06b420555752baeccacbea7de8e2d996578ba95b WHIRLPOOL 40f955c3d9d96fa2a2a5ffdab65260d7dd06e9d10b855a0397baf72305002b517dfba55d75e762dbe1a3ea237a691c082b9a6cf1d0241fa055232f02349b46db DIST firefox-41.0.2.source.tar.xz 159761468 SHA256 ff00689f4d2ff54c5eb7b3aa367560a3645800eb0c96e73a795e461461b1970e SHA512 700c1f355436747f8707b4086dfa0865c87ca7d1c3a5a879347e3460b26158681716addf085dc2446b1eeaccf328b3f3d6282df8e00cd97d8affd97dd780b409 WHIRLPOOL dd52ac3fa4c97ff0252eaf8530340a9baf515a0ad7afd121391c05de7fa030cd5151476073665a917568fe9c81cddc67109d19ad8f453ce601ff7ef4de148f08 DIST firefox-42.0-patches-01b2.tar.xz 6424 SHA256 6c8a89c75ea4a359bf720f011e1bb856b653cd6676767b33ccb9d2f807a089e3 SHA512 d40266c98aa5bfeed243e3bd42f9146bc73492bd20bd07ac4941df83793a7e3a832220b65fc8c9eeb5f3a00089087251a2b758df5fc0d3dd3403468ec0b9eb53 WHIRLPOOL 93356507e31a5dca653a5fcc844c24acc1de6b2a01f3dbd7227c1e23eda4e8799a59cf1a50bb49b721249cb82c744d49f4671bfb7188275101c6de955afdb149 -DIST firefox-42.0b6.source.tar.xz 165774656 SHA256 fbf1674306c4bf97c5f420811ccf761ef729148669560fd384355467d5f1dc0a SHA512 ae5c30b4592bee65d3f4efbd7ceb383390534ccb0cd58a36b57f4a07af02d6a7bcebb3d98368714ffe5a228ab4a715ffdb75f7ddf8f50d6d1971fb9e1b05091e WHIRLPOOL 7c9fa4f5e0a53fea6c8a0654d85c9b3673aa3fba38adc129cf1990b3b2cd558d966c4a7f1bdf35902489f6921560985a9637e94abf83dc3247c24a81472f8102 +DIST firefox-42.0b8.source.tar.xz 165772404 SHA256 f813958903af24e0dd29c0647ff90e18596283b60fa10ea27f3b9c7fa1f10e82 SHA512 e436607ba62604f7543fad30da33c49996f04895e3ba5c67ce69241a75ef34282e7e24cf986da54e226810815f21a005dd73b878ecc20ea098d46e26bf961d70 WHIRLPOOL e210343f74a7cb15f7526a4aeaca2727012c14518bf394163ec1b4b16f8f9cb1c24c6c8203e007bdea44d3d74204ff138a1f989c9159a586a3a883532d19f5a7 diff --git a/www-client/firefox/files/jit-hardened.patch b/www-client/firefox/files/jit-hardened.patch deleted file mode 100644 index 9fb48ead..00000000 --- a/www-client/firefox/files/jit-hardened.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/js/src/jit/ExecutableAllocator.cpp 2015-10-19 19:19:40.000000000 -0400 -+++ b/js/src/jit/ExecutableAllocator.cpp 2015-10-20 12:35:37.995626076 -0400 -@@ -88,7 +88,7 @@ - } - } - --#if TARGET_OS_IPHONE -+#if ! TARGET_OS_IPHONE - bool ExecutableAllocator::nonWritableJitCode = true; - #else - bool ExecutableAllocator::nonWritableJitCode = false; diff --git a/www-client/firefox/firefox-41.0.2-r1.ebuild b/www-client/firefox/firefox-41.0.2-r1.ebuild deleted file mode 100644 index 99807eeb..00000000 --- a/www-client/firefox/firefox-41.0.2-r1.ebuild +++ /dev/null @@ -1,420 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -VIRTUALX_REQUIRED="pgo" -WANT_AUTOCONF="2.1" -MOZ_ESR="" - -# This list can be updated with scripts/get_langs.sh from the mozilla overlay -# No official support as of fetch time -# csb -MOZ_LANGS=( af ar as ast be bg bn-BD bn-IN br bs ca cs cy da de el en -en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd -gl gu-IN he hi-IN hr hu hy-AM id is it ja kk km kn ko lt lv mai mk ml mr -nb-NO nl nn-NO or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta te -th tr uk vi xh zh-CN zh-TW ) - -# Convert the ebuild version to the upstream mozilla version, used by mozlinguas -MOZ_PV="${PV/_alpha/a}" # Handle alpha for SRC_URI -MOZ_PV="${MOZ_PV/_beta/b}" # Handle beta for SRC_URI -MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI - -if [[ ${MOZ_ESR} == 1 ]]; then - # ESR releases have slightly version numbers - MOZ_PV="${MOZ_PV}esr" -fi - -# Patch version -PATCH="${PN}-41.0-patches-01" -MOZ_HTTP_URI="http://archive.mozilla.org/pub/${PN}/releases" - -MOZCONFIG_OPTIONAL_GTK3=1 -MOZCONFIG_OPTIONAL_WIFI=1 -# MOZCONFIG_OPTIONAL_JIT="enabled" - -inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v6.41 multilib pax-utils fdo-mime autotools virtualx mozlinguas - -DESCRIPTION="Firefox Web Browser" -HOMEPAGE="http://www.mozilla.com/firefox" - -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -SLOT="0" -LICENSE="MPL-2.0 GPL-2 LGPL-2.1" -IUSE="bindist egl hardened +minimal neon pgo selinux +gmp-autoupdate test" -RESTRICT="!bindist? ( bindist )" - -# More URIs appended below... -SRC_URI="${SRC_URI} - https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz - https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz - https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz" - -ASM_DEPEND=">=dev-lang/yasm-1.1" - -# Mesa 7.10 needed for WebGL + bugfixes -RDEPEND=" - >=dev-libs/nss-3.19.2 - >=dev-libs/nspr-4.10.8 - selinux? ( sec-policy/selinux-mozilla )" - -DEPEND="${RDEPEND} - pgo? ( - >=sys-devel/gcc-4.5 ) - amd64? ( ${ASM_DEPEND} - virtual/opengl ) - x86? ( ${ASM_DEPEND} - virtual/opengl )" - -# No source releases for alpha|beta -if [[ ${PV} =~ alpha ]]; then - CHANGESET="8a3042764de7" - SRC_URI="${SRC_URI} - https://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.xz" - S="${WORKDIR}/mozilla-aurora-${CHANGESET}" -elif [[ ${PV} =~ beta ]]; then - S="${WORKDIR}/mozilla-beta" - SRC_URI="${SRC_URI} - ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz" -else - SRC_URI="${SRC_URI} - ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.xz" - if [[ ${MOZ_ESR} == 1 ]]; then - S="${WORKDIR}/mozilla-esr${PV%%.*}" - else - S="${WORKDIR}/mozilla-release" - fi -fi - -QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/firefox" - -BUILD_OBJ_DIR="${S}/ff" - -pkg_setup() { - moz_pkgsetup - - # Avoid PGO profiling problems due to enviroment leakage - # These should *always* be cleaned up anyway - unset DBUS_SESSION_BUS_ADDRESS \ - DISPLAY \ - ORBIT_SOCKETDIR \ - SESSION_MANAGER \ - XDG_SESSION_COOKIE \ - XAUTHORITY - - if ! use bindist; then - einfo - elog "You are enabling official branding. You may not redistribute this build" - elog "to any users on your network or the internet. Doing so puts yourself into" - elog "a legal problem with Mozilla Foundation" - elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" - fi - - if use pgo; then - einfo - ewarn "You will do a double build for profile guided optimization." - ewarn "This will result in your build taking at least twice as long as before." - fi -} - -pkg_pretend() { - # Ensure we have enough disk space to compile - if use pgo || use debug || use test ; then - CHECKREQS_DISK_BUILD="8G" - else - CHECKREQS_DISK_BUILD="4G" - fi - check-reqs_pkg_setup -} - -src_unpack() { - unpack ${A} - - # Unpack language packs - mozlinguas_src_unpack -} - -src_prepare() { - # Apply our patches - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - epatch "${WORKDIR}/firefox" - - # a hack for now to enable nonWritableJitCode so jit can work on hardened. - use hardened && epatch "${FILESDIR}"/jit-hardened.patch - - # Allow user to apply any additional patches without modifing ebuild - epatch_user - - # Enable gnomebreakpad - if use debug ; then - sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ - "${S}"/build/unix/run-mozilla.sh || die "sed failed!" - fi - - # Ensure that our plugins dir is enabled as default - sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ - "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!" - sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \ - "${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!" - - # Fix sandbox violations during make clean, bug 372817 - sed -e "s:\(/no-such-file\):${T}\1:g" \ - -i "${S}"/config/rules.mk \ - -i "${S}"/nsprpub/configure{.in,} \ - || die - - # Don't exit with error when some libs are missing which we have in - # system. - sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ - -i "${S}"/browser/installer/Makefile.in || die - - # Don't error out when there's no files to be removed: - sed 's@\(xargs rm\)$@\1 -f@' \ - -i "${S}"/toolkit/mozapps/installer/packager.mk || die - - # Keep codebase the same even if not using official branding - sed '/^MOZ_DEV_EDITION=1/d' \ - -i "${S}"/browser/branding/aurora/configure.sh || die - - eautoreconf - - # Must run autoconf in js/src - cd "${S}"/js/src || die - eautoconf - - # Need to update jemalloc's configure - cd "${S}"/memory/jemalloc/src || die - WANT_AUTOCONF= eautoconf -} - -src_configure() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - MEXTENSIONS="default" - # Google API keys (see http://www.chromium.org/developers/how-tos/api-keys) - # Note: These are for Gentoo Linux use ONLY. For your own distribution, please - # get your own set of keys. - _google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc - - #################################### - # - # mozconfig, CFLAGS and CXXFLAGS setup - # - #################################### - - mozconfig_init - mozconfig_config - - # 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" - - # enable non-writable-jit-code for hardened and force jit on -# use hardened && \ -# echo "mk_add_options MOZ_ENABLE_NON_WRITABLE_JIT_CODE=1" >> "${S}"/.mozconfig - mozconfig_annotate 'Gentoo testing of forced jit' --enable-ion - - if use neon ; then - mozconfig_annotate '' --with-fpu=neon - mozconfig_annotate '' --with-thumb=yes - mozconfig_annotate '' --with-thumb-interwork=no - fi - - if [[ ${CHOST} == armv* ]] ; then - mozconfig_annotate '' --with-float-abi=hard - mozconfig_annotate '' --enable-skia - - if ! use system-libvpx ; then - sed -i -e "s|softfp|hard|" \ - "${S}"/media/libvpx/moz.build - fi - fi - - use egl && mozconfig_annotate 'Enable EGL as GL provider' --with-gl-provider=EGL - - # Setup api key for location services - echo -n "${_google_api_key}" > "${S}"/google-api-key - mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key" - - mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" - mozconfig_annotate '' --disable-mailnews - - # Other ff-specific settings - mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} - - # Allow for a proper pgo build - if use pgo; then - echo "mk_add_options PROFILE_GEN_SCRIPT='\$(PYTHON) \$(OBJDIR)/_profile/pgo/profileserver.py'" >> "${S}"/.mozconfig - fi - - echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig - - # Finalize and report settings - mozconfig_final - - if [[ $(gcc-major-version) -lt 4 ]]; then - append-cxxflags -fno-stack-protector - fi - - # workaround for funky/broken upstream configure... - emake -f client.mk configure -} - -src_compile() { - if use pgo; then - addpredict /root - addpredict /etc/gconf - # Reset and cleanup environment variables used by GNOME/XDG - gnome2_environment_reset - - # Firefox tries to use dri stuff when it's run, see bug 380283 - shopt -s nullglob - cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -z "${cards}"; then - cards=$(echo -n /dev/ati/card* /dev/nvidiactl* | sed 's/ /:/g') - if test -n "${cards}"; then - # Binary drivers seem to cause access violations anyway, so - # let's use indirect rendering so that the device files aren't - # touched at all. See bug 394715. - export LIBGL_ALWAYS_INDIRECT=1 - fi - fi - shopt -u nullglob - addpredict "${cards}" - - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ - Xemake -f client.mk profiledbuild || die "Xemake failed" - else - CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ - MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \ - emake -f client.mk realbuild - fi - -} - -src_install() { - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" - DICTPATH="\"${EPREFIX}/usr/share/myspell\"" - - 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" \ - || die - - # Set default path to search for dictionaries. - echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \ - >> "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - - echo "pref(\"extensions.autoDisableScopes\", 3);" >> \ - "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - - local plugin - use gmp-autoupdate || for plugin in \ - gmp-gmpopenh264 ; do - echo "pref(\"media.${plugin}.autoupdate\", false);" >> \ - "${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \ - || die - done - - MOZ_MAKE_FLAGS="${MAKEOPTS}" \ - emake DESTDIR="${D}" install - - # Install language packs - mozlinguas_src_install - - local size sizes icon_path icon name - if use bindist; then - sizes="16 32 48" - icon_path="${S}/browser/branding/aurora" - # Firefox's new rapid release cycle means no more codenames - # Let's just stick with this one... - icon="aurora" - name="Aurora" - - # Override preferences to set the MOZ_DEV_EDITION defaults, since we - # don't define MOZ_DEV_EDITION to avoid profile debaucles. - # (source: browser/app/profile/firefox.js) - cat >>"${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" <<PROFILE_EOF -pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/firefoxdev/%VERSION%/"); -sticky_pref("lightweightThemes.selectedThemeID", "firefox-devedition@mozilla.org"); -sticky_pref("browser.devedition.theme.enabled", true); -sticky_pref("devtools.theme", "dark"); -PROFILE_EOF - - else - sizes="16 22 24 32 256" - icon_path="${S}/browser/branding/official" - icon="${PN}" - name="Mozilla Firefox" - fi - - # Install icons and .desktop for menu entry - for size in ${sizes}; do - insinto "/usr/share/icons/hicolor/${size}x${size}/apps" - newins "${icon_path}/default${size}.png" "${icon}.png" - done - # The 128x128 icon has a different name - insinto "/usr/share/icons/hicolor/128x128/apps" - newins "${icon_path}/mozicon128.png" "${icon}.png" - # Install a 48x48 icon into /usr/share/pixmaps for legacy DEs - newicon "${icon_path}/content/icon48.png" "${icon}.png" - newmenu "${FILESDIR}/icon/${PN}.desktop" "${PN}.desktop" - sed -i -e "s:@NAME@:${name}:" -e "s:@ICON@:${icon}:" \ - "${ED}/usr/share/applications/${PN}.desktop" || die - - # Add StartupNotify=true bug 237317 - if use startup-notification ; then - echo "StartupNotify=true"\ - >> "${ED}/usr/share/applications/${PN}.desktop" \ - || 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 - - 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?? - use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ - -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" \ - || die "sparc sed failed"; } - - # revdep-rebuild entry - insinto /etc/revdep-rebuild - echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10firefox - doins "${T}"/10${PN} || die -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - # Update mimedb for the new .desktop file - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} |