diff --git a/libzrtpcpp-1.0.1-compiler_warnings.patch b/libzrtpcpp-1.0.1-compiler_warnings.patch deleted file mode 100644 index 192b927..0000000 --- a/libzrtpcpp-1.0.1-compiler_warnings.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/ZrtpStateClass.cxx -=================================================================== ---- src/ZrtpStateClass.cxx.orig -+++ src/ZrtpStateClass.cxx -@@ -1032,7 +1032,7 @@ void ZrtpStateClass::evWaitConfAck(void) - DEBUGOUT((cout << "Checking for match in WaitConfAck.\n")); - - char *msg, first, last; -- uint8_t *pkt; -+ uint8_t *pkt = NULL; - - if (event->type == ZrtpPacket) { - pkt = event->data.packet; diff --git a/libzrtpcpp-1.3.0-missing_returns.patch b/libzrtpcpp-1.3.0-missing_returns.patch deleted file mode 100644 index 8d07c04..0000000 --- a/libzrtpcpp-1.3.0-missing_returns.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- src/ZrtpQueue.cpp -+++ src/ZrtpQueue.cpp -@@ -585,6 +585,7 @@ - if (zrtpUserCallback != NULL) { - return zrtpUserCallback->checkSASSignature(sas); - } -+ return false; - } - - void ZrtpQueue::setEnableZrtp(bool onOff) { -@@ -649,6 +650,7 @@ - bool ZrtpQueue::isMultiStream() { - if (zrtpEngine != NULL) - return zrtpEngine->isMultiStream(); -+ return false; - } - - void ZrtpQueue::acceptEnrollment(bool accepted) { -@@ -659,16 +661,19 @@ - bool ZrtpQueue::setSignatureData(uint8* data, int32 length) { - if (zrtpEngine != NULL) - return zrtpEngine->setSignatureData(data, length); -+ return false; - } - - int32 ZrtpQueue::getSignatureData(uint8* data) { - if (zrtpEngine != NULL) - return zrtpEngine->getSignatureData(data); -+ return 0; - } - - int32 ZrtpQueue::getSignatureLength() { - if (zrtpEngine != NULL) - return zrtpEngine->getSignatureLength(); -+ return 0; - } - - void ZrtpQueue::setPBXEnrollment(bool yesNo) { ---- src/ZrtpStateClass.cxx -+++ src/ZrtpStateClass.cxx -@@ -421,7 +421,8 @@ - */ - else if (event->type == Timer) { - if (!parent->sendPacketZRTP(sentPacket)) { -- return sendFailed(); // returns to state Initial -+ sendFailed(); // returns to state Initial -+ return; - } - if (nextTimer(&T1) <= 0) { - parent->zrtpNotSuppOther(); ---- src/libzrtpcpp/ZrtpStates.h -+++ src/libzrtpcpp/ZrtpStates.h -@@ -58,6 +58,7 @@ - int32_t processEvent(ZrtpStateClass& zsc) { - // fprintf(stdout, "ZrtpStates::processEvent, state: %d\n", state); - (zsc.*states[state].handler)(); -+ return state; - } - - bool inState(const int32_t s) { return ((s == state)); } diff --git a/libzrtpcpp-1.3.0.tar.bz2 b/libzrtpcpp-1.3.0.tar.bz2 deleted file mode 100644 index 161c558..0000000 --- a/libzrtpcpp-1.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3f53e0d56e35496cfdf8e4718f82ac44afb69fa0fbfe85f68995ba67bfbc6f6f -size 339263 diff --git a/libzrtpcpp-1.6.0.tar.bz2 b/libzrtpcpp-1.6.0.tar.bz2 new file mode 100644 index 0000000..7e83028 --- /dev/null +++ b/libzrtpcpp-1.6.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f23bede7665a5b99aa979b0b784c2218789417cb3a42bbc77b487d77a0c044c2 +size 328876 diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes index 6153c95..dfd4068 100644 --- a/libzrtpcpp.changes +++ b/libzrtpcpp.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Jan 8 09:10:00 MEZ 2011 - Werner.Dittmann@t-online.de + +- Update to latest version of GNU ZRTP C++ + * Cumulative update that implements all fixes and + versions since 1.3.0 (see below) + * Protocol implementation compliant with latest ZRTP + specification. + * lots of documentation added (doxygen ready) + * some code cleanup + ------------------------------------------------------------------- Thu Dec 9 15:36:27 UTC 2010 - rguenther@novell.com diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec index 8e01ec8..e5ee72e 100644 --- a/libzrtpcpp.spec +++ b/libzrtpcpp.spec @@ -1,7 +1,7 @@ # -# spec file for package libzrtpcpp (Version 1.3.0) +# spec file for package libzrtpcpp (Version 1.6.0) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 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 @@ -15,20 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: libzrtpcpp -Summary: A ccrtp extension for zrtp/Zfone support -BuildRequires: gcc-c++ libccrtp-devel libgcrypt-devel pkgconfig -Version: 1.3.0 -Release: 9 -License: GPLv2+ ; LGPLv2.1+ +Summary: A ccrtp extension for ZRTP support +BuildRequires: gcc-c++ libgcrypt-devel pkgconfig cmake +BuildRequires: libccrtp-devel >= 1.8.0 +Version: 1.6.0 +Release: 0 +License: GPL v3 or later Group: Development/Libraries/Other Url: http://www.gnu.org/software/commoncpp/commoncpp.html -Source0: ftp://ftp.gnu.org/gnu/cccrtp/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.bz2 Source1: rpmlintrc -Patch1: %name-1.0.1-compiler_warnings.patch -Patch2: libzrtpcpp-1.3.0-missing_returns.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -38,15 +35,7 @@ encryption, and which can be directly embedded into telephony applications. - -%package -n libzrtpcpp1 -License: GPLv2+ ; LGPLv2.1+ -Group: Development/Libraries/Other -Summary: A ccrtp extension for zrtp/Zfone support -Provides: %{name} = %{version} -Obsoletes: %{name} <= %{version} - -%description -n libzrtpcpp1 +%description -n libzrtpcpp This library is a GPL licensed extension to the GNU RTP Stack, ccrtp, that offers compatibility with Phil Zimmermann's zrtp/Zfone voice encryption, and which can be directly embedded into telephony @@ -55,10 +44,10 @@ applications. %package devel -License: GPLv3+ +License: GPL v3 or later Group: Development/Libraries/Other Summary: Headers and static link library for libzrtpcpp -Requires: libzrtpcpp1 = %{version} libccrtp-devel +Requires: libzrtpcpp = %{version} libccrtp-devel %description devel This package provides the header files, link libraries, and @@ -68,24 +57,30 @@ documentation for building applications that use libzrtpcpp. %prep %setup -q -%patch1 -%patch2 %build -%configure --disable-static --with-pic -%{__make} %{?jobs:-j%jobs} +mkdir build +cd build + +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DSYSCONFDIR=%{_sysconfdir} \ + -DMANDIR=%{_mandir} \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ + .. + +make %{?_smp_mflags} -%check -make check %install -%makeinstall -rm -f %{buildroot}%{_libdir}/*.la +cd build +make install DESTDIR=$RPM_BUILD_ROOT %clean -rm -rf %{buildroot} +rm -rf "$RPM_BUILD_ROOT" -%files -n libzrtpcpp1 +%files -n libzrtpcpp %defattr(-,root,root,0755) %doc AUTHORS COPYING README %{_libdir}/*.so.* @@ -97,8 +92,40 @@ rm -rf %{buildroot} %{_includedir}/libzrtpcpp/*.h %dir %{_includedir}/libzrtpcpp -%post -n libzrtpcpp1 -p /sbin/ldconfig +%post -n libzrtpcpp -p /sbin/ldconfig -%postun -n libzrtpcpp1 -p /sbin/ldconfig +%postun -n libzrtpcpp -p /sbin/ldconfig %changelog +* Mon Dec 27 2010 - Werner Dittmann +- Add Skein MAC authentication algorithm +- lots of documentation added (doxygen ready) +- some code cleanup + +* Sun Oct 11 2009 - Werner Dittmann +- Fix multistream problem +- add DH2048 mode +- update cipher selection to match latest draft (15x) +- Test with zfone3 with Ping packet mode enabled +- some code cleanup + +* Wed Jun 24 2009 - David Sugar +- Spec updated per current Fedora & CentOS policies. +- Updated release 1.4.5 has all mandatory IETF interop requirements. + +* Fri Jan 26 2009 - Werner Dittmann +- Update to version 1.4.2 to support the latest ZRTP + specification draft-zimmermann-avt-zrtp-12 + +* Fri Aug 22 2008 - David Sugar +- Adapted for newer library naming conventions. + +* Tue Dec 11 2007 - Werner Dittmann +- this is the first spec file for version 1.x.x +- remove the .la file in devel package +- use default file atttribute instead of 755 + +* Sat Apr 18 2007 - Werner Dittmann +- set version to 1.1.0 +- GNU ZRTP is compatible with the latest Zfone Beta + from April 2 2007