Patch for memory bug in libgadu. Addresses Bug #99881, x86 stable

Package-Manager: portage-2.0.51.22-r2

5 files changed, 33 insertions, 6 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index d35202df0fe8..5568daab5a10 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.353 2005/07/21 04:47:42 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.354 2005/07/29 14:02:31 rizzo Exp $
+
+*gaim-1.4.0-r2 (29 Jul 2005)
+
+  29 Jul 2005; Don Seiler <rizzo@gentoo.org>
+  +files/gaim-1.4.0-libgg-mem.patch, -gaim-1.4.0-r1.ebuild,
+  +gaim-1.4.0-r2.ebuild:
+  Patch for memory bug in libgadu.  Addresses Bug #99881
 
   21 Jul 2005; Don Seiler <rizzo@gentoo.org> -gaim-1.2.1.ebuild,
   -gaim-1.4.0.ebuild:
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index a8d80f0599eb..af4dd9bda808 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,10 +1,11 @@
-MD5 c90b582ac974e97dabc5730490c618c8 ChangeLog 51742
+MD5 137a0ae58d6e36c5d83d00a09b8b54dd ChangeLog 51960
+MD5 2e3c9fc66210bf14025ab0acc58b8a61 gaim-1.4.0-r2.ebuild 4360
 MD5 f0320b012e455c11a4ff683409df1309 gaim-1.3.1.ebuild 4275
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
-MD5 b2c2dc673370e8e2805219397971a03a gaim-1.4.0-r1.ebuild 4287
+MD5 11f026799a722bb53a2f4cdac2dad2d7 files/gaim-1.4.0-libgg-mem.patch 477
 MD5 7eeaeb97528ef69941cf3fa3d04dea3e files/gaim-1.3.0-silc-ft.patch 567
 MD5 34466df05198ffffaa36d5469babd2aa files/digest-gaim-1.3.1 64
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
-MD5 20166c600c6de257f42af05bea6efd22 files/digest-gaim-1.4.0-r1 64
+MD5 20166c600c6de257f42af05bea6efd22 files/digest-gaim-1.4.0-r2 64
 MD5 d28b7cad9b42f5e1ecd276003220a0f8 files/gaim-1.4.0-oscar-ssi.diff 1200
 MD5 1a1937855d7436ad73db7062927a2be2 files/gaim-1.4.0-msn-userlist.diff 729
diff --git a/net-im/gaim/files/digest-gaim-1.4.0-r1 b/net-im/gaim/files/digest-gaim-1.4.0-r2
index 26b60f0f8a08..26b60f0f8a08 100644
--- a/net-im/gaim/files/digest-gaim-1.4.0-r1
+++ b/net-im/gaim/files/digest-gaim-1.4.0-r2
diff --git a/net-im/gaim/files/gaim-1.4.0-libgg-mem.patch b/net-im/gaim/files/gaim-1.4.0-libgg-mem.patch
new file mode 100644
index 000000000000..48887b3262b4
--- /dev/null
+++ b/net-im/gaim/files/gaim-1.4.0-libgg-mem.patch
@@ -0,0 +1,16 @@
+--- libgg.c.orig	2005-07-19 17:35:24.000000000 +0200
++++ libgg.c	2005-07-19 17:39:05.000000000 +0200
+@@ -1086,8 +1086,11 @@
+ 
+ 			    e->event.status60.descr = buf;
+ 
+-			    if (len > 4 && p[h->length - 5] == 0)
+-				    e->event.status60.time = *((int*) (p + h->length - 4));
++			    if (len > 4 && p[h->length - 5] == 0) {
++				    uint32_t t;
++				    memcpy(&t, p + h->length - 4, sizeof(uint32_t));
++				    e->event.status60.time = t;
++			    }
+ 		    }
+ 
+ 		    break;
diff --git a/net-im/gaim/gaim-1.4.0-r1.ebuild b/net-im/gaim/gaim-1.4.0-r2.ebuild
index c645a01f98b2..e09d789ca1db 100644
--- a/net-im/gaim/gaim-1.4.0-r1.ebuild
+++ b/net-im/gaim/gaim-1.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.4.0-r1.ebuild,v 1.1 2005/07/21 04:43:02 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.4.0-r2.ebuild,v 1.1 2005/07/29 14:02:31 rizzo Exp $
 
 inherit flag-o-matic eutils toolchain-funcs debug multilib
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="nls perl spell nas cjk gnutls silc eds krb4 tcltk debug"
 
 RDEPEND=">=x11-libs/gtk+-2.0
@@ -92,6 +92,9 @@ src_unpack() {
 	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
 	epatch ${FILESDIR}/gaim-1.4.0-oscar-ssi.diff
 	epatch ${FILESDIR}/gaim-1.4.0-msn-userlist.diff
+
+	cd ${S}/src/protocols/gg
+	epatch ${FILESDIR}/gaim-1.4.0-libgg-mem.patch
 }
 
 src_compile() {