Accepting request 442290 from network:telephony

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/442290
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libzrtpcpp?expand=0&rev=37

V4.6.3.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6d788818ab5fedb15285ea7a3fd6ceadbca33c4fdd1c8abed900494872114f1a
-size 2232062

V4.6.4.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b619d037f152c8bb1de2433f055c5c78daa3545ebb534bd54684a9da4763e863
+size 2232285

libzrtpcpp.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Wed Mar 23 21:19:19 UTC 2016 - jengelh@inai.de
 

libzrtpcpp.spec

@@ -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 @@ Url:            http://www.gnutelephony.org/index.php/GNU_ZRTP
 #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 @@ documentation for building applications that use libzrtpcpp.
 
 %prep
 %setup -qn ZRTPCPP-%version
+%patch -P 1 -p1
 chmod a-x INSTALL
 
 %build
@@ -75,16 +77,15 @@ pushd build/
 # 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 \
+cmake -DCMAKE_INSTALL_PREFIX="%_prefix" \
--DCMAKE_C_FLAGS:STRING="%optflags" \
+	-DCMAKE_C_FLAGS:STRING="%optflags" \
--DCMAKE_CXX_FLAGS:STRING="%optflags" \
+	-DCMAKE_CXX_FLAGS:STRING="%optflags" \
--DCMAKE_LD_FLAGS:STRING="-Wl,--version-script=$PWD/version.map" \
+	-DCMAKE_LD_FLAGS:STRING="-Wl,--version-script=$PWD/version.map" \
--DCRYPTO_STANDALONE:BOOL=false \
+	-DCRYPTO_STANDALONE:BOOL=false \
 %if "%_lib" == "lib64"
-      -DLIB_SUFFIX=64 \
+	-DLIB_SUFFIX=64 \
 %endif
-      ..
+	..
-
 make %{?_smp_mflags} VERBOSE=1
 popd
 
@@ -97,12 +98,12 @@ popd
 %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/

typo.diff

@@ -0,0 +1,26 @@
+---
+ clients/ccrtp/ZrtpQueue.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: ZRTPCPP-4.6.4/clients/ccrtp/ZrtpQueue.h
+===================================================================
+--- ZRTPCPP-4.6.4.orig/clients/ccrtp/ZrtpQueue.h
++++ ZRTPCPP-4.6.4/clients/ccrtp/ZrtpQueue.h
+@@ -430,7 +430,7 @@ public:
+      *
+      * @see setMultiStrParams()
+      */
+-    DEPRECATED std::string getMultiStrParams() {return getMultiStrParams(NULL); }
++    DEPRECATED_ZRTP std::string getMultiStrParams() {return getMultiStrParams(NULL); }
+ 
+     /**
+      * Set Multi-stream parameters.
+@@ -450,7 +450,7 @@ public:
+      *
+      * @see getMultiStrParams()
+      */
+-    DEPRECATED void setMultiStrParams(std::string parameters) { setMultiStrParams(parameters, NULL);}
++    DEPRECATED_ZRTP void setMultiStrParams(std::string parameters) { setMultiStrParams(parameters, NULL);}
+ 
+     /**
+      * Get Multi-stream parameters.