Security bump bug 336396

(Portage version: 2.1.9.1/cvs/Linux x86_64)

4 files changed, 9 insertions, 322 deletions

diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index 849bf9dd2162..5e289e5791dd 100644
--- a/mail-client/thunderbird-bin/ChangeLog
+++ b/mail-client/thunderbird-bin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/thunderbird-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.11 2010/09/06 11:45:51 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/ChangeLog,v 1.12 2010/09/08 00:14:31 anarchy Exp $
+
+*thunderbird-bin-3.1.3 (08 Sep 2010)
+
+  08 Sep 2010; Jory A. Pratt <anarchy@gentoo.org>
+  -thunderbird-bin-3.0.5.ebuild, -thunderbird-bin-3.1.ebuild,
+  -thunderbird-bin-3.1.2.ebuild, +thunderbird-bin-3.1.3.ebuild:
+  Security bump bug 336396
 
 *thunderbird-bin-3.1.2 (06 Sep 2010)
 
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-3.0.5.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-3.0.5.ebuild
deleted file mode 100644
index 78b394ab3e9a..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-3.0.5.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.0.5.ebuild,v 1.4 2010/07/09 20:07:12 nirbheek Exp $
-
-EAPI="2"
-
-inherit eutils multilib mozextension
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# '\' at EOL is needed for ${LANG} matching in linguas() below
-LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu fi fr \
-fy-NL ga-IE gl he hu id is it ja ka ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT \
-ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW"
-NOSHORTLANGS="es-AR"
-
-MY_PN="${PN/-bin}"
-MY_PV="${PV/_beta/b}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Thunderbird Mail Client"
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
-SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip"
-
-KEYWORDS="-* amd64 x86"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
-
-for X in ${LANGS} ; do
-	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
-	fi
-	IUSE="${IUSE} linguas_${X/-/_}"
-	# english is handled internally
-	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-		if [ "${X}" != "en-US" ]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-DEPEND="app-arch/unzip"
-RDEPEND="x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	x86? (
-		>=x11-libs/gtk+-2.2
-		net-misc/curl[nss]
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-gtklibs
-	)"
-
-S="${WORKDIR}/thunderbird"
-
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	has_multilib_profile && ABI="x86"
-}
-
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_unpack "${P/-bin}-${X}.xpi"
-	done
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MY_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_install ${WORKDIR}/${P/-bin}-${X}
-	done
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-}
-
-pkg_postinst() {
-	#elog "For enigmail, please see instructions at"
-	#elog "  http://enigmail.mozdev.org/"
-
-	if use x86; then
-		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then
-			einfo
-			einfo "For using the crashreporter, you need gnome-base/gconf,"
-			einfo "gnome-base/orbit and net-misc/curl emerged."
-			einfo
-		fi
-	else
-		einfo
-		einfo "NB: You just installed a 32-bit thunderbird"
-		einfo
-		einfo "Crashreporter won't work on amd64"
-		einfo
-	fi
-
-	einfo
-	elog 'We have moved away from mozilla-launcher, as it has major design flaws.'
-	elog 'You will need to update your symlinks to use thunderbird-bin as the executable'
-	elog 'to launch thunderbird-bin. If you are used to just typing thunderbird to start, you'
-	elog 'can create an alias in your ${HOME}/.bashrc. Example: alias thunderbird="thunderbird-bin"'
-}
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-3.1.2.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-3.1.3.ebuild
index d537a0409d03..d9e612e92e91 100644
--- a/mail-client/thunderbird-bin/thunderbird-bin-3.1.2.ebuild
+++ b/mail-client/thunderbird-bin/thunderbird-bin-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.1.2.ebuild,v 1.1 2010/09/06 11:45:51 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.1.3.ebuild,v 1.1 2010/09/08 00:14:31 anarchy Exp $
 
 EAPI="2"
 
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-3.1.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-3.1.ebuild
deleted file mode 100644
index 06bb0e51148e..000000000000
--- a/mail-client/thunderbird-bin/thunderbird-bin-3.1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-3.1.ebuild,v 1.2 2010/07/09 20:07:12 nirbheek Exp $
-
-EAPI="2"
-
-inherit eutils multilib mozextension
-
-# Can be updated using scripts/get_langs.sh from mozilla overlay
-# '\' at EOL is needed for ${LANG} matching in linguas() below
-LANGS="af ar be bg bn-BD ca cs da de el en en-GB en-US es-AR es-ES et eu 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 ro ru \
-si sk sl sq sv-SE tr uk zh-CN zh-TW"
-NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
-
-MY_PN="${PN/-bin}"
-MY_PV="${PV/_beta/b}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Thunderbird Mail Client"
-REL_URI="http://releases.mozilla.org/pub/mozilla.org/${MY_PN}/releases/"
-SRC_URI="${REL_URI}/${MY_PV}/linux-i686/en-US/${MY_P}.tar.bz2"
-HOMEPAGE="http://www.mozilla.com/thunderbird"
-RESTRICT="strip"
-
-KEYWORDS="-* ~amd64 ~x86"
-SLOT="0"
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE=""
-
-for X in ${LANGS} ; do
-	if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then
-		SRC_URI="${SRC_URI}
-			linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
-	fi
-	IUSE="${IUSE} linguas_${X/-/_}"
-	# english is handled internally
-	if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then
-		if [ "${X}" != "en-US" ]; then
-			SRC_URI="${SRC_URI}
-				linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/linux-i686/xpi/${X}.xpi -> ${P/-bin/}-${X}.xpi )"
-		fi
-		IUSE="${IUSE} linguas_${X%%-*}"
-	fi
-done
-
-DEPEND="app-arch/unzip"
-RDEPEND="x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/libXmu
-	x86? (
-		>=x11-libs/gtk+-2.2
-		net-misc/curl[nss]
-	)
-	amd64? (
-		app-emulation/emul-linux-x86-baselibs
-		app-emulation/emul-linux-x86-gtklibs
-	)"
-
-S="${WORKDIR}/thunderbird"
-
-pkg_setup() {
-	# This is a binary x86 package => ABI=x86
-	# Please keep this in future versions
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	has_multilib_profile && ABI="x86"
-}
-
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA"
-	done
-}
-
-src_unpack() {
-	unpack ${A}
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_unpack "${P/-bin}-${X}.xpi"
-	done
-}
-
-src_install() {
-	declare MOZILLA_FIVE_HOME="/opt/${MY_PN}"
-
-	# Install thunderbird in /opt
-	dodir ${MOZILLA_FIVE_HOME%/*}
-	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
-
-	linguas
-	for X in ${linguas}; do
-		[[ ${X} != en ]] && xpi_install ${WORKDIR}/${P/-bin}-${X}
-	done
-
-	# Create /usr/bin/thunderbird-bin
-	dodir /usr/bin/
-	cat <<EOF >"${D}"/usr/bin/${PN}
-#!/bin/sh
-unset LD_PRELOAD
-LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
-exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
-EOF
-	fperms 0755 /usr/bin/${PN}
-
-	# Install icon and .desktop for menu entry
-	doicon "${FILESDIR}"/icon/${PN}-icon.png
-	domenu "${FILESDIR}"/icon/${PN}.desktop
-
-	# revdep-rebuild entry
-	insinto /etc/revdep-rebuild
-	doins "${FILESDIR}"/10${PN}
-
-	# Enable very specific settings for thunderbird-3
-	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
-		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
-		die "failed to cp thunderbird-gentoo-default-prefs.js"
-}
-
-pkg_postinst() {
-	#elog "For enigmail, please see instructions at"
-	#elog "  http://enigmail.mozdev.org/"
-
-	if use x86; then
-		if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' ; then
-			einfo
-			einfo "For using the crashreporter, you need gnome-base/gconf,"
-			einfo "gnome-base/orbit and net-misc/curl emerged."
-			einfo
-		fi
-	else
-		einfo
-		einfo "NB: You just installed a 32-bit thunderbird"
-		einfo
-		einfo "Crashreporter won't work on amd64"
-		einfo
-	fi
-
-	einfo
-	elog 'We have moved away from mozilla-launcher, as it has major design flaws.'
-	elog 'You will need to update your symlinks to use thunderbird-bin as the executable'
-	elog 'to launch thunderbird-bin. If you are used to just typing thunderbird to start, you'
-	elog 'can create an alias in your ${HOME}/.bashrc. Example: alias thunderbird="thunderbird-bin"'
-}