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 1ObkLQ-000140-1k for garchives@archives.gentoo.org; Thu, 22 Jul 2010 01:13:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47E4CE0931; Thu, 22 Jul 2010 01:13:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0B29BE0931 for ; Thu, 22 Jul 2010 01:13:02 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 10EAC1B4134 for ; Thu, 22 Jul 2010 01:13:01 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 942) id 566592CE15; Thu, 22 Jul 2010 01:13:00 +0000 (UTC) From: "Jory Pratt (anarchy)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, anarchy@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in mail-client/thunderbird: ChangeLog thunderbird-3.1.1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog thunderbird-3.1.1.ebuild X-VCS-Directories: mail-client/thunderbird X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt Content-Type: text/plain; charset=utf8 Message-Id: <20100722011300.566592CE15@corvid.gentoo.org> Date: Thu, 22 Jul 2010 01:13:00 +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: 43117695-3e03-4109-b42b-f21308f4f0d3 X-Archives-Hash: 1fca82ad5a34d5a6196f98c7bf9a8a8e anarchy 10/07/22 01:13:00 Modified: ChangeLog Added: thunderbird-3.1.1.ebuild Log: Security bump (bug #329279) (Portage version: 2.1.8.3/cvs/Linux x86_64) Revision Changes Path 1.17 mail-client/thunderbird/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunde= rbird/ChangeLog?rev=3D1.17&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunde= rbird/ChangeLog?rev=3D1.17&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunde= rbird/ChangeLog?r1=3D1.16&r2=3D1.17 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/mail-client/thunderbird/ChangeLog,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- ChangeLog 18 Jul 2010 23:55:10 -0000 1.16 +++ ChangeLog 22 Jul 2010 01:13:00 -0000 1.17 @@ -1,6 +1,12 @@ # ChangeLog for mail-client/thunderbird # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1= .16 2010/07/18 23:55:10 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1= .17 2010/07/22 01:13:00 anarchy Exp $ + +*thunderbird-3.1.1 (22 Jul 2010) + + 22 Jul 2010; Jory A. Pratt +thunderbird-3.1.1.ebu= ild: + Security bump (bug #329279) + =20 18 Jul 2010; Jory A. Pratt thunderbird-3.0.5.ebui= ld, thunderbird-3.1.ebuild: 1.1 mail-client/thunderbird/thunderbird-3.1.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunde= rbird/thunderbird-3.1.1.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunde= rbird/thunderbird-3.1.1.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: thunderbird-3.1.1.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-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.= 1.1.ebuild,v 1.1 2010/07/22 01:13:00 anarchy Exp $ EAPI=3D"3" WANT_AUTOCONF=3D"2.1" inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib= mozextension autotools # This list can be updated using get_langs.sh from the mozilla overlay LANGS=3D"af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et e= u fi fr \ fy-NL ga-IE he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT r= o ru si \ sk sl sq sv-SE tr uk zh-CN zh-TW" NOSHORTLANGS=3D"en-GB es-AR pt-BR zh-TW" MY_PV=3D"${PV/_rc/rc}" MY_P=3D"${P/_rc/rc}" DESCRIPTION=3D"Thunderbird Mail Client" HOMEPAGE=3D"http://www.mozilla.com/en-US/thunderbird/" KEYWORDS=3D"~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~a= md64-linux ~x86-linux" SLOT=3D"0" LICENSE=3D"|| ( MPL-1.1 GPL-2 LGPL-2.1 )" IUSE=3D"alsa ldap crypt bindist libnotify lightning mozdom system-sqlite = wifi" PATCH=3D"mozilla-${PN}-3.1-patches-0.1" REL_URI=3D"http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" SRC_URI=3D"${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 http://dev.gentoo.org/~anarchy/dist/${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}/${MY_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.3 >=3Ddev-libs/nspr-4.8 >=3Dapp-text/hunspell-1.2 x11-libs/cairo[X] x11-libs/pango[X] alsa? ( media-libs/alsa-lib ) libnotify? ( >=3Dx11-libs/libnotify-0.4 ) system-sqlite? ( >=3Ddev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) wifi? ( net-wireless/wireless-tools ) !x11-plugins/lightning" PDEPEND=3D"crypt? ( >=3Dx11-plugins/enigmail-1.1 )" S=3D"${WORKDIR}"/comm-1.9.2 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 } pkg_setup() { export BUILD_OFFICIAL=3D1 export MOZILLA_OFFICIAL=3D1 if ! use bindist; then 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 } src_unpack() { unpack ${A} linguas for X in ${linguas}; do # FIXME: Add support for unpacking xpis to portage [[ ${X} !=3D "en" ]] && xpi_unpack "${P}-${X}.xpi" done if [[ ${linguas} !=3D "" && ${linguas} !=3D "en" ]]; then einfo "Selected language packs (first will be default): ${linguas}" fi } src_prepare() { # Apply our patches EPATCH_SUFFIX=3D"patch" \ EPATCH_FORCE=3D"yes" \ epatch "${WORKDIR}" epatch "${FILESDIR}"/${PN}-3.1-gcc45.patch # ARM fixes, bug 327783 epatch "${FILESDIR}/${PN}-xul-1.9.2-arm-fixes.patch" eautoreconf cd mozilla eautoreconf cd js/src eautoreconf } src_configure() { declare MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/mozilla-${PN}" MEXTENSIONS=3D"default" #################################### # # mozconfig, CFLAGS and CXXFLAGS setup # #################################### touch mail/config/mozconfig mozconfig_init mozconfig_config # It doesn't compile on alpha without this LDFLAGS use alpha && append-ldflags "-Wl,--no-relax" mozconfig_annotate '' --enable-extensions=3D"${MEXTENSIONS}" mozconfig_annotate '' --enable-application=3Dmail mozconfig_annotate '' --with-default-mozilla-five-home=3D"${EPREFIX}${MO= ZILLA_FIVE_HOME}" mozconfig_annotate '' --with-user-appdir=3D.thunderbird mozconfig_annotate '' --with-system-nspr --with-nspr-prefix=3D"${EPREFIX= }"/usr mozconfig_annotate '' --with-system-nss --with-nss-prefix=3D"${EPREFIX}"= /usr mozconfig_annotate '' --with-sqlite-prefix=3D"${EPREFIX}"/usr mozconfig_annotate '' --x-includes=3D"${EPREFIX}"/usr/include --x-librar= ies=3D"${EPREFIX}"/usr/$(get_libdir) mozconfig_annotate 'broken' --disable-crashreporter mozconfig_annotate '' --with-system-hunspell # Use enable features mozconfig_use_enable ldap mozconfig_use_enable ldap ldap-experimental mozconfig_use_enable libnotify mozconfig_use_enable lightning calendar mozconfig_use_enable wifi necko-wifi mozconfig_use_enable system-sqlite mozconfig_use_enable !bindist official-branding mozconfig_use_enable alsa ogg mozconfig_use_enable alsa wave # Bug #72667 if use mozdom; then MEXTENSIONS=3D"${MEXTENSIONS},inspector" fi # Finalize and report settings mozconfig_final #################################### # # Configure and build # #################################### # Disable no-print-directory MAKEOPTS=3D${MAKEOPTS/--no-print-directory/} if [[ $(gcc-major-version) -lt 4 ]]; then append-cxxflags -fno-stack-protector fi CPPFLAGS=3D"${CPPFLAGS}" \ CC=3D"$(tc-getCC)" CXX=3D"$(tc-getCXX)" LD=3D"$(tc-getLD)" \ econf || die } 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() { declare MOZILLA_FIVE_HOME=3D"/usr/$(get_libdir)/mozilla-${PN}" emake DESTDIR=3D"${D}" install || die "emake install failed" if use lightning ; then declare emid emd1 emid2 emid=3D"{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}" dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} unzip "${S}"/mozilla/dist/xpi-stage/gdata-provider.xpi emid1=3D"calendar-timezones@mozilla.org" dodir ${MOZILLA_FIVE_HOME}/extensions/${emid1} cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid1} unzip "${S}"/mozilla/dist/xpi-stage/calendar-timezones.xpi emid2=3D"{e2fda1a4-762b-4020-b5ad-a41df1933103}" dodir ${MOZILLA_FIVE_HOME}/extensions/${emid2} cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid2} unzip "${S}"/mozilla/dist/xpi-stage/lightning.xpi fi linguas for X in ${linguas}; do [[ ${X} !=3D "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}" done if ! use bindist; then newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png t= hunderbird-icon.png domenu "${FILESDIR}"/icon/${PN}.desktop else newicon "${S}"/mail/branding/unofficial/content/icon48.png thunderbird-= icon-unbranded.png newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ ${PN}.desktop fi # Warn user that remerging enigmail is neccessary on USE=3Dcrypt use crypt && ewarn "Please remerge x11-plugins/enigmail after updating $= {PN}." # Enable very specific settings for thunderbird-3 cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js \ "${ED}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \ die "failed to cp thunderbird-gentoo-default-prefs.js" }