From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi, guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 17:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: Distopico , rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi Received: via spool by submit@debbugs.gnu.org id=B.1689873568351 (code B ref -1); Thu, 20 Jul 2023 17:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 20 Jul 2023 17:19:28 +0000 Received: from localhost ([127.0.0.1]:59781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMXJI-00005a-Dr for submit@debbugs.gnu.org; Thu, 20 Jul 2023 13:19:28 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMXJF-00005I-V8 for submit@debbugs.gnu.org; Thu, 20 Jul 2023 13:19:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMXJA-0007dd-Ip for guix-patches@gnu.org; Thu, 20 Jul 2023 13:19:20 -0400 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMXJ8-00040g-JP for guix-patches@gnu.org; Thu, 20 Jul 2023 13:19:20 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4R6KDN1CY4zDrPl for ; Thu, 20 Jul 2023 17:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1689873556; bh=eQwVSbdkAMtciuppwiu1/rSsEBvKH/cSa2u7Bpg5sXk=; h=From:To:Cc:Subject:Date:From; b=EZunXDVUYuLCpUzlwe3FRyMc5mOwUBbZbIKp4RFSWigLEfplpIge+s6/MJaL7RW2I T8xlsgN5yCdjRh3om/uALhOhxNRl/C3y3Vp4prjj0FlFCsJM34hBd8KYA9RyagUtjI /Ds0sLpdOiiL4F8fl6RLGCRyecPKykzSvndUtxQ0= X-Riseup-User-ID: 09DF913F4B828119996494B60DA827CDAF7B219E89249E4251C5774C2DCE6E36 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4R6KDM316zzFqgN; Thu, 20 Jul 2023 17:19:15 +0000 (UTC) From: Distopico Date: Thu, 20 Jul 2023 12:18:18 -0500 Message-ID: <20230720171841.31901-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=198.252.153.129; envelope-from=distopico@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes telegram-desktop call not working with openSSL 3 see: https://github.com/telegramdesktop/tdesktop/issues/26108 * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit --- gnu/packages/telegram.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa01c2f692..aeab249198 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,6 +97,21 @@ (define libyuv-for-telegram-desktop (base32 "0mm56p8iapfild2xdw4w8zi35c3xm06fgagiali644gnxdmnym6c"))))) +(define libsrtp-for-telegram-desktop + (let ((commit "a566a9cfcd619e8327784aa7cff4a1276dc1e895") + (revision "1494")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cisco/libsrtp") + (commit commit))) + (file-name (git-file-name + "libsrtp-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1ichw2v9s2mggi5p2wbbmlg55q4r48dxi3ks7ykfcfkmh7pb1w1s"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) @@ -265,8 +281,8 @@ (define tgcalls-for-telegram-desktop "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") - (revision "328")) + (let ((commit "a45d8b8f0a99bd0e5118dda1dc4a8b7b3ad5dcfd") + (revision "388")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -282,14 +298,14 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) + (base32 "1qs3ikkd6l56brj40cv6wlhx5gj5avisj9mj8ypjfwcyw9hb2n5y")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("libsrtp" "rnnoise" + '("rnnoise" "libsrtp_config" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -311,9 +327,12 @@ (define-public webrtc-for-telegram-desktop (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libyuv-to (string-append third-party "/libyuv"))) + (libyuv-to (string-append third-party "/libyuv")) + (libsrtp-to (string-append third-party "/libsrtp"))) (copy-recursively #$libyuv-for-telegram-desktop - libyuv-to))))))) + libyuv-to) + (copy-recursively #$libsrtp-for-telegram-desktop + libsrtp-to))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17 base-commit: 13cb9b302868b5a966a6ae177412c474084f4bf1 -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 19:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Distopico Cc: rg@raghavgururajan.name, 64748@debbugs.gnu.org, hako@ultrarare.space Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.168988164026250 (code B ref 64748); Thu, 20 Jul 2023 19:34:02 +0000 Received: (at 64748) by debbugs.gnu.org; 20 Jul 2023 19:34:00 +0000 Received: from localhost ([127.0.0.1]:59951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMZPU-0006pK-E2 for submit@debbugs.gnu.org; Thu, 20 Jul 2023 15:34:00 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:48718 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMZPR-0006pA-JJ for 64748@debbugs.gnu.org; Thu, 20 Jul 2023 15:33:58 -0400 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 075C134012E; Thu, 20 Jul 2023 21:33:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1689881637; bh=YlGxrb7wylFsrm1y/F/RQztFkGrJX7d5ACkYQP/cNRk=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=EcLPEYnByxHOuyszGNQweib8tpHx1WFyAoD44RAAhxi1qnBTMRrGfU5457FnYGg7y zHjhea1SPeyVnzNsNPyYHsuU0SxDr6CxX4CdCXwo2rJIS+GmUn/f2D+0xIeK0T8rN3 NJWNbfGIjW5t5jt+3MjFtoQFwxDnmNVQL3aYotK8= Date: Thu, 20 Jul 2023 22:33:53 +0300 From: Saku Laesvuori Message-ID: <20230720193353.gb75xe2ywl6nfvnr@X-kone> References: <20230720171841.31901-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="qsim6epbmipak2kc" Content-Disposition: inline In-Reply-To: <20230720171841.31901-1-distopico@riseup.net> X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --qsim6epbmipak2kc Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > Fixes telegram-desktop call not working with openSSL 3 >=20 > see: https://github.com/telegramdesktop/tdesktop/issues/26108 >=20 > * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d= 8b8 revision commit You should probably mention adding `libsrtp-for-telegram-desktop` in the ChangeLog. > @@ -96,6 +97,21 @@ (define libyuv-for-telegram-desktop > (base32 > "0mm56p8iapfild2xdw4w8zi35c3xm06fgagiali644gnxdmnym6c"))))) > =20 > +(define libsrtp-for-telegram-desktop > + (let ((commit "a566a9cfcd619e8327784aa7cff4a1276dc1e895") > + (revision "1494")) > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/cisco/libsrtp") > + (commit commit))) > + (file-name (git-file-name > + "libsrtp-for-telegram-desktop" > + (git-version "0" revision commit))) > + (sha256 > + (base32 > + "1ichw2v9s2mggi5p2wbbmlg55q4r48dxi3ks7ykfcfkmh7pb1w1s"))))) > + Have you tried using the libsrtp version packaged in Guix as an input to `webrtc-for-telegram-desktop` instead of bundling it? If that doesn't work, have you tried packaging libsrtp 2.5.0 and using it as an input? It would probably be relatively easy with record inheriting. I'm quite new to Guix (and couldn't push changes even if they were perfect) so someone else might have more comments on this. --qsim6epbmipak2kc Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmS5jCEACgkQJX0oSiod OjJOdBAAuF1bGiO/QoSdEuO3wK5h27JeyNachG3AwI32DkYmKEmlNrrREgMznFD1 90zSFUXbd+pJiDY3OmCAts2NLS4+VJm3dmloPUzP6Ce3FjbygMuPySsalbpx8Skq 9PQAOagOSXV0d8smOH6sfIMRDXFaGPBa8LuMa5YwMyMbbeuURAHEJlcRvMbYDQHL NK/r17rx95MtXFAl57mgVBoIaJz3p4Vki7jCMrniFuW3slVnHHtVR5MYGsD+SNIS RNlQLv7MsNwhFxPXR9pyy8129Yed6mPgS1KT89GtQUGUnIvBwEjhVMb3j6Bnm2x3 egaPMb4ZAOl5FBMUKbvDuWxe5JiDWKHV/1HvDEyBX3rpsxBmV/NwrR/GN+3WTMOT Qn25PkJBDMhbP7P1LV7denmsCDye1KTXcRWD0SUMifTXanI8QhXMqIcriAhZBgoN +v68PgSoUENmMNLcRa91sLeyOz47GogtGQgHayWtZTa4KLcetDbfm8WfYe1CufEp 7C4D51NHxAFsFKzat/YKUoAkw7VtAuTRfygE3+wOuYcmi6OX4vk2uyCcRtml3sl5 2jvDHXbyfrRNXrwO/F46PpUWPilgygXM68pDRJGxo3bNTglMKd35RYygdW+MJUcM 4YfnfEVOTOQezpaNHYkTwGKXN+E+74LYYRXuLtAkSSmysvxAJ7s= =CVid -----END PGP SIGNATURE----- --qsim6epbmipak2kc-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 20:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Saku Laesvuori Cc: rg@raghavgururajan.name, 64748@debbugs.gnu.org, hako@ultrarare.space Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.168988468432514 (code B ref 64748); Thu, 20 Jul 2023 20:25:01 +0000 Received: (at 64748) by debbugs.gnu.org; 20 Jul 2023 20:24:44 +0000 Received: from localhost ([127.0.0.1]:60019 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMaCZ-0008SM-VB for submit@debbugs.gnu.org; Thu, 20 Jul 2023 16:24:44 -0400 Received: from mx1.riseup.net ([198.252.153.129]:45410) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMaCU-0008Rx-GZ for 64748@debbugs.gnu.org; Thu, 20 Jul 2023 16:24:42 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4R6PL8485nzDqXT; Thu, 20 Jul 2023 20:24:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1689884672; bh=9CbgIWZn3T8kXco9Ki7Um9Nqh1H6u0LNWzEeqFDDdLg=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=GbdE4SDnanzjHsUaEIRh+J8CwmUg4UkQS2YfLcZgEqTCnrnMirzsAAdy9/JJ3hNGG 5mHsIHUT3RB059PIdR1GNGwzjNerLA3phVLcvXlzH5sc/8rLxYE3FUSqn6ve2DpueT obo+beC13gkY4lrM85BfwEG351ld2Lwoemt/knak= X-Riseup-User-ID: 1D0916ADBA679FA7908053C9B13D6D77DBC82D03EEE31988804722D671F22421 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4R6PL722jDzJn1j; Thu, 20 Jul 2023 20:24:31 +0000 (UTC) References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> From: Distopico Date: Thu, 20 Jul 2023 15:21:05 -0500 In-reply-to: <20230720193353.gb75xe2ywl6nfvnr@X-kone> Message-ID: <87a5vq9vr7.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain On 2023-07-20, Saku Laesvuori wrote: > > You should probably mention adding `libsrtp-for-telegram-desktop` in the > ChangeLog. Looks like it's not longer necessary, Changelog is auto-generated, that said in the main Changelog > > Have you tried using the libsrtp version packaged in Guix as an input to > `webrtc-for-telegram-desktop` instead of bundling it? If that doesn't > work, have you tried packaging libsrtp 2.5.0 and using it as an input? > It would probably be relatively easy with record inheriting. > > I'm quite new to Guix (and couldn't push changes even if they were > perfect) so someone else might have more comments on this. > I tried but it require source code inside libsrtp folder, for example '/crypto/cipher/cipher.c', also libsrtp package is the compiled version and webrtc-.. require source code from libsrtp. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFJBAEBCAAzFiEEvYwofabWO6y953lVmAk6gHJUa/MFAmS5l/wVHGRpc3RvcGlj b0ByaXNldXAubmV0AAoJEJgJOoByVGvzF4MH+gIXal19cwmlA2Tg/XVtvuONAFFS pJQaGMrVOBbiIrsnSYDaj7s/A6RIgA+Vlc/0ZjC0V2LUGgvaQaXDZhtNtI9OqG7H eVH5j5HrtXurOVKR++D3ViAE70jLxnjqgNKYXsPzig+5imANJwshm8YKfdX6TTQg 6s3ql40/4hWI4kwxX5Af84w4eSYDr/h1IDM84mY+tQk3uaSHhwXDOqOHLIeAXN4U 4lzvY5RuYshfvyO7LI5uKvXEn9jNWzcg8eDxngsjjymdIoJvBsrhcpw7L0crrLCW 3TuU6TOyvUNjC/dNeYjZy9EZ8uFtJhdlzYE7RVLQFi5dE70wvYgC/8OTa2Y= =nQ2R -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 21:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Distopico Cc: rg@raghavgururajan.name, 64748@debbugs.gnu.org, hako@ultrarare.space Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16898871704847 (code B ref 64748); Thu, 20 Jul 2023 21:07:02 +0000 Received: (at 64748) by debbugs.gnu.org; 20 Jul 2023 21:06:10 +0000 Received: from localhost ([127.0.0.1]:60095 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMaqf-0001G7-V5 for submit@debbugs.gnu.org; Thu, 20 Jul 2023 17:06:10 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:34180 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMaqa-0001Fs-Rr for 64748@debbugs.gnu.org; Thu, 20 Jul 2023 17:06:08 -0400 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 9001434012E; Thu, 20 Jul 2023 23:06:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1689887163; bh=0IKiyodVwGz9z5Z6VBAC9QeTPDxVSq9fQwpW7auRoiA=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=tbg2ToT4BzsdzsZZJYLoCuOuoIitdQdUtlwJL7jEMR83/kHCHkqFJmG/4bExeNcPB YamPmMrt2nKG1Kx7PZCRpmw4d5nbF/FBB70DetVGp6rqNzs+PSO2LhYBfRPuJIT1D5 l3cTaR+y9sXoYz2jraHyaD1lbywNV4b7fqWsgTQE= Date: Fri, 21 Jul 2023 00:06:00 +0300 From: Saku Laesvuori Message-ID: <20230720210600.2zwjtcdnoa63rmo4@X-kone> References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="4wbsuxwec63fmkpp" Content-Disposition: inline In-Reply-To: <87a5vq9vr7.fsf@riseup.net> X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --4wbsuxwec63fmkpp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > > You should probably mention adding `libsrtp-for-telegram-desktop` in the > > ChangeLog. >=20 > Looks like it's not longer necessary, Changelog is auto-generated, that > said in the main Changelog I mean the commit message. Now your commit message's ChangeLog only mentions updating webrtc-for-telegram-desktop. See my last telegram commit 6192acf8b77 for an example of what I'm talking about. I would assume the ChangeLog file is autogenerated based on the commit messages. > > Have you tried using the libsrtp version packaged in Guix as an input to > > `webrtc-for-telegram-desktop` instead of bundling it? If that doesn't > > work, have you tried packaging libsrtp 2.5.0 and using it as an input? > > It would probably be relatively easy with record inheriting. > > > > I'm quite new to Guix (and couldn't push changes even if they were > > perfect) so someone else might have more comments on this. >=20 > I tried but it require source code inside libsrtp folder, for example > '/crypto/cipher/cipher.c', also libsrtp package is the compiled version > and webrtc-.. require source code from libsrtp. You would probably have to patch the `CMakeLists.txt` so it doesn't try to build libsrtp from source, see what I did with crc32c in the mentioned commit for reference. It is quite possible that telegram doesn't actually need the source code and they are simply using a git submodule to simplify their own dependency versioning and development. You might also have to add a new libsrtp version because the one packaged in Guix is not configured to use openssl unlike telegram expects. I'd still try the packaged version first if compiling telegram a few more times isn't a big problem for you. --4wbsuxwec63fmkpp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmS5obgACgkQJX0oSiod OjLtYhAAkwEa3lmWT7nOp+QuXf6nbvZ4m2FRmv5/9zIjcsPDyidA2LC3H1dLsz1l ICdPDx/ZwhP0HBwiorCl31om8gMXLlD7nSgp4I+5swsoRuOGnYZ9FabTNrnxZkHT CAR02LI+QtjOr1Cwu1nmfhcEQJt31voLFVkJMXXDobaDMs35tFccCAunbh5ExVgI JUjuufX1JzKytDLxMpT5szLwKf5OGDz7oqbCimZALyb7aX/UYkyNQqoGvOJwA5wP QUx275hrYNKmpGmxV9tcTf9jM6gcPoVi2v7yLKUTgp2RRu/b9wqQ8pjW5Xc1ECd8 L/juoJf30RDvpHWd/ff+gacfvu723AV6tJBSTLbtAdTXLDnTBGCXoMBx0nFiZwGE MuVBssEhJnWZSXtcJz/hyQK75FjQD8Nr5BpZ4/F3Slj72i+5L4qgFQL62c4w9It1 saJJEXxkHAX6bK/gG1A+nLup4wTeVOfojLCZn5LL+AEdXvbTFNL1UF3ocqNNrHNr q91N8z8hyDgE6DpVCqJ1ZHJjJtU1dPdJz+odBi8eMZQL46tZ6RqMm3XFCG2IMdWe OoJ/59Lp5Dj8oWsVRjdsHDYkxihva+rbttnnLvONj8kODm8f+ZXSmBQmXIeai0g1 9uT7CmL7y6EIKzm6XM2A7zrJqM/VTzmXvhKP8pJLgDKIW0FZyJM= =Kg9Y -----END PGP SIGNATURE----- --4wbsuxwec63fmkpp-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 23:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Saku Laesvuori Cc: rg@raghavgururajan.name, 64748@debbugs.gnu.org, hako@ultrarare.space Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.168989502729048 (code B ref 64748); Thu, 20 Jul 2023 23:18:01 +0000 Received: (at 64748) by debbugs.gnu.org; 20 Jul 2023 23:17:07 +0000 Received: from localhost ([127.0.0.1]:60185 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMctP-0007YR-1Y for submit@debbugs.gnu.org; Thu, 20 Jul 2023 19:17:07 -0400 Received: from mx0.riseup.net ([198.252.153.6]:53056) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMctL-0007Xs-4N for 64748@debbugs.gnu.org; Thu, 20 Jul 2023 19:17:06 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4R6T951qS5z9sm7; Thu, 20 Jul 2023 23:16:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1689895017; bh=eVUSQi/3HsHOx94Tg+HuILiEYzcxTNmtqz70Ij/kPHA=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=MvhbuYFdV5FkcCCJszX7h3IrA6QUNe++iZPAv+ebiXzOmRwE9HVhaH8Mhj6z0skO6 mjjY5kvUJh5kot1jxFIpUhek3qVSqppKH3bGbsdj00oc9c/3Yu1J+s5uq/1xt1vhrq qLyJCy1sTFlloi9lhgtUzEx8rGDZ/tNZvh+gyjk4= X-Riseup-User-ID: 257CDB5C2441C22D36B22B523696E8AD77C5F0E1539525541B99B619DAD5D44D Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4R6T9367RlzFqhN; Thu, 20 Jul 2023 23:16:55 +0000 (UTC) References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> From: Distopico Date: Thu, 20 Jul 2023 18:09:13 -0500 In-reply-to: <20230720210600.2zwjtcdnoa63rmo4@X-kone> Message-ID: <87zg3q897e.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain On 2023-07-21, Saku Laesvuori wrote: > > I mean the commit message. Now your commit message's ChangeLog only > mentions updating webrtc-for-telegram-desktop. See my last telegram > commit 6192acf8b77 for an example of what I'm talking about. > > I would assume the ChangeLog file is autogenerated based on the commit > messages. > Make sense, I'll update the patch to add more description > > You would probably have to patch the `CMakeLists.txt` so it doesn't try > to build libsrtp from source, see what I did with crc32c in the > mentioned commit for reference. It is quite possible that telegram > doesn't actually need the source code and they are simply using a git > submodule to simplify their own dependency versioning and development. > > You might also have to add a new libsrtp version because the one > packaged in Guix is not configured to use openssl unlike telegram > expects. I'd still try the packaged version first if compiling telegram > a few more times isn't a big problem for you. > I tried but didn't work, this change is similar to **libyuv**, that have reference to the source code of that external library: example https://github.com/desktop-app/tg_owt/blob/83-sdk/src/api/video/i010_buffer.cc#L17 So the case of **libsrtp** is similar, check for example: - https://github.com/desktop-app/tg_owt/blob/master/src/pc/srtp_session_unittest.cc#L25 - https://github.com/desktop-app/tg_owt/blob/master/src/pc/external_hmac.cc#L18 - https://github.com/desktop-app/tg_owt/blob/master/src/pc/BUILD.gn#L174 So change that will require patch several files, not just `CMakeLists.txt`, patch all those file will be make this package hard to maintain. but you can try if you want and let me know if works. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFJBAEBCAAzFiEEvYwofabWO6y953lVmAk6gHJUa/MFAmS5wGUVHGRpc3RvcGlj b0ByaXNldXAubmV0AAoJEJgJOoByVGvzATMH/2XU0ss7XBJATPE++FkVvYL3TQe1 6mxgnTGh5uHF9PbmG4T/J5fN2R54y8ub/riyKDwAtKnxWCT13X51rWphn4Y6y1r7 03IVzVov1NzvzFh8UMtTUOp2dXcv0gSMs+9EAbLPibTauy2vVwCivso5jBmMR0g3 kVi9C0xY/yFfb5yNyQ/d7Q5Fdrsvh2VOa49np/+MmsjpAVc7ANECsjNYOzeJqSix 2en9IIKJUcpKH7fAlanZN6SBq2rG/QQqm4BptkHkqqdFdS6SeRyPgVBXUTHtdr2S IbsrGD5TiBzkel/5ohRwjq701klEEidB7wSgbs6RQwAQYQbgkbU6uLaPR7Q= =Bi9D -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v2] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 References: <20230720171841.31901-1-distopico@riseup.net> In-Reply-To: <20230720171841.31901-1-distopico@riseup.net> Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi, guix-patches@gnu.org Resent-Date: Thu, 20 Jul 2023 23:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: Distopico , rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi X-Debbugs-Original-Xcc: rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.168989574630084 (code B ref 64748); Thu, 20 Jul 2023 23:30:02 +0000 Received: (at 64748) by debbugs.gnu.org; 20 Jul 2023 23:29:06 +0000 Received: from localhost ([127.0.0.1]:60190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMd4z-0007p9-FS for submit@debbugs.gnu.org; Thu, 20 Jul 2023 19:29:05 -0400 Received: from mx1.riseup.net ([198.252.153.129]:45840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMd4u-0007oc-M2 for 64748@debbugs.gnu.org; Thu, 20 Jul 2023 19:29:03 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4R6TQv0QxRzDqKr for <64748@debbugs.gnu.org>; Thu, 20 Jul 2023 23:28:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1689895735; bh=deesPfLVJSS5JT77fAurOCVkj2CoSYLTx/ywesaaRgE=; h=From:To:Cc:Subject:Date:From; b=UAycH2TyRxMaGwQvNHOHoN2ZmeQckYn1BuVWUTKA+Wwe5FdBMBngMKcXcKpLLHB6Z p3oIGBUlu60Hm++D2IKYmMOCw8oPVf+PlJmDhgkuH+kPqCROrWF7PyC1qReRQFNxGa M0PePM29EBd4CIvEPYWPwgcF6BlNRGU01bp10ay4= X-Riseup-User-ID: EE551987009BDE17E3E2012C07CBA35773691132515D1BE3E385EF2AACF8CF7A Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4R6TQt2ZsDzJn1j; Thu, 20 Jul 2023 23:28:54 +0000 (UTC) From: Distopico Date: Thu, 20 Jul 2023 18:26:59 -0500 Message-ID: <20230720232843.17471-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Fixes telegram-desktop call not working with openSSL 3 Add libsrtp-for-telegram-desktop because webrtc (tg_owt) now use `libsrtp` as submodule and in the code use code source directly from the submodule. see: https://github.com/telegramdesktop/tdesktop/issues/26108 * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit * gnu/packages/telegram.scm (libsrtp-for-telegram-desktop): Add libsrtp a566a9 revision commit --- Add more context about the change in the commit message gnu/packages/telegram.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa01c2f692..aeab249198 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,6 +97,21 @@ (define libyuv-for-telegram-desktop (base32 "0mm56p8iapfild2xdw4w8zi35c3xm06fgagiali644gnxdmnym6c"))))) +(define libsrtp-for-telegram-desktop + (let ((commit "a566a9cfcd619e8327784aa7cff4a1276dc1e895") + (revision "1494")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cisco/libsrtp") + (commit commit))) + (file-name (git-file-name + "libsrtp-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1ichw2v9s2mggi5p2wbbmlg55q4r48dxi3ks7ykfcfkmh7pb1w1s"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) @@ -265,8 +281,8 @@ (define tgcalls-for-telegram-desktop "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") - (revision "328")) + (let ((commit "a45d8b8f0a99bd0e5118dda1dc4a8b7b3ad5dcfd") + (revision "388")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -282,14 +298,14 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) + (base32 "1qs3ikkd6l56brj40cv6wlhx5gj5avisj9mj8ypjfwcyw9hb2n5y")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("libsrtp" "rnnoise" + '("rnnoise" "libsrtp_config" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -311,9 +327,12 @@ (define-public webrtc-for-telegram-desktop (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libyuv-to (string-append third-party "/libyuv"))) + (libyuv-to (string-append third-party "/libyuv")) + (libsrtp-to (string-append third-party "/libsrtp"))) (copy-recursively #$libyuv-for-telegram-desktop - libyuv-to))))))) + libyuv-to) + (copy-recursively #$libsrtp-for-telegram-desktop + libsrtp-to))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17 base-commit: 13cb9b302868b5a966a6ae177412c474084f4bf1 -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jul 2023 07:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Distopico Cc: rg@raghavgururajan.name, 64748@debbugs.gnu.org, hako@ultrarare.space Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.168992417519156 (code B ref 64748); Fri, 21 Jul 2023 07:23:01 +0000 Received: (at 64748) by debbugs.gnu.org; 21 Jul 2023 07:22:55 +0000 Received: from localhost ([127.0.0.1]:60432 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMkTW-0004yt-O9 for submit@debbugs.gnu.org; Fri, 21 Jul 2023 03:22:54 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:45674 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMkTR-0004yc-6P for 64748@debbugs.gnu.org; Fri, 21 Jul 2023 03:22:53 -0400 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 310B934013B; Fri, 21 Jul 2023 09:22:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1689924167; bh=GcpyiHJDUZy1/hYdAiq96cjjp1e8LmxwdGY7HGRC+zs=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=NZaa6docDIJ5tBJr26sCZVCca9daixllUgxfU1BZ6m1TK0mwaLfH+iizUxh6ysgUc rfRdXngHIA6XdJVhGQtOIz+RO1If5txFoP9HE3YGnL+1ToxDA5nEU2qYnxtIudWMfA Cz6NUMVsUHNVARDhwnlRbzMlCQzjGx1e6qGdmpDg= Date: Fri, 21 Jul 2023 10:22:42 +0300 From: Saku Laesvuori Message-ID: <20230721072242.eso6juxdbhpdkgex@X-kone> References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> <87zg3q897e.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="nmk3rybonqm3bbd6" Content-Disposition: inline In-Reply-To: <87zg3q897e.fsf@riseup.net> X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --nmk3rybonqm3bbd6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > > You would probably have to patch the `CMakeLists.txt` so it doesn't try > > to build libsrtp from source, see what I did with crc32c in the > > mentioned commit for reference. It is quite possible that telegram > > doesn't actually need the source code and they are simply using a git > > submodule to simplify their own dependency versioning and development. > > > > You might also have to add a new libsrtp version because the one > > packaged in Guix is not configured to use openssl unlike telegram > > expects. I'd still try the packaged version first if compiling telegram > > a few more times isn't a big problem for you. > > I tried but didn't work, this change is similar to **libyuv**, that have > reference to the source code of that external library: example > https://github.com/desktop-app/tg_owt/blob/83-sdk/src/api/video/i010_buff= er.cc#L17 >=20 > So the case of **libsrtp** is similar, check for example: > - https://github.com/desktop-app/tg_owt/blob/master/src/pc/srtp_session_u= nittest.cc#L25 > - https://github.com/desktop-app/tg_owt/blob/master/src/pc/external_hmac.= cc#L18 > - https://github.com/desktop-app/tg_owt/blob/master/src/pc/BUILD.gn#L174 >=20 > So change that will require patch several files, not just > `CMakeLists.txt`, patch all those file will be make this package hard to > maintain. I see. I think libsrtp is small enough that unbundling it is not worth the effort of patching all those files. --nmk3rybonqm3bbd6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmS6MkIACgkQJX0oSiod OjIGjQ/+KjHeivW0+qMqq9ETAM+lD0KreJhD3Yo/x3v4iGlnIeHX7v5KZtNz8PpP T4rr9BfOpaK3LeUCfK/PFg8cfT5uUC4BZW0JiIe0pLXSpRjAUJkF/oIdJ513qVnw 8oENZi6HdjgcqAjmtuzw3JCGpHrk5gn0DL44b3fQ8ET3XzhBBle+Ofa0rUColC+V 8cKV9n4ur+zdDLGtwFwp2zKj3MnOiSOhE9fkIY89xLz4uB4lvOQp9e5Vdi/vIMPL gxvZlIy1k82uwdwQQYlSjC6M+0tDDMqubEKuF/3Bltu52yll2d8dpwIe/jTOYbs1 gLrWMhoogw1Q+ErfxnKKSUppzK5NdyV+Bah1mG8n9Grb3ESUiM0kJXzGoFac7puM shmV/VLiPDtbHQJZliGogQJpSkoWdrHdG6Ay3kFK0zlUBrndJ+sNr+LVY4RkbfWe lmb5O/0FU3C8lv6P9kJgVjXIG2/w4tz2tK0XPoDy7aTxz02aBXM0xrLZceCDkvFc uUj0gTvDWmqah90Qrj5j3vRHZsHbxiyV3NSCZ1yaS6ax3/yhB3vcHJmBxw+sjGT3 pKTZ09eDdCZvywa058gyyXETWbGthijhquFEJ6RZkyQ54gsnmCO1rbR1Kn/ik4O3 cGCa+ffThBVZVAc8MiqzAFEKmUL9TMOP/3EmgMQzrEpNDPvvb+A= =nkoj -----END PGP SIGNATURE----- --nmk3rybonqm3bbd6-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jul 2023 06:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Saku Laesvuori , Distopico Cc: hako@ultrarare.space, 64748@debbugs.gnu.org Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169000781428228 (code B ref 64748); Sat, 22 Jul 2023 06:37:02 +0000 Received: (at 64748) by debbugs.gnu.org; 22 Jul 2023 06:36:54 +0000 Received: from localhost ([127.0.0.1]:35315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN6EX-0007LE-Ui for submit@debbugs.gnu.org; Sat, 22 Jul 2023 02:36:54 -0400 Received: from out-22.mta1.migadu.com ([2001:41d0:203:375::16]:42987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN6EU-0007L3-8H for 64748@debbugs.gnu.org; Sat, 22 Jul 2023 02:36:53 -0400 Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1690007808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=+ql/NfYleOwS10NO5hKPZb/n0GyOYZtXScSe50NmsYs=; b=OCIrOX1QuUXJ89yXBvVobCb218YDhfHMYV6vB+EWRPyjWLX8v8kjF7CNwg8Ohpg9+cjgzH fT2llsOzYZxZgw25PeEQQThNwcBVNdFlWSP3XxejXYuEQfWIr3+QTN631owzRVOwrG3X0s zD7KfgWbFMIZBBUljg8DeFgQUF1rFzf+iur0gbT/2hpHThA5/YZSUhvkLNo2IsR8DVo7He DB3Eeu5fnoV1fhfjqSGqE0bBsn5T5K4Ie2SKhWO6/plgOOxjtftyFSGxc9CnrB04B3B+nw dqC92t91FuHADPh97W1QfnIYAp1DRO1ngfuRbvhhZm+Mfs+MUCLVFPjEaitExA== Date: Sat, 22 Jul 2023 02:36:39 -0400 MIME-Version: 1.0 References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> <87zg3q897e.fsf@riseup.net> <20230721072242.eso6juxdbhpdkgex@X-kone> Content-Language: en-CA X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan In-Reply-To: <20230721072242.eso6juxdbhpdkgex@X-kone> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------665oWfBRCLIpFwgD0jeAqN7K" X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------665oWfBRCLIpFwgD0jeAqN7K Content-Type: multipart/mixed; boundary="------------XAV7vUmMt7SBzdML4XumkhA1"; protected-headers="v1" From: Raghav Gururajan To: Saku Laesvuori , Distopico Cc: 64748@debbugs.gnu.org, hako@ultrarare.space Message-ID: Subject: Re: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> <87zg3q897e.fsf@riseup.net> <20230721072242.eso6juxdbhpdkgex@X-kone> In-Reply-To: <20230721072242.eso6juxdbhpdkgex@X-kone> --------------XAV7vUmMt7SBzdML4XumkhA1 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 SWYgbGlic3J0cCBpbiBHdWl4IHVzZXMgc29tZXRoaW5nIG90aGVyIHRoYW4gb3BlbnNzbCBi eSBkZWZhdWx0LCB0aGVuIHdlIA0KY291bGQgY3JlYXRlIGEgcGFja2FnZS1kZWZpbml0aW9u ICJsaWJzcnRwLW9wZW5zc2wiIHdoaWNoIGluaGVyaXRzIGZyb20gDQoibGlic3J0cCIgYW5k IGJ1aWxkLWZsYWdnZWQgdG8gdXNlIG9wZW5zc2wuIFdlIGNhbiB0aGVuIHVzZSB0aGF0IGZv ciANCnRlbGVncmFtIGRlc2t0b3AuDQoNClRob3VnaHRzPw0KDQpSZWdhcmRzLA0KUkcuDQo= --------------XAV7vUmMt7SBzdML4XumkhA1-- --------------665oWfBRCLIpFwgD0jeAqN7K Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCZLt49wUDAAAAAAAKCRBfWBZkf4vlUTeI AQDYHgLnXuErEE+nO1mfYDedWyKELseIHG62qXthnwNATwD9FAErU/HYUIWcVQkndczhCG8TjwrY cbewfiYKz53F8gU= =+MQ6 -----END PGP SIGNATURE----- --------------665oWfBRCLIpFwgD0jeAqN7K-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Jul 2023 08:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Raghav Gururajan Cc: hako@ultrarare.space, 64748@debbugs.gnu.org, Distopico Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169001432316953 (code B ref 64748); Sat, 22 Jul 2023 08:26:02 +0000 Received: (at 64748) by debbugs.gnu.org; 22 Jul 2023 08:25:23 +0000 Received: from localhost ([127.0.0.1]:35436 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN7vX-0004PN-Ay for submit@debbugs.gnu.org; Sat, 22 Jul 2023 04:25:23 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:59280 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qN7vT-0004P7-SA for 64748@debbugs.gnu.org; Sat, 22 Jul 2023 04:25:21 -0400 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 45354342471; Sat, 22 Jul 2023 10:25:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1690014318; bh=vuwThY6/r4SgsQj0eI5JxXIlZ2OXrFAofqPq702R0JE=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=ah2Fr7Mv78yogXmIoCB5iKJFkBl7VGU/X0LFczHX4+YMGXQOg7CeAqIGgxwX7XuKG 9anplpJeI0U0tuqqS5+SbehMYIdH6SAPWDX1pipl0ApwiEC6/5FpxsS9iT+UZM0f99 FzGp0lCKUOst9Orl+q/lucOT+WM2W/WshG8zTxfM= Date: Sat, 22 Jul 2023 11:25:16 +0300 From: Saku Laesvuori Message-ID: <20230722082516.yh5nwyfllmwzgjqu@X-kone> References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> <87zg3q897e.fsf@riseup.net> <20230721072242.eso6juxdbhpdkgex@X-kone> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="wgw4ya6wy7jejpl6" Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --wgw4ya6wy7jejpl6 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > If libsrtp in Guix uses something other than openssl by default, then we= =20 > could create a package-definition "libsrtp-openssl" which inherits from= =20 > "libsrtp" and build-flagged to use openssl. We can then use that for=20 > telegram desktop. Yes, but we would still need to patch webrtc-for-telegram-desktop as the code currently refers to headers in the submodule directory. Now that I think of it, it could actually be relatively easy with a regex substitution (something like s!^#include "third_party/(srtp/[^"]*)"$!#include <\1>!) on every file. That's of course assuming that the code only refers to headers in the submodule. --wgw4ya6wy7jejpl6 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmS7kmwACgkQJX0oSiod OjLvkQ/+Lu3GLUjC7CQJJ0sti5NmmMDOcqxi6bWRKPkANwNxnvNXw9hKDTRp9beJ 3FWWwDZFrlwN1SDOCBnju5eouf7BnxaOHXPTSGUpZHkhFfz9pb6GyuvVFmIOC90g ++8UY8/Jt9PmNSZShRrBBXW7QvgZ1ZV41ySWFu569ZOdpW446b1kMXvBQX3BOBvT FqxiZp91gPpCKyAWtNmKXChqJtV7LqdfF5mRNLdVIhp/8Rzvje7Php3JKydLE2cj 6bQqLa7MJEbAg3GaLUv6Uq8ZVsOpv/pcLodNES88U8qX/CP/ZbE4vpl/KDMbe2Yi S+X1t0CW/xc1WC/I6Q3SopWg4bXZi7EtAPvmF8Taj45sCrx+Tppf9C/4w/W7KkDr iFbkljhdK/xPHmMASPLBOeXYWU6JSH87rB6l9nMs1bDNjHGiXun1JwTcU5X4eGQf 7RTUtNzGLAHu8YlK0EJEZAOHuDufm2io0j3xKKV++TWeHUCmO7LmyOQ6P6fy6AOH EMTuDyYNQb0fv5u/tyarbHeXyEl9etffTURE7FYBwwP4hABbdlTVBAVVImueJtJ5 5xBfcbteGFQWDdC7tND2Mh4GIwWSYr+yb8bNQ8nz+Whv4hEWmbS6FI7buW6FEcaW NWb5X8/+oAW3f4V309oH/8x9bD4/Dot+Yq1dTfcVEYR2q7kboHA= =ji6d -----END PGP SIGNATURE----- --wgw4ya6wy7jejpl6-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 17:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Saku Laesvuori Cc: Raghav Gururajan , 64748@debbugs.gnu.org, hako@ultrarare.space Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169021900423078 (code B ref 64748); Mon, 24 Jul 2023 17:17:01 +0000 Received: (at 64748) by debbugs.gnu.org; 24 Jul 2023 17:16:44 +0000 Received: from localhost ([127.0.0.1]:43930 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNzAp-000609-KI for submit@debbugs.gnu.org; Mon, 24 Jul 2023 13:16:43 -0400 Received: from mx0.riseup.net ([198.252.153.6]:35438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNzAn-0005zr-Od for 64748@debbugs.gnu.org; Mon, 24 Jul 2023 13:16:43 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4R8mzR6JX7z9tJW; Mon, 24 Jul 2023 17:16:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690218996; bh=+15s1wbDbCcdD6/nQ24oPYZrqk9krsicqQVEbVDLtSA=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=EhebYfzSfZa8V0EsTDyTeA1X97ukV/lOVrMYR3/zbBiiJ5GeZuM8p01DRNcncwOP5 6L6WWdDuIAEJceWyULp6umL8ckr3fC+oiE3CMAwo0nD78tZ6THaSZwtqU2Tl4y0Nux jVWzoxo/FCLDTH02SkkJgWyu7P1d3XpIfLkwtNok= X-Riseup-User-ID: 84B1CB0A8BC32ABC46D02C6D79861DE0669782974CBF07CCD83412D89E7B89A4 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4R8mzQ2jPMzFqjM; Mon, 24 Jul 2023 17:16:34 +0000 (UTC) References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> <87zg3q897e.fsf@riseup.net> <20230721072242.eso6juxdbhpdkgex@X-kone> <20230722082516.yh5nwyfllmwzgjqu@X-kone> From: Distopico Date: Mon, 24 Jul 2023 12:07:12 -0500 In-reply-to: <20230722082516.yh5nwyfllmwzgjqu@X-kone> Message-ID: <87h6ptnsb3.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) I just tested trying to replace all the libsrtp but not luck from side, they use for example: - third_party/libsrtp/crypto/include/crypto_types.h - third_party/libsrtp/include/srtp.h not exposed by "libsrtp" package, also they use a custom configuration for that library https://github.com/desktop-app/tg_owt/blob/master/src/third_party/libsrtp_config/config.h Also there is many other references to `libsrtp` .C source code https://github.com/desktop-app/tg_owt/blob/a45d8b8f0a99bd0e5118dda1dc4a8b7b3ad5dcfd/cmake/libsrtp.cmake#L4 I was checking nix implementation and they just use the submodules https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/tg_owt.nix#L19 and not "srtp" package. So I think the patch that i sent is a good solution, similar to the nix one, but if someone else want to try another option would be great. On 2023-07-22, Saku Laesvuori wrote: > [[PGP Signed Part:Undecided]] >> If libsrtp in Guix uses something other than openssl by default, then we >> could create a package-definition "libsrtp-openssl" which inherits from >> "libsrtp" and build-flagged to use openssl. We can then use that for >> telegram desktop. > > Yes, but we would still need to patch webrtc-for-telegram-desktop as the > code currently refers to headers in the submodule directory. Now that I > think of it, it could actually be relatively easy with a regex substitution > (something like s!^#include "third_party/(srtp/[^"]*)"$!#include <\1>!) > on every file. That's of course assuming that the code only refers to > headers in the submodule. > > [[End of PGP Signed Part]] From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 24 Jul 2023 20:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Distopico , Saku Laesvuori Cc: hako@ultrarare.space, 64748@debbugs.gnu.org Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169022985618509 (code B ref 64748); Mon, 24 Jul 2023 20:18:02 +0000 Received: (at 64748) by debbugs.gnu.org; 24 Jul 2023 20:17:36 +0000 Received: from localhost ([127.0.0.1]:44189 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qO1zs-0004oT-DO for submit@debbugs.gnu.org; Mon, 24 Jul 2023 16:17:36 -0400 Received: from out-6.mta1.migadu.com ([2001:41d0:203:375::6]:54987) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qO1zo-0004oI-Gm for 64748@debbugs.gnu.org; Mon, 24 Jul 2023 16:17:35 -0400 Message-ID: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1690229850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=D3MiI30+RymfizQBfEXvm+UHHpDWFxiuy/jZGtCp72c=; b=TdZh6ZIdMRm2r+MYAPlvh5ne/P4Bk0ktdOCJBsfUq6lV3XxNoxivJ3QzRwzZ4m4a/WHfe1 cLnakLab5Sov7N9WFWv8GnndlIvYQh/WsIesVG6PCrxKcqAggoZy2AIhUv1Z+kkQm2Kqvl MzMLdDeDjEAuXCCM83kRfB3tRHwbcScKSLwLt2mly0ifFv9K4Ehy8aD44ZUgiiYPS7ZFxb 68mgCBxZ6bV3BUy2ypcmgyA2vXRJFgj1ZBlr7s2l2roGVzmOYKiks6jnqYmfjIOzk6biZw YOlUrDxi8I4RAKxGIdY5mQu67PZolE+/2QJtwf73vCEbR9uZm/wL3YIjbj5FyA== Date: Mon, 24 Jul 2023 16:17:19 -0400 MIME-Version: 1.0 References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> <87zg3q897e.fsf@riseup.net> <20230721072242.eso6juxdbhpdkgex@X-kone> <20230722082516.yh5nwyfllmwzgjqu@X-kone> <87h6ptnsb3.fsf@riseup.net> Content-Language: en-CA X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Raghav Gururajan In-Reply-To: <87h6ptnsb3.fsf@riseup.net> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------gtJ4CGlrSU02LgTqS6EpVxHC" X-Migadu-Flow: FLOW_OUT X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------gtJ4CGlrSU02LgTqS6EpVxHC Content-Type: multipart/mixed; boundary="------------e9ytrtBNmjB8G18vPXNytU4S"; protected-headers="v1" From: Raghav Gururajan To: Distopico , Saku Laesvuori Cc: 64748@debbugs.gnu.org, hako@ultrarare.space Message-ID: Subject: Re: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> <87zg3q897e.fsf@riseup.net> <20230721072242.eso6juxdbhpdkgex@X-kone> <20230722082516.yh5nwyfllmwzgjqu@X-kone> <87h6ptnsb3.fsf@riseup.net> In-Reply-To: <87h6ptnsb3.fsf@riseup.net> --------------e9ytrtBNmjB8G18vPXNytU4S Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: base64 SGVsbG8sDQoNCj4gSSBqdXN0IHRlc3RlZCB0cnlpbmcgdG8gcmVwbGFjZSBhbGwgdGhlIGxp YnNydHAgYnV0IG5vdCBsdWNrIGZyb20gc2lkZSwNCj4gdGhleSB1c2UgZm9yIGV4YW1wbGU6 DQo+IC0gdGhpcmRfcGFydHkvbGlic3J0cC9jcnlwdG8vaW5jbHVkZS9jcnlwdG9fdHlwZXMu aA0KPiAtIHRoaXJkX3BhcnR5L2xpYnNydHAvaW5jbHVkZS9zcnRwLmgNCj4NCj4+IFllcywg YnV0IHdlIHdvdWxkIHN0aWxsIG5lZWQgdG8gcGF0Y2ggd2VicnRjLWZvci10ZWxlZ3JhbS1k ZXNrdG9wIGFzIHRoZQ0KPj4gY29kZSBjdXJyZW50bHkgcmVmZXJzIHRvIGhlYWRlcnMgaW4g dGhlIHN1Ym1vZHVsZSBkaXJlY3RvcnkuIE5vdyB0aGF0IEkNCj4+IHRoaW5rIG9mIGl0LCBp dCBjb3VsZCBhY3R1YWxseSBiZSByZWxhdGl2ZWx5IGVhc3kgd2l0aCBhIHJlZ2V4IHN1YnN0 aXR1dGlvbg0KPj4gKHNvbWV0aGluZyBsaWtlIHMhXiNpbmNsdWRlICJ0aGlyZF9wYXJ0eS8o c3J0cC9bXiJdKikiJCEjaW5jbHVkZSA8XDE+ISkNCj4+IG9uIGV2ZXJ5IGZpbGUuIFRoYXQn cyBvZiBjb3Vyc2UgYXNzdW1pbmcgdGhhdCB0aGUgY29kZSBvbmx5IHJlZmVycyB0bw0KPj4g aGVhZGVycyBpbiB0aGUgc3VibW9kdWxlLg0KDQpJIHdhcyB3b25kZXJpbmcgaWYgd2UgY291 bGQgYWRkIG5ldyBwaGFzZSBhZnRlciB1bnBhY2sgdGhhdCBjb3BpZXMgDQpjb250ZW50cyBm cm9tIGxpYnNydHAgcGFja2FnZSB0byBgW2J1aWxkLWRpcl0vdGhpcmRfcGFydHkvbGlic3J0 cGAuDQoNClJlZ2FyZHMsDQpSRy4NCg0K --------------e9ytrtBNmjB8G18vPXNytU4S-- --------------gtJ4CGlrSU02LgTqS6EpVxHC Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQTNLV6qqYzLN9qR1rBfWBZkf4vlUQUCZL7cTwUDAAAAAAAKCRBfWBZkf4vlUQZZ AQCcIIZaowjAfl9fdhiWD8vxnHzKFdIMUnI92TgKFIf7bgD/eK+aSuNuvSKkN19oY8NZMFIpvyDE Vw+YdciOit+C2Ak= =81Py -----END PGP SIGNATURE----- --------------gtJ4CGlrSU02LgTqS6EpVxHC-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 07:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Raghav Gururajan Cc: hako@ultrarare.space, 64748@debbugs.gnu.org, Distopico Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169035630515837 (code B ref 64748); Wed, 26 Jul 2023 07:26:02 +0000 Received: (at 64748) by debbugs.gnu.org; 26 Jul 2023 07:25:05 +0000 Received: from localhost ([127.0.0.1]:47464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOYtN-00047N-48 for submit@debbugs.gnu.org; Wed, 26 Jul 2023 03:25:05 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:57122 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOYtL-00047C-Gd for 64748@debbugs.gnu.org; Wed, 26 Jul 2023 03:25:04 -0400 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 76F60342467; Wed, 26 Jul 2023 09:25:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1690356304; bh=e4Jh2nKV6uXUBaEhr/87TGYt7FihWahz70EaPNgNohI=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=NGDilfVIFDrjEWzhMHAVI2QaNvr06ERTBM9S1tKpcRvC9Dkg6Lk3mWdYrYvhm0Jb8 4jiHdMckJe1sI/USMRZvTgeqRk2aSIpDoUM773By/qk8Fu+uVVLJnz5aUjtJbDlsoZ q4VWj87eGqN0xjn48YKpLH0KYt7WEpl+qnvq/dQc= Date: Wed, 26 Jul 2023 10:24:58 +0300 From: Saku Laesvuori Message-ID: <20230726072458.izqje3vvldxutste@X-kone> References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> <87zg3q897e.fsf@riseup.net> <20230721072242.eso6juxdbhpdkgex@X-kone> <20230722082516.yh5nwyfllmwzgjqu@X-kone> <87h6ptnsb3.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="2llqbwxytu5vit65" Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --2llqbwxytu5vit65 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > I was wondering if we could add new phase after unpack that copies=20 > contents from libsrtp package to `[build-dir]/third_party/libsrtp`. Simply replacing #$libsrtp-for-telegram-desktop with #$(package-source libsrtp) in the unpack-additional-sources phase seems to work (builds fine = and telegram doesn't crash; I haven't tried calls). --2llqbwxytu5vit65 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmTAykoACgkQJX0oSiod OjJKQw/+ImQcJm+p/haJ7MdA/0Je/Ryj5BbDP009PcRdOLc+sFMzSg/fkJM7zxNC zXj09nyX4jedt6eTMaSXc49YOh+f7GsncFr7YxXnYOpg8RPsnrYX37RQ+mNSKzQd pZQDKFWR4bKSvX9KTuttPvw/hRqTXG3h2t13fAVBjOgnGDhyCrjgjGh9L8Bi8mY2 eftRDViu1ZRP2Kk++vWfsTR1Rs9m1Jh5O9HhqG6aqMYFEyMHgqViD+I1RsoOWG6z gPFWJnVnuJMcmejF8qTuhZGW98uGhHAtWBKQxwqqqfq3m4QDtcuvpSByl7wj6A9e soaJfqItnHL5UDSoSMRhLiQP36s9hjEm/iBxVgp89Nfsc5jfVQs8GEgzj4YRx3C2 X9B+Ow0sw5Z0G4kEYvAK+kjBv/wXmlFoOZ3Zkh4q9LqVTApGddGclyQu2Bk4WiU9 I1ZuHPgnP4wcffx9p3XbCEWPbOWu7uDRb3CudGUpjqsah63yl0PchkwAk5Zy3RsZ UZrlWMQcRK0xkxIIiojtHYSJ+kmkV/AQ2Lih0YHM6PZUVjV4RxgOvrRonIH/tTWy G2zQUDjOPZhsZ8zhZu75ov7TWGeERQy21Z0854ClUvXocAaCwy12nEKXow71ZFA1 OxYkiorxrTaS6U1qnbYJApbfJLWRkeucklYRWVeLwq/HQfZIVkY= =KaIb -----END PGP SIGNATURE----- --2llqbwxytu5vit65-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 18:55:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Saku Laesvuori Cc: Raghav Gururajan , 64748@debbugs.gnu.org, hako@ultrarare.space Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16903976962416 (code B ref 64748); Wed, 26 Jul 2023 18:55:01 +0000 Received: (at 64748) by debbugs.gnu.org; 26 Jul 2023 18:54:56 +0000 Received: from localhost ([127.0.0.1]:50069 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOjey-0000ct-5Z for submit@debbugs.gnu.org; Wed, 26 Jul 2023 14:54:56 -0400 Received: from mx1.riseup.net ([198.252.153.129]:34570) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOjew-0000cf-2E for 64748@debbugs.gnu.org; Wed, 26 Jul 2023 14:54:54 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RB33r2dX6zDqFd; Wed, 26 Jul 2023 18:54:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690397688; bh=mEcEVqg4hM/elgZngDPbqyokDkG0xJcFZ5Aq0w+lMDA=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=KfG+aTk7npyqrIhzcdyZ2ziMjY208LEk9JHhjX2/Zc6r6c45qrXPRRALUpmUwOcP9 sbk1J0UJmjZijBDNn9SfYiEdsVxNlLXHSDpQxgBud1SR9xf2VxCtn1oLyYmfqzXzQV mMDBaVDMLFAyWxrKFanE043qKmUTU/nDB+XL+VPY= X-Riseup-User-ID: 31A0727CAB38AC5CCF6713F7B7E1A415B5FC3855B077415073E38B12CC5FF0AD Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4RB33p5QQ8zJp26; Wed, 26 Jul 2023 18:54:46 +0000 (UTC) References: <20230720171841.31901-1-distopico@riseup.net> <20230720193353.gb75xe2ywl6nfvnr@X-kone> <87a5vq9vr7.fsf@riseup.net> <20230720210600.2zwjtcdnoa63rmo4@X-kone> <87zg3q897e.fsf@riseup.net> <20230721072242.eso6juxdbhpdkgex@X-kone> <20230722082516.yh5nwyfllmwzgjqu@X-kone> <87h6ptnsb3.fsf@riseup.net> <20230726072458.izqje3vvldxutste@X-kone> From: Distopico Date: Wed, 26 Jul 2023 13:54:02 -0500 In-reply-to: <20230726072458.izqje3vvldxutste@X-kone> Message-ID: <87edku33m3.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Tested with calls and works fine, changes in the last path On 2023-07-26, Saku Laesvuori wrote: > [[PGP Signed Part:Undecided]] >> I was wondering if we could add new phase after unpack that copies >> contents from libsrtp package to `[build-dir]/third_party/libsrtp`. > > Simply replacing #$libsrtp-for-telegram-desktop with #$(package-source > libsrtp) in the unpack-additional-sources phase seems to work (builds fine and > telegram doesn't crash; I haven't tried calls). > > [[End of PGP Signed Part]] From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v3] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 References: <20230720171841.31901-1-distopico@riseup.net> In-Reply-To: <20230720171841.31901-1-distopico@riseup.net> Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 18:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: hako@ultrarare.space, Distopico , rg@raghavgururajan.name Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16903977712560 (code B ref 64748); Wed, 26 Jul 2023 18:57:02 +0000 Received: (at 64748) by debbugs.gnu.org; 26 Jul 2023 18:56:11 +0000 Received: from localhost ([127.0.0.1]:50073 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOjgA-0000fD-Il for submit@debbugs.gnu.org; Wed, 26 Jul 2023 14:56:10 -0400 Received: from mx0.riseup.net ([198.252.153.6]:54910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOjg8-0000f0-JH for 64748@debbugs.gnu.org; Wed, 26 Jul 2023 14:56:09 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4RB35G6F5mz9tFB; Wed, 26 Jul 2023 18:56:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690397762; bh=ZImdSbPBDGjTnUrkoDVuK4L3MwaUzQX6J0UUZLPwXBo=; h=From:To:Cc:Subject:Date:From; b=aWp3LR4KRtYY/ncEMfA0xBjgF0lx2BIQ0RbJhfGhoYd+8fBWhjEZ9jsj67AOzLGCz zURa0mBZFCFLmkB9buYqQs+c8grcgQ0Bs8VLZ7ZztXp2nDmfmjT6un2FxFI9egCeYi Ctoa8ZdwaEQJ4xeY4cLnHji0H32yf+WQow2gWrFk= X-Riseup-User-ID: 5E2525FA60A46AC5DB24DA0C8F9CD9909CB89CE0FA7D642B39F9DDF13B4CC933 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4RB35F5dbqzJn7m; Wed, 26 Jul 2023 18:56:01 +0000 (UTC) From: Distopico Date: Wed, 26 Jul 2023 13:54:48 -0500 Message-ID: <20230726185551.1911-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Fixes telegram-desktop call not working with openSSL 3 , Use sources from `libsrtp` instead of the submodule. gnu: libsrtp: Update to 2.5.0. see: https://github.com/telegramdesktop/tdesktop/issues/26108 * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit * gnu/packages/telephony.scm (libsrtp): Update to 2.5.0. --- use sources from existing `libsrtp` package, update it to the last version gnu/packages/telegram.scm | 17 +++++++++++------ gnu/packages/telephony.scm | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa01c2f692..0b32b49d14 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -265,8 +266,8 @@ (define tgcalls-for-telegram-desktop "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") - (revision "328")) + (let ((commit "a45d8b8f0a99bd0e5118dda1dc4a8b7b3ad5dcfd") + (revision "388")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -282,14 +283,14 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) + (base32 "1qs3ikkd6l56brj40cv6wlhx5gj5avisj9mj8ypjfwcyw9hb2n5y")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("libsrtp" "rnnoise" + '("rnnoise" "libsrtp_config" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -311,9 +312,13 @@ (define-public webrtc-for-telegram-desktop (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libyuv-to (string-append third-party "/libyuv"))) + (libyuv-to (string-append third-party "/libyuv")) + (libsrtp-to (string-append third-party "/libsrtp"))) (copy-recursively #$libyuv-for-telegram-desktop - libyuv-to))))))) + libyuv-to) + (copy-recursively #$(package-source + libsrtp) + libsrtp-to))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17 diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index aa65c4eaad..dc0adc7334 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -456,7 +456,7 @@ (define-public sipwitch (define-public libsrtp (package (name "libsrtp") - (version "2.4.2") + (version "2.5.0") (source (origin (method git-fetch) (uri (git-reference @@ -465,7 +465,7 @@ (define-public libsrtp (file-name (git-file-name name version)) (sha256 (base32 - "1gswpjm4jacfxmgglbf8hxi3yzsag4drk4q943p0wkmv21zj8l78")))) + "1ichw2v9s2mggi5p2wbbmlg55q4r48dxi3ks7ykfcfkmh7pb1w1s")))) (native-inputs (list psmisc ;some tests require 'killall' procps)) -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v3] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 19:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Distopico Cc: hako@ultrarare.space, 64748@debbugs.gnu.org, rg@raghavgururajan.name Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16903987944122 (code B ref 64748); Wed, 26 Jul 2023 19:14:02 +0000 Received: (at 64748) by debbugs.gnu.org; 26 Jul 2023 19:13:14 +0000 Received: from localhost ([127.0.0.1]:50087 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOjwg-00014P-1u for submit@debbugs.gnu.org; Wed, 26 Jul 2023 15:13:14 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:56126 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOjwe-00014G-8w for 64748@debbugs.gnu.org; Wed, 26 Jul 2023 15:13:13 -0400 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 5984A340160; Wed, 26 Jul 2023 21:13:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1690398793; bh=IAUez8DcwTREdw/8BSgpPQ39pYABIFKp8a39IUGjcM0=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=QYKOlXigyMxN+CPcVNic10r7Y0/kJlXyHWVjPQ6nvCP4wZkO6D1482aGxoXf1kgkV eUTUz8G4ac/RPFcDgeNsRXsL/QtQDKVw1BLlTKD8r8NrrJIRlOTD5jOSMvFVLNANSD GBu4Xb0cvhSQeYBbZ1zWLDOCjUppQL+Mlw3vxrxs= Date: Wed, 26 Jul 2023 22:13:07 +0300 From: Saku Laesvuori Message-ID: <20230726191307.6urneppnevvaljad@X-kone> References: <20230720171841.31901-1-distopico@riseup.net> <20230726185551.1911-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="qagqoy6rihexvfjj" Content-Disposition: inline In-Reply-To: <20230726185551.1911-1-distopico@riseup.net> X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --qagqoy6rihexvfjj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline > diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm > index aa65c4eaad..dc0adc7334 100644 > --- a/gnu/packages/telephony.scm > +++ b/gnu/packages/telephony.scm > @@ -456,7 +456,7 @@ (define-public sipwitch > (define-public libsrtp > (package > (name "libsrtp") > - (version "2.4.2") > + (version "2.5.0") This should be split to a separate commit (one package per commit). Also, according to `guix refresh --list-dependent libsrtp` libsrtp has 739 (>300) dependent packages and should thus not be updated on master to avoid a drop in substitute availability. Have you checked if the calls work with libsrtp 2.4.2 so that the telegram update could be applied to master without updating libsrtp? --qagqoy6rihexvfjj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmTBcEMACgkQJX0oSiod OjKzaRAAvebdCDaE2oMC+zZtemgt6IFGszEGKmK8fzQXHrPmbE4aa4+ZWgliJ8jc ZFNL/Tfz35R6Wn7u8Xx+f1eHlXg6Qd1BCAWRuD/NN0fBT/cVgLw6xMWUgk1PZgxC 6j0VqrPkf89iUSUatsPfu9LvbKM13iTwz5g0DvzxVDOdl3zTdL3D3wd3k0cWYLWf 99m/M6rMJy4ME9lHUfmjJ+ahbaA6qSAw+pAJOJKab9WJ2WYMNrxidsZ7Z2nF1nib K9VnfakzK+rpH2niDHjnhWyzwOb1M8MZRKn6wC1XfTSQOOVLoKPxhM14VU/7djbL qY8/by44K3UVcpbMeGA+VicyB5N5FcLIE/yYBGDzC9pHp6pq44CkOpYsU6gyf31p MG63K3n62x0986/kA+4PWocou76bWz9jKJDafF1xeG+1OFyUDlth75KTgRShMADS aeCaE9/+yWf6kx71anZoV1aIADAlsX8xVNGZME7HPlwKj2cvRj9nyWU8wI4AT8OI Tm0qnF/m7V0kQSeBrR+6LFCywUxrZ79oBYMZr/6SRmNuvuSarXlKp6ud2h+X91aP KUliVWY7acAQfbiTRGsovc5+07yBMv1xKEufxZJH/hNqpGFLLzJGdN+p/l7gtw8H k43C6lIvU4hVvY7G9yHMK/E4W+hX+CRqBGuRnivZ+CTuw2llvtU= =M1MZ -----END PGP SIGNATURE----- --qagqoy6rihexvfjj-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v4] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 References: <20230720171841.31901-1-distopico@riseup.net> In-Reply-To: <20230720171841.31901-1-distopico@riseup.net> Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 19:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: hako@ultrarare.space, Distopico , rg@raghavgururajan.name Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16903993515008 (code B ref 64748); Wed, 26 Jul 2023 19:23:01 +0000 Received: (at 64748) by debbugs.gnu.org; 26 Jul 2023 19:22:31 +0000 Received: from localhost ([127.0.0.1]:50103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOk5e-0001Ii-KI for submit@debbugs.gnu.org; Wed, 26 Jul 2023 15:22:30 -0400 Received: from mx0.riseup.net ([198.252.153.6]:50748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOk5b-0001IT-EU for 64748@debbugs.gnu.org; Wed, 26 Jul 2023 15:22:29 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4RB3gd5PdRz9tMC; Wed, 26 Jul 2023 19:22:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690399341; bh=GxYXIx/J3I1tKCZtDEvjFMJImz32Y2GDJTgnQyeG4mM=; h=From:To:Cc:Subject:Date:From; b=X+RK9ZRmRwmc2OxWE/4TCDjXiiSUuvquXUv7GyXB8ciVMWBziwbnNsaKCTy9rMG4P gjCHxCZaLsh/hGg9wh+VVj9+tOgSjLh3+lDEeEqNypKASKRBnAZ1KO9LIj38FKNlXf wBqckuhTz7QdaV/bCTjUDH36mdyyH0b7WTfVlY7Y= X-Riseup-User-ID: D65F29AD378A43A69D2897AA3AA0C3620FE15C6CDEB461FF1F0F982ACC62990B Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RB3gc4jL8zFpZR; Wed, 26 Jul 2023 19:22:20 +0000 (UTC) From: Distopico Date: Wed, 26 Jul 2023 14:21:39 -0500 Message-ID: <20230726192211.20232-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Fixes telegram-desktop call not working with openSSL 3 , Use sources from `libsrtp` instead of the submodule. see: https://github.com/telegramdesktop/tdesktop/issues/26108 * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit --- gnu/packages/telegram.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa01c2f692..0b32b49d14 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -265,8 +266,8 @@ (define tgcalls-for-telegram-desktop "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") - (revision "328")) + (let ((commit "a45d8b8f0a99bd0e5118dda1dc4a8b7b3ad5dcfd") + (revision "388")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -282,14 +283,14 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) + (base32 "1qs3ikkd6l56brj40cv6wlhx5gj5avisj9mj8ypjfwcyw9hb2n5y")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("libsrtp" "rnnoise" + '("rnnoise" "libsrtp_config" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -311,9 +312,13 @@ (define-public webrtc-for-telegram-desktop (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libyuv-to (string-append third-party "/libyuv"))) + (libyuv-to (string-append third-party "/libyuv")) + (libsrtp-to (string-append third-party "/libsrtp"))) (copy-recursively #$libyuv-for-telegram-desktop - libyuv-to))))))) + libyuv-to) + (copy-recursively #$(package-source + libsrtp) + libsrtp-to))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17 -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v3] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 19:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Saku Laesvuori Cc: hako@ultrarare.space, 64748@debbugs.gnu.org, rg@raghavgururajan.name Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16903993925103 (code B ref 64748); Wed, 26 Jul 2023 19:24:02 +0000 Received: (at 64748) by debbugs.gnu.org; 26 Jul 2023 19:23:12 +0000 Received: from localhost ([127.0.0.1]:50107 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOk6K-0001KE-3X for submit@debbugs.gnu.org; Wed, 26 Jul 2023 15:23:12 -0400 Received: from mx0.riseup.net ([198.252.153.6]:52106) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOk6I-0001K2-Of for 64748@debbugs.gnu.org; Wed, 26 Jul 2023 15:23:11 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx0.riseup.net (Postfix) with ESMTPS id 4RB3hT2BwLz9s8K; Wed, 26 Jul 2023 19:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1690399385; bh=NXUnWT/mdwgSvZqJAxGlq56/+yIj6RsiGuUyjyXyGuU=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=Lt3y8R2ZO7zaiKz1cN+l3mvUBtRbrqpLcA/2Uff2k5XtCl4flpXr9VS9lPO+BLoGz abJFsMi8uFashg5AJOqTMMpDq2GM8EkTbRZ2xsXnE+ph6MpqGCwEkPliND9sjwo0Zd WVtZKV9BSRgKX/xmtyYWgrCbgQr419jv/+0O7/zU= X-Riseup-User-ID: 6C0B99ED0E2207AA13FC77EF6F574771AB14141E8221FCD31D83F70C106FB8AC Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RB3hS1PnKzFqL3; Wed, 26 Jul 2023 19:23:04 +0000 (UTC) References: <20230720171841.31901-1-distopico@riseup.net> <20230726185551.1911-1-distopico@riseup.net> <20230726191307.6urneppnevvaljad@X-kone> From: Distopico Date: Wed, 26 Jul 2023 14:22:29 -0500 In-reply-to: <20230726191307.6urneppnevvaljad@X-kone> Message-ID: <87a5vi32ax.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) actually I tested first with 2.4.2 and it works fine from my side. On 2023-07-26, Saku Laesvuori wrote: > [[PGP Signed Part:Undecided]] >> diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm >> index aa65c4eaad..dc0adc7334 100644 >> --- a/gnu/packages/telephony.scm >> +++ b/gnu/packages/telephony.scm >> @@ -456,7 +456,7 @@ (define-public sipwitch >> (define-public libsrtp >> (package >> (name "libsrtp") >> - (version "2.4.2") >> + (version "2.5.0") > > This should be split to a separate commit (one package per commit). > > Also, according to `guix refresh --list-dependent libsrtp` libsrtp has > 739 (>300) dependent packages and should thus not be updated on master to avoid > a drop in substitute availability. Have you checked if the calls work > with libsrtp 2.4.2 so that the telegram update could be applied to > master without updating libsrtp? > > [[End of PGP Signed Part]] From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v4] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jul 2023 20:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Distopico Cc: hako@ultrarare.space, 64748@debbugs.gnu.org, rg@raghavgururajan.name Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16904021629603 (code B ref 64748); Wed, 26 Jul 2023 20:10:02 +0000 Received: (at 64748) by debbugs.gnu.org; 26 Jul 2023 20:09:22 +0000 Received: from localhost ([127.0.0.1]:50133 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOkp0-0002Up-15 for submit@debbugs.gnu.org; Wed, 26 Jul 2023 16:09:22 -0400 Received: from vmi571514.contaboserver.net ([75.119.130.101]:55642 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOkox-0002Ug-Sd for 64748@debbugs.gnu.org; Wed, 26 Jul 2023 16:09:20 -0400 Received: from X-kone (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id C2B96340160; Wed, 26 Jul 2023 22:09:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1690402161; bh=e63JwaptwywK2k1ZtErVIQ23e6DvR+G5CgHQHhYETJI=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=OH+/LeZXkLCIYq1sOcWx5zb1kx1gB8JQ0LtiPDKdKA3rQ3vE49kzZ3ZcKQEkTIHeh zDY0vXH7O1Rnytki25YfkL9iZENDTExpn0PYbiZ/DkCYdXIIIdJiJvAHpCUlJ4zOHw YokkRhRPjpZisPhSBifiQBpcoli8fgxTVbcg5OOQ= Date: Wed, 26 Jul 2023 23:09:16 +0300 From: Saku Laesvuori Message-ID: <20230726200916.rwmqmutv7ig5wmbp@X-kone> References: <20230720171841.31901-1-distopico@riseup.net> <20230726192211.20232-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="prd4gvd2gywu6cjj" Content-Disposition: inline In-Reply-To: <20230726192211.20232-1-distopico@riseup.net> X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --prd4gvd2gywu6cjj Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > Fixes telegram-desktop call not working with openSSL 3 , > Use sources from `libsrtp` instead of the submodule. >=20 > see: https://github.com/telegramdesktop/tdesktop/issues/26108 >=20 > * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d= 8b8 revision commit > --- I wonder if this ChangeLog should mention something about adding libsrtp sources to the unpack-additional-sources phase. Otherwise it looks good to me and is just waiting for someone with more experience/commit access. --prd4gvd2gywu6cjj Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoMkZR3NPB29fCOn/JX0oSiodOjIFAmTBfWwACgkQJX0oSiod OjLHyQ/+LwjTf5ftuv6SNxy7E5cU6Opo+DdyLuU9fL16vTR4KWMHRelWKUOf9RSq qn7VWgL0+pptf+Iupd/jBhvGVHLSsP+YlPXDPY9CwOpAcCkw5ze9HQK3srcGdg17 lKSPTmbBTGFJUUlRGijP/bvRsagjsckWLVlpav23TfbFuz7RvpE+b13CkMUcrklo H46GsjoHZXqOKyvuEmwUPKJdhkqL25Xky1oEMl1POhuKI/R+ho6qfbhTk2oey8lX w6krXB3LUqmmYsQATMg8PNKu/ZNE/CQJAKnWuX7wDIjoEmD3//Jc4NYlJnACy07i PMMIecTdDNjiWonbfX1fGULLC8irG/Ko9i0zfvBVNCiLVPCjMUjl8s9N5mwzs+H0 89ENb1CX226b9Z6OY/MdsVEXQFxGtaTlXXFTgxC0BoL0Th1o69uH44tA0S12ZVUz hqm1qhuxBsgWWdE0wP+aLj/7mjCDjBvaUBuBgKhgQE1dk2VuaPfZ6gssmUNkxh5k k1JpV9HFHxdygfh7B3QrnjnWWaIC8v28tgYpYEZn3bjQXN9Htf1pPCwSZmzUaY9a 1TRkJLokg514fXNMqEOpBrQ4SgbfXJRP+v6MsJiMvQ6JGtp9d9Fk/Fuhsvb+285s 843m1pd3JA005EsdVC0D/RNKmZufcXyGKlbrh8XkcFzL9WfJCA8= =Y/Dx -----END PGP SIGNATURE----- --prd4gvd2gywu6cjj-- From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Aug 2023 03:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: hako@ultrarare.space, Distopico , rg@raghavgururajan.name Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16912044305395 (code B ref 64748); Sat, 05 Aug 2023 03:01:02 +0000 Received: (at 64748) by debbugs.gnu.org; 5 Aug 2023 03:00:30 +0000 Received: from localhost ([127.0.0.1]:55169 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qS7Wo-0001Ow-9w for submit@debbugs.gnu.org; Fri, 04 Aug 2023 23:00:30 -0400 Received: from mx1.riseup.net ([198.252.153.129]:44390) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qS7Wl-0001Og-Oo for 64748@debbugs.gnu.org; Fri, 04 Aug 2023 23:00:29 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RHnPy28KCzDqWn; Sat, 5 Aug 2023 03:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1691204422; bh=oWO5QlRLjGKPskFduIFSVJNkeztLGkw34AUvvNlZIdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DY2SGsEa3tgQZI303XMhw53/9u2TwJe8D8yav4MR+GCsWI4R3lHJMPjElN84/nOgB iGxLR8zhjFJlkT7M/FtrmvvKDjLxQeRq/dHTyxm480qUXBqdBPGzB8UWWloGl9tZj5 4WHI3s5x0ShCK4r56x3xaKkA0y5L17P/YeDGUl44= X-Riseup-User-ID: 636FE8028452C5219FDFDAC7719715298F80F8017DD35EE588599D3A0540D97C Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4RHnPx11tnzJmsF; Sat, 5 Aug 2023 03:00:20 +0000 (UTC) From: Distopico Date: Fri, 4 Aug 2023 21:59:50 -0500 Message-ID: <20230805030015.28796-1-distopico@riseup.net> In-Reply-To: <20230726200916.rwmqmutv7ig5wmbp@X-kone> References: <20230726200916.rwmqmutv7ig5wmbp@X-kone> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit Fixes `telegram-desktop` calls that are not working with OpenSSL 3. Now, `webrtc-for-telegram-desktop` uses sources from the Guix `libsrtp` package instead of the submodule in the `unpack-additional-sources` phase. see: https://github.com/telegramdesktop/tdesktop/issues/26108 --- * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit Fixes `telegram-desktop` calls that are not working with OpenSSL 3. Now, `webrtc-for-telegram-desktop` uses sources from the Guix `libsrtp` package instead of the submodule in the `unpack-additional-sources` phase. gnu/packages/telegram.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa01c2f692..0b32b49d14 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -265,8 +266,8 @@ (define tgcalls-for-telegram-desktop "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") - (revision "328")) + (let ((commit "a45d8b8f0a99bd0e5118dda1dc4a8b7b3ad5dcfd") + (revision "388")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -282,14 +283,14 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) + (base32 "1qs3ikkd6l56brj40cv6wlhx5gj5avisj9mj8ypjfwcyw9hb2n5y")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("libsrtp" "rnnoise" + '("rnnoise" "libsrtp_config" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -311,9 +312,13 @@ (define-public webrtc-for-telegram-desktop (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libyuv-to (string-append third-party "/libyuv"))) + (libyuv-to (string-append third-party "/libyuv")) + (libsrtp-to (string-append third-party "/libsrtp"))) (copy-recursively #$libyuv-for-telegram-desktop - libyuv-to))))))) + libyuv-to) + (copy-recursively #$(package-source + libsrtp) + libsrtp-to))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17 base-commit: cf9904bcc8dd03e73675475bb4d8746dc434e415 -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Aug 2023 09:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Distopico Cc: Raghav Gururajan , Saku Laesvuori , 64748@debbugs.gnu.org Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16914019981427 (code B ref 64748); Mon, 07 Aug 2023 09:54:02 +0000 Received: (at 64748) by debbugs.gnu.org; 7 Aug 2023 09:53:18 +0000 Received: from localhost ([127.0.0.1]:60634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSwvN-0000Mw-W2 for submit@debbugs.gnu.org; Mon, 07 Aug 2023 05:53:18 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:51370) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSwvK-0000Mk-8r for 64748@debbugs.gnu.org; Mon, 07 Aug 2023 05:53:15 -0400 Date: Mon, 07 Aug 2023 17:38:57 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691401978; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=gwPOcdpBY/pOeSALuf+ylY6dESvs5Tt3x5tZPa3LeKQ=; b=Ie1ciNjNuiGmxDz+TPlRr+EL334clXztq5s6NT7qrp77/+dLVsDSA5x4UoPHIdXFmNNs6n jYz0pMwQI6jll5NkPemkWDzZBCd2NAhxuLKHqpkCxjseUFIK4ylDr/lUxZu51eZ52Owkr0 iOAjN3LaK99FJeJnek3p3JZwGimqplSJjVuPoECCguh38xAboHYPZNRfJxBd7KyfXHXb5O 2EccTnZpHLGfkifbl/0mv77u998rRRe3ImvpF2xyFZV5RgRyWUbsd3mkGslIyCfaX94zBN SgANLMEBV0bY1C/41ScJpRY9o7J0mEErjWOkoxexy6lSRQevAs0p1Z72ngSsiQ== Message-ID: <87350vw5se.wl-hako@ultrarare.space> From: Hilton Chain In-Reply-To: <20230805030015.28796-1-distopico@riseup.net> References: <20230726200916.rwmqmutv7ig5wmbp@X-kone> <20230805030015.28796-1-distopico@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi, Sorry for the late reply (in this thread). On Sat, 05 Aug 2023 10:59:50 +0800, Distopico wrote: > > * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit > > Fixes `telegram-desktop` calls that are not working with OpenSSL 3. > Now, `webrtc-for-telegram-desktop` uses sources from the Guix `libsrtp` > package instead of the submodule in the `unpack-additional-sources` phase. > > see: https://github.com/telegramdesktop/tdesktop/issues/26108 > > --- > * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit > > Fixes `telegram-desktop` calls that are not working with OpenSSL 3. > Now, `webrtc-for-telegram-desktop` uses sources from the Guix `libsrtp` > package instead of the submodule in the `unpack-additional-sources` phase. Have you checked (Unbundle libSRTP) yet? `git grep include.*libsrtp' shows that `srtp_priv.h' is used, and it's not present in libsrtp@2.4.2. But since you have tested, I think it's not an issue here. For commit message, I think there's a 80-character limit and the long sentences could be split into the [...] below as well. --8<---------------cut here---------------start------------->8--- * gnu/packages/telegram.scm (...): ... [snippet]: [...] [#:phases]: [...] --8<---------------cut here---------------end--------------->8--- 0-388.a45d8b8 can be used to describe the version if you prefer. Patch LGTM, but if the aforementioned patch works, it's better to add it. Thanks From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 07 Aug 2023 12:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Distopico Cc: Raghav Gururajan , Saku Laesvuori , 64748@debbugs.gnu.org Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169141122228016 (code B ref 64748); Mon, 07 Aug 2023 12:28:02 +0000 Received: (at 64748) by debbugs.gnu.org; 7 Aug 2023 12:27:02 +0000 Received: from localhost ([127.0.0.1]:60782 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSzKA-0007Ho-Cm for submit@debbugs.gnu.org; Mon, 07 Aug 2023 08:27:02 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:48280) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qSzK7-0007HN-Od for 64748@debbugs.gnu.org; Mon, 07 Aug 2023 08:27:01 -0400 Date: Mon, 07 Aug 2023 20:26:48 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691411206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=qXFnDAWcTojsmw6ebPaiWdoS7dsl7rH6fpVSHYoCYZ8=; b=4IMpJ+Il0p21UL9r2O9sexxyrj66R2ZD5hpcetXetdNWLGMjqu66yYUihKyy7n53oOxLXg 340XHjBKrGnYnl644ISLtbvHVwf34g73f8ixXzCGVoVtF5vpBthGjanh/YZQPQLcK8eNzH khu04CL5UPzTcfA+B/udVU93NjjtTZMTUeATGHgkBMPYXlJZETklcqZLkm3x7ewWoW0gT1 2ApEdp4grAlZ83OBltI0EAvfklvzRzvSnuKSYJRgftbbfIrN8mPlrTnn5uO99YxA0I/ZAZ 3TpLuKk8PkP+fBhNxlwybE3WnuLZmcacOhA0TisMAuar1XqrXdpTJFpS/IA2IA== Message-ID: <875y5rf37b.wl-hako@ultrarare.space> From: Hilton Chain In-Reply-To: <87350vw5se.wl-hako@ultrarare.space> References: <20230726200916.rwmqmutv7ig5wmbp@X-kone> <20230805030015.28796-1-distopico@riseup.net> <87350vw5se.wl-hako@ultrarare.space> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space X-Spamd-Bar: / X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Mon, 07 Aug 2023 17:38:57 +0800, Hilton Chain wrote: > `git grep include.*libsrtp' shows that `srtp_priv.h' is used, and it's > not present in libsrtp@2.4.2. But since you have tested, I think it's > not an issue here. Found it in libsrtp source! So the reply's unrelated here. From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v6 0/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: distopico@riseup.net, saku@laesvuori.fi, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 13:32:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: Hilton Chain , Distopico , Saku Laesvuori , Raghav Gururajan X-Debbugs-Original-Xcc: Distopico , Saku Laesvuori , Raghav Gururajan Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169322950120582 (code B ref 64748); Mon, 28 Aug 2023 13:32:01 +0000 Received: (at 64748) by debbugs.gnu.org; 28 Aug 2023 13:31:41 +0000 Received: from localhost ([127.0.0.1]:47404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qacLF-0005Lu-1m for submit@debbugs.gnu.org; Mon, 28 Aug 2023 09:31:41 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:44358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qacLB-0005Lk-Rl for 64748@debbugs.gnu.org; Mon, 28 Aug 2023 09:31:39 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1693229448; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dTQedcoPsFxMGoZn5osRaoECFeSjbbBSMbpGiriBrsg=; b=bcIuI2qY9wAKUpO1TIz7kJt0KfbIs0hLSZNduForK+zxBfNfbvxfE6ZogJIUkqxXvazCZ9 QTEv2VSbNf2xvjuXeb2FTRnUGi3AXaL3V8QkvZQP16dJ4MdFw/XRVPde1qua5uRbQ1Lnu1 Dblp1zh1h7NK3EqU2r03nVVUycH2B7hA1kyy3Z1BdtcyF5bax9MuuKrjrwKw2r/v9VzgFW 606JSchRUKM4vkWSqdLOBFNFOkbblfzYx41LHJGoA71YdbUbB4byQ5aDUYGf31nHHY9SVr 6glo+tq7zpwp8zCrdF6KL3jmvMEKP5y/pVKI0qmYxPa1Mc/FwYUAP+xsMAJ/og== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 28 Aug 2023 21:30:50 +0800 Message-ID: In-Reply-To: <20230720171841.31901-1-distopico@riseup.net> References: <20230720171841.31901-1-distopico@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + X-Spam-Level: * X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Finished my own request for unbundling libSRTP and updated the package to the latest commit. Don't have a Telegram account, so I can't test the functionality. Please let me know if it works. Thanks Distopico (1): gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942. Hilton Chain (1): gnu: libyuv-for-telegram-desktop: Update to 0-2439.77c2121. gnu/local.mk | 1 + ...or-telegram-desktop-unbundle-libsrtp.patch | 137 ++++++++++++++++++ gnu/packages/telegram.scm | 22 ++- 3 files changed, 152 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch base-commit: 3b927302124de6eadaa8e0a7280002cd85c04d33 -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v6 1/2] gnu: libyuv-for-telegram-desktop: Update to 0-2439.77c2121. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 13:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169322954620676 (code B ref 64748); Mon, 28 Aug 2023 13:33:01 +0000 Received: (at 64748) by debbugs.gnu.org; 28 Aug 2023 13:32:26 +0000 Received: from localhost ([127.0.0.1]:47411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qacLy-0005NP-Fz for submit@debbugs.gnu.org; Mon, 28 Aug 2023 09:32:26 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:48600) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qacLx-0005NH-6x for 64748@debbugs.gnu.org; Mon, 28 Aug 2023 09:32:25 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1693229497; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rwxkZnwytYpt2ihCKzQwsiOxEQIADI6tF0a7k4nLrvM=; b=aXD/7G0SG95hns2ovtWj+K8mVUpLtRUvnKudpEriILP3CVWnZzSNTEtCj+2DDdulEvusM2 tqGWfGt8ZsqLe5HbDuFAJk3Khqj20Vdr4GGP8S3LZppQiCB0/PEnuL61HBNGPNSsn4DpKz ptOAnjyGFMooEcNvWOMAeb8Nzjul6IvuYC6aSJ8KSWYKkDvNltKVg5R5Qe+EAMaR8NDJi0 WXrUJVfzGw7EgJy3bMJDxg9Pt/lAB/4odHS7yG6glXst+5rW6MM88vnVY2BIyFbIJmUuAw Iv1JpnoqWXTzgQhHEcW4nDKoWvl1QHKFpgr74/7p77zMscdIWbyZEpAEt7iCag== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 28 Aug 2023 21:31:28 +0800 Message-ID: <7ae8d9ceb36788f7705d7f0bf687adccde45cc9a.1693229275.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/telegram.scm (libyuv-for-telegram-desktop): Update to 0-2439.77c2121. --- gnu/packages/telegram.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index dffc6b8ff4..88daea7d7d 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -83,8 +83,8 @@ (define-module (gnu packages telegram) (define %telegram-version "4.8.1") (define libyuv-for-telegram-desktop - (let ((commit "00950840d1c9bcbb3eb6ebc5aac5793e71166c8b") - (revision "2212")) + (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") + (revision "2439")) (origin (method git-fetch) (uri (git-reference @@ -95,7 +95,7 @@ (define libyuv-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0mm56p8iapfild2xdw4w8zi35c3xm06fgagiali644gnxdmnym6c"))))) + "1b4k8yskr9ffl5k8s9i0af1gn1pavsfixla26vh8bij69rdr7f9c"))))) (define cmake-helpers-for-telegram-desktop (origin -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v6 2/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 13:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: Distopico Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169322955220695 (code B ref 64748); Mon, 28 Aug 2023 13:33:02 +0000 Received: (at 64748) by debbugs.gnu.org; 28 Aug 2023 13:32:32 +0000 Received: from localhost ([127.0.0.1]:47414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qacM3-0005Nh-PJ for submit@debbugs.gnu.org; Mon, 28 Aug 2023 09:32:32 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:48608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qacM1-0005NY-6P for 64748@debbugs.gnu.org; Mon, 28 Aug 2023 09:32:30 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1693229500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vqdiwPTVfhRFq798Q+61qa5O5wsvbdEKSvol68edZJM=; b=j/2uUuPoOSpwvoxEJuZ4/pFma0xwvH5HSAFcTMylolm/pXnIv3laDLvJTEV14yS/6uU7mD Vv3xDDLmq+lQaMSfk95vhqHiYaAW36mF46zMipvzmaBLJiAWUnGdlylRWgGcYMQs1X6pGT SK689k/0jV0NYPfV+sg6nibPw+8tKwNuvCdoHIvb9BcuXmIuaRj5kUXQxAdYVLg9BOBde4 a2n+2wVaZWCsfQJx2V0XCo6WU88gzP+/tkfLhNp4kZGba481bjfL/Ux7F+MEqLYsUhtI+a VuOXDPsRWxqxbKdb3I5jSFJEjfg2ysvFq5bwjTUxnD8iHS4z5KCu99zIRgAWsQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 28 Aug 2023 21:31:29 +0800 Message-ID: <6bc3e221df4078fb77503f2106017c0c09528d40.1693229275.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Distopico * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to 0-389.0532942, which fixes `telegram-desktop` calls that are not working with OpenSSL 3. [source]: Add the patch. : Unbundle libsrtp. Keep libsrtp_config. [inputs]: Add libsrtp. --- gnu/local.mk | 1 + ...or-telegram-desktop-unbundle-libsrtp.patch | 137 ++++++++++++++++++ gnu/packages/telegram.scm | 16 +- 3 files changed, 149 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch diff --git a/gnu/local.mk b/gnu/local.mk index 8f409b7ea8..684f9f3ec4 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2094,6 +2094,7 @@ dist_patch_DATA = \ %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch new file mode 100644 index 0000000000..486f0b1aa5 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch @@ -0,0 +1,137 @@ +From 62672f3756ecf218252098211d78c13369ab6d28 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Thu, 4 May 2023 16:21:09 +0300 +Subject: [PATCH] Unbundle libSRTP + +Avoid private symbols and link against system-wide libSRTP. The excluded code +in SrtpSession looks unreachable from the call integration in Telegram Desktop. +--- + CMakeLists.txt | 3 +++ + cmake/libsrtp.cmake | 13 +++++++++++++ + src/pc/external_hmac.cc | 1 - + src/pc/external_hmac.h | 9 ++++++--- + src/pc/srtp_session.cc | 16 ++++++++++++++-- + 5 files changed, 36 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af7d24c21..66bec8fdf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2647,6 +2647,9 @@ if (TG_OWT_USE_PROTOBUF) + list(APPEND export_targets proto) + endif() + ++if (LIBSRTP_FOUND) ++ target_compile_definitions(tg_owt PRIVATE HAVE_LIBSRTP) ++endif() + if (NOT absl_FOUND) + list(APPEND export_targets libabsl) + endif() +diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake +index 5124312d2..01f051606 100644 +--- a/cmake/libsrtp.cmake ++++ b/cmake/libsrtp.cmake +@@ -1,3 +1,16 @@ ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(LIBSRTP libsrtp2) ++ ++if (LIBSRTP_FOUND) ++ add_library(libsrtp INTERFACE EXCLUDE_FROM_ALL) ++ add_library(tg_owt::libsrtp ALIAS libsrtp) ++ ++ target_include_directories(libsrtp INTERFACE ${LIBSRTP_INCLUDE_DIRS} ${LIBSRTP_CFLAGS_OTHER}) ++ target_link_libraries(libsrtp INTERFACE ${LIBSRTP_LINK_LIBRARIES} ${LIBSRTP_LDFLAGS_OTHER}) ++ ++ return() ++endif() ++ + add_library(libsrtp OBJECT EXCLUDE_FROM_ALL) + init_target(libsrtp) + add_library(tg_owt::libsrtp ALIAS libsrtp) +diff --git a/src/pc/external_hmac.cc b/src/pc/external_hmac.cc +index 27b5d0e5a..222f5d9ae 100644 +--- a/src/pc/external_hmac.cc ++++ b/src/pc/external_hmac.cc +@@ -15,7 +15,6 @@ + + #include "rtc_base/logging.h" + #include "rtc_base/zero_memory.h" +-#include "third_party/libsrtp/include/srtp.h" + + // Begin test case 0 */ + static const uint8_t kExternalHmacTestCase0Key[20] = { +diff --git a/src/pc/external_hmac.h b/src/pc/external_hmac.h +index c5071fc19..8fdc2f1a7 100644 +--- a/src/pc/external_hmac.h ++++ b/src/pc/external_hmac.h +@@ -30,9 +30,12 @@ + + #include + +-#include "third_party/libsrtp/crypto/include/crypto_types.h" +-#include "third_party/libsrtp/include/srtp.h" +-#include "third_party/libsrtp/include/srtp_priv.h" ++#ifdef HAVE_LIBSRTP ++# include ++# include ++#else ++# include "srtp_priv.h" ++#endif + + #define EXTERNAL_HMAC_SHA1 SRTP_HMAC_SHA1 + 1 + #define HMAC_KEY_LENGTH 20 +diff --git a/src/pc/srtp_session.cc b/src/pc/srtp_session.cc +index 7d1aaf2d6..7b5a789b0 100644 +--- a/src/pc/srtp_session.cc ++++ b/src/pc/srtp_session.cc +@@ -30,8 +30,12 @@ + #include "rtc_base/thread_annotations.h" + #include "rtc_base/time_utils.h" + #include "system_wrappers/include/metrics.h" +-#include "third_party/libsrtp/include/srtp.h" +-#include "third_party/libsrtp/include/srtp_priv.h" ++ ++#ifdef HAVE_LIBSRTP ++# include ++#else ++# include "srtp_priv.h" ++#endif + + namespace cricket { + +@@ -290,6 +294,9 @@ bool SrtpSession::UnprotectRtcp(void* p, int in_len, int* out_len) { + bool SrtpSession::GetRtpAuthParams(uint8_t** key, int* key_len, int* tag_len) { + RTC_DCHECK(thread_checker_.IsCurrent()); + RTC_DCHECK(IsExternalAuthActive()); ++#ifdef HAVE_LIBSRTP ++ return false; ++#else + if (!IsExternalAuthActive()) { + return false; + } +@@ -313,6 +320,7 @@ bool SrtpSession::GetRtpAuthParams(uint8_t** key, int* key_len, int* tag_len) { + *key_len = external_hmac->key_length; + *tag_len = rtp_auth_tag_len_; + return true; ++#endif + } + + int SrtpSession::GetSrtpOverhead() const { +@@ -336,6 +344,9 @@ bool SrtpSession::GetSendStreamPacketIndex(void* p, + int in_len, + int64_t* index) { + RTC_DCHECK(thread_checker_.IsCurrent()); ++#ifdef HAVE_LIBSRTP ++ return false; ++#else + srtp_hdr_t* hdr = reinterpret_cast(p); + srtp_stream_ctx_t* stream = srtp_get_stream(session_, hdr->ssrc); + if (!stream) { +@@ -346,6 +357,7 @@ bool SrtpSession::GetSendStreamPacketIndex(void* p, + *index = static_cast(rtc::NetworkToHost64( + srtp_rdbx_get_packet_index(&stream->rtp_rdbx) << 16)); + return true; ++#endif + } + + bool SrtpSession::DoSetKey(int type, diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 88daea7d7d..a3d5dc273a 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,8 +1,9 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan -;;; Copyright © 2022 Hilton Chain +;;; Copyright © 2022, 2023 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2023 Lu Hui +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -266,8 +267,8 @@ (define tgcalls-for-telegram-desktop "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") - (revision "328")) + (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") + (revision "389")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -283,14 +284,18 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) + (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/123 + "webrtc-for-telegram-desktop-unbundle-libsrtp.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("libsrtp" "rnnoise" + '("libsrtp_config" "rnnoise" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -325,6 +330,7 @@ (define-public webrtc-for-telegram-desktop libdrm libglvnd libjpeg-turbo + libsrtp libvpx libxcomposite libxdamage -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v7 0/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 14:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169323465330924 (code B ref 64748); Mon, 28 Aug 2023 14:58:02 +0000 Received: (at 64748) by debbugs.gnu.org; 28 Aug 2023 14:57:33 +0000 Received: from localhost ([127.0.0.1]:48746 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qadgK-00082i-Pj for submit@debbugs.gnu.org; Mon, 28 Aug 2023 10:57:33 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:50330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qadgI-00082a-Vw for 64748@debbugs.gnu.org; Mon, 28 Aug 2023 10:57:32 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1693234601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CXgJCmXqyGFiPett13AJBnztki8hSNpf5R/M3byaX6g=; b=cJEgBXP4UgZgkAsosR+cSTceKpME7ytSfFnE1kAe91PH6wxdu1oYLVUrB0dMkgaJlAnTb1 YxfdARHVgxMFGrhpNmTja/OA7UJrPFOv485mKaPpyQmuPNPwt5digoJbC0X07W2AXnHjJQ EbeSfIcqm+0d/ntia3zo24xhkLHr8hxO6NaiZRn82C+s0J4MDLNI1kUlEtSodofWiC+it3 +c1zhdw9vQS8+uFROyLi1lrHOjINc2hyPn3z4IqVB37C5YI3yN6IPlogiItAvHS/6xDCgc nHLXq3UuKPVQUA/K9fPryi5USMlFLaYzJ4UEz4WnAmb5CLTrs4b2E39MorYylg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 28 Aug 2023 22:56:34 +0800 Message-ID: In-Reply-To: <20230720171841.31901-1-distopico@riseup.net> References: <20230720171841.31901-1-distopico@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: + X-Spam-Level: * X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) V6 -> V7: Don't keep the unnecessary libsrtp_config. Distopico (1): gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942. Hilton Chain (1): gnu: libyuv-for-telegram-desktop: Update to 0-2439.77c2121. gnu/local.mk | 1 + ...or-telegram-desktop-unbundle-libsrtp.patch | 137 ++++++++++++++++++ gnu/packages/telegram.scm | 22 ++- 3 files changed, 152 insertions(+), 8 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch base-commit: 4a49a89b09d07d96f4d6ef3c0ca93801370f7b20 -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v7 1/2] gnu: libyuv-for-telegram-desktop: Update to 0-2439.77c2121. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169323485531358 (code B ref 64748); Mon, 28 Aug 2023 15:01:02 +0000 Received: (at 64748) by debbugs.gnu.org; 28 Aug 2023 15:00:55 +0000 Received: from localhost ([127.0.0.1]:48750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qadjb-00089i-Cc for submit@debbugs.gnu.org; Mon, 28 Aug 2023 11:00:55 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:35098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qadjZ-00089X-GD for 64748@debbugs.gnu.org; Mon, 28 Aug 2023 11:00:54 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1693234804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DVR1xffcq57cgrDFsLdSAB4r2tJovTYptATy4TEVVww=; b=DTWlszygh9VBW9dwei1LbYNp/rwo30U+me9mBnDzAqa/Co/COPPElQb+EsMcfShRIVCdiD SLjlIHzHPTv56a1J1p9NGfA7XG241OqyUEsZUzz4omWsYFToK+99ewVWLgNiRkvgU7uSkw olOcUp7nfsDOmFQ5L73k9pbNlAggo3tuZhMuJ9BOLRP6vUJU0zD8J6lhziN+lCnbwHeyHG MQdwBy2leydHhc9PNssB+cWO92oBaMpObEwrsbNUiABbCCIx2hYU8GY3SV9KmNjTo0F5wb Nkr6WV7sTW7LXBwCFQtH8pISoY3HNFnW48d7vT5ULxA75todmV4HU8RQcaCqwg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 28 Aug 2023 23:00:03 +0800 Message-ID: <61dfad1a1947a99fdc1104c2943aebdb4b79aebf.1693234399.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/telegram.scm (libyuv-for-telegram-desktop): Update to 0-2439.77c2121. --- (no change since v6) gnu/packages/telegram.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index dffc6b8ff4..88daea7d7d 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -83,8 +83,8 @@ (define-module (gnu packages telegram) (define %telegram-version "4.8.1") (define libyuv-for-telegram-desktop - (let ((commit "00950840d1c9bcbb3eb6ebc5aac5793e71166c8b") - (revision "2212")) + (let ((commit "77c2121f7e6b8e694d6e908bbbe9be24214097da") + (revision "2439")) (origin (method git-fetch) (uri (git-reference @@ -95,7 +95,7 @@ (define libyuv-for-telegram-desktop (git-version "0" revision commit))) (sha256 (base32 - "0mm56p8iapfild2xdw4w8zi35c3xm06fgagiali644gnxdmnym6c"))))) + "1b4k8yskr9ffl5k8s9i0af1gn1pavsfixla26vh8bij69rdr7f9c"))))) (define cmake-helpers-for-telegram-desktop (origin -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v7 2/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Aug 2023 15:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64748@debbugs.gnu.org Cc: Hilton Chain , Distopico Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.169323486131378 (code B ref 64748); Mon, 28 Aug 2023 15:01:02 +0000 Received: (at 64748) by debbugs.gnu.org; 28 Aug 2023 15:01:01 +0000 Received: from localhost ([127.0.0.1]:48753 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qadjg-0008A2-Lv for submit@debbugs.gnu.org; Mon, 28 Aug 2023 11:01:01 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:35110) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qadjd-00089t-8G for 64748@debbugs.gnu.org; Mon, 28 Aug 2023 11:00:59 -0400 From: Hilton Chain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1693234808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u16GYGz9krVwMACNAvq3Uqf+OcodL/GJnrQFDrqDDDw=; b=Y8677ugUaJ01CqghqYCLgpC6uGkxkudhDgzfGoGm/VJdd0wtZqkDAZR6No/tyBDYRsFWO/ KOA7gk3CbGXQVrpfCqmwRKl7AyLRyYn9Kbw8iCg1su1stExAgMoBlgUxaNJbMo2LLrddzq 2PuSkceZPT5kI8e/5D7fo3iXnVO1sWAPzedL+70GqQYqci4dxGpZc7v3T7blR3Ei1KQCBg WNEkAk4sa/S++Bz7shmpWo3B73WH2L6utQzV8QmJJtoBNB1r20xZWOSBkRQtdrS6Vpw78y qjuTIEe2lg7jDUnqLccHL8C8V8dx2c4pOOcvk/S1I3Hja4sz5fuozwLgC7MgVw== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Date: Mon, 28 Aug 2023 23:00:04 +0800 Message-ID: <243d068053e6678cd4c89f2b2d9314b28473dbea.1693234399.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spamd-Bar: --- X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) From: Distopico * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to 0-389.0532942, which fixes `telegram-desktop` calls that are not working with OpenSSL 3. [source]: Add the patch. : Unbundle libsrtp. [inputs]: Add libsrtp. Signed-off-by: Hilton Chain --- gnu/local.mk | 1 + ...or-telegram-desktop-unbundle-libsrtp.patch | 137 ++++++++++++++++++ gnu/packages/telegram.scm | 16 +- 3 files changed, 149 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch diff --git a/gnu/local.mk b/gnu/local.mk index 48187d7e64..5ab021eaed 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2093,6 +2093,7 @@ dist_patch_DATA = \ %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ + %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch new file mode 100644 index 0000000000..486f0b1aa5 --- /dev/null +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch @@ -0,0 +1,137 @@ +From 62672f3756ecf218252098211d78c13369ab6d28 Mon Sep 17 00:00:00 2001 +From: Nicholas Guriev +Date: Thu, 4 May 2023 16:21:09 +0300 +Subject: [PATCH] Unbundle libSRTP + +Avoid private symbols and link against system-wide libSRTP. The excluded code +in SrtpSession looks unreachable from the call integration in Telegram Desktop. +--- + CMakeLists.txt | 3 +++ + cmake/libsrtp.cmake | 13 +++++++++++++ + src/pc/external_hmac.cc | 1 - + src/pc/external_hmac.h | 9 ++++++--- + src/pc/srtp_session.cc | 16 ++++++++++++++-- + 5 files changed, 36 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index af7d24c21..66bec8fdf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2647,6 +2647,9 @@ if (TG_OWT_USE_PROTOBUF) + list(APPEND export_targets proto) + endif() + ++if (LIBSRTP_FOUND) ++ target_compile_definitions(tg_owt PRIVATE HAVE_LIBSRTP) ++endif() + if (NOT absl_FOUND) + list(APPEND export_targets libabsl) + endif() +diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake +index 5124312d2..01f051606 100644 +--- a/cmake/libsrtp.cmake ++++ b/cmake/libsrtp.cmake +@@ -1,3 +1,16 @@ ++find_package(PkgConfig REQUIRED) ++pkg_check_modules(LIBSRTP libsrtp2) ++ ++if (LIBSRTP_FOUND) ++ add_library(libsrtp INTERFACE EXCLUDE_FROM_ALL) ++ add_library(tg_owt::libsrtp ALIAS libsrtp) ++ ++ target_include_directories(libsrtp INTERFACE ${LIBSRTP_INCLUDE_DIRS} ${LIBSRTP_CFLAGS_OTHER}) ++ target_link_libraries(libsrtp INTERFACE ${LIBSRTP_LINK_LIBRARIES} ${LIBSRTP_LDFLAGS_OTHER}) ++ ++ return() ++endif() ++ + add_library(libsrtp OBJECT EXCLUDE_FROM_ALL) + init_target(libsrtp) + add_library(tg_owt::libsrtp ALIAS libsrtp) +diff --git a/src/pc/external_hmac.cc b/src/pc/external_hmac.cc +index 27b5d0e5a..222f5d9ae 100644 +--- a/src/pc/external_hmac.cc ++++ b/src/pc/external_hmac.cc +@@ -15,7 +15,6 @@ + + #include "rtc_base/logging.h" + #include "rtc_base/zero_memory.h" +-#include "third_party/libsrtp/include/srtp.h" + + // Begin test case 0 */ + static const uint8_t kExternalHmacTestCase0Key[20] = { +diff --git a/src/pc/external_hmac.h b/src/pc/external_hmac.h +index c5071fc19..8fdc2f1a7 100644 +--- a/src/pc/external_hmac.h ++++ b/src/pc/external_hmac.h +@@ -30,9 +30,12 @@ + + #include + +-#include "third_party/libsrtp/crypto/include/crypto_types.h" +-#include "third_party/libsrtp/include/srtp.h" +-#include "third_party/libsrtp/include/srtp_priv.h" ++#ifdef HAVE_LIBSRTP ++# include ++# include ++#else ++# include "srtp_priv.h" ++#endif + + #define EXTERNAL_HMAC_SHA1 SRTP_HMAC_SHA1 + 1 + #define HMAC_KEY_LENGTH 20 +diff --git a/src/pc/srtp_session.cc b/src/pc/srtp_session.cc +index 7d1aaf2d6..7b5a789b0 100644 +--- a/src/pc/srtp_session.cc ++++ b/src/pc/srtp_session.cc +@@ -30,8 +30,12 @@ + #include "rtc_base/thread_annotations.h" + #include "rtc_base/time_utils.h" + #include "system_wrappers/include/metrics.h" +-#include "third_party/libsrtp/include/srtp.h" +-#include "third_party/libsrtp/include/srtp_priv.h" ++ ++#ifdef HAVE_LIBSRTP ++# include ++#else ++# include "srtp_priv.h" ++#endif + + namespace cricket { + +@@ -290,6 +294,9 @@ bool SrtpSession::UnprotectRtcp(void* p, int in_len, int* out_len) { + bool SrtpSession::GetRtpAuthParams(uint8_t** key, int* key_len, int* tag_len) { + RTC_DCHECK(thread_checker_.IsCurrent()); + RTC_DCHECK(IsExternalAuthActive()); ++#ifdef HAVE_LIBSRTP ++ return false; ++#else + if (!IsExternalAuthActive()) { + return false; + } +@@ -313,6 +320,7 @@ bool SrtpSession::GetRtpAuthParams(uint8_t** key, int* key_len, int* tag_len) { + *key_len = external_hmac->key_length; + *tag_len = rtp_auth_tag_len_; + return true; ++#endif + } + + int SrtpSession::GetSrtpOverhead() const { +@@ -336,6 +344,9 @@ bool SrtpSession::GetSendStreamPacketIndex(void* p, + int in_len, + int64_t* index) { + RTC_DCHECK(thread_checker_.IsCurrent()); ++#ifdef HAVE_LIBSRTP ++ return false; ++#else + srtp_hdr_t* hdr = reinterpret_cast(p); + srtp_stream_ctx_t* stream = srtp_get_stream(session_, hdr->ssrc); + if (!stream) { +@@ -346,6 +357,7 @@ bool SrtpSession::GetSendStreamPacketIndex(void* p, + *index = static_cast(rtc::NetworkToHost64( + srtp_rdbx_get_packet_index(&stream->rtp_rdbx) << 16)); + return true; ++#endif + } + + bool SrtpSession::DoSetKey(int type, diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 88daea7d7d..4814c22b6c 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,8 +1,9 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Raghav Gururajan -;;; Copyright © 2022 Hilton Chain +;;; Copyright © 2022, 2023 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori ;;; Copyright © 2023 Lu Hui +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -266,8 +267,8 @@ (define tgcalls-for-telegram-desktop "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") - (revision "328")) + (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") + (revision "389")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -283,14 +284,18 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) + (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k")) + (patches + (search-patches + ;; https://github.com/desktop-app/tg_owt/pull/123 + "webrtc-for-telegram-desktop-unbundle-libsrtp.patch")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("libsrtp" "rnnoise" + '("rnnoise" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -325,6 +330,7 @@ (define-public webrtc-for-telegram-desktop libdrm libglvnd libjpeg-turbo + libsrtp libvpx libxcomposite libxdamage -- 2.41.0 From unknown Thu Aug 21 12:10:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64748] [PATCH v7 2/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942. Resent-From: Distopico Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 29 Aug 2023 18:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Hilton Chain Cc: 64748@debbugs.gnu.org Received: via spool by 64748-submit@debbugs.gnu.org id=B64748.16933329234233 (code B ref 64748); Tue, 29 Aug 2023 18:16:01 +0000 Received: (at 64748) by debbugs.gnu.org; 29 Aug 2023 18:15:23 +0000 Received: from localhost ([127.0.0.1]:51521 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb3FK-00016D-EM for submit@debbugs.gnu.org; Tue, 29 Aug 2023 14:15:23 -0400 Received: from mx1.riseup.net ([198.252.153.129]:59176) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qb3FG-00015v-KT for 64748@debbugs.gnu.org; Tue, 29 Aug 2023 14:15:21 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4RZwZ61yVwzDqPg; Tue, 29 Aug 2023 18:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1693332905; bh=3m1eaZ9srbmyVvasd430T/6NxDCPge6Gbf/Nez9tCq0=; h=References:From:To:Cc:Subject:Date:In-reply-to:From; b=E5XeoH+h3YVTd1eZm+akWdYbS40CfFGCa5CM/0y8E6UjAqKZi7k4CVUgVVqx9wsJs 5GmeA82bfMdwXXebDjYc6lTgjZiiduI3ZYNl1yZvqkLOIeHPQ1dkvorvmBm37PKDeB tT/HAfHCiKYU31uVIRZpFgiuQ5lbc8cCEVJOI+eI= X-Riseup-User-ID: 329583D67383A666DED733C04BA642F692A013E8677B72D7D0588EAB5C222239 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4RZwYh3ngCzFqjF; Tue, 29 Aug 2023 18:14:32 +0000 (UTC) References: <243d068053e6678cd4c89f2b2d9314b28473dbea.1693234399.git.hako@ultrarare.space> From: Distopico Date: Tue, 29 Aug 2023 13:13:52 -0500 In-reply-to: <243d068053e6678cd4c89f2b2d9314b28473dbea.1693234399.git.hako@ultrarare.space> Message-ID: <87msy990my.fsf@riseup.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Build and the call works fine from my side On 2023-08-28, Hilton Chain wrote: > From: Distopico > > * gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch= : New > file. > * gnu/local.mk (dist_patch_DATA): Register it. > * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to > 0-389.0532942, which fixes `telegram-desktop` calls that are not working = with > OpenSSL 3. > [source]: Add the patch. > : Unbundle libsrtp. > [inputs]: Add libsrtp. > > Signed-off-by: Hilton Chain > --- > gnu/local.mk | 1 + > ...or-telegram-desktop-unbundle-libsrtp.patch | 137 ++++++++++++++++++ > gnu/packages/telegram.scm | 16 +- > 3 files changed, 149 insertions(+), 5 deletions(-) > create mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-unbu= ndle-libsrtp.patch > > diff --git a/gnu/local.mk b/gnu/local.mk > index 48187d7e64..5ab021eaed 100644 > --- a/gnu/local.mk > +++ b/gnu/local.mk > @@ -2093,6 +2093,7 @@ dist_patch_DATA =3D \ > %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ > %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ > %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ > + %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patc= h \ > %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ > %D%/packages/patches/wmctrl-64-fix.patch \ > %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ > diff --git a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-li= bsrtp.patch b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-lib= srtp.patch > new file mode 100644 > index 0000000000..486f0b1aa5 > --- /dev/null > +++ b/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.p= atch > @@ -0,0 +1,137 @@ > +From 62672f3756ecf218252098211d78c13369ab6d28 Mon Sep 17 00:00:00 2001 > +From: Nicholas Guriev > +Date: Thu, 4 May 2023 16:21:09 +0300 > +Subject: [PATCH] Unbundle libSRTP > + > +Avoid private symbols and link against system-wide libSRTP. The excluded= code > +in SrtpSession looks unreachable from the call integration in Telegram D= esktop. > +--- > + CMakeLists.txt | 3 +++ > + cmake/libsrtp.cmake | 13 +++++++++++++ > + src/pc/external_hmac.cc | 1 - > + src/pc/external_hmac.h | 9 ++++++--- > + src/pc/srtp_session.cc | 16 ++++++++++++++-- > + 5 files changed, 36 insertions(+), 6 deletions(-) > + > +diff --git a/CMakeLists.txt b/CMakeLists.txt > +index af7d24c21..66bec8fdf 100644 > +--- a/CMakeLists.txt > ++++ b/CMakeLists.txt > +@@ -2647,6 +2647,9 @@ if (TG_OWT_USE_PROTOBUF) > + list(APPEND export_targets proto) > + endif() > + > ++if (LIBSRTP_FOUND) > ++ target_compile_definitions(tg_owt PRIVATE HAVE_LIBSRTP) > ++endif() > + if (NOT absl_FOUND) > + list(APPEND export_targets libabsl) > + endif() > +diff --git a/cmake/libsrtp.cmake b/cmake/libsrtp.cmake > +index 5124312d2..01f051606 100644 > +--- a/cmake/libsrtp.cmake > ++++ b/cmake/libsrtp.cmake > +@@ -1,3 +1,16 @@ > ++find_package(PkgConfig REQUIRED) > ++pkg_check_modules(LIBSRTP libsrtp2) > ++ > ++if (LIBSRTP_FOUND) > ++ add_library(libsrtp INTERFACE EXCLUDE_FROM_ALL) > ++ add_library(tg_owt::libsrtp ALIAS libsrtp) > ++ > ++ target_include_directories(libsrtp INTERFACE ${LIBSRTP_INCLUDE_DIRS= } ${LIBSRTP_CFLAGS_OTHER}) > ++ target_link_libraries(libsrtp INTERFACE ${LIBSRTP_LINK_LIBRARIES} $= {LIBSRTP_LDFLAGS_OTHER}) > ++ > ++ return() > ++endif() > ++ > + add_library(libsrtp OBJECT EXCLUDE_FROM_ALL) > + init_target(libsrtp) > + add_library(tg_owt::libsrtp ALIAS libsrtp) > +diff --git a/src/pc/external_hmac.cc b/src/pc/external_hmac.cc > +index 27b5d0e5a..222f5d9ae 100644 > +--- a/src/pc/external_hmac.cc > ++++ b/src/pc/external_hmac.cc > +@@ -15,7 +15,6 @@ > + > + #include "rtc_base/logging.h" > + #include "rtc_base/zero_memory.h" > +-#include "third_party/libsrtp/include/srtp.h" > + > + // Begin test case 0 */ > + static const uint8_t kExternalHmacTestCase0Key[20] =3D { > +diff --git a/src/pc/external_hmac.h b/src/pc/external_hmac.h > +index c5071fc19..8fdc2f1a7 100644 > +--- a/src/pc/external_hmac.h > ++++ b/src/pc/external_hmac.h > +@@ -30,9 +30,12 @@ > + > + #include > + > +-#include "third_party/libsrtp/crypto/include/crypto_types.h" > +-#include "third_party/libsrtp/include/srtp.h" > +-#include "third_party/libsrtp/include/srtp_priv.h" > ++#ifdef HAVE_LIBSRTP > ++# include > ++# include > ++#else > ++# include "srtp_priv.h" > ++#endif > + > + #define EXTERNAL_HMAC_SHA1 SRTP_HMAC_SHA1 + 1 > + #define HMAC_KEY_LENGTH 20 > +diff --git a/src/pc/srtp_session.cc b/src/pc/srtp_session.cc > +index 7d1aaf2d6..7b5a789b0 100644 > +--- a/src/pc/srtp_session.cc > ++++ b/src/pc/srtp_session.cc > +@@ -30,8 +30,12 @@ > + #include "rtc_base/thread_annotations.h" > + #include "rtc_base/time_utils.h" > + #include "system_wrappers/include/metrics.h" > +-#include "third_party/libsrtp/include/srtp.h" > +-#include "third_party/libsrtp/include/srtp_priv.h" > ++ > ++#ifdef HAVE_LIBSRTP > ++# include > ++#else > ++# include "srtp_priv.h" > ++#endif > + > + namespace cricket { > + > +@@ -290,6 +294,9 @@ bool SrtpSession::UnprotectRtcp(void* p, int in_len,= int* out_len) { > + bool SrtpSession::GetRtpAuthParams(uint8_t** key, int* key_len, int* ta= g_len) { > + RTC_DCHECK(thread_checker_.IsCurrent()); > + RTC_DCHECK(IsExternalAuthActive()); > ++#ifdef HAVE_LIBSRTP > ++ return false; > ++#else > + if (!IsExternalAuthActive()) { > + return false; > + } > +@@ -313,6 +320,7 @@ bool SrtpSession::GetRtpAuthParams(uint8_t** key, in= t* key_len, int* tag_len) { > + *key_len =3D external_hmac->key_length; > + *tag_len =3D rtp_auth_tag_len_; > + return true; > ++#endif > + } > + > + int SrtpSession::GetSrtpOverhead() const { > +@@ -336,6 +344,9 @@ bool SrtpSession::GetSendStreamPacketIndex(void* p, > + int in_len, > + int64_t* index) { > + RTC_DCHECK(thread_checker_.IsCurrent()); > ++#ifdef HAVE_LIBSRTP > ++ return false; > ++#else > + srtp_hdr_t* hdr =3D reinterpret_cast(p); > + srtp_stream_ctx_t* stream =3D srtp_get_stream(session_, hdr->ssrc); > + if (!stream) { > +@@ -346,6 +357,7 @@ bool SrtpSession::GetSendStreamPacketIndex(void* p, > + *index =3D static_cast(rtc::NetworkToHost64( > + srtp_rdbx_get_packet_index(&stream->rtp_rdbx) << 16)); > + return true; > ++#endif > + } > + > + bool SrtpSession::DoSetKey(int type, > diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm > index 88daea7d7d..4814c22b6c 100644 > --- a/gnu/packages/telegram.scm > +++ b/gnu/packages/telegram.scm > @@ -1,8 +1,9 @@ > ;;; GNU Guix --- Functional package management for GNU > ;;; Copyright =C2=A9 2021 Raghav Gururajan > -;;; Copyright =C2=A9 2022 Hilton Chain > +;;; Copyright =C2=A9 2022, 2023 Hilton Chain > ;;; Copyright =C2=A9 2023 Saku Laesvuori > ;;; Copyright =C2=A9 2023 Lu Hui > +;;; Copyright =C2=A9 2023 Camilo Q.S. (Distopico) > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -266,8 +267,8 @@ (define tgcalls-for-telegram-desktop > "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) > > (define-public webrtc-for-telegram-desktop > - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") > - (revision "328")) > + (let ((commit "0532942ac6176a66ef184fb728a4cbb02958fc0b") > + (revision "389")) > (hidden-package > (package > (name "webrtc-for-telegram-desktop") > @@ -283,14 +284,18 @@ (define-public webrtc-for-telegram-desktop > (file-name > (git-file-name name version)) > (sha256 > - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy= ")) > + (base32 "0fary99yl1ddk5zjpfy0pyb5brd268j41plcnvv9qjyf0wj9hf2k= ")) > + (patches > + (search-patches > + ;; https://github.com/desktop-app/tg_owt/pull/123 > + "webrtc-for-telegram-desktop-unbundle-libsrtp.patch")) > (modules '((guix build utils) > (ice-9 ftw) > (srfi srfi-1))) > (snippet > #~(begin > (let ((keep > - '("libsrtp" "rnnoise" > + '("rnnoise" > ;; Not available in Guix. > "pffft"))) > (with-directory-excursion "src/third_party" > @@ -325,6 +330,7 @@ (define-public webrtc-for-telegram-desktop > libdrm > libglvnd > libjpeg-turbo > + libsrtp > libvpx > libxcomposite > libxdamage --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFJBAEBCAAzFiEEvYwofabWO6y953lVmAk6gHJUa/MFAmTuNYUVHGRpc3RvcGlj b0ByaXNldXAubmV0AAoJEJgJOoByVGvzwoIIAIIEWB/aAsLK4OylOmgF+kdPWutE dWWaa7OApM/kxUT6EiATpQ1BXWXPn8FWUCHuqJ/R19GXEQhHvBXeOi6PL3xBzCx0 Ehsc/J7xnb10vmUjMe2qDuF2zV142jyajXpylkvij/CE/vRntXqNbohYlQccIk0T CNDoRD44ug3mLzsv3+I7H74/HLR17XxwSPI1zVb42QpRH7c2ydXrDALO512LBCeE OVFp2mAoKdN7MTGZWQa7eMI9ACKMmzgcfTPwt5+qRp5u2sEdMCgbFHiAOpQ+SbfQ awxTrr5lKOYqKZ3jPMrdQAqAdf2AOxKG5o5dFUfjY8BTU8S+wViMS92hG9U= =UQ7p -----END PGP SIGNATURE----- --=-=-=-- From unknown Thu Aug 21 12:10:54 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Distopico Subject: bug#64748: closed (Re: [PATCH v7 2/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942.) Message-ID: References: <874jkel11w.wl-hako@ultrarare.space> <20230720171841.31901-1-distopico@riseup.net> X-Gnu-PR-Message: they-closed 64748 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 64748@debbugs.gnu.org Date: Fri, 01 Sep 2023 09:03:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1693558982-29578-1" This is a multi-part message in MIME format... ------------=_1693558982-29578-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64748: [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 64748@debbugs.gnu.org. --=20 64748: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64748 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1693558982-29578-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64748-done) by debbugs.gnu.org; 1 Sep 2023 09:02:27 +0000 Received: from localhost ([127.0.0.1]:59833 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc02t-0007gG-J8 for submit@debbugs.gnu.org; Fri, 01 Sep 2023 05:02:27 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:44362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc02r-0007g7-TL for 64748-done@debbugs.gnu.org; Fri, 01 Sep 2023 05:02:26 -0400 Date: Fri, 01 Sep 2023 17:01:31 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1693558887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=6UNSkkQ0+k1CmZ4bk9d5vmhhB03DPgqlVMPmQ7aH1kk=; b=1XA9vQNm6kYLZjguv6G8mmaVm13i85X8RLxKFDImNcd1MWxkD6blDqAsnhAj2TTDgWjW6a yAHH/mXmWQB9PZvBPk+8VisluE5IGpGZests7P/qOpy5y17mse+C4HkVDdpxSdXek4wtns 8P+5/Dh7Ck71f/59e4qpSHG1+0IKDLHZaAW2+U44HnFFGHTHt7TAGf4H9fJHAYNWnhZSYL X06Xy3sh6pCnMYRY/LQhE1rKHeroN2a+lrxvYm1qC73JybX6+oRTr9wIjacXIPIuc5oHfj 0nBG7GqpclDiWfSau8YDz4mmHGYFtEyGssrZiNpZkE5jEMd5dN84nc8ryBfWxg== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <874jkel11w.wl-hako@ultrarare.space> From: Hilton Chain To: Distopico Subject: Re: [PATCH v7 2/2] gnu: webrtc-for-telegram-desktop: Update to 0-389.0532942. In-Reply-To: <87msy990my.fsf@riseup.net> References: <243d068053e6678cd4c89f2b2d9314b28473dbea.1693234399.git.hako@ultrarare.space> <87msy990my.fsf@riseup.net> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 64748-done Cc: Hilton Chain , 64748-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On Wed, 30 Aug 2023 02:13:52 +0800, Distopico wrote: > > [1 ] > Build and the call works fine from my side > Thanks! Pushed as 33018f8c2506a1ed0b805d595f3309b90153ac23. ------------=_1693558982-29578-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 20 Jul 2023 17:19:28 +0000 Received: from localhost ([127.0.0.1]:59781 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMXJI-00005a-Dr for submit@debbugs.gnu.org; Thu, 20 Jul 2023 13:19:28 -0400 Received: from lists.gnu.org ([2001:470:142::17]:46754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMXJF-00005I-V8 for submit@debbugs.gnu.org; Thu, 20 Jul 2023 13:19:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMXJA-0007dd-Ip for guix-patches@gnu.org; Thu, 20 Jul 2023 13:19:20 -0400 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMXJ8-00040g-JP for guix-patches@gnu.org; Thu, 20 Jul 2023 13:19:20 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx1.riseup.net (Postfix) with ESMTPS id 4R6KDN1CY4zDrPl for ; Thu, 20 Jul 2023 17:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1689873556; bh=eQwVSbdkAMtciuppwiu1/rSsEBvKH/cSa2u7Bpg5sXk=; h=From:To:Cc:Subject:Date:From; b=EZunXDVUYuLCpUzlwe3FRyMc5mOwUBbZbIKp4RFSWigLEfplpIge+s6/MJaL7RW2I T8xlsgN5yCdjRh3om/uALhOhxNRl/C3y3Vp4prjj0FlFCsJM34hBd8KYA9RyagUtjI /Ds0sLpdOiiL4F8fl6RLGCRyecPKykzSvndUtxQ0= X-Riseup-User-ID: 09DF913F4B828119996494B60DA827CDAF7B219E89249E4251C5774C2DCE6E36 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4R6KDM316zzFqgN; Thu, 20 Jul 2023 17:19:15 +0000 (UTC) From: Distopico To: guix-patches@gnu.org Subject: [PATCH] gnu: webrtc-for-telegram-desktop: Update to a45d8b8 Date: Thu, 20 Jul 2023 12:18:18 -0500 Message-ID: <20230720171841.31901-1-distopico@riseup.net> MIME-Version: 1.0 X-Debbugs-Cc: rg@raghavgururajan.name, hako@ultrarare.space, saku@laesvuori.fi Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=198.252.153.129; envelope-from=distopico@riseup.net; helo=mx1.riseup.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: Distopico X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Fixes telegram-desktop call not working with openSSL 3 see: https://github.com/telegramdesktop/tdesktop/issues/26108 * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to a45d8b8 revision commit --- gnu/packages/telegram.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index aa01c2f692..aeab249198 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2023 Saku Laesvuori +;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; ;;; This file is part of GNU Guix. ;;; @@ -96,6 +97,21 @@ (define libyuv-for-telegram-desktop (base32 "0mm56p8iapfild2xdw4w8zi35c3xm06fgagiali644gnxdmnym6c"))))) +(define libsrtp-for-telegram-desktop + (let ((commit "a566a9cfcd619e8327784aa7cff4a1276dc1e895") + (revision "1494")) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cisco/libsrtp") + (commit commit))) + (file-name (git-file-name + "libsrtp-for-telegram-desktop" + (git-version "0" revision commit))) + (sha256 + (base32 + "1ichw2v9s2mggi5p2wbbmlg55q4r48dxi3ks7ykfcfkmh7pb1w1s"))))) + (define cmake-helpers-for-telegram-desktop (origin (method git-fetch) @@ -265,8 +281,8 @@ (define tgcalls-for-telegram-desktop "193m2gkvipijqbfd6a8mhg9nd63wlnshzgspk3pip57vk21l709z")))) (define-public webrtc-for-telegram-desktop - (let ((commit "5098730b9eb6173f0b52068fe2555b7c1015123a") - (revision "328")) + (let ((commit "a45d8b8f0a99bd0e5118dda1dc4a8b7b3ad5dcfd") + (revision "388")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -282,14 +298,14 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1lk54zlrff59rj5k9dylsgz4sdds4728psrk8m3v9qn5y8d6z8qy")) + (base32 "1qs3ikkd6l56brj40cv6wlhx5gj5avisj9mj8ypjfwcyw9hb2n5y")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) (snippet #~(begin (let ((keep - '("libsrtp" "rnnoise" + '("rnnoise" "libsrtp_config" ;; Not available in Guix. "pffft"))) (with-directory-excursion "src/third_party" @@ -311,9 +327,12 @@ (define-public webrtc-for-telegram-desktop (add-after 'unpack 'unpack-additional-sources (lambda _ (let* ((third-party (string-append (getcwd) "/src/third_party")) - (libyuv-to (string-append third-party "/libyuv"))) + (libyuv-to (string-append third-party "/libyuv")) + (libsrtp-to (string-append third-party "/libsrtp"))) (copy-recursively #$libyuv-for-telegram-desktop - libyuv-to))))))) + libyuv-to) + (copy-recursively #$libsrtp-for-telegram-desktop + libsrtp-to))))))) (native-inputs (list pkg-config python-wrapper yasm)) (inputs (list abseil-cpp-cxxstd17 base-commit: 13cb9b302868b5a966a6ae177412c474084f4bf1 -- 2.41.0 ------------=_1693558982-29578-1--