From 8261df73d415f95cbc95f08fd626019ee0f7245d17181faa69af8e3f90a2c2cc Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 14 Aug 2015 08:30:07 +0000
Subject: [PATCH] zrtpcpp-4.4.0

OBS-URL: https://build.opensuse.org/package/show/network:telephony/libzrtpcpp?expand=0&rev=41
---
 ...g-add-includedir-libzrtcpp-to-CFLAGS.patch | 35 -------------------
 V4.3.1.tar.gz                                 |  3 --
 V4.4.0.tar.gz                                 |  3 ++
 libzrtpcpp.changes                            | 11 ++++++
 libzrtpcpp.spec                               |  6 ++--
 5 files changed, 16 insertions(+), 42 deletions(-)
 delete mode 100644 0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
 delete mode 100644 V4.3.1.tar.gz
 create mode 100644 V4.4.0.tar.gz

diff --git a/0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch b/0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
deleted file mode 100644
index cb285a2..0000000
--- a/0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f100d9583fb0345ebe91959b9310fed3af1602db Mon Sep 17 00:00:00 2001
-X-Git-Clone: git://github.com/tmatth/ZRTPCPP
-From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
-Date: Mon, 14 Jul 2014 11:31:17 -0400
-Subject: [PATCH] pkg-config: add <includedir>/libzrtcpp to CFLAGS
-
-Also remove broken lines that are not required.
----
- libzrtpcpp.pc.cmake | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/libzrtpcpp.pc.cmake b/libzrtpcpp.pc.cmake
-index 655bd30..9676c3d 100644
---- a/libzrtpcpp.pc.cmake
-+++ b/libzrtpcpp.pc.cmake
-@@ -1,15 +1,13 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--pkglibdir=${libdir}/@PACKAGE@
- includedir=@includedir@
--pkgincludedir=${includedir}/@PACKAGE@
- 
- Name: libzrtpcpp
- Description: GNU ZRTP core library
- Version: @VERSION@
- Requires: @CRYPTOBACKEND@
- Libs:  -L${libdir} -l@zrtplibName@
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${includedir}/libzrtpcpp
- 
- 
--- 
-2.0.0
-
diff --git a/V4.3.1.tar.gz b/V4.3.1.tar.gz
deleted file mode 100644
index 6a65d46..0000000
--- a/V4.3.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d9cce8ba5946620ce030a6b04f58c4011cbd1deb79ee41a6b8999dc6b689604c
-size 1928961
diff --git a/V4.4.0.tar.gz b/V4.4.0.tar.gz
new file mode 100644
index 0000000..dc1521c
--- /dev/null
+++ b/V4.4.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b32444819bdde13d765d04b5e5392ad960f6609f5e5cc7c9aa5bff36d10a28ad
+size 1933037
diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes
index 0da9c0d..eb960b7 100644
--- a/libzrtpcpp.changes
+++ b/libzrtpcpp.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Aug 14 08:25:38 UTC 2015 - jengelh@inai.de
+
+- Update to new upstream release 4.4.0
+* Changes to the handling of HMAC and Hash contexts to avoild too
+  many malloc/free calls and thus memory pointer problems.
+* Enhance the handling an check the nonce when using multi-stream
+  mode.
+- Drop 0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
+  (merged)
+
 -------------------------------------------------------------------
 Tue Mar 17 19:57:23 UTC 2015 - jengelh@inai.de
 
diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec
index 4ec37f8..ec2b5b7 100644
--- a/libzrtpcpp.spec
+++ b/libzrtpcpp.spec
@@ -18,7 +18,7 @@
 
 Name:           libzrtpcpp
 %define lname	libzrtpcpp4
-Version:        4.3.1
+Version:        4.4.0
 Release:        0
 Summary:        A ccrtp extension for ZRTP support
 License:        GPL-3.0+
@@ -29,7 +29,6 @@ Url:            http://www.gnutelephony.org/index.php/GNU_ZRTP
 #Git-Web:	https://github.com/wernerd/ZRTPCPP
 Source:         https://github.com/wernerd/ZRTPCPP/archive/V%version.tar.gz
 Source2:        %name.keyring
-Patch1:         0001-pkg-config-add-includedir-libzrtcpp-to-CFLAGS.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++ >= 4.7
 BuildRequires:  pkg-config
@@ -66,8 +65,7 @@ documentation for building applications that use libzrtpcpp.
 
 %prep
 %setup -qn ZRTPCPP-%version
-%patch -P 1 -p1
-chmod a-x NEWS
+chmod a-x INSTALL NEWS
 
 %build
 mkdir build