[SCM] KDE PIM Runtime module packaging branch, master, updated. debian/4.14.2-1-1-g610830f

[Scott Kitterman]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdepim-runtime.git;a=commitdiff;h=610830f

The following commit has been merged in the master branch:
commit 610830f0be882137cba3473e7f16441b25e30f14
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sun Nov 16 23:55:05 2014 -0500

    * Add debian/patches/tlscancelled.patch to fix issue with inability to
      cancel connections using unknown SSL certificates (Closes: #750995)
    * Bump minimum kdepimlibs5-dev build-depends version to 4:4.14.2-2~
      in order to ensure the added enum is available
---
 debian/changelog                  | 10 ++++++++++
 debian/control                    |  2 +-
 debian/patches/series             |  1 +
 debian/patches/tlscancelled.patch | 25 +++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4250b49..15da24d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+kdepim-runtime (4:4.14.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add debian/patches/tlscancelled.patch to fix issue with inability to
+    cancel connections using unknown SSL certificates (Closes: #750995)
+  * Bump minimum kdepimlibs5-dev build-depends version to 4:4.14.2-2~
+    in order to ensure the added enum is available
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 16 Nov 2014 22:14:26 -0500
+
 kdepim-runtime (4:4.14.2-1) unstable; urgency=medium
 
   * New upstream release (4.14.2).
diff --git a/debian/control b/debian/control
index 8a54341..821af0d 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cmake,
                debhelper (>= 9),
                kde-sc-dev-latest (>= 4:4.12),
                kdelibs5-dev (>= 4:4.12),
-               kdepimlibs5-dev (>= 4:4.14.0),
+               kdepimlibs5-dev (>= 4:4.14.2-2~),
                libakonadi-dev (>= 1.12.90),
                libboost-dev (>= 1.40.0-2),
                libkgapi-dev (>= 2.2.0),
diff --git a/debian/patches/series b/debian/patches/series
index 2a1961a..78ff968 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 hide_akonaditray.diff
 kolabproxy_unittest
+tlscancelled.patch
diff --git a/debian/patches/tlscancelled.patch b/debian/patches/tlscancelled.patch
new file mode 100644
index 0000000..dcc253e
--- /dev/null
+++ b/debian/patches/tlscancelled.patch
@@ -0,0 +1,25 @@
+Description: Use SSL specific error type on SSL error
+ Add debian/patches/tlscancelled.patch to fix issue with inability to
+ cancel connections using unknown SSL certificates (Closes: #750995)
+Origin: vendor
+Author: Jim Scadden <jims at silentasylum.co.uk>
+Bug-Debian: http://bugs.debian.org/750995
+Bug: https://bugs.kde.org/show_bug.cgi?id=335994
+Forwarded: https://bugs.kde.org/show_bug.cgi?id=335994
+Reviewed-By: Scott Kitterman <scott at kitterman.com>
+Last-Update: 2014-11-16
+
+--- kdepim-runtime-4.14.2.orig/resources/imap/sessionpool.cpp
++++ kdepim-runtime-4.14.2/resources/imap/sessionpool.cpp
+@@ -377,6 +377,11 @@ void SessionPool::onLoginDone( KJob *job
+                                i18n( "Could not connect to the IMAP-server.
%1",
+                                      job->errorString() ) );
+       }
++    } else if ( job->error() == KIMAP::LoginJob::ERR_SSL_FAILED ) {
++      cancelSessionCreation( login->session(),
++                             EncryptionError,
++                             i18n( "Could not connect to the IMAP-server %1.
%2",
++                                   m_account->server(), job->errorString() ) );
+     } else {
+       // Connection worked, but login failed -> ask for a different password or ssl settings.
+       m_pendingInitialSession = login->session();

-- 
KDE PIM Runtime module packaging