Bug#769857: unblock: kdepim-runtime/4:4.14.2-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package kdepim-runtime
RC bug fix. Note that this is part two of the fix. Part one is in
kdepimlibs and subject of a different unblock request.
unblock kdepim-runtime/4:4.14.2-2
diff -Nru kdepim-runtime-4.14.2/debian/changelog kdepim-runtime-4.14.2/debian/changelog
--- kdepim-runtime-4.14.2/debian/changelog 2014-10-20 11:13:02.000000000 -0400
+++ kdepim-runtime-4.14.2/debian/changelog 2014-11-16 22:44:21.000000000 -0500
@@ -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@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 -Nru kdepim-runtime-4.14.2/debian/control kdepim-runtime-4.14.2/debian/control
--- kdepim-runtime-4.14.2/debian/control 2014-10-20 11:13:02.000000000 -0400
+++ kdepim-runtime-4.14.2/debian/control 2014-11-16 22:43:51.000000000 -0500
@@ -11,7 +11,7 @@
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 -Nru kdepim-runtime-4.14.2/debian/patches/series kdepim-runtime-4.14.2/debian/patches/series
--- kdepim-runtime-4.14.2/debian/patches/series 2014-10-20 11:13:02.000000000 -0400
+++ kdepim-runtime-4.14.2/debian/patches/series 2014-11-16 22:22:40.000000000 -0500
@@ -1,2 +1,3 @@
hide_akonaditray.diff
kolabproxy_unittest
+tlscancelled.patch
diff -Nru kdepim-runtime-4.14.2/debian/patches/tlscancelled.patch kdepim-runtime-4.14.2/debian/patches/tlscancelled.patch
--- kdepim-runtime-4.14.2/debian/patches/tlscancelled.patch 1969-12-31 19:00:00.000000000 -0500
+++ kdepim-runtime-4.14.2/debian/patches/tlscancelled.patch 2014-11-16 22:27:43.000000000 -0500
@@ -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@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@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.\n%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.\n%2",
++ m_account->server(), job->errorString() ) );
+ } else {
+ // Connection worked, but login failed -> ask for a different password or ssl settings.
+ m_pendingInitialSession = login->session();
Reply to: