Updated to latest release, 4.1.2. Resolves:

http://secunia.com/advisories/53818/ From NEWS:
== GNU ZRTP 4.1.1 ==

Is a bug fix release that fixes some problems when building a standalone
version of the library, i.e. with embedded crypto algorithms and not using
on openSSL.

Another fix was necessary for NetBSD thread handling.


== GNU ZRTP 4.1.0 ==

Small enhancements when dealing with non-NIST algorithms. An application may
set a ''algorithm selection policy'' to control the selection behaviour. In
addition the the standrad selection policy (as per RFC6189) this version
provides a _non-NIST_ selection policy: if the selected public key algorithm
is a non-NIST ECC algorithm then the other selection functions prefer non-NIST
HASH algorithms (Skein etc).


== GNU ZRTP 4.0.0 ==

For this version I added some new algorithms for the DH key agreement
and the Skein Hash for ZRTP. Not further functional enhancments.

Added a new (old) build parameter -DCORE_LIB that will build a ZRTP core
library. This was available in V2.3 but I somehow lost this for 3.0
You may add other build parameters, such as SQLITE and CRYPTO_STANDALONE
if you build the core library.


== GNU ZRTP 3.2.0 ==

The main ZRTP modules contain fixes for three vulnerabilities found by Mark
Dowd. Thus we advise application developers to use this version of the
library. The vulnerabilities may lead to application crashes during ZRTP
negotiation if an attacker sends prepared ZRTP packets. The fixes remove these
attack vectors.

Some small other enhancements and cleanup, mainly inside client code.

Some enhancements in cache handling and the handling of retained shared
secrets. This change was proposed by Phil, is a slight security enhacement and
is fully backward comaptible.

Because of some API changes clients must be compiled and linked with the new
library.

For details please refer to the Git logs.


== GNU ZRTP 3.1.0 ==

This version adds some new features and code that supports some other
client and this accounts for the most changes inside this release.

The ZRTP core functionality was not changed as much (bug fixes, cleanup
mainly) and remains fully backward compatible with older library
versions. However, one nice enhancement was done: the addition of a standalone
SDES support module. This module supports basic SDES only without the fancy
stuff like many other SDES implementations. Thus it's pretty interoperable.

Some other features are:
- add some android support for a client, may serve as template for others
- documentation and code cleanup

Because of some API changes clients must be compiled and linked with the new
library.


== GNU ZRTP 3.0.0 ==

This is a major enhancement and restructuring of the overall ZRTP
distribution. This was necessary because more and more other clients use ZRTP
and add their specific glue code. Also some clients are not prepared to use
openSSL or other crypto libraries to their code and distributions.

Here a summary of the changes
- a new directory layout to accomodate various clients
- add standalone crypto modules, for example for AES, to have a real
  standalone ZRTP/SRTP library that does not require any other crypto library
  (optional via CMake configuration)
- Re-structure ZRTP cache and add SQlite3 as optional storage backend

The default settings for CMake build the normal ZRTP library that use openSSL
as crypto backend, use the normal file based cache and include the GNU ccRTP
modules. This is a librray that is to a large degree compatible with the
earlier builds.

Please refer to the top level CMakeFile.txt for options how to switch on the
standalone crypto mode or the SQlite3 based cache storage.

4 files changed, 26 insertions, 21 deletions

diff --git a/net/libzrtpcpp/Makefile b/net/libzrtpcpp/Makefile
index 308723236b2..f49d03d13c0 100644
--- a/net/libzrtpcpp/Makefile
+++ b/net/libzrtpcpp/Makefile
@@ -1,16 +1,20 @@
-# $NetBSD: Makefile,v 1.4 2014/01/01 11:52:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/10 02:58:51 rodent Exp $
 
-DISTNAME=	libzrtpcpp-2.3.3
-PKGREVISION=	1
+DISTNAME=	V4.1.2
+PKGNAME=	libzrtpcpp${DISTNAME:S/V/-/1}
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_GNU:=ccrtp/}
+MASTER_SITES=	https://github.com/wernerd/ZRTPCPP/archive/
+FETCH_USING=	curl
 
 MAINTAINER=	rodent@NetBSD.org
 HOMEPAGE=	http://wiki.gnutelephony.org/
 COMMENT=	ZRTP extension for GNU ccRTP
 LICENSE=	gnu-gpl-v3
 
+WRKSRC=		${WRKDIR}/ZRTPCPP-${PKGVERSION_NOREV}
+
 USE_PKGLOCALEDIR=	yes
+GCC_REQD+=		4.7
 USE_TOOLS+=		pkg-config
 USE_LIBTOOL=		yes
 USE_LANGUAGES+=		c c++
diff --git a/net/libzrtpcpp/PLIST b/net/libzrtpcpp/PLIST
index 5ee02108955..052105c85cb 100644
--- a/net/libzrtpcpp/PLIST
+++ b/net/libzrtpcpp/PLIST
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.1 2013/04/17 00:55:35 rodent Exp $
-include/libzrtpcpp/TimeoutProvider.h
+@comment $NetBSD: PLIST,v 1.2 2014/01/10 02:58:51 rodent Exp $
+include/libzrtpcpp/CcrtpTimeoutProvider.h
 include/libzrtpcpp/ZrtpCWrapper.h
 include/libzrtpcpp/ZrtpCallback.h
 include/libzrtpcpp/ZrtpCodes.h
 include/libzrtpcpp/ZrtpConfigure.h
 include/libzrtpcpp/ZrtpQueue.h
 include/libzrtpcpp/ZrtpUserCallback.h
+include/libzrtpcpp/common/osSpecifics.h
 include/libzrtpcpp/zrtpccrtp.h
 lib/libzrtpcpp.so
-lib/libzrtpcpp.so.2
-lib/libzrtpcpp.so.${PKGVERSION}
+lib/libzrtpcpp.so.4
+lib/libzrtpcpp.so.4.1.1
 lib/pkgconfig/libzrtpcpp.pc
diff --git a/net/libzrtpcpp/distinfo b/net/libzrtpcpp/distinfo
index bff6b4c2f13..a54175439c5 100644
--- a/net/libzrtpcpp/distinfo
+++ b/net/libzrtpcpp/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2013/06/27 01:40:45 rodent Exp $
+$NetBSD: distinfo,v 1.3 2014/01/10 02:58:51 rodent Exp $
 
-SHA1 (libzrtpcpp-2.3.3.tar.gz) = b1bdf9d54f8170f9bfac396b590608e08cfba1b5
-RMD160 (libzrtpcpp-2.3.3.tar.gz) = 1f7bf6734036e6b62b94be530fb7ea299e124728
-Size (libzrtpcpp-2.3.3.tar.gz) = 256971 bytes
-SHA1 (patch-CMakeLists.txt) = 4c47e69e4b1d48748c14268a25e192e7bb1ae953
+SHA1 (V4.1.2.tar.gz) = 4dd9a916437e6a9d82ccc86fb566e40f801f8340
+RMD160 (V4.1.2.tar.gz) = 6b51a90a036baf9c965fb22c5aa2d5adf130bd03
+Size (V4.1.2.tar.gz) = 1919843 bytes
+SHA1 (patch-CMakeLists.txt) = 4635e03e618872e75c2081e8247b77cff1d0d339
diff --git a/net/libzrtpcpp/patches/patch-CMakeLists.txt b/net/libzrtpcpp/patches/patch-CMakeLists.txt
index 56bb71ac288..37f9de70397 100644
--- a/net/libzrtpcpp/patches/patch-CMakeLists.txt
+++ b/net/libzrtpcpp/patches/patch-CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2013/04/17 00:55:36 rodent Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2014/01/10 02:58:52 rodent Exp $
 
 Don't set LIB_SUFFIX for pkgsrc. LIBDIRNAME is set via CMAKE_ARGS.
 
---- CMakeLists.txt.orig	2012-10-17 13:16:16.000000000 +0000
+--- CMakeLists.txt.orig	2013-11-23 12:30:36.000000000 +0000
 +++ CMakeLists.txt
-@@ -71,18 +71,6 @@ endif()
- enable_arg(ccrtp true "Enable GNU ccRTP support for GNU ZRTP")
- args_help()
+@@ -80,18 +80,6 @@ include(CheckLibraryExists)
+ include(CheckIncludeFiles)
+ include(CheckFunctionExists)
  
 -if (NOT LIB_SUFFIX)
 -    set(LIBDIRNAME "lib")
@@ -20,6 +20,6 @@ Don't set LIB_SUFFIX for pkgsrc. LIBDIRNAME is set via CMAKE_ARGS.
 -    set(LIBDIRNAME "lib${LIB_SUFFIX}")
 -endif()
 -
- # setup the Thread include and lib
- find_package(Threads)
- if(CMAKE_HAVE_PTHREAD_H)
+ check_include_files(stdlib.h HAVE_STDLIB_H)
+ check_include_files(string.h HAVE_STRING_H)
+