Hello community,

here is the log from the commit of package libqca2 for openSUSE:Factory checked 
in at 2014-04-17 14:10:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqca2 (Old)
 and      /work/SRC/openSUSE:Factory/.libqca2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqca2"

Changes:
--------
--- /work/SRC/openSUSE:Factory/libqca2/libqca2.changes  2013-10-14 
09:29:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqca2.new/libqca2.changes     2014-04-17 
14:11:01.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 16 16:13:46 UTC 2014 - [email protected]
+
+- Added detect_ssl2_available.diff: fix build with no-ssl2 in
+  openssl lib
+
+-------------------------------------------------------------------

New:
----
  detect_ssl2_available.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqca2.spec ++++++
--- /var/tmp/diff_new_pack.RYieOz/_old  2014-04-17 14:11:03.000000000 +0200
+++ /var/tmp/diff_new_pack.RYieOz/_new  2014-04-17 14:11:03.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package libqca2
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -58,6 +58,8 @@
 Patch1:         r928413.diff
 Patch2:         disable-insecure-ssl.diff
 Patch3:         qca-2.0.3-gcc47.patch
+# PATCH-FIX-UPSTREAM detect_ssl2_available.diff -- fix build with no-ssl2 in 
openssl lib
+Patch4:         detect_ssl2_available.diff
 Requires:       gpg2 >= 2.0.0
 %requires_eq    libqt4
 
@@ -191,6 +193,7 @@
 popd
 pushd qca-ossl-*
 %patch2
+%patch4 -p1
 popd
 cd ../../..
 %setup -D -q -n qca-%{tar_version}

++++++ detect_ssl2_available.diff ++++++
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;
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to