[libzrtpcpp/el6] new usptream version
wolfy
wolfy at fedoraproject.org
Mon Aug 5 12:47:58 UTC 2013
commit 6451888370c464c722481d061ec41805f21f049f
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date: Mon Aug 5 15:47:44 2013 +0300
new usptream version
.gitignore | 1 +
CMakeLists.txt | 245 ++++++++++++++++++++++++++++++++++++++
demo.CmakeLists.txt | 31 +++++
libzrtpcpp-2.0.0-remove-ec.patch | 236 ------------------------------------
libzrtpcpp-3.2.1-remove-ec.patch | 162 +++++++++++++++++++++++++
libzrtpcpp.spec | 45 +++++---
sources | 2 +-
7 files changed, 469 insertions(+), 253 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8b9b7c..273134c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
libzrtpcpp-1.4.3.tar.gz
+/ZRTPCPP-3.2.1.tar.gz
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100755
index 0000000..e78ff1d
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,245 @@
+# Copyright (C) 2009 Werner Dittman
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+cmake_minimum_required(VERSION 2.6)
+
+PROJECT(libzrtpcpp)
+
+SET(CPACK_PACKAGE_VERSION_MAJOR 3)
+SET(CPACK_PACKAGE_VERSION_MINOR 2)
+SET(CPACK_PACKAGE_VERSION_PATCH 1)
+
+set (VERSION 3.2.1)
+set (SOVERSION 3)
+
+# Define supported command line parameters.
+#
+# Example to build the tivi client: cmake -DTIVI=true ..
+# Without any options cmake generates libzrtpcpp for use with GNU ccRTP
+#
+option(CCRTP "Build library to use with GNU ccRTP." ON)
+option(CRYPTO_STANDALONE "Use embedded crypto and big number modules." OFF)
+option(TIVI "Build library for the tivi client, implies '-DCRYPTO_STNDALONE=true'." OFF)
+option(SQLITE "Use SQLite DB as backend for ZRTP cache." OFF)
+
+option(ANDROID "Generate Android makefiles (Android.mk)" OFF)
+option(JAVA "Generate Java support files (requires JDK and SWIG)" OFF)
+
+
+# **** Check what and how to build ****
+#
+if (CCRTP AND TIVI)
+ MESSAGE(FATAL_ERROR "Cannot build more than one client at once. Use different build directories.")
+endif()
+
+if (CCRTP)
+ set (PACKAGE libzrtpcpp)
+ set(zrtplibName zrtpcpp)
+elseif (TIVI)
+ set (PACKAGE libzrtptivi)
+ set(zrtplibName zrtptivi)
+ set(CRYPTO_STANDALONE true)
+ set(SQLITE true)
+else()
+ MESSAGE(WARNING "No client defined, building for GNU ccRTP.")
+ set (PACKAGE libzrtpcpp)
+ set(CCRTP true)
+ set(zrtplibName zrtpcpp)
+endif()
+
+
+if(MSVC60)
+ set(BUILD_STATIC ON CACHE BOOL "static linking only" FORCE)
+ MARK_AS_ADVANCED(BUILD_STATIC)
+else()
+ option(BUILD_STATIC "Set to OFF to build shared libraries" OFF)
+endif()
+
+# set to true for debug and trace during CMakeLists development
+# set(CMAKE_VERBOSE_MAKEFILE TRUE)
+
+MESSAGE( STATUS "Configuring GNU ${PROJECT_NAME} ${VERSION} for ${PACKAGE}...")
+
+# include most of the fine stuff we need
+include(FindPkgConfig)
+include(CheckLibraryExists)
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+
+if (NOT LIB_SUFFIX)
+ set(LIBDIRNAME "lib")
+ # this caused problems in debian where it has to always be lib....
+ if (NOT EXISTS /etc/debian_version)
+ if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" )
+ set(LIBDIRNAME "lib64")
+ endif()
+ endif()
+else()
+ set(LIBDIRNAME "lib${LIB_SUFFIX}")
+endif()
+
+check_include_files(stdlib.h HAVE_STDLIB_H)
+check_include_files(string.h HAVE_STRING_H)
+
+if (NOT CRYPTO_STANDALONE)
+ pkg_check_modules(OPENSSL libcrypto>=0.9.8)
+ if (OPENSSL_FOUND)
+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${OPENSSL_INCLUDE_DIRS}) #update include files search directory
+ check_include_files(openssl/bn.h HAVE_OPENSSL_BN_H)
+ check_include_files(openssl/aes.h HAVE_OPENSSL_AES_H)
+ check_include_files(openssl/sha.h HAVE_OPENSSL_SHA_H)
+ check_library_exists(crypto EVP_CipherInit_ex "${OPENSSL_LIBDIR}" HAVE_SSL_CRYPT) #use search lib directory from pkg-config
+ set(LIBS ${LIBS} -lcrypto)
+ set(CRYPTOBACKEND "libcrypto >= 0.9.8")
+ set(BUILD_REQ "libopenssl-devel >= 0.9.8")
+ set(PACKAGE_REQ "libopenssl >= 0.9.8")
+ include_directories(${OPENSSL_INCLUDE_DIRS}) #update includes directory from pkg-config
+ else()
+ message(FATAL_ERROR "No crypto library found")
+ endif()
+else()
+ # For crypto standalone mode we need to configure the bnlib. In a first step
+ # without the tests and demos.
+ check_include_files(stdint.h HAVE_STDINT_H)
+ check_include_files(stdint.h HAVE_ASSERT_H)
+ check_include_files(limits.h HAVE_LIMITS_H)
+
+ check_function_exists(memmove HAVE_MEMMOVE)
+ check_function_exists(memcpy HAVE_MEMCPY)
+
+ # TODO: check if we compile the tests for bnlib
+ #
+ # check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
+ # check_function_exists(getrusage HAVE_GETRUSAGE)
+ # check_function_exists(clock HAVE_CLOCK)
+ # check_function_exists(time HAVE_TIME)
+
+ # Check if Solaris-style gethrvtime() is available
+ # check_function_exists(gethrvtime HAVE_GETHRVTIME)
+ #
+ # until here
+
+ # necessary and required modules checked, ready to generate config.h
+ configure_file(${CMAKE_SOURCE_DIR}/bnlib/bnconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/bnconfig.h)
+endif()
+
+if (SQLITE)
+ pkg_check_modules(SQLITE3 sqlite3>=3.7)
+ if (SQLITE3_FOUND)
+ check_include_files(sqlite3.h HAVE_SQLITE_H)
+ set(LIBS ${LIBS} -lsqlite3)
+ else()
+ message(FATAL_ERROR "SQLite3 library not found")
+ endif()
+endif()
+
+# necessary and required modules checked, ready to generate config.h in top-level build directory
+configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+
+#add_definitions(-g -O2 -fno-strict-aliasing)
+#if(CMAKE_COMPILER_IS_GNUCXX)
+# add_definitions(-Wno-long-long -Wno-char-subscripts)
+# add_definitions(-Wall -ansi -pedantic)
+# add_definitions(-Wall -pedantic)
+# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pedantic -std=c99")
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic -std=c++11")
+# add_definitions(-DNEW_STDCPP)
+#endif()
+
+include_directories(BEFORE ${CMAKE_BINARY_DIR})
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/zrtp)
+if(CRYPTO_STANDALONE)
+ include_directories (${CMAKE_SOURCE_DIR}/bnlib)
+endif()
+
+if (NOT CCRTP)
+ set (sdes_src ${CMAKE_SOURCE_DIR}/zrtp/ZrtpSdesStream.cpp)
+endif()
+
+# **** The following source files a common for all clients ****
+#
+set(zrtp_src_no_cache
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpCallbackWrapper.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZRtp.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpCrc32.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketCommit.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketConf2Ack.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketConfirm.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketDHPart.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketGoClear.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketClearAck.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketHelloAck.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketHello.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketError.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketErrorAck.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketPingAck.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketPing.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketSASrelay.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpPacketRelayAck.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpStateClass.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpTextData.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpConfigure.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZrtpCWrapper.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/Base32.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/zrtpB64Encode.c
+ ${CMAKE_SOURCE_DIR}/zrtp/zrtpB64Decode.c
+ ${CMAKE_SOURCE_DIR}/common/osSpecifics.c ${sdes_src})
+
+set(bnlib_src
+ ${CMAKE_SOURCE_DIR}/bnlib/bn00.c
+ ${CMAKE_SOURCE_DIR}/bnlib/lbn00.c
+ ${CMAKE_SOURCE_DIR}/bnlib/bn.c
+ ${CMAKE_SOURCE_DIR}/bnlib/lbnmem.c
+ ${CMAKE_SOURCE_DIR}/bnlib/sieve.c
+ ${CMAKE_SOURCE_DIR}/bnlib/prime.c
+ ${CMAKE_SOURCE_DIR}/bnlib/bnprint.c
+ ${CMAKE_SOURCE_DIR}/bnlib/jacobi.c
+ ${CMAKE_SOURCE_DIR}/bnlib/germain.c
+ ${CMAKE_SOURCE_DIR}/bnlib/ec/ec.c
+ ${CMAKE_SOURCE_DIR}/bnlib/ec/ecdh.c)
+
+set(zrtp_crypto_src
+ ${CMAKE_SOURCE_DIR}/zrtp/crypto/zrtpDH.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/crypto/hmac256.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/crypto/sha256.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/crypto/hmac384.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/crypto/sha384.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/crypto/aesCFB.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/crypto/twoCFB.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/crypto/sha2.c)
+
+if (NOT SQLITE)
+ set(zrtp_src ${zrtp_src_no_cache}
+ ${CMAKE_SOURCE_DIR}/zrtp/ZIDCacheFile.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZIDRecordFile.cpp)
+else()
+ set(zrtp_src ${zrtp_src_no_cache}
+ ${CMAKE_SOURCE_DIR}/zrtp/ZIDCacheDb.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/ZIDRecordDb.cpp
+ ${CMAKE_SOURCE_DIR}/zrtp/zrtpCacheSqliteBackend.c)
+
+endif()
+
+if (CCRTP)
+ add_subdirectory(clients/ccrtp)
+endif()
+
+add_subdirectory(demo)
+
+if (TIVI)
+ add_subdirectory(clients/tivi)
+endif()
+
+##very usefull for macosx, specially when using gtkosx bundler
+if(APPLE)
+ if (NOT CMAKE_INSTALL_NAME_DIR)
+ set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "CMAKE_INSTALL_NAME_DIR set for macosx" )
+ endif (NOT CMAKE_INSTALL_NAME_DIR)
+endif(APPLE)
diff --git a/demo.CmakeLists.txt b/demo.CmakeLists.txt
new file mode 100755
index 0000000..56f81a2
--- /dev/null
+++ b/demo.CmakeLists.txt
@@ -0,0 +1,31 @@
+
+#to make sure includes are first taken - it contains config.h
+include_directories(BEFORE ${CMAKE_BINARY_DIR})
+include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/zrtp
+ ${CMAKE_SOURCE_DIR}/clients/ccrtp)
+
+if (CCRTP)
+ ########### next target ###############
+
+# add_executable(zrtptest zrtptest.cpp)
+# target_link_libraries(zrtptest ${zrtplibName})
+# add_dependencies(zrtptest ${zrtplibName})
+
+ ########### next target ###############
+
+ add_executable(zrtptestMulti zrtptestMulti.cpp)
+ target_link_libraries(zrtptestMulti ${zrtplibName})
+ add_dependencies(zrtptestMulti ${zrtplibName})
+else()
+ add_executable(sdestest sdestest.cpp)
+ target_link_libraries(sdestest ${zrtplibName})
+ add_dependencies(sdestest ${zrtplibName})
+endif()
+########### next target ###############
+
+#add_executable(wrappertest wrappertest.c)
+#target_link_libraries(wrappertest zrtpcpp)
+
+########### install files ###############
+# None
diff --git a/libzrtpcpp-3.2.1-remove-ec.patch b/libzrtpcpp-3.2.1-remove-ec.patch
new file mode 100644
index 0000000..fadc618
--- /dev/null
+++ b/libzrtpcpp-3.2.1-remove-ec.patch
@@ -0,0 +1,162 @@
+--- ZRTPCPP-3.2.1/zrtp/crypto/openssl/zrtpDH.cpp.orig 2013-08-05 13:32:37.957262149 +0300
++++ ZRTPCPP-3.2.1/zrtp/crypto/openssl/zrtpDH.cpp 2013-08-05 13:37:35.085357045 +0300
+@@ -43,8 +43,8 @@
+ #include <openssl/err.h>
+ #include <openssl/dh.h>
+ #include <openssl/evp.h>
+-#include <openssl/ec.h>
+-#include <openssl/ecdh.h>
++//#include <openssl/ec.h>
++//#include <openssl/ecdh.h>
+
+ #include <zrtp/crypto/zrtpDH.h>
+ #include <zrtp/libzrtpcpp/ZrtpTextData.h>
+@@ -189,12 +189,14 @@ ZrtpDH::ZrtpDH(const char* type) {
+ else if (*(int32_t*)type == *(int32_t*)dh3k) {
+ pkType = DH3K;
+ }
++/*
+ else if (*(int32_t*)type == *(int32_t*)ec25) {
+- pkType = EC25;
++ pkType = EC25;
+ }
+ else if (*(int32_t*)type == *(int32_t*)ec38) {
+ pkType = EC38;
+ }
++*/
+ else {
+ return;
+ }
+@@ -237,13 +239,14 @@ ZrtpDH::ZrtpDH(const char* type) {
+ tmpCtx->priv_key = BN_bin2bn(random, 32, NULL);
+ }
+ break;
+-
++/*
+ case EC25:
+ ctx = static_cast<void*>(EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
+ break;
+ case EC38:
+ ctx = static_cast<void*>(EC_KEY_new_by_curve_name(NID_secp384r1));
+ break;
++*/
+ }
+ }
+
+@@ -256,11 +259,12 @@ ZrtpDH::~ZrtpDH() {
+ case DH3K:
+ DH_free(static_cast<DH*>(ctx));
+ break;
+-
++/*
+ case EC25:
+ case EC38:
+ EC_KEY_free(static_cast<EC_KEY*>(ctx));
+ break;
++*/
+ }
+ }
+
+@@ -275,6 +279,7 @@ int32_t ZrtpDH::computeSecretKey(uint8_t
+ tmpCtx->pub_key = BN_bin2bn(pubKeyBytes, getDhSize(), NULL);
+ return DH_compute_key(secret, tmpCtx->pub_key, tmpCtx);
+ }
++/*
+ if (pkType == EC25 || pkType == EC38) {
+ uint8_t buffer[100];
+ int32_t ret;
+@@ -290,6 +295,7 @@ int32_t ZrtpDH::computeSecretKey(uint8_t
+ EC_POINT_free(point);
+ return ret;
+ }
++*/
+ return -1;
+ }
+
+@@ -297,9 +303,10 @@ int32_t ZrtpDH::generatePublicKey()
+ {
+ if (pkType == DH2K || pkType == DH3K)
+ return DH_generate_key(static_cast<DH*>(ctx));
+-
++/*
+ if (pkType == EC25 || pkType == EC38)
+ return EC_KEY_generate_key(static_cast<EC_KEY*>(ctx));
++*/
+ return 0;
+ }
+
+@@ -307,12 +314,12 @@ int32_t ZrtpDH::getDhSize() const
+ {
+ if (pkType == DH2K || pkType == DH3K)
+ return DH_size(static_cast<DH*>(ctx));
+-
++/*
+ if (pkType == EC25)
+ return 32;
+ if (pkType == EC38)
+ return 48;
+-
++*/
+ return 0;
+ }
+
+@@ -320,11 +327,12 @@ int32_t ZrtpDH::getPubKeySize() const
+ {
+ if (pkType == DH2K || pkType == DH3K)
+ return BN_num_bytes(static_cast<DH*>(ctx)->pub_key);
+-
++/*
+ if (pkType == EC25 || pkType == EC38)
+ return EC_POINT_point2oct(EC_KEY_get0_group(static_cast<EC_KEY*>(ctx)),
+ EC_KEY_get0_public_key(static_cast<EC_KEY*>(ctx)),
+ POINT_CONVERSION_UNCOMPRESSED, NULL, 0, NULL) - 1;
++*/
+ return 0;
+
+ }
+@@ -340,6 +348,7 @@ int32_t ZrtpDH::getPubKeyBytes(uint8_t *
+ }
+ return BN_bn2bin(static_cast<DH*>(ctx)->pub_key, buf + prepend);
+ }
++/*
+ if (pkType == EC25 || pkType == EC38) {
+ uint8_t buffer[100];
+
+@@ -349,11 +358,14 @@ int32_t ZrtpDH::getPubKeyBytes(uint8_t *
+ memcpy(buf, buffer+1, len-1);
+ return len-1;
+ }
++*/
++
+ return 0;
+ }
+
+ int32_t ZrtpDH::checkPubKey(uint8_t *pubKeyBytes) const
+ {
++/*
+ if (pkType == EC25 || pkType == EC38) {
+ uint8_t buffer[100];
+ int32_t ret;
+@@ -375,6 +387,7 @@ int32_t ZrtpDH::checkPubKey(uint8_t *pub
+
+ return ret;
+ }
++*/
+
+ BIGNUM* pubKeyOther = BN_bin2bn(pubKeyBytes, getDhSize(), NULL);
+
+@@ -407,12 +420,14 @@ const char* ZrtpDH::getDHtype()
+ case DH3K:
+ return dh3k;
+ break;
++/*
+ case EC25:
+ return ec25;
+ break;
+ case EC38:
+ return ec38;
+ break;
++*/
+ }
+ return NULL;
+ }
diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec
index f5257fd..503784e 100644
--- a/libzrtpcpp.spec
+++ b/libzrtpcpp.spec
@@ -1,19 +1,32 @@
Name: libzrtpcpp
-Version: 2.3.4
+Version: 3.2.1
Release: 1%{?dist}
Summary: ZRTP support library for the GNU ccRTP stack
Group: System Environment/Libraries
License: GPLv3+
URL: https://github.com/wernerd/ZRTPCPP
-Source0: http://ftp.gnu.org/pub/gnu/ccrtp/%{name}-%{version}.tar.gz
+Source0: https://github.com/wernerd/ZRTPCPP/archive/ZRTPCPP-%{version}.tar.gz
# remove ec ecryption, our ssl doesn't ship with it.
-Patch0: libzrtpcpp-2.0.0-remove-ec.patch
+Patch0: libzrtpcpp-3.2.1-remove-ec.patch
+#too many things to modify in the default CMakeLists.txt to use sed
+Source1: CMakeLists.txt
+#per instructions of the author, disable building of zrtptest, it uses a syntax
+#not understood by our gcc. included below is a fragment of our correspondance
+#
+# Regarding the compiler problem: for the time being you can savely skip
+# 'zrtptest', the other program that seems to sompile is 'zrtptestMulti' which
+# is more elaborate. Can you give me some hint how to define a #ifdef that I
+# can use to modify the 'zrtptest' source to exclude some code in for the older
+# GCC? I think I can change the code but it takes some time (testing). Thus to
+#go forward, just disable building of the 'zrtptest' if possible.
+#
+Source2: demo.CmakeLists.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ccrtp-devel
-BuildRequires: libgcrypt-devel
-BuildRequires: doxygen
+BuildRequires: ccrtp-devel
+BuildRequires: libgcrypt-devel
+BuildRequires: doxygen
BuildRequires: cmake
BuildRequires: openssl-devel
@@ -29,7 +42,7 @@ applications.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
+Requires: pkgconfig
%description devel
The %{name}-devel package contains libraries and header files for
@@ -37,11 +50,11 @@ developing applications that use %{name}.
%prep
-%setup -q
+%setup -q -n ZRTPCPP-%{version}
+cp -f %{SOURCE1} .
+cp -f %{SOURCE2} demo/CMakeLists.txt
-sed -i '/CMAKE_VERBOSE_MAKEFILE/d' CMakeLists.txt
-
-%patch0 -p1
+%patch0 -p1 -b .ec
%build
@@ -68,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc README.md AUTHORS COPYING NEWS
-%{_libdir}/libzrtpcpp.so.2*
+%{_libdir}/libzrtpcpp.so.3*
%files devel
%defattr(-,root,root,-)
@@ -78,10 +91,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Mon Jul 29 2013 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 2.3.4-1
-- sync with rawhide
- - Update to 2.3.4
- - Fixes CVE-2013-2221 CVE-2013-2222 CVE-2013-2223
+* Mon Aug 05 2013 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 3.2.1-1
+- new upstream version
+ - Fixes CVE-2013-2221 CVE-2013-2222 CVE-2013-2223 and consequently
+ https://bugzilla.redhat.com/show_bug.cgi?id=980905
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 9dfad3a..d48f1e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3aac59472c5649736e24de30080e2efd libzrtpcpp-2.3.4.tar.gz
+e0a7976c86979688bbf6a9b4b5bf4f3e ZRTPCPP-3.2.1.tar.gz
More information about the scm-commits
mailing list