axs 14/09/11 22:13:18 Modified: ChangeLog Added: thunderbird-31.1.1.ebuild Removed: thunderbird-31.1.0.ebuild Log: minor version bump; uses new enigmal that fixed security flaws; other bug fixes (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 2B6559ED)
Revision Changes Path 1.301 mail-client/thunderbird/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.301&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?rev=1.301&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/ChangeLog?r1=1.300&r2=1.301 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v retrieving revision 1.300 retrieving revision 1.301 diff -u -r1.300 -r1.301 --- ChangeLog 7 Sep 2014 13:27:48 -0000 1.300 +++ ChangeLog 11 Sep 2014 22:13:18 -0000 1.301 @@ -1,6 +1,13 @@ # ChangeLog for mail-client/thunderbird # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.300 2014/09/07 13:27:48 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.301 2014/09/11 22:13:18 axs Exp $ + +*thunderbird-31.1.1 (11 Sep 2014) + + 11 Sep 2014; Ian Stakenvicius (_AxS_) <a...@gentoo.org> + +thunderbird-31.1.1.ebuild, -thunderbird-31.1.0.ebuild: + minor version bump; uses new enigmal that fixed security flaws; other bug + fixes 07 Sep 2014; Agostino Sarubbo <a...@gentoo.org> thunderbird-24.8.0.ebuild: Stable for ppc64, wrt bug #522020 1.1 mail-client/thunderbird/thunderbird-31.1.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-31.1.1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-client/thunderbird/thunderbird-31.1.1.ebuild?rev=1.1&content-type=text/plain Index: thunderbird-31.1.1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-31.1.1.ebuild,v 1.1 2014/09/11 22:13:18 axs Exp $ EAPI=5 WANT_AUTOCONF="2.1" MOZ_ESR="" MOZ_LIGHTNING_VER="3.3" MOZ_LIGHTNING_GDATA_VER="2.6.3" # This list can be updated using scripts/get_langs.sh from the mozilla overlay MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW ) # Convert the ebuild version to th firefox-24.0-patches-0.4.tar.xze upstream mozilla version, used by mozlinguas MOZ_PV="${PV/_beta/b}" # ESR releases have slightly version numbers if [[ ${MOZ_ESR} == 1 ]]; then MOZ_PV="${MOZ_PV}esr" fi MOZ_P="${PN}-${MOZ_PV}" # Enigmail version EMVER="1.7.2" # 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_JIT="enabled" inherit flag-o-matic toolchain-funcs mozconfig-v4.31 makeedit multilib autotools pax-utils check-reqs nsplugins mozlinguas DESCRIPTION="Thunderbird Mail Client" HOMEPAGE="http://www.mozilla.com/en-US/thunderbird/"; KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" SLOT="0" LICENSE="MPL-2.0 GPL-2 LGPL-2.1" IUSE="bindist crypt ldap +lightning +minimal mozdom selinux" PATCH="thunderbird-31.0-patches-0.1" PATCHFF="firefox-31.0-patches-0.2" SRC_URI="${SRC_URI} ${MOZ_FTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2 ${MOZ_HTTP_URI}${MOZ_PV}/source/${MOZ_P}.source.tar.bz2 crypt? ( http://www.enigmail.net/download/source/enigmail-${EMVER}.tar.gz ) lightning? ( ${MOZ_HTTP_URI/${PN}/calendar/lightning}${MOZ_LIGHTNING_VER}/linux/lightning.xpi -> lightning-${MOZ_LIGHTNING_VER}.xpi ${MOZ_HTTP_URI/${PN}/calendar/lightning}${MOZ_LIGHTNING_GDATA_VER}/linux/gdata-provider.xpi -> gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz http://dev.gentoo.org/~axs/distfiles/${PATCHFF}.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz"; ASM_DEPEND=">=dev-lang/yasm-1.1" RDEPEND=" >=dev-libs/nss-3.16.2 >=dev-libs/nspr-4.10.6 selinux? ( sec-policy/selinux-thunderbird ) !x11-plugins/enigmail crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) )" DEPEND="${RDEPEND} amd64? ( ${ASM_DEPEND} virtual/opengl ) x86? ( ${ASM_DEPEND} virtual/opengl )" if [[ ${PV} =~ beta ]]; then S="${WORKDIR}/comm-beta" else S="${WORKDIR}/comm-esr${PV%%.*}" fi BUILD_OBJ_DIR="${WORKDIR}/tbird" pkg_setup() { moz_pkgsetup export MOZILLA_DIR="${S}/mozilla" 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 yourself into" elog "a legal problem with Mozilla Foundation" elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag" elog fi } pkg_pretend() { # Ensure we have enough disk space to compile CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_setup } src_unpack() { unpack ${A} # Unpack language packs mozlinguas_src_unpack # Unpack lightning for calendar locales if use lightning ; then xpi_unpack lightning-${MOZ_LIGHTNING_VER}.xpi xpi_unpack gdata-provider-${MOZ_LIGHTNING_GDATA_VER}.xpi fi } src_prepare() { # Apply our Thunderbird patchset EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ epatch "${WORKDIR}/thunderbird" # Apply our patchset from firefox to thunderbird as well pushd "${S}"/mozilla &>/dev/null || die EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \ epatch "${WORKDIR}/firefox" popd &>/dev/null || die # Ensure that are plugins dir is enabled as default sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \ "${S}"/mozilla/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}"/mozilla/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!" # 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}"/mail/installer/Makefile.in || die # Don't error out when there's no files to be removed: sed 's@\(xargs rm\)$@\1 -f@' \ -i "${S}"/mozilla/toolkit/mozapps/installer/packager.mk || die # Shell scripts sometimes contain DOS line endings; bug 391889 grep -rlZ --include="*.sh" $'\r$' . | while read -r -d $'\0' file ; do einfo edos2unix "${file}" edos2unix "${file}" done # Confirm the version of lightning being grabbed for langpacks is the same # as that used in thunderbird local THIS_MOZ_LIGHTNING_VER=$(python "${S}"/calendar/lightning/build/makeversion.py ${PV}) if [[ ${MOZ_LIGHTNING_VER} != ${THIS_MOZ_LIGHTNING_VER} ]]; then eqawarn "The version of lightning used for localization differs from the version" eqawarn "in thunderbird. Please update MOZ_LIGHTNING_VER in the ebuild from ${MOZ_LIGHTNING_VER}" eqawarn "to ${THIS_MOZ_LIGHTNING_VER}" fi # Allow user to apply any additional patches without modifing ebuild epatch_user eautoreconf # Ensure we run eautoreconf in mozilla to regenerate configure cd "${S}"/mozilla || die eautoconf cd "${S}"/mozilla/js/src || die eautoconf } src_configure() { declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" MEXTENSIONS="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-extensions="${MEXTENSIONS}" mozconfig_annotate '' --disable-mailnews # Other tb-specific settings mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} mozconfig_annotate '' --with-user-appdir=.thunderbird mozconfig_use_enable lightning calendar mozconfig_use_enable ldap # Bug #72667 if use mozdom; then MEXTENSIONS="${MEXTENSIONS},inspector" fi # Use an objdir to keep things organized. echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig # Finalize and report settings mozconfig_final #################################### # # Configure and build # #################################### # Disable no-print-directory MAKEOPTS=${MAKEOPTS/--no-print-directory/} 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 if use crypt; then pushd "${WORKDIR}"/enigmail &>/dev/null ||die econf popd &>/dev/null ||die fi } src_compile() { mkdir -p "${BUILD_OBJ_DIR}" && cd "${BUILD_OBJ_DIR}" || die CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \ MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \ emake -f "${S}"/client.mk # Only build enigmail extension if crypt enabled. if use crypt ; then einfo "Building enigmail" pushd "${WORKDIR}"/enigmail &>/dev/null || die emake -j1 emake -j1 xpi popd &>/dev/null || die fi } src_install() { declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" DICTPATH="\"${EPREFIX}/usr/share/myspell\"" declare emid cd "${BUILD_OBJ_DIR}" || die # Copy our preference before omnijar is created. cp "${FILESDIR}"/thunderbird-gentoo-default-prefs-1.js-1 \ "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ || die # Set default path to search for dictionaries. echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \ >> "${BUILD_OBJ_DIR}/mozilla/dist/bin/defaults/pref/all-gentoo.js" \ || die # Pax mark xpcshell for hardened support, only used for startupcache creation. pax-mark m "${BUILD_OBJ_DIR}"/mozilla/dist/bin/xpcshell MOZ_MAKE_FLAGS="${MAKEOPTS}" \ emake DESTDIR="${D}" install # Install language packs mozlinguas_src_install if ! use bindist; then newicon "${S}"/other-licenses/branding/thunderbird/content/icon48.png thunderbird-icon.png domenu "${FILESDIR}"/icon/${PN}.desktop else newicon "${S}"/mail/branding/aurora/content/icon48.png thunderbird-icon-unbranded.png newmenu "${FILESDIR}"/icon/${PN}-unbranded.desktop \ ${PN}.desktop sed -i -e "s:Mozilla\ Thunderbird:EarlyBird:g" \ "${ED}"/usr/share/applications/${PN}.desktop fi if use crypt ; then local enigmail_xpipath="${WORKDIR}/enigmail/build" cd "${T}" || die unzip "${enigmail_xpipath}"/enigmail*.xpi install.rdf || die emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} || die cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die unzip "${enigmail_xpipath}"/enigmail*.xpi || die fi if use lightning ; then local l c mozlinguas_export emid="{a62ef8ec-5fdc-40c2-873c-223b8a6925cc}" dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} unzip "${BUILD_OBJ_DIR}"/mozilla/dist/xpi-stage/gdata-provider-*.xpi # Install locales for gdata-provider -- each locale is a directory tree insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome cd "${WORKDIR}"/gdata-provider-${MOZ_LIGHTNING_GDATA_VER}/chrome for l in "${mozlinguas[@]}"; do if [[ -d gdata-provider-${l} ]]; then doins -r gdata-provider-${l} echo "locale gdata-provider ${l} chrome/gdata-provider-${l}/locale/${l}/" \ >> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \ || die "Error adding gdata-provider-${l} to chrome.manifest" else ewarn "Sorry, but lightning gdata-provider in ${P} does not support the ${l} locale" fi; done emid="{e2fda1a4-762b-4020-b5ad-a41df1933103}" dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} cd "${ED}"${MOZILLA_FIVE_HOME}/extensions/${emid} || die unzip "${BUILD_OBJ_DIR}"/mozilla/dist/xpi-stage/lightning-*.xpi \ || die # Install locales for lightning - each locale is a jar file insinto ${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome cd "${WORKDIR}"/lightning-${MOZ_LIGHTNING_VER}/chrome || die for l in "${mozlinguas[@]}"; do if [[ -e calendar-${l}.jar ]]; then for c in calendar lightning; do doins ${c}-${l}.jar echo "locale ${c} $l jar:chrome/${c}-${l}.jar!/locale/${l}/${c}/" \ >> "${ED}"/${MOZILLA_FIVE_HOME}/extensions/${emid}/chrome.manifest \ || die "Error adding ${c}-${l} to chrome.manifest" done else ewarn "Sorry, but lightning calendar in ${P} does not support the ${l} locale" fi; done # Fix mimetype so it shows up as a calendar application in GNOME 3 # This requires that the .desktop file was already installed earlier sed -e "s:^\(MimeType=\):\1text/calendar;:" \ -e "s:^\(Categories=\):\1Calendar;:" \ -i "${ED}"/usr/share/applications/${PN}.desktop || die fi pax-mark m "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird} # Plugin-container needs to be pax-marked for hardened to ensure plugins such as flash # continue to work as expected. 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 } pkg_postinst() { if use crypt; then local peimpl=$(eselect --brief --colour=no pinentry show) case "${peimpl}" in *gtk*|*qt*) ;; *) ewarn "The pinentry front-end currently selected is not one supported by thunderbird." ewarn "You may be prompted for your password in an inaccessible shell!!" ewarn "Please use 'eselect pinentry' to select either the gtk or qt front-end" ;; esac fi elog elog "If you experience problems with plugins please issue the" elog "following command : rm \${HOME}/.thunderbird/*/extensions.sqlite ," elog "then restart thunderbird" }
