From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 71DON1uwZGCQCQAAgWs5BA (envelope-from ) for ; Wed, 31 Mar 2021 19:24:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id EJaDMFuwZGDHSgAAbx9fmQ (envelope-from ) for ; Wed, 31 Mar 2021 17:24:43 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 561361B7BE for ; Wed, 31 Mar 2021 19:24:43 +0200 (CEST) Received: from localhost ([::1]:47738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lReaA-0008GI-EU for larch@yhetil.org; Wed, 31 Mar 2021 13:24:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lReZc-0007Tz-PO for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:10 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43891) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lReZZ-0006Ff-8C for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lReZZ-0002xi-4a for guix-patches@gnu.org; Wed, 31 Mar 2021 13:24:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH v2 07/12] gnu: pjproject-jami: Fix CVE-2020-15260 and CVE-2021-21375. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 17:24:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47513 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47513@debbugs.gnu.org Cc: Jack Hill , Maxime Devos , Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161721139311234 (code B ref 47513); Wed, 31 Mar 2021 17:24:05 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 17:23:13 +0000 Received: from localhost ([127.0.0.1]:55418 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYi-0002v2-Ss for submit@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:13 -0400 Received: from mail-qv1-f51.google.com ([209.85.219.51]:39871) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lReYb-0002sg-V2 for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 13:23:06 -0400 Received: by mail-qv1-f51.google.com with SMTP id q9so10313814qvm.6 for <47513@debbugs.gnu.org>; Wed, 31 Mar 2021 10:23:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BK4q44gi8stqYjxO5ii2WjRMFUa2AoDtGI3nDVIDaWw=; b=UafaCLLSh22ifKSbekF7CLUwJqN00XTaiBcckCyxAp3f8wJGuf2tGFr8Etk1c5OIZL Dt5SZKdrkjuvKxE5f91MBa++HaXqLN8H3KIocXCm1+aXLUXKcxzeIvVgMea3gTVdXoEf gEViCIoUeEZQ9M3lXIY2/jpLcyAowMI/zeegspsEFLc0PNd5d/zvhEbz1bcja31KToHq aSaDIiMhWNwYuaZsM0qqqgfVWWvlnoGAeGQ+6rvdw2kvT5knbjCBmg2r5J7pvmqQoMrN bRgg6aHIKhki30x9FLuG+YWThWwZMKzpXOjVHk39cdYbnhElWV+RVYE8owYtWNPZkLDa ek/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BK4q44gi8stqYjxO5ii2WjRMFUa2AoDtGI3nDVIDaWw=; b=azYIOGiyQUH+3++pkr1INiPP50EnwaIEJs951/d0ja4GbJ3tcO2P81sd/2VgkhUKdE TRuEo+zXEIogB9471ETZjbl0TpaEnDKR7n8ThXqIiaWXXNBY1H3SGeTzqKJQrLY3QhQ6 joSaiutTPFfAMbcQJeRbeW4m0drN8hXDAe1MFiDSXAJ4jYbaREkdxUrJL6Iz9sVnq1IK fpp1SoqMw3hOqZJTUfL9cNALhbezz0RQcEW3pgo1z14DBYeJIucuugB/zw7ZISUIy+pl wxEdAXIJbZU1T9cRYEXNQ7nvLM0BFQS9M3Ypk7mjzllxQsbtnCcI7kJMoBz/ksSISTpp gfzQ== X-Gm-Message-State: AOAM531HKfFLk5IvSoRi92jKGXgPH7GVO1O1Kgn9pd6oxNQKTAwYK/XZ pbtB+Y5BhHMjLd3Zu2G/32qLYmCvqb/NwA== X-Google-Smtp-Source: ABdhPJzxRNAjVEXb/sD1vZdP65k93QKhG7jxgIPKWQWVjKR1YYXMJaO1MvNeWHaBHMXQa3qY/3GEeA== X-Received: by 2002:a0c:bd2f:: with SMTP id m47mr4145414qvg.53.1617211380268; Wed, 31 Mar 2021 10:23:00 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id c5sm1891349qkg.105.2021.03.31.10.22.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Mar 2021 10:23:00 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 13:22:27 -0400 Message-Id: <20210331172232.22483-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331172232.22483-1-maxim.cournoyer@gmail.com> References: <20210331172232.22483-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1617211483; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=BK4q44gi8stqYjxO5ii2WjRMFUa2AoDtGI3nDVIDaWw=; b=VnHKjc082LysIEeKs7HIyIoN6b5AkQVTEh28FL+r5jInBBnZBnradVFCZH91OxOkiTTl4T oJvRraXVj9uNlCwQSfxDW9vWnT8FDXXMIjeLCoqrP7n1knjSC+sqYOdbBE81KrePA+/AWY UxvEkrew3yXHU14+1O1XzMZJLuDOPRX3sBmrLt+d3ZLsjEolp5NbN0xHHfFFbUd2rLKhKn rsZVBCr4Vj2m7i68iUzgDSlhdhwwzIpRvlOLwq2PnkJO6cpb5EkBFaq3IdskccnHHB5sbe SIAuClLRIcmsmLIvmwKH2spRMpbUNfrHiervGsBhW48hgOTG0IMdFmlhXGJ08Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617211483; a=rsa-sha256; cv=none; b=kFZ89PeFPQcpIYGO5fdMuiTDskmTDRfq94fdBLQSsPtO3+cSY63NrOlB0LE1zOEzn4DYVs Hx6VboDoE9F5I9vk5M4AqImkc1OEOYSnCMZmIGGFP65mPlqsWDmW5N3lAq/y/e7pcAex/x u69D7fB0cLWwqzPYSHJvECxgf6AYbM30dYUMMbFVf99TG8imP/Msl1YpbRkm4KlQ8nag0M UpdSHkXxW4oj06XgCVXs4cUxqZVRZgmpXNh3vD2cYUEfvnVdKQVfAsrbZ1twx68+oOQ887 sGBeETdpZ/iGKZyhDp4oN9eKtbds50lO+n6ub65oS2vd/PGYe6se0WE2YmH83Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=UafaCLLS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 0.17 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20161025 header.b=UafaCLLS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 561361B7BE X-Spam-Score: 0.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: FL7PUDTM0/Bm The custom pjproject package used by Jami is updated with the latest patches found in the 20210326.1.cfba013 release of Jami. * gnu/packages/jami.scm (%jami-version): Update to 20210326.1.cfba013. (jami-source) [snippet]: Update comment. Add client-electron and client-ios to the list of deleted directories. Remove client-windows from the list, as it no longer exists. (jami-apply-dependency-patches): Update comment. Ignore whitespace when applying patches, otherwise the pjproject patches would not apply. (pjproject-jami): Add comment. [source]: Define the source; the parent pjproject package was updated was updated to 2.11, but the patches only apply against 2.10. [phases] : Update the list of patches used with those found in the release tarball. --- gnu/packages/jami.scm | 52 ++++++++++++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 3773c1ab0a..35d84bb37b 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2019 Pierre Neidhardt ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2019, 2020 Jan Wielkiewicz -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -63,7 +63,7 @@ #:use-module (guix utils) #:use-module (srfi srfi-1)) -(define %jami-version "20200710.1.6bd18d2") +(define %jami-version "20210326.1.cfba013") (define* (jami-source #:key keep-contrib-patches?) "Return an origin object of the tarball release sources archive of Jami. @@ -78,7 +78,7 @@ of Jami." (modules '((guix build utils))) (snippet `(begin - ;; Delete over 200 MiB of bundled tarballs. The contrib directory + ;; Delete multiple MiBs of bundled tarballs. The contrib directory ;; contains the custom patches for pjproject and other libraries used ;; by Savoir-faire Linux. (if ,keep-contrib-patches? @@ -86,21 +86,21 @@ of Jami." (delete-file-recursively "daemon/contrib")) ;; Remove code from unused Jami clients. (for-each delete-file-recursively '("client-android" + "client-electron" + "client-ios" "client-macosx" - "client-uwp" - "client-windows")) - #t)) + "client-uwp")))) (sha256 (base32 - "0lg61jv39x7kc9lq30by246xb6gcgp1rzj49ak7ff8nqpfzyfvva")))) + "1h0avma8bdzyznkz39crjyv2888bii4f49md15jg7970dyp5pdyz")))) (define %sfl-patches (jami-source #:keep-contrib-patches? #t)) (define %jami-sources (jami-source)) -;; Savoir-faire Linux modifies many libraries to add features -;; to Jami. This procedure makes applying patches to a given -;; package easy. +;; Savoir-faire Linux maintains a set of patches for some key dependencies +;; (currently pjproject and ffmpeg) of Jami that haven't yet been integrated +;; upstream. This procedure simplifies the process of applying these patches.x (define jami-apply-dependency-patches '(lambda* (#:key inputs dep-name patches) (let ((patches-directory "sfl-patches")) @@ -112,15 +112,30 @@ of Jami." dep-name)) (for-each (lambda (file) - (invoke "patch" "--force" "-p1" "-i" + (invoke "patch" "--force" "--ignore-whitespace" "-p1" "-i" (string-append patches-directory "/" file ".patch"))) patches)))) +;;; Jami maintains pjproject patches that add the ability to do ICE over TCP, +;;; among other things. The patches are currently based on pjproject 2.10. (define-public pjproject-jami (package (inherit pjproject) (name "pjproject-jami") + (version "2.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pjsip/pjproject") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) + (patches (search-patches + "pjproject-correct-the-cflags-field.patch" + "pjproject-fix-pkg-config-ldflags.patch")))) (native-inputs `(("sfl-patches" ,%sfl-patches) ,@(package-native-inputs pjproject))) @@ -140,14 +155,19 @@ of Jami." "0004-multiple_listeners" "0005-fix_ebusy_turn" "0006-ignore_ipv6_on_transport_check" - "0007-pj_ice_sess" + "0007-upnp-srflx-nat-assisted-cand" "0008-fix_ioqueue_ipv6_sendto" "0009-add-config-site" - ;; Note: The base pjproject is already patched with - ;; "0010-fix-pkgconfig". + ;; Already taken care of via the origin patches. + ;;"0010-fix-pkgconfig" "0011-fix-tcp-death-detection" - "0012-fix-turn-shutdown-crash")) - #t)))))))) + "0012-fix-turn-shutdown-crash" + "0013-Assign-unique-local-preferences-for-candidates-with-" + "0014-Add-new-compile-time-setting-PJ_ICE_ST_USE_TURN_PERM" + "0015-update-local-preference-for-peer-reflexive-candidate" + "0016-use-addrinfo-instead-CFHOST" + "0017-CVE-2020-15260" + "0018-CVE-2021-21375")))))))))) ;; The following variables are configure flags used by ffmpeg-jami. They're ;; from the ring-project/daemon/contrib/src/ffmpeg/rules.mak file. We try to -- 2.31.1