[Pkg-giraffe-maintainers] [PATCH 1/5] rebuild patch queue from patch-queue branch

[c.schoenert at t-online.de]

From: Carsten Schoenert <c.schoenert at t-online.de>

modified patches:
OpenSSL-Make-SSLv2-conditional.patch

Do a incomplete implementation of the condition if SSL_TXT_SSLV2=true
the build causes a FTBFS as the 'else if' block is missing the needed
assignments.
This issue isn't visible in recent Debian unstable due the already
happen transition of OpenSSl to version 1.1 which hasn't support for
SSLv2 any longer.
Thanks Nishanth Aravamudan from Cannonical for giving feedback about
that issue!

Closes: #861849
---
 debian/patches/OpenSSL-Make-SSLv2-conditional.patch | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/patches/OpenSSL-Make-SSLv2-conditional.patch b/debian/patches/OpenSSL-Make-SSLv2-conditional.patch
index d9ae9fc0..7bb0aba2 100644
--- a/debian/patches/OpenSSL-Make-SSLv2-conditional.patch
+++ b/debian/patches/OpenSSL-Make-SSLv2-conditional.patch
@@ -6,15 +6,15 @@ OpenSSL1.1 doesn't support SSLv2 anymore, make the code conditional so
 we can build against both OpenSSL versions.
 Patch based on work done for Dovecot.
 ---
- common/ECChannel.cpp                       | 4 ++++
- provider/server/ECSoapServerConnection.cpp | 4 ++++
- 2 files changed, 8 insertions(+)
+ common/ECChannel.cpp                       | 5 +++++
+ provider/server/ECSoapServerConnection.cpp | 5 +++++
+ 2 files changed, 10 insertions(+)
 
 diff --git a/common/ECChannel.cpp b/common/ECChannel.cpp
-index cab099f4..17f2f0fb 100644
+index cab099f..344a1e1 100644
 --- a/common/ECChannel.cpp
 +++ b/common/ECChannel.cpp
-@@ -95,12 +95,16 @@ HRESULT ECChannel::HrSetCtx(ECConfig *lpConfig, ECLogger *lpLogger) {
+@@ -95,12 +95,17 @@ HRESULT ECChannel::HrSetCtx(ECConfig *lpConfig, ECLogger *lpLogger) {
  			ssl_neg = true;
  		}
  
@@ -22,9 +22,10 @@ index cab099f4..17f2f0fb 100644
  		if (strcasecmp(ssl_name, SSL_TXT_SSLV2) == 0)
  			ssl_proto = 0x01;
  		else if (strcasecmp(ssl_name, SSL_TXT_SSLV3) == 0)
+ 			ssl_proto = 0x02;
 +#else
 +		if (strcasecmp(ssl_name, SSL_TXT_SSLV3) == 0)
- 			ssl_proto = 0x02;
++			ssl_proto = 0x02;
  		else if (strcasecmp(ssl_name, SSL_TXT_TLSV1) == 0)
  			ssl_proto = 0x04;
 +#endif
@@ -32,10 +33,10 @@ index cab099f4..17f2f0fb 100644
  		else if (strcasecmp(ssl_name, SSL_TXT_TLSV1_1) == 0)
  			ssl_proto = 0x08;
 diff --git a/provider/server/ECSoapServerConnection.cpp b/provider/server/ECSoapServerConnection.cpp
-index 4e5a49d6..c69f56f1 100644
+index 4e5a49d..ab18970 100644
 --- a/provider/server/ECSoapServerConnection.cpp
 +++ b/provider/server/ECSoapServerConnection.cpp
-@@ -249,12 +249,16 @@ ECRESULT ECSoapServerConnection::ListenSSL(const char* lpServerName, int nServer
+@@ -249,12 +249,17 @@ ECRESULT ECSoapServerConnection::ListenSSL(const char* lpServerName, int nServer
  			ssl_neg = true;
  		}
  
@@ -43,9 +44,10 @@ index 4e5a49d6..c69f56f1 100644
  		if (strcasecmp(ssl_name, SSL_TXT_SSLV2) == 0)
  			ssl_proto = 0x01;
  		else if (strcasecmp(ssl_name, SSL_TXT_SSLV3) == 0)
+ 			ssl_proto = 0x02;
 +#else
 +		if (strcasecmp(ssl_name, SSL_TXT_SSLV3) == 0)
- 			ssl_proto = 0x02;
++			ssl_proto = 0x02;
  		else if (strcasecmp(ssl_name, SSL_TXT_TLSV1) == 0)
  			ssl_proto = 0x04;
 +#endif
-- 
2.11.0