Hello community, here is the log from the commit of package libjingle for openSUSE:Factory checked in at Wed Apr 21 01:55:34 CEST 2010. -------- --- libjingle/libjingle.changes 2009-06-19 11:03:16.000000000 +0200 +++ /mounts/work_src_done/STABLE/libjingle/libjingle.changes 2010-04-20 22:24:02.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 17 08:37:17 UTC 2010 - aj@suse.de + +- Add libjingle-0.3.12-openssl.patch to fix build with openssl 1.0. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- libjingle-0.3.12-openssl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjingle.spec ++++++ --- /var/tmp/diff_new_pack.xURBh2/_old 2010-04-21 01:55:30.000000000 +0200 +++ /var/tmp/diff_new_pack.xURBh2/_new 2010-04-21 01:55:30.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package libjingle (Version 0.3.12) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,8 +22,8 @@ Url: http://sourceforge.net/projects/tapioca-voip/ BuildRequires: gcc-c++ libexpat-devel openssl-devel pkg-config Version: 0.3.12 -Release: 3 -License: GPL v2 only +Release: 4 +License: BSD3c(or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build %define debug_package_requires libjingle-0_3-0 = %{version}-%{release} Group: Productivity/Networking/Other @@ -31,6 +31,8 @@ Source: http://farsight.freedesktop.org/releases/libjingle/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM libjingle-gcc44.patch vuntz@novell.com -- Sent to upstream by mail Patch0: libjingle-gcc44.patch +# PATCH-FIX-UPSTREAM libjingle-0.3.12-openssl.patch aj@suse.de -- Fix build with openssl 1.0, Patch from fedora 12 +Patch1: libjingle-0.3.12-openssl.patch %description Libjingle is a collection of open-source C++ code and sample @@ -39,7 +41,7 @@ %package -n libjingle-0_3-0 -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Summary: Library for Peer-to-Peer Applications Group: Productivity/Networking/Other @@ -50,7 +52,7 @@ %package utils -License: BSD 3-clause (or similar) +License: BSD3c(or similar) Requires: libjingle-0_3-0 >= %{version} Summary: Library for Peer-to-Peer Applications Group: Productivity/Networking/Other @@ -62,7 +64,7 @@ %package devel -License: LGPL v2.1 or later +License: LGPLv2.1+ Requires: libjingle-0_3-0 = %{version} glibc-devel libexpat-devel libopenssl-devel zlib-devel Summary: Library for Peer-to-Peer Applications Group: Development/Libraries/C and C++ @@ -76,6 +78,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 tr -d '\r' <README >README.unix ; touch -r README README.unix ; mv README.unix README %build ++++++ 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; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org