Patch for second MSN issue

5 files changed, 165 insertions, 2 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 13410c796218..81f6214da155 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.222 2004/08/23 19:29:12 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.223 2004/08/23 21:26:17 rizzo Exp $
+
+*gaim-0.81-r4 (23 Aug 2004)
+
+  23 Aug 2004; Don Seiler <rizzo@gentoo.org>
+  +files/gaim-0.82cvs-msn_object.diff, +gaim-0.81-r4.ebuild:
+  Patch for another MSN issue
 
 *gaim-0.81-r3 (23 Aug 2004)
 
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index c7ddbdf6467e..f52d5d911b93 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,9 +1,10 @@
-MD5 68db1367ea88047cc2af49d149fbbce6 ChangeLog 35699
+MD5 377cf116470e986a4a0eb7d4a1c4d339 ChangeLog 35865
 MD5 aa2bd01ed3b53a41dd82677362df7309 gaim-0.80.ebuild 3677
 MD5 19b3cafbbe380403d46cccc45a984b80 metadata.xml 481
 MD5 ce948aa070cbdedd0e166613b097fb6e gaim-0.81-r1.ebuild 3525
 MD5 c21c8b11e93aaa2494e8d22cd918d8e0 gaim-0.81-r2.ebuild 3623
 MD5 ed634d8e63bd8930a700ea858bf68d06 gaim-0.81-r3.ebuild 3704
+MD5 5475e11d57955f5e988367814dc0329c gaim-0.81-r4.ebuild 3753
 MD5 ad7e4af1d9de1d8a8c2b24530b6469e5 files/gaim-0.81_msn-slp.diff 779
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
 MD5 ed679fa262748c5626af4d9dcfd4b278 files/digest-gaim-0.81-r1 63
@@ -17,3 +18,5 @@ MD5 d37f310f1242f44dab25d3aa42c8836d files/gaim-0.81cvs-icon_scaling.diff 3999
 MD5 4d66f0652fc19f650164da20f3898eac files/gaim-0.81cvs-irc-ison-lessflood.patch 1252
 MD5 91841348c88bce66a078e65c4c26f9ca files/gaim-0.81cvs-chatbutton-crashfix.patch 2932
 MD5 ed679fa262748c5626af4d9dcfd4b278 files/digest-gaim-0.81-r3 63
+MD5 9fdaa511955472f3e519c29ab6047f0f files/gaim-0.82cvs-msn_object.diff 836
+MD5 ed679fa262748c5626af4d9dcfd4b278 files/digest-gaim-0.81-r4 63
diff --git a/net-im/gaim/files/digest-gaim-0.81-r4 b/net-im/gaim/files/digest-gaim-0.81-r4
new file mode 100644
index 000000000000..0f0ac7561307
--- /dev/null
+++ b/net-im/gaim/files/digest-gaim-0.81-r4
@@ -0,0 +1 @@
+MD5 ee3460363f51ad24db1c5697d1da3c1b gaim-0.81.tar.bz2 4588215
diff --git a/net-im/gaim/files/gaim-0.82cvs-msn_object.diff b/net-im/gaim/files/gaim-0.82cvs-msn_object.diff
new file mode 100644
index 000000000000..de7cec7de303
--- /dev/null
+++ b/net-im/gaim/files/gaim-0.82cvs-msn_object.diff
@@ -0,0 +1,29 @@
+===================================================================
+RCS file: /cvsroot/gaim/gaim/src/protocols/msn/object.c,v
+retrieving revision 1.3
+retrieving revision 1.4
+diff -u -r1.3 -r1.4
+--- gaim/gaim/src/protocols/msn/object.c	2004/08/19 01:13:58	1.3
++++ gaim/gaim/src/protocols/msn/object.c	2004/08/22 17:31:37	1.4
+@@ -35,11 +35,18 @@
+ 	if ((tag = strstr(str, id "=\"")) != NULL) \
+ 	{ \
+ 		char buf[16]; \
++		size_t offset; \
+ 		tag += strlen(id "=\""); \
+ 		c = strchr(tag, '"'); \
+-		strncpy(buf, tag, c - tag); \
+-		buf[c - tag] = '\0'; \
+-		obj->field = atoi(buf); \
++		if (c != NULL) \
++		{ \
++			memset(buf, 0, sizeof(buf)); \
++			offset = c - tag; \
++			if (offset >= sizeof(buf)) \
++				offset = sizeof(buf) - 1; \
++			strncpy(buf, tag, offset); \
++			obj->field = atoi(buf); \
++		} \
+ 	}
+ 
+ static GList *local_objs;
diff --git a/net-im/gaim/gaim-0.81-r4.ebuild b/net-im/gaim/gaim-0.81-r4.ebuild
new file mode 100644
index 000000000000..a3a6941f780a
--- /dev/null
+++ b/net-im/gaim/gaim-0.81-r4.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-0.81-r4.ebuild,v 1.1 2004/08/23 21:26:17 rizzo Exp $
+
+inherit flag-o-matic eutils gcc
+use debug && inherit debug
+
+IUSE="nls perl spell nas debug crypt cjk gnutls silc evo krb4"
+
+DESCRIPTION="GTK Instant Messenger client"
+HOMEPAGE="http://gaim.sourceforge.net/"
+SRC_URI="mirror://sourceforge/gaim/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha ~ia64 ~mips ~hppa"
+
+DEPEND=">=x11-libs/gtk+-2.0
+	>=dev-libs/glib-2.0
+	nas? ( >=media-libs/nas-1.4.1-r1 )
+	sys-devel/gettext
+	media-libs/libao
+	>=media-libs/audiofile-0.2.0
+	perl? ( >=dev-lang/perl-5.8.2-r1
+			!<dev-perl/ExtUtils-MakeMaker-6.17 )
+	spell? ( >=app-text/gtkspell-2.0.2 )
+	dev-libs/nss
+	gnutls? ( net-libs/gnutls )
+	krb4? ( app-crypt/mit-krb5 )
+	silc? ( >=net-im/silc-toolkit-0.9.12-r2 )
+	evo? ( mail-client/evolution )"
+
+PDEPEND="crypt? ( >=x11-plugins/gaim-encryption-2.29 )"
+
+print_gaim_warning() {
+	ewarn
+	ewarn "If you are merging ${P} from an earlier version, you will need"
+	ewarn "to re-merge any plugins like gaim-encryption or gaim-snpp."
+	ewarn
+	ewarn "If you experience problems with gaim, file them as bugs with"
+	ewarn "Gentoo's bugzilla, http://bugs.gentoo.org.  DO NOT report them"
+	ewarn "as bugs with gaim's sourceforge tracker, and by all means DO NOT"
+	ewarn "seek help in #gaim."
+	ewarn
+	ewarn "Be sure to USE=\"debug\" and include a backtrace for any seg"
+	ewarn "faults, see http://gaim.sourceforge.net/gdb.php for details on"
+	ewarn "backtraces."
+	ewarn
+	ewarn "Please read the gaim FAQ at http://gaim.sourceforge.net/faq.php"
+	ewarn
+	einfo
+	einfo "Note that we are now filtering all unstable flags in C[XX]FLAGS."
+	einfo
+	for TICKER in 1 2 3 4 5; do
+		# Double beep here.
+		echo -ne "\a" ; sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
+		echo -ne "\a" ; sleep 1
+	done
+	sleep 3
+}
+
+pkg_setup() {
+	print_gaim_warning
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	use cjk && epatch ${FILESDIR}/gaim-0.76-xinput.patch
+	epatch ${FILESDIR}/syslog_fd_leak.diff
+	epatch ${FILESDIR}/gaim-0.82cvs-gtkprefs-fix.patch
+	epatch ${FILESDIR}/gaim-0.82cvs-msn_object.diff
+	cd ${S}/src/protocols/msn/
+	epatch ${FILESDIR}/gaim-0.81_msn-slp.diff
+	cd ${S}/src/protocols/novell/
+	epatch ${FILESDIR}/gaim-0.82cvs-novell.diff
+}
+
+src_compile() {
+	# Stabilize things, for your own good
+	strip-flags
+	replace-flags -O? -O2
+
+	# -msse2 doesn't play nice on gcc 3.2
+	[ "`gcc-version`" == "3.2" ] && filter-flags -msse2
+
+	local myconf
+	use perl || myconf="${myconf} --disable-perl"
+	use spell || myconf="${myconf} --disable-gtkspell"
+	use nls  || myconf="${myconf} --disable-nls"
+	use nas && myconf="${myconf} --enable-nas" || myconf="${myconf} --disable-nas"
+	use evo || myconf="${myconf} --disable-gevolution"
+	use krb4 && myconf="${myconf} --with-krb4=/usr"
+
+	if use gnutls ; then
+		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
+		myconf="${myconf} --with-gnutls-libs=/usr/lib"
+	else
+		myconf="${myconf} --enable-gnutls=no"
+	fi
+
+	if use silc ; then
+		myconf="${myconf} --with-silc-includes=/usr/include/silc-toolkit"
+		myconf="${myconf} --with-silc-libs=/usr/lib"
+	fi
+
+	myconf="${myconf} --with-nspr-includes=/usr/include/nspr"
+	myconf="${myconf} --with-nss-includes=/usr/include/nss"
+	myconf="${myconf} --with-nspr-libs=/usr/lib"
+	myconf="${myconf} --with-nss-libs=/usr/lib"
+
+	econf ${myconf} || die "Configuration failed"
+
+	emake || MAKEOPTS="${MAKEOPTS} -j1" emake || die "Make failed"
+}
+
+src_install() {
+	make install DESTDIR=${D} || die "Install failed"
+	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
+}
+
+pkg_postinst() {
+	print_gaim_warning
+}