Mbox and imap fixes.

Package-Manager: portage-2.0.54

4 files changed, 90 insertions, 1 deletions

diff --git a/kde-base/kdepim-kioslaves/ChangeLog b/kde-base/kdepim-kioslaves/ChangeLog
index aba2266af415..886256e9a902 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.43 2006/04/06 01:36:02 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-kioslaves/ChangeLog,v 1.44 2006/04/22 10:55:50 carlo Exp $
+
+*kdepim-kioslaves-3.5.2-r1 (22 Apr 2006)
+
+  22 Apr 2006; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdepim-kioslaves-3.5.2-fixes.diff,
+  +kdepim-kioslaves-3.5.2-r1.ebuild:
+  Mbox and imap fixes.
 
   05 Apr 2006; Diego Pettenò <flameeyes@gentoo.org>
   -kdepim-kioslaves-3.5.0.ebuild, -kdepim-kioslaves-3.5.1.ebuild:
diff --git a/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.5.2-r1 b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.5.2-r1
new file mode 100644
index 000000000000..9ee81dd048d6
--- /dev/null
+++ b/kde-base/kdepim-kioslaves/files/digest-kdepim-kioslaves-3.5.2-r1
@@ -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.diff b/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes.diff
new file mode 100644
index 000000000000..4f755073ba20
--- /dev/null
+++ b/kde-base/kdepim-kioslaves/files/kdepim-kioslaves-3.5.2-fixes.diff
@@ -0,0 +1,57 @@
+--- kdepim/kioslaves/imap4/imap4.cc	2005/09/14 19:43:34	460690
++++ kdepim/kioslaves/imap4/imap4.cc	2006/04/05 20:34:16	526879
+@@ -2232,6 +2232,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/05 20:32:16	526877
+@@ -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/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 );
diff --git a/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r1.ebuild b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r1.ebuild
new file mode 100644
index 000000000000..23409d42e849
--- /dev/null
+++ b/kde-base/kdepim-kioslaves/kdepim-kioslaves-3.5.2-r1.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-r1.ebuild,v 1.1 2006/04/22 10:55:50 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.diff"
\ No newline at end of file