summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorDon Seiler <rizzo@gentoo.org>2004-05-05 04:30:35 +0000
committerDon Seiler <rizzo@gentoo.org>2004-05-05 04:30:35 +0000
commit18a82cb728f53cd7b9f4788e683551e7ecadb255 (patch)
tree566c93cd487d95175434aa50ea4dc1874b1685fc /net-im
parentgcc-3.4.0 must depend on glibc-2.3.3_pre20040420 for mips (Manifest recommit) (diff)
downloadgentoo-2-18a82cb728f53cd7b9f4788e683551e7ecadb255.tar.gz
gentoo-2-18a82cb728f53cd7b9f4788e683551e7ecadb255.tar.bz2
gentoo-2-18a82cb728f53cd7b9f4788e683551e7ecadb255.zip
Patch for msn chat closing crash. Fixes bug #47388
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gaim/ChangeLog6
-rw-r--r--net-im/gaim/files/gaim-0.77-msn_chat_leave.patch13
-rw-r--r--net-im/gaim/gaim-0.77-r1.ebuild6
3 files changed, 22 insertions, 3 deletions
diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 2a6ec9613403..44492972b6c7 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-im/gaim
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.173 2004/05/04 21:19:08 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.174 2004/05/05 04:30:34 rizzo Exp $
+
+ 04 May 2004; Don Seiler <rizzo@gentoo.org>;
+ +files/gaim-0.77-msn_chat_leave.patch, gaim-0.77-r1.ebuild:
+ Patch for msn chat closing crash. Fixes bug #47388
04 May 2004; Don Seiler <rizzo@gentoo.org>; gaim-0.77-r1.ebuild,
gaim-0.77.ebuild:
diff --git a/net-im/gaim/files/gaim-0.77-msn_chat_leave.patch b/net-im/gaim/files/gaim-0.77-msn_chat_leave.patch
new file mode 100644
index 000000000000..589b2213f32a
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.77-msn_chat_leave.patch
@@ -0,0 +1,13 @@
+--- msn.c.orig 2004-05-04 23:06:06.983204743 -0500
++++ msn.c 2004-05-04 23:11:01.329968111 -0500
+@@ -1052,8 +1052,8 @@ msn_chat_leave(GaimConnection *gc, int i
+
+ strcpy(buf, "OUT\r\n");
+
+- if (!msn_servconn_write(swboard->servconn, buf, strlen(buf)))
+- msn_switchboard_destroy(swboard);
++ msn_servconn_write(swboard->servconn, buf, strlen(buf));
++ msn_switchboard_destroy(swboard);
+
+ serv_got_chat_left(gc, id);
+ }
diff --git a/net-im/gaim/gaim-0.77-r1.ebuild b/net-im/gaim/gaim-0.77-r1.ebuild
index c0c87e275012..f3da2f3607fd 100644
--- a/net-im/gaim/gaim-0.77-r1.ebuild
+++ b/net-im/gaim/gaim-0.77-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.77-r1.ebuild,v 1.2 2004/05/04 21:19:08 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.77-r1.ebuild,v 1.3 2004/05/05 04:30:34 rizzo Exp $
inherit flag-o-matic eutils gcc
use debug && inherit debug
@@ -61,8 +61,10 @@ src_unpack() {
epatch ${FILESDIR}/gaim-0.77-smileys_dialogs.patch
epatch ${FILESDIR}/gaim-0.77-ucs2-copypaste.patch
use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
- cd src/protocols/novell
+ cd ${S}/src/protocols/novell
epatch ${FILESDIR}/gaim-0.78cvs-novelltweaks5.patch
+ cd ${S}/src/protocols/msn
+ epatch ${FILESDIR}/gaim-0.77-msn_chat_leave.patch
}
src_compile() {