Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/comms/srtp srtp: updated to 2.3.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/4f5630f2e6f7
branches: trunk
changeset: 430882:4f5630f2e6f7
user: adam <adam%pkgsrc.org@localhost>
date: Tue May 05 17:54:39 2020 +0000
description:
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.
diffstat:
comms/srtp/Makefile | 30 ++-
comms/srtp/PLIST | 46 +-----
comms/srtp/buildlink3.mk | 5 +-
comms/srtp/distinfo | 23 +--
comms/srtp/patches/patch-CMakeLists.txt | 39 +++++
comms/srtp/patches/patch-Makefile.in | 106 ----------------
comms/srtp/patches/patch-configure | 27 ----
comms/srtp/patches/patch-configure.in | 26 ---
comms/srtp/patches/patch-crypto_cipher_aes__icm.c | 22 ---
comms/srtp/patches/patch-crypto_hash_hmac.c | 58 --------
comms/srtp/patches/patch-crypto_kernel_crypto__kernel.c | 24 ---
comms/srtp/patches/patch-crypto_math_datatypes.c | 13 -
comms/srtp/patches/patch-crypto_math_gf2__8.c | 13 -
comms/srtp/patches/patch-crypto_math_math.c | 47 -------
comms/srtp/patches/patch-include_srtp.h | 21 ---
comms/srtp/patches/patch-srtp_srtp.c | 19 --
comms/srtp/patches/patch-test_rtpw__test.sh | 13 -
17 files changed, 75 insertions(+), 457 deletions(-)
diffs (truncated from 619 to 300 lines):
diff -r fb2b7d01214e -r 4f5630f2e6f7 comms/srtp/Makefile
--- a/comms/srtp/Makefile Tue May 05 17:51:45 2020 +0000
+++ b/comms/srtp/Makefile Tue May 05 17:54:39 2020 +0000
@@ -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
+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= http://srtp.sourceforge.net/
-COMMENT= Secure Real-time Transport Protocol library
+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"
diff -r fb2b7d01214e -r 4f5630f2e6f7 comms/srtp/PLIST
--- a/comms/srtp/PLIST Tue May 05 17:51:45 2020 +0000
+++ b/comms/srtp/PLIST Tue May 05 17:54:39 2020 +0000
@@ -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
diff -r fb2b7d01214e -r 4f5630f2e6f7 comms/srtp/buildlink3.mk
--- a/comms/srtp/buildlink3.mk Tue May 05 17:51:45 2020 +0000
+++ b/comms/srtp/buildlink3.mk Tue May 05 17:54:39 2020 +0000
@@ -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
diff -r fb2b7d01214e -r 4f5630f2e6f7 comms/srtp/distinfo
--- a/comms/srtp/distinfo Tue May 05 17:51:45 2020 +0000
+++ b/comms/srtp/distinfo Tue May 05 17:54:39 2020 +0000
@@ -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
diff -r fb2b7d01214e -r 4f5630f2e6f7 comms/srtp/patches/patch-CMakeLists.txt
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/comms/srtp/patches/patch-CMakeLists.txt Tue May 05 17:54:39 2020 +0000
@@ -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)
diff -r fb2b7d01214e -r 4f5630f2e6f7 comms/srtp/patches/patch-Makefile.in
--- a/comms/srtp/patches/patch-Makefile.in Tue May 05 17:51:45 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2015/09/06 14:02:08 joerg Exp $
-
---- Makefile.in.orig 2006-07-18 17:42:42.000000000 +0000
-+++ Makefile.in
-@@ -66,44 +66,44 @@ libdir = @libdir@
-
- # implicit rules for object files and test apps
-
-+%.lo: %.c
-+ libtool --mode=compile $(COMPILE) -c $< -o $@
- %.o: %.c
- $(COMPILE) -c $< -o $@
-
- %$(EXE): %.c
-- $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
--
-+ libtool --mode=link $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS)
-
- # libcrypt.a (the crypto engine)
--ciphers = crypto/cipher/cipher.o crypto/cipher/null_cipher.o \
-- crypto/cipher/aes.o crypto/cipher/aes_icm.o \
-- crypto/cipher/aes_cbc.o
-+ciphers = crypto/cipher/cipher.lo crypto/cipher/null_cipher.lo \
-+ crypto/cipher/aes.lo crypto/cipher/aes_icm.lo \
-+ crypto/cipher/aes_cbc.lo
-
--hashes = crypto/hash/null_auth.o crypto/hash/sha1.o \
-- crypto/hash/hmac.o crypto/hash/auth.o # crypto/hash/tmmhv2.o
-+hashes = crypto/hash/null_auth.lo crypto/hash/sha1.lo \
-+ crypto/hash/hmac.lo crypto/hash/auth.lo # crypto/hash/tmmhv2.lo
-
--replay = crypto/replay/rdb.o crypto/replay/rdbx.o \
-- crypto/replay/ut_sim.o
-+replay = crypto/replay/rdb.lo crypto/replay/rdbx.lo \
-+ crypto/replay/ut_sim.lo
-
--math = crypto/math/datatypes.o crypto/math/stat.o
-+math = crypto/math/datatypes.lo crypto/math/stat.lo
-
--ust = crypto/ust/ust.o
-+ust = crypto/ust/ust.lo
-
--rng = crypto/rng/$(RNG_OBJS) crypto/rng/prng.o crypto/rng/ctr_prng.o
-+rng = crypto/rng/$(RNG_OBJS) crypto/rng/prng.lo crypto/rng/ctr_prng.lo
-
--err = crypto/kernel/err.o
-+err = crypto/kernel/err.lo
-
--kernel = crypto/kernel/crypto_kernel.o crypto/kernel/alloc.o \
-- crypto/kernel/key.o $(rng) $(err) # $(ust)
-+kernel = crypto/kernel/crypto_kernel.lo crypto/kernel/alloc.lo \
-+ crypto/kernel/key.lo $(rng) $(err) # $(ust)
-
- cryptobj = $(ciphers) $(hashes) $(math) $(stat) $(kernel) $(replay)
-
- # libsrtp.a (implements srtp processing)
-
--srtpobj = srtp/srtp.o
-+srtpobj = srtp/srtp.lo
-
--libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi)
-- ar cr libsrtp.a $^
-- $(RANLIB) libsrtp.a
-+libsrtp.la: $(srtpobj) $(cryptobj) $(gdoi)
-+ libtool --mode=link ${CC} -rpath ${libdir} -version-info 1 -o $@ $(srtpobj) $(cryptobj) $(gdoi)
-
- # libcryptomath.a contains general-purpose routines that are used to
- # generate tables and verify cryptoalgorithm implementations - this
-@@ -127,19 +127,19 @@ testapp = $(crypto_testapp) test/srtp_dr
- test/roc_driver$(EXE) test/rdbx_driver$(EXE) test/rtpw$(EXE) \
- test/dtls_srtp_driver$(EXE)
-
--$(testapp): libsrtp.a
-+$(testapp): libsrtp.la
-
--test/rtpw$(EXE): test/rtpw.c test/rtp.c test/getopt_s.c
-- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-+test/rtpw$(EXE): test/rtpw.lo test/rtp.lo test/getopt_s.lo
-+ libtool --mode=link $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-
--test/srtp_driver$(EXE): test/srtp_driver.c test/getopt_s.c
-- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-+test/srtp_driver$(EXE): test/srtp_driver.lo test/getopt_s.lo
-+ libtool --mode=link $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-
--test/rdbx_driver$(EXE): test/rdbx_driver.c test/getopt_s.c
-- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-+test/rdbx_driver$(EXE): test/rdbx_driver.lo test/getopt_s.lo
-+ libtool --mode=link $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-
--test/dtls_srtp_driver$(EXE): test/dtls_srtp_driver.c test/getopt_s.c
-- $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-+test/dtls_srtp_driver$(EXE): test/dtls_srtp_driver.lo test/getopt_s.lo
-+ libtool --mode=link $(COMPILE) $(LDFLAGS) -o $@ $^ $(LIBS) $(SRTPLIB)
-
- test: $(testapp)
- @echo "Build done. Please run '$(MAKE) runtest' to run self tests."
-@@ -196,7 +196,7 @@ install:
- $(INSTALL) -d $(DESTDIR)$(libdir)
- cp include/*.h $(DESTDIR)$(includedir)/srtp
- cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp
-- if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi
-+ if [ -f libsrtp.la ]; then libtool --mode=install cp libsrtp.la $(DESTDIR)$(libdir)/; fi
-
- uninstall:
- rm -rf $(DESTDIR)$(includedir)/srtp
diff -r fb2b7d01214e -r 4f5630f2e6f7 comms/srtp/patches/patch-configure
--- a/comms/srtp/patches/patch-configure Tue May 05 17:51:45 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2015/09/06 14:02:08 joerg Exp $
-
---- configure.orig 2005-10-03 15:23:13.000000000 +0000
-+++ configure
Home |
Main Index |
Thread Index |
Old Index