From 1c8e6c528c1b5a1f9a96c6a647e0dbdded130ac42c34de3c5031ca08b4c21742 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Fri, 27 Sep 2013 10:44:56 +0000 Subject: [PATCH] Accepting request 200844 from home:jengelh:branches:network:telephony - Update to new upstream release 3.2.2.2 OBS-URL: https://build.opensuse.org/request/show/200844 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=27 --- libzrtpcpp-2.3.3.tar.gz | 3 --- libzrtpcpp-2.3.3.tar.gz.sig | Bin 543 -> 0 bytes libzrtpcpp-3.2.2.2.tar.xz | 3 +++ libzrtpcpp.changes | 7 ++++++ libzrtpcpp.spec | 45 +++++++++++++++++++++--------------- 5 files changed, 36 insertions(+), 22 deletions(-) delete mode 100644 libzrtpcpp-2.3.3.tar.gz delete mode 100644 libzrtpcpp-2.3.3.tar.gz.sig create mode 100644 libzrtpcpp-3.2.2.2.tar.xz diff --git a/libzrtpcpp-2.3.3.tar.gz b/libzrtpcpp-2.3.3.tar.gz deleted file mode 100644 index d5f1845..0000000 --- a/libzrtpcpp-2.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fe700603104d080692f3df8cbec14647eadaa8248ed584f26260749161e11dd -size 256971 diff --git a/libzrtpcpp-2.3.3.tar.gz.sig b/libzrtpcpp-2.3.3.tar.gz.sig deleted file mode 100644 index c124c6fb9519fffad9665eccefcd910b6bd0f809dd723edfc1fd54b2ee6c0df3..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0SEvF1p-mC5y}7x2@tV!Dx9-?hq`)w5C2Fz0x5w%bLW5kl&2il zT#A-}`#GR#G`2ls4s00%?3C92T>~kqfn7q@6{#zjPRhMXqIX%U7)L7OjbFQxLz_>V zFez5AF3P0zaXnqmP!fOflnA|Xee z5l~wNk_cNKf~k}e4+J9+(3#N8LZUgjqHOMljJ#J}Nx8>V355I)1tePNGnk=-2H@ld zRayE3lon4h6Md8G&LCMwbMN@nPr@6#Ux zw4WO*zMQhJ@+W-{geY1#dN(+aYIWl%lrys}Z$ea0`9<}VP%Xq>R?C#*^l`vzId|Rk zF(1SyF4xE&TYm07n#oDUR{G?~tsVlzSoZNV!U%(3YklDaRN9oVvZdiv h%p*09HlC%}4QsJl)-&GIWX2iHb*eyfuxd99);REt0fqno diff --git a/libzrtpcpp-3.2.2.2.tar.xz b/libzrtpcpp-3.2.2.2.tar.xz new file mode 100644 index 0000000..2209feb --- /dev/null +++ b/libzrtpcpp-3.2.2.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:813bdb432b73552c9922e0474c129c00ad36e4f2d1f66c0f53ff37b5f56193e3 +size 1272388 diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index e0e1d38..1def5d8 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jul 3 23:35:48 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 3.2.2.2 +* Re-structure ZRTP cache and add SQlite3 as optional storage backend +* Fixes CVE-2013-2221 CVE-2013-2222 CVE-2013-2223 (bnc#828028) + ------------------------------------------------------------------- Thu Jun 13 20:01:04 UTC 2013 - jengelh@inai.de diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index d16328f..f36fc96 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -17,23 +17,32 @@ Name: libzrtpcpp -%define lname libzrtpcpp2 -Version: 2.3.3 +%define lname libzrtpcpp3 +Version: 3.2.2.2 Release: 0 +# git describe: V3.2.2_2 Summary: A ccrtp extension for ZRTP support License: GPL-3.0+ -Group: Development/Libraries/Other +Group: Development/Libraries/C and C++ Url: http://www.gnutelephony.org/index.php/GNU_ZRTP #Freecode-URL: http://freecode.com/projects/libzrtpcpp -Source: ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz -Source2: ftp://ftp.gnu.org/pub/gnu/ccrtp/%name-%version.tar.gz.sig -Source3: %name.keyring -BuildRequires: ccrtp-devel >= 2.0.0 +#Git-Clone: git://github.com/wernerd/ZRTPCPP +# No longer produces release tarballs since 3.x. +Source: %name-%version.tar.xz BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: libopenssl-devel >= 0.9.8 BuildRequires: pkgconfig +BuildRequires: xz +%if 0%{?suse_version} >= 1130 +BuildRequires: pkgconfig(libccrtp) >= 2 +BuildRequires: pkgconfig(libcrypto) >= 0.9.8 +BuildRequires: pkgconfig(sqlite3) >= 3.7 +%else +BuildRequires: ccrtp-devel >= 2 +BuildRequires: libopenssl-devel >= 0.9.8 +BuildRequires: sqlite3-devel >= 3.7 +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -44,7 +53,7 @@ applications. %package -n %lname Summary: A ccrtp extension for ZRTP support -Group: Development/Libraries/Other +Group: System/Libraries %description -n %lname This library is a GPL licensed extension to the GNU RTP Stack, ccrtp, @@ -54,7 +63,7 @@ applications. %package devel Summary: Headers and link library for libzrtpcpp -Group: Development/Libraries/Other +Group: Development/Libraries/C and C++ Requires: %{lname} = %{version} Requires: ccrtp-devel >= 2.0.0 @@ -63,25 +72,23 @@ This package provides the header files, link libraries, and documentation for building applications that use libzrtpcpp. %prep -%{?gpg_verify: %gpg_verify %{S:2}} -%setup -q +%setup -qn ZRTPCPP %build mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DSYSCONFDIR=%{_sysconfdir} \ - -DMANDIR=%{_mandir} \ - -DCMAKE_VERBOSE_MAKEFILE=TRUE \ - -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_C_FLAGS:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS:STRING="%{optflags}" \ + -DCRYPTO_STANDALONE:BOOL=false \ %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif .. -make %{?_smp_mflags} V=1 +#perl -i -pe 's{@zrtplib@}{-lzrtpcpp}g' *.pc.cmake +make %{?_smp_mflags} VERBOSE=1 %install cd build @@ -93,7 +100,7 @@ make install DESTDIR="%buildroot" %files -n %lname %defattr(-,root,root,0755) %doc AUTHORS COPYING README.md -%{_libdir}/libzrtpcpp.so.2* +%{_libdir}/libzrtpcpp.so.3* %files devel %defattr(-,root,root,0755)