[pkgsrc/trunk]: pkgsrc/net/libzrtpcpp Update libzrtpcpp to version 4.7.0

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/503a2affa12d
branches:  trunk
changeset: 387082:503a2affa12d
user:      nros <nros%pkgsrc.org@localhost>
date:      Fri Oct 21 16:10:37 2022 +0000

description:
Update libzrtpcpp to version 4.7.0

Pkgsrc changes:
Github and pkglint fixes.

Changes from NEWS:

## GNU ZRTP 4.6.6 ##

Small fix in zrtp/crypto/zrtpDh.cpp to fix a small memory leak.


## GNU ZRTP 4.6.5 ##

Cleanup compiler flags, reduce visibility for Android build,
check some buffer length. No functional enhancements, no changes
in API.


## 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
DH1 packets and avoid an NULL pointer access.


## GNU ZRTP 4.6.2 ##

A small fix in the ZrtpCWrapper to fix an issue within 4.6.1
;-)


## GNU ZRTP 4.6.1 ##

A small fix in the ZrtpCWrapper to initialize and use the ZRTP
master instance in case of multi-stream usage. Does not affect
the main ZRTP usage, only projects that use the wrapper such
as PJSIP or Gstreamer projects.

These project should re-compile if they use the multi-stream
feature.


## GNU ZRTP 4.6.0 ##

Only a small add-on to the code to implement handling of the
disclosure flag. See RFC6189, chapter 11 for more details
about the disclosure flag.

Because the API changed, thus it's necessary to recompile
applications that use the new library version.


## GNU ZRTP 4.5.0 ##

Added a new SAS algorithm 'B32E' that uses 32 Unicode Emoji
code points instead of 32 ASCII characters. Application that
are able to display Emojis may use this new SAS algorithm to
display nice Emojis instead of 'boring' ASCII letters and
digits.

Some technical details:

* the 32 selected emojis are easily distinguishable, known to
  everyone, not offending etc, and use standard Unicode code
  points
* select colored emojis that look good on white and on black
  backgrounds (most emojis look good on white only)
* select emojis that are available on iOS, Android, Mac OS X
  (Windows not checked)
* the resulting SAS string is UTF-8 encoded, suitable for most
  platforms except Java.

To use the codes for Java the application needs to translate the
UTF-8 encoding into UTF-16 encoding. Because most of the emojis
are Unicode supplementary characters the UTF-8 to UTF-16 conversion
must generate the necessary UTF-16 surrogate pairs.

To support the UTF-8 / UTF-16 conversion the common directory
contains conversion functions that I extracted from ICU C/C++
library source.

Because the API changed, thus it's necessary to recompile
applications that use the new library version.

diffstat:

 net/libzrtpcpp/Makefile                               |  24 +++++++--------
 net/libzrtpcpp/PLIST                                  |   4 +-
 net/libzrtpcpp/buildlink3.mk                          |   6 +-
 net/libzrtpcpp/distinfo                               |  11 +++---
 net/libzrtpcpp/patches/patch-CMakeLists.txt           |  29 ++++++------------
 net/libzrtpcpp/patches/patch-cryptcommon_ZrtpRandom.h |  14 +++++++++
 6 files changed, 46 insertions(+), 42 deletions(-)

diffs (163 lines):

diff -r 4e94ee39c34a -r 503a2affa12d net/libzrtpcpp/Makefile
--- a/net/libzrtpcpp/Makefile   Fri Oct 21 13:00:54 2022 +0000
+++ b/net/libzrtpcpp/Makefile   Fri Oct 21 16:10:37 2022 +0000
@@ -1,34 +1,32 @@
-# $NetBSD: Makefile,v 1.38 2022/04/18 19:10:03 adam Exp $
+# $NetBSD: Makefile,v 1.39 2022/10/21 16:10:37 nros Exp $
 
-GITHUB_TAG=    V4.4.0
-DISTNAME=      ${GITHUB_TAG}
-PKGNAME=       libzrtpcpp${DISTNAME:S/V/-/1}
-PKGREVISION=   26
+DISTNAME=      libzrtpcpp-4.7.0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=wernerd/}
 GITHUB_PROJECT=        ZRTPCPP
-DIST_SUBDIR=   ${PKGBASE}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-#HOMEPAGE=     http://www.gnutelephony.org/index.php/GNU_ZRTP
+HOMEPAGE=      https://www.gnu.org/software/ccrtp/zrtp.html
 COMMENT=       ZRTP extension for GNU ccRTP
-LICENSE=       gnu-gpl-v3
+LICENSE=       apache-2.0
 
 WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
-USE_PKGLOCALEDIR=      yes
-GCC_REQD+=             4.7
 USE_TOOLS+=            pkg-config
 USE_LIBTOOL=           yes
 USE_LANGUAGES+=                c c++
 USE_CMAKE=             yes
-PKG_DESTDIR_SUPPORT=   destdir
-CMAKE_ARGS+=           -DLIBDIRNAME=lib
+CMAKE_ARGS+=           -DCCRTP=ON
+CMAKE_ARGS+=           -DLIB_SUFFIX=""
+
+CMAKE_USE_GNU_INSTALL_DIRS=    no
+
+PKGCONFIG_OVERRIDE=    libzrtpcpp.pc.cmake
 
 .include "options.mk"
 
 .include "../../mk/pthread.buildlink3.mk"
+.include "../../net/ccrtp/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../net/ccrtp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4e94ee39c34a -r 503a2affa12d net/libzrtpcpp/PLIST
--- a/net/libzrtpcpp/PLIST      Fri Oct 21 13:00:54 2022 +0000
+++ b/net/libzrtpcpp/PLIST      Fri Oct 21 16:10:37 2022 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2015/04/18 03:36:23 rodent Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/10/21 16:10:37 nros 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.4.0
+lib/libzrtpcpp.so.${PKGVERSION}
 lib/pkgconfig/libzrtpcpp.pc
diff -r 4e94ee39c34a -r 503a2affa12d net/libzrtpcpp/buildlink3.mk
--- a/net/libzrtpcpp/buildlink3.mk      Fri Oct 21 13:00:54 2022 +0000
+++ b/net/libzrtpcpp/buildlink3.mk      Fri Oct 21 16:10:37 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2022/04/18 19:10:03 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2022/10/21 16:10:37 nros Exp $
 
 BUILDLINK_TREE+=       libzrtpcpp
 
@@ -6,13 +6,13 @@
 LIBZRTPCPP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libzrtpcpp+=     libzrtpcpp>=4.4.0
-BUILDLINK_ABI_DEPENDS.libzrtpcpp?=     libzrtpcpp>=4.4.0nb26
+BUILDLINK_ABI_DEPENDS.libzrtpcpp?=     libzrtpcpp>=4.7.0
 BUILDLINK_PKGSRCDIR.libzrtpcpp?=       ../../net/libzrtpcpp
 
 pkgbase := libzrtpcpp
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.libzrtpcpp:Msqlite3)
+.if ${PKG_BUILD_OPTIONS.libzrtpcpp:Msqlite3}
 .include "../../databases/sqlite3/buildlink3.mk"
 .endif
 
diff -r 4e94ee39c34a -r 503a2affa12d net/libzrtpcpp/distinfo
--- a/net/libzrtpcpp/distinfo   Fri Oct 21 13:00:54 2022 +0000
+++ b/net/libzrtpcpp/distinfo   Fri Oct 21 16:10:37 2022 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 11:05:57 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/10/21 16:10:37 nros Exp $
 
-BLAKE2s (libzrtpcpp/V4.4.0.tar.gz) = 6be8b9adacc5b69a7d1d8f93e875c0cd55d995165e512bcebfddea52c2b1af5f
-SHA512 (libzrtpcpp/V4.4.0.tar.gz) = 56cc44cf05a505b6d62043f4ee621bc00fd38d1b0f27f9d21ed6169aae3d08f948cf2af91f8a094f24db82080fc9c553aa50c34d06926b68cd767f258454c204
-Size (libzrtpcpp/V4.4.0.tar.gz) = 1933037 bytes
-SHA1 (patch-CMakeLists.txt) = 1c56d64b67a381cda790bbdab3892f3be408231f
+BLAKE2s (libzrtpcpp-4.7.0.tar.gz) = 5c3d4fb9aed62b3a368aeed5ace6fa8c047177b68979e42dbde4c2a619186bc7
+SHA512 (libzrtpcpp-4.7.0.tar.gz) = 7ea7458edf06944c5248973ece871af7a44319935fb7e761ffee256c83ca6feeb887c108ed7193563a7cd2be29b79657e659c69c46bc3a27b94b4eb4c664fac4
+Size (libzrtpcpp-4.7.0.tar.gz) = 2235691 bytes
+SHA1 (patch-CMakeLists.txt) = 96540d42cd0ff7cbf837d337fb62a0ca0deccdc2
+SHA1 (patch-cryptcommon_ZrtpRandom.h) = e0724c674ce528afd1803585268ce92be0488101
diff -r 4e94ee39c34a -r 503a2affa12d net/libzrtpcpp/patches/patch-CMakeLists.txt
--- a/net/libzrtpcpp/patches/patch-CMakeLists.txt       Fri Oct 21 13:00:54 2022 +0000
+++ b/net/libzrtpcpp/patches/patch-CMakeLists.txt       Fri Oct 21 16:10:37 2022 +0000
@@ -1,25 +1,16 @@
-$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.
+$NetBSD: patch-CMakeLists.txt,v 1.4 2022/10/21 16:10:37 nros Exp $
 
---- CMakeLists.txt.orig        2015-03-29 10:38:44.000000000 +0000
+* respect LIB_SUFFIX set to an empty string, so
+  that LIB_SUFFIX can be set to nothing for pkgsrc
+
+--- CMakeLists.txt.orig        2022-10-20 16:44:38.408278688 +0000
 +++ CMakeLists.txt
-@@ -85,18 +85,6 @@ include(CheckLibraryExists)
+@@ -101,7 +101,7 @@ include(CheckLibraryExists)
  include(CheckIncludeFiles)
  include(CheckFunctionExists)
  
 -if (NOT LIB_SUFFIX)
--    set(LIBDIRNAME "lib")
--    # this caused problems in debian where it has to always be lib....
--    if (NOT EXISTS /etc/debian_version)
--        if ( "${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" )
--            set(LIBDIRNAME "lib64")
--        endif()
--    endif()
--else()
--    set(LIBDIRNAME "lib${LIB_SUFFIX}")
--endif()
--
- MESSAGE(STATUS "Configuring GNU ${PROJECT_NAME} ${VERSION} for ${PACKAGE}, commit: ${GIT_COMMIT} ...")
- 
- 
++if (NOT DEFINED LIB_SUFFIX)
+     set(LIBDIRNAME "lib")
+     # this caused problems in debian where it has to always be lib....
+     if (NOT EXISTS /etc/debian_version)
diff -r 4e94ee39c34a -r 503a2affa12d net/libzrtpcpp/patches/patch-cryptcommon_ZrtpRandom.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/libzrtpcpp/patches/patch-cryptcommon_ZrtpRandom.h     Fri Oct 21 16:10:37 2022 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-cryptcommon_ZrtpRandom.h,v 1.1 2022/10/21 16:10:37 nros Exp $
+
+* include stdbool.h so that bool is defined in C
+
+--- cryptcommon/ZrtpRandom.h.orig      2020-02-01 18:04:00.000000000 +0000
++++ cryptcommon/ZrtpRandom.h
+@@ -28,6 +28,7 @@
+ #if !(defined(_WIN32) || defined(_WIN64))
+ #include <unistd.h>
+ #endif
++#include <stdbool.h>
+ #include <stdint.h>
+ #include <sys/types.h>
+