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

Maximiliano Curia maxy at moszumanska.debian.org
Tue May 20 13:25:25 UTC 2014


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

The following commit has been merged in the master branch:
commit bf62fc5cd409e790769c82536e31c9f13d5a79fd
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun May 18 00:32:46 2014 +0200

    New patch: sslv2_disabled.patch
---
 debian/changelog                    |  1 +
 debian/patches/series               |  1 +
 debian/patches/sslv2_disabled.patch | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 08ca0b5..c1c01c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ kdepimlibs (4:4.13.1-1) UNRELEASED; urgency=medium
   * Update symbols with 4:4.12.4 build log.
   * Update symbols files.
   * Update libkalarmcal2 acc file
+  * New patch: sslv2_disabled.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 17 May 2014 14:25:52 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 46cfb76..e53b441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 ship_akonaditest
 ship_knut
 add_soname_to_xsd_file
+sslv2_disabled.patch
diff --git a/debian/patches/sslv2_disabled.patch b/debian/patches/sslv2_disabled.patch
new file mode 100644
index 0000000..0a2cf70
--- /dev/null
+++ b/debian/patches/sslv2_disabled.patch
@@ -0,0 +1,13 @@
+Index: kdepimlibs/kimap/tests/loginjobtest.cpp
+===================================================================
+--- kdepimlibs.orig/kimap/tests/loginjobtest.cpp	2014-05-18 00:31:24.641426654 +0200
++++ kdepimlibs/kimap/tests/loginjobtest.cpp	2014-05-18 00:31:58.984090428 +0200
+@@ -226,7 +226,7 @@
+             << "S: A000002 OK";
+ 
+     QTest::newRow( "sslv3" ) << scenario << static_cast<int>(QSsl::SslV3) << static_cast<int>(KIMAP::LoginJob::SslV3);
+-    QTest::newRow( "sslv2" ) << scenario << static_cast<int>(QSsl::SslV2) << static_cast<int>(KIMAP::LoginJob::SslV2);
++    // QTest::newRow( "sslv2" ) << scenario << static_cast<int>(QSsl::SslV2) << static_cast<int>(KIMAP::LoginJob::SslV2);
+     //AnySslVersion doesn't mean the server can force a specific version (e.g. openssl always starts with a sslv2 hello)
+     QTest::newRow( "any protocol with anyssl version" ) << scenario << static_cast<int>(QSsl::AnyProtocol) << static_cast<int>(KIMAP::LoginJob::AnySslVersion);
+     //KIMAP and KTcpSocket use SslV3_1 but really mean tls without starttls

-- 
KDE PIM Libraries module packaging



More information about the pkg-kde-commits mailing list