[SCM] QCA2 OpenSSL plugin packaging branch, master, updated. debian/0.1-20070904-3-18-g53fea5d

[Felix Geyer]

The following commit has been merged in the master branch:
commit cfbd5546430235490e35550053c5193182edee90
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Mon May 30 01:04:47 2011 +0200

    Enable support for SSL2 only when available in OpenSSL.
---
 debian/changelog                          |    2 ++
 debian/patches/detect_ssl2_available.diff |   17 +++++++++++++++++
 debian/patches/series                     |    1 +
 3 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37c5825..2aa78da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ qca2-plugin-ossl (2.0.0~beta3-1) UNRELEASED; urgency=low
   * Switch debian/rules engine to dhmk.
   * Enable support for MD2 only when available in OpenSSL. (Closes: #622017)
     - Add detect_md2_available.diff
+  * Enable support for SSL2 only when available in OpenSSL.
+    - Add detect_ssl2_available.diff
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 29 May 2011 23:15:26 +0200
 
diff --git a/debian/patches/detect_ssl2_available.diff b/debian/patches/detect_ssl2_available.diff
new file mode 100644
index 0000000..9cdec99
--- /dev/null
+++ b/debian/patches/detect_ssl2_available.diff
@@ -0,0 +1,17 @@
+Description: fix compile when openssl doesn't support ssl2
+Origin: upstream, http://websvn.kde.org/?view=revision&revision=1230301
+
+--- qca-ossl/qca-ossl.cpp
++++ qca-ossl/qca-ossl.cpp
+@@ -5235,9 +5235,11 @@
+ 		OpenSSL_add_ssl_algorithms();
+ 		SSL_CTX *ctx = 0;
+ 		switch (version) {
++#ifndef OPENSSL_NO_SSL2
+ 		case TLS::SSL_v2:
+ 			ctx = SSL_CTX_new(SSLv2_client_method());
+ 			break;
++#endif
+ 		case TLS::SSL_v3:
+ 			ctx = SSL_CTX_new(SSLv3_client_method());
+ 			break;
diff --git a/debian/patches/series b/debian/patches/series
index 75f2308..a15b674 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove_whirlpool_algo.diff
 detect_md2_available.diff
+detect_ssl2_available.diff

-- 
QCA2 OpenSSL plugin packaging