Hello community, here is the log from the commit of package libzrtpcpp checked in at Tue Sep 9 19:11:36 CEST 2008. -------- --- libzrtpcpp/libzrtpcpp.changes 2008-05-11 23:31:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/libzrtpcpp/libzrtpcpp.changes 2008-09-08 14:22:29.000000000 +0200 @@ -1,0 +2,11 @@ +Mon Sep 8 14:21:01 CEST 2008 - hvogel@suse.de + +- Update to 1.3.0 + * implements the latest changes define in the ZRTP draft + * The Method ''setSipsSecret(...)'' is no longer available. + * The method ''setOtherSecret(...)'' was renamed to + ''setPbxSecret(...)'' + * The methos ''setSrtpsSecret(...)'' is was renamed to + ''setAuxSecret(...)'' + +------------------------------------------------------------------- Old: ---- libzrtpcpp-1.0.1-no-return-in-nonvoid-function.patch libzrtpcpp-1.0.1.tar.bz2 New: ---- libzrtpcpp-1.3.0-missing_returns.patch libzrtpcpp-1.3.0.tar.bz2 rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzrtpcpp.spec ++++++ --- /var/tmp/diff_new_pack.u28887/_old 2008-09-09 19:11:24.000000000 +0200 +++ /var/tmp/diff_new_pack.u28887/_new 2008-09-09 19:11:24.000000000 +0200 @@ -1,26 +1,34 @@ # -# spec file for package libzrtpcpp (Version 1.0.1) +# spec file for package libzrtpcpp (Version 1.3.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libzrtpcpp -Summary: a ccrtp extension for zrtp/Zfone support -BuildRequires: ccrtp-devel >= 1.5.0 gcc-c++ libgcc libgcrypt-devel pkgconfig -Version: 1.0.1 -Release: 2 +Summary: A ccrtp extension for zrtp/Zfone support +BuildRequires: gcc-c++ libccrtp-devel libgcc libgcrypt-devel pkgconfig +Version: 1.3.0 +Release: 1 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 +Source1: rpmlintrc Patch1: %name-1.0.1-compiler_warnings.patch -Patch2: libzrtpcpp-1.0.1-no-return-in-nonvoid-function.patch +Patch2: libzrtpcpp-1.3.0-missing_returns.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -34,7 +42,7 @@ %package -n libzrtpcpp1 License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/Other -Summary: a ccrtp extension for zrtp/Zfone support +Summary: A ccrtp extension for zrtp/Zfone support Provides: %{name} = %{version} Obsoletes: %{name} <= %{version} @@ -50,7 +58,7 @@ License: GPL v3 or later Group: Development/Libraries/Other Summary: Headers and static link library for libzrtpcpp -Requires: libzrtpcpp1 = %{version} ccrtp-devel +Requires: libzrtpcpp1 = %{version} libccrtp-devel %description devel This package provides the header files, link libraries, and @@ -94,6 +102,14 @@ %postun -n libzrtpcpp1 -p /sbin/ldconfig %changelog +* Mon Sep 08 2008 hvogel@suse.de +- Update to 1.3.0 + * implements the latest changes define in the ZRTP draft + * The Method ''setSipsSecret(...)'' is no longer available. + * The method ''setOtherSecret(...)'' was renamed to + ''setPbxSecret(...)'' + * The methos ''setSrtpsSecret(...)'' is was renamed to + ''setAuxSecret(...)'' * Mon May 12 2008 crrodriguez@suse.de - fix no-return-in-nonvoid-function errors - fix both buildRequires and -devel package dependencies ++++++ libzrtpcpp-1.3.0-missing_returns.patch ++++++ --- 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)); } ++++++ libzrtpcpp-1.0.1.tar.bz2 -> libzrtpcpp-1.3.0.tar.bz2 ++++++ ++++ 17315 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org