From 5bd41aaad38257f94fc898206f5afa6e72253b08a430e4d5db4ab803ddc1e4a1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 28 Jun 2014 01:43:08 +0000 Subject: [PATCH 1/2] libzrtpcpp-4.2.3 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=31 --- libzrtpcpp-4.1.0.tar.xz | 3 --- libzrtpcpp-4.2.3.tar.lz | 3 +++ libzrtpcpp.changes | 9 +++++++++ libzrtpcpp.spec | 11 +++++------ 4 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 libzrtpcpp-4.1.0.tar.xz create mode 100644 libzrtpcpp-4.2.3.tar.lz diff --git a/libzrtpcpp-4.1.0.tar.xz b/libzrtpcpp-4.1.0.tar.xz deleted file mode 100644 index 7702a28..0000000 --- a/libzrtpcpp-4.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0ab8eaac6a5a53948144eb48bd41167cb6c2d3885a60b8c325a3d98177d6171a -size 1277856 diff --git a/libzrtpcpp-4.2.3.tar.lz b/libzrtpcpp-4.2.3.tar.lz new file mode 100644 index 0000000..5851dcc --- /dev/null +++ b/libzrtpcpp-4.2.3.tar.lz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:59d5a7d58763e2fdd0e2360c4ec12df3ac1f8f6c7f9b0993c6ec07c6c16c1f38 +size 1291010 diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index a310df2..3306101 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Jun 28 01:41:37 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 4.2.3 +* Enhance SRTP handling to provide a longer bit-shift register +* Add functions to read ZID cache entries, raw data, formatted + as string +* Order full ZID list by secure-since date + ------------------------------------------------------------------- Sun Nov 24 13:16:43 UTC 2013 - jengelh@inai.de diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index b5f8a02..e79e945 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -1,7 +1,7 @@ # # spec file for package libzrtpcpp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -18,22 +18,21 @@ Name: libzrtpcpp %define lname libzrtpcpp4 -Version: 4.1.0 +Version: 4.2.3 Release: 0 Summary: A ccrtp extension for ZRTP support License: GPL-3.0+ Group: Development/Libraries/C and C++ Url: http://www.gnutelephony.org/index.php/GNU_ZRTP -#Freecode-URL: http://freecode.com/projects/libzrtpcpp #Git-Clone: git://github.com/wernerd/ZRTPCPP -#Snapshot: V4.1.0 +#Snapshot: V4.2.3 # No longer produces release tarballs since 3.x. -Source: %name-%version.tar.xz +Source: %name-%version.tar.lz BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: lzip BuildRequires: pkgconfig -BuildRequires: xz %if 0%{?suse_version} >= 1130 BuildRequires: pkgconfig(libccrtp) >= 2 BuildRequires: pkgconfig(libcrypto) >= 0.9.8 From c45ae5de31aa5c83aa59f7609d134d4a5563bde2a6cc9f7bc5e6490e2d163ac8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 6 Sep 2014 18:37:31 +0000 Subject: [PATCH 2/2] libzrtpcpp-4.2.4 OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=32 --- libzrtpcpp-4.2.3.tar.lz | 3 --- libzrtpcpp-4.2.4.tar.xz | 3 +++ libzrtpcpp.changes | 7 +++++++ libzrtpcpp.spec | 22 +++++++++++----------- 4 files changed, 21 insertions(+), 14 deletions(-) delete mode 100644 libzrtpcpp-4.2.3.tar.lz create mode 100644 libzrtpcpp-4.2.4.tar.xz diff --git a/libzrtpcpp-4.2.3.tar.lz b/libzrtpcpp-4.2.3.tar.lz deleted file mode 100644 index 5851dcc..0000000 --- a/libzrtpcpp-4.2.3.tar.lz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59d5a7d58763e2fdd0e2360c4ec12df3ac1f8f6c7f9b0993c6ec07c6c16c1f38 -size 1291010 diff --git a/libzrtpcpp-4.2.4.tar.xz b/libzrtpcpp-4.2.4.tar.xz new file mode 100644 index 0000000..28ec15c --- /dev/null +++ b/libzrtpcpp-4.2.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21d382964f3070a148a3ec5f556295854525f7b34e70028d3512897a47b5b146 +size 1279984 diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index 3306101..5be9a6b 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 6 18:30:47 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 4.2.4 +* Rename functions aes_init() to aes_init_zrtp() to avoid names + clashes with other libreries that may include own AES modules. + ------------------------------------------------------------------- Sat Jun 28 01:41:37 UTC 2014 - jengelh@inai.de diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index e79e945..72c90b9 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -18,7 +18,7 @@ Name: libzrtpcpp %define lname libzrtpcpp4 -Version: 4.2.3 +Version: 4.2.4 Release: 0 Summary: A ccrtp extension for ZRTP support License: GPL-3.0+ @@ -26,22 +26,17 @@ Group: Development/Libraries/C and C++ Url: http://www.gnutelephony.org/index.php/GNU_ZRTP #Git-Clone: git://github.com/wernerd/ZRTPCPP -#Snapshot: V4.2.3 +#Snapshot: V4.2.4 # No longer produces release tarballs since 3.x. -Source: %name-%version.tar.lz +Source: %name-%version.tar.xz +Source2: %name.keyring BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: lzip BuildRequires: pkgconfig -%if 0%{?suse_version} >= 1130 +BuildRequires: xz 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 @@ -77,16 +72,21 @@ documentation for building applications that use libzrtpcpp. mkdir build cd build +# libzrtpcpp changed its API (apparently - can't tell whether aes_init +# was meant to be exported or not), but failed to bump the SO version. +# So now, add explicit symbol versions to ensure programs with wrong +# ABI combinations are caught. +echo "V_%version { global: *; };" >version.map cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DCMAKE_C_FLAGS:STRING="%{optflags}" \ -DCMAKE_CXX_FLAGS:STRING="%{optflags}" \ + -DCMAKE_LD_FLAGS:STRING="-Wl,--version-script=$PWD/version.map" \ -DCRYPTO_STANDALONE:BOOL=false \ %if "%{_lib}" == "lib64" -DLIB_SUFFIX=64 \ %endif .. -#perl -i -pe 's{@zrtplib@}{-lzrtpcpp}g' *.pc.cmake make %{?_smp_mflags} VERBOSE=1 %install