CVS commit: pkgsrc/comms/srtp

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Feb 29 12:37:01 UTC 2024

Modified Files:
        pkgsrc/comms/srtp: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/comms/srtp/patches: patch-CMakeLists.txt

Log Message:
srtp: updated to 2.6.0

2.6.0

- remove use of pointers to 32bit values
- Cleaning up cmake and enabled more warnings.
- start using const on internal arguments
- Some srtp_driver fixes
- remove travis reference from README.md
- meson.build: implement mbedtls support
- iv length is constant so set only once
- Add x86 SIMD optimizations to crypto datatypes
- Add a missing typedef for stream list ctx
- cmake: Rename TEST_APPS as LIBSRTP_TEST_APPS option
- cmake: Support configuring as subproject


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/comms/srtp/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/comms/srtp/PLIST
cvs rdiff -u -r1.3 -r1.4 pkgsrc/comms/srtp/buildlink3.mk
cvs rdiff -u -r1.8 -r1.9 pkgsrc/comms/srtp/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/comms/srtp/patches/patch-CMakeLists.txt

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.6 pkgsrc/comms/srtp/Makefile:1.7
--- pkgsrc/comms/srtp/Makefile:1.6      Tue Oct 24 22:08:25 2023
+++ pkgsrc/comms/srtp/Makefile  Thu Feb 29 12:37:01 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2023/10/24 22:08:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2024/02/29 12:37:01 adam Exp $
 
-DISTNAME=      srtp-2.5.0
-PKGREVISION=   1
+DISTNAME=      srtp-2.6.0
 CATEGORIES=    comms security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=cisco/}
 GITHUB_PROJECT=        libsrtp
@@ -13,7 +12,11 @@ COMMENT=     Secure Real-time Transport Prot
 LICENSE=       modified-bsd
 
 PKGCONFIG_OVERRIDE=    libsrtp2.pc.in
-TEST_TARGET=           test
+
+TEST_TARGET=   test
+TEST_ENV+=     LD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
+# For Darwin
+TEST_ENV+=     DYLD_LIBRARY_PATH=${WRKSRC}/${CMAKE_BUILD_DIR}
 
 CMAKE_ARGS+=   -DBUILD_SHARED_LIBS=ON
 CMAKE_ARGS+=   -DBUILD_WITH_WARNINGS=OFF

Index: pkgsrc/comms/srtp/PLIST
diff -u pkgsrc/comms/srtp/PLIST:1.4 pkgsrc/comms/srtp/PLIST:1.5
--- pkgsrc/comms/srtp/PLIST:1.4 Wed Feb 15 12:23:30 2023
+++ pkgsrc/comms/srtp/PLIST     Thu Feb 29 12:37:01 2024
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2023/02/15 12:23:30 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2024/02/29 12:37:01 adam Exp $
 include/srtp2/auth.h
 include/srtp2/cipher.h
 include/srtp2/crypto_types.h
 include/srtp2/srtp.h
 lib/cmake/libSRTP/libSRTPConfig.cmake
 lib/cmake/libSRTP/libSRTPConfigVersion.cmake
-lib/cmake/libSRTP/libSRTPTargets-noconfig.cmake
+lib/cmake/libSRTP/libSRTPTargets-debug.cmake
 lib/cmake/libSRTP/libSRTPTargets.cmake
 lib/libsrtp2.so
 lib/libsrtp2.so.${PKGVERSION}

Index: pkgsrc/comms/srtp/buildlink3.mk
diff -u pkgsrc/comms/srtp/buildlink3.mk:1.3 pkgsrc/comms/srtp/buildlink3.mk:1.4
--- pkgsrc/comms/srtp/buildlink3.mk:1.3 Tue Oct 24 22:08:25 2023
+++ pkgsrc/comms/srtp/buildlink3.mk     Thu Feb 29 12:37:01 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2023/10/24 22:08:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2024/02/29 12:37:01 adam Exp $
 
 BUILDLINK_TREE+=       srtp
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        srtp
 SRTP_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.srtp+=   srtp>=2.3.0
-BUILDLINK_ABI_DEPENDS.srtp?=   srtp>=2.5.0nb1
+BUILDLINK_ABI_DEPENDS.srtp+=   srtp>=2.5.0nb1
 BUILDLINK_PKGSRCDIR.srtp?=     ../../comms/srtp
 .include "../../security/openssl/buildlink3.mk"
 .endif # SRTP_BUILDLINK3_MK

Index: pkgsrc/comms/srtp/distinfo
diff -u pkgsrc/comms/srtp/distinfo:1.8 pkgsrc/comms/srtp/distinfo:1.9
--- pkgsrc/comms/srtp/distinfo:1.8      Wed Feb 15 12:23:30 2023
+++ pkgsrc/comms/srtp/distinfo  Thu Feb 29 12:37:01 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2023/02/15 12:23:30 adam Exp $
+$NetBSD: distinfo,v 1.9 2024/02/29 12:37:01 adam Exp $
 
-BLAKE2s (srtp-2.5.0.tar.gz) = f5901a179289b5fef66b85e94f8005e722c193c652670b1de2adba5b3c47f07d
-SHA512 (srtp-2.5.0.tar.gz) = bd679ab65ccf22ca30fe867b9649a0b84cfa6fad6e22eb10f081141632f6dd56479a04d525b865f11fd46007303ca211065d9c170e4820d6ea7055403702340a
-Size (srtp-2.5.0.tar.gz) = 638704 bytes
-SHA1 (patch-CMakeLists.txt) = b8818d6d91e164eb2f008c6445e09312552161e3
+BLAKE2s (srtp-2.6.0.tar.gz) = e1f898b9c0f45f194a0b4e3fcf98bc93c601074e3d02faeed9da4359e2aeeaa0
+SHA512 (srtp-2.6.0.tar.gz) = 96f6e2b7300a416a10e5cc45cf67dadf2f4f81119267689cac4296e2dc6d73398457d1a56b651ab4be6da9e701564d3f256bf6d5f42add5eb2b9b9fe8e438a74
+Size (srtp-2.6.0.tar.gz) = 640699 bytes
+SHA1 (patch-CMakeLists.txt) = a4d8092ed84a354f7f4a963c1548f993eb06b7e3

Index: pkgsrc/comms/srtp/patches/patch-CMakeLists.txt
diff -u pkgsrc/comms/srtp/patches/patch-CMakeLists.txt:1.2 pkgsrc/comms/srtp/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/comms/srtp/patches/patch-CMakeLists.txt:1.2  Wed Feb 15 12:23:31 2023
+++ pkgsrc/comms/srtp/patches/patch-CMakeLists.txt      Thu Feb 29 12:37:01 2024
@@ -1,18 +1,18 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2023/02/15 12:23:31 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2024/02/29 12:37:01 adam Exp $
 
 Prepare and install pkgconfig file.
 
---- CMakeLists.txt.orig        2023-02-01 07:25:02.000000000 +0000
+--- CMakeLists.txt.orig        2024-02-24 08:29:39.000000000 +0000
 +++ CMakeLists.txt
-@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.12)
- 
- project(libsrtp2 VERSION 2.5.0 LANGUAGES C)
+@@ -7,6 +7,7 @@ set(CMAKE_C_STANDARD_REQUIRED ON)
+ set(CMAKE_C_EXTENSIONS ON)
+ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
  
 +set(PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
- set(PACKAGE_VERSION ${CMAKE_PROJECT_VERSION})
- set(PACKAGE_STRING "${CMAKE_PROJECT_NAME} ${CMAKE_PROJECT_VERSION}")
+ set(PACKAGE_VERSION ${PROJECT_VERSION})
+ set(PACKAGE_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
  
-@@ -278,6 +279,12 @@ install(TARGETS srtp2 DESTINATION lib
+@@ -302,6 +303,12 @@ install(TARGETS srtp2 DESTINATION lib
    EXPORT libSRTPTargets
  )