Add a better patch found on http://kmess.org/board/viewtopic.php?p=32892#p32892

Package-Manager: portage-2.2.0_alpha73/cvs/Linux x86_64

4 files changed, 61 insertions, 18 deletions

diff --git a/net-im/kmess/ChangeLog b/net-im/kmess/ChangeLog
index d4598fcf22ca..525b9cec1646 100644
--- a/net-im/kmess/ChangeLog
+++ b/net-im/kmess/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/kmess
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.83 2011/11/06 10:33:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/ChangeLog,v 1.84 2011/11/11 20:15:42 hwoarang Exp $
+
+*kmess-2.0.6-r3 (11 Nov 2011)
+
+  11 Nov 2011; Markos Chandras <hwoarang@gentoo.org>
+  +files/kmess-2.0.6-follow-location-redirects.patch, +kmess-2.0.6-r3.ebuild,
+  -kmess-2.0.6-r2.ebuild:
+  Add a better patch found on
+  http://kmess.org/board/viewtopic.php?p=32892#p32892
 
 *kmess-2.0.6-r2 (06 Nov 2011)
 
diff --git a/net-im/kmess/Manifest b/net-im/kmess/Manifest
index 0bfa7759dbad..f5a674d309a4 100644
--- a/net-im/kmess/Manifest
+++ b/net-im/kmess/Manifest
@@ -3,28 +3,29 @@ Hash: SHA512
 
 AUX 2.0.5-msn_login_url_fix.patch 1637 RMD160 c9de7aa9ed2776b122371570a0132942ab817f84 SHA1 cba7a7506f7390959f712106df5b00d824242f91 SHA256 146883b9430532ed3d5766a26aab45cbb311600591516a104f179f11fe9087ad
 AUX kmess-2.0.6-contact-list.patch 1659 RMD160 6b7b2ef695017de925019c48b71ac3edd10cfdfd SHA1 0380a14ab7b08665961f715ee57714d75469c546 SHA256 95a9bf74ad625ae3047664cb6e71fc96c9c1ab9c797b6604c13dbe735506937b
+AUX kmess-2.0.6-follow-location-redirects.patch 1756 RMD160 e92727f5dd2a7b06eab776d15871ec1303579743 SHA1 9135ee40986b68caa4b7743dfa58cf198cc3d773 SHA256 2d99260dc84c7020c59cf88161b14882407d3635c7d274a7536b79fb257bc403
 AUX kmess-2.0.6-login-fix.patch 645 RMD160 5f6c9e8c6a3f232104d71241b966e33492d39025 SHA1 704e65136bdfd9a0dac6d82f50acd19824f2a0ad SHA256 a8024cffc91c4f5ddb91faebf33b2b5d5f7cd0a992afaccb288fbdb95864a7e0
 DIST kmess-2.0.6.tar.bz2 3183344 RMD160 e9eedc9b92d442e9d556487c45c796a910b50bbd SHA1 b2032648c810c7e2e986bbfc104443f1b38437f0 SHA256 3d2a93f71c6cd1e7969dee34fe0f78427cc5c512853f0bd2437c65baa92224f2
 EBUILD kmess-2.0.6-r1.ebuild 1502 RMD160 9930b20d2110f1a6dae9561972e8c426857a9684 SHA1 c0e0d5885bb36caf6e5cd64be4ba8ba66d5bd641 SHA256 0f2ab1fa745d926eb68cfa53fb1db5f002b1254b891e2e2c96678661b2e16102
-EBUILD kmess-2.0.6-r2.ebuild 1545 RMD160 fa6525cc7144d690aa93769c18848daa5f74bf20 SHA1 a23db6b156c7decd90e36df63e8c3ce6f99d2374 SHA256 0f31662b10f7b182b71f6d76d9e130e5c3ec1afd8fad98c5ed9f93504daa2ccf
+EBUILD kmess-2.0.6-r3.ebuild 1558 RMD160 b38330fc6659b9f525e4fb41fd386d32ed174a2c SHA1 82666c7b2dcbd40273b91679dccdf65a70e33abe SHA256 d4451c93a71c07e7a4142dc29fa99d23794140dd2bae1ead0b3ad14b137310ab
 EBUILD kmess-2.0.9999.ebuild 1491 RMD160 8d1e73663f0cef1452a0ad55963bd2abd8315659 SHA1 5bf656579d1310025f5dbb1f8bd894f5c2b61230 SHA256 767bd4e9c4c62f457dfa09be8569308c11b25fe9a2538d48ac4912277429317a
 EBUILD kmess-9999.ebuild 1461 RMD160 1ee1b3e3d8c5601391607b2ffe634bb37ad75298 SHA1 44c226c2935674471135a88cc461a4ac0c1fa06e SHA256 6a512258f906085200ed8c1682895cf8c7f4c558569e0c3a89f7c2d01c9f62a0
-MISC ChangeLog 12405 RMD160 1ce23900354792840dc45d08d5ea09cf8535a257 SHA1 a4f2e7592a6fe712673ccf0e8200b3a33253dfbe SHA256 81d4312318d8c7ebe257a973f0e1f3b079e79c6f7fbd1c25a28a4a0b1af4a1f1
+MISC ChangeLog 12678 RMD160 3711e6619446eec9bd571348320888fdf17b9a7b SHA1 3e193f7c4ebae6fb32b655ed58490e7a2613721b SHA256 8d84ef2f75fd3947644f26bc5c5c337f990f0653d5ec3eefab72336de59b8f86
 MISC metadata.xml 412 RMD160 24c240202b46a8feddfda4f98de84360ef3f42ec SHA1 7400ce3e9f72c85fcadac8fa67b1e77d988ad2f7 SHA256 a8709df1103848b82fc1e16588d03e687e44e5627d53f07564f873e7b5e4b570
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOtmJnAAoJEPqDWhW0r/LCXVIP/2glKW0BqQeVtqcse2g7nqav
-BE2QHe+5iqWfu8kOBbVGDbov7uyg+RxCTtVkSUKVD0odExacGgyjMMXhSU3uwWqJ
-ck4sn/wHA8e196vlsah3cSa55AWlNkfYwlPztEWlNgagRRnj7ZiM1YgkSBwUgQzw
-FP/j1In3BOHigNxsgEPajrxK6xmiguxZWLyVYK7isXPF0pIPi02yAkHigEQ5U2L7
-TzpspX32eUrCjS3lTXJHjqUD1CcQbvJ/Sjna/mKTVTgnXLi+gWHUggjBfU4hwatM
-MEkXgfDCXCzxGLTm9eZC2FBdi/cKRxWCxAK6FONjC/5AsXWnNhDuvKnBKa1vLEPU
-cUBkuwb+y6Ud5fuITLyAN19R6SyXLr1i0K82VOhpm6VC2JUXjq/K/+xLPoBOkTuU
-WPidZRVweJD0bJ8KrofrxGpOVuJHcPwkK3xzDLTuqn7194pfJXRCLseDNmXRPuva
-aDDTP1ceyjFXr6sttUpdlomoXWVOLMAzfVe56qzOw6MY+cxrY22Oqy6aBqjEfoJQ
-0VQ/vrGL1vlL2y47RNm+qb3abLXlKLfyeEpSoDeMvM9A+RLoYOiGzLikptXA6Hwr
-g1G8KbiIG22J/X4ZLzrHulK18tHooqS+Rxqb66dkS2PhaHFU9P4ijv7pjdDZdt2z
-Vz7RWxL1B6uVVmLD8hPU
-=BwL1
+iQIcBAEBCgAGBQJOvYJyAAoJEPqDWhW0r/LCP0AP/2XuyuPtHDE2R7Ud1wTaxHrd
+gKXOIl5wdPv7qOJ7mjYtOMA7SSYwqquwTkknqUoIZ/Nn1GYSzYoAo1vinOOANti2
+kuFVpZ7CNA9FDdW+GqvwnqYW0NbrFZJWSvYG7zVk4GXOJ7W5OaS9AW+beQnG0Njz
++ETGDdUDu3qcjSL7h6zZY9xkd33FOyfKsmP1D1p7FkZcJsOP/9BumnEFHze60oPc
+68XliZM8OSGzoWKGsc0JULw7WEUBPFs71iUW2lcnH3pnMgkTCcxbAdy9u3Ghu8d3
+/+NvNQwhXsu/C0m+YblkuRdH3P0bVs6WxNYYl4lKqzazX30JtpbqMpaNJyAROXPl
+TemGIPsMWUz8wdREWd9bDk9kNroDl0DzyjpZ/QWWVfzMtrFf9ABPogFFeojJ3Drv
+5uuhK/2dDek/tj1UpyYC4A8M7ZEx3O3RUtn64fV3wu9vAcdFEpa5mOOKjGGqbbxN
++z6dalEMvHl8nuilcH1e1lWfAjeFFV63XpaOS+KKoAjQTUWPjV5BELG2W3lQUBZH
+KEyq9p0XpNCvMQN4pOeyAO2vORHY0PW9y+Ue3iuLRuNkVLklzhtLPwV23VwDMokS
+o46SXoF8YStdZLZIBq8qiUxhmkj2p45qqoPFkJ6XSeLUsUcIfyH6HwdanIOdV6kW
+vFXYA+CD/BlW1RYgeY3y
+=2bS5
 -----END PGP SIGNATURE-----
diff --git a/net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch b/net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch
new file mode 100644
index 000000000000..fbabdeff44dd
--- /dev/null
+++ b/net-im/kmess/files/kmess-2.0.6-follow-location-redirects.patch
@@ -0,0 +1,34 @@
+Follow Location redirects, MS seems to have moved some accounts to other
+servers. Forum topic reference:
+Connection problem to wlm - http://kmess.org/board/viewtopic.php?f=4&t=20549
+diff -Nur a/src/network/soap/httpsoapconnection.cpp b/src/network/soap/httpsoapconnection.cpp
+--- a/src/network/soap/httpsoapconnection.cpp	2011-02-16 08:16:45.000000000 +0100
++++ b/src/network/soap/httpsoapconnection.cpp	2011-11-08 16:53:29.612517607 +0100
+@@ -456,6 +456,7 @@
+   const QByteArray& replyContents = reply->readAll();
+   const int         statusCode    = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute   ).toInt();
+   const QString     error         ( reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute ).toString() );
++  QUrl redirectUrl = reply->attribute( QNetworkRequest::RedirectionTargetAttribute ).toUrl();
+ 
+ #ifdef KMESSDEBUG_HTTPSOAPCONNECTION_GENERAL
+   bool requestSuccess = false;
+@@ -490,13 +491,16 @@
+ #endif
+ 
+     // Parse the message contents
+-    if( currentResponse->isFaultMessage() )
++    if( !redirectUrl.isEmpty() || currentResponse->isFaultMessage() )
+     {
+-      // Verify if the server is redirecting us to another server
+       if( currentResponse->getFaultCode() == "psf:Redirect" )
+       {
++        redirectUrl = XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" );
++      }
++      // Verify if the server is redirecting us to another server
++      if( !redirectUrl.isEmpty() )
++      {
+         const QUrl& originalUrl = currentResponse->getEndPoint();
+-        const QUrl redirectUrl( XmlFunctions::getNodeValue( currentResponse->getFault(), "redirectUrl" ) );
+         const QString originalHost( originalUrl.host() );
+         const QString redirectHost( redirectUrl.host() );
+ 
diff --git a/net-im/kmess/kmess-2.0.6-r2.ebuild b/net-im/kmess/kmess-2.0.6-r3.ebuild
index 3234c41dff57..8243c9cbab18 100644
--- a/net-im/kmess/kmess-2.0.6-r2.ebuild
+++ b/net-im/kmess/kmess-2.0.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-2.0.6-r2.ebuild,v 1.1 2011/11/06 10:33:05 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kmess/kmess-2.0.6-r3.ebuild,v 1.1 2011/11/11 20:15:42 hwoarang Exp $
 
 EAPI=3
 
@@ -41,7 +41,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-login-fix.patch
-	"${FILESDIR}"/${P}-contact-list.patch
+	"${FILESDIR}"/${P}-follow-location-redirects.patch
 )
 
 src_configure() {