summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2017-06-09 18:39:00 +0200
committerJohannes Huber <johu@gentoo.org>2017-06-09 18:39:50 +0200
commite99054b5b5a1545b422ef03f2bf58fec31639ba9 (patch)
treefb34ef0af46ded21fb407fc7ebfaf6d96fb42aee /app-crypt/qca/files
parentapp-crypt/qca: Remove 2.1.1 (r0) (diff)
downloadgentoo-e99054b5b5a1545b422ef03f2bf58fec31639ba9.tar.gz
gentoo-e99054b5b5a1545b422ef03f2bf58fec31639ba9.tar.bz2
gentoo-e99054b5b5a1545b422ef03f2bf58fec31639ba9.zip
app-crypt/qca: Remove 2.1.1-r1
Package-Manager: Portage-2.3.6, Repoman-2.3.2
Diffstat (limited to 'app-crypt/qca/files')
-rw-r--r--app-crypt/qca/files/qca-2.1.0.3-qt55.patch26
-rw-r--r--app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch48
-rw-r--r--app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch28
3 files changed, 0 insertions, 102 deletions
diff --git a/app-crypt/qca/files/qca-2.1.0.3-qt55.patch b/app-crypt/qca/files/qca-2.1.0.3-qt55.patch
deleted file mode 100644
index 277c24e02800..000000000000
--- a/app-crypt/qca/files/qca-2.1.0.3-qt55.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7207e6285e932044cd66d49d0dc484666cfb0092 Mon Sep 17 00:00:00 2001
-From: Hrvoje Senjan <hrvoje.senjan@gmail.com>
-Date: Sat, 17 Jan 2015 20:12:18 +0100
-Subject: [PATCH] Add missing QIODevice include
-
-Fixes build with Qt 5.5
----
- include/QtCrypto/qca_basic.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/QtCrypto/qca_basic.h b/include/QtCrypto/qca_basic.h
-index 42808c5..e0c6cbb 100644
---- a/include/QtCrypto/qca_basic.h
-+++ b/include/QtCrypto/qca_basic.h
-@@ -35,6 +35,8 @@
-
- #include "qca_core.h"
-
-+#include <QIODevice>
-+
- // Qt5 comes with QStringLiteral for wrapping string literals, which Qt4 does
- // not have. It is needed if the headers are built with QT_NO_CAST_FROM_ASCII.
- // Defining it here as QString::fromUtf8 for convenience.
---
-2.0.5
-
diff --git a/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch b/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch
deleted file mode 100644
index 3e112c622a50..000000000000
--- a/app-crypt/qca/files/qca-2.1.1-libressl-230-sha0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 0dbed8eb38afd1561907a52283091c37e7b85156
-Author: Heiko Becker <heirecka@exherbo.org>
-Date: Thu Sep 24 23:05:21 2015 +0200
-
- qca-ossl: Fix build without support for SHA-0
-
- LibreSSL >= 2.3.0 removed support for SHA-0, so there's no EVP_sha
- anymore.
- Wikipedia says about SHA-0: "160-bit hash function published in 1993
- under the name SHA. It was withdrawn shortly after publication due to
- an undisclosed "significant flaw" and replaced by the slightly revised
- version SHA-1.'
-
- REVIEW: 125387
-
-diff --git a/plugins/qca-ossl/CMakeLists.txt b/plugins/qca-ossl/CMakeLists.txt
-index 3124f02..cdeaeca 100644
---- a/plugins/qca-ossl/CMakeLists.txt
-+++ b/plugins/qca-ossl/CMakeLists.txt
-@@ -25,6 +25,13 @@ if(OPENSSL_FOUND)
- message(WARNING "qca-ossl will be compiled without AES CTR mode encryption support")
- endif(HAVE_OPENSSL_AES_CTR)
-
-+ check_function_exists(EVP_sha HAVE_OPENSSL_SHA0)
-+ if(HAVE_OPENSSL_SHA0)
-+ add_definitions(-DHAVE_OPENSSL_SHA0)
-+ else(HAVE_OPENSSL_SHA0)
-+ message(WARNING "qca-ossl will be compiled without SHA-0 digest algorithm support")
-+ endif(HAVE_OPENSSL_SHA0)
-+
- set(QCA_OSSL_SOURCES qca-ossl.cpp)
-
- my_automoc( QCA_OSSL_SOURCES )
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index b34ecc1..61d9e43 100644
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -7135,8 +7135,10 @@ public:
- return new opensslInfoContext(this);
- else if ( type == "sha1" )
- return new opensslHashContext( EVP_sha1(), this, type);
-+#ifdef HAVE_OPENSSL_SHA0
- else if ( type == "sha0" )
- return new opensslHashContext( EVP_sha(), this, type);
-+#endif
- else if ( type == "ripemd160" )
- return new opensslHashContext( EVP_ripemd160(), this, type);
- #ifdef HAVE_OPENSSL_MD2
diff --git a/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch b/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch
deleted file mode 100644
index accefc49c3d3..000000000000
--- a/app-crypt/qca/files/qca-2.1.1-libressl-230-sslv3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-commit 20a587d77636186edb044cd2b71d6d90fe98d232
-Author: Heiko Becker <heirecka@exherbo.org>
-Date: Thu Sep 24 22:54:41 2015 +0200
-
- qca-ossl: Fix build without SSLv3
-
- This fixes building with LibreSSL >= 2.3.0 which has removed support
- for SSLv3 completely. As far as I know OpenSSL can be configured to
- build without it, so it might be helpful there as well.
-
- REVIEW: 125386
-
-diff --git a/plugins/qca-ossl/qca-ossl.cpp b/plugins/qca-ossl/qca-ossl.cpp
-index cfb1e9f..b34ecc1 100644
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -5403,9 +5403,11 @@ public:
- ctx = SSL_CTX_new(SSLv2_client_method());
- break;
- #endif
-+#ifndef OPENSSL_NO_SSL3_METHOD
- case TLS::SSL_v3:
- ctx = SSL_CTX_new(SSLv3_client_method());
- break;
-+#endif
- case TLS::TLS_v1:
- ctx = SSL_CTX_new(TLSv1_client_method());
- break;