Upstream points at commit log as "change log": https://github.com/cisco/libsrtp/compare/v2.4.0...v2.5.0
Dynamic export symbols were removed. The killall/pkill patch got merged, the tv_sec/long patch done differently which now builds without warnings on amd64. Tests pass on amd64. Only lightly tested with net/dino; I'm looking into net/tg_owt support for system libsrtp now that tg_owt updated its bundle to 2.5.0. Feedback? OK? Index: Makefile =================================================================== RCS file: /cvs/ports/security/libsrtp/Makefile,v retrieving revision 1.18 diff -u -p -r1.18 Makefile --- Makefile 11 Mar 2022 19:53:32 -0000 1.18 +++ Makefile 6 May 2023 10:09:20 -0000 @@ -1,10 +1,10 @@ -SHARED_LIBS += srtp2 3.0 +SHARED_LIBS += srtp2 4.0 COMMENT= secure RTP library GH_ACCOUNT= cisco GH_PROJECT= libsrtp -GH_TAGNAME= v2.4.2 +GH_TAGNAME= v2.5.0 CATEGORIES= security telephony Index: distinfo =================================================================== RCS file: /cvs/ports/security/libsrtp/distinfo,v retrieving revision 1.10 diff -u -p -r1.10 distinfo --- distinfo 21 Sep 2021 08:44:55 -0000 1.10 +++ distinfo 6 May 2023 09:59:57 -0000 @@ -1,2 +1,2 @@ -SHA256 (libsrtp-2.4.2.tar.gz) = OxvLFOvaVysEub3wdXSkSchMuSSQVBTk2U5ig30itig= -SIZE (libsrtp-2.4.2.tar.gz) = 631393 +SHA256 (libsrtp-2.5.0.tar.gz) = ikPvjpritmUpJZGvYqoaSuQeRottmNglj5FHhzXaTgk= +SIZE (libsrtp-2.5.0.tar.gz) = 638704 Index: patches/patch-srtp_srtp_c =================================================================== RCS file: /cvs/ports/security/libsrtp/patches/patch-srtp_srtp_c,v retrieving revision 1.4 diff -u -p -r1.4 patch-srtp_srtp_c --- patches/patch-srtp_srtp_c 11 Mar 2022 19:53:32 -0000 1.4 +++ patches/patch-srtp_srtp_c 6 May 2023 10:05:51 -0000 @@ -5,7 +5,7 @@ https://gitlab.linphone.org/BC/public/ex Index: srtp/srtp.c --- srtp/srtp.c.orig +++ srtp/srtp.c -@@ -2837,6 +2837,19 @@ srtp_err_status_t srtp_dealloc(srtp_t session) +@@ -2903,6 +2903,19 @@ srtp_err_status_t srtp_dealloc(srtp_t session) return srtp_err_status_ok; } Index: patches/patch-test_rtp_decoder_c =================================================================== RCS file: /cvs/ports/security/libsrtp/patches/patch-test_rtp_decoder_c,v retrieving revision 1.5 diff -u -p -r1.5 patch-test_rtp_decoder_c --- patches/patch-test_rtp_decoder_c 11 Mar 2022 19:53:32 -0000 1.5 +++ patches/patch-test_rtp_decoder_c 6 May 2023 10:05:51 -0000 @@ -1,10 +1,9 @@ #1: probably a strict alignment fix -#2, 64-bit time_t on 32-bit archs Index: test/rtp_decoder.c --- test/rtp_decoder.c.orig +++ test/rtp_decoder.c -@@ -714,7 +714,8 @@ void rtp_decoder_handle_pkt(u_char *arg, +@@ -743,7 +743,8 @@ void rtp_decoder_handle_pkt(u_char *arg, dcdr->frame_nr++; if ((dcdr->start_tv.tv_sec == 0) && (dcdr->start_tv.tv_usec == 0)) { @@ -14,12 +13,3 @@ Index: test/rtp_decoder.c } if (hdr->caplen < dcdr->rtp_offset) { -@@ -764,7 +765,7 @@ void rtp_decoder_handle_pkt(u_char *arg, - dcdr->rtcp_cnt++; - } - timersub(&hdr->ts, &dcdr->start_tv, &delta); -- fprintf(stdout, "%02ld:%02ld.%06ld\n", delta.tv_sec / 60, delta.tv_sec % 60, -+ fprintf(stdout, "%02lld:%02lld.%06ld\n", (long long)delta.tv_sec / 60, (long long)delta.tv_sec % 60, - (long)delta.tv_usec); - hexdump(&message, octets_recvd); - } Index: patches/patch-test_rtpw_test_sh =================================================================== RCS file: patches/patch-test_rtpw_test_sh diff -N patches/patch-test_rtpw_test_sh --- patches/patch-test_rtpw_test_sh 11 Mar 2022 19:53:32 -0000 1.7 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -https://github.com/cisco/libsrtp/pull/594 - -Index: test/rtpw_test.sh ---- test/rtpw_test.sh.orig -+++ test/rtpw_test.sh -@@ -66,13 +66,13 @@ key=Ky7cUDT2GnI0XKWYbXv9AYmqbcLsqzL9mvdN9t/G - - ARGS="-b $key -a -e 128" - --# First, we run "killall" to get rid of all existing rtpw processes. -+# First, we run "pkill" to get rid of all existing rtpw processes. - # This step also enables this script to clean up after itself; if this - # script is interrupted after the rtpw processes are started but before - # they are killed, those processes will linger. Re-running the script - # will get rid of them. - --killall rtpw 2>/dev/null -+pkill rtpw 2>/dev/null - - if test -n $MESON_EXE_WRAPPER || test -x $RTPW; then -
