Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package kdepimlibs RC bug fix. Note: This is a two part fix. The other part is in kdepim-runtime and will be requested in a separate unblock. Both have been tested and uploaded. unblock kdepimlibs/4:4.14.2-2
diff -Nru kdepimlibs-4.14.2/debian/changelog kdepimlibs-4.14.2/debian/changelog --- kdepimlibs-4.14.2/debian/changelog 2014-10-20 11:13:26.000000000 -0400 +++ kdepimlibs-4.14.2/debian/changelog 2014-11-16 22:38:20.000000000 -0500 @@ -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 <sc...@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 -Nru kdepimlibs-4.14.2/debian/patches/series kdepimlibs-4.14.2/debian/patches/series --- kdepimlibs-4.14.2/debian/patches/series 2014-10-20 11:13:26.000000000 -0400 +++ kdepimlibs-4.14.2/debian/patches/series 2014-11-16 22:40:13.000000000 -0500 @@ -1,2 +1,3 @@ add_soname_to_xsd_file sslv2_disabled.patch +tlscancelled.patch diff -Nru kdepimlibs-4.14.2/debian/patches/tlscancelled.patch kdepimlibs-4.14.2/debian/patches/tlscancelled.patch --- kdepimlibs-4.14.2/debian/patches/tlscancelled.patch 1969-12-31 19:00:00.000000000 -0500 +++ kdepimlibs-4.14.2/debian/patches/tlscancelled.patch 2014-11-16 22:41:40.000000000 -0500 @@ -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 <j...@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 <sc...@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 );
