[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.11.5-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepimlibs.git;a=commitdiff;h=eae3a0a

The following commit has been merged in the master branch:
commit eae3a0ae5290cdb350355e91e43dac909ca344a4
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jan 13 18:45:54 2014 -0300

    Remove always_reset_dosslfallback.diff, applied upstream.
---
 debian/changelog                               |  1 +
 debian/patches/always_reset_dosslfallback.diff | 33 --------------------------
 debian/patches/series                          |  1 -
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7703576..4f3d326 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kdepimlibs (4:4.11.5-1) UNRELEASED; urgency=low
   * Bump Standards-Version to 3.9.5, no changes needed.
   * Update libakonadi-calendar4 extended description, thanks to Filipus
     Klutiero. (Closes: #721009)
+  * Remove always_reset_dosslfallback.diff, applied upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 13 Jan 2014 18:17:37 -0300
 
diff --git a/debian/patches/always_reset_dosslfallback.diff b/debian/patches/always_reset_dosslfallback.diff
deleted file mode 100644
index 23469b7..0000000
--- a/debian/patches/always_reset_dosslfallback.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 4b8adabf8d6d821ad6fde20588a5ef0d72363a97
-Author: Christian Mollekopf <chrigi_1 at fastmail.fm>
-Date:   Tue Nov 19 18:29:27 2013 +0100
-
-    Always reset doSslFallback.
-    
-    Otherwise doSslFallback will remain true if the errors are ignored, although a connection is established.
-    If we then receive an error from the server (e.g. due to disconnect), the session
-    will go into a reconnect frenzy.
-    
-    BUG: 316840
-    FIXED-IN: 4.11.4
-
-diff --git a/kimap/sessionthread.cpp b/kimap/sessionthread.cpp
-index e70e317..42a1f62 100644
---- a/kimap/sessionthread.cpp
-+++ b/kimap/sessionthread.cpp
-@@ -274,6 +274,7 @@ void SessionThread::socketError(KTcpSocket::Error error)
- // Called in secondary thread
- void SessionThread::sslConnected()
- {
-+  doSslFallback = false;
-   Q_ASSERT( QThread::currentThread() == thread() );
-   if ( !m_socket )
-     return;
-@@ -290,7 +291,6 @@ void SessionThread::sslConnected()
-      KSslErrorUiData errorData( m_socket );
-      emit sslError( errorData );
-   } else {
--    doSslFallback = false;
-     kDebug() << "TLS negotiation done.";
-     m_encryptedMode = true;
-     emit encryptionNegotiationResult( true, m_socket->negotiatedSslVersion() );
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0059af9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-always_reset_dosslfallback.diff

-- 
KDE PIM Libraries module packaging