From patchwork Tue May 13 20:18:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Brielmaier X-Patchwork-Id: 42582 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 51FE427BC4B; Tue, 13 May 2025 21:34:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 40F2627BC49 for ; Tue, 13 May 2025 21:34:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEwKK-00051s-FP; Tue, 13 May 2025 16:34:15 -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 1uEw6c-0004n0-Vi for guix-patches@gnu.org; Tue, 13 May 2025 16:20:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uEw6c-0003mE-JE for guix-patches@gnu.org; Tue, 13 May 2025 16:20:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=uc33Z46vMraMmzsuSSZEpfH6bwx7kG9s3wfZKJMquCY=; b=eY0XkxkMxqoyxp3383NGeOXGAZ/YcpcS2Ze8I/tu1c8mP5oqVGFmn4qZImaWFPrGe2E224du46EhiRU93Xs+uwJo69vMDR/Or3hx+QUGyvamthVtjUWF6QW2IG/fg4ZS6EL6t/CdNNPHYBDgY/NYUW80WT8kjJ9tgjoaWI1BpSUvggnsPGqyWEARqsU1Ygot+SaGYFX9G7ue98RAp6mlHYFHsPh/hhSdv8F7si/WN5tZzzJmb4SbH3HyPE193538u0vMG7mio4gnir9Hvi24tOSmmQA26pO45AD2hwp4UYc04Ps3wHt6SHOZZlee2sRX/cAWGMY6r2CFXeE3IHojrA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uEw6c-0008Jm-AX for guix-patches@gnu.org; Tue, 13 May 2025 16:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78412] [PATCH] gnu: webrtc-for-telegram-desktop: Update to 0-489.8c233a4. Resent-From: Jonathan Brielmaier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 13 May 2025 20:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78412 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78412@debbugs.gnu.org Cc: Jonathan Brielmaier X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174716756731732 (code B ref -1); Tue, 13 May 2025 20:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 May 2025 20:19:27 +0000 Received: from localhost ([127.0.0.1]:34805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uEw62-0008Fd-6j for submit@debbugs.gnu.org; Tue, 13 May 2025 16:19:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:35632) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uEw5z-0008Dp-4J for submit@debbugs.gnu.org; Tue, 13 May 2025 16:19:24 -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 1uEw5N-0004EM-BL for guix-patches@gnu.org; Tue, 13 May 2025 16:18:53 -0400 Received: from mout.web.de ([217.72.192.78]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEw5I-0003iT-3h for guix-patches@gnu.org; Tue, 13 May 2025 16:18:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=web.de; s=s29768273; t=1747167517; x=1747772317; i=jonathan.brielmaier@web.de; bh=uc33Z46vMraMmzsuSSZEpfH6bwx7kG9s3wfZKJMquCY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:Message-ID: MIME-Version:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=ju5lBKBAZ1QarxRvYwNT1TFoNkvUmsE2tx4nogffRfc7pVTSD5PBie7NBvFUK9tQ Uu1GDqBwCQhvrBcEGrPdRYEQ85r3qlpdkMvt+OKJCC5/lJhaozI3lHtmdFsAgQIhO cPCZ3Pm7ZgHHZ6wTCvIXzw82EcdY28E0PlCOlKMbQyLiM+FAIq82D35z7vDSZX+OG 3izkk4/+9n5FLMm+GWGgfYfqOmiw1Pma3aBjeeqlLx84UYyQ2lddN/ElhfBZlFoCc yU6Fn3liL7HfyDDggJyn4QX974iHL9RqId+ObX7XVueF4RAcWLKQ4K+Xub96Q5prT mKprQiMb34gaGn/6bA== X-UI-Sender-Class: 814a7b36-bfc1-4dae-8640-3722d8ec6cd6 Received: from 3700X.lan ([77.181.68.135]) by smtp.web.de (mrweb105 [213.165.67.124]) with ESMTPSA (Nemesis) id 1M43GU-1uEw5F26Sm-000vqx; Tue, 13 May 2025 22:18:37 +0200 Date: Tue, 13 May 2025 22:18:27 +0200 Message-ID: X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:qKP2L3nfVGPGlOlR6PKramC5G0cumSmd4TBeAtAR1cOjA2iXa0Z kv4JmNpFjHbc9XbgfTnA77/bGB7GGmp772oHW0hzecI80YPL5uQjfyAmP9TVdWXFtro6XA7 KIoN5C/dnDnG9iAJn74CXcR8DkDhMxv198wKiJ6iWj2o8kExOSVN31O9og9Z2Jo1d1VhpOO AW43YfLr2BO8BUwyfgP2g== UI-OutboundReport: notjunk:1;M01:P0:Kbx/PQGNqgo=;aHLx8Ghk9FpFuPSHYcfZf1X3xaC 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 Received-SPF: pass client-ip=217.72.192.78; envelope-from=jonathan.brielmaier@web.de; helo=mout.web.de 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Jonathan Brielmaier X-ACL-Warn: , Jonathan Brielmaier via Guix-patches X-Patchwork-Original-From: Jonathan Brielmaier via Guix-patches via From: Jonathan Brielmaier Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fixes the build against pipewire@1.4. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop): Update to 0-489.8c233a4. [source]: Remove patch who got rebased and merged upstream: webrtc-for-telegram-desktop-unbundle-libsrtp.patch. * gnu/local.mk (dist_patch_DATA): Remove it. Change-Id: Ie07b49a402aa9b11097c7c0c61ac5da0e03fa899 --- gnu/local.mk | 1 - ...or-telegram-desktop-unbundle-libsrtp.patch | 136 ------------------ gnu/packages/telegram.scm | 10 +- 3 files changed, 3 insertions(+), 144 deletions(-) delete mode 100644 gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch base-commit: 380282f3f5b862b67b6601b89eb7749fd9814509 diff --git a/gnu/local.mk b/gnu/local.mk index ce0f981a419..92f6f8b7cc8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2411,7 +2411,6 @@ dist_patch_DATA = \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/webrtc-audio-processing-byte-order-pointer-size.patch \ %D%/packages/patches/webrtc-audio-processing-x86-no-sse.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-dont-inline-draw-fire.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 deleted file mode 100644 index 3317d0a9c16..00000000000 --- a/gnu/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch +++ /dev/null @@ -1,136 +0,0 @@ -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,5 +2647,8 @@ if (APPLE) - libyuv - ) -+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 37772fa2746..65d95711b95 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -274,8 +274,8 @@ (define tgcalls-for-telegram-desktop "1p563a11w8jrid96xf03dg6j39ciz28n5f4r6g28lxhiphbqzfym")))) (define-public webrtc-for-telegram-desktop - (let ((commit "c425281150317753d7bc5182c6572abe20f9a784") - (revision "456")) + (let ((commit "8c233a4c12d6ec1f2aa87991564ac28cc996c57a") + (revision "489")) (hidden-package (package (name "webrtc-for-telegram-desktop") @@ -291,11 +291,7 @@ (define-public webrtc-for-telegram-desktop (file-name (git-file-name name version)) (sha256 - (base32 "1fj48iq56awnrckncy1qc3zhdzifl725hbb6an7wg2v3zmagvrwn")) - (patches - (search-patches - ;; https://github.com/desktop-app/tg_owt/pull/123 - "webrtc-for-telegram-desktop-unbundle-libsrtp.patch")) + (base32 "0d1nglf8irxgavw0p1d23wffmzyzbwapnli45ssgmrn1czzri4gw")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1)))