Security Bump Bug #98855

(Portage version: 2.0.51.22-r1)

8 files changed, 272 insertions, 33 deletions

diff --git a/mail-client/mozilla-thunderbird-bin/ChangeLog b/mail-client/mozilla-thunderbird-bin/ChangeLog
index a5624e0f0240..47e19dd91248 100644
--- a/mail-client/mozilla-thunderbird-bin/ChangeLog
+++ b/mail-client/mozilla-thunderbird-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mozilla-thunderbird-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.21 2005/07/10 18:45:56 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/ChangeLog,v 1.22 2005/07/14 16:20:01 anarchy Exp $
+
+*mozilla-thunderbird-bin-1.0.5 (14 Jul 2005)
+
+  14 Jul 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-thunderbird-bin-1.0.5.ebuild:
+  Security Bump Bug #98855
 
   10 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
   mozilla-thunderbird-bin-1.0.2.ebuild:
diff --git a/mail-client/mozilla-thunderbird-bin/Manifest b/mail-client/mozilla-thunderbird-bin/Manifest
index 34c5c6ee4a9f..c1cbc209c03f 100644
--- a/mail-client/mozilla-thunderbird-bin/Manifest
+++ b/mail-client/mozilla-thunderbird-bin/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a1b93d8bdfb97f8e82cec5680c0d7adf mozilla-thunderbird-bin-1.0.2.ebuild 3312
 MD5 7b5fa01382e052dd3f74b5f620061a99 ChangeLog 6000
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 552a6947de77bfa4e290acdb23a872a5 files/thunderbird-bin-0.7-init.tar.bz2 3339
+MD5 a1b93d8bdfb97f8e82cec5680c0d7adf mozilla-thunderbird-bin-1.0.2.ebuild 3312
+MD5 a1b93d8bdfb97f8e82cec5680c0d7adf mozilla-thunderbird-bin-1.0.5.ebuild 3312
 MD5 b45ad1c0970314d565c8674885fdedbb files/digest-mozilla-thunderbird-bin-1.0.2 71
-MD5 a622df770b03edce7d158cfe97e8e315 files/icon/mozillathunderbird-bin.desktop 205
+MD5 552a6947de77bfa4e290acdb23a872a5 files/thunderbird-bin-0.7-init.tar.bz2 3339
+MD5 cac57af7f63e97aed3c1be35a58f7ea9 files/digest-mozilla-thunderbird-bin-1.0.5 71
 MD5 04115f0e204444eac76a092a63c89027 files/icon/mozillathunderbird-bin-icon.png 6499
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC0W0V8zY1VwezZiERAlJtAKCaA4nvSPhEKbrD9ywkhfHkpS2nsQCfRILt
-/txdxiZOmFmqjB8RStU6wPM=
-=a59o
------END PGP SIGNATURE-----
+MD5 a622df770b03edce7d158cfe97e8e315 files/icon/mozillathunderbird-bin.desktop 205
diff --git a/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.5 b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.5
new file mode 100644
index 000000000000..cc2edf4e9dbe
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/files/digest-mozilla-thunderbird-bin-1.0.5
@@ -0,0 +1 @@
+MD5 886389da1fa3774f9611165e87b0395c thunderbird-1.0.5.tar.gz 10378018
diff --git a/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.5.ebuild b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.5.ebuild
new file mode 100644
index 000000000000..63b76057b5cd
--- /dev/null
+++ b/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird-bin/mozilla-thunderbird-bin-1.0.5.ebuild,v 1.1 2005/07/14 16:20:01 anarchy Exp $
+
+inherit nsplugins eutils mozilla-launcher
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/thunderbird
+
+DESCRIPTION="The Mozilla Thunderbird Mail & News Reader"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/linux-i686/en-US/thunderbird-${PV}.tar.gz"
+
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird"
+RESTRICT="nostrip"
+
+KEYWORDS="-* x86 ~amd64"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE=""
+
+DEPEND="virtual/libc"
+RDEPEND="virtual/x11
+	>=dev-libs/libIDL-0.8.0
+	>=x11-libs/gtk+-2.1.1
+	virtual/xft
+	>=media-libs/jpeg-6b
+	>=media-libs/libmng-1.0.0
+	>=media-libs/libpng-1.2.1
+	dev-libs/expat
+	app-arch/zip
+	app-arch/unzip
+	>=www-client/mozilla-launcher-1.28
+	amd64? ( >=app-emulation/emul-linux-x86-baselibs-2.1.1
+			 >=app-emulation/emul-linux-x86-gtklibs-2.1 )"
+
+src_install() {
+	# Install thunderbird in /opt
+	dodir /opt
+	mv ${S} ${D}/opt/thunderbird
+
+	# Fixing permissions
+	chown -R root:root ${D}/opt/thunderbird
+
+	# Create stub to call mozilla-launcher
+	dodir /usr/bin
+	cat <<EOF >${D}/usr/bin/thunderbird-bin
+#!/bin/sh
+# 
+# Stub script to run mozilla-launcher.  We used to use a symlink here but
+# OOo brokenness makes it necessary to use a stub instead:
+# http://bugs.gentoo.org/show_bug.cgi?id=78890
+
+export MOZILLA_LAUNCHER=thunderbird-bin
+exec /usr/libexec/mozilla-launcher "\$@"
+EOF
+chmod 0755 ${D}/usr/bin/thunderbird-bin
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/mozillathunderbird-bin-icon.png
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillathunderbird-bin.desktop
+
+	# Normally thunderbird-bin-0.7 must be run as root once before it
+	# can be run as a normal user.  Drop in some initialized files to
+	# avoid this.
+	einfo "Extracting firefox-bin-${PV} initialization files"
+	tar xjpf ${FILESDIR}/thunderbird-bin-0.7-init.tar.bz2 \
+		-C ${D}/opt/thunderbird
+}
+
+pkg_preinst() {
+	# Remove entire installed instance to solve various
+	# problems, for example see bug 27719
+	rm -rf ${ROOT}/opt/MozillaThunderbird
+	rm -rf ${ROOT}/opt/thunderbird
+}
+
+pkg_postinst() {
+	einfo "To enable Enigmail, you must install the Enigmail and Enigmime"
+	einfo "extensions as root.  Go to Tools / Options / Extensions and click"
+	einfo "on Install Extension to install Enigmail in your Thunderbird build."
+	einfo "Restart Thunderbird after having installed both extensions."
+	einfo ""
+	einfo "The extensions are located at http://enigmail.mozdev.org/"
+	einfo ""
+	einfo "Please note that the binary name has changed from MozillaThunderbird"
+	einfo "to simply thunderbird-bin"
+	einfo ""
+
+	if use amd64; then
+		einfo "You just installed a thunderbird version pre-built for 32 bits"
+		einfo "system."
+	fi
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}
diff --git a/mail-client/mozilla-thunderbird/ChangeLog b/mail-client/mozilla-thunderbird/ChangeLog
index 1fc72232983e..66adb9b21f93 100644
--- a/mail-client/mozilla-thunderbird/ChangeLog
+++ b/mail-client/mozilla-thunderbird/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mozilla-thunderbird
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.63 2005/07/06 18:56:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/ChangeLog,v 1.64 2005/07/14 16:18:08 anarchy Exp $
+
+*mozilla-thunderbird-1.0.5 (14 Jul 2005)
+
+  14 Jul 2005; Jory A. Pratt <anarchy@gentoo.org>
+  +mozilla-thunderbird-1.0.5.ebuild:
+  Security Bump Bug #98855
 
   06 Jul 2005; Aron Griffis <agriffis@gentoo.org>
   mozilla-thunderbird-1.0.2.ebuild, mozilla-thunderbird-1.0.2-r1.ebuild,
diff --git a/mail-client/mozilla-thunderbird/Manifest b/mail-client/mozilla-thunderbird/Manifest
index 03a46d43cc35..400d1951aeab 100644
--- a/mail-client/mozilla-thunderbird/Manifest
+++ b/mail-client/mozilla-thunderbird/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 560ee30f3e0c90a1f094f58b2233e6bd mozilla-thunderbird-1.0.2-r1.ebuild 6291
-MD5 6a46a133faac10cf9e245f5c8991dbee mozilla-thunderbird-1.0.2.ebuild 6179
-MD5 988cdabe4b288a0ace4b12d1815b667e mozilla-thunderbird-1.0.2-r10.ebuild 3964
 MD5 1cf31a9cf2ec457b425fdc2479a83ce0 ChangeLog 7714
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
+MD5 560ee30f3e0c90a1f094f58b2233e6bd mozilla-thunderbird-1.0.2-r1.ebuild 6291
+MD5 988cdabe4b288a0ace4b12d1815b667e mozilla-thunderbird-1.0.2-r10.ebuild 3964
+MD5 6a46a133faac10cf9e245f5c8991dbee mozilla-thunderbird-1.0.2.ebuild 6179
+MD5 93cda64f8a518c6ea5b0d62cda1cb208 mozilla-thunderbird-1.0.5.ebuild 3971
+MD5 558a424a1a9905cedc4e7ef902e8c1c3 files/digest-mozilla-thunderbird-1.0.2 207
+MD5 f904cce3be497c53c3ffd5373b7851b4 files/digest-mozilla-thunderbird-1.0.2-r1 207
+MD5 99df508a69b6283098fcf48cc2dd2456 files/digest-mozilla-thunderbird-1.0.2-r10 79
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-thunderbird-0.9-4ft2.patch 22360
-MD5 f904cce3be497c53c3ffd5373b7851b4 files/digest-mozilla-thunderbird-1.0.2-r1 207
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-thunderbird-1.0.2-gcc4.patch 1818
 MD5 f014f20584305e86670ed50e990745db files/thunderbird-0.7-init.tar.bz2 3345
-MD5 99df508a69b6283098fcf48cc2dd2456 files/digest-mozilla-thunderbird-1.0.2-r10 79
-MD5 558a424a1a9905cedc4e7ef902e8c1c3 files/digest-mozilla-thunderbird-1.0.2 207
-MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
+MD5 a7504ac2a67cca6f3732cdaa3fd17711 files/digest-mozilla-thunderbird-1.0.5 79
 MD5 1c810870d0c92c730341e491c310e2d4 files/icon/mozillathunderbird.desktop 184
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzClpBXaUFmZvwyMRAi0zAKCWzb7V6rNSAok+dtLP1v+6nf7BsQCeLwq0
-2nzSxPQneDW/mMQNiQg3GJM=
-=dx3F
------END PGP SIGNATURE-----
+MD5 04115f0e204444eac76a092a63c89027 files/icon/thunderbird-icon.png 6499
diff --git a/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.5 b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.5
new file mode 100644
index 000000000000..12c355989b83
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/files/digest-mozilla-thunderbird-1.0.5
@@ -0,0 +1 @@
+MD5 e69e5ae8c8cc163ddc073061ad0c3cfa thunderbird-1.0.5-source.tar.bz2 33366136
diff --git a/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild
new file mode 100644
index 000000000000..e47c4072df56
--- /dev/null
+++ b/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mozilla-thunderbird/mozilla-thunderbird-1.0.5.ebuild,v 1.1 2005/07/14 16:18:08 anarchy Exp $
+
+unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
+inherit flag-o-matic toolchain-funcs eutils nsplugins mozconfig mozilla-launcher makeedit multilib
+
+EMVER="0.92.0"
+IPCVER="1.1.3"
+
+DESCRIPTION="Thunderbird Mail Client"
+HOMEPAGE="http://www.mozilla.org/projects/thunderbird/"
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${PV}/source/thunderbird-${PV}-source.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="ldap"
+
+RDEPEND=">=www-client/mozilla-launcher-1.34"
+
+S=${WORKDIR}/mozilla
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+export MOZ_THUNDERBIRD=1
+
+src_unpack() {
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd failed"
+
+	if [[ $(gcc-major-version) -eq 3 ]]; then
+		# ABI Patch for alpha/xpcom for gcc-3.x
+		if [[ ${ARCH} == alpha ]]; then
+			epatch ${FILESDIR}/mozilla-alpha-xpcom-subs-fix.patch
+		fi
+	fi
+
+	# patch out ft caching code since the API changed between releases of
+	# freetype; this enables freetype-2.1.8+ compat.
+	# https://bugzilla.mozilla.org/show_bug.cgi?id=234035#c65
+	epatch ${FILESDIR}/mozilla-thunderbird-0.9-4ft2.patch
+
+	# GCC 4 compile patch ; bug #87800
+	epatch ${FILESDIR}/${PN}-1.0.2-gcc4.patch
+}
+
+src_compile() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+
+	# tb-specific settings
+	mozconfig_use_enable ldap
+	mozconfig_use_enable ldap ldap-experimental
+	mozconfig_annotate '' \
+		--with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} \
+		--with-user-appdir=.thunderbird
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# hardened GCC uses -fstack-protector-all by default, and this breaks
+	# thunderbird
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
+	####################################
+	#
+	#  Configure and build Thunderbird
+	#
+	####################################
+
+	econf || die "econf failed"
+
+	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
+	# requirements while compiling
+	edit_makefiles
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/thunderbird
+
+	# Most of the installation happens here
+	dodir ${MOZILLA_FIVE_HOME}
+	cp -RL --no-preserve=links ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+	# Chromes will live in /var, registered in pkg_postinst
+	keepdir ${MOZILLA_FIVE_HOME/usr/var}
+
+	# Create /usr/bin/thunderbird
+	install_mozilla_launcher_stub thunderbird $MOZILLA_FIVE_HOME
+
+	# Install icon and .desktop for menu entry
+	insinto /usr/share/pixmaps
+	doins ${FILESDIR}/icon/thunderbird-icon.png
+
+	# Fix bug 54179: Install .desktop file into /usr/share/applications
+	# instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+	insinto /usr/share/applications
+	doins ${FILESDIR}/icon/mozillathunderbird.desktop
+}
+
+pkg_preinst() {
+	# Remove entire installed instance to solve various
+	# problems, for example see bug 27719
+	rm -rf ${ROOT}/usr/$(get_libdir)/thunderbird
+}
+
+pkg_postinst() {
+	declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/thunderbird"
+
+	# Update the component registry
+	MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=thunderbird \
+		/usr/libexec/mozilla-launcher -register
+
+	# This should be called in the postinst and postrm of all the
+	# mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+	# thunderbird-bin ebuilds.
+	update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+	update_mozilla_launcher_symlinks
+}