[kdepimlibs/f15] kmail does not work with dovecot (#757295, kde#249992)

[Rex Dieter]

commit 1226c75bde6bc57922432e4d8e60d37c1914dd00
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Nov 26 08:30:45 2011 -0600

    kmail does not work with dovecot (#757295,kde#249992)

 kdepimlibs-4.7.3-dovecot_kde249992.patch |   26 ++++++++++++++++++++++++++
 kdepimlibs.spec                          |   11 ++++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/kdepimlibs-4.7.3-dovecot_kde249992.patch b/kdepimlibs-4.7.3-dovecot_kde249992.patch
new file mode 100644
index 0000000..a2adf41
--- /dev/null
+++ b/kdepimlibs-4.7.3-dovecot_kde249992.patch
@@ -0,0 +1,26 @@
+--- kdepimlibs-4.7.3/kimap/loginjob.cpp.ark	2011-11-08 00:15:20.339317872 +0100
++++ kdepimlibs-4.7.3/kimap/loginjob.cpp	2011-11-08 00:19:51.685974706 +0100
+@@ -323,11 +323,7 @@ void LoginJob::handleResponse( const Mes
+       }
+     }
+   } else if ( response.content.size() >= 2 ) {
+-    if ( d->authState == LoginJobPrivate::Authenticate ) {
+-      if (!d->answerChallenge(QByteArray::fromBase64(response.content[1].toString()))) {
+-        emitResult(); //error, we're done
+-      }
+-    } else if ( response.content[1].toString()=="CAPABILITY" ) {
++    if ( response.content[1].toString()=="CAPABILITY" ) {
+       bool authModeSupported = d->authMode.isEmpty();
+       for (int i = 2; i < response.content.size(); ++i) {
+         QString capability = response.content[i].toString();
+@@ -346,6 +342,10 @@ void LoginJob::handleResponse( const Mes
+         setErrorText( i18n("Login failed, authentication mode %1 is not supported by the server.", d->authMode) );
+         d->authState = LoginJobPrivate::Login; //just to treat the upcoming OK correctly
+       }
++    } else if ( d->authState == LoginJobPrivate::Authenticate ) {
++      if (!d->answerChallenge(QByteArray::fromBase64(response.content[1].toString()))) {
++        emitResult(); //error, we're done
++      }
+     }
+   }
+ }
diff --git a/kdepimlibs.spec b/kdepimlibs.spec
index 563adb0..c2f9398 100644
--- a/kdepimlibs.spec
+++ b/kdepimlibs.spec
@@ -8,7 +8,7 @@
 Name: kdepimlibs
 Summary: KDE PIM Libraries
 Version: 4.6.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # http://techbase.kde.org/Policies/Licensing_Policy
 License: LGPLv2+
@@ -17,6 +17,10 @@ URL: http://www.kde.org/
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepimlibs-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+## upstream patches
+# https://bugs.kde.org/249992
+Patch100: kdepimlibs-4.7.3-dovecot_kde249992.patch
+
 %if ! 0%{?akonadi_subpkg}
 Obsoletes: %{name}-akonadi < %{version}-%{release}
 Provides:  %{name}-akonadi = %{version}-%{release}
@@ -82,6 +86,8 @@ format for easy browsing.
 %prep
 %setup -q
 
+%patch100 -p1 -b .dovecot_kde249992
+
 
 %build
 mkdir -p %{_target_platform}
@@ -210,6 +216,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Nov 26 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.5-2
+- kmail does not work with dovecot (#757295,kde#249992)
+
 * Fri Jul 01 2011 Rex Dieter <rdieter at fedoraproject.org> 4.6.5-1
 - 4.6.5