CVS commit: pkgsrc/comms/srtp

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/comms/srtp
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 5 May 2020 17:54:40 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue May  5 17:54:40 UTC 2020

Modified Files:
        pkgsrc/comms/srtp: Makefile PLIST buildlink3.mk distinfo
Added Files:
        pkgsrc/comms/srtp/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/comms/srtp/patches: patch-Makefile.in patch-configure
            patch-configure.in patch-crypto_cipher_aes__icm.c
            patch-crypto_hash_hmac.c patch-crypto_kernel_crypto__kernel.c
            patch-crypto_math_datatypes.c patch-crypto_math_gf2__8.c
            patch-crypto_math_math.c patch-include_srtp.h patch-srtp_srtp.c
            patch-test_rtpw__test.sh

Log Message:
srtp: updated to 2.3.0

libsrtp 2.3.0
Major changes in this release are a fuzzer for libsrtp, NSS as optional crypto back end and cmake support for building. For more details and a complete list of changes please see the CHANGES file.

libsrtp 2.2.0
First release in the 2.2 series.

The major change with this release is that the all the code has been reformatted to be consistent and this consistency can be enforced with the include .clang-format file. This resulted in a lot of 
none functional changes but was considered worth it to simplify maintenance in the future. There are numerous other minor fixes, see the CHANGES file for more details.

libsrtp 2.1.0
First release in the 2.1 series.

libsrtp 2.0.0
Initial libsrtp 2.0 release.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/comms/srtp/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/srtp/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/comms/srtp/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/comms/srtp/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/comms/srtp/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 pkgsrc/comms/srtp/patches/patch-Makefile.in \
    pkgsrc/comms/srtp/patches/patch-configure \
    pkgsrc/comms/srtp/patches/patch-configure.in \
    pkgsrc/comms/srtp/patches/patch-crypto_cipher_aes__icm.c \
    pkgsrc/comms/srtp/patches/patch-crypto_hash_hmac.c \
    pkgsrc/comms/srtp/patches/patch-crypto_kernel_crypto__kernel.c \
    pkgsrc/comms/srtp/patches/patch-crypto_math_datatypes.c \
    pkgsrc/comms/srtp/patches/patch-crypto_math_gf2__8.c \
    pkgsrc/comms/srtp/patches/patch-crypto_math_math.c \
    pkgsrc/comms/srtp/patches/patch-include_srtp.h \
    pkgsrc/comms/srtp/patches/patch-srtp_srtp.c \
    pkgsrc/comms/srtp/patches/patch-test_rtpw__test.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/comms/srtp/Makefile
diff -u pkgsrc/comms/srtp/Makefile:1.3 pkgsrc/comms/srtp/Makefile:1.4
--- pkgsrc/comms/srtp/Makefile:1.3      Sun Jan 26 05:26:18 2020
+++ pkgsrc/comms/srtp/Makefile  Tue May  5 17:54:39 2020
@@ -1,21 +1,25 @@
-# $NetBSD: Makefile,v 1.3 2020/01/26 05:26:18 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/05 17:54:39 adam Exp $
 
-DISTNAME=              srtp-1.4.4
-CATEGORIES=            comms security
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=srtp/}
-EXTRACT_SUFX=          .tgz
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://srtp.sourceforge.net/
-COMMENT=               Secure Real-time Transport Protocol library
+DISTNAME=      srtp-2.3.0
+CATEGORIES=    comms security
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=cisco/}
+GITHUB_PROJECT=        libsrtp
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/cisco/libsrtp
+COMMENT=       Secure Real-time Transport Protocol library
+LICENSE=       modified-bsd
 
+USE_CMAKE=             yes
 USE_TOOLS+=            gmake
-USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
+PKGCONFIG_OVERRIDE=    libsrtp2.pc.in
+TEST_TARGET=           test
 
-LDFLAGS.SunOS+=                -lsocket -lnsl
-TEST_TARGET=           runtest
+CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
+CMAKE_ARGS+=   -DENABLE_OPENSSL=ON
 
-WRKSRC=                        ${WRKDIR}/srtp
+LDFLAGS.SunOS+=        -lsocket -lnsl
 
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/comms/srtp/PLIST
diff -u pkgsrc/comms/srtp/PLIST:1.2 pkgsrc/comms/srtp/PLIST:1.3
--- pkgsrc/comms/srtp/PLIST:1.2 Mon Jan  1 22:29:21 2018
+++ pkgsrc/comms/srtp/PLIST     Tue May  5 17:54:39 2020
@@ -1,36 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/01 22:29:21 rillig Exp $
-include/srtp/aes.h
-include/srtp/aes_cbc.h
-include/srtp/aes_icm.h
-include/srtp/alloc.h
-include/srtp/auth.h
-include/srtp/cipher.h
-include/srtp/config.h
-include/srtp/crypto.h
-include/srtp/crypto_kernel.h
-include/srtp/crypto_math.h
-include/srtp/crypto_types.h
-include/srtp/cryptoalg.h
-include/srtp/datatypes.h
-include/srtp/err.h
-include/srtp/getopt_s.h
-include/srtp/gf2_8.h
-include/srtp/hmac.h
-include/srtp/integers.h
-include/srtp/kernel_compat.h
-include/srtp/key.h
-include/srtp/null_auth.h
-include/srtp/null_cipher.h
-include/srtp/prng.h
-include/srtp/rand_source.h
-include/srtp/rdb.h
-include/srtp/rdbx.h
-include/srtp/rtp.h
-include/srtp/rtp_priv.h
-include/srtp/sha1.h
-include/srtp/srtp.h
-include/srtp/srtp_priv.h
-include/srtp/stat.h
-include/srtp/ut_sim.h
-include/srtp/xfm.h
-lib/libsrtp.la
+@comment $NetBSD: PLIST,v 1.3 2020/05/05 17:54:39 adam Exp $
+include/srtp2/auth.h
+include/srtp2/cipher.h
+include/srtp2/cipher_types.h
+include/srtp2/crypto_types.h
+include/srtp2/srtp.h
+lib/libsrtp2.so
+lib/libsrtp2.so.${PKGVERSION}
+lib/libsrtp2.so.2
+lib/pkgconfig/libsrtp2.pc

Index: pkgsrc/comms/srtp/buildlink3.mk
diff -u pkgsrc/comms/srtp/buildlink3.mk:1.1 pkgsrc/comms/srtp/buildlink3.mk:1.2
--- pkgsrc/comms/srtp/buildlink3.mk:1.1 Sun Sep  6 14:02:08 2015
+++ pkgsrc/comms/srtp/buildlink3.mk     Tue May  5 17:54:39 2020
@@ -1,12 +1,13 @@
-# $NetBSD: buildlink3.mk,v 1.1 2015/09/06 14:02:08 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2020/05/05 17:54:39 adam Exp $
 
 BUILDLINK_TREE+=       srtp
 
 .if !defined(SRTP_BUILDLINK3_MK)
 SRTP_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.srtp+=   srtp>=1.4.4
+BUILDLINK_API_DEPENDS.srtp+=   srtp>=2.3.0
 BUILDLINK_PKGSRCDIR.srtp?=     ../../comms/srtp
+.include "../../security/openssl/buildlink3.mk"
 .endif # SRTP_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -srtp

Index: pkgsrc/comms/srtp/distinfo
diff -u pkgsrc/comms/srtp/distinfo:1.4 pkgsrc/comms/srtp/distinfo:1.5
--- pkgsrc/comms/srtp/distinfo:1.4      Mon Sep 26 13:20:41 2016
+++ pkgsrc/comms/srtp/distinfo  Tue May  5 17:54:39 2020
@@ -1,18 +1,7 @@
-$NetBSD: distinfo,v 1.4 2016/09/26 13:20:41 maya Exp $
+$NetBSD: distinfo,v 1.5 2020/05/05 17:54:39 adam Exp $
 
-SHA1 (srtp-1.4.4.tgz) = 299c6cfe0c9d6f1804bc5921cfbdb6a6bc76a521
-RMD160 (srtp-1.4.4.tgz) = 64e58a3fc2cc30a8d7cba6b6ce59f807649d9dee
-SHA512 (srtp-1.4.4.tgz) = 951bfec212f579daae4a5a7fc9eded163dd6790da2e3840629dbeac36d7d960f95a1f1b844505629c7815816515f0784bf9b6e1c47f2986416ec04ec9d4b7564
-Size (srtp-1.4.4.tgz) = 502890 bytes
-SHA1 (patch-Makefile.in) = 8e0e6d7bed257263e4609d305dfa6a27efc1906d
-SHA1 (patch-configure) = d70d01b5f846b2f163ba2246511cf1314005fa35
-SHA1 (patch-configure.in) = 217c066920fedaaba02d86e3c2017a368ea8fee7
-SHA1 (patch-crypto_cipher_aes__icm.c) = 7e402b790678bd6c27daf8f56bf0a1123b087d07
-SHA1 (patch-crypto_hash_hmac.c) = fe7dfb0b775169a649bf1f7c5c25d17e5e258cc8
-SHA1 (patch-crypto_kernel_crypto__kernel.c) = f529544b3355a05fdb70962bf44d8f8fa8a5a167
-SHA1 (patch-crypto_math_datatypes.c) = f5358856026b91ae40db4a7c38bae6138656d94e
-SHA1 (patch-crypto_math_gf2__8.c) = 4e878e3debc2c287dcbce6ab1127ba8cd22352c3
-SHA1 (patch-crypto_math_math.c) = 06961bd3184b0e47475f76a55d9669ce6d3a7149
-SHA1 (patch-include_srtp.h) = 4e680a004d14a338c7ec4cc135f21da38490c315
-SHA1 (patch-srtp_srtp.c) = 90f2674702dc2070350abc61f7773a4a6234ae33
-SHA1 (patch-test_rtpw__test.sh) = 00f28ef1e91b963ab4d413ac10925150bff4b6be
+SHA1 (srtp-2.3.0.tar.gz) = 263a45a82cb1acb1a6c7beef64def31949496a02
+RMD160 (srtp-2.3.0.tar.gz) = 4a650d4eb649be9c1779d15a48f135e712406709
+SHA512 (srtp-2.3.0.tar.gz) = 34b1a01cb9a75aed175be09aadd2827224203b9801becc3fbc5214667cce79c3b87b0f59e4315583863ab5a2cc4fc81d56ab604a5e4c984518b8a8a2a7b77461
+Size (srtp-2.3.0.tar.gz) = 633819 bytes
+SHA1 (patch-CMakeLists.txt) = 26975bb773ab2729a0a7df45c44239cf5fb0fb6f

Added files:

Index: pkgsrc/comms/srtp/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/comms/srtp/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Tue May  5 17:54:40 2020
+++ pkgsrc/comms/srtp/patches/patch-CMakeLists.txt      Tue May  5 17:54:39 2020
@@ -0,0 +1,39 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2020/05/05 17:54:39 adam Exp $
+
+Set shared library version.
+Prepare and install pkgconfig file.
+Install crypto_types.h.
+
+--- CMakeLists.txt.orig        2019-12-23 09:58:25.000000000 +0000
++++ CMakeLists.txt
+@@ -2,7 +2,9 @@ cmake_minimum_required(VERSION 2.8)
+ 
+ project(libsrtp2 LANGUAGES C)
+ 
++set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
+ set(PACKAGE_VERSION 2.3.0)
++set(PACKAGE_SOVERSION 2)
+ set(PACKAGE_STRING "${CMAKE_PROJECT_NAME} ${PACKAGE_VERSION}")
+ 
+ include(TestBigEndian)
+@@ -184,10 +186,20 @@ if(WIN32)
+   target_link_libraries(srtp2 ws2_32)
+ endif()
+ 
++set(prefix "${CMAKE_INSTALL_PREFIX}")
++set(libdir "\${exec_prefix}/lib")
++set(includedir "\${prefix}/include")
++configure_file(libsrtp2.pc.in libsrtp2.pc @ONLY)
++install(FILES libsrtp2.pc DESTINATION lib/pkgconfig)
++
++set_target_properties(srtp2 PROPERTIES
++    VERSION ${PACKAGE_VERSION} SOVERSION ${PACKAGE_SOVERSION})
++
+ install(TARGETS srtp2 DESTINATION lib)
+ install(FILES include/srtp.h crypto/include/auth.h
+   crypto/include/cipher.h
+   crypto/include/cipher_types.h
++  crypto/include/crypto_types.h
+   DESTINATION include/srtp2)
+ 
+ if(TEST_APPS)

Prev by Date: CVS commit: pkgsrc/emulators/BasiliskII
Next by Date: CVS commit: pkgsrc/comms/asterisk14
Previous by Thread: CVS commit: pkgsrc/emulators/BasiliskII
Next by Thread: CVS commit: pkgsrc/comms/asterisk14
Indexes:

Home | Main Index | Thread Index | Old Index