Fix buffer overflow with GCC 4.5 and _U_FORTIFY_SOURCE=2 wrt #324863 by Harald van Dijk.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 49 insertions, 4 deletions

diff --git a/mail-client/thunderbird/ChangeLog b/mail-client/thunderbird/ChangeLog
index 92a8e48ae336..b1f7ee728ddc 100644
--- a/mail-client/thunderbird/ChangeLog
+++ b/mail-client/thunderbird/ChangeLog
@@ -1,6 +1,11 @@
 # 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.10 2010/06/26 04:48:48 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/ChangeLog,v 1.11 2010/06/26 15:32:57 ssuominen Exp $
+
+  26 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+  thunderbird-3.1.ebuild, +files/thunderbird-3.1-gcc45.patch:
+  Fix buffer overflow with GCC 4.5 and _U_FORTIFY_SOURCE=2 wrt #324863 by
+  Harald van Dijk.
 
 *thunderbird-3.1 (26 Jun 2010)
 
diff --git a/mail-client/thunderbird/Manifest b/mail-client/thunderbird/Manifest
index 6781b6e7a449..30a3f41b91bb 100644
--- a/mail-client/thunderbird/Manifest
+++ b/mail-client/thunderbird/Manifest
@@ -3,6 +3,7 @@ AUX icon/thunderbird-icon-unbranded.png 13280 RMD160 1654b2cfa39631e2084da982001
 AUX icon/thunderbird-icon.png 6499 RMD160 1aeece7719c1c1629b98fc11870641769681a048 SHA1 651d244e96fa0edf13f68f5ef9047432eb6ed3bf SHA256 ff9749e42b82b80425bb52883d63baa53298af7be98870ee6b73f0a6cf0ab22d
 AUX icon/thunderbird-unbranded.desktop 183 RMD160 2aeecc5f6127adee0c9ab1e1c83a29bafb82f41e SHA1 3c7533d73abf8208e2117de1601ac31935994021 SHA256 b42bda8d82722d069049889f14887aabc9f3e139a023186780ffff222ca5722d
 AUX icon/thunderbird.desktop 173 RMD160 03faca4ba9ff401e5d5ffc6ebb0a27ddbd9dd36c SHA1 cfdaa810fda5599a2e8454933157d5c2e590bd7f SHA256 1990dde085dbb37be74766a39eab72c0a0812cb1fde6f1c3fd10ce64dc8f5623
+AUX thunderbird-3.1-gcc45.patch 1051 RMD160 d01dcbdc7c25d8a4c077d07abc247111a6c5f77c SHA1 e6bb3ac4796d5d8d10573f8131892281c094486e SHA256 0bc2214d4b705bf2edb515c471e2748eac5c84f765af44d2134704572bd5e435
 AUX thunderbird-3.1-noalsa-fixup.patch 1087 RMD160 ad7807e9d42c65b9f1a8965e43db349a4c1fd38f SHA1 36f66207e3df9aa2481a7e2cb43c6ba0e74dc912 SHA256 62a9044ad373a3ead7c8547e7a342891c55f04d5fe0225e5ac05115fbad962e1
 AUX thunderbird-gentoo-default-prefs-1.js 311 RMD160 3542b008d6ba40a0290e5921d3388b81c817437c SHA1 bd307aa373458fed7c30c749d3e7acaf26e0b05e SHA256 1c9e25533118fc41e7dd8c276ce60106f6fb1959cab3887438759d23fdbc5445
 AUX thunderbird-gentoo-default-prefs.js 494 RMD160 9eed5d9ac1f7953bb563354176a3656c09e62744 SHA1 6a155c0e3bf74f37ddb2e506df5cb35af5e7105f SHA256 e9831135f0f893944df3f51d3c754db9eb330a1293d7e6b79b7682d6ce60b48f
@@ -143,6 +144,6 @@ DIST thunderbird-3.1-zh-TW.xpi 220411 RMD160 c7aaa900aeaf7c0926d9ad793d9df5a9eca
 DIST thunderbird-3.1.source.tar.bz2 65633518 RMD160 bc55cf89dfe1f2c946fff8f5ec21b0377229afe7 SHA1 89e9d8099a5437ce401577fc4d526eb0dd9e51da SHA256 494090fd47944c15e3906847931d7efe77ec0e05f56dbae3a8c36d0a48616a86
 EBUILD thunderbird-3.0.4-r1.ebuild 7028 RMD160 df4bebf6ae84c63cdcc2f1a1ad1093d3c9cfe325 SHA1 07f3d45628903fb5dbad78f72457b29b7864e3b8 SHA256 7d0613e43175794ff9397f1315397bb8eae224af97e3cc1f0c42de77bf02db53
 EBUILD thunderbird-3.0.5.ebuild 7149 RMD160 5717d2f1972872a841d152ab1de28985a542f94a SHA1 68fda98a7e161ec7ff94514821b31f635ef844e4 SHA256 03280f0db88e11ab47cbe2a82f67bddc4f12ba655117ceaa9ab175a90864de91
-EBUILD thunderbird-3.1.ebuild 7497 RMD160 cfc4849aa47414e6d8d7c49d64a0de9089a400c7 SHA1 19132c405aa19402dfd0e0fabd8cd25ed912c46f SHA256 92ee1b7554ea14f364b47699653e520fcfe2e1e9045b219d4dc818d9174c46e7
-MISC ChangeLog 52154 RMD160 0aaffb342c822a23cd3905922d8eab7b0a9f3295 SHA1 ffffb930541a7fc721e3ee328605d1652fc3c598 SHA256 808b0cf2c21523b275f383c555d9ddd510ef073509ab42f3390ded2c77f2f992
+EBUILD thunderbird-3.1.ebuild 7543 RMD160 9bb5c7be53b829d13313d4bfd5ef0ac61d59fbdd SHA1 54cb7ef4dd76fdd0ffce430c2b8eefa8d07b9923 SHA256 07332fc12b11cb4cf263bdde8d39c3b8e1ca12bbb984df41a0a50bfc50715c4f
+MISC ChangeLog 52365 RMD160 6d0d2eb80864f7c4dace75887bc79f12e0e286ee SHA1 350ed87b4d049c4ab1a0e6a6dbffe6079240eb6b SHA256 891e8e747748aedc3c09513f83a2b34791f04c52489a47fdf33c71bf681ebbc5
 MISC metadata.xml 471 RMD160 dd596368f27518e6d32d724e878d8dfb0303fb68 SHA1 147c70ac08b477679be27a428679c4c06ce0c1f0 SHA256 8f3f2c2b7c204fa12ce8ab51e655985374ea469d3870680b6925d541dbf56ef3
diff --git a/mail-client/thunderbird/files/thunderbird-3.1-gcc45.patch b/mail-client/thunderbird/files/thunderbird-3.1-gcc45.patch
new file mode 100644
index 000000000000..0757854c04a9
--- /dev/null
+++ b/mail-client/thunderbird/files/thunderbird-3.1-gcc45.patch
@@ -0,0 +1,37 @@
+http://bugs.gentoo.org/324863
+
+Fix buffer overflow with GCC 4.5 and -U_FORTIFY_SOURCE=2
+
+Patch by Harald van Dijk
+
+--- comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/hashmgr.cpp
++++ comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/hashmgr.cpp
+@@ -187,7 +187,7 @@
+     struct hentry* hp = 
+ 	(struct hentry *) malloc (sizeof(struct hentry) + wbl + descl);
+     if (!hp) return 1;
+-    char * hpw = &(hp->word);
++    char * hpw = HENTRY_WORD(hp);
+     strcpy(hpw, word);
+     if (ignorechars != NULL) {
+       if (utf8) {
+--- comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/htypes.hxx
++++ comm-1.9.2/mozilla/extensions/spellcheck/hunspell/src/htypes.hxx
+@@ -57,6 +57,8 @@
+ #ifndef _HTYPES_HXX_
+ #define _HTYPES_HXX_
+ 
++#include <cstddef>
++
+ #define ROTATE_LEN   5
+ 
+ #define ROTATE(v,q) \
+@@ -68,7 +70,7 @@
+ #define H_OPT_PHON   (1 << 2)
+ 
+ // see also csutil.hxx
+-#define HENTRY_WORD(h) &(h->word)
++#define HENTRY_WORD(h) ((char *) h + offsetof(struct hentry, word))
+ 
+ // approx. number  of user defined words
+ #define USERWORD 1000
diff --git a/mail-client/thunderbird/thunderbird-3.1.ebuild b/mail-client/thunderbird/thunderbird-3.1.ebuild
index 40e0f334799a..52f196b5498a 100644
--- a/mail-client/thunderbird/thunderbird-3.1.ebuild
+++ b/mail-client/thunderbird/thunderbird-3.1.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/thunderbird-3.1.ebuild,v 1.1 2010/06/26 04:48:48 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird/thunderbird-3.1.ebuild,v 1.2 2010/06/26 15:32:57 ssuominen Exp $
 
 EAPI="3"
 WANT_AUTOCONF="2.1"
@@ -120,6 +120,8 @@ src_prepare() {
 	# Fix broken media support
 	epatch "${FILESDIR}/${PN}-3.1-noalsa-fixup.patch"
 
+	epatch "${FILESDIR}"/${PN}-3.1-gcc45.patch
+
 	eautoreconf
 
 	cd mozilla