Add patch for ICQ charset stuff, bug #235541

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.26-gentoo-r1 x86_64

4 files changed, 95 insertions, 7 deletions

diff --git a/net-im/pidgin/ChangeLog b/net-im/pidgin/ChangeLog
index ac44fe6265c7..3dd7bfe7ef25 100644
--- a/net-im/pidgin/ChangeLog
+++ b/net-im/pidgin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/pidgin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.84 2009/02/08 13:17:40 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/ChangeLog,v 1.85 2009/02/20 17:23:27 tester Exp $
+
+  20 Feb 2009; Olivier Crête <tester@gentoo.org>
+  +files/pidgin-2.5.4-icq-messages-magic.patch, pidgin-2.5.4-r1.ebuild:
+  Add patch for ICQ charset stuff, bug #235541
 
 *pidgin-2.5.4-r1 (08 Feb 2009)
 
diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index f73ee0b4a8e5..b791aec75d60 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA1
 
 AUX pidgin-2.5.2-asneeded.patch 381 RMD160 e00a6f9c275e0d845f80b1a61b4483ddef13a14a SHA1 4bf4ff9da6b10ddc0038087f6003dd2b6fcf26c4 SHA256 ebc882a6d188803cd74484b9d4bffd52c853e49c652ed4a818acf8f0b7004a29
+AUX pidgin-2.5.4-icq-messages-magic.patch 2978 RMD160 fa89104830608f368ed8fa23013d936e1b5e2fab SHA1 88e03f43981376858530d048568af8a67788377c SHA256 d05c053a994911028fc04fd9557f3dec82c43d5291ca14389260a7ee13322cf3
 AUX pidgin-2.5.4-icq.patch 1039 RMD160 d39faa3b9a19e306c57a2e425e4e446c47efde3a SHA1 c9cb8785f3d8386ecf2003060b7381126be0be6c SHA256 c6076c3bca9b5aec2081917d2feb3d9c15934b680a402db8a5ea8ab172130540
 DIST pidgin-2.5.1.tar.bz2 8952067 RMD160 d9f927db55ecc55a2e66b064612774575b82b062 SHA1 8b7be1be4d549d9c0e34c820c8a285aab5e116d7 SHA256 13e87a88b43804be72f8566402afa4c1c3756396aed4ef6b6b9d86d384e75b77
 DIST pidgin-2.5.2.tar.bz2 8059006 RMD160 fe27ecce5ada1664de9e260b863b9b4940de75a8 SHA1 aa555099806cc3e9019a9e9bb9f05c5c11c43641 SHA256 2013410352bbbab949cbaa71b0b751a39597b3710845a34e62fcb0e1f9b669dc
@@ -10,14 +11,14 @@ DIST pidgin-2.5.4.tar.bz2 8398610 RMD160 13f9e27e00e73a02b18f967fcf722a0c511569e
 EBUILD pidgin-2.5.1.ebuild 5257 RMD160 191422a18058b1b2f946f2e7cfc50f94c8d13444 SHA1 d815a51713a185e999ef9a8f9c72c3b6019532a3 SHA256 ed49ce3c83b90c2faae18ddafeb5f72777872dc6c815d019b9a13d3bac92d17d
 EBUILD pidgin-2.5.2.ebuild 5384 RMD160 a8921cf29b4756294748577561c0afd8a89ee65d SHA1 6dc295f3313107a1e1018eb49ee3d684fe23ae1d SHA256 62b847ce460b8c0f14e232b64fde73ac99e1d30512e7d4b396fab6710d885acf
 EBUILD pidgin-2.5.3.ebuild 5298 RMD160 2d150a98536012118834f60eed3fd189be341886 SHA1 7ce7cd9c1e6eef07692827d5b4185d6568410733 SHA256 f9036f9177f7d2bd16e2153a92fc6861a5a023e286f46ca5eb37f7550c21113d
-EBUILD pidgin-2.5.4-r1.ebuild 4607 RMD160 c2acc8669b4ded4370177c55627660ad3e276a65 SHA1 d31921f0deb8656d73af01c6ca5312c89f6652af SHA256 ffac52236c02be1c1a06322f90a0613ee7352cb6b8b390deb0159a77908dbe96
+EBUILD pidgin-2.5.4-r1.ebuild 4659 RMD160 fd53cc975ef4538923a2dc8699ae1fba7423b638 SHA1 305ba1c548972409168bcbf928a4966174b209c1 SHA256 1fef31506a198fe704eba5af31e4b4751ce709fb2a58543fddf59c314c17028e
 EBUILD pidgin-2.5.4.ebuild 4548 RMD160 ea40324f30c535f0dc3901cead3dab794393ae12 SHA1 7ecc91ef1b09acb1c7f49defa2996dc3228b5cbd SHA256 3cc2068de314399b51c65c358a637a002c9804efecec8308b347963421415da5
-MISC ChangeLog 11515 RMD160 c79c11ec1a0197637a761dd20a6da3b52a229049 SHA1 b210d16883ef0ef190e19328edb8d68b8100702f SHA256 9c2e3b64bbbae9af36992647165f8a80a1a9047a9ece303edfcbfd1f0b214857
+MISC ChangeLog 11685 RMD160 cca510841b7996e668f9625a5b329f1141d67069 SHA1 3c7f3437540135e890bcb0d0e558bd13355d7098 SHA256 113b41b06c10f8d93c1a07ed43d8a0ad324ce89bce4628b88d33e320f05ced3b
 MISC metadata.xml 989 RMD160 7d97c83fcb6e8189dabc908c7c4b12ebf16b7ccc SHA1 a0faafa7c0d1c8835141709e61c6205c503481bb SHA256 4f5d2e541300302662d3fcec49b74723ff00c4803cf88e522545dc9f3e0cad0f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkmOzXEACgkQl4DfQEcjpw3EpACdEJxjP7/6TagRHXrz8hGMPV0d
-xesAoINIY+p4cwvvJH6m1iyT9pZyxacZ
-=g/jE
+iEYEARECAAYFAkme5xUACgkQmOfEJZHYOKdfcQCgjzwg7WJqKhDL2GHdxra0pnN2
+FfEAoJuESitaqL8JonRPO4CneSQIiqbx
+=zQM3
 -----END PGP SIGNATURE-----
diff --git a/net-im/pidgin/files/pidgin-2.5.4-icq-messages-magic.patch b/net-im/pidgin/files/pidgin-2.5.4-icq-messages-magic.patch
new file mode 100644
index 000000000000..542857fac7b0
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.5.4-icq-messages-magic.patch
@@ -0,0 +1,82 @@
+#
+#
+# patch "libpurple/protocols/oscar/family_icbm.c"
+#  from [80ce9708420fc9a68491d504ae265384ff5a63c9]
+#    to [18ddbc7d86612fd9ae5917928b5835df2aae50b8]
+#
+============================================================
+--- libpurple/protocols/oscar/family_icbm.c	80ce9708420fc9a68491d504ae265384ff5a63c9
++++ libpurple/protocols/oscar/family_icbm.c	18ddbc7d86612fd9ae5917928b5835df2aae50b8
+@@ -1566,9 +1566,10 @@ static int incomingim_ch1(OscarData *od,
+ 
+ static int incomingim_ch1(OscarData *od, FlapConnection *conn, aim_module_t *mod, FlapFrame *frame, aim_modsnac_t *snac, guint16 channel, aim_userinfo_t *userinfo, ByteStream *bs, guint8 *cookie)
+ {
+-	guint16 type, length;
++	guint16 type, length, magic1, msglen;
+ 	aim_rxcallback_t userfunc;
+ 	int ret = 0;
++	int rev = 0;
+ 	struct aim_incomingim_ch1_args args;
+ 	unsigned int endpos;
+ 
+@@ -1603,11 +1604,31 @@ static int incomingim_ch1(OscarData *od,
+ 			 *   - 0101 -- Unknown
+ 			 *   - Message
+ 			 *
++			 * Slick and possible others reverse 'Features' and 'Messages' section.
++			 * Thus, the TLV could have following layout:
++			 *   - 0101 -- Unknown (possibly magic for message section)
++			 *   - Message
++			 *   - 0501 -- Unknown (possibly magic for features section)
++			 *   - Features: Don't know how to interpret these
+ 			 */
+ 
+-			byte_stream_get8(bs); /* 05 */
+-			byte_stream_get8(bs); /* 01 */
++			magic1 = byte_stream_get16(bs); /* 0501 or 0101 */
++			if (magic1 == 0x101) /* Bad, message comes before attributes */
++			{
++				/* Jump to the features section */
++				msglen = byte_stream_get16(bs);
++				bs->offset += msglen;
++				rev = 1;
+ 
++				magic1 = byte_stream_get16(bs); /* 0501 */
++			}
++
++			if (magic1 != 0x501)
++			{
++				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->sn);
++				break;
++			}
++
+ 			args.featureslen = byte_stream_get16(bs);
+ 			if (args.featureslen > byte_stream_empty(bs))
+ 			{
+@@ -1624,11 +1645,25 @@ static int incomingim_ch1(OscarData *od,
+ 				args.icbmflags |= AIM_IMFLAGS_CUSTOMFEATURES;
+ 			}
+ 
++			if (rev)
++			{
++				/* Fix buffer back to message */
++				bs->offset -= args.featureslen + 2 + 2 + msglen + 2 + 2;
++			}
++
++			magic1 = byte_stream_get16(bs); /* 01 01 */
++			if (magic1 != 0x101) /* Bad, message comes before attributes */
++			{
++				purple_debug_misc("oscar", "Received an IM containing an invalid message part from %s.  They are probably trying to do something malicious.\n", userinfo->sn);
++				break;
++			}
++			msglen = byte_stream_get16(bs);
++
+ 			/*
+ 			 * The rest of the TLV contains one or more message
+ 			 * blocks...
+ 			 */
+-			incomingim_ch1_parsemsgs(od, userinfo, bs->data + bs->offset /* XXX evil!!! */, length - 2 - 2 - args.featureslen, &args);
++			incomingim_ch1_parsemsgs(od, userinfo, bs->data + bs->offset - 2 - 2 /* XXX evil!!! */, msglen + 2 + 2, &args);
+ 
+ 		} else if (type == 0x0003) { /* Server Ack Requested */
+ 
diff --git a/net-im/pidgin/pidgin-2.5.4-r1.ebuild b/net-im/pidgin/pidgin-2.5.4-r1.ebuild
index 9bb4fca3e871..e81b8fc2d26b 100644
--- a/net-im/pidgin/pidgin-2.5.4-r1.ebuild
+++ b/net-im/pidgin/pidgin-2.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.4-r1.ebuild,v 1.1 2009/02/08 13:17:40 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pidgin/pidgin-2.5.4-r1.ebuild,v 1.2 2009/02/20 17:23:27 tester Exp $
 
 EAPI=2
 
@@ -85,6 +85,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-icq.patch
+	epatch "${FILESDIR}"/${P}-icq-messages-magic.patch
 }
 
 src_configure() {