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

[Scott Kitterman]

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

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

    * Add new error code for ERR_SSL_FAILED to support fixing issue where
      connection via SSL using an unknown certificate could not be rejected
      (Closes: #769852)
---
 debian/changelog                  |  9 +++++++++
 debian/patches/series             |  1 +
 debian/patches/tlscancelled.patch | 42 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d757da2..4019e7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kdepimlibs (4:4.14.2-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add new error code for ERR_SSL_FAILED to support fixing issue where
+    connection via SSL using an unknown certificate could not be rejected
+    (Closes: #769852)
+
+ -- Scott Kitterman <scott at kitterman.com>  Sun, 16 Nov 2014 22:35:39 -0500
+
 kdepimlibs (4:4.14.2-1) unstable; urgency=medium
 
   * New upstream release (4.14.2).
diff --git a/debian/patches/series b/debian/patches/series
index 340c9a2..67ced40 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add_soname_to_xsd_file
 sslv2_disabled.patch
+tlscancelled.patch
diff --git a/debian/patches/tlscancelled.patch b/debian/patches/tlscancelled.patch
new file mode 100644
index 0000000..1c80aa1
--- /dev/null
+++ b/debian/patches/tlscancelled.patch
@@ -0,0 +1,42 @@
+Description: Add 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: #769852)
+Origin: vendor
+Author: Jim Scadden <jims at silentasylum.co.uk>
+Bug-Debian: http://bugs.debian.org/769852
+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
+
+--- kdepimlibs-4.14.2.orig/kimap/loginjob.cpp
++++ kdepimlibs-4.14.2/kimap/loginjob.cpp
+@@ -535,7 +535,7 @@ void LoginJobPrivate::sslResponse(bool r
+     authState = LoginJobPrivate::Capability;
+     tags << sessionInternal()->sendCommand( "CAPABILITY" );
+   } else {
+-    q->setError( LoginJob::UserDefinedError );
++    q->setError( LoginJob::ERR_SSL_FAILED );
+     q->setErrorText( i18n( "Login failed, TLS negotiation failed." ) );
+     encryptionMode = LoginJob::Unencrypted;
+     q->emitResult();
+@@ -597,7 +597,6 @@ void LoginJob::connectionLost()
+       emitResult();
+     }
+   }
+-
+ }
+ 
+ void LoginJobPrivate::saveServerGreeting(const Message &response)
+--- kdepimlibs-4.14.2.orig/kimap/loginjob.h
++++ kdepimlibs-4.14.2/kimap/loginjob.h
+@@ -61,7 +61,8 @@ class KIMAP_EXPORT LoginJob : public Job
+     };
+ 
+     enum ErrorCode {
+-      ERR_COULD_NOT_CONNECT = KJob::UserDefinedError + 23 // same as in kio
++      ERR_COULD_NOT_CONNECT = KJob::UserDefinedError + 23, // same as in kio
++      ERR_SSL_FAILED = KJob::UserDefinedError + 128,  // outside of values used by kio
+     };
+ 
+     explicit LoginJob( Session *session );

-- 
KDE PIM Libraries module packaging