[kdenetwork/f17] fix build on f17
Rex Dieter
rdieter at fedoraproject.org
Sat Dec 29 21:55:19 UTC 2012
commit 1b2841c1ce64c39de6c6be263a989a503b80746d
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Dec 29 15:55:20 2012 -0600
fix build on f17
kdenetwork-4.9.5-libjingle_openssl.patch | 12 ++++++++++++
kdenetwork.spec | 5 +++++
2 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/kdenetwork-4.9.5-libjingle_openssl.patch b/kdenetwork-4.9.5-libjingle_openssl.patch
new file mode 100644
index 0000000..946b6f4
--- /dev/null
+++ b/kdenetwork-4.9.5-libjingle_openssl.patch
@@ -0,0 +1,12 @@
+diff -up kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc.libjingle_openssl kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc
+--- kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc.libjingle_openssl 2012-11-29 18:32:55.000000000 -0600
++++ kdenetwork-4.9.5/kopete/protocols/jabber/googletalk/libjingle/talk/base/openssladapter.cc 2012-12-29 15:54:09.768759196 -0600
+@@ -648,7 +648,7 @@ OpenSSLAdapter::SSLPostConnectionCheck(S
+ int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
+
+ if (extension_nid == NID_subject_alt_name) {
+-#if OPENSSL_VERSION_NUMBER >= 0x1000000fL
++#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ const X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
+ #else
+ X509V3_EXT_METHOD* meth = X509V3_EXT_get(extension);
diff --git a/kdenetwork.spec b/kdenetwork.spec
index 7e2892c..333d099 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -26,6 +26,10 @@ Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
# Fix build failure with g++4.7
Patch3: kdenetwork-4.7.97-fix-for-g++47.patch
+
+## upstreamable patches
+Patch50: kdenetwork-4.9.5-libjingle_openssl.patch
+
## upstream patches
## security patches
@@ -223,6 +227,7 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
%patch1 -p1 -b .icon
%patch2 -p1 -b .resolv-conf-path
%patch3 -p1 -b .fix-for-g++47
+%patch50 -p1 -b .libjingle_openssl
%build
More information about the scm-commits
mailing list