Play nice with broken imap servers.

Package-Manager: portage-2203-svn

7 files changed, 145 insertions, 51 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..ab6988ff1e63 100644
--- a/kde-base/kdepim-kioslaves/Manifest
+++ b/kde-base/kdepim-kioslaves/Manifest
@@ -1,14 +1,17 @@
-MD5 d446eb419796113f927e3fca8da89419 ChangeLog 6402
+MD5 a6e05a512d476afb91b167d211ae8021 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 8e1324b0b6a123dbf60deb43c48c3bd3 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
diff --git a/kde-base/kmail/Manifest b/kde-base/kmail/Manifest
index f8feb0b6f841..76796b4f00b5 100644
--- a/kde-base/kmail/Manifest
+++ b/kde-base/kmail/Manifest
@@ -1,4 +1,4 @@
-MD5 bfb456b3429d296c7502586d6cc2e44c ChangeLog 7696
+MD5 ba84de9e04b0bc2483ea3db358078fc2 ChangeLog 7828
 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1 208
 MD5 e8e3fc943d40a2fa3260a042e8f0dcf6 files/digest-kmail-3.4.1-r1 208
 MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2 282
@@ -6,6 +6,7 @@ MD5 ed5f8c08265b32641a4cc480b7414fce files/digest-kmail-3.4.2-r1 282
 MD5 1abd06c61033b13feaa26798ccacf032 files/digest-kmail-3.4.3 67
 MD5 4b77483fe398773d23a75714c3dd6223 files/digest-kmail-3.5.2 247
 MD5 342529061ff068b5002fa430c5c6b20c files/digest-kmail-3.5.2-r1 67
+MD5 342529061ff068b5002fa430c5c6b20c files/digest-kmail-3.5.2-r2 67
 MD5 0dc20eebce2c8cb4475f065683ae24ff files/kdepim-3.4.2-partnode.patch 756
 MD5 465fb4ad98b38e7c5328429eaabb1000 files/kmail-3.4.1-shift+click-crash.diff 516
 MD5 eba73836fe71e337b9f5626f7cd85952 files/kmail-3.5-ham_spam_icons.diff 2557
@@ -17,5 +18,6 @@ MD5 393bf626aee24f4dd500ca341e1d314c kmail-3.4.2-r1.ebuild 1856
 MD5 0517daa346612e50e60119680a33a3da kmail-3.4.2.ebuild 1629
 MD5 d2de8d9c7a4a872edd470b81a9ae45b7 kmail-3.4.3.ebuild 1733
 MD5 b99a451fecc945edb57e424c27ac7d05 kmail-3.5.2-r1.ebuild 1926
+MD5 ca206446e7396c0397d7a92b26117434 kmail-3.5.2-r2.ebuild 2045
 MD5 5b7f453dddb33b4a363f7d52587de763 kmail-3.5.2.ebuild 1748
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
diff --git a/kde-base/libkdepim/Manifest b/kde-base/libkdepim/Manifest
index fde1f34fc11d..11dd36177d9e 100644
--- a/kde-base/libkdepim/Manifest
+++ b/kde-base/libkdepim/Manifest
@@ -1,53 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-DIST kdepim-3.4.0-3.4.1.tar.xdelta 689503 RMD160 a60f8dd9b2cd481d781d096c978f04f03a352d3b SHA256 3ab1b52a7924ea5b47219e572c7c3a3be7d4f746bb93c6b9cab50004eb90f5c5 size 689503
-DIST kdepim-3.4.0.tar.bz2 11441545 RMD160 abc3794c45f12e29b3dc8ce3c4b570e980beb8c3 SHA256 7769e1989404c16d679c0be32cde7634ceb5692131de6ab1d44def47eca871ad size 11441545
-DIST kdepim-3.4.1-3.4.2.tar.xdelta 534400 RMD160 eb7e99cebc7f43eac706ee5deb53ea078cfb2fd1 SHA256 09a84121a686141fdedfb34d5bc40bae2918e020cd9f414925316773bcb521ad size 534400
-DIST kdepim-3.4.1.tar.bz2 11345538 RMD160 f3dd526ca3094f42eb825ece30d0b84c047a6050 SHA256 a8e86e9d9d6ae0c997546294f3bb28c988e21834e23aeddd1db26fc57d3e3b5b size 11345538
-DIST kdepim-3.4.2.tar.bz2 11368492 RMD160 c149409d447c5108348d24bdb973979e4c31e80d SHA256 69cfaf807ea3df22543a74a4d87ae2330ea859b4b51431ef86d3f983824df948 size 11368492
-DIST kdepim-3.4.3.tar.bz2 11327132 RMD160 a1c15ae5759b9865297a28e0ee00f66b04fc2a96 SHA256 c44f3987e66a81b5cba6a9aded7f8deef6e7ea93ae9fb000a12c9865f609e5c6 size 11327132
-DIST kdepim-3.5.2.tar.bz2 12887336 RMD160 8e6571d14bbf6b3370c4fdb108a1a79625e87365 SHA256 9c038a80912894b3ec132b2c7219ec5549ca80dcdeec88555928d2e038966539 size 12887336
-EBUILD libkdepim-3.4.1.ebuild 551 RMD160 088f667d943818f3849da5ee6a5ef74f9f7894a0 SHA1 bd4a258b96fd3eb54f4e92e0f2987ce8fb22bd56 SHA256 07d3b46100550f418e333c1aa890742f70f775ff2ef00564175153d63e705854 size 551
+MD5 50dcead5298ef5c7cc80d04f11a70270 ChangeLog 5622
+MD5 91f2200bdc01873b716cb3f9feadcf95 files/digest-libkdepim-3.4.1 762
+MD5 02dd51f1d3985f64e8d6dbe249c2d3cf files/digest-libkdepim-3.4.2 1030
+MD5 078792b016dc323d645d7a2b33ed6913 files/digest-libkdepim-3.4.3 247
+MD5 4b77483fe398773d23a75714c3dd6223 files/digest-libkdepim-3.5.2 247
+MD5 342529061ff068b5002fa430c5c6b20c files/digest-libkdepim-3.5.2-r1 67
 MD5 3d81dacf5ddb8f4838c35595882d4376 libkdepim-3.4.1.ebuild 551
-RMD160 088f667d943818f3849da5ee6a5ef74f9f7894a0 libkdepim-3.4.1.ebuild 551
-SHA256 07d3b46100550f418e333c1aa890742f70f775ff2ef00564175153d63e705854 libkdepim-3.4.1.ebuild 551
-EBUILD libkdepim-3.4.2.ebuild 555 RMD160 97fcd05ceb3b5c1d68106cc47a3e7f9decc3f5af SHA1 419cda5bd71146eca8a556e223a7dff069c9eb63 SHA256 32d53beb5388bfbd59fbfb93ffe7ba24be150b3c490060424fe3e7f9a0ceb2db size 555
 MD5 19370076a7e24292cd8a17415d568838 libkdepim-3.4.2.ebuild 555
-RMD160 97fcd05ceb3b5c1d68106cc47a3e7f9decc3f5af libkdepim-3.4.2.ebuild 555
-SHA256 32d53beb5388bfbd59fbfb93ffe7ba24be150b3c490060424fe3e7f9a0ceb2db libkdepim-3.4.2.ebuild 555
-EBUILD libkdepim-3.4.3.ebuild 556 RMD160 5311cd40b25f1d7c019eb46427b1df7ea161a527 SHA1 1bbb1b39efcb0e511de1313ddf595ed80ae0f666 SHA256 801977ffca651f4e73c6b37d6bc6e051f87ef57f8e23ccb47e01294d28ac2778 size 556
 MD5 362bf7d1932bb9fbc7c1fd5b5ef5351e libkdepim-3.4.3.ebuild 556
-RMD160 5311cd40b25f1d7c019eb46427b1df7ea161a527 libkdepim-3.4.3.ebuild 556
-SHA256 801977ffca651f4e73c6b37d6bc6e051f87ef57f8e23ccb47e01294d28ac2778 libkdepim-3.4.3.ebuild 556
-EBUILD libkdepim-3.5.2.ebuild 530 RMD160 1763e43a414433e6de71948e0e169d3a041db0dd SHA1 9989590c4bf0d9ffa5d69ca98917f68b4535654b SHA256 9738df7b63db1a261aa80a25fb54145debf7518f0086cda34dfc580fc27e87f2 size 530
+MD5 0d8b665a17c987b4cce6ab08fc76abbc libkdepim-3.5.2-r1.ebuild 611
 MD5 3eff8acf0803c3820486a16bd4b37514 libkdepim-3.5.2.ebuild 530
-RMD160 1763e43a414433e6de71948e0e169d3a041db0dd libkdepim-3.5.2.ebuild 530
-SHA256 9738df7b63db1a261aa80a25fb54145debf7518f0086cda34dfc580fc27e87f2 libkdepim-3.5.2.ebuild 530
-MISC ChangeLog 5475 RMD160 f66cfb2aeb61630f7a0e1cb9e3f240d0d153f8d0 SHA1 65c5b5facece960118e1bf7feb736129bd47e74d SHA256 622ef311b79b500327395567cb1914fe941c5c0c2fa8b3e1f4274108f09194af size 5475
-MD5 92e1ce2f3b8a9e5d768de70a57ec973e ChangeLog 5475
-RMD160 f66cfb2aeb61630f7a0e1cb9e3f240d0d153f8d0 ChangeLog 5475
-SHA256 622ef311b79b500327395567cb1914fe941c5c0c2fa8b3e1f4274108f09194af ChangeLog 5475
-MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a size 156
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
-SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
-MD5 91f2200bdc01873b716cb3f9feadcf95 files/digest-libkdepim-3.4.1 762
-RMD160 9ae3652b41011c19fba1e6066280de6392cdee04 files/digest-libkdepim-3.4.1 762
-SHA256 26263ad8661ed9287c7a3fe3eabc8c2ec9f40c8ef72c525a4ff100b852b3fff0 files/digest-libkdepim-3.4.1 762
-MD5 02dd51f1d3985f64e8d6dbe249c2d3cf files/digest-libkdepim-3.4.2 1030
-RMD160 58b14a0877f000302499e13cc795d0b8f9cb4830 files/digest-libkdepim-3.4.2 1030
-SHA256 9a0ebc7b7a8cb892afff0ad664ab68e88e7adf2767afe184ca23e8d19d51bf46 files/digest-libkdepim-3.4.2 1030
-MD5 078792b016dc323d645d7a2b33ed6913 files/digest-libkdepim-3.4.3 247
-RMD160 bc5edc9614ec6bc755f7eebf14f94a4cce174e18 files/digest-libkdepim-3.4.3 247
-SHA256 541b17828da40a695b28451a60321cd1bc8879fbd8deb2405ed060940085ac5a files/digest-libkdepim-3.4.3 247
-MD5 4b77483fe398773d23a75714c3dd6223 files/digest-libkdepim-3.5.2 247
-RMD160 6593013cc2b82f2b51819d483733f409262d7d91 files/digest-libkdepim-3.5.2 247
-SHA256 93b85550a7cebd0f79e5aed63e5719488cfdcc0ee049038fd423aefa50f64e59 files/digest-libkdepim-3.5.2 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEUUJIW78445TWHXcRAlCtAJ0UHEzMncKTr0mT/JyeeqGnq2p62ACdHJ73
-wCY440LOEbv1cSM1vCrjuho=
-=KZes
------END PGP SIGNATURE-----