[pkgsrc/trunk]: pkgsrc/net/libzrtpcpp Add sqlite3 PKG_OPTION. USE_CMAKE inste...

[rodent <rodent%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a2ec1da7ab4f
branches:  trunk
changeset: 650115:a2ec1da7ab4f
user:      rodent <rodent%pkgsrc.org@localhost>
date:      Sat Apr 18 03:36:23 2015 +0000

description:
Add sqlite3 PKG_OPTION. USE_CMAKE instead of autotools. Update openssl
dependency. Bump BUILDLINK_A{B,P}I* in buildlink3.mk due to API changes.

>From NEWS:

== GNU ZRTP 4.4.0 ==

Changes the handling of HMAC and Hash contexts to avoild tool
many malloc/free calls and thus memory pointer problems.

Enhance the handling an check the nonce when using multi-stream
mode. This required a modification to the class file and some
modifications on the API. The old functions are now deprecated
but still usable. Nevertheless you should change your application
to use the new fuctions which support the new nonce handling and
checks.

Some bug fixing as well.

== GNU ZRTP 4.3.1 ==

This is a bugfix release. It fixes several compiler issues in
iOS8 Clang, Mircosoft C++ compiler (VS 2012) etc.

This release also adds a fix to address a possible problem when
using 'memset(...)' on a memory area immediately followed by a
'free(...)' call to free this memory area. Some compilers may
otpimize the code and do not call 'memset(...)'. That's bad for
software that deals with secure keys :-) . The fix removes this
possible vulnerability.


== GNU ZRTP 4.3.0 ==

This version adds some new API that provide to set retry timer
values and to get some retry counters.

Application may now set some values of the retry counters during
the discovery (Hello) and the negotiation phase. Applications may
increase the number of retries or modify the capping to support
slow or bad networks.

To get some idea about the actual number of retries during ZRTP
negotiation an application may now use the new API to get an array
of counters. The ZRTP state engine records how many retries occured
during the different protocol states.

Note: only the ZRTP initiator performs packet retries after the
discovery (Hello) phase. The responder would always return zero
alues for the other retry counters.

Because we have a new set of functions the API changed, thus it's
necessary to recompile applications that use the new library version.


== GNU ZRTP 4.2.4 ==

Only small changes to enable Android X86 (see clients/tivi/android)
as an example.

Rename functions aes_init() to aes_init_zrtp() to avoid names clashes
with other libreries that may include own AES modules.


== GNU ZRTP 4.2.3 ==

The optional SAS relay feature (refer to RFC6189, chapter 7.3) is
not longer compiled by default. If your project needs this support
then modify the CMakeLists.txt file and uncomment a 'add_definition'
statments. See comment in the CMakelists.txt file.

The reasons to disable this optional feature in the default build:
it's rarely used and some concerns about misusing this feature.


== GNU ZRTP 4.2.2 ==

A small enhancement in SRTP handling to provide a longer bit-shift
register with 128 bits. The replay now check accepts packets which
are up to 127 sequence number behing the current packet. The upper
layer (codecs) gets more packets on slower/bad networks that we may
see on mobile 3G/4G connections.

If the codecs do not remove silence then this may lead to some longer
audio replay, similar to sattelite communication.


== GNU ZRTP 4.2.1 ==

Bug fixes in the SRTP part that checks for replay and updates the ROC.

The wrong computations lead to false replay indications and to wrong
HMAC, thus they dropped to much packets, in particular under bad network
conditions.

Changed the handling the the zrtp_getSasType function the the ZrtpCWrapper.
Please check the inline documentation and the compiler warning how to
use the return value of the function.

diffstat:

 net/libzrtpcpp/Makefile                     |  18 +++++++++++-------
 net/libzrtpcpp/PLIST                        |   4 ++--
 net/libzrtpcpp/buildlink3.mk                |  13 ++++++++++---
 net/libzrtpcpp/distinfo                     |  10 +++++-----
 net/libzrtpcpp/options.mk                   |  15 +++++++++++++++
 net/libzrtpcpp/patches/patch-CMakeLists.txt |  10 +++++-----
 6 files changed, 48 insertions(+), 22 deletions(-)

diffs (145 lines):

diff -r 8be4f7972f05 -r a2ec1da7ab4f net/libzrtpcpp/Makefile
--- a/net/libzrtpcpp/Makefile   Sat Apr 18 03:12:51 2015 +0000
+++ b/net/libzrtpcpp/Makefile   Sat Apr 18 03:36:23 2015 +0000
@@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.8 2014/04/07 04:11:22 rodent Exp $
+# $NetBSD: Makefile,v 1.9 2015/04/18 03:36:23 rodent Exp $
 
-DISTNAME=      V4.2.0
+GITHUB_TAG=    V4.4.0
+DISTNAME=      ${GITHUB_TAG}
 PKGNAME=       libzrtpcpp${DISTNAME:S/V/-/1}
 CATEGORIES=    net
-MASTER_SITES=  https://github.com/wernerd/ZRTPCPP/archive/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=wernerd/}
+GITHUB_PROJECT=        ZRTPCPP
 DIST_SUBDIR=   ${PKGBASE}
 
 MAINTAINER=    rodent%NetBSD.org@localhost
-HOMEPAGE=      http://wiki.gnutelephony.org/
+HOMEPAGE=      http://www.gnutelephony.org/index.php/GNU_ZRTP
 COMMENT=       ZRTP extension for GNU ccRTP
 LICENSE=       gnu-gpl-v3
 
-WRKSRC=                ${WRKDIR}/ZRTPCPP-${PKGVERSION_NOREV}
+WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
 USE_PKGLOCALEDIR=      yes
 GCC_REQD+=             4.7
@@ -22,8 +24,10 @@
 PKG_DESTDIR_SUPPORT=   destdir
 CMAKE_ARGS+=           -DLIBDIRNAME=lib
 
-BUILDLINK_API_DEPENDS.openssl+=        openssl>=0.9.7i
-BUILDLINK_DEPMETHOD.openssl=   build
+.include "options.mk"
+
+BUILDLINK_API_DEPENDS.openssl+=        openssl>=0.9.8
+#BUILDLINK_DEPMETHOD.openssl=  build
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff -r 8be4f7972f05 -r a2ec1da7ab4f net/libzrtpcpp/PLIST
--- a/net/libzrtpcpp/PLIST      Sat Apr 18 03:12:51 2015 +0000
+++ b/net/libzrtpcpp/PLIST      Sat Apr 18 03:36:23 2015 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/04/07 04:11:22 rodent Exp $
+@comment $NetBSD: PLIST,v 1.4 2015/04/18 03:36:23 rodent Exp $
 include/libzrtpcpp/CcrtpTimeoutProvider.h
 include/libzrtpcpp/ZrtpCWrapper.h
 include/libzrtpcpp/ZrtpCallback.h
@@ -10,5 +10,5 @@
 include/libzrtpcpp/zrtpccrtp.h
 lib/libzrtpcpp.so
 lib/libzrtpcpp.so.4
-lib/libzrtpcpp.so.4.2.0
+lib/libzrtpcpp.so.4.4.0
 lib/pkgconfig/libzrtpcpp.pc
diff -r 8be4f7972f05 -r a2ec1da7ab4f net/libzrtpcpp/buildlink3.mk
--- a/net/libzrtpcpp/buildlink3.mk      Sat Apr 18 03:12:51 2015 +0000
+++ b/net/libzrtpcpp/buildlink3.mk      Sat Apr 18 03:36:23 2015 +0000
@@ -1,14 +1,21 @@
-# $NetBSD: buildlink3.mk,v 1.5 2014/04/07 05:34:23 rodent Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2015/04/18 03:36:23 rodent Exp $
 
 BUILDLINK_TREE+=       libzrtpcpp
 
 .if !defined(LIBZRTPCPP_BUILDLINK3_MK)
 LIBZRTPCPP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libzrtpcpp+=     libzrtpcpp>=0.9.0
-BUILDLINK_ABI_DEPENDS.libzrtpcpp?=     libzrtpcpp>=4.2.0
+BUILDLINK_API_DEPENDS.libzrtpcpp+=     libzrtpcpp>=4.4.0
+BUILDLINK_ABI_DEPENDS.libzrtpcpp?=     libzrtpcpp>=4.4.0
 BUILDLINK_PKGSRCDIR.libzrtpcpp?=       ../../net/libzrtpcpp
 
+pkgbase := libzrtpcpp
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.libzrtpcpp:Msqlite3)
+.include "../../databases/sqlite3/buildlink3.mk"
+.endif
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff -r 8be4f7972f05 -r a2ec1da7ab4f net/libzrtpcpp/distinfo
--- a/net/libzrtpcpp/distinfo   Sat Apr 18 03:12:51 2015 +0000
+++ b/net/libzrtpcpp/distinfo   Sat Apr 18 03:36:23 2015 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2014/04/07 04:11:22 rodent Exp $
+$NetBSD: distinfo,v 1.5 2015/04/18 03:36:23 rodent Exp $
 
-SHA1 (libzrtpcpp/V4.2.0.tar.gz) = fdba0ac3a849279ece82fe7e78172f3709bde6a8
-RMD160 (libzrtpcpp/V4.2.0.tar.gz) = a48238527518078a08e5d733dddac619ce46d1c0
-Size (libzrtpcpp/V4.2.0.tar.gz) = 1922243 bytes
-SHA1 (patch-CMakeLists.txt) = 4635e03e618872e75c2081e8247b77cff1d0d339
+SHA1 (libzrtpcpp/V4.4.0.tar.gz) = edbd5484f476439dff3692aed85680173bb78d65
+RMD160 (libzrtpcpp/V4.4.0.tar.gz) = 7018a4507aaa67debb52d54a428750e9f9e01eef
+Size (libzrtpcpp/V4.4.0.tar.gz) = 1933037 bytes
+SHA1 (patch-CMakeLists.txt) = 1c56d64b67a381cda790bbdab3892f3be408231f
diff -r 8be4f7972f05 -r a2ec1da7ab4f net/libzrtpcpp/options.mk
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libzrtpcpp/options.mk Sat Apr 18 03:36:23 2015 +0000
@@ -0,0 +1,15 @@
+# $NetBSD: options.mk,v 1.1 2015/04/18 03:36:23 rodent Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.libzrtpcpp
+PKG_SUPPORTED_OPTIONS= sqlite3
+PKG_SUGGESTED_OPTIONS+=        # blank
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msqlite3)
+BUILDLINK_API_DEPENDS.sqlite3+=        sqlite3>=3.7
+.include "../../databases/sqlite3/buildlink3.mk"
+CMAKE_ARGS+=           -DSQLITE=ON
+.else
+CMAKE_ARGS+=           -DSQLITE=OFF
+.endif
diff -r 8be4f7972f05 -r a2ec1da7ab4f net/libzrtpcpp/patches/patch-CMakeLists.txt
--- a/net/libzrtpcpp/patches/patch-CMakeLists.txt       Sat Apr 18 03:12:51 2015 +0000
+++ b/net/libzrtpcpp/patches/patch-CMakeLists.txt       Sat Apr 18 03:36:23 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2014/01/10 02:58:52 rodent Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2015/04/18 03:36:23 rodent Exp $
 
 Don't set LIB_SUFFIX for pkgsrc. LIBDIRNAME is set via CMAKE_ARGS.
 
---- CMakeLists.txt.orig        2013-11-23 12:30:36.000000000 +0000
+--- CMakeLists.txt.orig        2015-03-29 10:38:44.000000000 +0000
 +++ CMakeLists.txt
-@@ -80,18 +80,6 @@ include(CheckLibraryExists)
+@@ -85,18 +85,6 @@ include(CheckLibraryExists)
  include(CheckIncludeFiles)
  include(CheckFunctionExists)
  
@@ -20,6 +20,6 @@
 -    set(LIBDIRNAME "lib${LIB_SUFFIX}")
 -endif()
 -
- check_include_files(stdlib.h HAVE_STDLIB_H)
- check_include_files(string.h HAVE_STRING_H)
+ MESSAGE(STATUS "Configuring GNU ${PROJECT_NAME} ${VERSION} for ${PACKAGE}, commit: ${GIT_COMMIT} ...")
  
+