Fix bug 55193, broken Yahoo IM

5 files changed, 105 insertions, 4 deletions

diff --git a/kde-base/kdenetwork/ChangeLog b/kde-base/kdenetwork/ChangeLog
index b2257ccb6e1a..75c6c6ea2c69 100644
--- a/kde-base/kdenetwork/ChangeLog
+++ b/kde-base/kdenetwork/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdenetwork
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.91 2004/06/24 22:13:29 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/ChangeLog,v 1.92 2004/06/28 13:06:41 caleb Exp $
+
+*kdenetwork-3.2.3-r1 (28 Jun 2004)
+
+  28 Jun 2004; Caleb Tennis <caleb@gentoo.org> kdenetwork-3.2.3-r1.ebuild:
+  Add a patch for Yahoo brokenness (BUG #55193)
 
   16 Jun 2004; Jason Wever <weeve@gentoo.org> kdenetwork-3.2.3.ebuild:
   Re-added ~sparc keyword in relation to bug #54092.
diff --git a/kde-base/kdenetwork/Manifest b/kde-base/kdenetwork/Manifest
index 1e71942d8e96..0062cd6854a9 100644
--- a/kde-base/kdenetwork/Manifest
+++ b/kde-base/kdenetwork/Manifest
@@ -3,15 +3,18 @@ MD5 5572d45012ddfa59b23dbb815106a5fd kdenetwork-3.2.3.ebuild 1247
 MD5 8ca1ddb44e1789e711218d60395307b3 kdenetwork-3.2.0.ebuild 1182
 MD5 e998bbd6b0564f2223ed7c21f7340c32 kdenetwork-3.3.0_alpha1.ebuild 1242
 MD5 ca796b2851bcacbc066be9ba0528cb7b kdenetwork-3.2.2.ebuild 1279
-MD5 82074f3e46e239b67fd64cd30e9e9d75 ChangeLog 11651
+MD5 94aa632954cb62d7a52998a289a64f56 kdenetwork-3.2.3-r1.ebuild 1298
+MD5 4e61d23f4b80e0fd8d24d5024ff4a205 ChangeLog 11811
 MD5 13b04b9cec08a4d7c3d7f6c48a813c77 kdenetwork-3.2.1.ebuild 1201
 MD5 14889ab75f97d76e58b0c1154e7683a9 metadata.xml 161
-MD5 b26345e19494f7ca7c1408a86e3664ca files/lisa 544
-MD5 464f7d99494703f3dc7c95044d42af68 files/reslisa 555
+MD5 2b40f6a3ce62adc79ebdfe8da00bb96d files/lisa 545
+MD5 b5cb0c8bb899ab098fe94ae274856c1c files/reslisa 556
 MD5 93d1b5a88409a2adfec615de70dcaf70 files/linuxwirelesswidget.cpp.diff 796
 MD5 3939e85ee43aba114cc3ece4194145b6 files/reslisa.conf 340
 MD5 d97100af0cb95f733660b7a61492d71f files/lisa.conf 452
+MD5 5438b3a7b03a90a34a0e097f4f84a393 files/digest-kdenetwork-3.2.3-r1 69
 MD5 0e0801b8d184b3f261ffdec424adc482 files/digest-kdenetwork-3.3.0_alpha1 71
+MD5 5db705e5e97fc3263d695a8fa5898a33 files/yahoo-fix-connect-062404.patch 1546
 MD5 419e4285f4c61e2c2f5cb24cfc3c6145 files/digest-kdenetwork-3.1.5 70
 MD5 62110957dfcdb489a410148cb79839e1 files/digest-kdenetwork-3.2.0 70
 MD5 5aa146ff883f3e9d94f1738db6a9cffd files/digest-kdenetwork-3.2.1 70
diff --git a/kde-base/kdenetwork/files/digest-kdenetwork-3.2.3-r1 b/kde-base/kdenetwork/files/digest-kdenetwork-3.2.3-r1
new file mode 100644
index 000000000000..8b5af6340d1a
--- /dev/null
+++ b/kde-base/kdenetwork/files/digest-kdenetwork-3.2.3-r1
@@ -0,0 +1 @@
+MD5 153f102259bff53872550a54fbd6b73c kdenetwork-3.2.3.tar.bz2 325800
diff --git a/kde-base/kdenetwork/files/yahoo-fix-connect-062404.patch b/kde-base/kdenetwork/files/yahoo-fix-connect-062404.patch
new file mode 100644
index 000000000000..d7f04e50ed79
--- /dev/null
+++ b/kde-base/kdenetwork/files/yahoo-fix-connect-062404.patch
@@ -0,0 +1,44 @@
+? yahoo-fix-connect-062404.patch
+Index: libyahoo2.c
+===================================================================
+RCS file: /home/kde/kdenetwork/kopete/protocols/yahoo/libyahoo2/libyahoo2.c,v
+retrieving revision 1.18
+retrieving revision 1.18.2.3
+diff -u -p -r1.18 -r1.18.2.3
+--- libyahoo2.c	14 Jan 2004 02:07:29 -0000	1.18
++++ libyahoo2.c	26 Jun 2004 00:37:08 -0000	1.18.2.3
+@@ -1816,6 +1816,8 @@ static void yahoo_process_auth_0x0b(stru
+ 	 * challenge. */
+ 
+ 	shaUpdate(&ctx1, pass_hash_xor1, 64);
++	if (j >= 3 )
++		ctx1.sizeLo = 0x1ff;
+ 	shaUpdate(&ctx1, magic_key_char, 4);
+ 	shaFinal(&ctx1, digest1);
+ 
+@@ -1905,6 +1907,8 @@ static void yahoo_process_auth_0x0b(stru
+ 	 * challenge. */
+ 
+ 	shaUpdate(&ctx1, crypt_hash_xor1, 64);
++	if (j >= 3 )
++		ctx1.sizeLo = 0x1ff;
+ 	shaUpdate(&ctx1, magic_key_char, 4);
+ 	shaFinal(&ctx1, digest1);
+ 
+Index: yahoo_fn.c
+===================================================================
+RCS file: /home/kde/kdenetwork/kopete/protocols/yahoo/libyahoo2/Attic/yahoo_fn.c,v
+retrieving revision 1.1.2.1
+retrieving revision 1.1.2.3
+diff -u -p -r1.1.2.1 -r1.1.2.3
+--- yahoo_fn.c	18 Jan 2004 20:03:39 -0000	1.1.2.1
++++ yahoo_fn.c	26 Jun 2004 00:37:08 -0000	1.1.2.3
+@@ -4386,7 +4386,7 @@ struct yahoo_fn yahoo_fntable[5][96] = 
+      { XOR, 0x77D64B90, 0 },
+      { BITFLD, (long)table_103, 0 },
+      { LOOKUP, (long)table_104, 0 },
+-     { MULADD, 0x7D1428CB, 0x89F6853D },
++     { MULADD, 0x7D1428CB, 0x3D },
+      { XOR, 0x6F872C49, 0 },
+      { XOR, 0x2E484655, 0 },
+      { MULADD, 0x1E3349F7, 0x41F5 },
diff --git a/kde-base/kdenetwork/kdenetwork-3.2.3-r1.ebuild b/kde-base/kdenetwork/kdenetwork-3.2.3-r1.ebuild
new file mode 100644
index 000000000000..d6931691b0b4
--- /dev/null
+++ b/kde-base/kdenetwork/kdenetwork-3.2.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdenetwork/kdenetwork-3.2.3-r1.ebuild,v 1.1 2004/06/28 13:06:41 caleb Exp $
+
+inherit kde-dist
+
+DESCRIPTION="KDE network apps: kopete, kppp, kget. kmail and knode are now in kdepim."
+
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+IUSE="slp samba wifi jabber ssl"
+
+DEPEND="~kde-base/kdebase-${PV}
+	slp? ( net-libs/openslp )
+	samba? ( net-fs/samba )
+	jabber? ( net-dns/libidn )
+	ssl? ( app-crypt/qca-tls )
+	!net-im/kopete
+	wifi? ( net-wireless/wireless-tools )"
+
+src_unpack() {
+	kde_src_unpack
+	epatch ${FILESDIR}/yahoo-fix-connect-062404.patch
+}
+
+src_compile() {
+	myconf="$myconf `use_enable slp`"
+	use wifi || DO_NOT_COMPILE="$DO_NOT_COMPILE wifi"
+	kde_src_compile
+}
+
+src_install() {
+	kde_src_install
+
+	chmod +s ${D}/${KDEDIR}/bin/reslisa
+
+	# empty config file needed for lisa to work with default settings
+	touch ${D}/etc/lisarc
+
+	# lisa, reslisa initscripts
+	dodir /etc/init.d
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/lisa > ${D}/etc/init.d/lisa
+	sed -e "s:_KDEDIR_:${KDEDIR}:g" ${FILESDIR}/reslisa > ${D}/etc/init.d/reslisa
+	chmod +x ${D}/etc/init.d/*
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/lisa.conf lisa
+	newins ${FILESDIR}/reslisa.conf reslisa
+}