[Gsrc-commit] trunk r4785: update zrtp to 2.3.4

[Carl Hansen]

------------------------------------------------------------
revno: 4785
revision-id: address@hidden
parent: address@hidden
committer: address@hidden
branch nick: trunk
timestamp: Sat 2017-09-30 11:53:13 -0700
message:
  update zrtp to 2.3.4
modified:
  pkg/gnu/zrtp/Makefile          makefile-20160617014725-uokjfnggs70iry9h-2047

=== modified file 'pkg/gnu/zrtp/Makefile'
--- a/pkg/gnu/zrtp/Makefile     2017-03-19 07:44:25 +0000
+++ b/pkg/gnu/zrtp/Makefile     2017-09-30 18:53:13 +0000
@@ -1,4 +1,5 @@
 # Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2017 Carl Hansen <address@hidden>
 #
 # This file is part of GSRC.
 #
@@ -22,7 +23,11 @@
 HOME_URL = http://www.gnu.org/software/ccrtp
 DESCRIPTION = A C++ implementation of the ZRTP specification
 define BLURB
-
+Library that adds ZRTP support to the GNU ccRTP stack. Phil Zimmermann
+developed ZRTP to allow ad-hoc, easy to use key negotiation to setup SRTP
+(Secure Real-time Transport Protocol) sessions. GNU ZRTP works together
+with GNU ccRTP (1.5.0 or later) and provides a ZRTP implementation that
+can be directly embedded into client and server applications.  
 endef
 
 ######################################################################
@@ -31,23 +36,25 @@
 MASTER_SUBDIR = ccrtp/
 DISTFILES = $(DISTNAME).tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-WORKOBJ = $(WORKDIR)/build-$(GARVERSION)/
+WORKOBJ = $(WORKSRC)-build/
 CONFIGURE_SCRIPTS = $(WORKSRC)/CMakeLists.txt
 
 BUILDDEPS =  
-LIBDEPS = libgcrypt ccrtp
+LIBDEPS = libgcrypt ccrtp openssl
 
 ######################################################################
 
 include ../../../gar/gar.lib/auto.mk
 include config.mk
 
+# the following is inoperative.
 # CMake seems to ignore most environment variables. In this case, 
-# libzrtp requires OpenSSL 0.98, which GSRC does not provide, but 
+# libzrtp requires OpenSSL 0.98, which GSRC did  not provide, but 
 # since CMake does not seem to honor the PKG_CONFIG_PATH variable
 # and since GSRC tries to use its own pkg-build by default, it cannot
 # find the library. Here we remove the argument to use GSRC's pkg-config
 # so that the thing will at least build. 
-CMAKE_CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=$(prefix) \
-                       -DSYSCONFDIR=$(sysconfdir) \
-                       $(CONFIGURE_OPTS)
+#CMAKE_CONFIGURE_ARGS =        -DCMAKE_INSTALL_PREFIX=$(prefix) \
+#                      -DSYSCONFDIR=$(sysconfdir) \
+#                      $(CONFIGURE_OPTS)
+#