rpms/libjingle/devel libjingle-0.3.12-openssl.patch, NONE, 1.1 libjingle.spec, 1.16, 1.17

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/libjingle/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2952

Modified Files:
	libjingle.spec 
Added Files:
	libjingle-0.3.12-openssl.patch 
Log Message:
* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.12-6
- rebuilt with new openssl


libjingle-0.3.12-openssl.patch:
 openssladapter.cc |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE libjingle-0.3.12-openssl.patch ---
diff -up libjingle-0.3.12/talk/base/openssladapter.cc.openssl libjingle-0.3.12/talk/base/openssladapter.cc
--- libjingle-0.3.12/talk/base/openssladapter.cc.openssl	2008-09-16 15:55:22.000000000 +0200
+++ libjingle-0.3.12/talk/base/openssladapter.cc	2009-08-25 17:26:25.000000000 +0200
@@ -641,7 +641,11 @@ OpenSSLAdapter::SSLPostConnectionCheck(S
     int extension_nid = OBJ_obj2nid(X509_EXTENSION_get_object(extension));
 
     if (extension_nid == NID_subject_alt_name) {
+#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;
 


Index: libjingle.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libjingle/devel/libjingle.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- libjingle.spec	21 Aug 2009 14:18:11 -0000	1.16
+++ libjingle.spec	25 Aug 2009 15:28:17 -0000	1.17
@@ -8,6 +8,7 @@ License:        BSD
 URL:            http://code.google.com/apis/talk/libjingle/
 Source0:        http://farsight.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 Patch0:		%{name}-%{version}-gcc44.patch
+Patch1:		libjingle-0.3.12-openssl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -36,6 +37,7 @@ developing applications that use %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .gcc
+%patch1 -p1 -b .openssl
 
 %build
 %configure --disable-static
@@ -78,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.12-6
+* Tue Aug 25 2009 Tomas Mraz <tmraz at redhat.com> - 0.3.12-6
 - rebuilt with new openssl
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.12-5