[neon/kde/kopete/Neon/release] debian: Fix the fix for incompatibility with openssl 1.1 (Closes: #913679, #948987)

[Norbert Preining]

Git commit ed09111c61df8ab72bb0c42231b8894bd50a0265 by Norbert Preining.
Committed on 12/01/2021 at 03:31.
Pushed by jriddell into branch 'Neon/release'.

Fix the fix for incompatibility with openssl 1.1 (Closes: #913679, #948987)

M  +1    -0    debian/changelog
M  +14   -14   debian/patches/kopete-17.08.3-openssl-1.1.patch

https://invent.kde.org/neon/kde/kopete/commit/ed09111c61df8ab72bb0c42231b8894bd50a0265

diff --git a/debian/changelog b/debian/changelog
index efd41c9..dada2b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ kopete (4:20.12.1-0r1) UNRELEASED; urgency=medium
   [ Norbert Preining ]
   * Update maintainer name part.
   * Fix compilation errors (Closes: #979388)
+  * Fix the fix for incompatibility with openssl 1.1 (Closes: #913679, #948987)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 09 Jan 2021 14:00:22 +0100
 
diff --git a/debian/patches/kopete-17.08.3-openssl-1.1.patch b/debian/patches/kopete-17.08.3-openssl-1.1.patch
index 243b6fa..4714e66 100644
--- a/debian/patches/kopete-17.08.3-openssl-1.1.patch
+++ b/debian/patches/kopete-17.08.3-openssl-1.1.patch
@@ -28,13 +28,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +  if (methods_socket == NULL) {
 +      methods_socket = BIO_meth_new (BIO_TYPE_BIO | BIO_get_new_index (), "socket");
 +      if (methods_socket == NULL ||
-+          BIO_meth_set_write (methods_socket, socket_write) ||
-+          BIO_meth_set_read (methods_socket, socket_read) ||
-+          BIO_meth_set_puts (methods_socket, socket_puts) ||
-+          BIO_meth_set_gets (methods_socket, 0) ||
-+          BIO_meth_set_ctrl (methods_socket, socket_ctrl) ||
-+          BIO_meth_set_create (methods_socket, socket_new) ||
-+          BIO_meth_set_destroy (methods_socket, socket_free))
++          !BIO_meth_set_write (methods_socket, socket_write) ||
++          !BIO_meth_set_read (methods_socket, socket_read) ||
++          !BIO_meth_set_puts (methods_socket, socket_puts) ||
++          !BIO_meth_set_gets (methods_socket, 0) ||
++          !BIO_meth_set_ctrl (methods_socket, socket_ctrl) ||
++          !BIO_meth_set_create (methods_socket, socket_new) ||
++          !BIO_meth_set_destroy (methods_socket, socket_free))
 +      return NULL;
 +    }
 +  return methods_socket;
@@ -227,13 +227,13 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +  if (methods_stream == NULL) {
 +      methods_stream = BIO_meth_new (BIO_TYPE_BIO | BIO_get_new_index (), "stream");
 +      if (methods_stream == NULL ||
-+          BIO_meth_set_write (methods_stream, stream_write) ||
-+          BIO_meth_set_read (methods_stream, stream_read) ||
-+          BIO_meth_set_puts (methods_stream, stream_puts) ||
-+          BIO_meth_set_gets (methods_stream, 0) ||
-+          BIO_meth_set_ctrl (methods_stream, stream_ctrl) ||
-+          BIO_meth_set_create (methods_stream, stream_new) ||
-+          BIO_meth_set_destroy (methods_stream, stream_free))
++          !BIO_meth_set_write (methods_stream, stream_write) ||
++          !BIO_meth_set_read (methods_stream, stream_read) ||
++          !BIO_meth_set_puts (methods_stream, stream_puts) ||
++          !BIO_meth_set_gets (methods_stream, 0) ||
++          !BIO_meth_set_ctrl (methods_stream, stream_ctrl) ||
++          !BIO_meth_set_create (methods_stream, stream_new) ||
++          !BIO_meth_set_destroy (methods_stream, stream_free))
 +      return NULL;
 +    }
 +  return methods_stream;