From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1C448138CA2 for ; Thu, 23 Apr 2015 13:14:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCF4DE09AB; Thu, 23 Apr 2015 13:14:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61ED4E09AB for ; Thu, 23 Apr 2015 13:14:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 72EB4340A8F for ; Thu, 23 Apr 2015 13:14:27 +0000 (UTC) Received: by oystercatcher.gentoo.org (Postfix, from userid 2245) id 3553D168F3; Thu, 23 Apr 2015 13:14:26 +0000 (UTC) From: "Lars Wendler (polynomial-c)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, polynomial-c@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in www-client/firefox: ChangeLog firefox-37.0.2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog firefox-37.0.2.ebuild X-VCS-Directories: www-client/firefox X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20150423131426.3553D168F3@oystercatcher.gentoo.org> Date: Thu, 23 Apr 2015 13:14:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 0c02a434-48ab-4f96-b499-354f31da4b45 X-Archives-Hash: cc2679238c4585c16995af7484cf900a polynomial-c 15/04/23 13:14:26 Modified: ChangeLog Added: firefox-37.0.2.ebuild Log: Security bump (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC) Revision Changes Path 1.411 www-client/firefox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/ChangeLog?rev=1.411&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/ChangeLog?rev=1.411&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/ChangeLog?r1=1.410&r2=1.411 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v retrieving revision 1.410 retrieving revision 1.411 diff -u -r1.410 -r1.411 --- ChangeLog 6 Apr 2015 22:38:40 -0000 1.410 +++ ChangeLog 23 Apr 2015 13:14:26 -0000 1.411 @@ -1,6 +1,11 @@ # ChangeLog for www-client/firefox # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.410 2015/04/06 22:38:40 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.411 2015/04/23 13:14:26 polynomial-c Exp $ + +*firefox-37.0.2 (23 Apr 2015) + + 23 Apr 2015; Lars Wendler +firefox-37.0.2.ebuild: + Security bump. 06 Apr 2015; Ian Stakenvicius (_AxS_) firefox-37.0.1.ebuild, +files/firefox-37.0-jemalloc_configure_unbashify.patch: 1.1 www-client/firefox/firefox-37.0.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/firefox-37.0.2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox/firefox-37.0.2.ebuild?rev=1.1&content-type=text/plain Index: firefox-37.0.2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-37.0.2.ebuild,v 1.1 2015/04/23 13:14:26 polynomial-c Exp $ 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}-36.0-patches-01" # Upstream ftp release URI that's used by mozlinguas.eclass # We don't use the http mirror because it deletes old tarballs. MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/${PN}/releases" MOZ_HTTP_URI="http://ftp.mozilla.org/pub/${PN}/releases" MOZCONFIG_OPTIONAL_WIFI=1 inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v5.36 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 hardened +minimal pgo selinux +gmp-autoupdate test" RESTRICT="!bindist? ( bindist )" # More URIs appended below... SRC_URI="${SRC_URI} http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz http://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.17.4 >=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} http://dev.gentoo.org/~nirbheek/mozilla/firefox/firefox-${MOZ_PV}_${CHANGESET}.source.tar.bz2" S="${WORKDIR}/mozilla-aurora-${CHANGESET}" elif [[ ${PV} =~ beta ]]; then S="${WORKDIR}/mozilla-beta" SRC_URI="${SRC_URI} ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2 ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2" else SRC_URI="${SRC_URI} ${MOZ_FTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2 ${MOZ_HTTP_URI}/${MOZ_PV}/source/firefox-${MOZ_PV}.source.tar.bz2" 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_EXCLUDE="8002_jemalloc_configure_unbashify.patch" \ EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ epatch "${WORKDIR}/firefox" epatch "${FILESDIR}"/${PN}-35.0-gmp-clearkey-sprintf.patch epatch "${FILESDIR}"/${PN}-37.0-jemalloc_configure_unbashify.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 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" # 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} # force jit mozconfig_annotate '' --enable-ion # 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 elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then if use amd64 || use x86; then append-flags -mno-avx fi fi } 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}" \ Xemake -f client.mk profiledbuild || die "Xemake failed" else CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ emake -f client.mk 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" 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. pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,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?? 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 }