Play nice with broken imap servers.

(Portage version: 2203-svn)

5 files changed, 135 insertions, 2 deletions

diff --git a/kde-base/kdepim-kioslaves/ChangeLog b/kde-base/kdepim-kioslaves/ChangeLog
index 886256e9a902..1df0c38cd5bc 100644
--- a/kde-base/kdepim-kioslaves/ChangeLog
+++ b/kde-base/kdepim-kioslaves/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdepim-kioslaves
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.44 2006/04/22 10:55:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.45 2006/05/01 14:00:20 carlo Exp $
+
+*kdepim-kioslaves-3.5.2-r2 (01 May 2006)
+
+  01 May 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdepim-kioslaves-3.5.2-fixes-2.diff,
+  +kdepim-kioslaves-3.5.2-r2.ebuild:
+  Play nice with broken imap servers.
 
 *kdepim-kioslaves-3.5.2-r1 (22 Apr 2006)
 
diff --git a/kde-base/kdepim-kioslaves/Manifest b/kde-base/kdepim-kioslaves/Manifest
index f1b88aed5fa4..dc4671ea192f 100644
--- a/kde-base/kdepim-kioslaves/Manifest
+++ b/kde-base/kdepim-kioslaves/Manifest
@@ -1,14 +1,17 @@
-MD5 d446eb419796113f927e3fca8da89419 ChangeLog 6402
+MD5 4847d7e9e00ced9c369d76d2b6e7d48b ChangeLog 6615
 MD5 4781ed6b323012399cdd6a4c4f5070f0 files/configure-fix-kdepim-sasl.patch 1750
 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kdepim-kioslaves-3.4.1 208
 MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kdepim-kioslaves-3.4.2 282
 MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kdepim-kioslaves-3.4.3 67
 MD5 4b77483fe398773d23a75714c3dd6223 files/digest-kdepim-kioslaves-3.5.2 247
 MD5 342529061ff068b5002fa430c5c6b20c files/digest-kdepim-kioslaves-3.5.2-r1 67
+MD5 342529061ff068b5002fa430c5c6b20c files/digest-kdepim-kioslaves-3.5.2-r2 67
+MD5 8402c9a25324281f38c83ea3ebc20c24 files/kdepim-kioslaves-3.5.2-fixes-2.diff 2836
 MD5 9a96c94ff9bc1bbd832aecdf10ba3d9c files/kdepim-kioslaves-3.5.2-fixes.diff 1655
 MD5 58e12ae1cb38bb037aca5d8f4f5f6dcc kdepim-kioslaves-3.4.1.ebuild 600
 MD5 129500cb7462d0899369a77aacc3f993 kdepim-kioslaves-3.4.2.ebuild 716
 MD5 b6560bfad14a08b0198917343ac20a0f kdepim-kioslaves-3.4.3.ebuild 717
 MD5 019c8808668f997cd17d682e58a90d8f kdepim-kioslaves-3.5.2-r1.ebuild 727
+MD5 015960a07f132a2aa06c56c1c112cfce kdepim-kioslaves-3.5.2-r2.ebuild 729
 MD5 04c7787e15aa016897419f1492725ebc kdepim-kioslaves-3.5.2.ebuild 672
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.5.2-r2 b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.5.2-r2
new file mode 100644
index 000000000000..9ee81dd048d6
--- /dev/null
+++ b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.5.2-r2
@@ -0,0 +1 @@
+MD5 ac6b3b503e27a65a7b883c1e0a57262e kdepim-3.5.2.tar.bz2 12887336
diff --git a/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes-2.diff b/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes-2.diff
new file mode 100644
index 000000000000..3c492756af59
--- /dev/null
+++ b/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes-2.diff
@@ -0,0 +1,98 @@
+--- kdepim/kioslaves/mbox/readmbox.cc	2005/12/27 12:43:58	491743
++++ kdepim/kioslaves/mbox/readmbox.cc	2006/04/14 17:45:24	529892
+@@ -142,8 +142,10 @@
+ 
+ void ReadMBox::rewind()
+ {
+-	if( m_stream )
+-		m_stream->device()->reset();
++	if( !m_stream )
++		return; //Rewinding not possible
++	
++	m_stream->device()->reset();
+ 	m_atend = m_stream->atEnd();
+ }
+ 
+@@ -178,6 +180,7 @@
+ 	if( !m_file->open( IO_ReadOnly ) )
+ 	{
+ 		delete m_file;
++		m_file = 0;
+ 		return false;
+ 	}
+ 	m_stream = new QTextStream( m_file );
+--- kdepim/kioslaves/imap4/imap4.cc	2005/09/14 19:43:34	460690
++++ kdepim/kioslaves/imap4/imap4.cc	2006/04/24 19:41:11	533427
+@@ -1988,6 +1988,17 @@
+     if (cmd->result () == "OK")
+     {
+       QValueListIterator < imapList > it = listResponses.begin();
++      if ( it == listResponses.end() )
++      {
++          // empty answer - this is a buggy imap server
++          // as a fallback we fire a normal listing and take the first answer
++          completeQueue.removeRef (cmd);
++          cmd = doCommand( imapCommand::clientList("", "%") );
++          if (cmd->result () == "OK")
++          {
++              it = listResponses.begin();
++          }
++      }
+       if ( it != listResponses.end() )
+       {
+         namespaceToDelimiter[QString::null] = (*it).hierarchyDelimiter();
+@@ -2232,6 +2243,10 @@
+           path += item.hierarchyDelimiter();
+         }
+         path += mailboxName;
++        if (path.upper() == "/INBOX/") {
++            // make sure the client can rely on INBOX
++            path = path.upper();
++        }
+       }
+       aURL.setPath(path);
+       atom.m_str = aURL.url(0, 106); // utf-8
+--- kdepim/kioslaves/imap4/imapparser.cc	2006/03/14 18:28:14	518628
++++ kdepim/kioslaves/imap4/imapparser.cc	2006/04/28 08:08:27	534960
+@@ -729,7 +729,7 @@
+   lastStatus = imapInfo ();
+ 
+   parseLiteralC(inWords);       // swallow the box
+-  if (inWords[0] != '(')
++  if (inWords.isEmpty() || inWords[0] != '(')
+     return;
+ 
+   inWords.pos++;
+@@ -1745,10 +1745,15 @@
+   {
+     QString temp = (*it);
+ 
+-    // if we have a '/' separator we'll just nuke it
+     int pt = temp.find ('/');
+-    if (pt > 0)
+-      temp.truncate(pt);
++    if (pt > 0) 
++    {
++      if (temp.findRev ('"', pt) == -1 || temp.find('"', pt) == -1)
++      {
++        // if we have non-quoted '/' separator we'll just nuke it
++        temp.truncate(pt);
++      }
++    }
+     if (temp.find ("section=", 0, false) == 0)
+       _section = temp.right (temp.length () - 8);
+     else if (temp.find ("type=", 0, false) == 0)
+--- kdepim/kioslaves/imap4/rfcdecoder.cc	2005/07/26 18:54:59	438982
++++ kdepim/kioslaves/imap4/rfcdecoder.cc	2006/04/26 23:20:45	534373
+@@ -589,8 +589,10 @@
+       break;
+     l++;
+   }
+-  if (!*l)
++  if (!*l) {
++    free(latin);
+     return _str.ascii ();
++  }
+   QCString result;
+   l = latin;
+   while (*l)
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r2.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r2.ebuild
new file mode 100644
index 000000000000..20010fe9997d
--- /dev/null
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r2.ebuild,v 1.1 2006/05/01 14:00:20 carlo Exp $
+
+KMNAME=kdepim
+KMMODULE=kioslaves
+
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="kioslaves from kdepim package"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="sasl"
+DEPEND="sasl? ( >=dev-libs/cyrus-sasl-2 )
+	$(deprange 3.5.0 $MAXKDEVER kde-base/libkmime)"
+
+myconf="$myconf $(use_with sasl)"
+
+KMCOPYLIB="libkmime libkmime/"
+KMEXTRACTONLY="libkmime/"
+KMCOMPILEONLY="libemailfunctions"
+
+PATCHES="${FILESDIR}/kdepim-kioslaves-3.5.2-fixes-2.diff"
\ No newline at end of file