[arch-commits] Commit in kopete/trunk (PKGBUILD kopete-openssl-1.1.patch)

[Antonio Rojas]

    Date: Saturday, June 16, 2018 @ 18:26:15
  Author: arojas
Revision: 327074

Attempt to fix segfaults in libjingle (FS#59031)

Modified:
  kopete/trunk/PKGBUILD
  kopete/trunk/kopete-openssl-1.1.patch

--------------------------+
 PKGBUILD                 |    4 ++--
 kopete-openssl-1.1.patch |    9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-16 18:24:24 UTC (rev 327073)
+++ PKGBUILD	2018-06-16 18:26:15 UTC (rev 327074)
@@ -5,7 +5,7 @@
 
 pkgname=kopete
 pkgver=18.04.2
-pkgrel=1
+pkgrel=2
 pkgdesc='Instant Messenger'
 url='https://kde.org/applications/internet/kopete/'
 arch=(x86_64)
@@ -22,7 +22,7 @@
             'SKIP'
             'c34a268aaa058e563174581dbe37c15fed91e82326ec704d2a872463139865e0'
             'ceed663f7007654d186d918cf7a0742972ed5bd319879021e9ba80e395177700'
-            'e3271a11814dce26666d05b02d04e57a9fc6d66aa69e6d869c0aa2e9bb6d9782'
+            'a12ea422e5162ef11274a98fd53658d6e780cafbe2e0fac70c8bc7d3291fef8b'
             'a7ebdd8dd4336b7ec085ef254bf18040f473b73379a8cd84569b28441a6c71df')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>

Modified: kopete-openssl-1.1.patch
===================================================================
--- kopete-openssl-1.1.patch	2018-06-16 18:24:24 UTC (rev 327073)
+++ kopete-openssl-1.1.patch	2018-06-16 18:26:15 UTC (rev 327074)
@@ -9,7 +9,7 @@
  static BIO_METHOD methods_socket = {
    BIO_TYPE_BIO,
    "socket",
-@@ -98,16 +99,36 @@
+@@ -98,16 +99,40 @@
  };
  
  BIO_METHOD* BIO_s_socket2() { return(&methods_socket); }
@@ -34,7 +34,12 @@
 +#endif
  
  BIO* BIO_new_socket(talk_base::AsyncSocket* socket) {
-   BIO* ret = BIO_new(BIO_s_socket2());
++  const BIO_METHOD *socket2 = BIO_s_socket2();
++  if (socket2 == NULL) {
++          return NULL;
++  }
+-  BIO* ret = BIO_new(BIO_s_socket2());
++  BIO* ret = BIO_new(socket2);
    if (ret == NULL) {
            return NULL;
    }