From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id CGTlA2hqIWcHAgAA62LTzQ:P1 (envelope-from ) for ; Tue, 29 Oct 2024 23:06:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id CGTlA2hqIWcHAgAA62LTzQ (envelope-from ) for ; Wed, 30 Oct 2024 00:06:16 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=KM8DhxH8; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=IId8VAe9; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730243175; a=rsa-sha256; cv=none; b=Z8YDF47vOjj773fDPDpVR5/p3HaQHZ6h1l5HeK3eDZn4PeQ+lHtI7Gd26tVNRcCsJc31JM 459mPTeScMH/AFiNK2xUVens95HIQmrMBLPQ/K974q6jKml9/M9fyfbStbudhB5PYgMNqJ eX3qb9L78Ssnnju1c3nIm74sggoEgN0CtY2wqV662xPPaccmO8mBUEdQ6wAkHHmKK1I6t3 QMWUw1xffMKYwXfSfTrGMUziTfrZ0HWoio2kMR3z6q2HBAWgC2OKjr/kSlr9BbhfIcLkSs NS7vFZ4RyIDzK75dFwj9TdM4pDnSc70ytcXsJn6ztY+JHDN4n04WpsJrIAwgRw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=KM8DhxH8; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=IId8VAe9; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=riseup.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730243175; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Fv5xFLF7UgmBdYfwbSH066zIfrXM4KPabLPugRfKyok=; b=UwnZ5DhLaCbU68MP7ZYpTftK1KGs6jEqZxnkOrPyH5+T58vS2feP0rKJCi9MjwauNdJVCp zkF+P8Zhw8yR3jBc8hgm09AR8Bcv2e+k5wqOKS3KGhnqIYfDd7g991Fm/64vvFJguHKoVH qKRT68n2xwRidb/tWQsoS+RDTiqOxt7tXI/722xvbHEx3g7TRVM0/4NRi5NusF2ay51VEW xLXgbwpOAvqc33ZZPim7M2CQs6SZAKsNKlqmIOAHZ97cNvFG1QZn46CSB1pxJoUgN52ctN YTJm2aFmGPAlSEluKcN62QHmFu8khvjVjP8wS64zBCFNK9YHslVk7yHBU5uNaQ== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6FC5B85DAC for ; Wed, 30 Oct 2024 00:06:14 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5v2K-0008E5-JF; Tue, 29 Oct 2024 18:50:04 -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 1t5v2J-0008Dg-58 for guix-patches@gnu.org; Tue, 29 Oct 2024 18:50:03 -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 1t5v2I-0007fi-RF for guix-patches@gnu.org; Tue, 29 Oct 2024 18:50:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=Fv5xFLF7UgmBdYfwbSH066zIfrXM4KPabLPugRfKyok=; b=KM8DhxH86pxPM/pPW20Uq1dm9dxUi1cEvY8g23FLaMKzdP/CXpa8BeuafwvC8gqsnfO0MEDVWOvd7CEgYDB69vX5u5Z894W6Secb+UFAmBoBy7IPz6vJl++ucJd9d8Om/cxsknRgTmCchXydItFCl61FNBVwlyHQZGEfO97LykyQZiKR5jHUQJV8XaGo6zj7wojyl+zMYuONEakfSZr1r09ck4yxQundLVD0lA4YGrbWTYTnAvfGBESVcMCq4wL8wOAlIMeaPFLQCXnYto7MXgdrS0IyU5TXkIB10ew5KIUVu03qBZmVwSoehmMEOUsWABz/reGzyMdb6HfUzCPKpg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5v2I-0005z7-E6; Tue, 29 Oct 2024 18:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73998] [PATCH 2/2] gnu: mullvadbrowser: Update to 13.5.9 [security fixes]. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Tue, 29 Oct 2024 22:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73998 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73998@debbugs.gnu.org Cc: =?UTF-8?Q?Andr=C3=A9?= Batista , jonathan.brielmaier@web.de, mhw@netris.org X-Debbugs-Original-Xcc: jonathan.brielmaier@web.de, mhw@netris.org Received: via spool by 73998-submit@debbugs.gnu.org id=B73998.173024218822987 (code B ref 73998); Tue, 29 Oct 2024 22:50:02 +0000 Received: (at 73998) by debbugs.gnu.org; 29 Oct 2024 22:49:48 +0000 Received: from localhost ([127.0.0.1]:59367 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5v20-0005yZ-DD for submit@debbugs.gnu.org; Tue, 29 Oct 2024 18:49:48 -0400 Received: from mx0.riseup.net ([198.252.153.6]:40856) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5v1y-0005yN-R9 for 73998@debbugs.gnu.org; Tue, 29 Oct 2024 18:49:43 -0400 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4XdQS13L5Sz9sRV for <73998@debbugs.gnu.org>; Tue, 29 Oct 2024 22:49:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1730242177; bh=q/oSEqksEPPpjWyxj8cdqj1jmujUmYoPUi4pnwUR7Xg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IId8VAe9nhGwTrpfdeGMSia8sQrmAVFcc2MSVa/6kziGQT21I0FvtSAXb6J4EoKMU +5CijB5Q265g4wEWfoarkLtkP8aXn9IxKUKhcna/Hfa5dbmgPzN/NrJJsDMLa/nk8d DCojBoRI0N5yBQfo5hOa9zlkyZmottmy8V8CYbms= X-Riseup-User-ID: D55A113B7325F19423FC725544BF04F250385C473A56FC9B004E57792AC4EC29 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4XdQS01c27zFtMB; Tue, 29 Oct 2024 22:49:35 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 29 Oct 2024 19:49:22 -0300 Message-ID: <20241029224922.2681-1-nandre@riseup.net> In-Reply-To: <20241029224533.2612-1-nandre@riseup.net> References: <20241029224533.2612-1-nandre@riseup.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.39 X-Spam-Score: 2.39 X-Migadu-Queue-Id: 6FC5B85DAC X-Migadu-Scanner: mx10.migadu.com X-TUID: RQLd9IzetvIy Fixes CVE 2024-9680, 2024-10458, 2024-10459 and 2024-10463. See the Mozilla Foundation Security Advisories and for details. * gnu/packages/tor-browsers.scm (%mullvadbrowser-build-date): Update to 20241024160253. (%mullvadbrowser-version): Update to 13.5.9. (%mullvadbrowser-firefox-version): Update to 115.17.0esr-13.5-1-build2. (mullvadbrowser-translation-base): Update to 3b1be2065b54939ed019d94174f137847bcf3c66. (mullvadbrowser-translation-specific): Update to 2f7d98b46ce480cdb4d7e9ddab912650c8673d6c. (mullvadbrowser) [arguments] <#:phases>: Replace 'apply-guix-specific-patches so as to keep using icecat-compare-paths.patch as it applies to ESR 115. Replace 'remove-cargo-frozen-flag, keep the old regex which matches for this older version. --- gnu/packages/tor-browsers.scm | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 02e3c0583c..e6747401a5 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -817,17 +817,17 @@ (define %mullvadbrowser-locales (list "ar" "da" "de" "es-ES" "fa" "fi" "fr" "it" ;; 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 "20240930230510") +(define %mullvadbrowser-build-date "20241024160253") ;; To find the last version, look at ;; https://mullvad.net/en/download/browser/linux. -(define %mullvadbrowser-version "13.5.6") +(define %mullvadbrowser-version "13.5.9") ;; 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.16.0esr-13.5-1-build2") +(define %mullvadbrowser-firefox-version "115.17.0esr-13.5-1-build2") ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-base @@ -835,11 +835,11 @@ (define mullvadbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "a142f78af87f994913faa15fb4b0f34f0ce1a22b"))) + (commit "3b1be2065b54939ed019d94174f137847bcf3c66"))) (file-name "translation-base-browser") (sha256 (base32 - "15ahsyji6fk236sb28vqpi7ai70r3qblfypmc7r781zq7nw8f9bs")))) + "04ckn133w8q6b4rgihl23pzmnd3k6458jn9h4f58fnr18rfh6057")))) ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-specific @@ -847,11 +847,11 @@ (define mullvadbrowser-translation-specific (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "78212a3da2439e436ac5f73d8e3eb908145c3ece"))) + (commit "2f7d98b46ce480cdb4d7e9ddab912650c8673d6c"))) (file-name "translation-mullvad-browser") (sha256 (base32 - "00qmmfz7lz9fw7id7bj89byd4zd39nc4f2plf0v640yzl8fdwi72")))) + "08anwb45rxzsdcxwzjflqb1d0f78pi4fsgdvsdlc4fmp8kx10nsd")))) (define mullvadbrowser-assets ;; This is a prebuilt Mullvad Browser from which we take the assets we need. @@ -867,7 +867,7 @@ (define mullvadbrowser-assets version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "0q55mk9zzzs7g2cng107gm16g74lx1qf42gf5ayh4x7caxc8db01")))) + "0q3c2wf5r6n06y36bcp5qxir41a01dwj4am9pqs5cz48ilimh8c7")))) (arguments (list #:install-plan @@ -910,11 +910,26 @@ (define-public mullvadbrowser %mullvadbrowser-firefox-version ".tar.xz")) (sha256 (base32 - "1mkssnr7vx4la4r31dy6fbwvj1h9gxzywwxa6z4310nr17vr3sxj")))) + "1xz005sa7isz561r9zlsipm6gpx30b83k7xbfy00zkc7qkl15xzs")))) (arguments (substitute-keyword-arguments (package-arguments mullvadbrowser-base) ((#:phases phases) #~(modify-phases #$phases + (replace 'apply-guix-specific-patches + (lambda _ + (for-each + (lambda (file) (invoke "patch" "--force" "-p1" "-i" file)) + '(#$(local-file + (search-patch "icecat-compare-paths.patch")) + #$(local-file + (search-patch "icecat-use-system-wide-dir.patch")))))) + (replace 'remove-cargo-frozen-flag + (lambda _ + ;; This is only needed while torbrowser and mullvadbrowser + ;; remain based on different firefox ESR versions. Delete + ;; once mullvad reaches the same upstream base. + (substitute* "build/RunCbindgen.py" + (("\"--frozen\",") "")))) (add-after 'unpack 'ublock-private-allowed (lambda _ (substitute* "toolkit/components/extensions/Extension.sys.mjs" -- 2.46.0