From a1e9e00bb2731e097752de4025728a69b6c23a98 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Wed, 12 Apr 2017 00:07:22 +0200 Subject: [PATCH] qca: remove patches --- srcpkgs/qca/patches/libressl-2.3.patch | 28 -------------- srcpkgs/qca/patches/libressl.patch | 14 ------- srcpkgs/qca/patches/narrowing.patch | 51 -------------------------- 3 files changed, 93 deletions(-) delete mode 100644 srcpkgs/qca/patches/libressl-2.3.patch delete mode 100644 srcpkgs/qca/patches/libressl.patch delete mode 100644 srcpkgs/qca/patches/narrowing.patch diff --git a/srcpkgs/qca/patches/libressl-2.3.patch b/srcpkgs/qca/patches/libressl-2.3.patch deleted file mode 100644 index 34b6d4aa569..00000000000 --- a/srcpkgs/qca/patches/libressl-2.3.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- plugins/qca-ossl/qca-ossl.cpp.orig 2016-03-31 09:00:14.410576583 +0200 -+++ plugins/qca-ossl/qca-ossl.cpp 2016-03-31 09:00:21.935576020 +0200 -@@ -7129,8 +7129,6 @@ public: - return new opensslInfoContext(this); - else if ( type == "sha1" ) - return new opensslHashContext( EVP_sha1(), this, type); -- else if ( type == "sha0" ) -- return new opensslHashContext( EVP_sha(), this, type); - else if ( type == "ripemd160" ) - return new opensslHashContext( EVP_ripemd160(), this, type); - #ifdef HAVE_OPENSSL_MD2 ---- plugins/qca-ossl/qca-ossl.cpp.orig 2016-03-31 09:09:28.995535076 +0200 -+++ plugins/qca-ossl/qca-ossl.cpp 2016-03-31 09:09:36.345534526 +0200 -@@ -5394,13 +5394,8 @@ public: - 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()); -+ ctx = SSL_CTX_new(SSLv23_client_method()); - break; - case TLS::TLS_v1: - ctx = SSL_CTX_new(TLSv1_client_method()); diff --git a/srcpkgs/qca/patches/libressl.patch b/srcpkgs/qca/patches/libressl.patch deleted file mode 100644 index 2da07337d6f..00000000000 --- a/srcpkgs/qca/patches/libressl.patch +++ /dev/null @@ -1,14 +0,0 @@ -# upstream -# http://quickgit.kde.org/?p=qca.git&a=commit&h=593de6855a4f4dc26cface3e96de8889f90cb4bb - ---- plugins/qca-ossl/qca-ossl.cpp 2015-01-24 00:38:42.000000000 +0100 -+++ plugins/qca-ossl/qca-ossl.cpp 2015-01-24 00:38:27.000000000 +0100 -@@ -5801,7 +5801,7 @@ - { - SessionInfo sessInfo; - -- sessInfo.isCompressed = (0 != ssl->session->compress_meth); -+ sessInfo.isCompressed = (0 != SSL_SESSION_get_compress_id(ssl->session)); - - if (ssl->version == TLS1_VERSION) - sessInfo.version = TLS::TLS_v1; diff --git a/srcpkgs/qca/patches/narrowing.patch b/srcpkgs/qca/patches/narrowing.patch deleted file mode 100644 index 030373daa50..00000000000 --- a/srcpkgs/qca/patches/narrowing.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- src/qca_textfilter.cpp 2014-11-06 09:15:45.000000000 +0100 -+++ src/qca_textfilter.cpp 2017-01-25 05:19:43.948129764 +0100 -@@ -289,29 +289,31 @@ - - static QByteArray b64decode(const QByteArray &s, bool *ok) - { -- // -1 specifies invalid -+#define _I '\xff' -+ // _I specifies invalid - // 64 specifies eof - // everything else specifies data - - static char tbl[] = - { -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63, -- 52,53,54,55,56,57,58,59,60,61,-1,-1,-1,64,-1,-1, -- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, -- 15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1, -- -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, -- 41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,62,_I,_I,_I,63, -+ 52,53,54,55,56,57,58,59,60,61,_I,_I,_I,64,_I,_I, -+ _I, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, -+ 15,16,17,18,19,20,21,22,23,24,25,_I,_I,_I,_I,_I, -+ _I,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, -+ 41,42,43,44,45,46,47,48,49,50,51,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, -+ _I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I,_I, - }; -+#undef _I - - // return value - QByteArray p;