Revision bump adds upstream patches which fixes connection issues to some jabber server like facebook fixes bug #483790.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xF3CFD2BD)

4 files changed, 81 insertions, 2 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index c998884a139e..05447a035edd 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.396 2013/10/11 16:46:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.397 2013/10/25 21:09:06 johu Exp $
+
+*kopete-4.11.2-r1 (25 Oct 2013)
+
+  25 Oct 2013; Johannes Huber <johu@gentoo.org>
+  +files/kopete-4.11.2-jabber-connect.patch,
+  +files/kopete-4.11.2-jabber-connect2.patch, +kopete-4.11.2-r1.ebuild,
+  -kopete-4.11.2.ebuild:
+  Revision bump adds upstream patches which fixes connection issues to some
+  jabber server like facebook fixes bug #483790.
 
   11 Oct 2013; Johannes Huber <johu@gentoo.org> kopete-4.11.2.ebuild:
   Use subslot for net-libs/ortp bug #487518.
diff --git a/kde-base/kopete/files/kopete-4.11.2-jabber-connect.patch b/kde-base/kopete/files/kopete-4.11.2-jabber-connect.patch
new file mode 100644
index 000000000000..40e226b7c286
--- /dev/null
+++ b/kde-base/kopete/files/kopete-4.11.2-jabber-connect.patch
@@ -0,0 +1,33 @@
+commit dd536999ce5611ad5d80adb813f7857ab29f20d4
+Author: Pali Rohár <pali.rohar@gmail.com>
+Date:   Mon Oct 21 15:33:54 2013 +0200
+
+    Do not allow overwriting bare jid of myself account in jabber client
+    
+    Kopete account id and myself contact id cannot be changed. This means that all
+    jabber code must use bare jid for myself contact specified in account dialog.
+    Jabber server can change user jid after successfull login, but there is no
+    way in Kopete to propage it. So allow changing only of resource name and do not
+    tell other Kopete code about bare jid changes (which is account id and myself
+    contact id). Chaning resource name is OK. Without this patch it is not possible
+    to login to jabber servers which chaning bare jid (e.g facebook).
+    
+    BUG: 324937
+    FIXED-IN: 4.12
+
+diff --git a/protocols/jabber/jabberclient.cpp b/protocols/jabber/jabberclient.cpp
+index c1d5f58..b96241e 100644
+--- a/protocols/jabber/jabberclient.cpp
++++ b/protocols/jabber/jabberclient.cpp
+@@ -1059,9 +1059,8 @@ void JabberClient::slotCSAuthenticated ()
+ 		d->jabberClient->s5bManager()->setServer ( s5bServer () );
+ 	}
+ 
+-	
+-	//update the resource:
+-	d->jid = d->jabberClientStream->jid();
++	// update only resource and do not change bare jid, see bug 324937
++	d->jid = XMPP::Jid ( d->jid.node(), d->jid.domain(), d->jabberClientStream->jid().resource() );
+ 
+ 	// start the client operation
+ 	d->jabberClient->start ( jid().domain (), jid().node (), d->password, jid().resource () );
diff --git a/kde-base/kopete/files/kopete-4.11.2-jabber-connect2.patch b/kde-base/kopete/files/kopete-4.11.2-jabber-connect2.patch
new file mode 100644
index 000000000000..319c0851c643
--- /dev/null
+++ b/kde-base/kopete/files/kopete-4.11.2-jabber-connect2.patch
@@ -0,0 +1,32 @@
+commit 7801dae888e6fd145e6755e9f89d2bf04092bf4a
+Author: Pali Rohár <pali.rohar@gmail.com>
+Date:   Mon Oct 21 12:45:37 2013 +0200
+
+    Fix JabberResourcePool::lockToResource
+    
+    When locking contact to resource check only for bare JID. It does not make sense to check for full JID with (maybe old/bad) resource name
+    
+    CCBUG: 324937
+
+diff --git a/protocols/jabber/jabberresourcepool.cpp b/protocols/jabber/jabberresourcepool.cpp
+index de2b2bf..27330a7 100644
+--- a/protocols/jabber/jabberresourcepool.cpp
++++ b/protocols/jabber/jabberresourcepool.cpp
+@@ -220,7 +220,7 @@ void JabberResourcePool::clear ()
+ 
+ void JabberResourcePool::lockToResource ( const XMPP::Jid &jid, const XMPP::Resource &resource )
+ {
+-	kDebug(JABBER_DEBUG_GLOBAL) << "Locking " << jid.full() << " to " << resource.name();
++	kDebug(JABBER_DEBUG_GLOBAL) << "Locking " << jid.bare() << " to " << resource.name();
+ 
+ 	// remove all existing locks first
+ 	removeLock ( jid );
+@@ -228,7 +228,7 @@ void JabberResourcePool::lockToResource ( const XMPP::Jid &jid, const XMPP::Reso
+ 	// find the resource in our dictionary that matches
+ 	foreach(JabberResource *mResource, d->pool)
+ 	{
+-		if ( (mResource->jid().bare().toLower() == jid.full().toLower()) && (mResource->resource().name().toLower() == resource.name().toLower()) )
++		if ( (mResource->jid().bare().toLower() == jid.bare().toLower()) && (mResource->resource().name().toLower() == resource.name().toLower()) )
+ 		{
+ 			d->lockList.append ( mResource );
+ 			return;
diff --git a/kde-base/kopete/kopete-4.11.2.ebuild b/kde-base/kopete/kopete-4.11.2-r1.ebuild
index 14a271251b40..05f867f6c867 100644
--- a/kde-base/kopete/kopete-4.11.2.ebuild
+++ b/kde-base/kopete/kopete-4.11.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.11.2.ebuild,v 1.2 2013/10/11 16:46:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.11.2-r1.ebuild,v 1.1 2013/10/25 21:09:06 johu Exp $
 
 EAPI=5
 
@@ -63,6 +63,11 @@ sms testbed winpopup +xmpp yahoo zeroconf"
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-jabber-connect.patch"
+	"${FILESDIR}/${P}-jabber-connect2.patch"
+)
+
 COMMONDEPEND="
 	dev-libs/libpcre
 	$(add_kdebase_dep kdepimlibs)