From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2BCF61382C5 for ; Fri, 12 Jun 2020 18:20:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A851E08F2; Fri, 12 Jun 2020 18:20:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1276AE08F2 for ; Fri, 12 Jun 2020 18:20:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 437D234F220 for ; Fri, 12 Jun 2020 18:20:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C82C1288 for ; Fri, 12 Jun 2020 18:20:08 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1591986005.6a1adc628363b4622c055acdcf20020ff49f2f95.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/libsrtp/, net-libs/libsrtp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild net-libs/libsrtp/libsrtp-2.3.0.ebuild X-VCS-Directories: net-libs/libsrtp/files/ net-libs/libsrtp/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 6a1adc628363b4622c055acdcf20020ff49f2f95 X-VCS-Branch: master Date: Fri, 12 Jun 2020 18:20:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e3171b05-6c6b-48d8-88aa-64985630a8a5 X-Archives-Hash: 1c7e2d590b530b725ee4d0e663c9f454 commit: 6a1adc628363b4622c055acdcf20020ff49f2f95 Author: Stephan Hartmann googlemail com> AuthorDate: Fri Jun 12 17:38:46 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Fri Jun 12 18:20:05 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a1adc62 net-libs/libsrtp: fix nss dependency, add rtp patch Thanks-to: Joakim Tjernlund infinera.com> Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Stephan Hartmann googlemail.com> Signed-off-by: Mike Gilbert gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/16205 .../libsrtp/files/libsrtp-2.3.0-rtp-header.patch | 24 ++++++++++++++++++++++ ...ibsrtp-2.3.0.ebuild => libsrtp-2.3.0-r1.ebuild} | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch b/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch new file mode 100644 index 00000000000..096b19e8f34 --- /dev/null +++ b/net-libs/libsrtp/files/libsrtp-2.3.0-rtp-header.patch @@ -0,0 +1,24 @@ +From 55299517f39e2e1a34df05c27cbc9898071ac9db Mon Sep 17 00:00:00 2001 +From: Lennart Grahl +Date: Mon, 18 May 2020 18:01:08 +0200 +Subject: [PATCH] Fix two-byte RTP header extension encryption + +Also ignores the application bits as required by RFC 8285, sec 4.3 +Fixes #490 +--- + srtp/srtp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/srtp/srtp.c b/srtp/srtp.c +index b45cee0f..176b01f0 100644 +--- a/srtp/srtp.c ++++ b/srtp/srtp.c +@@ -1423,7 +1423,7 @@ static srtp_err_status_t srtp_process_header_encryption( + xtn_hdr_data++; + } + } +- } else if ((ntohs(xtn_hdr->profile_specific) & 0x1fff) == 0x100) { ++ } else if ((ntohs(xtn_hdr->profile_specific) & 0xfff0) == 0x1000) { + /* RFC 5285, section 4.3. Two-Byte Header */ + while (xtn_hdr_data + 1 < xtn_hdr_end) { + uint8_t xid = *xtn_hdr_data; diff --git a/net-libs/libsrtp/libsrtp-2.3.0.ebuild b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild similarity index 95% rename from net-libs/libsrtp/libsrtp-2.3.0.ebuild rename to net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild index b534d6b7f95..552f914255b 100644 --- a/net-libs/libsrtp/libsrtp-2.3.0.ebuild +++ b/net-libs/libsrtp/libsrtp-2.3.0-r1.ebuild @@ -22,7 +22,7 @@ RDEPEND=" !libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] ) libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] ) ) - nss? ( dev-libs/nss ) + nss? ( >=dev-libs/nss-3.52[${MULTILIB_USEDEP}] ) " DEPEND="${RDEPEND}" @@ -36,6 +36,7 @@ DOCS=( CHANGES ) PATCHES=( "${FILESDIR}/${P}-gcc-10.patch" "${FILESDIR}/${P}-nss.patch" + "${FILESDIR}/${P}-rtp-header.patch" ) src_prepare() {