From patchwork Thu Sep 5 23:17:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 67651 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D62B427BBE9; Fri, 6 Sep 2024 00:18:20 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, TVD_SPACE_RATIO,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 210A327BBE2 for ; Fri, 6 Sep 2024 00:18:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smLjm-0005Lq-6z; Thu, 05 Sep 2024 19:18:02 -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 1smLjh-0005LV-2M for guix-patches@gnu.org; Thu, 05 Sep 2024 19:17:58 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smLjg-0008VE-Ob for guix-patches@gnu.org; Thu, 05 Sep 2024 19:17:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=nlOsSaT/C/JsyJBbjXnZAyjlK+AzEs67zD6hppuaQmo=; b=M6dDqswk9kCbZXucPjEXYAvUZ5apWbbwEsCrRGqoZaQJYrifyGhevCp2GYGCyjchLYv3QSeihfJUx95zwingZwHSqxjOhBf4CRpUY5a1ynlZBCAwwSBQuwR5gT7404SgdF5IJzQvtxEbiTzqYQFoOh6QYUDvhMqfr99MlgCGgJSqaaP1WayonVjgCNcSbB0AEkGAwoFNTwj8XvxL5LnZ85hAocKrvNCMapGg80MuQuS/SKpNj3OY2ozlHYJrzvcuJaINw3OiRYrGpdf6qNWPd98scAlf5871N8JANnjbz/rPsM0NwfK6VfHpKS1gEBs2qt8rJTW7pN2FkJx4nKKZYQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smLkk-0002ZL-AX for guix-patches@gnu.org; Thu, 05 Sep 2024 19:19:02 -0400 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?b?QW5kcsOp?= 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?b?QW5kcsOp?= 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?b?QW5kcsOp?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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") From patchwork Thu Sep 5 23:17:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 67654 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 8197A27BBEB; Fri, 6 Sep 2024 00:19:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 50A3F27BBE2 for ; Fri, 6 Sep 2024 00:19:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smLkj-0005Sc-QQ; Thu, 05 Sep 2024 19:19:01 -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 1smLkf-0005S1-4N for guix-patches@gnu.org; Thu, 05 Sep 2024 19:18:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smLke-000087-Qk for guix-patches@gnu.org; Thu, 05 Sep 2024 19:18:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=syJhaZIwjDuHi78KLI3KYCjxhGy1t+h8fAR+JICKauk=; b=bOQLTjMZi/9cRucvIR5R2uzWCjDUA88q5gmwlf6pDbYE8Lz09GKgk+jMIFNY8MjU6O88/duHSE7SyEVKi1Sq3jJa4oOeOeaQDH1g2Se7E2c+XsXf54rjqJEv/p6HLwdwyFLYpO/RfLUPk5uaQdqQ0X8wp7G3rv5R8vHKrE1XlFabwy+43zUvBoRNjhW+2gZ+jVUEFQOpsXfxVWTFS9lbsEFoDmrYYTdLpumYaSlJcRPCynfX4eFdgt6S9l0o2OiFGZuskdAPQ3OVhH7ZFLol95Q5uevMPaOWEj1a62Dj0y3zRGhb/NIAJcHwQ3AuO0f/47U7crmFpObFOp7NT5pH7Q==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smLli-0002bd-AY for guix-patches@gnu.org; Thu, 05 Sep 2024 19:20:02 -0400 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?b?QW5kcsOp?= 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?b?QW5kcsOp?= 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?b?QW5kcsOp?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)) From patchwork Thu Sep 5 23:18:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 67652 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 27FAF27BBEA; Fri, 6 Sep 2024 00:19:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 05A8727BBE2 for ; Fri, 6 Sep 2024 00:19:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smLkk-0005Sv-0O; Thu, 05 Sep 2024 19:19:03 -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 1smLkh-0005SE-3b for guix-patches@gnu.org; Thu, 05 Sep 2024 19:18:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smLkf-00008C-Dt for guix-patches@gnu.org; Thu, 05 Sep 2024 19:18:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=rVS0OEX/C/fKmpsaQUcZTjjIxlQ0p5KSKnJrQbRxy/4=; b=CkVG97gXWRwrQnTfq04XMpVemtkoHc4QIwJJULB004t67SsEDBHRZ9aCqONjkDr4CvLC8NlXZhBM4GQwCeSANmWR0vxV+etvi5Jt4q9+bekUpXGP0MX/SoXjge4/EDSL0cd3/c8MyR+V4yRBvjzF7+y3qutA6hvvEHMT5UYT+kRK5kc0EubmuaAPBmJ2thYPjlCGijm0V3GpEoLJPD1Umm0DoiYm0O4NHErjhPI8Zu3MPCTOU5C/FBvP4zzdgdfClsECHjXa8QEql2ytru133BcJjkVF8vMz2cxbhVbZx5hLINBGWj/dcHONvrQGVE9q6pIT9OTOW71Uwj7kSYwFWg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smLli-0002bm-VH for guix-patches@gnu.org; Thu, 05 Sep 2024 19:20:02 -0400 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?b?QW5kcsOp?= 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?b?QW5kcsOp?= 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?b?QW5kcsOp?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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")) From patchwork Thu Sep 5 23:18:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Andr=C3=A9_Batista?= X-Patchwork-Id: 67653 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4630F27BBEA; Fri, 6 Sep 2024 00:19:30 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6E6F727BBE2 for ; Fri, 6 Sep 2024 00:19:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smLkl-0005Sw-Cr; Thu, 05 Sep 2024 19:19:03 -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 1smLkh-0005SF-3g for guix-patches@gnu.org; Thu, 05 Sep 2024 19:18:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1smLkg-00008E-2f for guix-patches@gnu.org; Thu, 05 Sep 2024 19:18:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=W0fA1Hxlv8BfZWBPes1kjMLiRJ/EEus6XbumBBHUK0I=; b=U5zbKYe2VqWJBWme0UU4MgOTzZFs9MGj4QEMYgvH8off30X0AmynaLU/ZPZ2upL239u8lWN7TejM2gmHrjC9uc4i6RzLpH5VYsFNQr25SnV1ojogpCqaVViSUbFT12hXkdKm9y/JYFqiyQc7lG/txIYMGpDgko9tBM8uPuGhfrKxoPXOjcGKVutZkSen3zgBDlqbV8tqx4JSiQrT16+5TtQzwwgCNiDdNmewJFHJV2/gFiotofmzYUhSdeaSH9HxBtlF1vnygSs/tNSL90UKEtHHltu1TPwsHVGgqcGkC9HHpxnx1DzatzP1MIgjnET4zHm9t+YALU2vuP67AwdNEA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smLlj-0002bt-JW for guix-patches@gnu.org; Thu, 05 Sep 2024 19:20:03 -0400 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?b?QW5kcsOp?= 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?b?QW5kcsOp?= 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?b?QW5kcsOp?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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