From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH 0/3] gnu: torbrowser: Update to 13.5. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2024 13:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17194091232025 (code B ref -1); Wed, 26 Jun 2024 13:39:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Jun 2024 13:38:43 +0000 Received: from localhost ([127.0.0.1]:38827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMSrC-0000Wb-Sk for submit@debbugs.gnu.org; Wed, 26 Jun 2024 09:38:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:46748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMSrB-0000WT-46 for submit@debbugs.gnu.org; Wed, 26 Jun 2024 09:38:41 -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 1sMSr7-0007jM-I2 for guix-patches@gnu.org; Wed, 26 Jun 2024 09:38:37 -0400 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMSr5-0005to-3N for guix-patches@gnu.org; Wed, 26 Jun 2024 09:38:37 -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 mx0.riseup.net (Postfix) with ESMTPS id 4W8N7p45Tvz9v9W for ; Wed, 26 Jun 2024 13:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1719409110; bh=pihk/Ph9qCCg6XZQP2TEM6I4zgBs7zehnRGId1oCVsk=; h=From:To:Cc:Subject:Date:From; b=Rr3DvNBKaRXVOxpSJh+7G/l2JqCuvH/6U9Ui0aEwv6vnJfdPuX1vM2amDwpC6pNFb GC8ARiX9dGgR4cZJ+FfnuFb7CjsuKYmLlO6rDyd0thqaK6tEzc11xHV2B77YErKOt7 nNjkAmRUsVN5YuwfSFcREs8E3+IpXScKWZ+09CdQ= X-Riseup-User-ID: E79164ADF80C4D891F4E6BE1478A6C57EA59EFB61C2C3459C6E20DC5B264E60A Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4W8N7n53NnzJsLc; Wed, 26 Jun 2024 13:38:29 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Wed, 26 Jun 2024 10:38:17 -0300 Message-ID: <20240626133817.21595-1-nandre@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.6; envelope-from=nandre@riseup.net; helo=mx0.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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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: -2.3 (--) This patch series updates torbrowser to its latest stable version. In order to do so, it also updates go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird to 0.2.0, which now depends on the new go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Bridge logic has been changed upstream and we don't need the old add-bridges phase. ld became unsupported, but lld only breaks cargo rustc invocations, so we now use the lld-as-ld-wrapper (thanks). llvm was updated to version 16 to mimick what upstream does. Cheers, André Batista (3): gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. gnu: go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird: Update to 0.2.0. gnu: torbrowser: Update to 13.5. gnu/packages/golang.scm | 33 ++++++++++++++++++++++++++++++--- gnu/packages/tor-browsers.scm | 35 ++++++++++++++++------------------- 2 files changed, 46 insertions(+), 22 deletions(-) -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH 1/3] gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2024 13:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17194096362858 (code B ref 71782); Wed, 26 Jun 2024 13:48:03 +0000 Received: (at 71782) by debbugs.gnu.org; 26 Jun 2024 13:47:16 +0000 Received: from localhost ([127.0.0.1]:38836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMSzU-0000k2-7P for submit@debbugs.gnu.org; Wed, 26 Jun 2024 09:47:16 -0400 Received: from mx1.riseup.net ([198.252.153.129]:48664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMSzS-0000jc-9u for 71782@debbugs.gnu.org; Wed, 26 Jun 2024 09:47:15 -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 4W8NKj6trFzDqnq for <71782@debbugs.gnu.org>; Wed, 26 Jun 2024 13:47:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1719409626; bh=D/GiuaW2PcfgbQr5EWuq+Jvc7fOtdJ1v4T4sHwgzrMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y8g/oVPdTJwI6b96h3ZsCt55eISf3+YY3DWZxBvBcpW46YJZKRPj10TLezFr1EE+m qxxqa7hO6CjbfnSYCdd6GADdC8/oGnvEjYBjxpD3smGvZ/t4GtI18MAC4b3VgJOYz9 S+QBPSKdN5AM0dEqfd0NWht5RNXDwNKzI6oqenM0= X-Riseup-User-ID: 8B5642167C848AB099A06C77238FFC45091ED5A6599A3E2B189025EBCF14AACB Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4W8NKV0ZVLzJt6T; Wed, 26 Jun 2024 13:46:53 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Wed, 26 Jun 2024 10:46:41 -0300 Message-ID: <20240626134641.21691-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-1-nandre@riseup.net> MIME-Version: 1.0 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/golang.scm (go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel): New variable. Change-Id: I0f0a78458467600ad70374f4224aa6ad1e371ad8 --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4e3fe5bd10..705b5d3b03 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2387,6 +2387,31 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports incorporates ideas and concepts from Philipp Winter's ScrambleSuit protocol.") (license (list license:bsd-2 license:bsd-3)))) +(define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel + (let ((commit "3b6faa48163782c1e5420bcb4b068cd38c401ea7") + (revision "0")) + (package + (name "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08k108h1fh9mq0m5kr866s2n0lsif0dpbi8ffb62g5ghg7jaai89")))) + (build-system go-build-system) + (arguments + `(#:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel")) + (home-page "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (synopsis "Go webtunnel library") + (description "WebTunnel is a library for XXXXXX Tor pluggable transports in +Go.") + (license license:bsd-2)))) + (define-public go-github-com-sevlyar-go-daemon (package (name "go-github-com-sevlyar-go-daemon") -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH 2/3] gnu: go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird: Update to 0.2.0. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2024 13:48:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17194096712920 (code B ref 71782); Wed, 26 Jun 2024 13:48:03 +0000 Received: (at 71782) by debbugs.gnu.org; 26 Jun 2024 13:47:51 +0000 Received: from localhost ([127.0.0.1]:38843 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMT03-0000l2-1f for submit@debbugs.gnu.org; Wed, 26 Jun 2024 09:47:51 -0400 Received: from mx0.riseup.net ([198.252.153.6]:55788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMT00-0000ko-Vp for 71782@debbugs.gnu.org; Wed, 26 Jun 2024 09:47:50 -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 mx0.riseup.net (Postfix) with ESMTPS id 4W8NLP0Ccmz9sM8 for <71782@debbugs.gnu.org>; Wed, 26 Jun 2024 13:47:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1719409661; bh=rkjrR4lcgH3snOGqp275tksDzq1cHdfxZiIo7mCg1Gc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L9/meDP/Qu+N+457oCc3o5Rmw2x0EbhDc8QE9NMgr3+wSXC2SqpKs+CEcyokhm/7i I1z/uKe1vJYMcvc3nO4XmaOSymyHxB2OyC7c4omh7udJ47UFOQsW0iQ5uK3Q5dxPvb D7sPfPwvvj6aUGGBkGiLfn6hYFjOCrRcgiK1VNFA= X-Riseup-User-ID: 3306BDCF29EC89A607D246013BA914C368F73706B1542FA13BB64895300AD45C Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4W8NLN1HznzJtDc; Wed, 26 Jun 2024 13:47:39 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Wed, 26 Jun 2024 10:47:14 -0300 Message-ID: <20240626134727.21708-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-1-nandre@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 (-) * gnu/packages/golang.scm (go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird): Update to 0.2.0. [arguments] <#:go>: Use go-1.21. [propagated-inputs]: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Change-Id: I28bc797602f8d262f4281dcb76d7ca3833a5f434 --- gnu/packages/golang.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 705b5d3b03..1a68d35663 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -45,6 +45,7 @@ ;;; Copyright © 2023 Clément Lassieur ;;; Copyright © 2024 Troy Figiel ;;; Copyright © 2024 Greg Hogan +;;; Copyright © 2024 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -2342,7 +2343,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird (package (name "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -2351,12 +2352,12 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports (file-name (git-file-name name version)) (sha256 (base32 - "0rifg5kgqp4c3b44j48fjmx00m00ai7fa4gaqrgphiqs1fc5586s")))) + "0imdf11ldkmbkp74gl1bcbvzmrl7jmkcfhpn6377r99gkf0zk28j")))) (build-system go-build-system) (arguments `(#:unpack-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird" #:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/cmd/lyrebird" - #:go ,go-1.20 + #:go ,go-1.21 #:phases (modify-phases %standard-phases (add-after 'unpack 'substitutions @@ -2378,6 +2379,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports go-github-com-refraction-networking-utls go-gitlab-com-yawning-edwards25519-extra go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-goptlib + go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-text)) -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH 3/3] gnu: torbrowser: Update to 13.5. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 26 Jun 2024 13:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17194096993024 (code B ref 71782); Wed, 26 Jun 2024 13:49:02 +0000 Received: (at 71782) by debbugs.gnu.org; 26 Jun 2024 13:48:19 +0000 Received: from localhost ([127.0.0.1]:38854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMT0U-0000mh-Tw for submit@debbugs.gnu.org; Wed, 26 Jun 2024 09:48:19 -0400 Received: from mx0.riseup.net ([198.252.153.6]:54058) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMT0T-0000mS-3Z for 71782@debbugs.gnu.org; Wed, 26 Jun 2024 09:48:18 -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 mx0.riseup.net (Postfix) with ESMTPS id 4W8NLx2dngz9w8c for <71782@debbugs.gnu.org>; Wed, 26 Jun 2024 13:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1719409689; bh=L/xT8F6o1ziWcMtyUGmJIylBzjJNnuTDmGRo86Rxu9Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Arsazclh+L3JBUV5d9sV+/u5jtLrDA9lbtvh4pwxUlDIjBg9KjCZ1oeHsfHWUwh1D g7tAu3tkKJqf+ters0EtJrWhV2w7ixY0EzdbxgeKFOSnDbgbDKXp0vlyIvrvO5g9tR IisEZbcfgG6ZfNxAo6oeTEAFhdpwz3IIGfcKJLZQ= X-Riseup-User-ID: 9197688E74CCF6B2BE0364ED0DEB3A4658D82198C6D5AF5A54A76E234E97C1D8 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4W8NLj3kdfzJt6T; Wed, 26 Jun 2024 13:47:57 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Wed, 26 Jun 2024 10:47:48 -0300 Message-ID: <20240626134748.21727-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-1-nandre@riseup.net> MIME-Version: 1.0 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/tor-browsers.scm (%torbrowser-build-date): Update to 20240611120000. (%torbrowser-version): Update to 13.5. (%torbrowser-firefox-version): Update to 115.12.0esr-13.5-1-build3. (torbrowser-translation-base): Update to dc59db634f066298e903142227834da483ec197d. (torbrowser-translation-specific): Update to de4f91a5020d637ab5d66459718525a5f9207be2. (lld-as-ld-wrapper-16): New variable. (make-torbrowser)[native-inputs]: Add lld-as-ld-wrapper-16. Use llvm-16 and clang-16. [arguments] <#:phases>: Remove add-bridges. Change-Id: Ic08578fa1b0f33a8f426c60ca65db3c9102ad554 --- gnu/packages/tor-browsers.scm | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 3d01346c8c..0407cc39dc 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -151,16 +151,16 @@ (define %torbrowser-locales ;; We copy the official build id, which is defined at ;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20240510190000") +(define %torbrowser-build-date "20240611120000") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.0.16") +(define %torbrowser-version "13.5") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "115.12.0esr-13.0-1-build1") +(define %torbrowser-firefox-version "115.12.0esr-13.5-1-build3") ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base @@ -168,11 +168,11 @@ (define torbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) + (commit "dc59db634f066298e903142227834da483ec197d"))) (file-name "translation-base-browser") (sha256 (base32 - "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) + "11lbw2lpsjm0r2lwmy8i2db40r5ypf8fhn4jh59l927g40ch6dxw")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -180,11 +180,11 @@ (define torbrowser-translation-specific (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "b5d79336411e5a59c4861341ef9aa7353e0bcad9"))) + (commit "de4f91a5020d637ab5d66459718525a5f9207be2"))) (file-name "translation-tor-browser") (sha256 (base32 - "0ahz69pxhgik7ynmdkbnx7v5l2v392i6dswjz057g4hwnd7d34fb")))) + "0q8nnqf4zhqivv3rjlvcsbac5254ingw98qwrbnhz3m5gl78vpcf")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -200,7 +200,7 @@ (define torbrowser-assets version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1kffam66bsaahzx212hw9lb03jwfr24hivzg067iyzilsldpc9c1")))) + "0fqqzrwpqzadgi24qarpnj8aac5w57qlfb4vy2cwga5h40dsp6ly")))) (arguments (list #:install-plan @@ -215,6 +215,10 @@ (define torbrowser-assets Browser.") (license license:silofl1.1))) +;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld. +(define lld-as-ld-wrapper-16 + (make-lld-wrapper lld-16 #:lld-as-ld? #t)) + (define* (make-torbrowser #:key moz-app-name moz-app-remotingname @@ -238,7 +242,7 @@ (define* (make-torbrowser #:key ".tar.xz")) (sha256 (base32 - "1b70zyjyai6kk4y1kkl8jvrs56gg7z31kkad6bmdpd8jw4n71grx")))) + "0i5fmippmzhd1nlhzk46rnhv2rgb2ari071m8yww7gk8lfnn5x5f")))) (build-system mozilla-build-system) (inputs (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird @@ -293,8 +297,9 @@ (define* (make-torbrowser #:key rust `(,rust "cargo") rust-cbindgen - llvm-15 - clang-15 + lld-as-ld-wrapper-16 ; for cargo rustc + llvm-16 + clang-16 perl node-lts python-wrapper @@ -632,14 +637,6 @@ (define (runpaths-of-input label) (substitute* "toolkit/locales/en-US/toolkit/about/aboutAddons.ftl" (("addons.mozilla.org") "gnuzilla.gnu.org")))) - (add-before 'build 'add-bridges ;see deploy.sh - (lambda _ - (let ((port (open-file - "browser/app/profile/000-tor-browser.js" "a"))) - (display - "#include ../../../tools/torbrowser/bridges.js" port) - (newline port) - (close port)))) (replace 'build (lambda* (#:key (make-flags '()) (parallel-build? #t) #:allow-other-keys) -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCHv2 1/3] gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 27 Jun 2024 16:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.171950435511064 (code B ref 71782); Thu, 27 Jun 2024 16:06:01 +0000 Received: (at 71782) by debbugs.gnu.org; 27 Jun 2024 16:05:55 +0000 Received: from localhost ([127.0.0.1]:43240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMrdD-0002sN-EG for submit@debbugs.gnu.org; Thu, 27 Jun 2024 12:05:55 -0400 Received: from mx1.riseup.net ([198.252.153.129]:44790) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMrdB-0002s6-7Q for 71782@debbugs.gnu.org; Thu, 27 Jun 2024 12:05: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 4W93MD3KMNzDqSm for <71782@debbugs.gnu.org>; Thu, 27 Jun 2024 16:05:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1719504344; bh=XdFnQWZBpwz+ZVEm0uCdVO8zYJ4v0gVYTV7+eMRnd8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=owAhf7Aq6YXUPUHNYgnpMQ/dBpoCB3CvXLaE8zpXnrwMrWEEcsEhjLMVUG4j4n+aG nogaNeKrbXkBwrLUnoLCIT5QdDV79Zo6yrQjxqmZiKtzy7wSOTR9/X7vrFbhE2upLz 7l9vx2DyL0e+L4OVnEZw4KKeJ7c6O9OmfYi8KNt4= X-Riseup-User-ID: CCD8DDCBFE5703A05D58481EF5BF18765D2FED6C4B053B396924EA1B6E945AF9 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4W93MC47fTzJrNB; Thu, 27 Jun 2024 16:05:43 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Thu, 27 Jun 2024 13:05:36 -0300 Message-ID: <20240627160536.1103-1-nandre@riseup.net> In-Reply-To: <20240626134641.21691-1-nandre@riseup.net> References: <20240626134641.21691-1-nandre@riseup.net> MIME-Version: 1.0 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/golang.scm (go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel): New variable. Change-Id: I0f0a78458467600ad70374f4224aa6ad1e371ad2 --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 4e3fe5bd10..705b5d3b03 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2387,6 +2387,31 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports incorporates ideas and concepts from Philipp Winter's ScrambleSuit protocol.") (license (list license:bsd-2 license:bsd-3)))) +(define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel + (let ((commit "3b6faa48163782c1e5420bcb4b068cd38c401ea7") + (revision "0")) + (package + (name "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08k108h1fh9mq0m5kr866s2n0lsif0dpbi8ffb62g5ghg7jaai89")))) + (build-system go-build-system) + (arguments + `(#:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel")) + (home-page "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (synopsis "Go WebTunnel Pluggable Transport") + (description "WebTunnel is a Go Pluggable Transport that attempts to imitate +web browsing activities based on HTTP Upgrade (HTTPT).") + (license license:expat)))) + (define-public go-github-com-sevlyar-go-daemon (package (name "go-github-com-sevlyar-go-daemon") -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCHv3 0/4] Update torbrowser and mullvadbrowser to v13.5.1. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jul 2024 23:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172117332830517 (code B ref 71782); Tue, 16 Jul 2024 23:43:01 +0000 Received: (at 71782) by debbugs.gnu.org; 16 Jul 2024 23:42:08 +0000 Received: from localhost ([127.0.0.1]:34605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTro8-0007w9-C9 for submit@debbugs.gnu.org; Tue, 16 Jul 2024 19:42:08 -0400 Received: from mx0.riseup.net ([198.252.153.6]:42576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTro6-0007vd-Ie for 71782@debbugs.gnu.org; Tue, 16 Jul 2024 19:42:07 -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 mx0.riseup.net (Postfix) with ESMTPS id 4WNwZs59NXz9tsx for <71782@debbugs.gnu.org>; Tue, 16 Jul 2024 23:41:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1721173317; bh=qdMFf8cKztYlY0Z1W3alidV4d8GLPZRm5HTcfy7HM5U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JWwJM6b797/QGtkTgdKWNg7AkEr1qExYe6/Nu0u6D5m+1hT9R8e2WvHTiVD8cY1+O t6NrnUqACHOlu92jIWuUHRUQnb5TqbPMjK/YD6Wo96/d8QFPBKTWc2rUf8v22lg8uC b1tnQ3W7wZqlis6EnBVRTdkODlzd84CEXJK+8HHs= X-Riseup-User-ID: 057EC079FC977643ACB093EBA06CEFDCAB9E4BEC9D6B443BAE6405264B84CC19 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4WNwZr5qcnzJrV5; Tue, 16 Jul 2024 23:41:56 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 16 Jul 2024 20:41:43 -0300 Message-ID: <20240716234143.4610-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-1-nandre@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 (-) This patch series updates both torbrowser and mullvadbrowser to version 13.5.1. Besides what has been said in the previous cover regarding changes to the bridge logic, ld, llvm and lyrebird, all of which are still applicable, this patch series makes important changes to the locale variables and phases of both browsers. Upstream has changed its own upstream localization repository to github (firefox-locales), which means mozilla-locales can be discarded and guix package definition update routines have been simplified. Other than that, torbrowser global localization directories have also changed. Considering that those changes are incompatible with the previous build logic and that these browser definitions are intertwined, upgrading one browser would break the other or the gymnastics to preserve the remainder would be useless since both need to follow the new procedure from now on. Because of that, the following patches are meant to be applied together. Finally, this patch series also incorporates #71181, which can be closed once this is applied. Cheers, André Batista (4): gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. gnu: go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird: Update to 0.2.0. gnu: torbrowser: Update to 13.5.1 [security fixes]. gnu: mullvadbrowser: Update to 13.5.1 [security fixes]. gnu/packages/golang.scm | 33 +++++- gnu/packages/tor-browsers.scm | 200 ++++++++++++---------------------- 2 files changed, 100 insertions(+), 133 deletions(-) base-commit: 2d6a3799fcda5c017f653c6e96b91964b07a7ee0 -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCHv3 1/4] gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jul 2024 23:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172117334330542 (code B ref 71782); Tue, 16 Jul 2024 23:43:02 +0000 Received: (at 71782) by debbugs.gnu.org; 16 Jul 2024 23:42:23 +0000 Received: from localhost ([127.0.0.1]:34608 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTroM-0007wY-Pk for submit@debbugs.gnu.org; Tue, 16 Jul 2024 19:42:23 -0400 Received: from mx0.riseup.net ([198.252.153.6]:46378) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTroK-0007wL-Mu for 71782@debbugs.gnu.org; Tue, 16 Jul 2024 19:42:22 -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 mx0.riseup.net (Postfix) with ESMTPS id 4WNwb83Hjgz9tsx for <71782@debbugs.gnu.org>; Tue, 16 Jul 2024 23:42:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1721173332; bh=sLrcVYDe5u5aQoAZRtGXihO6xxmYXqQtVIkQsCCfGcY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e2+d8wOoKwd0B41Rl1xbLSGPD1AbicA69IOMwXDtwzgz3tFpBb4GH23mAO6lHIlv2 L1/f6SiFquDixS4LrdLMy9VR3TEkJIvLtLsSC+aJ0925yTne8J2jGKQyhbenW2ulw6 jrIPS85YJLpxnAg8kyeV535vFiNqSIh6BiSP2Ick= X-Riseup-User-ID: 3B497135DC776F0B10231F6A01740BBF23CBEA557822330D7660C13F26016919 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4WNwb73tcMzJrkT; Tue, 16 Jul 2024 23:42:11 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 16 Jul 2024 20:42:06 -0300 Message-ID: <20240716234206.4624-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-1-nandre@riseup.net> MIME-Version: 1.0 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/golang.scm (go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel): New variable. Change-Id: Icee28357fd2b40744f5e4699a6aeaec4d2746759 --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index eed7126873..d847c347a4 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2258,6 +2258,31 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports incorporates ideas and concepts from Philipp Winter's ScrambleSuit protocol.") (license (list license:bsd-2 license:bsd-3)))) +(define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel + (let ((commit "3b6faa48163782c1e5420bcb4b068cd38c401ea7") + (revision "0")) + (package + (name "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08k108h1fh9mq0m5kr866s2n0lsif0dpbi8ffb62g5ghg7jaai89")))) + (build-system go-build-system) + (arguments + `(#:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel")) + (home-page "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (synopsis "Go WebTunnel Pluggable Transport") + (description "WebTunnel is a Go Pluggable Transport that attempts to imitate +web browsing activities based on HTTP Upgrade (HTTPT).") + (license license:bsd-2)))) + (define-public go-github-com-sevlyar-go-daemon (package (name "go-github-com-sevlyar-go-daemon") -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCHv3 2/4] gnu: go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird: Update to 0.2.0. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jul 2024 23:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172117337130583 (code B ref 71782); Tue, 16 Jul 2024 23:43:02 +0000 Received: (at 71782) by debbugs.gnu.org; 16 Jul 2024 23:42:51 +0000 Received: from localhost ([127.0.0.1]:34611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTrop-0007xC-6z for submit@debbugs.gnu.org; Tue, 16 Jul 2024 19:42:51 -0400 Received: from mx1.riseup.net ([198.252.153.129]:56436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTrom-0007wy-5W for 71782@debbugs.gnu.org; Tue, 16 Jul 2024 19:42:49 -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 4WNwbg5GJlzDqbL for <71782@debbugs.gnu.org>; Tue, 16 Jul 2024 23:42:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1721173359; bh=J01d7RTblZbUb7e11KBfwmwgsCighTamJtjihLvNEAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FCOHkwY7HD/7RsyFX41ImmI6iNNrOn3ZWrPjbyfLmKmujyh5ZaSj1qrPU1/cot9VN +BxovGT3z4kihRh5/iJNYzOUt4an6q5hX/fiyxFM/TR0Zyw/yOo+qnXidIB/zt3mJg IPdhD1p4CNzGm1B5PClp6k0NiksoE+p/JEbU7VA0= X-Riseup-User-ID: 348252555DD1A13088F7EF9051F4769248FCEB6632BED3C40B0260E788589B65 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4WNwbf5jJszJrmh; Tue, 16 Jul 2024 23:42:38 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 16 Jul 2024 20:42:19 -0300 Message-ID: <20240716234232.4639-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-1-nandre@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 (-) * gnu/packages/golang.scm (go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird): Update to 0.2.0. [arguments] <#:go>: Use go-1.21. [propagated-inputs]: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Change-Id: I68a859e0980200b50aaa9d300ffaf1e1bce2a5bc --- gnu/packages/golang.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index d847c347a4..1f7f17a580 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2024 Troy Figiel ;;; Copyright © 2024 Greg Hogan ;;; Copyright © 2024 Brennan Vincent +;;; Copyright © 2024 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -2213,7 +2214,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird (package (name "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -2222,12 +2223,12 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports (file-name (git-file-name name version)) (sha256 (base32 - "0rifg5kgqp4c3b44j48fjmx00m00ai7fa4gaqrgphiqs1fc5586s")))) + "0imdf11ldkmbkp74gl1bcbvzmrl7jmkcfhpn6377r99gkf0zk28j")))) (build-system go-build-system) (arguments `(#:unpack-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird" #:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird/cmd/lyrebird" - #:go ,go-1.20 + #:go ,go-1.21 #:phases (modify-phases %standard-phases (add-after 'unpack 'substitutions @@ -2249,6 +2250,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports go-github-com-refraction-networking-utls go-gitlab-com-yawning-edwards25519-extra go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-goptlib + go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-text)) -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCHv3 3/4] gnu: torbrowser: Update to 13.5.1 [security fixes]. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jul 2024 23:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172117338930652 (code B ref 71782); Tue, 16 Jul 2024 23:44:02 +0000 Received: (at 71782) by debbugs.gnu.org; 16 Jul 2024 23:43:09 +0000 Received: from localhost ([127.0.0.1]:34617 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTrp6-0007yJ-QL for submit@debbugs.gnu.org; Tue, 16 Jul 2024 19:43:09 -0400 Received: from mx1.riseup.net ([198.252.153.129]:50904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTrp4-0007xf-PF for 71782@debbugs.gnu.org; Tue, 16 Jul 2024 19:43:08 -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 4WNwc22tg0zDqBT for <71782@debbugs.gnu.org>; Tue, 16 Jul 2024 23:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1721173378; bh=V48yK5wys1Q5aQjL7dLlemA4YVt/ibRwFZctROyF+6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UKhKXJFPRe0A5kj4wWl2DLtsZV8GjIXJAxrwRfLS1o8P+0mdXHvzlKXjvmhiJfNsm hpfaZQGQsXEuTmlmX1QUFW/DrFV3wDvibKLWkv1AIN3WqYdQwo7fFRzj96FzSE/xMN TwvZthu6NzAFhP0AkLxmF7dqu5iBrwoOQm3azZlI= X-Riseup-User-ID: 7360CE18917DCAD77D504889CB2E74DE8A86F9E4D2005212A801133746CBEEF8 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4WNwc11x2DzJrkT; Tue, 16 Jul 2024 23:42:57 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 16 Jul 2024 20:42:50 -0300 Message-ID: <20240716234251.4653-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-1-nandre@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 CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603 and 2024-6604. See the Mozilla Foundation Security advisory for details. * gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to 20240708120000. (%torbrowser-version): Update to 13.5.1. (%torbrowser-firefox-version): Update to 115.13.0esr-13.5-1-build2. (%torbrowser-locales): Change it to be a plain list of supported locales. (firefox-locales): New variable. (torbrowser-translation-base): Update to 6ff73b6f7a6cec4849c2cd1e1ee1dc6fc8894169. (torbrowser-translation-specific): Update to 427819f80eaca95645bf0c1876d6a728d6ce7093. (lld-as-ld-wrapper-16): New variable. (make-torbrowser)[native-inputs]: Add lld-as-ld-wrapper-16. Use llvm-16 and clang-16. [inputs]: Add firefox-locales. [arguments] <#:phases>: Remove add-bridges. setenv, copy-firefox-locales: Update MOZ_CHROME_MULTILOCALE to the new %torbrowser-locales format. copy-basebrowser-locales, copy-torbrowser-locales: Likewise and ajust fluent file path. deploy-fonts: Ajust regex expression. autoconfig: Remove file-picker configuration workaround. See #71181. Change-Id: Ia1f84bc55beed42580b1eaabcbb685b1cc2a7d51 --- gnu/packages/tor-browsers.scm | 142 ++++++++++++++-------------------- 1 file changed, 60 insertions(+), 82 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 3d01346c8c..8172083957 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2021 Baptiste Strazzul ;;; Copyright © 2022 SeerLite ;;; Copyright © 2024 Aleksandr Vityazev -;;; Copyright © 2020, 2021 André Batista +;;; Copyright © 2020, 2021, 2024 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,63 +104,48 @@ (define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) #~(list (cons #$locale #$(mozilla-locale locale changeset hash-string)) ...)) -;; See tor-browser-build/rbm.conf for the list. -;; See browser/locales/l10n-changesets.json for the changeset. -;; See update-mozilla-locales in gnuzilla.scm to automate updating changeset. -(define %torbrowser-locales - (mozilla-locales - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("1218mldjxybhgzdi0myzkwjr2fgnysl71pl847kr7wyn1j8wk3a5" "c25d00080479" "ar") - ("11c96jhfzd3h46qhblhvn2acsn895ykynarai8r5pf0655nfjs0j" "2de60e3d6d0c" "ca") - ("0yhycgb3s3kydbzy6f2q7f7g2lp975spr092prf9xp8ha62ghby7" "609edd15f9a9" "cs") - ("1kzx94n36c5vv954j7w65djvb37c178zazy25b35l71q2rvhmlhj" "2197a99c9a08" "da") - ("13h7hk11bbd0yq8gqdv7ndbizkgwlm3ybz225l3x2b5cnyjxyg14" "b7a533e5edc9" "de") - ("13ay27vdrqfv2ysyi7c2jmz50lps7rff9rmnws1z7jkj0a5chwrn" "20baf15379d8" "el") - ("0mdr5b6pqxjmg9c8064x3hpf53h6w9j8ghl32655sx9jh4v3ykza" "beff1baac7c5" "es-ES") - ("1pnyg09j6r15w8m62lwj89x6rz4br877z60p8s1hlrb9hj2s3vdx" "ebe0b60b0b36" "fa") - ("067r505626cvlrsalnndf2ykz3nnkiy0b8yaxzf1rracpzmp0hni" "d5ae6a933d71" "fi") - ("0026zzjv2bqc8sg06yvyd0mhny6mwwvhpvzjrhv2fi5v4wkxapdj" "496c2eb73b82" "fr") - ("1dxcp26y8siap4k54zsw7mqa7k0l4f1505rdf4hnnxrzf9a643g5" "2fcccb5b19b3" "ga-IE") - ("14v6xnlyj65hzaz2rmzxcl4skjgm48426jgr9mwkwiqis587lp4a" "c53cea027f8f" "he") - ("04fdw2gzb64fb51bvs0bwsidzlvkdahmcy76vdg3gfcxslnlpi3y" "5a76dd3b5d5c" "hu") - ("0bpyxpclfy74bcsjrs1ajh2am4zv6j6j9q4gc4vz8pgvzy9354zp" "6e6de17dcac4" "id") - ("131ph8n235kr6nj1pszk0m00nh6kl360r4qvx4hjm8s22mw0k8qd" "536265635dfe" "is") - ("03fbp4vgkwyimfmbm4n8blx1m16yhms2wm8j4wlx2h3cpxp5r71k" "91951e37e2b8" "it") - ("0ncm531d7ih7phcn9d83zwq0dfphvmzg3gmhqmrrkkbydi1g3pbb" "895dcf8bb524" "ja") - ("1x3110v730ak522zfm8j3r3v1x5lq3ig82kcgyxkc49xywajy0ni" "d0819a64fc40" "ka") - ("14rc9mr4ngxdzwpjagzhz47jazgp1a6vwb0vbwj31yxv9iwkrgzi" "6ef881aff44b" "ko") - ("1gl85z550amhbaxp39zdj6yyvashj9xd4ampfhm9jdpbf6n5j2l8" "afcbc29a15e5" "lt") - ("1hz5g3iprfkbd88ncppyksbhlws73lhs75nf62hangw8l73wdn69" "84f3d6c7e2da" "mk") - ("14aq37ngnav5m2kcb4wavxwhp28ad4jzdkzc7i64h0qvvxq5n3hf" "c9ec27a5db3d" "ms") - ("0h7dlnawm5mbcx4qdlz5c7n4axz2dpa677v13ljdgm2b5w76msmq" "5c1480ccc040" "my") - ("1b12azc1n8j1i2l20v66r74q79zqjvc5sf9pd8rmj3xd0fkxzdp2" "fc1896a0a24d" "nb-NO") - ("1fh4dhlb6hynlpb2997gssv9v8zk5b7qrw0sclggczb5pcpjk6wc" "7e6da4f01bdb" "nl") - ("1w8x3jjrd28f6g6ywwxldizpiipfkr63dzqd74kjpg24s2lqzp80" "e86a451a9cb5" "pl") - ("1v3v4n82sn7a4h2d9n653fmgc31mikacf59lvdj6gbwvzpjb5yfa" "94c3dbb67a5d" "pt-BR") - ("061a4z0lffgks3wlr6yh5z7x9arcn804mjwvffcmibs106vzamyq" "470b13b5805b" "ro") - ("1fxgh7nfxpg2zknvfff8igq9q1vm5n4q033v7lm2c0xn3dbl8m28" "402b2ecbf04d" "ru") - ("1i119g6dnhzxmpaz5r2jr9yzm1v24v2q6m3z6bfz2yihj0w7m133" "f637484e72b6" "sq") - ("1nllh3ax323sxwhj7xvwvbfnh4179332pcmpfyybw1vaid3nr39k" "bb2d5d96d69e" "sv-SE") - ("136m68fd0641k3qqmsw6zp016cvvd0sipsyv6rx2b9nli56agz57" "0e6c56bf2ac9" "th") - ("0q8p8bwq8an65yfdwzm4dhl6km68r83bv5i17kay2gak8msxxhsb" "91e611ae3f19" "tr") - ("1f2g7rnxpr2gjzngfsv19g11vk9zqpyrv01pz07mw2z3ffbkxf0j" "99d5ffa0b81e" "uk") - ("1rizwsfgr7vxm31bin3i7bwhcqa67wcylak3xa387dvgf1y9057i" "5fd44724e22d" "vi") - ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h" "081aeb1aa308" "zh-CN") - ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr" "9015a180602e" "zh-TW"))) - ;; We copy the official build id, which is defined at ;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20240510190000") +(define %torbrowser-build-date "20240708120000") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.0.16") +(define %torbrowser-version "13.5.1") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "115.12.0esr-13.0-1-build1") +(define %torbrowser-firefox-version "115.13.0esr-13.5-1-build2") + +;; See tor-browser-build/rbm.conf for the list. +(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" + "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" + "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" + "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) + +;; See browser/locales/l10n-changesets.json for the commit. +(define firefox-locales + (let ((commit "15d15edddfbd4611b4922fa1976e753c5be548ca") + (revision "0")) + (package + (name "firefox-locales") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mozilla-l10n/firefox-l10n") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rxck15vyhlwzjzn4l5zn7slbhjjj1ncm22b5mjhdb056sqhna17")))) + (build-system copy-build-system) + (home-page "https://github.com/mozilla-l10n/firefox-l10n") + (synopsis "Firefox Locales") + (description "This package contains localized messages for all +Firefox locales.") + (license license:mpl2.0)))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base @@ -168,11 +153,11 @@ (define torbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) + (commit "6ff73b6f7a6cec4849c2cd1e1ee1dc6fc8894169"))) (file-name "translation-base-browser") (sha256 (base32 - "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) + "11s4px6izzvja11qrr7g8whbmcn6yrvk2yc0k7jx628562hjwi3d")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -180,11 +165,11 @@ (define torbrowser-translation-specific (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "b5d79336411e5a59c4861341ef9aa7353e0bcad9"))) + (commit "427819f80eaca95645bf0c1876d6a728d6ce7093"))) (file-name "translation-tor-browser") (sha256 (base32 - "0ahz69pxhgik7ynmdkbnx7v5l2v392i6dswjz057g4hwnd7d34fb")))) + "1yq1aqdzwyiqvj918i9q7x27i37rm7090bjnimh2ai8ss3xc8jpf")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -200,7 +185,7 @@ (define torbrowser-assets version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1kffam66bsaahzx212hw9lb03jwfr24hivzg067iyzilsldpc9c1")))) + "12na110krw60d067x1dbwfnsk6vbx9l4vai0qvaasxydd0np2g6m")))) (arguments (list #:install-plan @@ -215,6 +200,10 @@ (define torbrowser-assets Browser.") (license license:silofl1.1))) +;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld. +(define lld-as-ld-wrapper-16 + (make-lld-wrapper lld-16 #:lld-as-ld? #t)) + (define* (make-torbrowser #:key moz-app-name moz-app-remotingname @@ -238,10 +227,11 @@ (define* (make-torbrowser #:key ".tar.xz")) (sha256 (base32 - "1b70zyjyai6kk4y1kkl8jvrs56gg7z31kkad6bmdpd8jw4n71grx")))) + "1p83mmv5gq1nvpqs5w6151b7b8s3pbp9nn7jcrhbgwr7a9ffypi8")))) (build-system mozilla-build-system) (inputs (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird + firefox-locales tor-client alsa-lib bash-minimal ;for wrap-program @@ -293,8 +283,9 @@ (define* (make-torbrowser #:key rust `(,rust "cargo") rust-cbindgen - llvm-15 - clang-15 + lld-as-ld-wrapper-16 ; for cargo rustc + llvm-16 + clang-16 perl node-lts python-wrapper @@ -540,8 +531,7 @@ (define (runpaths-of-input label) ;; $HOME/.mozbuild). (setenv "MOZBUILD_STATE_PATH" (in-vicinity (getcwd) ".mozbuild")) - (setenv "MOZ_CHROME_MULTILOCALE" - (string-join (map car #$locales))) + (setenv "MOZ_CHROME_MULTILOCALE" (string-join (list #$@locales))) ;; Make build reproducible. (setenv "MOZ_BUILD_DATE" #$build-date))) (add-before 'configure 'mozconfig @@ -555,14 +545,14 @@ (define (runpaths-of-input label) ;; See tor-browser-build/projects/firefox/build. (add-before 'configure 'copy-firefox-locales (lambda _ - (let ((l10ncentral ".mozbuild/l10n-central")) + (let ((l10ncentral ".mozbuild/l10n-central") + (ff-locales #$(this-package-input "firefox-locales"))) (mkdir-p l10ncentral) (for-each (lambda (lang) - (copy-recursively (cdr lang) - (in-vicinity l10ncentral - (car lang)))) - #$locales)))) + (copy-recursively (string-append ff-locales "/" lang) + (in-vicinity l10ncentral lang))) + (list #$@locales))))) (add-after 'copy-firefox-locales 'copy-basebrowser-locales (lambda _ (let ((l10ncentral ".mozbuild/l10n-central")) @@ -577,7 +567,7 @@ (define (runpaths-of-input label) #f (string-join '("mv" "translation-base-browser/~a/base-browser.ftl" - "~a/~a/browser/browser/")) + "~a/~a/toolkit/toolkit/global/")) lang l10ncentral lang)) (system (format @@ -586,7 +576,7 @@ (define (runpaths-of-input label) "translation-base-browser/~a/*" "~a/~a/browser/chrome/browser/")) lang l10ncentral lang))) - (map car #$locales))))) + (list #$@locales))))) (add-after 'copy-basebrowser-locales 'copy-torbrowser-locales (lambda _ (let ((l10ncentral ".mozbuild/l10n-central")) @@ -601,7 +591,7 @@ (define (runpaths-of-input label) #f (string-join '("mv" "translation-tor-browser/~a/tor-browser.ftl" - "~a/~a/browser/browser/")) + "~a/~a/toolkit/toolkit/global/")) lang l10ncentral lang)) (system (format @@ -623,7 +613,7 @@ (define (runpaths-of-input label) (format port " locale/~a/ (chrome/locale/~a/*)~%" lang lang) (close port))) - (map car #$locales))))) + (list #$@locales))))) (replace 'configure (lambda _ (invoke "./mach" "configure"))) @@ -632,14 +622,6 @@ (define (runpaths-of-input label) (substitute* "toolkit/locales/en-US/toolkit/about/aboutAddons.ftl" (("addons.mozilla.org") "gnuzilla.gnu.org")))) - (add-before 'build 'add-bridges ;see deploy.sh - (lambda _ - (let ((port (open-file - "browser/app/profile/000-tor-browser.js" "a"))) - (display - "#include ../../../tools/torbrowser/bridges.js" port) - (newline port) - (close port)))) (replace 'build (lambda* (#:key (make-flags '()) (parallel-build? #t) #:allow-other-keys) @@ -739,7 +721,7 @@ (define (runpaths-of-input label) (copy-recursively (in-vicinity #$assets "fontconfig") (in-vicinity lib "fontconfig")) (substitute* (in-vicinity lib "fontconfig/fonts.conf") - (("fonts") + (("fonts") (format #f "~a" (in-vicinity lib "fonts")))) (delete-file-recursively (in-vicinity lib "fonts")) (copy-recursively (in-vicinity #$assets "fonts") @@ -805,11 +787,7 @@ (define (runpaths-of-input label) "https://gnuzilla.gnu.org/mozzarella") (format #t "pref(~s, ~s);~%" "lightweightThemes.getMoreURL" - "https://gnuzilla.gnu.org/mozzarella") - ;; FIXME: https://github.com/NixOS/nixpkgs/issues/307095 - (format #t "pref(~s, ~a);~%" - "widget.use-xdg-desktop-portal.file-picker" - "1")))))) + "https://gnuzilla.gnu.org/mozzarella")))))) (add-after 'autoconfig 'autoconfig-tor (lambda* (#:key inputs #:allow-other-keys) (let ((lib (in-vicinity #$output "lib/torbrowser")) -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCHv3 4/4] gnu: mullvadbrowser: Update to 13.5.1 [security fixes]. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jul 2024 23:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172117340330679 (code B ref 71782); Tue, 16 Jul 2024 23:44:02 +0000 Received: (at 71782) by debbugs.gnu.org; 16 Jul 2024 23:43:23 +0000 Received: from localhost ([127.0.0.1]:34620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTrpK-0007yk-Sx for submit@debbugs.gnu.org; Tue, 16 Jul 2024 19:43:23 -0400 Received: from mx0.riseup.net ([198.252.153.6]:60044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTrpJ-0007yY-6J for 71782@debbugs.gnu.org; Tue, 16 Jul 2024 19:43:22 -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 mx0.riseup.net (Postfix) with ESMTPS id 4WNwcJ6TgPz9vbW for <71782@debbugs.gnu.org>; Tue, 16 Jul 2024 23:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1721173392; bh=Vq4GxI9MLTpFcbkeRZtSL5jKjNQ05o1AZZpsJ37YZIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=knGDySH1+MAJjGj3pLk/PxQ8cG0rpAApAzyKOeZZ4Ky8cHavUV6LVTSW7glTqihH/ 8BU9eKBE3CUQkBAjBdqjDYxUes99zzjZ+PwxARzhv3akHADQNn4uJ4ecsVceKbMJZ4 ul5DRTVdrd5Q48rIzz6uSgnXBVhdjy8Imq+BQoeE= X-Riseup-User-ID: 17F231A730C7E37DB5F353F9483BEC8ABCB5312B27E825362786200095F3D313 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4WNwcJ0HwYzJrV5; Tue, 16 Jul 2024 23:43:11 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 16 Jul 2024 20:43:06 -0300 Message-ID: <20240716234306.4667-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-1-nandre@riseup.net> MIME-Version: 1.0 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 CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603 and 2024-6604. See the Mozilla Foundation Security advisory for details. * gnu/packages/mullvad-browsers.scm (mozilla-locale): Remove it. (mozilla-locales): Likewise. (firefox-locales): Move to the top. (%mullvadbrowser-locales): Change it to be a plain list of supported locales. (%mullvadbrowser-build-date): Update to 20240708190000. (%mullvadbrowser-version): Update to 13.5.1. (%mullvadbrowser-firefox-version): Update to 115.13.0esr-13.5-1-build3. (mullvadbrowser-translation-base): Update to 6ff73b6f7a6cec4849c2cd1e1ee1dc6fc8894169. (mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales replacement accordingly. Change-Id: I221788e6028375ee40ad7fcfb1d52cb95fc67759 --- gnu/packages/tor-browsers.scm | 98 +++++++++++------------------------ 1 file changed, 30 insertions(+), 68 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 8172083957..3d17f6d566 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -90,39 +90,6 @@ (define-module (gnu packages tor-browsers) #:use-module (ice-9 regex) #:use-module (guix utils)) -(define (mozilla-locale locale changeset hash-string) - (origin - (method hg-fetch) - (uri (hg-reference - (url (string-append "https://hg.mozilla.org/l10n-central/" - locale)) - (changeset changeset))) - (file-name (string-append "mozilla-locale-" locale)) - (sha256 (base32 hash-string)))) - -(define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) - #~(list (cons #$locale #$(mozilla-locale locale changeset hash-string)) - ...)) - -;; We copy the official build id, which is defined at -;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20240708120000") - -;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.5.1") - -;; To find the last Firefox version, browse -;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> -;; There should be only one archive that starts with -;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "115.13.0esr-13.5-1-build2") - -;; See tor-browser-build/rbm.conf for the list. -(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" - "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" - "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" - "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) - ;; See browser/locales/l10n-changesets.json for the commit. (define firefox-locales (let ((commit "15d15edddfbd4611b4922fa1976e753c5be548ca") @@ -147,6 +114,25 @@ (define firefox-locales Firefox locales.") (license license:mpl2.0)))) +;; We copy the official build id, which is defined at +;; tor-browser-build/rbm.conf (browser_release_date). +(define %torbrowser-build-date "20240708120000") + +;; To find the last version, look at https://www.torproject.org/download/. +(define %torbrowser-version "13.5.1") + +;; To find the last Firefox version, browse +;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> +;; There should be only one archive that starts with +;; "src-firefox-tor-browser-". +(define %torbrowser-firefox-version "115.13.0esr-13.5-1-build2") + +;; See tor-browser-build/rbm.conf for the list. +(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" + "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" + "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" + "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) + ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base (origin @@ -831,47 +817,23 @@ (define-public torbrowser ;; See tor-browser-build/rbm.conf for the list. -;; See browser/locales/l10n-changesets.json for the changeset. -;; See update-mozilla-locales in gnuzilla.scm to automate updating changeset. -(define %mullvadbrowser-locales - (mozilla-locales - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("1218mldjxybhgzdi0myzkwjr2fgnysl71pl847kr7wyn1j8wk3a5" "c25d00080479" "ar") - ("1kzx94n36c5vv954j7w65djvb37c178zazy25b35l71q2rvhmlhj" "2197a99c9a08" "da") - ("13h7hk11bbd0yq8gqdv7ndbizkgwlm3ybz225l3x2b5cnyjxyg14" "b7a533e5edc9" "de") - ("0mdr5b6pqxjmg9c8064x3hpf53h6w9j8ghl32655sx9jh4v3ykza" "beff1baac7c5" "es-ES") - ("1pnyg09j6r15w8m62lwj89x6rz4br877z60p8s1hlrb9hj2s3vdx" "ebe0b60b0b36" "fa") - ("067r505626cvlrsalnndf2ykz3nnkiy0b8yaxzf1rracpzmp0hni" "d5ae6a933d71" "fi") - ("0026zzjv2bqc8sg06yvyd0mhny6mwwvhpvzjrhv2fi5v4wkxapdj" "496c2eb73b82" "fr") - ("03fbp4vgkwyimfmbm4n8blx1m16yhms2wm8j4wlx2h3cpxp5r71k" "91951e37e2b8" "it") - ("0ncm531d7ih7phcn9d83zwq0dfphvmzg3gmhqmrrkkbydi1g3pbb" "895dcf8bb524" "ja") - ("14rc9mr4ngxdzwpjagzhz47jazgp1a6vwb0vbwj31yxv9iwkrgzi" "6ef881aff44b" "ko") - ("0h7dlnawm5mbcx4qdlz5c7n4axz2dpa677v13ljdgm2b5w76msmq" "5c1480ccc040" "my") - ("1b12azc1n8j1i2l20v66r74q79zqjvc5sf9pd8rmj3xd0fkxzdp2" "fc1896a0a24d" "nb-NO") - ("1fh4dhlb6hynlpb2997gssv9v8zk5b7qrw0sclggczb5pcpjk6wc" "7e6da4f01bdb" "nl") - ("1w8x3jjrd28f6g6ywwxldizpiipfkr63dzqd74kjpg24s2lqzp80" "e86a451a9cb5" "pl") - ("1v3v4n82sn7a4h2d9n653fmgc31mikacf59lvdj6gbwvzpjb5yfa" "94c3dbb67a5d" "pt-BR") - ("1fxgh7nfxpg2zknvfff8igq9q1vm5n4q033v7lm2c0xn3dbl8m28" "402b2ecbf04d" "ru") - ("1nllh3ax323sxwhj7xvwvbfnh4179332pcmpfyybw1vaid3nr39k" "bb2d5d96d69e" "sv-SE") - ("136m68fd0641k3qqmsw6zp016cvvd0sipsyv6rx2b9nli56agz57" "0e6c56bf2ac9" "th") - ("0q8p8bwq8an65yfdwzm4dhl6km68r83bv5i17kay2gak8msxxhsb" "91e611ae3f19" "tr") - ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h" "081aeb1aa308" "zh-CN") - ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr" "9015a180602e" "zh-TW"))) +(define %mullvadbrowser-locales (list "ar" "da" "de" "es-ES" "fa" "fi" "fr" "it" + "ja" "ko" "my" "nb-NO" "nl" "pl" "pt-BR" + "ru" "sv-SE" "th" "tr" "zh-CN" "zh-TW")) ;; We copy the official build id, which can be found there: ;; https://cdn.mullvad.net/browser/update_responses/update_1/release. -(define %mullvadbrowser-build-date "20240510190000") +(define %mullvadbrowser-build-date "20240708190000") ;; To find the last version, look at ;; https://mullvad.net/en/download/browser/linux. -(define %mullvadbrowser-version "13.0.16") +(define %mullvadbrowser-version "13.5.1") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/mullvadbrowser/<%mullvadbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-mullvad-browser-". -(define %mullvadbrowser-firefox-version "115.12.0esr-13.0-1-build1") +(define %mullvadbrowser-firefox-version "115.13.0esr-13.5-1-build3") ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-base @@ -879,11 +841,11 @@ (define mullvadbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) + (commit "6ff73b6f7a6cec4849c2cd1e1ee1dc6fc8894169"))) (file-name "translation-base-browser") (sha256 (base32 - "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) + "11s4px6izzvja11qrr7g8whbmcn6yrvk2yc0k7jx628562hjwi3d")))) ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-specific @@ -911,7 +873,7 @@ (define mullvadbrowser-assets version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1bpchiz12zjyrzpgyk71naf1jdf3msjcjwggb1mziyawc6pyxj7v")))) + "1g0929852dicdrij5s8bpp97bci0clydg1q4s2sysarjnqki6hk1")))) (arguments (list #:install-plan @@ -954,7 +916,7 @@ (define-public mullvadbrowser %mullvadbrowser-firefox-version ".tar.xz")) (sha256 (base32 - "1xs4qwa3c6nfq6cj5q6asfrzki4brafg65g6hbn0fc9qqcmrhkv5")))) + "19hidpywdiz15q4443jsphd8hbbcz6qajvyivja0vqhy1d6s0avd")))) (arguments (substitute-keyword-arguments (package-arguments mullvadbrowser-base) ((#:phases phases) @@ -976,7 +938,7 @@ (define-public mullvadbrowser (system (format #f "cp -Lr ~a/~a .mozbuild/l10n-central/" #$mullvadbrowser-translation-specific lang))) - (map car #$%mullvadbrowser-locales)))) + (list #$@%mullvadbrowser-locales)))) (add-before 'build 'fix-profiles ;; Otherwise the profile would change every time the install ;; location changes, that is: at every package update. These -- 2.45.1 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v4 0/4] Update torbrowser and mullvadbrowser to v13.5.2. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Aug 2024 00:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172298972127106 (code B ref 71782); Wed, 07 Aug 2024 00:16:01 +0000 Received: (at 71782) by debbugs.gnu.org; 7 Aug 2024 00:15:21 +0000 Received: from localhost ([127.0.0.1]:33349 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbUKn-000737-CI for submit@debbugs.gnu.org; Tue, 06 Aug 2024 20:15:21 -0400 Received: from mx1.riseup.net ([198.252.153.129]:53702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbUKl-00072p-U8 for 71782@debbugs.gnu.org; Tue, 06 Aug 2024 20:15: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 4WdrK56vjWzDqFR for <71782@debbugs.gnu.org>; Wed, 7 Aug 2024 00:14:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1722989690; bh=e8rpKkbig3nJv4C9+i/Tdk/JC1nRHaE0FppxGnAP7go=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m5VB1kYiSgEevfouDMCmYcwYPxqRf7AWuLSsc4ALsYDgd3HTDY1+ah4+eEbTcfRTa 897vj2QWZamVn9EwaJeIEAV2rxnZJNwVOeD65enXwYen0FxotzSE/9U/KCYkGeQ3EY 6ADXCY1byAqm4zxQ+Ap4XhOUwni4/W5wWNCwk1lk= X-Riseup-User-ID: 511309943A3F3D25B78AE080C93988EFDE74885ACD3614614C3D6457B58D0E3F Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4WdrK50JtFzFpxB; Wed, 7 Aug 2024 00:14:48 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 6 Aug 2024 21:14:13 -0300 Message-ID: <20240807001413.4540-1-nandre@riseup.net> In-Reply-To: <20240716234143.4610-1-nandre@riseup.net> References: <20240716234143.4610-1-nandre@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 (-) This patch series updates both torbrowser and mullvadbrowser to version 13.5.2. See previous covers for the complete rationale. No further changes this time around besides updating commits, versions and hashes. A full upgrade depends on #72501 and #72502, which updates noscript and ublock-origin extensions. However, considering these extensions: 1. are useful and can be used on other browsers; 2. their update patches are more straightforward to review; and 3. commiting them would also benefit torbrowser and mullvadbrowser users regardless of this current patch series state, I've decided to send them separately. Cheers, André Batista (4): gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. gnu: go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird: Update to 0.2.0. gnu: torbrowser: Update to 13.5.2 [security fixes]. gnu: mullvadbrowser: Update to 13.5.2 [security fixes]. gnu/packages/golang.scm | 31 +++++- gnu/packages/tor-browsers.scm | 199 ++++++++++++---------------------- 2 files changed, 99 insertions(+), 131 deletions(-) base-commit: 856492962773434281814e42209e97e153357e2c -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v4 1/4] gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Aug 2024 00:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172298975127154 (code B ref 71782); Wed, 07 Aug 2024 00:16:02 +0000 Received: (at 71782) by debbugs.gnu.org; 7 Aug 2024 00:15:51 +0000 Received: from localhost ([127.0.0.1]:33352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbULG-00073u-QF for submit@debbugs.gnu.org; Tue, 06 Aug 2024 20:15:51 -0400 Received: from mx1.riseup.net ([198.252.153.129]:53846) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbULB-00073e-VW for 71782@debbugs.gnu.org; Tue, 06 Aug 2024 20:15:49 -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 4WdrKb6tJZzDqHk for <71782@debbugs.gnu.org>; Wed, 7 Aug 2024 00:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1722989716; bh=FG/+qOs6awrlKKXu4sbP2k91PlHPPJiJq0MOD9Tjq+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VgUAJhUefWQRVyty+W7rwUluMvPfc2zCbtIo+86xT1rcpa1VKsyu1rpBs3ErVIwQc o6dsi9ZkjzpV7C9D7OTDJJ8rf9tMZgqxBUMjiET/QK4zaAvzYw1g9wBDj5s9DwM/VD +dobHByIJmzNpaKvZa8Xohm+00IgkMvdVgmJOHhI= X-Riseup-User-ID: B1CE025B43E904F46AFCFBF58156E98EDC608637764E7894A081BA57EB43D277 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4WdrKb0FC2zFpyW; Wed, 7 Aug 2024 00:15:14 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 6 Aug 2024 21:15:03 -0300 Message-ID: <20240807001503.4558-1-nandre@riseup.net> In-Reply-To: <20240716234143.4610-1-nandre@riseup.net> References: <20240716234143.4610-1-nandre@riseup.net> MIME-Version: 1.0 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/golang.scm (go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel): New variable. --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 1298a8c58b..541aeb02c3 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2260,6 +2260,31 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports incorporates ideas and concepts from Philipp Winter's ScrambleSuit protocol.") (license (list license:bsd-2 license:bsd-3)))) +(define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel + (let ((commit "3b6faa48163782c1e5420bcb4b068cd38c401ea7") + (revision "0")) + (package + (name "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "08k108h1fh9mq0m5kr866s2n0lsif0dpbi8ffb62g5ghg7jaai89")))) + (build-system go-build-system) + (arguments + `(#:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel")) + (home-page "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (synopsis "Go WebTunnel Pluggable Transport") + (description "WebTunnel is a Go Pluggable Transport that attempts to imitate +web browsing activities based on HTTP Upgrade (HTTPT).") + (license license:bsd-2)))) + (define-public go-github-com-sevlyar-go-daemon (package (name "go-github-com-sevlyar-go-daemon") -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v4 2/4] gnu: go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird: Update to 0.2.0. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Aug 2024 00:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172298978227230 (code B ref 71782); Wed, 07 Aug 2024 00:17:01 +0000 Received: (at 71782) by debbugs.gnu.org; 7 Aug 2024 00:16:22 +0000 Received: from localhost ([127.0.0.1]:33357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbULm-000757-6p for submit@debbugs.gnu.org; Tue, 06 Aug 2024 20:16:22 -0400 Received: from mx1.riseup.net ([198.252.153.129]:49936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbULj-00074t-H2 for 71782@debbugs.gnu.org; Tue, 06 Aug 2024 20:16: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 4WdrLF4WyQzDqLd for <71782@debbugs.gnu.org>; Wed, 7 Aug 2024 00:15:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1722989749; bh=x0y5jwc2roV9w1QUTuz5GZn6LAvtwkYNBvZ6sqdf9VM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P1lLAPqOQ/oen8RUrMEWZ0i387UlSdWl6R1fa+pTu08fsc+03XeR4RRlducmf6WIE GQ5WtzygtJZD3RlRqU4+dceMOXa82uyWpiiL/cYoi1JZe5fmqSnCjjMimtxkyfoeBp 6k/bK0cp55qHSR1L2TjOdBk0ddHooUrbpDOB7S7g= X-Riseup-User-ID: 47E1D0A9C36D3D3A7135A0E5AB60092D29FE199C5BEBC33C23E228C8826B2787 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4WdrLD5CMszFq1R; Wed, 7 Aug 2024 00:15:48 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 6 Aug 2024 21:15:37 -0300 Message-ID: <20240807001541.4572-1-nandre@riseup.net> In-Reply-To: <20240716234143.4610-1-nandre@riseup.net> References: <20240716234143.4610-1-nandre@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 (-) * gnu/packages/golang.scm (go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird): Update to 0.2.0. [propagated-inputs]: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. --- gnu/packages/golang.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 541aeb02c3..931c00bef2 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2024 Troy Figiel ;;; Copyright © 2024 Greg Hogan ;;; Copyright © 2024 Brennan Vincent +;;; Copyright © 2024 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -2216,7 +2217,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird (package (name "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird") - (version "0.1.0") + (version "0.2.0") (source (origin (method git-fetch) (uri (git-reference @@ -2225,7 +2226,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports (file-name (git-file-name name version)) (sha256 (base32 - "0rifg5kgqp4c3b44j48fjmx00m00ai7fa4gaqrgphiqs1fc5586s")))) + "0imdf11ldkmbkp74gl1bcbvzmrl7jmkcfhpn6377r99gkf0zk28j")))) (build-system go-build-system) (arguments `(#:unpack-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird" @@ -2251,6 +2252,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports go-github-com-refraction-networking-utls go-gitlab-com-yawning-edwards25519-extra go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-goptlib + go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-text)) -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v4 3/4] gnu: torbrowser: Update to 13.5.2 [security fixes]. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Aug 2024 00:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172298980127280 (code B ref 71782); Wed, 07 Aug 2024 00:17:02 +0000 Received: (at 71782) by debbugs.gnu.org; 7 Aug 2024 00:16:41 +0000 Received: from localhost ([127.0.0.1]:33360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbUM4-00075v-QC for submit@debbugs.gnu.org; Tue, 06 Aug 2024 20:16:41 -0400 Received: from mx1.riseup.net ([198.252.153.129]:35926) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbUM2-00075R-Cg for 71782@debbugs.gnu.org; Tue, 06 Aug 2024 20:16:39 -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 4WdrLc1lK0zDqHk for <71782@debbugs.gnu.org>; Wed, 7 Aug 2024 00:16:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1722989768; bh=kQ26JfxxGNiptMrPV7Fnrb0Ib6WU+Ayfx/5JXdXARGw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tVkGe2IV7D4pzv9NCLoSPdvWJwMHNXKL9iZ5qEMpdurOD7XfJmp38cACIHJ2TPzbG TOv4zbe5MCRsGQSFj0JYpPEZiptftIkol7cZfZYq0RWp6VN4HS6vB3XRIfEBSQKrXw /xaVxLreAG8+WQaKgv9JI9sMRjhBwcX4Hxj+WbT8= X-Riseup-User-ID: 2A525E2FA1868088C70A912D79FB573807B84A72D786DA87A37786862505078F Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4WdrLb0kMDzFpxB; Wed, 7 Aug 2024 00:16:06 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 6 Aug 2024 21:15:57 -0300 Message-ID: <20240807001600.4589-1-nandre@riseup.net> In-Reply-To: <20240716234143.4610-1-nandre@riseup.net> References: <20240716234143.4610-1-nandre@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 CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604, 2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526, 2024-7527, 2024-7529 and 2024-7531. See the Mozilla Foundation Security advisories and for details. * gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to 20240805090000. (%torbrowser-version): Update to 13.5.2. (%torbrowser-firefox-version): Update to 115.14.0esr-13.5-1-build2. (%torbrowser-locales): Change it to be a plain list of supported locales. (firefox-locales): New variable. (torbrowser-translation-base): Update to 64b325861da514cd681533dcd368b351d2eb5f6c. (torbrowser-translation-specific): Update to 36af545865b83e790019195095544d9eec133a49. (lld-as-ld-wrapper-16): New variable. (make-torbrowser)[native-inputs]: Add lld-as-ld-wrapper-16. Use llvm-16 and clang-16. [inputs]: Add firefox-locales. [arguments] <#:phases>: Remove add-bridges. setenv, copy-firefox-locales: Update MOZ_CHROME_MULTILOCALE to the new %torbrowser-locales format. copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust fluent file path. deploy-fonts: Adjust regex expression. autoconfig: Remove file-picker configuration workaround. See #71181. --- gnu/packages/tor-browsers.scm | 141 +++++++++++++++------------------- 1 file changed, 60 insertions(+), 81 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 3d01346c8c..bde95a8428 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2021 Baptiste Strazzul ;;; Copyright © 2022 SeerLite ;;; Copyright © 2024 Aleksandr Vityazev -;;; Copyright © 2020, 2021 André Batista +;;; Copyright © 2020, 2021, 2024 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,63 +104,48 @@ (define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) #~(list (cons #$locale #$(mozilla-locale locale changeset hash-string)) ...)) -;; See tor-browser-build/rbm.conf for the list. -;; See browser/locales/l10n-changesets.json for the changeset. -;; See update-mozilla-locales in gnuzilla.scm to automate updating changeset. -(define %torbrowser-locales - (mozilla-locales - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("1218mldjxybhgzdi0myzkwjr2fgnysl71pl847kr7wyn1j8wk3a5" "c25d00080479" "ar") - ("11c96jhfzd3h46qhblhvn2acsn895ykynarai8r5pf0655nfjs0j" "2de60e3d6d0c" "ca") - ("0yhycgb3s3kydbzy6f2q7f7g2lp975spr092prf9xp8ha62ghby7" "609edd15f9a9" "cs") - ("1kzx94n36c5vv954j7w65djvb37c178zazy25b35l71q2rvhmlhj" "2197a99c9a08" "da") - ("13h7hk11bbd0yq8gqdv7ndbizkgwlm3ybz225l3x2b5cnyjxyg14" "b7a533e5edc9" "de") - ("13ay27vdrqfv2ysyi7c2jmz50lps7rff9rmnws1z7jkj0a5chwrn" "20baf15379d8" "el") - ("0mdr5b6pqxjmg9c8064x3hpf53h6w9j8ghl32655sx9jh4v3ykza" "beff1baac7c5" "es-ES") - ("1pnyg09j6r15w8m62lwj89x6rz4br877z60p8s1hlrb9hj2s3vdx" "ebe0b60b0b36" "fa") - ("067r505626cvlrsalnndf2ykz3nnkiy0b8yaxzf1rracpzmp0hni" "d5ae6a933d71" "fi") - ("0026zzjv2bqc8sg06yvyd0mhny6mwwvhpvzjrhv2fi5v4wkxapdj" "496c2eb73b82" "fr") - ("1dxcp26y8siap4k54zsw7mqa7k0l4f1505rdf4hnnxrzf9a643g5" "2fcccb5b19b3" "ga-IE") - ("14v6xnlyj65hzaz2rmzxcl4skjgm48426jgr9mwkwiqis587lp4a" "c53cea027f8f" "he") - ("04fdw2gzb64fb51bvs0bwsidzlvkdahmcy76vdg3gfcxslnlpi3y" "5a76dd3b5d5c" "hu") - ("0bpyxpclfy74bcsjrs1ajh2am4zv6j6j9q4gc4vz8pgvzy9354zp" "6e6de17dcac4" "id") - ("131ph8n235kr6nj1pszk0m00nh6kl360r4qvx4hjm8s22mw0k8qd" "536265635dfe" "is") - ("03fbp4vgkwyimfmbm4n8blx1m16yhms2wm8j4wlx2h3cpxp5r71k" "91951e37e2b8" "it") - ("0ncm531d7ih7phcn9d83zwq0dfphvmzg3gmhqmrrkkbydi1g3pbb" "895dcf8bb524" "ja") - ("1x3110v730ak522zfm8j3r3v1x5lq3ig82kcgyxkc49xywajy0ni" "d0819a64fc40" "ka") - ("14rc9mr4ngxdzwpjagzhz47jazgp1a6vwb0vbwj31yxv9iwkrgzi" "6ef881aff44b" "ko") - ("1gl85z550amhbaxp39zdj6yyvashj9xd4ampfhm9jdpbf6n5j2l8" "afcbc29a15e5" "lt") - ("1hz5g3iprfkbd88ncppyksbhlws73lhs75nf62hangw8l73wdn69" "84f3d6c7e2da" "mk") - ("14aq37ngnav5m2kcb4wavxwhp28ad4jzdkzc7i64h0qvvxq5n3hf" "c9ec27a5db3d" "ms") - ("0h7dlnawm5mbcx4qdlz5c7n4axz2dpa677v13ljdgm2b5w76msmq" "5c1480ccc040" "my") - ("1b12azc1n8j1i2l20v66r74q79zqjvc5sf9pd8rmj3xd0fkxzdp2" "fc1896a0a24d" "nb-NO") - ("1fh4dhlb6hynlpb2997gssv9v8zk5b7qrw0sclggczb5pcpjk6wc" "7e6da4f01bdb" "nl") - ("1w8x3jjrd28f6g6ywwxldizpiipfkr63dzqd74kjpg24s2lqzp80" "e86a451a9cb5" "pl") - ("1v3v4n82sn7a4h2d9n653fmgc31mikacf59lvdj6gbwvzpjb5yfa" "94c3dbb67a5d" "pt-BR") - ("061a4z0lffgks3wlr6yh5z7x9arcn804mjwvffcmibs106vzamyq" "470b13b5805b" "ro") - ("1fxgh7nfxpg2zknvfff8igq9q1vm5n4q033v7lm2c0xn3dbl8m28" "402b2ecbf04d" "ru") - ("1i119g6dnhzxmpaz5r2jr9yzm1v24v2q6m3z6bfz2yihj0w7m133" "f637484e72b6" "sq") - ("1nllh3ax323sxwhj7xvwvbfnh4179332pcmpfyybw1vaid3nr39k" "bb2d5d96d69e" "sv-SE") - ("136m68fd0641k3qqmsw6zp016cvvd0sipsyv6rx2b9nli56agz57" "0e6c56bf2ac9" "th") - ("0q8p8bwq8an65yfdwzm4dhl6km68r83bv5i17kay2gak8msxxhsb" "91e611ae3f19" "tr") - ("1f2g7rnxpr2gjzngfsv19g11vk9zqpyrv01pz07mw2z3ffbkxf0j" "99d5ffa0b81e" "uk") - ("1rizwsfgr7vxm31bin3i7bwhcqa67wcylak3xa387dvgf1y9057i" "5fd44724e22d" "vi") - ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h" "081aeb1aa308" "zh-CN") - ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr" "9015a180602e" "zh-TW"))) - ;; We copy the official build id, which is defined at ;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20240510190000") +(define %torbrowser-build-date "20240805090000") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.0.16") +(define %torbrowser-version "13.5.2") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "115.12.0esr-13.0-1-build1") +(define %torbrowser-firefox-version "115.14.0esr-13.5-1-build2") + +;; See tor-browser-build/rbm.conf for the list. +(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" + "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" + "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" + "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) + +;; See browser/locales/l10n-changesets.json for the commit. +(define firefox-locales + (let ((commit "d8d587117c7b9dcc6a4fbc38407ed2c831bb008f") + (revision "0")) + (package + (name "firefox-locales") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mozilla-l10n/firefox-l10n") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0a2ly29lli02jflqw78zjk7bp7h18fz935cc9csavi0cpdiixjv1")))) + (build-system copy-build-system) + (home-page "https://github.com/mozilla-l10n/firefox-l10n") + (synopsis "Firefox Locales") + (description "This package contains localized messages for all +Firefox locales.") + (license license:mpl2.0)))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base @@ -168,11 +153,11 @@ (define torbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) + (commit "64b325861da514cd681533dcd368b351d2eb5f6c"))) (file-name "translation-base-browser") (sha256 (base32 - "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) + "0sz60q60839waq8af021635il0v0s4nah6c7krssx12720zxcl5f")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -180,11 +165,11 @@ (define torbrowser-translation-specific (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "b5d79336411e5a59c4861341ef9aa7353e0bcad9"))) + (commit "36af545865b83e790019195095544d9eec133a49"))) (file-name "translation-tor-browser") (sha256 (base32 - "0ahz69pxhgik7ynmdkbnx7v5l2v392i6dswjz057g4hwnd7d34fb")))) + "02kc9b554p3ykm0vvybf2yr3fkmnm06czbdfbc5yapcfdrmwsly3")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -200,7 +185,7 @@ (define torbrowser-assets version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1kffam66bsaahzx212hw9lb03jwfr24hivzg067iyzilsldpc9c1")))) + "1m8rjjqm93ggqfra99xpxgqgjn4b37l63hhrv2gf67mbd12wm9kz")))) (arguments (list #:install-plan @@ -215,6 +200,10 @@ (define torbrowser-assets Browser.") (license license:silofl1.1))) +;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld. +(define lld-as-ld-wrapper-16 + (make-lld-wrapper lld-16 #:lld-as-ld? #t)) + (define* (make-torbrowser #:key moz-app-name moz-app-remotingname @@ -238,10 +227,11 @@ (define* (make-torbrowser #:key ".tar.xz")) (sha256 (base32 - "1b70zyjyai6kk4y1kkl8jvrs56gg7z31kkad6bmdpd8jw4n71grx")))) + "1v81y5grhzk5gdzryyyvf97g7li9rasvjdj2nkridi18694qrykh")))) (build-system mozilla-build-system) (inputs (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird + firefox-locales tor-client alsa-lib bash-minimal ;for wrap-program @@ -293,8 +283,9 @@ (define* (make-torbrowser #:key rust `(,rust "cargo") rust-cbindgen - llvm-15 - clang-15 + lld-as-ld-wrapper-16 ; for cargo rustc + llvm-16 + clang-16 perl node-lts python-wrapper @@ -541,7 +532,7 @@ (define (runpaths-of-input label) (setenv "MOZBUILD_STATE_PATH" (in-vicinity (getcwd) ".mozbuild")) (setenv "MOZ_CHROME_MULTILOCALE" - (string-join (map car #$locales))) + (string-join (list #$@locales))) ;; Make build reproducible. (setenv "MOZ_BUILD_DATE" #$build-date))) (add-before 'configure 'mozconfig @@ -555,14 +546,14 @@ (define (runpaths-of-input label) ;; See tor-browser-build/projects/firefox/build. (add-before 'configure 'copy-firefox-locales (lambda _ - (let ((l10ncentral ".mozbuild/l10n-central")) + (let ((l10ncentral ".mozbuild/l10n-central") + (ff-locales #$(this-package-input "firefox-locales"))) (mkdir-p l10ncentral) (for-each (lambda (lang) - (copy-recursively (cdr lang) - (in-vicinity l10ncentral - (car lang)))) - #$locales)))) + (copy-recursively (string-append ff-locales "/" lang) + (in-vicinity l10ncentral lang))) + (list #$@locales))))) (add-after 'copy-firefox-locales 'copy-basebrowser-locales (lambda _ (let ((l10ncentral ".mozbuild/l10n-central")) @@ -577,7 +568,7 @@ (define (runpaths-of-input label) #f (string-join '("mv" "translation-base-browser/~a/base-browser.ftl" - "~a/~a/browser/browser/")) + "~a/~a/toolkit/toolkit/global/")) lang l10ncentral lang)) (system (format @@ -586,7 +577,7 @@ (define (runpaths-of-input label) "translation-base-browser/~a/*" "~a/~a/browser/chrome/browser/")) lang l10ncentral lang))) - (map car #$locales))))) + (list #$@locales))))) (add-after 'copy-basebrowser-locales 'copy-torbrowser-locales (lambda _ (let ((l10ncentral ".mozbuild/l10n-central")) @@ -601,7 +592,7 @@ (define (runpaths-of-input label) #f (string-join '("mv" "translation-tor-browser/~a/tor-browser.ftl" - "~a/~a/browser/browser/")) + "~a/~a/toolkit/toolkit/global/")) lang l10ncentral lang)) (system (format @@ -623,7 +614,7 @@ (define (runpaths-of-input label) (format port " locale/~a/ (chrome/locale/~a/*)~%" lang lang) (close port))) - (map car #$locales))))) + (list #$@locales))))) (replace 'configure (lambda _ (invoke "./mach" "configure"))) @@ -632,14 +623,6 @@ (define (runpaths-of-input label) (substitute* "toolkit/locales/en-US/toolkit/about/aboutAddons.ftl" (("addons.mozilla.org") "gnuzilla.gnu.org")))) - (add-before 'build 'add-bridges ;see deploy.sh - (lambda _ - (let ((port (open-file - "browser/app/profile/000-tor-browser.js" "a"))) - (display - "#include ../../../tools/torbrowser/bridges.js" port) - (newline port) - (close port)))) (replace 'build (lambda* (#:key (make-flags '()) (parallel-build? #t) #:allow-other-keys) @@ -739,7 +722,7 @@ (define (runpaths-of-input label) (copy-recursively (in-vicinity #$assets "fontconfig") (in-vicinity lib "fontconfig")) (substitute* (in-vicinity lib "fontconfig/fonts.conf") - (("fonts") + (("fonts") (format #f "~a" (in-vicinity lib "fonts")))) (delete-file-recursively (in-vicinity lib "fonts")) (copy-recursively (in-vicinity #$assets "fonts") @@ -805,11 +788,7 @@ (define (runpaths-of-input label) "https://gnuzilla.gnu.org/mozzarella") (format #t "pref(~s, ~s);~%" "lightweightThemes.getMoreURL" - "https://gnuzilla.gnu.org/mozzarella") - ;; FIXME: https://github.com/NixOS/nixpkgs/issues/307095 - (format #t "pref(~s, ~a);~%" - "widget.use-xdg-desktop-portal.file-picker" - "1")))))) + "https://gnuzilla.gnu.org/mozzarella")))))) (add-after 'autoconfig 'autoconfig-tor (lambda* (#:key inputs #:allow-other-keys) (let ((lib (in-vicinity #$output "lib/torbrowser")) -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v4 4/4] gnu: mullvadbrowser: Update to 13.5.2 [security fixes]. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Aug 2024 00:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172298981727312 (code B ref 71782); Wed, 07 Aug 2024 00:17:02 +0000 Received: (at 71782) by debbugs.gnu.org; 7 Aug 2024 00:16:57 +0000 Received: from localhost ([127.0.0.1]:33363 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbUMK-00076R-T8 for submit@debbugs.gnu.org; Tue, 06 Aug 2024 20:16:57 -0400 Received: from mx1.riseup.net ([198.252.153.129]:47736) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbUMJ-00076C-6y for 71782@debbugs.gnu.org; Tue, 06 Aug 2024 20:16:56 -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 4WdrLx18MCzDqLd for <71782@debbugs.gnu.org>; Wed, 7 Aug 2024 00:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1722989785; bh=fSEwncxDLwrvzxDvhHbC6GsyFFLxvy5Dsws+FlVpNAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d13D/D2rDkOlUOj/Ue98rJNHho5cHBTo6B1lNPcw73YopH9JKm3nYJC1mMf51wUBO IZXcuxUzqp6bBJTYQ962g0Kk4UtpwwDtveFost0N0qFuQYaFPcaMdIAXuADqLiuNWh jPLjmT6626uu/IHqgJAQfxUAeMuEWR351WeSrNhM= X-Riseup-User-ID: A9EE45A42DDB5F2F389931F303CBF22BD0F657A229AC8EEF7C69393E45B0CC64 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4WdrLw1h87zFpxB; Wed, 7 Aug 2024 00:16:24 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 6 Aug 2024 21:16:17 -0300 Message-ID: <20240807001617.4604-1-nandre@riseup.net> In-Reply-To: <20240716234143.4610-1-nandre@riseup.net> References: <20240716234143.4610-1-nandre@riseup.net> MIME-Version: 1.0 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 CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604, 2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526, 2024-7527, 2024-7529 and 2024-7531. See the Mozilla Foundation Security advisories and for details. * gnu/packages/mullvad-browsers.scm (mozilla-locale): Remove it. (mozilla-locales): Likewise. (firefox-locales): Move to the top. (%mullvadbrowser-locales): Change it to be a plain list of supported locales. (%mullvadbrowser-build-date): Update to 20240805090000. (%mullvadbrowser-version): Update to 13.5.2. (%mullvadbrowser-firefox-version): Update to 115.14.0esr-13.5-1-build2. (mullvadbrowser-translation-base): Update to 64b325861da514cd681533dcd368b351d2eb5f6c. (mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales replacement accordingly. --- gnu/packages/tor-browsers.scm | 98 +++++++++++------------------------ 1 file changed, 30 insertions(+), 68 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index bde95a8428..1898f8b2c4 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -90,39 +90,6 @@ (define-module (gnu packages tor-browsers) #:use-module (ice-9 regex) #:use-module (guix utils)) -(define (mozilla-locale locale changeset hash-string) - (origin - (method hg-fetch) - (uri (hg-reference - (url (string-append "https://hg.mozilla.org/l10n-central/" - locale)) - (changeset changeset))) - (file-name (string-append "mozilla-locale-" locale)) - (sha256 (base32 hash-string)))) - -(define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) - #~(list (cons #$locale #$(mozilla-locale locale changeset hash-string)) - ...)) - -;; We copy the official build id, which is defined at -;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20240805090000") - -;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.5.2") - -;; To find the last Firefox version, browse -;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> -;; There should be only one archive that starts with -;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "115.14.0esr-13.5-1-build2") - -;; See tor-browser-build/rbm.conf for the list. -(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" - "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" - "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" - "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) - ;; See browser/locales/l10n-changesets.json for the commit. (define firefox-locales (let ((commit "d8d587117c7b9dcc6a4fbc38407ed2c831bb008f") @@ -147,6 +114,25 @@ (define firefox-locales Firefox locales.") (license license:mpl2.0)))) +;; We copy the official build id, which is defined at +;; tor-browser-build/rbm.conf (browser_release_date). +(define %torbrowser-build-date "20240805090000") + +;; To find the last version, look at https://www.torproject.org/download/. +(define %torbrowser-version "13.5.2") + +;; To find the last Firefox version, browse +;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> +;; There should be only one archive that starts with +;; "src-firefox-tor-browser-". +(define %torbrowser-firefox-version "115.14.0esr-13.5-1-build2") + +;; See tor-browser-build/rbm.conf for the list. +(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" + "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" + "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" + "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) + ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base (origin @@ -832,47 +818,23 @@ (define-public torbrowser ;; See tor-browser-build/rbm.conf for the list. -;; See browser/locales/l10n-changesets.json for the changeset. -;; See update-mozilla-locales in gnuzilla.scm to automate updating changeset. -(define %mullvadbrowser-locales - (mozilla-locales - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("1218mldjxybhgzdi0myzkwjr2fgnysl71pl847kr7wyn1j8wk3a5" "c25d00080479" "ar") - ("1kzx94n36c5vv954j7w65djvb37c178zazy25b35l71q2rvhmlhj" "2197a99c9a08" "da") - ("13h7hk11bbd0yq8gqdv7ndbizkgwlm3ybz225l3x2b5cnyjxyg14" "b7a533e5edc9" "de") - ("0mdr5b6pqxjmg9c8064x3hpf53h6w9j8ghl32655sx9jh4v3ykza" "beff1baac7c5" "es-ES") - ("1pnyg09j6r15w8m62lwj89x6rz4br877z60p8s1hlrb9hj2s3vdx" "ebe0b60b0b36" "fa") - ("067r505626cvlrsalnndf2ykz3nnkiy0b8yaxzf1rracpzmp0hni" "d5ae6a933d71" "fi") - ("0026zzjv2bqc8sg06yvyd0mhny6mwwvhpvzjrhv2fi5v4wkxapdj" "496c2eb73b82" "fr") - ("03fbp4vgkwyimfmbm4n8blx1m16yhms2wm8j4wlx2h3cpxp5r71k" "91951e37e2b8" "it") - ("0ncm531d7ih7phcn9d83zwq0dfphvmzg3gmhqmrrkkbydi1g3pbb" "895dcf8bb524" "ja") - ("14rc9mr4ngxdzwpjagzhz47jazgp1a6vwb0vbwj31yxv9iwkrgzi" "6ef881aff44b" "ko") - ("0h7dlnawm5mbcx4qdlz5c7n4axz2dpa677v13ljdgm2b5w76msmq" "5c1480ccc040" "my") - ("1b12azc1n8j1i2l20v66r74q79zqjvc5sf9pd8rmj3xd0fkxzdp2" "fc1896a0a24d" "nb-NO") - ("1fh4dhlb6hynlpb2997gssv9v8zk5b7qrw0sclggczb5pcpjk6wc" "7e6da4f01bdb" "nl") - ("1w8x3jjrd28f6g6ywwxldizpiipfkr63dzqd74kjpg24s2lqzp80" "e86a451a9cb5" "pl") - ("1v3v4n82sn7a4h2d9n653fmgc31mikacf59lvdj6gbwvzpjb5yfa" "94c3dbb67a5d" "pt-BR") - ("1fxgh7nfxpg2zknvfff8igq9q1vm5n4q033v7lm2c0xn3dbl8m28" "402b2ecbf04d" "ru") - ("1nllh3ax323sxwhj7xvwvbfnh4179332pcmpfyybw1vaid3nr39k" "bb2d5d96d69e" "sv-SE") - ("136m68fd0641k3qqmsw6zp016cvvd0sipsyv6rx2b9nli56agz57" "0e6c56bf2ac9" "th") - ("0q8p8bwq8an65yfdwzm4dhl6km68r83bv5i17kay2gak8msxxhsb" "91e611ae3f19" "tr") - ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h" "081aeb1aa308" "zh-CN") - ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr" "9015a180602e" "zh-TW"))) +(define %mullvadbrowser-locales (list "ar" "da" "de" "es-ES" "fa" "fi" "fr" "it" + "ja" "ko" "my" "nb-NO" "nl" "pl" "pt-BR" + "ru" "sv-SE" "th" "tr" "zh-CN" "zh-TW")) ;; We copy the official build id, which can be found there: ;; https://cdn.mullvad.net/browser/update_responses/update_1/release. -(define %mullvadbrowser-build-date "20240510190000") +(define %mullvadbrowser-build-date "20240805090000") ;; To find the last version, look at ;; https://mullvad.net/en/download/browser/linux. -(define %mullvadbrowser-version "13.0.16") +(define %mullvadbrowser-version "13.5.2") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/mullvadbrowser/<%mullvadbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-mullvad-browser-". -(define %mullvadbrowser-firefox-version "115.12.0esr-13.0-1-build1") +(define %mullvadbrowser-firefox-version "115.14.0esr-13.5-1-build2") ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-base @@ -880,11 +842,11 @@ (define mullvadbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) + (commit "64b325861da514cd681533dcd368b351d2eb5f6c"))) (file-name "translation-base-browser") (sha256 (base32 - "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) + "0sz60q60839waq8af021635il0v0s4nah6c7krssx12720zxcl5f")))) ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-specific @@ -912,7 +874,7 @@ (define mullvadbrowser-assets version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1bpchiz12zjyrzpgyk71naf1jdf3msjcjwggb1mziyawc6pyxj7v")))) + "1mvhasy70yhndibrb4m8cslkbz2gn08p6kirilnqzqq6p0j1lxq9")))) (arguments (list #:install-plan @@ -955,7 +917,7 @@ (define-public mullvadbrowser %mullvadbrowser-firefox-version ".tar.xz")) (sha256 (base32 - "1xs4qwa3c6nfq6cj5q6asfrzki4brafg65g6hbn0fc9qqcmrhkv5")))) + "0w5xy4cxcnxn6vzp5jbzxcssy9r69pgby0gl04m33fh9fl26pkkq")))) (arguments (substitute-keyword-arguments (package-arguments mullvadbrowser-base) ((#:phases phases) @@ -977,7 +939,7 @@ (define-public mullvadbrowser (system (format #f "cp -Lr ~a/~a .mozbuild/l10n-central/" #$mullvadbrowser-translation-specific lang))) - (map car #$%mullvadbrowser-locales)))) + (list #$@%mullvadbrowser-locales)))) (add-before 'build 'fix-profiles ;; Otherwise the profile would change every time the install ;; location changes, that is: at every package update. These -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v5 0/4] Update torbrowser and mullvadbrowser to v. 13.5.3. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Sep 2024 23:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista , mhw@netris.org, jonathan.brielmaier@web.de, ian@retrospec.tv Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17255777827641 (code B ref 71782); Thu, 05 Sep 2024 23:10:02 +0000 Received: (at 71782) by debbugs.gnu.org; 5 Sep 2024 23:09:42 +0000 Received: from localhost ([127.0.0.1]:38496 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLbi-0001zA-BO for submit@debbugs.gnu.org; Thu, 05 Sep 2024 19:09:42 -0400 Received: from mx0.riseup.net ([198.252.153.6]:48166) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLbh-0001ys-2J for 71782@debbugs.gnu.org; Thu, 05 Sep 2024 19:09:41 -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 mx0.riseup.net (Postfix) with ESMTPS id 4X0FQj3n2hz9wFG; Thu, 5 Sep 2024 23:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1725577709; bh=QyXu5HvpsqYM1blTgDrh+6nulOKwZGNK8wiUGtSfjyw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SDXlOpyb6G7WPLqIDfbgjPlu9g+rtoUVj4L63u4BW+qhMFnwLYI/d22a7sdSXfhlK J9I9CBjQJXlNjSBu6PT8yW4lgk72vljMb0XnMQmdqMT2FjGv7Ase/6W9x7Ay/DdMg8 u9CV4pwIJdGzTDwHfixTVJR+ACW3+60y/CaQEmns= X-Riseup-User-ID: 914EEE73FD52C08CF3A5ABA7B063D544A1E7BA304AE38E608A8F5F60F05F5CC0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4X0FQg25p7zFrPx; Thu, 5 Sep 2024 23:08:27 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Thu, 5 Sep 2024 20:08:01 -0300 Message-ID: <20240905230801.5772-1-nandre@riseup.net> In-Reply-To: <20240807001413.4540-1-nandre@riseup.net> References: <20240807001413.4540-1-nandre@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 (-) This patch series updates both torbrowser and mullvadbrowser to version 13.5.3. See previous covers for the complete rationale. No further changes this time around besides updating commits, versions and hashes. A full upgrade depends on #73012, which updates noscript extension. André Batista (4): gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. gnu: go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird: Update to 0.3.0. gnu: torbrowser: Update to 13.5.3 [security fixes]. gnu: mullvadbrowser: Update to 13.5.3 [security fixes]. gnu/packages/golang.scm | 31 +++++- gnu/packages/tor-browsers.scm | 199 ++++++++++++---------------------- 2 files changed, 99 insertions(+), 131 deletions(-) base-commit: 68d069ccaf1e7988058dc937d391a1262d927acc -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v5 1/4] gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Sep 2024 23:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: sharlatanus@gmail.com, jonathan.brielmaier@web.de, ian@retrospec.tv, =?UTF-8?Q?Andr=C3=A9?= Batista , mhw@netris.org, cox.katherine.e+guix@gmail.com Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17255783209822 (code B ref 71782); Thu, 05 Sep 2024 23:19:02 +0000 Received: (at 71782) by debbugs.gnu.org; 5 Sep 2024 23:18:40 +0000 Received: from localhost ([127.0.0.1]:38502 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLkO-0002YL-DT for submit@debbugs.gnu.org; Thu, 05 Sep 2024 19:18:40 -0400 Received: from mx0.riseup.net ([198.252.153.6]:47530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLkL-0002Y5-5H for 71782@debbugs.gnu.org; Thu, 05 Sep 2024 19:18:38 -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 mx0.riseup.net (Postfix) with ESMTPS id 4X0Fd16CWQz9tfN; Thu, 5 Sep 2024 23:17:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1725578246; bh=OlptBrRj4s3nDU8eDdq0iLrcbHp44gh8T+iKzJocQHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f5swaD+tvNh8I02bPf7TDHNXP7EZxXbqgGcunfs8V8VXmRKuVOL3v4DVEUOlnCvAQ E94dBL8rf5nIwEye0kuHnAcTncXOsH99Kh634aezCjAG9UIae4/JQ0t6J3NleLo6uC O769BSm3gfELc1w/ZQWvlGYQprfLrmiSQcPxVyqw= X-Riseup-User-ID: 4BEAC8685A6E59C40AF0A8CD6A9377C4CA264418F93F1786FD66DEB18F6A089B Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4X0Fd03syRzFsZr; Thu, 5 Sep 2024 23:17:24 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Thu, 5 Sep 2024 20:17:07 -0300 Message-ID: <20240905231707.5908-1-nandre@riseup.net> In-Reply-To: <20240905230801.5772-1-nandre@riseup.net> References: <20240905230801.5772-1-nandre@riseup.net> MIME-Version: 1.0 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/golang.scm (go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel): New variable. Change-Id: I84ef723ea03822bd5abf655914f44fb53fd865e2 --- gnu/packages/golang.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 9f04b8e423..af2acc909e 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -2241,6 +2241,31 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports incorporates ideas and concepts from Philipp Winter's ScrambleSuit protocol.") (license (list license:bsd-2 license:bsd-3)))) +(define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel + (let ((commit "e64b1b3562f3ab50d06141ecd513a21ec74fe8c6") + (revision "0")) + (package + (name "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nvd0qp1mdy7w32arnkhghxm5k2g6gy33cxlarxc6vdm4yh6v5nv")))) + (build-system go-build-system) + (arguments + `(#:import-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel")) + (home-page "https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/webtunnel") + (synopsis "Go WebTunnel Pluggable Transport") + (description "WebTunnel is a Go Pluggable Transport that attempts to imitate +web browsing activities based on HTTP Upgrade (HTTPT).") + (license license:bsd-2)))) + (define-public go-github-com-sevlyar-go-daemon (package (name "go-github-com-sevlyar-go-daemon") -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v5 2/4] gnu: go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird: Update to 0.3.0. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Sep 2024 23:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: sharlatanus@gmail.com, jonathan.brielmaier@web.de, ian@retrospec.tv, =?UTF-8?Q?Andr=C3=A9?= Batista , mhw@netris.org, cox.katherine.e+guix@gmail.com Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17255783469910 (code B ref 71782); Thu, 05 Sep 2024 23:20:02 +0000 Received: (at 71782) by debbugs.gnu.org; 5 Sep 2024 23:19:06 +0000 Received: from localhost ([127.0.0.1]:38506 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLkn-0002Zk-Pi for submit@debbugs.gnu.org; Thu, 05 Sep 2024 19:19:06 -0400 Received: from mx1.riseup.net ([198.252.153.129]:40002) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLkl-0002Yp-7O for 71782@debbugs.gnu.org; Thu, 05 Sep 2024 19:19:04 -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 4X0FdW4tHZzDqM3; Thu, 5 Sep 2024 23:17:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1725578271; bh=lOS+AcpwOozKr3uPrQVPY7lLuD8aJmfP352ghTuHa9o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XDwRlD3xkW0CeUTiEu6QDXrK0vpzEfKJTvG2K/jjyy7OprktO5xu8J68ZTODOFFq6 AN3IKYRRHaqGmffuhlzuZBKbOzjykwZfwMDC81KMTqJY752QQPSoBWMRUtAXa+wz4s ebEghyZeXUz0Lfxua4BY8LiAqqekHpOQUordbtkk= X-Riseup-User-ID: B0F89254C9CA601B3DFB2198591FE5A073A6141D7DA6F82FF0796CBC283BDF39 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4X0FdV2Zf3zFsbq; Thu, 5 Sep 2024 23:17:50 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Thu, 5 Sep 2024 20:17:34 -0300 Message-ID: <20240905231739.5931-1-nandre@riseup.net> In-Reply-To: <20240905230801.5772-1-nandre@riseup.net> References: <20240905230801.5772-1-nandre@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 (-) * gnu/packages/golang.scm (go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird): Update to 0.3.0. [propagated-inputs]: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Change-Id: Iac17163aab6e6010f9fa569fcaf51b217084a572 --- gnu/packages/golang.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index af2acc909e..ccb94aadf7 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -46,6 +46,7 @@ ;;; Copyright © 2024 Troy Figiel ;;; Copyright © 2024 Greg Hogan ;;; Copyright © 2024 Brennan Vincent +;;; Copyright © 2024 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -2197,7 +2198,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird (package (name "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird") - (version "0.1.0") + (version "0.3.0") (source (origin (method git-fetch) (uri (git-reference @@ -2206,7 +2207,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports (file-name (git-file-name name version)) (sha256 (base32 - "0rifg5kgqp4c3b44j48fjmx00m00ai7fa4gaqrgphiqs1fc5586s")))) + "1bmljd81vc8b4kzmpgmx1n1vvjn5y1s2w01hjxwplmnchv9dndkl")))) (build-system go-build-system) (arguments `(#:unpack-path "gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyrebird" @@ -2232,6 +2233,7 @@ (define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports go-github-com-refraction-networking-utls go-gitlab-com-yawning-edwards25519-extra go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-goptlib + go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel go-golang-org-x-crypto go-golang-org-x-net go-golang-org-x-text)) -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v5 3/4] gnu: torbrowser: Update to 13.5.3 [security fixes]. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Sep 2024 23:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista , mhw@netris.org, jonathan.brielmaier@web.de, ian@retrospec.tv Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17255783719952 (code B ref 71782); Thu, 05 Sep 2024 23:20:02 +0000 Received: (at 71782) by debbugs.gnu.org; 5 Sep 2024 23:19:31 +0000 Received: from localhost ([127.0.0.1]:38509 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLlC-0002aR-8H for submit@debbugs.gnu.org; Thu, 05 Sep 2024 19:19:31 -0400 Received: from mx0.riseup.net ([198.252.153.6]:53334) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLl9-0002aC-OC for 71782@debbugs.gnu.org; Thu, 05 Sep 2024 19:19: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) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4X0Ff03hqXz9tfN; Thu, 5 Sep 2024 23:18:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1725578296; bh=YFljl/nstsSH1+02wv9mm2jHP8dznNPlOjzOsoAGvTM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fwTi9VdzaKJQBQpZv7zXSIw4TSuS/I9e/E9FuZD9FIUH1Z4L07UVzunKlUk1cRZAQ PBdDQdk95ArbNKvREFOFVxujeF7tRUeSyRfLEGZ297xleRlL8nKrJfOHiQjvbRZN5N ty2Fnsfs4CuNTknlk9Xq8uc4vKeCPVQze4OKyXv0= X-Riseup-User-ID: 84DE43E786D1C4CFDBCACDC625AE13FC425BE7E7A2CBEBE3E6F787CF18D9C197 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4X0Fdz1ByfzFwYr; Thu, 5 Sep 2024 23:18:15 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Thu, 5 Sep 2024 20:18:03 -0300 Message-ID: <20240905231807.5950-1-nandre@riseup.net> In-Reply-To: <20240905230801.5772-1-nandre@riseup.net> References: <20240905230801.5772-1-nandre@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 CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604, 2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526, 2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and 2024-8384. See the Mozilla Foundation Security advisories , and for details. * gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to 20240903073000. (%torbrowser-version): Update to 13.5.3. (%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3. (%torbrowser-locales): Change it to be a plain list of supported locales. (firefox-locales): New variable. (torbrowser-translation-base): Update to daed2afc487d1b20efc17feb153156524c6f714b. (torbrowser-translation-specific): Update to 6374e3b09c0894b8452fa1ba0b99c807722fc805. (lld-as-ld-wrapper-16): New variable. (make-torbrowser)[native-inputs]: Add lld-as-ld-wrapper-16. Use llvm-16 and clang-16. [inputs]: Add firefox-locales. [arguments] <#:phases>: Remove add-bridges. setenv, copy-firefox-locales: Update MOZ_CHROME_MULTILOCALE to the new %torbrowser-locales format. copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust fluent file path. deploy-fonts: Adjust regex expression. autoconfig: Remove file-picker configuration workaround. See #71181. Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300 --- gnu/packages/tor-browsers.scm | 141 +++++++++++++++------------------- 1 file changed, 60 insertions(+), 81 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index ba6bbaa873..180dae6317 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2021 Baptiste Strazzul ;;; Copyright © 2022 SeerLite ;;; Copyright © 2024 Aleksandr Vityazev -;;; Copyright © 2020, 2021 André Batista +;;; Copyright © 2020, 2021, 2024 André Batista ;;; ;;; This file is part of GNU Guix. ;;; @@ -104,63 +104,48 @@ (define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) #~(list (cons #$locale #$(mozilla-locale locale changeset hash-string)) ...)) -;; See tor-browser-build/rbm.conf for the list. -;; See browser/locales/l10n-changesets.json for the changeset. -;; See update-mozilla-locales in gnuzilla.scm to automate updating changeset. -(define %torbrowser-locales - (mozilla-locales - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("1218mldjxybhgzdi0myzkwjr2fgnysl71pl847kr7wyn1j8wk3a5" "c25d00080479" "ar") - ("11c96jhfzd3h46qhblhvn2acsn895ykynarai8r5pf0655nfjs0j" "2de60e3d6d0c" "ca") - ("0yhycgb3s3kydbzy6f2q7f7g2lp975spr092prf9xp8ha62ghby7" "609edd15f9a9" "cs") - ("1kzx94n36c5vv954j7w65djvb37c178zazy25b35l71q2rvhmlhj" "2197a99c9a08" "da") - ("13h7hk11bbd0yq8gqdv7ndbizkgwlm3ybz225l3x2b5cnyjxyg14" "b7a533e5edc9" "de") - ("13ay27vdrqfv2ysyi7c2jmz50lps7rff9rmnws1z7jkj0a5chwrn" "20baf15379d8" "el") - ("0mdr5b6pqxjmg9c8064x3hpf53h6w9j8ghl32655sx9jh4v3ykza" "beff1baac7c5" "es-ES") - ("1pnyg09j6r15w8m62lwj89x6rz4br877z60p8s1hlrb9hj2s3vdx" "ebe0b60b0b36" "fa") - ("067r505626cvlrsalnndf2ykz3nnkiy0b8yaxzf1rracpzmp0hni" "d5ae6a933d71" "fi") - ("0026zzjv2bqc8sg06yvyd0mhny6mwwvhpvzjrhv2fi5v4wkxapdj" "496c2eb73b82" "fr") - ("1dxcp26y8siap4k54zsw7mqa7k0l4f1505rdf4hnnxrzf9a643g5" "2fcccb5b19b3" "ga-IE") - ("14v6xnlyj65hzaz2rmzxcl4skjgm48426jgr9mwkwiqis587lp4a" "c53cea027f8f" "he") - ("04fdw2gzb64fb51bvs0bwsidzlvkdahmcy76vdg3gfcxslnlpi3y" "5a76dd3b5d5c" "hu") - ("0bpyxpclfy74bcsjrs1ajh2am4zv6j6j9q4gc4vz8pgvzy9354zp" "6e6de17dcac4" "id") - ("131ph8n235kr6nj1pszk0m00nh6kl360r4qvx4hjm8s22mw0k8qd" "536265635dfe" "is") - ("03fbp4vgkwyimfmbm4n8blx1m16yhms2wm8j4wlx2h3cpxp5r71k" "91951e37e2b8" "it") - ("0ncm531d7ih7phcn9d83zwq0dfphvmzg3gmhqmrrkkbydi1g3pbb" "895dcf8bb524" "ja") - ("1x3110v730ak522zfm8j3r3v1x5lq3ig82kcgyxkc49xywajy0ni" "d0819a64fc40" "ka") - ("14rc9mr4ngxdzwpjagzhz47jazgp1a6vwb0vbwj31yxv9iwkrgzi" "6ef881aff44b" "ko") - ("1gl85z550amhbaxp39zdj6yyvashj9xd4ampfhm9jdpbf6n5j2l8" "afcbc29a15e5" "lt") - ("1hz5g3iprfkbd88ncppyksbhlws73lhs75nf62hangw8l73wdn69" "84f3d6c7e2da" "mk") - ("14aq37ngnav5m2kcb4wavxwhp28ad4jzdkzc7i64h0qvvxq5n3hf" "c9ec27a5db3d" "ms") - ("0h7dlnawm5mbcx4qdlz5c7n4axz2dpa677v13ljdgm2b5w76msmq" "5c1480ccc040" "my") - ("1b12azc1n8j1i2l20v66r74q79zqjvc5sf9pd8rmj3xd0fkxzdp2" "fc1896a0a24d" "nb-NO") - ("1fh4dhlb6hynlpb2997gssv9v8zk5b7qrw0sclggczb5pcpjk6wc" "7e6da4f01bdb" "nl") - ("1w8x3jjrd28f6g6ywwxldizpiipfkr63dzqd74kjpg24s2lqzp80" "e86a451a9cb5" "pl") - ("1v3v4n82sn7a4h2d9n653fmgc31mikacf59lvdj6gbwvzpjb5yfa" "94c3dbb67a5d" "pt-BR") - ("061a4z0lffgks3wlr6yh5z7x9arcn804mjwvffcmibs106vzamyq" "470b13b5805b" "ro") - ("1fxgh7nfxpg2zknvfff8igq9q1vm5n4q033v7lm2c0xn3dbl8m28" "402b2ecbf04d" "ru") - ("1i119g6dnhzxmpaz5r2jr9yzm1v24v2q6m3z6bfz2yihj0w7m133" "f637484e72b6" "sq") - ("1nllh3ax323sxwhj7xvwvbfnh4179332pcmpfyybw1vaid3nr39k" "bb2d5d96d69e" "sv-SE") - ("136m68fd0641k3qqmsw6zp016cvvd0sipsyv6rx2b9nli56agz57" "0e6c56bf2ac9" "th") - ("0q8p8bwq8an65yfdwzm4dhl6km68r83bv5i17kay2gak8msxxhsb" "91e611ae3f19" "tr") - ("1f2g7rnxpr2gjzngfsv19g11vk9zqpyrv01pz07mw2z3ffbkxf0j" "99d5ffa0b81e" "uk") - ("1rizwsfgr7vxm31bin3i7bwhcqa67wcylak3xa387dvgf1y9057i" "5fd44724e22d" "vi") - ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h" "081aeb1aa308" "zh-CN") - ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr" "9015a180602e" "zh-TW"))) - ;; We copy the official build id, which is defined at ;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20240510190000") +(define %torbrowser-build-date "20240903073000") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.0.16") +(define %torbrowser-version "13.5.3") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "115.12.0esr-13.0-1-build1") +(define %torbrowser-firefox-version "115.15.0esr-13.5-1-build3") + +;; See tor-browser-build/rbm.conf for the list. +(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" + "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" + "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" + "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) + +;; See browser/locales/l10n-changesets.json for the commit. +(define firefox-locales + (let ((commit "d8d587117c7b9dcc6a4fbc38407ed2c831bb008f") + (revision "0")) + (package + (name "firefox-locales") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/mozilla-l10n/firefox-l10n") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0a2ly29lli02jflqw78zjk7bp7h18fz935cc9csavi0cpdiixjv1")))) + (build-system copy-build-system) + (home-page "https://github.com/mozilla-l10n/firefox-l10n") + (synopsis "Firefox Locales") + (description "This package contains localized messages for all +Firefox locales.") + (license license:mpl2.0)))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base @@ -168,11 +153,11 @@ (define torbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) + (commit "daed2afc487d1b20efc17feb153156524c6f714b"))) (file-name "translation-base-browser") (sha256 (base32 - "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) + "0psmmgw9dnjwdhjbqkd69q5q7sdwyjcwagh93ffrjk0v7ybc79dq")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -180,11 +165,11 @@ (define torbrowser-translation-specific (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "b5d79336411e5a59c4861341ef9aa7353e0bcad9"))) + (commit "6374e3b09c0894b8452fa1ba0b99c807722fc805"))) (file-name "translation-tor-browser") (sha256 (base32 - "0ahz69pxhgik7ynmdkbnx7v5l2v392i6dswjz057g4hwnd7d34fb")))) + "1wd9iwcj2h70bp017pcdhgfiw2bs8zi68kljmpnk69pssd6cn8l3")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -200,7 +185,7 @@ (define torbrowser-assets version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1kffam66bsaahzx212hw9lb03jwfr24hivzg067iyzilsldpc9c1")))) + "0laz6yrm310iidddnas2w1s5wad183n9axjkgrf5cm5paj615343")))) (arguments (list #:install-plan @@ -215,6 +200,10 @@ (define torbrowser-assets Browser.") (license license:silofl1.1))) +;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld. +(define lld-as-ld-wrapper-16 + (make-lld-wrapper lld-16 #:lld-as-ld? #t)) + (define* (make-torbrowser #:key moz-app-name moz-app-remotingname @@ -238,10 +227,11 @@ (define* (make-torbrowser #:key ".tar.xz")) (sha256 (base32 - "1b70zyjyai6kk4y1kkl8jvrs56gg7z31kkad6bmdpd8jw4n71grx")))) + "13b9ni6anv279drhbb5m95nnmgslrp6frsm0y4028nfqiprs7vj5")))) (build-system mozilla-build-system) (inputs (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird + firefox-locales tor-client alsa-lib bash-minimal ;for wrap-program @@ -293,8 +283,9 @@ (define* (make-torbrowser #:key rust `(,rust "cargo") rust-cbindgen - llvm-15 - clang-15 + lld-as-ld-wrapper-16 ; for cargo rustc + llvm-16 + clang-16 perl node-lts python-wrapper @@ -541,7 +532,7 @@ (define (runpaths-of-input label) (setenv "MOZBUILD_STATE_PATH" (in-vicinity (getcwd) ".mozbuild")) (setenv "MOZ_CHROME_MULTILOCALE" - (string-join (map car #$locales))) + (string-join (list #$@locales))) ;; Make build reproducible. (setenv "MOZ_BUILD_DATE" #$build-date))) (add-before 'configure 'mozconfig @@ -555,14 +546,14 @@ (define (runpaths-of-input label) ;; See tor-browser-build/projects/firefox/build. (add-before 'configure 'copy-firefox-locales (lambda _ - (let ((l10ncentral ".mozbuild/l10n-central")) + (let ((l10ncentral ".mozbuild/l10n-central") + (ff-locales #$(this-package-input "firefox-locales"))) (mkdir-p l10ncentral) (for-each (lambda (lang) - (copy-recursively (cdr lang) - (in-vicinity l10ncentral - (car lang)))) - #$locales)))) + (copy-recursively (string-append ff-locales "/" lang) + (in-vicinity l10ncentral lang))) + (list #$@locales))))) (add-after 'copy-firefox-locales 'copy-basebrowser-locales (lambda _ (let ((l10ncentral ".mozbuild/l10n-central")) @@ -577,7 +568,7 @@ (define (runpaths-of-input label) #f (string-join '("mv" "translation-base-browser/~a/base-browser.ftl" - "~a/~a/browser/browser/")) + "~a/~a/toolkit/toolkit/global/")) lang l10ncentral lang)) (system (format @@ -586,7 +577,7 @@ (define (runpaths-of-input label) "translation-base-browser/~a/*" "~a/~a/browser/chrome/browser/")) lang l10ncentral lang))) - (map car #$locales))))) + (list #$@locales))))) (add-after 'copy-basebrowser-locales 'copy-torbrowser-locales (lambda _ (let ((l10ncentral ".mozbuild/l10n-central")) @@ -601,7 +592,7 @@ (define (runpaths-of-input label) #f (string-join '("mv" "translation-tor-browser/~a/tor-browser.ftl" - "~a/~a/browser/browser/")) + "~a/~a/toolkit/toolkit/global/")) lang l10ncentral lang)) (system (format @@ -623,7 +614,7 @@ (define (runpaths-of-input label) (format port " locale/~a/ (chrome/locale/~a/*)~%" lang lang) (close port))) - (map car #$locales))))) + (list #$@locales))))) (replace 'configure (lambda _ (invoke "./mach" "configure"))) @@ -632,14 +623,6 @@ (define (runpaths-of-input label) (substitute* "toolkit/locales/en-US/toolkit/about/aboutAddons.ftl" (("addons.mozilla.org") "gnuzilla.gnu.org")))) - (add-before 'build 'add-bridges ;see deploy.sh - (lambda _ - (let ((port (open-file - "browser/app/profile/000-tor-browser.js" "a"))) - (display - "#include ../../../tools/torbrowser/bridges.js" port) - (newline port) - (close port)))) (replace 'build (lambda* (#:key (make-flags '()) (parallel-build? #t) #:allow-other-keys) @@ -739,7 +722,7 @@ (define (runpaths-of-input label) (copy-recursively (in-vicinity #$assets "fontconfig") (in-vicinity lib "fontconfig")) (substitute* (in-vicinity lib "fontconfig/fonts.conf") - (("fonts") + (("fonts") (format #f "~a" (in-vicinity lib "fonts")))) (delete-file-recursively (in-vicinity lib "fonts")) (copy-recursively (in-vicinity #$assets "fonts") @@ -805,11 +788,7 @@ (define (runpaths-of-input label) "https://gnuzilla.gnu.org/mozzarella") (format #t "pref(~s, ~s);~%" "lightweightThemes.getMoreURL" - "https://gnuzilla.gnu.org/mozzarella") - ;; FIXME: https://github.com/NixOS/nixpkgs/issues/307095 - (format #t "pref(~s, ~a);~%" - "widget.use-xdg-desktop-portal.file-picker" - "1")))))) + "https://gnuzilla.gnu.org/mozzarella")))))) (add-after 'autoconfig 'autoconfig-tor (lambda* (#:key inputs #:allow-other-keys) (let ((lib (in-vicinity #$output "lib/torbrowser")) -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v5 4/4] gnu: mullvadbrowser: Update to 13.5.3 [security fixes]. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Sep 2024 23:20:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71782@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista , mhw@netris.org, jonathan.brielmaier@web.de, ian@retrospec.tv Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17255783899991 (code B ref 71782); Thu, 05 Sep 2024 23:20:03 +0000 Received: (at 71782) by debbugs.gnu.org; 5 Sep 2024 23:19:49 +0000 Received: from localhost ([127.0.0.1]:38512 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLlU-0002b4-BA for submit@debbugs.gnu.org; Thu, 05 Sep 2024 19:19:49 -0400 Received: from mx1.riseup.net ([198.252.153.129]:52436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smLlR-0002an-QO for 71782@debbugs.gnu.org; Thu, 05 Sep 2024 19:19:47 -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 4X0FfL47p6zDqM3; Thu, 5 Sep 2024 23:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1725578314; bh=zQCbnEiNy8WPNt3eSU/Ktoo3EN5SRpRp9s4NgK+2mf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q5QHMPqoy0Ngp6Ffz+qApdcpIHn9cifuKkVLlq6KQSUyPTWM15jW6hR2f48jx5AnL 7TzJmk9Gpt7tJFER+Tp338sTX4rPeDj7kyzmCvXP0e5Ial6Bg3djOr4sKGgiqxcySn +LMMKxrllk+z2lZEbdDLEnoi2XCSvK1SnCvQK9P4= X-Riseup-User-ID: 3F21796685F4296C0D6DF8172F6A69A9B1985D010AF10D91AAB22F6BB7B7A31C Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4X0FfK1N9TzFwYr; Thu, 5 Sep 2024 23:18:33 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Thu, 5 Sep 2024 20:18:25 -0300 Message-ID: <20240905231825.5970-1-nandre@riseup.net> In-Reply-To: <20240905230801.5772-1-nandre@riseup.net> References: <20240905230801.5772-1-nandre@riseup.net> MIME-Version: 1.0 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 CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604, 2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526, 2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and 2024-8384. See the Mozilla Foundation Security advisories , and for details. * gnu/packages/mullvad-browsers.scm (mozilla-locale): Remove it. (mozilla-locales): Likewise. (firefox-locales): Move to the top. (%mullvadbrowser-locales): Change it to be a plain list of supported locales. (%mullvadbrowser-build-date): Update to 20240903073000. (%mullvadbrowser-version): Update to 13.5.3. (%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2. (mullvadbrowser-translation-base): Update to daed2afc487d1b20efc17feb153156524c6f714b. (mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales replacement accordingly. Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf --- gnu/packages/tor-browsers.scm | 98 +++++++++++------------------------ 1 file changed, 30 insertions(+), 68 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 180dae6317..7f601737b1 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -90,39 +90,6 @@ (define-module (gnu packages tor-browsers) #:use-module (ice-9 regex) #:use-module (guix utils)) -(define (mozilla-locale locale changeset hash-string) - (origin - (method hg-fetch) - (uri (hg-reference - (url (string-append "https://hg.mozilla.org/l10n-central/" - locale)) - (changeset changeset))) - (file-name (string-append "mozilla-locale-" locale)) - (sha256 (base32 hash-string)))) - -(define-syntax-rule (mozilla-locales (hash-string changeset locale) ...) - #~(list (cons #$locale #$(mozilla-locale locale changeset hash-string)) - ...)) - -;; We copy the official build id, which is defined at -;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20240903073000") - -;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.5.3") - -;; To find the last Firefox version, browse -;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> -;; There should be only one archive that starts with -;; "src-firefox-tor-browser-". -(define %torbrowser-firefox-version "115.15.0esr-13.5-1-build3") - -;; See tor-browser-build/rbm.conf for the list. -(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" - "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" - "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" - "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) - ;; See browser/locales/l10n-changesets.json for the commit. (define firefox-locales (let ((commit "d8d587117c7b9dcc6a4fbc38407ed2c831bb008f") @@ -147,6 +114,25 @@ (define firefox-locales Firefox locales.") (license license:mpl2.0)))) +;; We copy the official build id, which is defined at +;; tor-browser-build/rbm.conf (browser_release_date). +(define %torbrowser-build-date "20240903073000") + +;; To find the last version, look at https://www.torproject.org/download/. +(define %torbrowser-version "13.5.3") + +;; To find the last Firefox version, browse +;; https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrowser-version> +;; There should be only one archive that starts with +;; "src-firefox-tor-browser-". +(define %torbrowser-firefox-version "115.15.0esr-13.5-1-build3") + +;; See tor-browser-build/rbm.conf for the list. +(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" + "ga-IE" "he" "hu" "id" "is" "it" "ja" "ka" "ko" "lt" + "mk" "ms" "my" "nb-NO" "nl" "pl" "pt-BR" "ro" "ru" + "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) + ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base (origin @@ -832,47 +818,23 @@ (define-public torbrowser ;; See tor-browser-build/rbm.conf for the list. -;; See browser/locales/l10n-changesets.json for the changeset. -;; See update-mozilla-locales in gnuzilla.scm to automate updating changeset. -(define %mullvadbrowser-locales - (mozilla-locales - ;; sha256 changeset locale - ;;--------------------------------------------------------------------------- - ("1218mldjxybhgzdi0myzkwjr2fgnysl71pl847kr7wyn1j8wk3a5" "c25d00080479" "ar") - ("1kzx94n36c5vv954j7w65djvb37c178zazy25b35l71q2rvhmlhj" "2197a99c9a08" "da") - ("13h7hk11bbd0yq8gqdv7ndbizkgwlm3ybz225l3x2b5cnyjxyg14" "b7a533e5edc9" "de") - ("0mdr5b6pqxjmg9c8064x3hpf53h6w9j8ghl32655sx9jh4v3ykza" "beff1baac7c5" "es-ES") - ("1pnyg09j6r15w8m62lwj89x6rz4br877z60p8s1hlrb9hj2s3vdx" "ebe0b60b0b36" "fa") - ("067r505626cvlrsalnndf2ykz3nnkiy0b8yaxzf1rracpzmp0hni" "d5ae6a933d71" "fi") - ("0026zzjv2bqc8sg06yvyd0mhny6mwwvhpvzjrhv2fi5v4wkxapdj" "496c2eb73b82" "fr") - ("03fbp4vgkwyimfmbm4n8blx1m16yhms2wm8j4wlx2h3cpxp5r71k" "91951e37e2b8" "it") - ("0ncm531d7ih7phcn9d83zwq0dfphvmzg3gmhqmrrkkbydi1g3pbb" "895dcf8bb524" "ja") - ("14rc9mr4ngxdzwpjagzhz47jazgp1a6vwb0vbwj31yxv9iwkrgzi" "6ef881aff44b" "ko") - ("0h7dlnawm5mbcx4qdlz5c7n4axz2dpa677v13ljdgm2b5w76msmq" "5c1480ccc040" "my") - ("1b12azc1n8j1i2l20v66r74q79zqjvc5sf9pd8rmj3xd0fkxzdp2" "fc1896a0a24d" "nb-NO") - ("1fh4dhlb6hynlpb2997gssv9v8zk5b7qrw0sclggczb5pcpjk6wc" "7e6da4f01bdb" "nl") - ("1w8x3jjrd28f6g6ywwxldizpiipfkr63dzqd74kjpg24s2lqzp80" "e86a451a9cb5" "pl") - ("1v3v4n82sn7a4h2d9n653fmgc31mikacf59lvdj6gbwvzpjb5yfa" "94c3dbb67a5d" "pt-BR") - ("1fxgh7nfxpg2zknvfff8igq9q1vm5n4q033v7lm2c0xn3dbl8m28" "402b2ecbf04d" "ru") - ("1nllh3ax323sxwhj7xvwvbfnh4179332pcmpfyybw1vaid3nr39k" "bb2d5d96d69e" "sv-SE") - ("136m68fd0641k3qqmsw6zp016cvvd0sipsyv6rx2b9nli56agz57" "0e6c56bf2ac9" "th") - ("0q8p8bwq8an65yfdwzm4dhl6km68r83bv5i17kay2gak8msxxhsb" "91e611ae3f19" "tr") - ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h" "081aeb1aa308" "zh-CN") - ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr" "9015a180602e" "zh-TW"))) +(define %mullvadbrowser-locales (list "ar" "da" "de" "es-ES" "fa" "fi" "fr" "it" + "ja" "ko" "my" "nb-NO" "nl" "pl" "pt-BR" + "ru" "sv-SE" "th" "tr" "zh-CN" "zh-TW")) ;; We copy the official build id, which can be found there: ;; https://cdn.mullvad.net/browser/update_responses/update_1/release. -(define %mullvadbrowser-build-date "20240510190000") +(define %mullvadbrowser-build-date "20240903073000") ;; To find the last version, look at ;; https://mullvad.net/en/download/browser/linux. -(define %mullvadbrowser-version "13.0.16") +(define %mullvadbrowser-version "13.5.3") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/mullvadbrowser/<%mullvadbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-mullvad-browser-". -(define %mullvadbrowser-firefox-version "115.12.0esr-13.0-1-build1") +(define %mullvadbrowser-firefox-version "115.15.0esr-13.5-1-build2") ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-base @@ -880,11 +842,11 @@ (define mullvadbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) + (commit "daed2afc487d1b20efc17feb153156524c6f714b"))) (file-name "translation-base-browser") (sha256 (base32 - "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) + "0psmmgw9dnjwdhjbqkd69q5q7sdwyjcwagh93ffrjk0v7ybc79dq")))) ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-specific @@ -912,7 +874,7 @@ (define mullvadbrowser-assets version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1bpchiz12zjyrzpgyk71naf1jdf3msjcjwggb1mziyawc6pyxj7v")))) + "17sqin4fnvq96plarv0iv8r801i19gh7v7szg2vrmcynay8qx4mc")))) (arguments (list #:install-plan @@ -955,7 +917,7 @@ (define-public mullvadbrowser %mullvadbrowser-firefox-version ".tar.xz")) (sha256 (base32 - "1xs4qwa3c6nfq6cj5q6asfrzki4brafg65g6hbn0fc9qqcmrhkv5")))) + "1c6jjw0x8bjz74q15a7vskrd0ji5ic19mzr9f2laivhznjy0r12c")))) (arguments (substitute-keyword-arguments (package-arguments mullvadbrowser-base) ((#:phases phases) @@ -977,7 +939,7 @@ (define-public mullvadbrowser (system (format #f "cp -Lr ~a/~a .mozbuild/l10n-central/" #$mullvadbrowser-translation-specific lang))) - (map car #$%mullvadbrowser-locales)))) + (list #$@%mullvadbrowser-locales)))) (add-before 'build 'fix-profiles ;; Otherwise the profile would change every time the install ;; location changes, that is: at every package update. These -- 2.45.2 From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v5 3/4] gnu: torbrowser: Update to 13.5.3 [security fixes]. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: =?UTF-8?Q?Andr=C3=A9?= Batista Cc: mhw@netris.org, jonathan.brielmaier@web.de, 71782@debbugs.gnu.org Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172563555620532 (code B ref 71782); Fri, 06 Sep 2024 15:13:01 +0000 Received: (at 71782) by debbugs.gnu.org; 6 Sep 2024 15:12:36 +0000 Received: from localhost ([127.0.0.1]:53845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smadX-0005L4-8J for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:12:36 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:34795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smadT-0005Ki-9p for 71782@debbugs.gnu.org; Fri, 06 Sep 2024 11:12:34 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id CA4DB1140113; Fri, 6 Sep 2024 11:12:25 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Fri, 06 Sep 2024 11:12:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1725635545; x=1725721945; bh=CmCrJ3Zv11+ADDTp3NEmkecUYPRjTRVmP60Oz/1biGQ=; b= dCXWngEqTb6Vezo8mrtB5bV8KsBW2qy3PNgFC6EGqZiY9wkyYTMzq4ptgaCYd4VZ RnzM0pl6nj/pbXC2B3Q7WJAHx+utbyQG+SCKWUE0PuUVDcZcFphnkAwrYQx4PVjE 6493dxLJscyY5ItITushxf5z/Z3EEYchpSVg6mfQHvjBlUvuofrd9P8PpGtnxv1e To6ypCbWjG+lnVeFOTtGbl6fu+gsbUPYGspIZUpellVDPLmfYnRHdJxtG7g2qZZM 4zLLU6YFMkibw/YjRyr4KS8uKJm7/s0epDqoXzTf45sF52YS8H3mS9u/X57Ma5Qe BHPyEmcXAVsjYfYTFVeAUg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725635545; x= 1725721945; bh=CmCrJ3Zv11+ADDTp3NEmkecUYPRjTRVmP60Oz/1biGQ=; b=L ThD9IIqz72Wp5Yd27UdEcgNb9y0O7swkHE42kHyuMI8Yzr3cAK14Yg0FUFcPBG6U FtarieId+4/rxgd1hainYlZfcxOxtYufD30AOmDziOumOz4y4b8GhqUJTQPkaZDr nlsrDKHEhjEngITQuq05X4bRwZu4MbG5Bmudqup7BzX6wKqh7y0tFD0sShN+untb VymmUPPPPoKtTcGkjzNO3N37JlMABx+wMOVDrwE/nDTK44zOU2kUfNOF7beoVCIW 1LQkhkxi3b4zZSj+M3/M/xXdlbZ3CTx7Q5SC2oxHxAvMl2rjaHciU/nfMBtAl9vU +pt0TJHdnhITeT2Wd+v+w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeiuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepfhgfhffvvefuffgjkfggtgfgsehtqhertddtreej necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnhepvefgiedtffelgeeuvdeifeetveeuieejjedvveehfedtffet jefhkedvveelgeegnecuffhomhgrihhnpehmohiiihhllhgrrdhorhhgpdhtohhrphhroh hjvggtthdrohhrghdpghhithhhuhgsrdgtohhmpdhgnhhurdhorhhgnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsph gvtgdrthhvpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphht thhopehmhhifsehnvghtrhhishdrohhrghdprhgtphhtthhopehjohhnrghthhgrnhdrsg hrihgvlhhmrghivghrseifvggsrdguvgdprhgtphhtthhopeejudejkedvseguvggssghu ghhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhgrnhgurhgvsehrihhsvghuphdrnhgvth X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 6 Sep 2024 11:12:24 -0400 (EDT) References: <20240905230801.5772-1-nandre@riseup.net> <20240905231807.5950-1-nandre@riseup.net> User-agent: mu4e 1.8.13; emacs 28.2 From: Ian Eure Date: Fri, 06 Sep 2024 08:05:28 -0700 In-reply-to: <20240905231807.5950-1-nandre@riseup.net> Message-ID: <878qw424vb.fsf@meson> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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 (-) Hi Andr=C3=A9, This all looks good to me. I built and ran both browsers and they=20 seem to be working how I=E2=80=99d expect. My only question is around the locale handling -- (gnu packages=20 gnuzilla) has a setup for these which I was able to reuse for=20 LibreWolf. Is that possible for mullvad and torbrowser? It would=20 be nice to have a unified way of handling this, instead of each=20 browser implementing its own strategy. That work can follow the merge of this patch series, but I think=20 it=E2=80=99s worth discussing. Thanks, =E2=80=94 Ian Andr=C3=A9 Batista writes: > Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603,=20 > 2024-6604, > 2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525,=20 > 2024-7526, > 2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383=20 > and > 2024-8384. > > See the Mozilla Foundation Security advisories > , > =20 > and > > for details. > > * gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update=20 > to > 20240903073000. > (%torbrowser-version): Update to 13.5.3. > (%torbrowser-firefox-version): Update to=20 > 115.15.0esr-13.5-1-build3. > (%torbrowser-locales): Change it to be a plain list of supported=20 > locales. > (firefox-locales): New variable. > (torbrowser-translation-base): Update to > daed2afc487d1b20efc17feb153156524c6f714b. > (torbrowser-translation-specific): Update to > 6374e3b09c0894b8452fa1ba0b99c807722fc805. > (lld-as-ld-wrapper-16): New variable. > (make-torbrowser)[native-inputs]: Add lld-as-ld-wrapper-16. Use > llvm-16 and clang-16. > [inputs]: Add firefox-locales. > [arguments] <#:phases>: Remove add-bridges. > setenv, copy-firefox-locales: Update MOZ_CHROME_MULTILOCALE=20 > to the > new %torbrowser-locales format. > copy-basebrowser-locales, copy-torbrowser-locales: Likewise=20 > and adjust > fluent file path. > deploy-fonts: Adjust regex expression. > autoconfig: Remove file-picker configuration workaround. See=20 > #71181. > > Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300 > --- > gnu/packages/tor-browsers.scm | 141=20 > +++++++++++++++------------------- > 1 file changed, 60 insertions(+), 81 deletions(-) > > diff --git a/gnu/packages/tor-browsers.scm=20 > b/gnu/packages/tor-browsers.scm > index ba6bbaa873..180dae6317 100644 > --- a/gnu/packages/tor-browsers.scm > +++ b/gnu/packages/tor-browsers.scm > @@ -21,7 +21,7 @@ > ;;; Copyright =C2=A9 2021 Baptiste Strazzul > ;;; Copyright =C2=A9 2022 SeerLite > ;;; Copyright =C2=A9 2024 Aleksandr Vityazev > -;;; Copyright =C2=A9 2020, 2021 Andr=C3=A9 Batista > +;;; Copyright =C2=A9 2020, 2021, 2024 Andr=C3=A9 Batista=20 > > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -104,63 +104,48 @@ (define-syntax-rule (mozilla-locales=20 > (hash-string changeset locale) ...) > #~(list (cons #$locale #$(mozilla-locale locale changeset=20 > hash-string)) > ...)) >=20=20 > -;; See tor-browser-build/rbm.conf for the list. > -;; See browser/locales/l10n-changesets.json for the changeset. > -;; See update-mozilla-locales in gnuzilla.scm to automate=20 > updating changeset. > -(define %torbrowser-locales > - (mozilla-locales > - ;; sha256=20 > changeset locale > -=20 > ;;-----------------------------------------------------------------------= ---- > - ("1218mldjxybhgzdi0myzkwjr2fgnysl71pl847kr7wyn1j8wk3a5"=20 > "c25d00080479" "ar") > - ("11c96jhfzd3h46qhblhvn2acsn895ykynarai8r5pf0655nfjs0j"=20 > "2de60e3d6d0c" "ca") > - ("0yhycgb3s3kydbzy6f2q7f7g2lp975spr092prf9xp8ha62ghby7"=20 > "609edd15f9a9" "cs") > - ("1kzx94n36c5vv954j7w65djvb37c178zazy25b35l71q2rvhmlhj"=20 > "2197a99c9a08" "da") > - ("13h7hk11bbd0yq8gqdv7ndbizkgwlm3ybz225l3x2b5cnyjxyg14"=20 > "b7a533e5edc9" "de") > - ("13ay27vdrqfv2ysyi7c2jmz50lps7rff9rmnws1z7jkj0a5chwrn"=20 > "20baf15379d8" "el") > - ("0mdr5b6pqxjmg9c8064x3hpf53h6w9j8ghl32655sx9jh4v3ykza"=20 > "beff1baac7c5" "es-ES") > - ("1pnyg09j6r15w8m62lwj89x6rz4br877z60p8s1hlrb9hj2s3vdx"=20 > "ebe0b60b0b36" "fa") > - ("067r505626cvlrsalnndf2ykz3nnkiy0b8yaxzf1rracpzmp0hni"=20 > "d5ae6a933d71" "fi") > - ("0026zzjv2bqc8sg06yvyd0mhny6mwwvhpvzjrhv2fi5v4wkxapdj"=20 > "496c2eb73b82" "fr") > - ("1dxcp26y8siap4k54zsw7mqa7k0l4f1505rdf4hnnxrzf9a643g5"=20 > "2fcccb5b19b3" "ga-IE") > - ("14v6xnlyj65hzaz2rmzxcl4skjgm48426jgr9mwkwiqis587lp4a"=20 > "c53cea027f8f" "he") > - ("04fdw2gzb64fb51bvs0bwsidzlvkdahmcy76vdg3gfcxslnlpi3y"=20 > "5a76dd3b5d5c" "hu") > - ("0bpyxpclfy74bcsjrs1ajh2am4zv6j6j9q4gc4vz8pgvzy9354zp"=20 > "6e6de17dcac4" "id") > - ("131ph8n235kr6nj1pszk0m00nh6kl360r4qvx4hjm8s22mw0k8qd"=20 > "536265635dfe" "is") > - ("03fbp4vgkwyimfmbm4n8blx1m16yhms2wm8j4wlx2h3cpxp5r71k"=20 > "91951e37e2b8" "it") > - ("0ncm531d7ih7phcn9d83zwq0dfphvmzg3gmhqmrrkkbydi1g3pbb"=20 > "895dcf8bb524" "ja") > - ("1x3110v730ak522zfm8j3r3v1x5lq3ig82kcgyxkc49xywajy0ni"=20 > "d0819a64fc40" "ka") > - ("14rc9mr4ngxdzwpjagzhz47jazgp1a6vwb0vbwj31yxv9iwkrgzi"=20 > "6ef881aff44b" "ko") > - ("1gl85z550amhbaxp39zdj6yyvashj9xd4ampfhm9jdpbf6n5j2l8"=20 > "afcbc29a15e5" "lt") > - ("1hz5g3iprfkbd88ncppyksbhlws73lhs75nf62hangw8l73wdn69"=20 > "84f3d6c7e2da" "mk") > - ("14aq37ngnav5m2kcb4wavxwhp28ad4jzdkzc7i64h0qvvxq5n3hf"=20 > "c9ec27a5db3d" "ms") > - ("0h7dlnawm5mbcx4qdlz5c7n4axz2dpa677v13ljdgm2b5w76msmq"=20 > "5c1480ccc040" "my") > - ("1b12azc1n8j1i2l20v66r74q79zqjvc5sf9pd8rmj3xd0fkxzdp2"=20 > "fc1896a0a24d" "nb-NO") > - ("1fh4dhlb6hynlpb2997gssv9v8zk5b7qrw0sclggczb5pcpjk6wc"=20 > "7e6da4f01bdb" "nl") > - ("1w8x3jjrd28f6g6ywwxldizpiipfkr63dzqd74kjpg24s2lqzp80"=20 > "e86a451a9cb5" "pl") > - ("1v3v4n82sn7a4h2d9n653fmgc31mikacf59lvdj6gbwvzpjb5yfa"=20 > "94c3dbb67a5d" "pt-BR") > - ("061a4z0lffgks3wlr6yh5z7x9arcn804mjwvffcmibs106vzamyq"=20 > "470b13b5805b" "ro") > - ("1fxgh7nfxpg2zknvfff8igq9q1vm5n4q033v7lm2c0xn3dbl8m28"=20 > "402b2ecbf04d" "ru") > - ("1i119g6dnhzxmpaz5r2jr9yzm1v24v2q6m3z6bfz2yihj0w7m133"=20 > "f637484e72b6" "sq") > - ("1nllh3ax323sxwhj7xvwvbfnh4179332pcmpfyybw1vaid3nr39k"=20 > "bb2d5d96d69e" "sv-SE") > - ("136m68fd0641k3qqmsw6zp016cvvd0sipsyv6rx2b9nli56agz57"=20 > "0e6c56bf2ac9" "th") > - ("0q8p8bwq8an65yfdwzm4dhl6km68r83bv5i17kay2gak8msxxhsb"=20 > "91e611ae3f19" "tr") > - ("1f2g7rnxpr2gjzngfsv19g11vk9zqpyrv01pz07mw2z3ffbkxf0j"=20 > "99d5ffa0b81e" "uk") > - ("1rizwsfgr7vxm31bin3i7bwhcqa67wcylak3xa387dvgf1y9057i"=20 > "5fd44724e22d" "vi") > - ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h"=20 > "081aeb1aa308" "zh-CN") > - ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr"=20 > "9015a180602e" "zh-TW"))) > - > ;; We copy the official build id, which is defined at > ;; tor-browser-build/rbm.conf (browser_release_date). > -(define %torbrowser-build-date "20240510190000") > +(define %torbrowser-build-date "20240903073000") >=20=20 > ;; To find the last version, look at=20 > https://www.torproject.org/download/. > -(define %torbrowser-version "13.0.16") > +(define %torbrowser-version "13.5.3") >=20=20 > ;; To find the last Firefox version, browse > ;;=20 > https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrows= er-version> > ;; There should be only one archive that starts with > ;; "src-firefox-tor-browser-". > -(define %torbrowser-firefox-version=20 > "115.12.0esr-13.0-1-build1") > +(define %torbrowser-firefox-version=20 > "115.15.0esr-13.5-1-build3") > + > +;; See tor-browser-build/rbm.conf for the list. > +(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el"=20 > "es-ES" "fa" "fi" "fr" > + "ga-IE" "he" "hu" "id" "is"=20 > "it" "ja" "ka" "ko" "lt" > + "mk" "ms" "my" "nb-NO" "nl"=20 > "pl" "pt-BR" "ro" "ru" > + "sq" "sv-SE" "th" "tr" "uk"=20 > "vi" "zh-CN" "zh-TW")) > + > +;; See browser/locales/l10n-changesets.json for the commit. > +(define firefox-locales > + (let ((commit "d8d587117c7b9dcc6a4fbc38407ed2c831bb008f") > + (revision "0")) > + (package > + (name "firefox-locales") > + (version (git-version "0.0.0" revision commit)) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url=20 > "https://github.com/mozilla-l10n/firefox-l10n") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > +=20 > "0a2ly29lli02jflqw78zjk7bp7h18fz935cc9csavi0cpdiixjv1")))) > + (build-system copy-build-system) > + (home-page=20 > "https://github.com/mozilla-l10n/firefox-l10n") > + (synopsis "Firefox Locales") > + (description "This package contains localized messages=20 > for all > +Firefox locales.") > + (license license:mpl2.0)))) >=20=20 > ;; See tor-browser-build/projects/translation/config. > (define torbrowser-translation-base > @@ -168,11 +153,11 @@ (define torbrowser-translation-base > (method git-fetch) > (uri (git-reference > (url=20 > "https://gitlab.torproject.org/tpo/translation.git") > - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) > + (commit "daed2afc487d1b20efc17feb153156524c6f714b"))) > (file-name "translation-base-browser") > (sha256 > (base32 > -=20 > "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) > +=20 > "0psmmgw9dnjwdhjbqkd69q5q7sdwyjcwagh93ffrjk0v7ybc79dq")))) >=20=20 > ;; See tor-browser-build/projects/translation/config. > (define torbrowser-translation-specific > @@ -180,11 +165,11 @@ (define torbrowser-translation-specific > (method git-fetch) > (uri (git-reference > (url=20 > "https://gitlab.torproject.org/tpo/translation.git") > - (commit "b5d79336411e5a59c4861341ef9aa7353e0bcad9"))) > + (commit "6374e3b09c0894b8452fa1ba0b99c807722fc805"))) > (file-name "translation-tor-browser") > (sha256 > (base32 > -=20 > "0ahz69pxhgik7ynmdkbnx7v5l2v392i6dswjz057g4hwnd7d34fb")))) > +=20 > "1wd9iwcj2h70bp017pcdhgfiw2bs8zi68kljmpnk69pssd6cn8l3")))) >=20=20 > (define torbrowser-assets > ;; This is a prebuilt Torbrowser from which we take the=20 > assets we need. > @@ -200,7 +185,7 @@ (define torbrowser-assets > version "/tor-browser-linux-x86_64-" version=20 > ".tar.xz")) > (sha256 > (base32 > -=20 > "1kffam66bsaahzx212hw9lb03jwfr24hivzg067iyzilsldpc9c1")))) > +=20 > "0laz6yrm310iidddnas2w1s5wad183n9axjkgrf5cm5paj615343")))) > (arguments > (list > #:install-plan > @@ -215,6 +200,10 @@ (define torbrowser-assets > Browser.") > (license license:silofl1.1))) >=20=20 > +;;; A LLD wrapper that can be used as a (near) drop-in=20 > replacement to GNU ld. > +(define lld-as-ld-wrapper-16 > + (make-lld-wrapper lld-16 #:lld-as-ld? #t)) > + > (define* (make-torbrowser #:key > moz-app-name > moz-app-remotingname > @@ -238,10 +227,11 @@ (define* (make-torbrowser #:key > ".tar.xz")) > (sha256 > (base32 > -=20 > "1b70zyjyai6kk4y1kkl8jvrs56gg7z31kkad6bmdpd8jw4n71grx")))) > +=20 > "13b9ni6anv279drhbb5m95nnmgslrp6frsm0y4028nfqiprs7vj5")))) > (build-system mozilla-build-system) > (inputs > (list=20 > go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-l= yrebird > + firefox-locales > tor-client > alsa-lib > bash-minimal ;for wrap-program > @@ -293,8 +283,9 @@ (define* (make-torbrowser #:key > rust > `(,rust "cargo") > rust-cbindgen > - llvm-15 > - clang-15 > + lld-as-ld-wrapper-16 ; for cargo rustc > + llvm-16 > + clang-16 > perl > node-lts > python-wrapper > @@ -541,7 +532,7 @@ (define (runpaths-of-input label) > (setenv "MOZBUILD_STATE_PATH" > (in-vicinity (getcwd) ".mozbuild")) > (setenv "MOZ_CHROME_MULTILOCALE" > - (string-join (map car #$locales))) > + (string-join (list #$@locales))) > ;; Make build reproducible. > (setenv "MOZ_BUILD_DATE" #$build-date))) > (add-before 'configure 'mozconfig > @@ -555,14 +546,14 @@ (define (runpaths-of-input label) > ;; See tor-browser-build/projects/firefox/build. > (add-before 'configure 'copy-firefox-locales > (lambda _ > - (let ((l10ncentral ".mozbuild/l10n-central")) > + (let ((l10ncentral ".mozbuild/l10n-central") > + (ff-locales #$(this-package-input=20 > "firefox-locales"))) > (mkdir-p l10ncentral) > (for-each > (lambda (lang) > - (copy-recursively (cdr lang) > - (in-vicinity l10ncentral > - (car lang)))) > - #$locales)))) > + (copy-recursively (string-append ff-locales=20 > "/" lang) > + (in-vicinity l10ncentral=20 > lang))) > + (list #$@locales))))) > (add-after 'copy-firefox-locales=20 > 'copy-basebrowser-locales > (lambda _ > (let ((l10ncentral ".mozbuild/l10n-central")) > @@ -577,7 +568,7 @@ (define (runpaths-of-input label) > #f (string-join > '("mv" > "translation-base-browser/~a/base-browser.ftl" > - "~a/~a/browser/browser/")) > + "~a/~a/toolkit/toolkit/global/")) > lang l10ncentral lang)) > (system > (format > @@ -586,7 +577,7 @@ (define (runpaths-of-input label) > "translation-base-browser/~a/*" > "~a/~a/browser/chrome/browser/")) > lang l10ncentral lang))) > - (map car #$locales))))) > + (list #$@locales))))) > (add-after 'copy-basebrowser-locales=20 > 'copy-torbrowser-locales > (lambda _ > (let ((l10ncentral ".mozbuild/l10n-central")) > @@ -601,7 +592,7 @@ (define (runpaths-of-input label) > #f (string-join > '("mv" > "translation-tor-browser/~a/tor-browser.ftl" > - "~a/~a/browser/browser/")) > + "~a/~a/toolkit/toolkit/global/")) > lang l10ncentral lang)) > (system > (format > @@ -623,7 +614,7 @@ (define (runpaths-of-input label) > (format port " locale/~a/=20 > (chrome/locale/~a/*)~%" > lang lang) > (close port))) > - (map car #$locales))))) > + (list #$@locales))))) > (replace 'configure > (lambda _ > (invoke "./mach" "configure"))) > @@ -632,14 +623,6 @@ (define (runpaths-of-input label) > (substitute* > "toolkit/locales/en-US/toolkit/about/aboutAddons.ftl" > (("addons.mozilla.org") "gnuzilla.gnu.org")))) > - (add-before 'build 'add-bridges ;see deploy.sh > - (lambda _ > - (let ((port (open-file > -=20 > "browser/app/profile/000-tor-browser.js" "a"))) > - (display > - "#include=20 > ../../../tools/torbrowser/bridges.js" port) > - (newline port) > - (close port)))) > (replace 'build > (lambda* (#:key (make-flags '()) (parallel-build?=20 > #t) > #:allow-other-keys) > @@ -739,7 +722,7 @@ (define (runpaths-of-input label) > (copy-recursively (in-vicinity #$assets=20 > "fontconfig") > (in-vicinity lib=20 > "fontconfig")) > (substitute* (in-vicinity lib=20 > "fontconfig/fonts.conf") > - (("fonts") > + (("fonts") > (format #f "~a" (in-vicinity lib=20 > "fonts")))) > (delete-file-recursively (in-vicinity lib=20 > "fonts")) > (copy-recursively (in-vicinity #$assets=20 > "fonts") > @@ -805,11 +788,7 @@ (define (runpaths-of-input label) > "https://gnuzilla.gnu.org/mozzarella") > (format #t "pref(~s, ~s);~%" > "lightweightThemes.getMoreURL" > -=20 > "https://gnuzilla.gnu.org/mozzarella") > - ;; FIXME:=20 > https://github.com/NixOS/nixpkgs/issues/307095 > - (format #t "pref(~s, ~a);~%" > -=20 > "widget.use-xdg-desktop-portal.file-picker" > - "1")))))) > +=20 > "https://gnuzilla.gnu.org/mozzarella")))))) > (add-after 'autoconfig 'autoconfig-tor > (lambda* (#:key inputs #:allow-other-keys) > (let ((lib (in-vicinity #$output=20 > "lib/torbrowser")) From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v5 3/4] gnu: torbrowser: Update to 13.5.3 [security fixes]. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Sep 2024 15:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ian Eure Cc: mhw@netris.org, jonathan.brielmaier@web.de, 71782@debbugs.gnu.org Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172572340113174 (code B ref 71782); Sat, 07 Sep 2024 15:37:02 +0000 Received: (at 71782) by debbugs.gnu.org; 7 Sep 2024 15:36:41 +0000 Received: from localhost ([127.0.0.1]:57238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smxUP-0003QQ-6N for submit@debbugs.gnu.org; Sat, 07 Sep 2024 11:36:41 -0400 Received: from mx1.riseup.net ([198.252.153.129]:41892) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smxUM-0003QC-Bm for 71782@debbugs.gnu.org; Sat, 07 Sep 2024 11:36:40 -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 4X1HJH0tYBzDqLh; Sat, 7 Sep 2024 15:36:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1725723391; bh=b7UEURLwu76WkRA7ZaDLRuhvEv3JvRMDcwMr2X54wtA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=qU+3G3WhJ+h+572lWwXrVGpyIPKlkZ/+r0tKx07/uUr3WRpI4gJol0EkoTJyXMVTA 9l2YfGJ1Q716XK64O0IF3t0cgPkwD0d83PpTkL1Ol6Yn842Tyu82+4i6VSC+V+xVWi 7LHbIicVRTbD/QcvAzqfn7UpoxOgw8zRUYlLCztY= X-Riseup-User-ID: C6C77B5056FC4A3EAFE65A5F29FA78B39C9EF947C7DFAC15B81E2BCAE41B582D Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4X1HJF59DHzFsDL; Sat, 7 Sep 2024 15:36:29 +0000 (UTC) Date: Sat, 7 Sep 2024 12:36:21 -0300 From: =?UTF-8?Q?Andr=C3=A9?= Batista Message-ID: References: <20240905230801.5772-1-nandre@riseup.net> <20240905231807.5950-1-nandre@riseup.net> <878qw424vb.fsf@meson> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <878qw424vb.fsf@meson> 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 (-) Hi Ian, sex 06 set 2024 às 08:05:28 (1725620728), ian@retrospec.tv enviou: > > This all looks good to me. I built and ran both browsers and they seem to > be working how I’d expect. Great, thanks! > My only question is around the locale handling -- (gnu packages gnuzilla) > has a setup for these which I was able to reuse for LibreWolf. Is that > possible for mullvad and torbrowser? It would be nice to have a unified way > of handling this, instead of each browser implementing its own strategy. > I'm not sure I understand why you think this to be desirable, could you elaborate? I'm also not sure if this is possible (without incuring in glitches) and in my opinion this is not desirable for both torbrowser and mullvad because: I. Both these browsers have modified pristine firefox in a number of non-trivial ways. Eg.: if you go to about:preferences you will see that there are various user settings which are specific to this browsers or even when you first launch torbrowser the connection settings page is unknown to firefox. I believe that's the reason why these browsers do not support 'all-mozilla-locales', but just a subset which has been worked upon by the torproject. II. In order to avoid guix users having a different fingerprint, we try to be as close as possible to what upstream does. I'm not sure if locale version could be somehow infered from the network, but I guess using the same version is the safest bet; III. Currently on guix master, these browsers are using code copied from gnuzilla.scm, but with a subset of locales and different changesets that are based on torproject settings. However, torproject has moved from mercurial to the unified github firefox locales[1] which has immensily simplified the work required to update the changesets (now actually commits) and all locales supported on those browsers now have only one commit, instead of various changesets on single locale repos; IV. Moreover, I believe mozilla itself is on the way of deprecating mercurial l10n-central in favor of firefox-locales git repo, since this is where all work has been happening[2], while l10n-central has stopped at 2024-07-10[2]. So probably in a not so distant future gnuzilla will have to move on to that as well. So I stand by the changes proposed on this patch series, at least as things stand. Thanks! 1. https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/55ad6ca216c086fb297af456ed0606ab88c1acdc 2. https://github.com/mozilla-l10n/firefox-l10n 3. https://hg.mozilla.org/l10n-central/ From unknown Mon Jun 23 06:03:24 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v5 3/4] gnu: torbrowser: Update to 13.5.3 [security fixes]. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 04:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71782 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: =?UTF-8?Q?Andr=C3=A9?= Batista Cc: mhw@netris.org, jonathan.brielmaier@web.de, 71782@debbugs.gnu.org Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.17257682911979 (code B ref 71782); Sun, 08 Sep 2024 04:05:01 +0000 Received: (at 71782) by debbugs.gnu.org; 8 Sep 2024 04:04:51 +0000 Received: from localhost ([127.0.0.1]:57845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sn9AQ-0000Vo-NP for submit@debbugs.gnu.org; Sun, 08 Sep 2024 00:04:51 -0400 Received: from fout2-smtp.messagingengine.com ([103.168.172.145]:58051) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sn9AO-0000Va-0G for 71782@debbugs.gnu.org; Sun, 08 Sep 2024 00:04:49 -0400 Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfout.phl.internal (Postfix) with ESMTP id BA6AB138027B; Sun, 8 Sep 2024 00:04:40 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Sun, 08 Sep 2024 00:04:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1725768280; x=1725854680; bh=nx0Gd4NN8Lu/vqAm1tTiKQ9zvCDYVkno0mkNAIlryD4=; b= mebTdRGw/fWwpYQz6S9psCfgwZr3EnvCOO3HQTJKWw1OVVvYpcUDbFpPoIe5Weeb hBPEGxprhQTXZC4LNZbySk9abwu1e/QmVHYyiX4a/3HcZp9Dx16SDhG5yPzcDPBU yjw3Msz1ftkrk8n2Qxnv0yob+Tf6d8nifvZ+76YuL7l2cQRL4EUR1MW/K6HRGAFj TZcLsifWVNcr+n83eMP9rKw/G6sZaZ5X+9k7R2CgUbOAQxPfmJs1r7lyWae4D2v4 2PFvsQRO6gEdYdQWKW6MwAhdP8UFr90q9Scia+bMQLcGfGOGnf2LvJfNIgb+vkf4 qh+WKExiZA7Z3i978d+cZA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725768280; x= 1725854680; bh=nx0Gd4NN8Lu/vqAm1tTiKQ9zvCDYVkno0mkNAIlryD4=; b=g hJ8FBKrlsIF1me0ZlhmgdmyWAnXeGEoAMFj0bRUiNGQENwsdmkDNc6AW/Tw0HIn5 DhlLaPMrcQy9wWZgdLyXfNygoip7faCM0pBCyTffQGwYXJT/D8qse/1SahL8s9KL uRhwPElBVLzK35LAPwvwxcZaDTLF7rPaFqK/Xzqwr2GgYCVaz3FrRi+uiQvLauKG TahfBiMHGjvFi3F5ubQKO/k10tMeQisnG+S0ezvSFiHux7duDiWmsYAyEf4CbqVy 26wEwQP2A4yC0miMCaYtu5U7JCMxIdY4h8ZvghzT1edeq+AJy6jjNspPzWMPKPyN KM/P6pC3dGoL3MXGVSxBw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeigedgkedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepfhgfhffvvefuffgjkfggtgfgsehtqhertddtreej necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnhephfelvedtieeffffggeeivdeukedutedtveejfffhleeileef heeggfdugfeiuefhnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepihgrnhesrhgvthhrohhsphgvtgdrthhvpdhnsggprhgtphhtthhopeegpdhm ohguvgepshhmthhpohhuthdprhgtphhtthhopehmhhifsehnvghtrhhishdrohhrghdprh gtphhtthhopehjohhnrghthhgrnhdrsghrihgvlhhmrghivghrseifvggsrdguvgdprhgt phhtthhopeejudejkedvseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepnh grnhgurhgvsehrihhsvghuphdrnhgvth X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 8 Sep 2024 00:04:39 -0400 (EDT) References: <20240905230801.5772-1-nandre@riseup.net> <20240905231807.5950-1-nandre@riseup.net> <878qw424vb.fsf@meson> User-agent: mu4e 1.8.13; emacs 28.2 From: Ian Eure Date: Sat, 07 Sep 2024 20:54:39 -0700 In-reply-to: Message-ID: <8734maeqp5.fsf@retrospec.tv> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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 (-) Hi Andr=C3=A9, Andr=C3=A9 Batista writes: > Hi Ian, > > sex 06 set 2024 =C3=A0s 08:05:28 (1725620728), ian@retrospec.tv=20 > enviou: >>=20 >> This all looks good to me. I built and ran both browsers and=20 >> they seem to >> be working how I=E2=80=99d expect. > > Great, thanks! > >> My only question is around the locale handling -- (gnu packages=20 >> gnuzilla) >> has a setup for these which I was able to reuse for LibreWolf.=20 >> Is that >> possible for mullvad and torbrowser? It would be nice to have=20 >> a unified way >> of handling this, instead of each browser implementing its own=20 >> strategy. >>=20 > > I'm not sure I understand why you think this to be desirable,=20 > could you > elaborate? > There=E2=80=99s a lot of duplication between the Firefox-derived browsers=20 in Guix, and I think it would be good to reduce it where it makes=20 sense. Because the locales are a separate package used as an=20 input, this seems like a part of them which could be handled in a=20 uniform way, to the benefit of all (assuming they use the same=20 locale data). > I'm also not sure if this is possible (without incuring in=20 > glitches) and > in my opinion this is not desirable for both torbrowser and=20 > mullvad > because: > > I. Both these browsers have modified pristine firefox in a=20 > number of > non-trivial ways. Eg.: if you go to about:preferences you will=20 > see that > there are various user settings which are specific to this=20 > browsers or > even when you first launch torbrowser the connection settings=20 > page is > unknown to firefox. I believe that's the reason why these=20 > browsers do > not support 'all-mozilla-locales', but just a subset which has=20 > been > worked upon by the torproject. > I see, now that I read the patch more closely, it looks like the=20 upstream locale data wasn=E2=80=99t being used, despite reusing the=20 `mozilla-locale' code from Gnuzilla. > II. In order to avoid guix users having a different fingerprint,=20 > we try > to be as close as possible to what upstream does. I'm not sure=20 > if locale > version could be somehow infered from the network, but I guess=20 > using the > same version is the safest bet; > > III. Currently on guix master, these browsers are using code=20 > copied from > gnuzilla.scm, but with a subset of locales and different=20 > changesets > that are based on torproject settings. However, torproject has=20 > moved > from mercurial to the unified github firefox locales[1] which=20 > has > immensily simplified the work required to update the changesets=20 > (now > actually commits) and all locales supported on those browsers=20 > now have > only one commit, instead of various changesets on single locale=20 > repos; > This makes sense to me with the additonal context. > IV. Moreover, I believe mozilla itself is on the way of=20 > deprecating > mercurial l10n-central in favor of firefox-locales git repo,=20 > since > this is where all work has been happening[2], while l10n-central=20 > has > stopped at 2024-07-10[2]. So probably in a not so distant future > gnuzilla will have to move on to that as well. > I wasn=E2=80=99t aware of this, but that=E2=80=99s great news, as it=E2=80= =99ll make=20 reproducible builds much easier. Thank you for letting me know. > So I stand by the changes proposed on this patch series, at=20 > least as > things stand. > Makes sense. I=E2=80=99m still in favor of merging them. Thank you for=20 taking the time to explain. Thanks, =E2=80=94 Ian From unknown Mon Jun 23 06:03:24 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: =?UTF-8?Q?Andr=C3=A9?= Batista Subject: bug#71782: closed (Re: [bug#71782] [PATCH v5 3/4] gnu: torbrowser: Update to 13.5.3 [security fixes].) Message-ID: References: <87r09051c9.fsf@gnu.org> <20240626133817.21595-1-nandre@riseup.net> X-Gnu-PR-Message: they-closed 71782 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 71782@debbugs.gnu.org Date: Mon, 30 Sep 2024 20:34:04 +0000 Content-Type: multipart/mixed; boundary="----------=_1727728444-2286-1" This is a multi-part message in MIME format... ------------=_1727728444-2286-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #71782: [PATCH 0/3] gnu: torbrowser: Update to 13.5. 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 71782@debbugs.gnu.org. --=20 71782: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D71782 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1727728444-2286-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 71782-done) by debbugs.gnu.org; 30 Sep 2024 20:33:52 +0000 Received: from localhost ([127.0.0.1]:46912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svN5b-0000Zg-GI for submit@debbugs.gnu.org; Mon, 30 Sep 2024 16:33:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:50878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1svN5X-0000Ya-V5 for 71782-done@debbugs.gnu.org; Mon, 30 Sep 2024 16:33:48 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1svN4t-000062-KH; Mon, 30 Sep 2024 16:33:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=/p1IvIvBnZT1Q87dEkeC3QB0Kp6qlXTNXfvL0O3dWZI=; b=nR2kGOJWOQFMRK6+VGpb kr7JP/AyN98i7QthgVNpxsBb90U9GAw544EuJnWRE5JFPHx8309RoaNIYcGKVaSddkNItMkd00ath PuPEttro/Mqgnm+Bvr9ypZeXJsnYGxl+nWcmJdBfTQlw91Z/plk/X6cz1X+hUJs9gdDVESiIrEGiI u6/ruJNpsEnwlU/suyWIx3W3RF1xJU9s+2mHHNMbRP0blvT7N50TF5AROqnsDYSAWH8o6lmKGrQ3R LBCYn1ju88qXh4lDfGJeICDY1S5svNFIIGD+35VcmoQWzljs/lRGq1dQ8ZfZYulwB0+obyT6p0LkK weie813/n+VmBg==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Ian Eure Subject: Re: [bug#71782] [PATCH v5 3/4] gnu: torbrowser: Update to 13.5.3 [security fixes]. In-Reply-To: <878qw424vb.fsf@meson> (Ian Eure's message of "Fri, 06 Sep 2024 08:05:28 -0700") References: <20240905230801.5772-1-nandre@riseup.net> <20240905231807.5950-1-nandre@riseup.net> <878qw424vb.fsf@meson> Date: Mon, 30 Sep 2024 22:32:54 +0200 Message-ID: <87r09051c9.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 71782-done Cc: =?utf-8?Q?Andr=C3=A9?= Batista , mhw@netris.org, 71782-done@debbugs.gnu.org, jonathan.brielmaier@web.de 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 (-) Hello, Ian Eure skribis: > This all looks good to me. I built and ran both browsers and they > seem to be working how I=E2=80=99d expect. Based on your feedback I applied v5 of this patch series. Thanks to the two of you! BTW, one of you might want to consider applying for commit rights to speed up the process of applying patches in your scope. Mark H Weaver does have commit rights but he tends to pay less attention to email. Thanks, Ludo=E2=80=99. ------------=_1727728444-2286-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 26 Jun 2024 13:38:43 +0000 Received: from localhost ([127.0.0.1]:38827 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMSrC-0000Wb-Sk for submit@debbugs.gnu.org; Wed, 26 Jun 2024 09:38:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:46748) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sMSrB-0000WT-46 for submit@debbugs.gnu.org; Wed, 26 Jun 2024 09:38:41 -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 1sMSr7-0007jM-I2 for guix-patches@gnu.org; Wed, 26 Jun 2024 09:38:37 -0400 Received: from mx0.riseup.net ([198.252.153.6]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sMSr5-0005to-3N for guix-patches@gnu.org; Wed, 26 Jun 2024 09:38:37 -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 mx0.riseup.net (Postfix) with ESMTPS id 4W8N7p45Tvz9v9W for ; Wed, 26 Jun 2024 13:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1719409110; bh=pihk/Ph9qCCg6XZQP2TEM6I4zgBs7zehnRGId1oCVsk=; h=From:To:Cc:Subject:Date:From; b=Rr3DvNBKaRXVOxpSJh+7G/l2JqCuvH/6U9Ui0aEwv6vnJfdPuX1vM2amDwpC6pNFb GC8ARiX9dGgR4cZJ+FfnuFb7CjsuKYmLlO6rDyd0thqaK6tEzc11xHV2B77YErKOt7 nNjkAmRUsVN5YuwfSFcREs8E3+IpXScKWZ+09CdQ= X-Riseup-User-ID: E79164ADF80C4D891F4E6BE1478A6C57EA59EFB61C2C3459C6E20DC5B264E60A Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4W8N7n53NnzJsLc; Wed, 26 Jun 2024 13:38:29 +0000 (UTC) From: =?UTF-8?q?Andr=C3=A9=20Batista?= To: guix-patches@gnu.org Subject: [PATCH 0/3] gnu: torbrowser: Update to 13.5. Date: Wed, 26 Jun 2024 10:38:17 -0300 Message-ID: <20240626133817.21595-1-nandre@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.6; envelope-from=nandre@riseup.net; helo=mx0.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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Andr=C3=A9=20Batista?= 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: -2.3 (--) This patch series updates torbrowser to its latest stable version. In order to do so, it also updates go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird to 0.2.0, which now depends on the new go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. Bridge logic has been changed upstream and we don't need the old add-bridges phase. ld became unsupported, but lld only breaks cargo rustc invocations, so we now use the lld-as-ld-wrapper (thanks). llvm was updated to version 16 to mimick what upstream does. Cheers, André Batista (3): gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-webtunnel. gnu: go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird: Update to 0.2.0. gnu: torbrowser: Update to 13.5. gnu/packages/golang.scm | 33 ++++++++++++++++++++++++++++++--- gnu/packages/tor-browsers.scm | 35 ++++++++++++++++------------------- 2 files changed, 46 insertions(+), 22 deletions(-) -- 2.45.1 ------------=_1727728444-2286-1--