From patchwork Wed Mar 31 05:23:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28209 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 10F1027BC66; Wed, 31 Mar 2021 06:24:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BD61C27BC65 for ; Wed, 31 Mar 2021 06:24:13 +0100 (BST) Received: from localhost ([::1]:43404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTKu-0000Eu-W1 for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:24:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTKl-0000Ei-Ee for guix-patches@gnu.org; Wed, 31 Mar 2021 01:24:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41689) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTKl-0005n1-6p for guix-patches@gnu.org; Wed, 31 Mar 2021 01:24:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTKl-00033L-1G for guix-patches@gnu.org; Wed, 31 Mar 2021 01:24:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 01/12] gnu: asio: Update to 1.18.1. References: <87y2e3kifn.fsf@gmail.com> In-Reply-To: <87y2e3kifn.fsf@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:24:02 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716824111708 (code B ref 47513); Wed, 31 Mar 2021 05:24:02 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:01 +0000 Received: from localhost ([127.0.0.1]:53230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKi-00032k-Ll for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:00 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:46825) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKg-00032J-Or for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:23:59 -0400 Received: by mail-qk1-f177.google.com with SMTP id z10so18252134qkz.13 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:23:58 -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:mime-version :content-transfer-encoding; bh=uHj020zj79wwTXZp70p2UYiqSuHglBr1fyNs9B1OAyA=; b=qidCBoXJqYJMRjOz35NbH96k6n7H6oMPZOtEAPxr1J6jQ2G0sbzc//c3eFbHXABKxc F7Gk3vH95tKu8MZOykTZdn+CCrt7+2cvcVJVXIyQXBjlOtW57VzZ2k8C37ZW07E9naXe dyKjYR3Yb6wTo59C4uglKxum26TvA83p/KTPIKoVQujVXEHe4ilfFxlBM0pHO3SlMtbu zNx1OfCEKWzlFMLQzjijr2mSVrjX3GKHqNDrsJUCx1XoCQxHlfr5jyVAxc4SwqgyeUBO EKIRDcNXIr99JmQpADhj2vZ/1yQox7ilVas1CsI/3+HyXGTs4FA3p92M3YraGEr6d9fv kBwA== 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:mime-version :content-transfer-encoding; bh=uHj020zj79wwTXZp70p2UYiqSuHglBr1fyNs9B1OAyA=; b=B25I3xwz2F02hFqLJsVj9nvdItD+PLetE0qk4BPNQpHRlPjXp7LKcORpjo38y38JEm Q7aSwfAruEjl0KKovZ4qq6wL8AYPNyiCGFagOMWAAl7rP344ku5U/+HgRYb+tFqEsPKb Qwkza+pejqJg/8KqMWctTuQUSGb5pruwFZZJIO4N1POb0XInUecVxiN4zfDLplrH6Y7n DKMTCyPPypGXPbKJWL7r4A7gQOcltAZFPSQZYFAqixc2PgdoDuPQ7War/ndVdoxVMGrh ufTED/Ke2pla/pW/y55Ijc9uQrqD3v4la1V5yTZnHarjKJp8kzqq7qJEev3PTmcEt/4L Oc1g== X-Gm-Message-State: AOAM533WBIESQ1//oJ/RU+fpBYATMgwT0CmXJGn7NqFHKMHoTrdz0wSl DvWtTjjWQcOsz3SQQl/eV/86TcBokvU= X-Google-Smtp-Source: ABdhPJx0ybZH6qTyCgMe5VsoMyhmIY3pzqJ5juXryBZSULZ5jAJq9XyRqP/zPd7syBBuVXnmMLx1Fg== X-Received: by 2002:a37:5b84:: with SMTP id p126mr1661198qkb.142.1617168232872; Tue, 30 Mar 2021 22:23:52 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:52 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:37 -0400 Message-Id: <20210331052348.5164-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (asio): Update to 1.18.1. (asio-1.12): New variable. * gnu/packages/emulators.scm (mame)[inputs]: Use asio-1.12, otherwise it fails to build. --- gnu/packages/emulators.scm | 2 +- gnu/packages/networking.scm | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 1cd23c3e6c..cfe909b3a6 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -1743,7 +1743,7 @@ This is a part of the TiLP project.") ("texinfo" ,texinfo))) (inputs `(("alsa-lib" ,alsa-lib) - ("asio" ,asio) + ("asio" ,asio-1.12) ;the bundled copy is at 1.11 ("expat" ,expat) ("flac" ,flac) ("fontconfig" ,fontconfig) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ecc6f57f4e..fe2499815b 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -26,7 +26,7 @@ ;;; Copyright © 2018, 2020 Marius Bakke ;;; Copyright © 2018, 2020 Oleg Pykhalov ;;; Copyright © 2018 Pierre Neidhardt -;;; Copyright © 2019, 2020 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer ;;; Copyright © 2019 Vasile Dumitrascu ;;; Copyright © 2019 Julien Lepiller ;;; Copyright © 2019 Timotej Lazar @@ -3027,7 +3027,8 @@ eight bytes) tools ;; Either BSD-3 or GPL-2 can be used. (license (list license:bsd-3 license:gpl2)))) -(define-public asio +;;; This is an old version required by rested. +(define-public asio-1.12 (package (name "asio") (version "1.12.2") @@ -3054,6 +3055,18 @@ low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.") (license license:boost1.0))) +(define-public asio + (package + (inherit asio-1.12) + (version "1.18.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/asio/asio/" + version " (Stable)/asio-" version ".tar.bz2")) + (sha256 + (base32 "04wi69d72l1p5c7d63z1dz06zn8pdqsbgx1if98dszs9ymfqgyaa")))))) + (define-public shadowsocks ;; There are some security fixes after the last release. (let* ((commit "e332ec93e9c90f1cbee676b022bf2c5d5b7b1239") From patchwork Wed Mar 31 05:23:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28210 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4969A27BC66; Wed, 31 Mar 2021 06:25:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B99EB27BC65 for ; Wed, 31 Mar 2021 06:25:10 +0100 (BST) Received: from localhost ([::1]:43678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTLp-0000Pa-Tv for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:25:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54792) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLi-0000PN-Fg for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41716) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLi-0006N1-6Y for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLi-00036d-3d for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 02/12] gnu: restbed: Update to 4.7. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:02 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716824311753 (code B ref 47513); Wed, 31 Mar 2021 05:25:02 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:03 +0000 Received: from localhost ([127.0.0.1]:53233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKj-00032n-0F for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:03 -0400 Received: from mail-qk1-f179.google.com ([209.85.222.179]:44948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKh-00032L-8U for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:23:59 -0400 Received: by mail-qk1-f179.google.com with SMTP id x11so42878qkp.11 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:23:59 -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=zKAKBmu8SpR75faE/aCuPYcRitQMKgpZWoesJi5jTuQ=; b=p+uccSDBgEQcFf9rr/wFRnxtsX/vrULKoFIY8+X4SpdPOAts++cd4lB+xZjRIXTYSB 5B6EDw8MbnyHyfUPamXq3AduK8mErbT7UtVLgl0XlwZaFS0sDrtjf8HFbEUz7D4OBX4P 3NztNoimGUQOd2t3wIMnegxdue/YeN1rCOlA/xlgVFEmBsSDIx9qxSoHnrKQv2lvv+AR Wntk2NsE2FyOqY/aRswwc8JXIIpGGwpWeBt8zREbP4KKBM/cX97oQ1u/Piv5GnYmWQnN 8hhQJr+bbtOvdGWrgjdM9IatZmX3VUDKIJBYIJrOItihv5gHmJ7ynqotPl/Qg1DxASeN iuOQ== 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=zKAKBmu8SpR75faE/aCuPYcRitQMKgpZWoesJi5jTuQ=; b=tlFz44BDe83qQyITIqfRzfZa80VlGbu4gGyQCUISz0/6tlKKXaoVhHOVx3+dwfnaU7 38Da9y0RSLov5p49bEus5yew6I9m3lFUQBoyMRFHYwdGZf/YNT0p9B600mQbB5kUw+Bj b6Q6nVUtNnVp/9IF9HhrBgR0G7RPCP4IBtWoaw223upk8iDBcGDKm0TOPwXSGfmTnZwu fy/gNntYZCsUCgkCt872pE5ChoCFsgyprHrVW5yKn+uzEyVrWGpixoGEwtxCZu3JSdXq 5bqgveuJjwPsU0t7vOyvyD/I/CaB1MYjlITnDon8zOlBa2TH2WdOyjBif3OSz+gbn2ta Tl4Q== X-Gm-Message-State: AOAM531/ZvWBTvjV/XMUCKp5ek9LY6C6P0M+pVeeexTeUmh8pFFv3B7E +55Ij+P3HchaYoV5Y7ZRastLVEktpfA= X-Google-Smtp-Source: ABdhPJyoIJLVJVSO+wy+4nLB/kkO9GZYbF8AYzMaXBp9XYXLoeDCss2w70t5eZljUGfr3TNyKO1T3A== X-Received: by 2002:a05:620a:108f:: with SMTP id g15mr1640250qkk.298.1617168233606; Tue, 30 Mar 2021 22:23:53 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:53 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:38 -0400 Message-Id: <20210331052348.5164-2-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (restbed): Update to 4.7. --- gnu/packages/networking.scm | 97 ++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 49 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index fe2499815b..ff0ccc95fc 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3332,57 +3332,56 @@ never see any machines other than the one Dante is running on.") (license (license:non-copyleft "file://LICENSE")))) (define-public restbed - (let ((commit "6eb385fa9051203f28bf96cc1844bbb5a9a6481f")) - (package - (name "restbed") - (version (git-version "4.6" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Corvusoft/restbed/") - (commit commit))) - (file-name (string-append name "-" version ".tar.gz")) - (sha256 - (base32 "0k60i5drklqqrb4khb25fzkgz9y0sncxf1sp6lh2bm1m0gh0661n")))) - (build-system cmake-build-system) - (inputs - `(("asio" ,asio) - ("catch" ,catch-framework) - ("openssl" ,openssl))) - (arguments - `(#:tests? #f - #:configure-flags - '("-DBUILD_TESTS=NO" - "-DBUILD_EXAMPLES=NO" - "-DBUILD_SSL=NO" - "-DBUILD_SHARED=NO") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'apply-patches-and-fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((asio (assoc-ref inputs "asio")) - (catch (assoc-ref inputs "catch")) - (openssl (assoc-ref inputs "openssl"))) - (substitute* "cmake/Findasio.cmake" - (("(find_path\\( asio_INCLUDE asio\\.hpp HINTS ).*$" all begin) - (string-append begin " \"" asio "/include\" )"))) - (substitute* "cmake/Findcatch.cmake" - (("(find_path\\( catch_INCLUDE catch\\.hpp HINTS ).*$" all begin) - (string-append begin " \"" catch "/include\" )"))) - (substitute* "cmake/Findopenssl.cmake" - (("(find_library\\( ssl_LIBRARY ssl ssleay32 HINTS ).*$" all begin) - (string-append begin " \"" openssl "/lib\" )")) - (("(find_library\\( crypto_LIBRARY crypto libeay32 HINTS ).*$" all begin) - (string-append begin " \"" openssl "/lib\" )")) - (("(find_path\\( ssl_INCLUDE openssl/ssl\\.h HINTS ).*$" all begin) - (string-append begin " \"" openssl "/include\" )"))))))))) - (synopsis "Asynchronous RESTful functionality to C++11 applications") - (description "Restbed is a comprehensive and consistent programming + (package + (name "restbed") + (version "4.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Corvusoft/restbed/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "055qicb773a599dsqbcz5xf0xj1wpk33mdrkyi0fsmyjmn8d2p9d")))) + (build-system cmake-build-system) + (inputs + `(("asio" ,asio-1.12) + ("catch" ,catch-framework) + ("openssl" ,openssl))) + (arguments + `(#:tests? #f + #:configure-flags + '("-DBUILD_TESTS=NO" + "-DBUILD_EXAMPLES=NO" + "-DBUILD_SSL=NO" + "-DBUILD_SHARED=NO") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'apply-patches-and-fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((asio (assoc-ref inputs "asio")) + (catch (assoc-ref inputs "catch")) + (openssl (assoc-ref inputs "openssl"))) + (substitute* "cmake/Findasio.cmake" + (("(find_path\\( asio_INCLUDE asio\\.hpp HINTS ).*$" all begin) + (string-append begin " \"" asio "/include\" )"))) + (substitute* "cmake/Findcatch.cmake" + (("(find_path\\( catch_INCLUDE catch\\.hpp HINTS ).*$" all begin) + (string-append begin " \"" catch "/include\" )"))) + (substitute* "cmake/Findopenssl.cmake" + (("(find_library\\( ssl_LIBRARY ssl ssleay32 HINTS ).*$" all begin) + (string-append begin " \"" openssl "/lib\" )")) + (("(find_library\\( crypto_LIBRARY crypto libeay32 HINTS ).*$" all begin) + (string-append begin " \"" openssl "/lib\" )")) + (("(find_path\\( ssl_INCLUDE openssl/ssl\\.h HINTS ).*$" all begin) + (string-append begin " \"" openssl "/include\" )"))))))))) + (synopsis "Asynchronous RESTful functionality to C++11 applications") + (description "Restbed is a comprehensive and consistent programming model for building applications that require seamless and secure communication over HTTP.") - (home-page "https://github.com/Corvusoft/restbed") - (license license:agpl3+)))) + (home-page "https://github.com/Corvusoft/restbed") + (license license:agpl3+))) (define-public restinio (package From patchwork Wed Mar 31 05:23:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28211 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 968E427BC67; Wed, 31 Mar 2021 06:25:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2F9AF27BC66 for ; Wed, 31 Mar 2021 06:25:24 +0100 (BST) Received: from localhost ([::1]:43760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTM3-0000Sa-Ax for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:25:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLi-0000PU-QG for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41717) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLi-0006N7-Iq for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLi-00036k-Fl for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 03/12] gnu: restinio: Update to 0.6.13. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:02 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716824911810 (code B ref 47513); Wed, 31 Mar 2021 05:25:02 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:09 +0000 Received: from localhost ([127.0.0.1]:53244 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKr-00034P-Bm for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:09 -0400 Received: from mail-qk1-f182.google.com ([209.85.222.182]:46831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKi-00032N-1a for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:01 -0400 Received: by mail-qk1-f182.google.com with SMTP id z10so18252177qkz.13 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:00 -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=hBffcvBFd/zYhLlOnAQj8AvWyXLYLQtcA5x3Gx4FGeE=; b=RxW1sHBXNncfuahLPKpTYk0YPjZLSw3xMwkpW12QWJeevyOw7H9ZYkhGyk/Xz6ty9F PHZ4nU8Fbwj5cHi2CNXfX0sfHEgWSJ65EZ6fmVbDR7PQQ2w6kbMrvZaQ6/p+W6Yy9504 LupAv2cm+oBqkKkAAoj/uVczQyMg6eZ3AJGt0ek6ktfhAACC9+LFxanb7mz5/ymg/8iq /aT5XfFDesagAcdVJxNvb4fRQmjU4TmJ/Ow/4iPRyojZXYgCGuRQblgKSbEinnmkvXeS TK2ob0LtUBT4zglMwP2GWFXB2vw4mpxmn4BLNth9FYpt6K4DFo2zpNRuaFVWRKKWwdV0 FqSg== 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=hBffcvBFd/zYhLlOnAQj8AvWyXLYLQtcA5x3Gx4FGeE=; b=G0KLtNWChwfZ/UXd1LlZS3gqHKy0xSNpKxScEdgocvLYdHRg0ecttySehdI0DoEoas 7SPW+xY520zyxG0L5GloEK2eRHvZOUwyPGR3YzAyz1WnEazZHEat6K8z320HnjDGFR/z S4KN+2hF2x3TISHwulHAI5BmJUx/MsTlei4iLz2TSfBeFQx6Ma/MGZIK8CVJycuAWoRJ 4o3xCpHbhQ54d8u4UjvV2J+d+rnZgP74gVQmlRdKcmJQSSsb7yiGHZb7/YTRMSEEC00a G0wal4rsaYOtdtK/ArWTmjqjR6R+eZS7IEQTmuuQxQT54DXcVuNkhzK9twU7xDI+ueke 8Itg== X-Gm-Message-State: AOAM530sQyghEgRIbYKxVcj8ARArzOyf6HA624NujB/ySpAjRtz0KA0k D13c1bCo93zHyagXxaz8SuKIr7Od418= X-Google-Smtp-Source: ABdhPJx7Kh4p4RDc0RQF8vuyKNunifX5+FAcYPZu52AGk+bKFNwDw4GObr4dP+qPKzfSP4kEeIu1Xw== X-Received: by 2002:a37:bbc4:: with SMTP id l187mr1556141qkf.153.1617168234481; Tue, 30 Mar 2021 22:23:54 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:54 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:39 -0400 Message-Id: <20210331052348.5164-3-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/networking.scm (restinio): Update to 0.6.13. --- gnu/packages/networking.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index ff0ccc95fc..464192ad7e 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3386,7 +3386,7 @@ communication over HTTP.") (define-public restinio (package (name "restinio") - (version "0.6.1.1") + (version "0.6.13") (source (origin (method git-fetch) (uri (git-reference @@ -3395,7 +3395,7 @@ communication over HTTP.") (file-name (git-file-name name version)) (sha256 (base32 - "141a96hx8zhcdv121g6cs91n46kb47y040v25pnvz5f54964z7f5")))) + "0gb0yc88hdzwm08zdiviay6s08q427za33kfbygib7bdzp2wr2dm")))) (build-system cmake-build-system) (inputs ; TODO: Need to force-keep references on some inputs, e.g. boost. `(("zlib" ,zlib) From patchwork Wed Mar 31 05:23:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28215 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 09C9127BC65; Wed, 31 Mar 2021 06:25:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 703E927BC67 for ; Wed, 31 Mar 2021 06:25:51 +0100 (BST) Received: from localhost ([::1]:44414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTMU-0000ld-9T for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:25:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54806) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLj-0000Pf-7S for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41718) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLj-0006Ng-0Z for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLi-00036s-Tw for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 04/12] gnu: Add nettle-3.7. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:02 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825011817 (code B ref 47513); Wed, 31 Mar 2021 05:25:02 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:10 +0000 Received: from localhost ([127.0.0.1]:53246 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKr-00034R-K6 for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:10 -0400 Received: from mail-qk1-f178.google.com ([209.85.222.178]:36801) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKi-00032O-Ms for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:01 -0400 Received: by mail-qk1-f178.google.com with SMTP id c4so18284279qkg.3 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:00 -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=hOmVUiZrKEloUk6+oiBjwcuj6xaKXR/1GWcGIZIa6pk=; b=Prb6WhqcnrnZuvwU3/IxmpVOFav/KmhY03YtKVIKX9uC6aqZbz51N56+1nFQ5Wi3FY BysmdKcfpTb8VDHdYqmtu2UYn12guqccVZPwcHr+BGHX8vAsNcw18qMo7VgUdz/Ekn5w 30L+spsLcIJuUHP9CI1h+wwWtczLsSF3Dh1KQLwsr057rX8Cqzu2+fJJcba+pADn+SMq nc89kVg3EG6v9yOwC/i3ybGj0uxCUn73YNtdBXQFDzAAbVYpCLbWdALKLKS3LtQlLG/X X1nRxo+657/uXB7jepR7H2EGavD/BQjrFYFKL/DWRFFDJMn3/K0gbM46DvmeVYauE3QF DPyg== 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=hOmVUiZrKEloUk6+oiBjwcuj6xaKXR/1GWcGIZIa6pk=; b=kh+fvHywSyHD3ZmSVAmWMOEULspYFrFnPiN4DDQZqJz8PMKqAl1TqmiDXznVyhq1mt Lga+eLeGsfSZXust7+muvUfyimMB9g13tRthzNKzux0OJJcrhJy0iZs3mUwZ5iC53jpG 8ssus6xCoP/CKrzJwOXSVnjUVGGAZWBxYgUxgeictQga6aEfvU4fFiEPZzxe66VZKQRB 8rC1kQ1NdXwOMw7RXXICRgClyZKmfsuTv/X63Cslq9r/b77TCxHYhN9pi6OHFnHyYPfN osSPbB3sU3fgXi+WGS4d1NR7fxtLQvkO8eBaHQMCMJFgicFRBtEimK3PzXHeiSkexsqy Bd2g== X-Gm-Message-State: AOAM533wUF0I6OgsuRQxoRnj3vimTkUCEeLw2gjB7at9kvc6fCjRn7Qb IO4kieF0aF4vnhDV4eij/2IRDh+V3B4= X-Google-Smtp-Source: ABdhPJxg7k+CeyTJWAkuuBNyTXhCeMXI1b6GeDvYNAYdhsf5Rayp7j1i30QPGCukbX5oFdeMQgPxXg== X-Received: by 2002:a37:7ec2:: with SMTP id z185mr1607182qkc.467.1617168235108; Tue, 30 Mar 2021 22:23:55 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:54 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:40 -0400 Message-Id: <20210331052348.5164-4-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches While nettle cannot be upgraded wholesale on the master branch, we can at least also offer the latest version available. * gnu/packages/nettle.scm (nettle-3.5, nettle-3.7): New variables. (nettle): Redefine as a binding to nettle-3.5, which is the current version. --- gnu/packages/nettle.scm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/gnu/packages/nettle.scm b/gnu/packages/nettle.scm index f5e7188ff0..753e2d6e7e 100644 --- a/gnu/packages/nettle.scm +++ b/gnu/packages/nettle.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2016 Mark H Weaver ;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -71,7 +72,7 @@ cryptographic toolkits for object-oriented languages or in applications themselves.") (license gpl2+))) -(define-public nettle +(define-public nettle-3.5 ;; This version is not API-compatible with version 2. In particular, lsh ;; cannot use it yet. So keep it separate. (package (inherit nettle-2) @@ -89,3 +90,17 @@ themselves.") ;; Build "fat" binaries where the right implementation is chosen ;; at run time based on CPU features (starting from 3.1.) `(cons "--enable-fat" ,flags)))))) + +(define-public nettle-3.7 + (package (inherit nettle-3.5) + (version "3.7.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/nettle/nettle-" + version ".tar.gz")) + (sha256 + (base32 + "0qpi1qp3bcvqdsaxy2pzg530db95x8qjahkynxgwvr6dy5760ald")))))) + +;;; Upgrading Nettle on master would cause 10000+ packages to be rebuilt. +(define-public nettle nettle-3.5) From patchwork Wed Mar 31 05:23:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28218 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0F9DB27BC66; Wed, 31 Mar 2021 06:26:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CCCC727BC65 for ; Wed, 31 Mar 2021 06:26:12 +0100 (BST) Received: from localhost ([::1]:45042 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTMq-00011m-0N for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:26:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54812) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLk-0000Qy-27 for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLj-0006OY-RR for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLj-000377-O4 for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 05/12] gnu: opendht: Update to 2.2.0rc4. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:03 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825111832 (code B ref 47513); Wed, 31 Mar 2021 05:25:03 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:11 +0000 Received: from localhost ([127.0.0.1]:53250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKs-00034g-HC for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:10 -0400 Received: from mail-qv1-f45.google.com ([209.85.219.45]:43778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKj-00032Q-MH for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:03 -0400 Received: by mail-qv1-f45.google.com with SMTP id cx5so9373594qvb.10 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:01 -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=XxtzBDE4YOGSqt8t6TPLmEHihxpxfVZqXidK7D6xJnc=; b=ner/MXU4tHiZQc/Oo05jK9b9J+OpVKMXZSqizBconhexRKXVu4QRjbq6lNsmZZHBaU 8G/K3dhM5JTjYOqmix8E89me5NI+ZH5b+CHCc1C3YUEUJkIdkdgOYo+yX6H3+C0qi1Fl fw+dHpneKA9jZpVgV/Cru5fJgn8xWcWGLuoEt9plCJVTIjg2b+Bhy2OyLoukke6PfESX BgD3FI0bOOhrqD3dyFm2fFlud0HR0itQd6wPsUEahxFvsJKungCV5vib0RwwgqFzjWbI r5tPfu2ksAugIjvwyqPgWD/O7FmGGvVmDTQHT/y6ApggQgtgnRkVtRamtpU/IAfHasSK Xlyw== 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=XxtzBDE4YOGSqt8t6TPLmEHihxpxfVZqXidK7D6xJnc=; b=g9cPJowBr/YgErXSsCc8qFw0sZYXo0PkCMZpBfxiOQJfyn0GSyHX9yWPj6hUighLAB 7vxgSwsgEp3GTbLGYxCL9Jcgk8+N+niGyPCF61HvKOlBM6ABbgE9sD1JfDxPMWW3tkTH YfSBClD2D2zc9DsBA6OAH1H75wGWdM1PE88vB+jgOm/rB75ZI263kqzsfyj0IxTMIhNR 8bH68jVXmJR66xpTuWfhLvx8gTEBm+mprQFfEDqkHi++oW+uegi3boQ5hpsvYU6bKzdh 4NAPBxRKAYkhrFpv4nf/uUi/qQVilIT/yJuMS5cnOGlH/mJcHKrh/k9i0r2WwuErYU+g eCNg== X-Gm-Message-State: AOAM533FUZsVz6UNakiFCdyuC6+OSGHd7QM02Bb9wQMYCZiJNIuUUgKZ +Yw7WdIUjcQH54Tat9X5RkrOu8KOJTA= X-Google-Smtp-Source: ABdhPJz7JSjwBrkyMY3cDWdyKu0Y/KDeJmpZ3JanexjJhoF/FHsxJNCLXCa6P1frNz16r/5nsQ+lVQ== X-Received: by 2002:ad4:4904:: with SMTP id bh4mr1396280qvb.53.1617168235907; Tue, 30 Mar 2021 22:23:55 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:55 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:41 -0400 Message-Id: <20210331052348.5164-5-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/opendht-fix-jami.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Un-register it. * gnu/packages/networking.scm (opendht): Update to 2.2.0rc4. [patches]: Remove field. [inputs]: Use nettle-3.7. [native-inputs]: Move restinio to... [propagated-inputs]: ... here. --- gnu/local.mk | 1 - gnu/packages/networking.scm | 13 ++++---- gnu/packages/patches/opendht-fix-jami.patch | 33 --------------------- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 gnu/packages/patches/opendht-fix-jami.patch diff --git a/gnu/local.mk b/gnu/local.mk index deb4ddcede..9bc7ae7564 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1469,7 +1469,6 @@ dist_patch_DATA = \ %D%/packages/patches/opencascade-oce-glibc-2.26.patch \ %D%/packages/patches/opencv-fix-build-of-grfmt_jpeg2000.cpp.patch \ %D%/packages/patches/opencv-rgbd-aarch64-test-fix.patch \ - %D%/packages/patches/opendht-fix-jami.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openmpi-mtl-priorities.patch \ diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 464192ad7e..7a09c48651 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -3428,40 +3428,39 @@ and targeted primarily for asynchronous processing of HTTP-requests.") (define-public opendht (package (name "opendht") - (version "2.1.4") + (version "2.2.0rc4") ;jami requires >= 2.2.0 (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/savoirfairelinux/opendht") (commit version))) (file-name (git-file-name name version)) - (patches (search-patches "opendht-fix-jami.patch")) (sha256 (base32 - "1ax26ri1ifb6s8ppd28jmanka9yf8mw3np65q2h4djhhik0phhal")))) + "1wc0f6cnvnlmhxnx64nxqgsx93k4g7ljdaqjl40ml74jg3nqrzcl")))) ;; Since 2.0, the gnu-build-system does not seem to work anymore, upstream bug? (build-system cmake-build-system) (inputs `(("argon2" ,argon2) - ("nettle" ,nettle) + ("nettle" ,nettle-3.7) ("readline" ,readline) ("jsoncpp" ,jsoncpp) ("openssl" ,openssl) ;required for the DHT proxy ("fmt" ,fmt))) (propagated-inputs `(("gnutls" ,gnutls) ;included in opendht/crypto.h - ("msgpack" ,msgpack))) ;included in several installed headers + ("msgpack" ,msgpack) ;included in several installed headers + ("restinio" ,restinio))) ;included in opendht/http.h (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) - ("restinio" ,restinio) ;headers only library ("libtool" ,libtool) ("cppunit" ,cppunit))) (arguments `(#:tests? #f ; Tests require network connection. #:configure-flags - '(;; "-DOPENDHT_TESTS=on" + '(;;"-DOPENDHT_TESTS=on" "-DOPENDHT_TOOLS=off" "-DOPENDHT_PYTHON=off" "-DOPENDHT_PROXY_SERVER=on" diff --git a/gnu/packages/patches/opendht-fix-jami.patch b/gnu/packages/patches/opendht-fix-jami.patch deleted file mode 100644 index 9718a84a41..0000000000 --- a/gnu/packages/patches/opendht-fix-jami.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e2b39dd3a0742853e00f9c3e8c46c911da20bed7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Adrien=20B=C3=A9raud?= -Date: Tue, 30 Jun 2020 10:42:49 -0400 -Subject: [PATCH 1/4] http/request: make terminate public - ---- - include/opendht/http.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/include/opendht/http.h b/include/opendht/http.h -index cc8d5f9..46b722c 100644 ---- a/include/opendht/http.h -+++ b/include/opendht/http.h -@@ -294,6 +294,7 @@ public: - * User action to cancel the Request and call the completion callbacks. - */ - void cancel(); -+ void terminate(const asio::error_code& ec); - - private: - using OnCompleteCb = std::function; -@@ -320,8 +321,6 @@ private: - - void connect(std::vector&& endpoints, HandlerCb cb = {}); - -- void terminate(const asio::error_code& ec); -- - void post(); - - void handle_request(const asio::error_code& ec); --- -2.27.0 - From patchwork Wed Mar 31 05:23:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28212 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9A3D727BC66; Wed, 31 Mar 2021 06:25:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1EFBE27BC65 for ; Wed, 31 Mar 2021 06:25:26 +0100 (BST) Received: from localhost ([::1]:43778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTM3-0000TO-Fq for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:25:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLj-0000QR-M3 for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLj-0006OB-EP for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLj-00036z-BX for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 06/12] gnu: pjproject: Update to 2.11. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:03 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825011825 (code B ref 47513); Wed, 31 Mar 2021 05:25:03 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:10 +0000 Received: from localhost ([127.0.0.1]:53248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKs-00034Y-3n for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:10 -0400 Received: from mail-qk1-f177.google.com ([209.85.222.177]:44011) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKj-00032S-Vf for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:02 -0400 Received: by mail-qk1-f177.google.com with SMTP id x14so18255040qki.10 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:01 -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=Gxy/TNTiofw0sIAHkWHpYqRS/FPVo1T3Y/9x5vlGrCs=; b=kjEFJYe5f77xUKAbSsJnUsFuoaxS/zmRntH4cFPvUpyzyHARnSRExBF+xTkByKkQGG 7B5IGTJAyBWQJlE07gzclmlb3dvE01PIoBU5dguuPNdz8Z5BsTHjK4P5YouemhQx8l5L HyKvgg9ZAIFkPhO8I+SZwe4FfPz8Pn+874F8ybgrJYjoyqSe8XyC6y7S9v3P86i3sHvy Wms0/a+zsQ1y+Hk4ihtyJnw/xNRN3HOFXWEiIr0KGLn1v0u5fUh5N9h5fEBGQr+8Lol0 +861KoYvFpytKYqV5hf8XhhfBfIALDx300ujLVD7XfOvrDiUhWAocRYoB5qo4rov2SoB r/iA== 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=Gxy/TNTiofw0sIAHkWHpYqRS/FPVo1T3Y/9x5vlGrCs=; b=NdcYgBmtGGqPApLfaWy4w/RA+MmBKA7iYLcGzGk9MlwTX34AAgmsL/srhPw62pK41l 2LTJbbBwrBITIABMGnjK3aN7JODzmFS+XdKif+ZrrzDSDcQZhVG6Tj2CjnuE4/N/jKcr b7LzSiZXtk2NBkkVckNli73shDxvcII4+0l9T/ALlvYlejeOgXRV9F2k3zkZZvoIG/HQ M/h+MyxjFLKG8HF0FFbz0UwdH6tccMfLQtCll8PfIy9eXpDC7YOoXCTPOJKEmMx+vbBa WkKikobWvzcslbGX5cLUJ2ifkRuSNF5aEeFZI30njmrEx+k/BK6Zfeeq8X/Tqt8q2ceR hYHg== X-Gm-Message-State: AOAM533kDq4TNMLnr7P2NGjyiFsXcKVBuVE9u8MtpkVP4GgCEU6Iuq42 rZA1PbTxpBNuP0JnX80J2sKSh46oNUM= X-Google-Smtp-Source: ABdhPJxb0+pEcWUzZDIiAazehlfR6I4v1/Yw1XPdcvfOEFptxHz4UHUVNgclyK9/ayNZR/mDxk1OOQ== X-Received: by 2002:a05:620a:16dc:: with SMTP id a28mr1589780qkn.442.1617168236489; Tue, 30 Mar 2021 22:23:56 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:56 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:42 -0400 Message-Id: <20210331052348.5164-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/telephony.scm (pjproject): Update to 2.11. Remove trailing #t. [patches]: Delete field. The patches are preserved because pjproject-jami still needs them. --- gnu/packages/telephony.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 5c8d247e68..af7148bf84 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Raghav Gururajan -;;; Copyright © 2020 Maxim Cournoyer +;;; Copyright © 2020, 2021 Maxim Cournoyer ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 LibreMiami ;;; @@ -723,7 +723,7 @@ your calls and messages.") (define-public pjproject (package (name "pjproject") - (version "2.10") + (version "2.11") (source (origin (method git-fetch) @@ -733,12 +733,8 @@ your calls and messages.") (file-name (git-file-name name version)) (sha256 (base32 - "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0")) + "1kn9g1x1vmh4130ghph8mldz5m89gsjs4vpdzlzm98m3808gk5an")) (modules '((guix build utils))) - ;; The patches upstream status can be tracked at: - ;; https://github.com/pjsip/pjproject/pull/2501. - (patches (search-patches "pjproject-correct-the-cflags-field.patch" - "pjproject-fix-pkg-config-ldflags.patch")) (snippet '(begin ;; Remove bundled libraries. @@ -746,8 +742,7 @@ your calls and messages.") (substitute* "aconfigure.ac" (("third_party/build/os-auto.mak") "")) (substitute* "Makefile" - (("third_party/build") "")) - #t)))) + (("third_party/build") "")))))) (build-system gnu-build-system) (outputs '("out" "debug" "static")) (arguments @@ -785,8 +780,7 @@ your calls and messages.") ;; Make all the files writable to prevent the following error: ;; "autom4te: cannot open aconfigure: Permission denied". (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-before 'build 'build-dep (lambda _ (invoke "make" "dep"))) ;; The check phases is moved after the install phase so to @@ -800,8 +794,7 @@ your calls and messages.") (with-directory-excursion out (for-each (lambda (f) (rename-file f (string-append s "/" (basename f)))) - (find-files "." "\\.a$"))) - #t))) + (find-files "." "\\.a$")))))) (add-after 'install 'check (assoc-ref %standard-phases 'check)) (add-before 'patch-source-shebangs 'autoconf @@ -844,8 +837,7 @@ your calls and messages.") ;; Disable the pjnath and pjsua tests, which require an actual ;; network and an actual sound card, respectively. (("pjnath-test pjmedia-test pjsip-test pjsua-test") - "pjmedia-test pjsip-test")) - #t))))) + "pjmedia-test pjsip-test"))))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) From patchwork Wed Mar 31 05:23:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28220 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2E8EC27BC66; Wed, 31 Mar 2021 06:26:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 81A0127BC65 for ; Wed, 31 Mar 2021 06:26:28 +0100 (BST) Received: from localhost ([::1]:45682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTN5-0001OO-NI for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:26:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLk-0000Rj-GP for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLk-0006Od-8k for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLk-00037F-5a for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 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 05:25:04 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825111840 (code B ref 47513); Wed, 31 Mar 2021 05:25:04 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:11 +0000 Received: from localhost ([127.0.0.1]:53252 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKs-00034n-Va for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:11 -0400 Received: from mail-qk1-f173.google.com ([209.85.222.173]:33723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKl-00032T-4x for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:04 -0400 Received: by mail-qk1-f173.google.com with SMTP id o5so18305663qkb.0 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:03 -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=DNZNS3pEJs9gg3saO0XAlMxYtBYS6bg+0apphlocB0dfJOTt+SGBVyOQGmeCAgH4c+ jBk/++x0zpdhFs9e9p93Zd2dfZTGNoRrp19Cz0pSZ82YIc8mnXlCLgThyBWUO8ru56sa Htwl2Ivw/nqZOz/qzr8IlZggw+1ATuoDj2ZRvoUNp4eiIhklUEEzWUGhiPxUSwwg3jMI VfBgBYnKMcUioPbfh8rvlFNlekMnIkYdNKC4ldMJW0cUerrWrhjz5z+cgiIlxiGWHgcf OhnuZXnqJvv0Rj4AkMAkSqsVpX8ZXg3Frzk47g4KDQ6pARZvUKpMjalmXmzxiJgfY6kr I9cg== 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=NqKSQfRB++39hPPRmq29GD1/CM4Q/yxh9AgTJZ8rgdXNdUR0v2UPPKIIDhx9VnfguH ZwWxJjUiS9Gh32xbMWLm8B23z7AUIj2EvO45F+XHWuvz0ztSsEe6rfqNBXQUHxJOaVM6 bKtkbhy3bf25PY8GtExkBSj9iRdK1p0e/BR5vA2pleELzN6fAcT0pVxivrOCyUiyp2Bo poCjUUI+PxmbcKu57WHd4SDM47gTQNAm1tkqakSO+FK3zwCGe5M7oFHFs0Wxqe2JpEBg kcGzZSLpzdwqmN8hOY3Q9BFIctWFYZEdX26pW5+m84MJYEduyAnRKI5iFEDNopGuzgTE MTog== X-Gm-Message-State: AOAM530+dDtTDNYQ7/VR/qrBJ8dYibfQJ68YeGVXZIJ9NKGx6HNNJUJ/ EK5KqgPOSk1SnbdSlfVwyIP+rEL1HgE= X-Google-Smtp-Source: ABdhPJxYDQRgdXuGRL7N9Ygfdm9aoppRB6e0PuIt5wUH/+t4jd40Kck25Z+J+PCki8k4ID6P+523sg== X-Received: by 2002:a37:842:: with SMTP id 63mr1670764qki.112.1617168237409; Tue, 30 Mar 2021 22:23:57 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:57 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:43 -0400 Message-Id: <20210331052348.5164-7-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Wed Mar 31 05:23:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28214 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id BE44D27BC68; Wed, 31 Mar 2021 06:25:51 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6526D27BC65 for ; Wed, 31 Mar 2021 06:25:51 +0100 (BST) Received: from localhost ([::1]:44426 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTMU-0000ls-H3 for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:25:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLk-0000SP-TG for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41722) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLk-0006Ol-LH for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLk-00037M-IM for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 08/12] ffmpeg-jami: Patch with the patches from Jami 20210326.1.cfba013. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:04 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825111847 (code B ref 47513); Wed, 31 Mar 2021 05:25:04 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:11 +0000 Received: from localhost ([127.0.0.1]:53254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKt-00034v-DW for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:11 -0400 Received: from mail-qv1-f48.google.com ([209.85.219.48]:34507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKl-00032V-Lz for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:04 -0400 Received: by mail-qv1-f48.google.com with SMTP id g8so9396767qvx.1 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:03 -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=Xb9F4n0JXjg3BYwemeCPGelwABhhCb87Fy5yym2eScU=; b=bSoHi49Men6H/DGF7FnMxAtGVO1qu5GnVoruERLgH+rPPXfCwhB4Yzg7FskHrUgx/E r+aTDOd1apyxU9rqCpYpJTwP514BY81yaJNGbzfJnM7yPC1FoFl7pllgGaHYKt4dw2RR Xvg1D9YC68dlxdjJnb6h9RnxJXMbVV6DavpL+Y7QG7tKfGR/g10ERPmktpgW6EfrPcLc K92GqkHmAIDJBgH0IHtSovr61/FpijHBqOXK5HtMYpcfm4lRwwE33Sr48m6XqXkrU1qO CVq4Cz6XvOVJKEqspwg679orA5935BdPo7fCO/1IXIap/rqgYryx9zy7t8w5VjsG3hri bavg== 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=Xb9F4n0JXjg3BYwemeCPGelwABhhCb87Fy5yym2eScU=; b=iqLaXCVBpm9QQSuMaCNhhCXkXeH68g6T0sYRpSPnrUAjlP/kwODKuoQJUZE/S+PCRh sTIHgCSVFQgB/NIRL+oV6g+Z9luWERBGyXDptQ49UlfE7V1OP4pyGngaq+xADH0gP8PF JeXGAPAKsMe/fBHeeHanhefRNi1dJ1ehCbbOtHyVCS6ZG/eoHdBfXF7VDhaSUOmpjhbm cpjH9IId846VoD5G8XZHJzlGpQpAH9yNiERk+vxVd4+4ryPtcJCRyob7gBO7uDquTJBM tnAiUEFwp1WLHBJkW5bTfpPA0zFoQcy1FoiM7bAXBcv94moiGyc61hOSP3kfuGZDDDQ5 AogQ== X-Gm-Message-State: AOAM530xYVF1KWdetdbdGSw4FwRHp8OT9Lvdtj6i/PegTw/9KDUlzAJf AwRoQj1pPHWStLAag/oY9vgbNcZ5rcM= X-Google-Smtp-Source: ABdhPJw3W3rhGCmmLQIeto7BIH2VDmsvoPy9EwsobykjjiH2Kp1Zo8awXQRR4iGeF8Wtr+SmRhzkNw== X-Received: by 2002:a0c:f6cf:: with SMTP id d15mr1268628qvo.62.1617168238075; Tue, 30 Mar 2021 22:23:58 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:57 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:44 -0400 Message-Id: <20210331052348.5164-8-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/jami.scm (ffmpeg-jami): Remove trailing #t. [phases] : Add libopusdec-enable-FEC and libopusenc-enable-FEC to the list of patches to apply. --- gnu/packages/jami.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 35d84bb37b..9d5d00c60c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -403,21 +403,22 @@ of Jami." `(modify-phases ,phases (add-after 'unpack 'make-git-checkout-writable (lambda _ - (for-each make-file-writable (find-files ".")) - #t)) + (for-each make-file-writable (find-files ".")))) (add-after 'unpack 'apply-patches (lambda* (#:key inputs #:allow-other-keys) (let ((jami-apply-dependency-patches ,jami-apply-dependency-patches)) ;; These patches come from: ;; "ring-project/daemon/contrib/src/ffmpeg/rules.mak". - (jami-apply-dependency-patches #:inputs inputs - #:dep-name "ffmpeg" - #:patches - '("remove-mjpeg-log" - "change-RTCP-ratio" - "rtp_ext_abs_send_time")) - #t)))))))))) + (jami-apply-dependency-patches + #:inputs inputs + #:dep-name "ffmpeg" + #:patches + '("remove-mjpeg-log" + "change-RTCP-ratio" + "rtp_ext_abs_send_time" + "libopusdec-enable-FEC" + "libopusenc-enable-FEC")))))))))))) (define-public libring (package From patchwork Wed Mar 31 05:23:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28213 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E1BD227BC66; Wed, 31 Mar 2021 06:25:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6330527BC65 for ; Wed, 31 Mar 2021 06:25:49 +0100 (BST) Received: from localhost ([::1]:44216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTMS-0000gE-Hy for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:25:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLl-0000TH-8a for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41723) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLl-0006PB-1C for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLk-00037U-UR for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 09/12] gnu: libring: Update to 20210326.1.cfba013. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:04 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825211854 (code B ref 47513); Wed, 31 Mar 2021 05:25:04 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:12 +0000 Received: from localhost ([127.0.0.1]:53256 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKt-000352-Mc for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:12 -0400 Received: from mail-qk1-f180.google.com ([209.85.222.180]:40881) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKm-00032c-Jv for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:05 -0400 Received: by mail-qk1-f180.google.com with SMTP id 7so18276007qka.7 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:04 -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=hjWINfoMjy9Ss2QY19lk1i9/aRPX7DOj15fWRoTHw6Y=; b=kVRPWJmSmijcaf/4DTXSdlw7f8GPBui76lS5LkZR9L9B8Fir1hBQPNdK/cp3B5mHhV KA9eihX9KgoKL1E5qFlgUGhrGyucYpk9795RW9Tkomo/ZBvgx8/HRL2VYcitHq1LtpKC SsDnoSMj0vER0cNPGtitlPpsz2JsrcdEgLOemRowEtuM47xk36gDCXebFFHmOQ64369K u+P7K/ih/uv2VlgNo48PIFuSoxItCMXJKhK8DdLVun0M9TiVwyq6FN0Ce4is0ZwYfPvw 9RzjVFrYkRtzmQKS/h/F93dytzc92SBX/IOe2We2XWznbURycl0UaSrSaqbPUvBcYimn jVPQ== 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=hjWINfoMjy9Ss2QY19lk1i9/aRPX7DOj15fWRoTHw6Y=; b=jBME+IzhAlQnGnFC9/8Ty61u8aG1gWq2dhd2KruHzqKygaTeLjPVx94poGYpN8rGR1 C185tr9m7jMDWEfU4ebFv2LAzI0QLkk93hO4+g0aiiX3+V4rYJhA+gw9kqEH7Mlb6n9r ZRn/lLmEYkL+xYfKiUlFTaRobNv+3ucoflETrLoYY9t2JwNVqlm6bxnOVJpifm1dx1BJ GSXsqEbxdx9v1Mv2LjB/oOvIR4lly+rHP5Z+1zvnHOSWzlONTnV3Nms8ApAGO8CSDffE PPTvoVxbAwCDHoT+dmErBbwcAjzooXWb/e84sxh4M0phPBVsQFEF1Y1tU9n7mYqzlp7G IQQg== X-Gm-Message-State: AOAM531uWJRXLNADqxo14YPAK1oFgI2KGtzHufY1GIBDfYdSdvH1KPT0 7YRQ/ItEdvAmIkfwqKqDqFSHYKCUOqQ= X-Google-Smtp-Source: ABdhPJxCvWAGHRyR1k8LXqVrQjaV1dq2Nkh1P7j7rgKRWhoqH34nsOvjrFSKfimI3ajYoChsCFBBRA== X-Received: by 2002:a05:620a:1585:: with SMTP id d5mr1610431qkk.325.1617168238830; Tue, 30 Mar 2021 22:23:58 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:58 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:45 -0400 Message-Id: <20210331052348.5164-9-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/jami.scm (libring): Update to 20210326.1.cfba013. Remove trailing #t. [inputs]: Remove boost, flac, gmp, gsm, libogg, libva, opus, pcre, libsamplerate, libsndfile, libvorbis, libx264, libvdpau, zlib, python, python-wrapper, restinio, and libx11. Add webrtc-audio-processing. [native-inputs]: Remove cppunit. Add gcc-8. [make-flags]: Add the V=1 flag. [synopsis]: More explicitly describe what this component is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 61 ++++++++++++++----------------------------- 1 file changed, 20 insertions(+), 41 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 9d5d00c60c..ddb4b35349 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) @@ -428,71 +429,49 @@ of Jami." (build-system gnu-build-system) (inputs `(("alsa-lib" ,alsa-lib) - ("boost" ,boost) + ("asio" ,asio) ("dbus-c++" ,dbus-c++) ("eudev" ,eudev) ("ffmpeg" ,ffmpeg-jami) - ("flac" ,flac) - ("gmp" ,gmp) - ("gsm" ,gsm) ("jack" ,jack-1) ("jsoncpp" ,jsoncpp) ("libarchive" ,libarchive) ("libnatpmp" ,libnatpmp) - ("libogg" ,libogg) - ("libva" ,libva) + ("libsecp256k1" ,libsecp256k1) + ("libupnp" ,libupnp) ("opendht" ,opendht) - ("opus" ,opus) - ("pcre" ,pcre) + ("openssl" ,openssl) + ("pjproject" ,pjproject-jami) ("pulseaudio" ,pulseaudio) - ("libsamplerate" ,libsamplerate) - ("libsndfile" ,libsndfile) ("speex" ,speex) ("speexdsp" ,speexdsp) - ("libupnp" ,libupnp) - ("libvorbis" ,libvorbis) - ("libx264" ,libx264) - ("libvdpau" ,libvdpau) - ("yaml-cpp" ,yaml-cpp) - ("zlib" ,zlib) - ("openssl" ,openssl) - ("libsecp256k1" ,libsecp256k1) - ("python" ,python) - ("python-wrapper" ,python-wrapper) - ("restinio" ,restinio) - ("libx11" ,libx11) - ("asio" ,asio) - ;; TODO: Upstream seems to rely on a custom pjproject (a.k.a. pjsip) version. - ;; See https://git.jami.net/savoirfairelinux/ring-daemon/issues/24. - ("pjproject" ,pjproject-jami))) + ("webrtc-audio-processing" ,webrtc-audio-processing) + ("yaml-cpp" ,yaml-cpp))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) + ("gcc" ,gcc-8) ;charconv requires GCC 8.1+ ("libtool" ,libtool) + ("perl" ,perl) ;to generate manpages with pod2man ("pkg-config" ,pkg-config) - ("which" ,which) - ("cppunit" ,cppunit) - ("perl" ,perl))) ; Needed for documentation. + ("which" ,which))) (arguments `(#:tests? #f ; The tests fail to compile due to missing headers. + #:make-flags '("V=1") ;build verbosely #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "daemon") - #t)) + (chdir "daemon"))) (add-before 'build 'add-lib-dir (lambda _ - (mkdir-p "src/lib") - #t))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library and daemon implementing the Jami core -functionality.") + (mkdir-p "src/lib")))))) + (synopsis "Jami core library and daemon") + (description "This package provides a library and daemon implementing the +Jami core functionality. Jami is a secure and distributed voice, video and +chat communication platform that requires no centralized server and leaves the +power of privacy in the hands of the user. It supports the SIP and IAX +protocols, as well as decentralized calling using P2P-DHT.") (home-page "https://jami.net/") (license license:gpl3+))) From patchwork Wed Mar 31 05:23:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28216 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C31EE27BC66; Wed, 31 Mar 2021 06:26:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4A55727BC65 for ; Wed, 31 Mar 2021 06:26:11 +0100 (BST) Received: from localhost ([::1]:44872 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTMo-0000xV-D7 for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:26:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLl-0000UB-Oi for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41724) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLl-0006Pb-FT for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLl-00037b-CW for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 10/12] gnu: libringclient: Update to 20210326.1.cfba013. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25: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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825211862 (code B ref 47513); Wed, 31 Mar 2021 05:25:05 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:12 +0000 Received: from localhost ([127.0.0.1]:53258 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKu-000359-3v for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:12 -0400 Received: from mail-qv1-f44.google.com ([209.85.219.44]:42669) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKn-00032i-41 for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:05 -0400 Received: by mail-qv1-f44.google.com with SMTP id 30so9365517qva.9 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24: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=dFPTWNQ0V1f5jWKp2QLMCO5e8lFAu8XzgN+IjskTL2k=; b=iCyL/4yEIJcXBd+tGpp6FMBCJzghjsHMgb9Oi6Nvu+KNAULBnp5qHKs1ZQht/xOW7k MYjXnAhJ1aKpeuEqXOFDz4LINIOsP9TucZrnh0le05WcVOO7pTxJywP01haTu8pDanFg 6e1493WbIluoaTocmCg9VmZUeFpLsgq24IEXE7Mgf+MxHA/JNdYMMjo45HINmMOhNEx1 3VJk70r4jXRIeXa+woLh2ee1ZJpY47HwbGhp9psSbHftVnBLDJTmQFu2czMiyq+eRXAq ItloV45iS/B96SqjJtDYvLPqiToO3BHXBrEL8OcnfX9L1fDlEnTEyVO0zxjroC5dHStA T0JA== 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=dFPTWNQ0V1f5jWKp2QLMCO5e8lFAu8XzgN+IjskTL2k=; b=iUfMF00k70axlPrnTp1BF/WBWPJL5wVFs4b6waZlX7BY+gW7+l2CBP/T6aJsEYDzb7 0rOVqPx7V/oDGTg3jqD65dtn+Cu3vB+78JtS8oPv+P6EdCkC4QEHGQKlLeapu3fOhzvV /zhjpn9ubTmNkRGjI3vjGrPvHkFe+f0eYekFQlJB6UrRUoi4Vs4G7waehK1FZJyeF4xC 83uhBVbbRVey8R6fOvXnB15Qj9V4YluOOibrZGftNQCCs1WMVMuv1UoucaVUxd38wRJN 8B0uvj2Tc2u7OXEXbO1zfYrsLBTg4yc0s7uZV2LupOaakABPvhZHdJk4tDy9x+9GuQb6 84ow== X-Gm-Message-State: AOAM530ochEeeGppX1dpHWXHdcP4FIrz3Rx3i0mqyVhr8L4WIO8KSShu U/IVWhE1lpyu0BXtVoSYM5E4dEKcSBk= X-Google-Smtp-Source: ABdhPJw0wEgVGJb4cnpd3SqY+kYT83cT3sRm6Lu/F9N/joD+zOHrim/vfsEvgf2+D6lJ/S8FlNKhpQ== X-Received: by 2002:a05:6214:c6c:: with SMTP id t12mr1477208qvj.17.1617168239502; Tue, 30 Mar 2021 22:23:59 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:59 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:46 -0400 Message-Id: <20210331052348.5164-10-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/jami.scm (libringclient): Update to 20210326.1.cfba013. Remove trailing #t. Do not inherit from libring. [version, source]: Specify fields. [propagated-inputs]: Remove qttools. Move libring to ... [inputs]: ... here. Add network-manager. [configure-flags] Define the RING_XML_INTERFACES_DIR variable. [phases]{fix-dbus-interfaces-path}: Delete. [synopsis]: More explicitly describe what this component is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index ddb4b35349..41fa69dd48 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -477,37 +477,33 @@ protocols, as well as decentralized calling using P2P-DHT.") (define-public libringclient (package - (inherit libring) (name "libringclient") + (version %jami-version) + (source %jami-sources) (build-system cmake-build-system) + (inputs + `(("libring" ,libring) + ("network-manager" ,network-manager))) (propagated-inputs - `(("libring" ,libring) ; For 'dring'. - ("qtbase" ,qtbase) ; Qt is included in several installed headers. - ("qttools" ,qttools))) + `(("qtbase" ,qtbase))) ; Qt is included in several installed headers. (arguments `(#:tests? #f ; There is no testsuite. #:configure-flags - (list (string-append "-DRING_BUILD_DIR=" - (assoc-ref %build-inputs "libring") "/include")) + (let ((libring (assoc-ref %build-inputs "libring"))) + (list (string-append "-DRING_XML_INTERFACES_DIR=" + libring "/share/dbus-1/interfaces") + (string-append "-DRING_BUILD_DIR=" libring "/include"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "lrc") - #t)) - (add-before 'configure 'fix-dbus-interfaces-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("\\$\\{CMAKE_INSTALL_PREFIX\\}(/share/dbus-1/interfaces)" _ dbus-interfaces-path-suffix) - (string-append (assoc-ref inputs "libring") - dbus-interfaces-path-suffix)))))))) - (synopsis "Distributed multimedia communications platform") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides a library common to all Jami clients.") + (chdir "lrc")))))) + (synopsis "Jami client library") + (description "This package provides a library common to all Jami clients. +Jami is a secure and distributed voice, video and chat communication platform +that requires no centralized server and leaves the power of privacy in the +hands of the user. It supports the SIP and IAX protocols, as well as +decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) From patchwork Wed Mar 31 05:23:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28219 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B209E27BC66; Wed, 31 Mar 2021 06:26:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2D0FF27BC65 for ; Wed, 31 Mar 2021 06:26:27 +0100 (BST) Received: from localhost ([::1]:45546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTN4-0001HJ-D2 for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:26:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLm-0000VJ-5o for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41725) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLl-0006Pm-Sg for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLl-00037i-PO for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 11/12] gnu: jami: Update to 20210326.1.cfba013 and rename to jami-gnome. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25: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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825311869 (code B ref 47513); Wed, 31 Mar 2021 05:25:05 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:13 +0000 Received: from localhost ([127.0.0.1]:53260 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKu-00035H-Fm for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:12 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:46993) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKo-00032l-46 for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:06 -0400 Received: by mail-qt1-f169.google.com with SMTP id y2so13637829qtw.13 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:06 -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=64NZXJcNWJYncSbMBO+/mY3Jp1zzgi4CQAl8YbvYHtM=; b=kFBDZqmfdJ4BXl4xDYjNcfZUHi6112DOw9WnT9Ofim/Y+vUWynkEkoNUHX3vmWQNXu 560U7xHHkb05lrLJJeLnZG/5yqeG0sinychXxU0vExYWrfvIj9HW1yD/m7p9ADdqUGfl T+HPmCIKGjUNNik97LpZdgj/S9Vw3y4ea4V+J2d1pGlgqfuAa6SawaAWhVd1SaOj7LFs xdHL1DKVbXlA84TE/GsPdgYbhqIrWIab5OTLoxcTPXVGvMfIPFPPlPlD2qtF2s1nILLa fuRox29W0V1VwLoH86dI7dyDZtEwxsGrawBDmKKVFHnaCj2oyiEor0ynqX7qwgf924yI bqTA== 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=64NZXJcNWJYncSbMBO+/mY3Jp1zzgi4CQAl8YbvYHtM=; b=twjJhgz0oeTCX/K5AH23+6InKpoVFfUVFOiHZC0ZW+hQ6kbB5f8dYCMZnjpqkarpnP zEzdmch+xW8v0XWilAx1oAl3NioIIE0Xw/yBmdWOv4BPbY81yUtUJD2QTbOStWk+vIAB gZ4gxb1pqKasl/BYx7oLcFoVh1yPXsh+4o4ZJFMctqN9oC0Y3RwRdCaaAFOYziofoDKd kP+MYU2jfgcSO4WTVHZuDDCCx0hKhr0rf17ovjn0nQHQKk0Lmw8kZc9tnE4bXUayKHmW T/EPI3ABxQHwwVnAtv0zMM8z3ZgioU4l9YojmVXAKLOxA9SMJwU8YwQV9KI8LXt87poh 2Gkw== X-Gm-Message-State: AOAM530S4We9tOXisw+t7CBQJGg46LfFTthFaW9dm7EAroBNzAePn3xC 8CujF4ckv0HBfJxwKnkmZ2+bZtHrUvM= X-Google-Smtp-Source: ABdhPJxWToJSUmAm05mt9L47GXB2YbsieHpHvVQPwSklafqWsHpgONLMBtlJIOoXw4VJtPbSVKQH5w== X-Received: by 2002:ac8:588e:: with SMTP id t14mr986699qta.123.1617168240331; Tue, 30 Mar 2021 22:24:00 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:23:59 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:47 -0400 Message-Id: <20210331052348.5164-11-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/jami.scm (jami): Update to 20210326.1.cfba013. Rename to ... (jami-gnome): In prevision of the soon released Jami Qt client. (jami): Define as obsoleted by jami-gnome. [inputs]: Sort lexico-graphically. Add libappindicator and network-manager. [native-inputs]: Add a comment and fix a typo. Remove doxygen. [propagated-inputs]: Remove evolution-data-server. [synopsis]: More explicitly describe what this package is. [description]: Describe the specifics before the generalities. --- gnu/packages/jami.scm | 53 +++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 41fa69dd48..79dbb39f5a 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -31,6 +31,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -507,44 +508,48 @@ decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) -(define-public jami +(define-public jami-gnome (package - (inherit libring) - (name "jami") + (name "jami-gnome") + (version %jami-version) + (source %jami-sources) (build-system cmake-build-system) (inputs - `(("libringclient" ,libringclient) - ("gtk+" ,gtk+) - ("qrencode" ,qrencode) - ("libnotify" ,libnotify) - ("clutter" ,clutter) + `(("clutter" ,clutter) ("clutter-gtk" ,clutter-gtk) + ("gtk+" ,gtk+) ("libcanberra" ,libcanberra) - ("webkitgtk" ,webkitgtk) - ("sqlite" ,sqlite))) + ("libappindicator" ,libappindicator) + ("libnotify" ,libnotify) + ("libringclient" ,libringclient) + ("network-manager" ,network-manager) + ("qrencode" ,qrencode) + ("sqlite" ,sqlite) + ("webkitgtk" ,webkitgtk))) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("doxygen" ,doxygen))) + ("glib:bin" ,glib "bin"))) ;for glib-compile-resources (propagated-inputs - `(("libring" ,libring) ; Contains `dring', the daemon, which is automatically by d-bus. - ("adwaita-icon-theme" ,adwaita-icon-theme) - ("evolution-data-server" ,evolution-data-server))) + `(("libring" ,libring) ; Contains 'dring', the daemon, which is + ; automatically started by DBus. + ("adwaita-icon-theme" ,adwaita-icon-theme))) (arguments `(#:tests? #f ; There is no testsuite. #:phases (modify-phases %standard-phases (add-after 'unpack 'change-directory (lambda _ - (chdir "client-gnome") - #t))))) - (synopsis "Distributed, privacy-respecting communication program") - (description "Jami (formerly GNU Ring) is a secure and distributed voice, -video and chat communication platform that requires no centralized server and -leaves the power of privacy in the hands of the user. It supports the SIP and -IAX protocols, as well as decentralized calling using P2P-DHT. - -This package provides the Jami client for the GNOME desktop.") + (chdir "client-gnome")))))) + (synopsis "Jami client for GNOME") + (description "This package provides a Jami client for the GNOME desktop. +Jami is a secure and distributed voice, video and chat communication platform +that requires no centralized server and leaves the power of privacy in the +hands of the user. It supports the SIP and IAX protocols, as well as +decentralized calling using P2P-DHT.") (home-page "https://jami.net") (license license:gpl3+))) + +;;; Keep this until the Qt client matures enough to become the +;;; main 'jami' client. +(deprecated-package jami jami-gnome) From patchwork Wed Mar 31 05:23:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 28217 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E0B7727BC67; Wed, 31 Mar 2021 06:26:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0D27527BC66 for ; Wed, 31 Mar 2021 06:26:13 +0100 (BST) Received: from localhost ([::1]:45066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRTMq-00012H-7C for patchwork@mira.cbaines.net; Wed, 31 Mar 2021 01:26:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54842) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRTLn-0000X8-Ip for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41726) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRTLn-0006QW-A7 for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRTLm-00037q-78 for guix-patches@gnu.org; Wed, 31 Mar 2021 01:25:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47513] [PATCH 12/12] gnu: Add jami-qt. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Mar 2021 05:25:06 +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: Maxim Cournoyer Received: via spool by 47513-submit@debbugs.gnu.org id=B47513.161716825311875 (code B ref 47513); Wed, 31 Mar 2021 05:25:06 +0000 Received: (at 47513) by debbugs.gnu.org; 31 Mar 2021 05:24:13 +0000 Received: from localhost ([127.0.0.1]:53262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKu-00035O-TT for submit@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:13 -0400 Received: from mail-qt1-f174.google.com ([209.85.160.174]:36426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRTKo-00032x-Mx for 47513@debbugs.gnu.org; Wed, 31 Mar 2021 01:24:07 -0400 Received: by mail-qt1-f174.google.com with SMTP id h7so13685882qtx.3 for <47513@debbugs.gnu.org>; Tue, 30 Mar 2021 22:24:06 -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=w/Uk02L9qE2cG3qjJPbghvxqSxijRjr3Cu9OPZ3hGCg=; b=mwsh7DVmqd/WKlTfxU69ejgJlNU8DhKBoAzTD46vftLgYMpzhqHNdL1yS5WPy+p61z 3yWO/qrBtHYLS5x0FcDMd/ed65vKwy6UYM69rkeJyRYVR4dpWlruCnEBPc6hzfNrkpj5 YEn+xygifTHLPIz0miBQEfKw5aD52M1/Q7IMArIJGIRdTP6ODaIgxUpNqNuCUiFepAEg tZe3VSaZdk4CvlqwzfiAXRxbcOQ/35bYJDBAl2QzZ0PD/viav1oUp2osGIkChWngZeAx srV7TM2cnzU8MRTRLaNDitPZ+wc+bOb8brrc/fc05WqgxM7XqOw/sSSjCIk+56XdmDrE /a8w== 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=w/Uk02L9qE2cG3qjJPbghvxqSxijRjr3Cu9OPZ3hGCg=; b=NILY6UHYxr3Msb7bqJqWmmbFytSaJfEoY8yGC4/pzu5StPL4OysUSHAjR60l9rcc0K r9UVZW43jcdmWFjyBnPvQSYHdJ+LzULDcBfksQKNeFIPYICRFjHU3eXLBNNNZ3HHfOF8 OsfYCaY3Nmug8q19BBjyGy8XsWOaMoHYke3403DsXnhQW63Taz5hAXjay+P//yoFKcUX Ej4dTaiCvxeqXYN3zU2Fb/j4adFGOf2Kehs7KFJ/9q5l0IYEDNZff48/mo7iyfnmrw67 Saru+RfbG7jtqTIhMXTnsVCv3G6vVDU/CQrhdGg2o8QK8u9ZVzZ5z74EuoIx18rR3jB4 bdkA== X-Gm-Message-State: AOAM530gLsd9DOfOjY+9lT3WnA8MrSAu1nMkOOLnkzlSzUW8rGTBr4uY DaNE9GgoUh8VL4ENd2c/jR5X11a2Dzk= X-Google-Smtp-Source: ABdhPJwDs5IsXbO6Ym2bFioLOqf9HHxyKrMx4g0cVQ0qbUCUWMwwIleK+K02hxpnoldJRxHQHWY4ZA== X-Received: by 2002:ac8:7776:: with SMTP id h22mr1056330qtu.325.1617168241015; Tue, 30 Mar 2021 22:24:01 -0700 (PDT) Received: from localhost.localdomain ([207.35.95.145]) by smtp.gmail.com with ESMTPSA id q64sm828662qtd.32.2021.03.30.22.24.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 22:24:00 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 31 Mar 2021 01:23:48 -0400 Message-Id: <20210331052348.5164-12-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210331052348.5164-1-maxim.cournoyer@gmail.com> References: <20210331052348.5164-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/jami.scm (jami-qt): New variable. --- gnu/packages/jami.scm | 66 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 79dbb39f5a..67befe63a2 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) @@ -59,6 +60,7 @@ #:use-module (gnu packages) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix packages) @@ -553,3 +555,67 @@ decentralized calling using P2P-DHT.") ;;; Keep this until the Qt client matures enough to become the ;;; main 'jami' client. (deprecated-package jami jami-gnome) + +(define-public jami-qt + (package + (name "jami-qt") ;to be renamed 'jami' at some point + (version %jami-version) + ;; The Qt client code is not yet part of the release tarball; fetch it + ;; from git for now. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.jami.net/savoirfairelinux/jami-client-qt.git") + (commit "ae21c17da5e8f730ae3895ccbc4da8047e3be1eb"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rf3lpk8c4qc12pi6pn4rdp7i8b83xv64yqr0q47rzv9s518qyjp")))) + (build-system qt-build-system) + (arguments + `(#:tests? #f ;no test suite + #:phases + (modify-phases %standard-phases + ;; TODO: Uncomment after switching back to the tarball source. + ;; (add-after 'unpack 'change-directory + ;; (lambda _ + ;; (chdir "client-qt"))) + (add-after 'install 'wrap + ;; The program fails to find the QtWebEngineProcess program, so we + ;; set QTWEBENGINEPROCESS_PATH to help it. + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin")) + (qtwebengineprocess (string-append + (assoc-ref inputs "qtwebengine") + "/lib/qt5/libexec/QtWebEngineProcess"))) + (for-each (lambda (program) + (wrap-program program + `("QTWEBENGINEPROCESS_PATH" = + (,qtwebengineprocess)))) + (find-files bin ".*")))))))) + (native-inputs + `(("pkg-config" ,pkg-config) + ("qttools" ,qttools) + ("doxygen" ,doxygen) + ("graphviz" ,graphviz))) + (inputs + `(("network-manager" ,network-manager) + ("qrencode" ,qrencode) + ("qtsvg" ,qtsvg) + ("qtwebengine" ,qtwebengine) + ("qtwebchannel" ,qtwebchannel) + ("qtmultimedia" ,qtmultimedia) + ("qtdeclarative" ,qtdeclarative) + ("qtgraphicaleffects" ,qtgraphicaleffects) + ("qtquickcontrols" ,qtquickcontrols) + ("qtquickcontrols2" ,qtquickcontrols2))) + (propagated-inputs + `(("libringclient" ,libringclient))) + (home-page "https://jami.net") + (synopsis "Qt Jami client") + (description "This package provides the Jami Qt client. Jami is a secure +and distributed voice, video and chat communication platform that requires no +centralized server and leaves the power of privacy in the hands of the user. +It supports the SIP and IAX protocols, as well as decentralized calling using +P2P-DHT.") + (license license:gpl3+)))