From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R1wQI-0007Yg-Sh for garchives@archives.gentoo.org; Fri, 09 Sep 2011 08:26:55 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14D7D21C0DD; Fri, 9 Sep 2011 08:26:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9FF3A21C0DD for ; Fri, 9 Sep 2011 08:26:46 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC4781B4005 for ; Fri, 9 Sep 2011 08:26:45 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2245) id 85DE52004C; Fri, 9 Sep 2011 08:26:44 +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: firefox-3.6.22.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: firefox-3.6.22.ebuild ChangeLog X-VCS-Directories: www-client/firefox X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler Content-Type: text/plain; charset=utf8 Message-Id: <20110909082644.85DE52004C@flycatcher.gentoo.org> Date: Fri, 9 Sep 2011 08:26:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: e39bb807b456d109088f9fa706251c2b polynomial-c 11/09/09 08:26:44 Modified: ChangeLog Added: firefox-3.6.22.ebuild Log: security bump =20 (Portage version: 2.2.0_alpha54/cvs/Linux x86_64) Revision Changes Path 1.96 www-client/firefox/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox= /ChangeLog?rev=3D1.96&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox= /ChangeLog?rev=3D1.96&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox= /ChangeLog?r1=3D1.95&r2=3D1.96 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- ChangeLog 4 Sep 2011 10:19:42 -0000 1.95 +++ ChangeLog 9 Sep 2011 08:26:44 -0000 1.96 @@ -1,6 +1,11 @@ # ChangeLog for www-client/firefox # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.95 2= 011/09/04 10:19:42 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.96 2= 011/09/09 08:26:44 polynomial-c Exp $ + +*firefox-3.6.22 (08 Sep 2011) + + 08 Sep 2011; Lars Wendler +firefox-3.6.22.eb= uild: + Security bump. =20 04 Sep 2011; Markus Meier firefox-3.6.20.ebuild: arm stable, bug #379549 1.1 www-client/firefox/firefox-3.6.22.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox= /firefox-3.6.22.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/firefox= /firefox-3.6.22.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: firefox-3.6.22.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.22.ebui= ld,v 1.1 2011/09/09 08:26:44 polynomial-c Exp $ EAPI=3D"3" WANT_AUTOCONF=3D"2.1" inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib= pax-utils fdo-mime autotools mozextension java-pkg-opt-2 python LANGS=3D"af ar as be bg bn-BD bn-IN ca cs cy da de el en en-GB en-US eo e= s-AR \ es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gl gu-IN he hi-IN hr hu id i= s it \ ja ka kk kn ko ku lt lv mk ml mr nb-NO nl nn-NO oc or pa-IN pl pt-BR pt-P= T rm \ ro ru si sk sl sq sr sv-SE ta ta-LK te th tr uk vi zh-CN zh-TW" NOSHORTLANGS=3D"en-GB es-AR es-CL es-MX pt-BR zh-CN zh-TW" MAJ_XUL_PV=3D"1.9.2" MAJ_PV=3D"${PV/_*/}" # Without the _rc and _beta stuff DESKTOP_PV=3D"3.6" MY_PV=3D"${PV/_rc/rc}" # Handle beta for SRC_URI XUL_PV=3D"${MAJ_XUL_PV}${MAJ_PV/${DESKTOP_PV}/}" # Major + Minor version = no.s PATCH=3D"${PN}-3.6-patches-0.4" DESCRIPTION=3D"Firefox Web Browser" HOMEPAGE=3D"http://www.mozilla.com/firefox" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64= -linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"+alsa bindist gnome +ipc java libnotify system-sqlite wifi" REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/firefox/releases" SRC_URI=3D"${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.bz2" for X in ${LANGS} ; do if [ "${X}" !=3D "en" ] && [ "${X}" !=3D "en-US" ]; then SRC_URI=3D"${SRC_URI} linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P= }-${X}.xpi )" fi IUSE=3D"${IUSE} linguas_${X/-/_}" # english is handled internally if [ "${#X}" =3D=3D 5 ] && ! has ${X} ${NOSHORTLANGS}; then if [ "${X}" !=3D "en-US" ]; then SRC_URI=3D"${SRC_URI} linguas_${X%%-*}? ( ${REL_URI}/${PV}/linux-i686/xpi/${X}.xpi -> ${P}-= ${X}.xpi )" fi IUSE=3D"${IUSE} linguas_${X%%-*}" fi done RDEPEND=3D" >=3Dsys-devel/binutils-2.16.1 >=3Ddev-libs/nss-3.12.8 >=3Ddev-libs/nspr-4.8.6 >=3Dapp-text/hunspell-1.2 system-sqlite? ( >=3Ddev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=3Dx11-libs/cairo-1.8.8[X] gnome? ( >=3Dgnome-base/gnome-vfs-2.16.3 >=3Dgnome-base/libgnomeui-2.16.1 >=3Dgnome-base/gconf-2.16.0 >=3Dgnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=3Dx11-libs/libnotify-0.4 ) ~net-libs/xulrunner-${XUL_PV}[ipc=3D,java=3D,wifi=3D,libnotify=3D,system= -sqlite=3D]" DEPEND=3D"${RDEPEND} java? ( >=3Dvirtual/jdk-1.4 ) =3Ddev-lang/python-2*[threads] dev-util/pkgconfig" RDEPEND=3D"${RDEPEND} java? ( >=3Dvirtual/jre-1.4 )" S=3D"${WORKDIR}/mozilla-1.9.2" # This is a copy of the launcher program installed as part of xulrunner, = so has # already been stripped. Bug #332071 for details. QA_PRESTRIPPED=3D"usr/$(get_libdir)/${PN}/firefox" linguas() { local LANG SLANG for LANG in ${LINGUAS}; do if has ${LANG} en en_US; then has en ${linguas} || linguas=3D"${linguas:+"${linguas} "}en" continue elif has ${LANG} ${LANGS//-/_}; then has ${LANG//_/-} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${L= ANG//_/-}" continue elif [[ " ${LANGS} " =3D=3D *" ${LANG}-"* ]]; then for X in ${LANGS}; do if [[ "${X}" =3D=3D "${LANG}-"* ]] && \ [[ " ${NOSHORTLANGS} " !=3D *" ${X} "* ]]; then has ${X} ${linguas} || linguas=3D"${linguas:+"${linguas} "}${X}" continue 2 fi done fi ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" done } # XXX FIXME XXX: All refs to mozilla-${PN} need to become ${PN} with the = next bump # Note that this WILL cause breakage for packages that use fx's libdir an= d includedir pkg_setup() { # Ensure we always build with C locale. export LANG=3D"C" export LC_ALL=3D"C" export LC_MESSAGES=3D"C" export LC_CTYPE=3D"C" 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 yours= elf into" elog "a legal problem with Mozilla Foundation" elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" fi java-pkg-opt-2_pkg_setup python_set_active_version 2 } src_unpack() { unpack firefox-${MY_PV}.source.tar.bz2 ${PATCH}.tar.bz2 linguas for X in ${linguas}; do # FIXME: Add support for unpacking xpis to portage [[ ${X} !=3D "en" ]] && xpi_unpack "${P}-${X}.xpi" done } src_prepare() { # Apply our patches EPATCH_SUFFIX=3D"patch" \ EPATCH_FORCE=3D"yes" \ epatch "${WORKDIR}" # Allow user to apply additional patches without modifing ebuild epatch_user eautoreconf cd js/src eautoreconf } src_configure() { MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}" MEXTENSIONS=3D"default" #################################### # # 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" mozconfig_annotate '' --enable-crypto mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" mozconfig_annotate '' --enable-application=3Dbrowser mozconfig_annotate '' --disable-mailnews mozconfig_annotate 'broken' --disable-crashreporter mozconfig_annotate '' --enable-image-encoder=3Dall mozconfig_annotate '' --enable-canvas mozconfig_annotate 'gtk' --enable-default-toolkit=3Dcairo-gtk2 # Bug 60668: Galeon doesn't build without oji enabled, so enable it # regardless of java setting. mozconfig_annotate '' --enable-oji --enable-mathml mozconfig_annotate 'places' --enable-storage --enable-places mozconfig_annotate '' --enable-safe-browsing # Build mozdevelop permately mozconfig_annotate '' --enable-jsd --enable-xpctools # System-wide install specs mozconfig_annotate '' --disable-installer mozconfig_annotate '' --disable-updater mozconfig_annotate '' --disable-strip mozconfig_annotate '' --disable-install-strip # Use system libraries mozconfig_annotate '' --enable-system-cairo mozconfig_annotate '' --enable-system-hunspell mozconfig_annotate '' --with-system-nspr --with-nspr-prefix=3D"${EPREFIX= }"/usr mozconfig_annotate '' --with-system-nss --with-nss-prefix=3D"${EPREFIX}"= /usr mozconfig_annotate '' --x-includes=3D"${EPREFIX}"/usr/include --x-librar= ies=3D"${EPREFIX}"/usr/$(get_libdir) mozconfig_annotate '' --with-system-bz2 mozconfig_annotate '' --with-system-libxul mozconfig_annotate '' --with-libxul-sdk=3D"${EPREFIX}"/usr/$(get_libdir)= /xulrunner-devel-${MAJ_XUL_PV} mozconfig_use_enable gnome gnomevfs mozconfig_use_enable gnome gnomeui mozconfig_use_enable ipc # +ipc, upstream default mozconfig_use_enable libnotify mozconfig_use_enable java javaxpcom mozconfig_use_enable wifi necko-wifi mozconfig_use_enable alsa ogg mozconfig_use_enable alsa wave mozconfig_use_enable system-sqlite mozconfig_use_enable !bindist official-branding # Other ff-specific settings mozconfig_annotate '' --with-default-mozilla-five-home=3D${MOZILLA_FIVE_= HOME} # Finalize and report settings mozconfig_final if [[ $(gcc-major-version) -lt 4 ]]; then append-cxxflags -fno-stack-protector fi #################################### # # Configure and build # #################################### CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" PYTHON=3D"$(P= YTHON)" econf } src_compile() { # Should the build use multiprocessing? Not enabled by default, as it te= nds to break [ "${WANT_MP}" =3D "true" ] && jobs=3D${MAKEOPTS} || jobs=3D"-j1" emake ${jobs} || die } src_install() { MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/${PN}" emake DESTDIR=3D"${D}" install || die "emake install failed" linguas for X in ${linguas}; do [[ ${X} !=3D "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" done # Install icon and .desktop for menu entry if ! use bindist ; then newicon "${S}"/other-licenses/branding/firefox/content/icon48.png ${PN}= -icon.png newmenu "${FILESDIR}"/icon/${PN}-1.5.desktop \ mozilla-${PN}-${DESKTOP_PV}.desktop else newicon "${S}"/browser/branding/unofficial/content/icon48.png ${PN}-ico= n-unbranded.png newmenu "${FILESDIR}"/icon/${PN}-1.5-unbranded.desktop \ mozilla-${PN}-${DESKTOP_PV}.desktop sed -i -e "s:Bon\ Echo:Namoroka:" \ "${ED}"/usr/share/applications/mozilla-${PN}-${DESKTOP_PV}.desktop || = die "sed failed!" fi # Add StartupNotify=3Dtrue bug 237317 if use startup-notification ; then echo "StartupNotify=3Dtrue" >> "${ED}"/usr/share/applications/mozilla-$= {PN}-${DESKTOP_PV}.desktop fi pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/firefox # Enable very specific settings not inherited from xulrunner cp "${FILESDIR}"/firefox-default-prefs.js \ "${ED}/${MOZILLA_FIVE_HOME}/defaults/preferences/all-gentoo.js" || \ die "failed to cp firefox-default-prefs.js" # Plugins dir dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins \ || die "failed to symlink" # very ugly hack to make firefox not sigbus on sparc use sparc && { sed -e 's/Firefox/FirefoxGentoo/g' \ -i "${ED}/${MOZILLA_FIVE_HOME}/application.ini" || \ die "sparc sed failed"; } } pkg_postinst() { ewarn "We have finished moving away from mozilla-${PN}" ewarn "to plain jane ${PN}. If for some reason you have a bug" ewarn "that results please open a report and assign to maintainer" ewarn "with mozilla@gentoo.org being CC'd on the bug report." elog # Update mimedb for the new .desktop file fdo-mime_desktop_database_update }