[SCM] QCA2 library packaging branch, master, updated. debian/2.1.1-4-2-g71a9810

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=71a9810

The following commit has been merged in the master branch:
commit 71a9810866492b0ecdf2f840265c5c7bf8f39cd4
Author: Felix Geyer <fgeyer at debian.org>
Date:   Fri Jun 16 09:46:29 2017 +0200

    Remove patches that have been applied upstream.
    
    * Remove patches that have been applied upstream:
      - fix_build_without_sslv3.diff
      - fix_base64_decoding_on_ARM.diff
---
 debian/changelog                               |  3 +++
 debian/patches/fix_base64_decoding_on_ARM.diff | 36 --------------------------
 debian/patches/fix_build_without_sslv3.diff    | 29 ---------------------
 debian/patches/series                          |  2 --
 4 files changed, 3 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da268ef..097d71a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 qca2 (2.1.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Remove patches that have been applied upstream:
+    - fix_build_without_sslv3.diff
+    - fix_base64_decoding_on_ARM.diff
 
  -- Felix Geyer <fgeyer at debian.org>  Fri, 16 Jun 2017 09:33:58 +0200
 
diff --git a/debian/patches/fix_base64_decoding_on_ARM.diff b/debian/patches/fix_base64_decoding_on_ARM.diff
deleted file mode 100644
index d200331..0000000
--- a/debian/patches/fix_base64_decoding_on_ARM.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From 601fd3a05141c614ae48a3ddac44194d669eaae1 Mon Sep 17 00:00:00 2001
-From: Rolf Eike Beer <eb at emlix.com>
-Date: Mon, 27 Jun 2016 12:55:51 +0200
-Subject: fix base64 decoding on ARM
-
-This code was broken on ARM and other architectures where "char" is unsigned by
-default.
-
-First, it breaks with newer compilers with errors like:
-
-  .../src/qca_textfilter.cpp:314:2: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
-
-Second, if the compiler would just allow this conversion then the unsigned char
-would hold 255, which would not be sign extended when cast to an int later, so
-all the checks "< 0" will never trigger, and so invalid input characters cannot
-be detected.
-
-REVIEW:128295
-BUG:364495
----
- src/qca_textfilter.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qca_textfilter.cpp b/src/qca_textfilter.cpp
-index 9889a24..3baf511 100644
---- a/src/qca_textfilter.cpp
-+++ b/src/qca_textfilter.cpp
-@@ -293,7 +293,7 @@ static QByteArray b64decode(const QByteArray &s, bool *ok)
- 	// 64 specifies eof
- 	// everything else specifies data
- 
--	static char tbl[] =
-+	static signed 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,
diff --git a/debian/patches/fix_build_without_sslv3.diff b/debian/patches/fix_build_without_sslv3.diff
deleted file mode 100644
index 1a81490..0000000
--- a/debian/patches/fix_build_without_sslv3.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Heiko Becker <heirecka at exherbo.org>
-Date: Thu, 24 Sep 2015 20:54:41 +0000
-Subject: qca-ossl: Fix build without SSLv3
-X-Git-Url: http://quickgit.kde.org/?p=qca.git&a=commitdiff&h=20a587d77636186edb044cd2b71d6d90fe98d232
----
-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
----
-
-
---- a/plugins/qca-ossl/qca-ossl.cpp
-+++ b/plugins/qca-ossl/qca-ossl.cpp
-@@ -5403,9 +5403,11 @@
- 			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;
diff --git a/debian/patches/series b/debian/patches/series
index 8665f0a..f9b23b5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,3 @@ define_qca_export.diff
 pipeunittest_more_wait.diff
 hurd_msync.diff
 kubuntu_ignore_filewatch_test.diff
-fix_build_without_sslv3.diff
-fix_base64_decoding_on_ARM.diff

-- 
QCA2 library packaging