Hello community,
here is the log from the commit of package libzrtpcpp for openSUSE:Factory checked in at 2016-12-02 16:41:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzrtpcpp (Old)
and /work/SRC/openSUSE:Factory/.libzrtpcpp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzrtpcpp"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzrtpcpp/libzrtpcpp.changes 2016-04-01 13:02:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libzrtpcpp.new/libzrtpcpp.changes 2016-12-02 16:41:11.000000000 +0100
@@ -1,0 +2,11 @@
+Mon Nov 21 01:15:05 UTC 2016 - jengelh@inai.de
+
+- Update to new upstream release 4.6.4
+ * Include the openSSL specific hmac.h file when building SRTP
+ with openSSL crypto backend.
+ * Rename macro "DEPRECATED" to "DEPRECATED_ZRTP" to avoid
+ name clashes.
+ * Add warning code to ZrtpCWrapper.h if AuxSecret match fails.
+- Add typo.diff to make it build
+
+-------------------------------------------------------------------
Old:
----
V4.6.3.tar.gz
New:
----
V4.6.4.tar.gz
typo.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzrtpcpp.spec ++++++
--- /var/tmp/diff_new_pack.lsGva2/_old 2016-12-02 16:41:13.000000000 +0100
+++ /var/tmp/diff_new_pack.lsGva2/_new 2016-12-02 16:41:13.000000000 +0100
@@ -18,7 +18,7 @@
Name: libzrtpcpp
%define lname libzrtpcpp4
-Version: 4.6.3
+Version: 4.6.4
Release: 0
Summary: A ccrtp extension for ZRTP support
License: GPL-3.0+
@@ -28,6 +28,7 @@
#Git-Clone: git://github.com/wernerd/ZRTPCPP
#Git-Web: https://github.com/wernerd/ZRTPCPP
Source: https://github.com/wernerd/ZRTPCPP/archive/V%version.tar.gz
+Patch1: typo.diff
BuildRequires: cmake
BuildRequires: gcc-c++ >= 4.7
BuildRequires: pkg-config
@@ -64,6 +65,7 @@
%prep
%setup -qn ZRTPCPP-%version
+%patch -P 1 -p1
chmod a-x INSTALL
%build
@@ -75,16 +77,15 @@
# 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 \
+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
..
-
make %{?_smp_mflags} VERBOSE=1
popd
@@ -97,12 +98,12 @@
%postun -p /sbin/ldconfig -n %lname
%files -n %lname
-%defattr(-,root,root,0755)
+%defattr(-,root,root)
%doc AUTHORS COPYING README.md
%_libdir/libzrtpcpp.so.4*
%files devel
-%defattr(-,root,root,0755)
+%defattr(-,root,root)
%_libdir/libzrtpcpp.so
%_libdir/pkgconfig/libzrtpcpp.pc
%_includedir/libzrtpcpp/
++++++ V4.6.3.tar.gz -> V4.6.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.3/CMakeLists.txt new/ZRTPCPP-4.6.4/CMakeLists.txt
--- old/ZRTPCPP-4.6.3/CMakeLists.txt 2016-03-14 18:50:58.000000000 +0100
+++ new/ZRTPCPP-4.6.4/CMakeLists.txt 2016-11-10 19:28:11.000000000 +0100
@@ -14,9 +14,9 @@
SET(CPACK_PACKAGE_VERSION_MAJOR 4)
SET(CPACK_PACKAGE_VERSION_MINOR 6)
-SET(CPACK_PACKAGE_VERSION_PATCH 3)
+SET(CPACK_PACKAGE_VERSION_PATCH 4)
-set (VERSION 4.6.3)
+set (VERSION 4.6.4)
set (SOVERSION 4)
# Define supported command line parameters.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.3/NEWS.md new/ZRTPCPP-4.6.4/NEWS.md
--- old/ZRTPCPP-4.6.3/NEWS.md 2016-03-14 18:50:58.000000000 +0100
+++ new/ZRTPCPP-4.6.4/NEWS.md 2016-11-10 19:28:11.000000000 +0100
@@ -1,3 +1,11 @@
+## GNU ZRTP 4.6.4 ##
+
+Some fixes to slience Windows C/C++ compiler, fix a few include
+statements when using openSSL, small fixes to check disclosure
+flag. Reset valid flags when adding a new cache record to avoid
+wrong security message.
+
+
## GNU ZRTP 4.6.3 ##
A small fix inside the ZRTP main module to ignore malformed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.3/clients/tivi/android/jni/Application.mk new/ZRTPCPP-4.6.4/clients/tivi/android/jni/Application.mk
--- old/ZRTPCPP-4.6.3/clients/tivi/android/jni/Application.mk 2016-03-14 18:50:58.000000000 +0100
+++ new/ZRTPCPP-4.6.4/clients/tivi/android/jni/Application.mk 2016-11-10 19:28:11.000000000 +0100
@@ -9,4 +9,5 @@
APP_MODULES := zrtpcpp
APP_ABI := armeabi-v7a x86
APP_CPPFLAGS += -std=c++11
-# NDK_TOOLCHAIN_VERSION := 4.8
+NDK_TOOLCHAIN_VERSION=clang
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.3/common/osSpecifics.h new/ZRTPCPP-4.6.4/common/osSpecifics.h
--- old/ZRTPCPP-4.6.3/common/osSpecifics.h 2016-03-14 18:50:58.000000000 +0100
+++ new/ZRTPCPP-4.6.4/common/osSpecifics.h 2016-11-10 19:28:11.000000000 +0100
@@ -52,12 +52,12 @@
#endif
#ifdef __GNUC__
-#define DEPRECATED __attribute__((deprecated))
+#define DEPRECATED_ZRTP __attribute__((deprecated))
#elif defined(_MSC_VER)
-#define DEPRECATED __declspec(deprecated)
+#define DEPRECATED_ZRTP __declspec(deprecated)
#else
-#pragma message("WARNING: You need to implement DEPRECATED for this compiler")
-#define DEPRECATED
+#pragma message("WARNING: You need to implement DEPRECATED_ZRTP for this compiler")
+#define DEPRECATED_ZRTP
#endif
#if defined(__cplusplus)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.3/srtp/CryptoContext.cpp new/ZRTPCPP-4.6.4/srtp/CryptoContext.cpp
--- old/ZRTPCPP-4.6.3/srtp/CryptoContext.cpp 2016-03-14 18:50:58.000000000 +0100
+++ new/ZRTPCPP-4.6.4/srtp/CryptoContext.cpp 2016-11-10 19:28:11.000000000 +0100
@@ -394,8 +394,8 @@
}
delta = -delta;
- int idx = delta / 64;
- uint64_t bit = 1UL << (delta % 64);
+ int idx = (int)delta / 64;
+ uint64_t bit = (uint64_t)1UL << (delta % 64);
if ((replay_window[idx] & bit) == bit) {
return false; /* Packet already received ! */
}
@@ -442,8 +442,8 @@
}
else {
delta = -delta;
- int idx = delta / 64;
- uint64_t bit = 1UL << (delta % 64);
+ int idx = (int)delta / 64;
+ uint64_t bit = (uint64_t)1UL << (delta % 64);
replay_window[idx] |= bit;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ZRTPCPP-4.6.3/srtp/CryptoContext.h new/ZRTPCPP-4.6.4/srtp/CryptoContext.h
--- old/ZRTPCPP-4.6.3/srtp/CryptoContext.h 2016-03-14 18:50:58.000000000 +0100
+++ new/ZRTPCPP-4.6.4/srtp/CryptoContext.h 2016-11-10 19:28:11.000000000 +0100
@@ -44,9 +44,8 @@
#include