[gentoo-commits] gentoo-x86 commit in kde-base/kopete/files: kopete-4.4.5-openssl-1.patch

[gentoo-commits] gentoo-x86 commit in kde-base/kopete/files: kopete-4.4.5-openssl-1.patch

[Jorge Manuel B. S. Vicetto (jmbsvicetto)]

jmbsvicetto    10/07/15 02:46:54

  Added:                kopete-4.4.5-openssl-1.patch
  Log:
  Bumped kopete-4.4.4-r2 and kopete-4.4.5 to add fix for building wlm protocol support. Thanks to Alin Nastac <mrness@gentoo.org> - fixes bug 328229.
  Added patch to allow kopete-4.4.5 to build against openssl-1 based on Samuli Suominen's patch for libmsn-4.1.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/kopete/files/kopete-4.4.5-openssl-1.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/files/kopete-4.4.5-openssl-1.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kopete/files/kopete-4.4.5-openssl-1.patch?rev=1.1&content-type=text/plain

Index: kopete-4.4.5-openssl-1.patch
===================================================================
diff -urN kopete-4.4.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc kopete-4.4.5-new/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc
--- kopete-4.4.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc	2009-11-30 23:34:11.000000000 -0100
+++ kopete-4.4.5-new/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc	2010-07-15 02:12:06.000000000 +0000
@@ -648,7 +648,13 @@
     int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
 
     if (extension_nid == NID_subject_alt_name) {
-      X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
+
+      #if OPENSSL_VERSION_NUMBER >= 0x10000000L
+        const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
+      #else
+        X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
+      #endif
+
       if (!meth)
         break;