From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.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 iN5GB3BmIWdxjwAAqHPOHw:P1 (envelope-from ) for ; Tue, 29 Oct 2024 22:49:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id iN5GB3BmIWdxjwAAqHPOHw (envelope-from ) for ; Tue, 29 Oct 2024 23:49:20 +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=IX631qW5; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=VYBf1CT2; 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=1730242160; a=rsa-sha256; cv=none; b=AAizo+Iuh+z6IB+TwVi0DhVoJaBqo1MdXwq4dMXAwGLxB4yms/gN2DWEqtl8FXrQu/qX3g I+r/VTGWdEOv9ITXKzOiMyp8n3cMQlKZ2p12ts6lYXEaxUy5qadFpRCp/DcZt3epgefgbE r4cp1gfKzszOC9xj+aQ3DFfjrGr5MGgn7igU4IqQ0cGLkx+1i4s750bSnoAEWDCUlO6nAL /aGMNr6ETL5wi4LJNkfexJu2x4UAAVv4FpC87+Sf9JiKqjf6R8eF8iByjEKebopx1vY0tq SHm3YBfqa8n7f+CHyBN7F0JG6qYI2ZygHJQDSaKiXiyihGBeAPqFPfzNOngorw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=IX631qW5; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=VYBf1CT2; 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=1730242160; 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=o0CYLFnCX4/D3aMVi0Nm7gbq7LF9IfVKkdrYM7P8q0M=; b=Y3d6XEcb6nRXRxxwqEZDT+FZULENDinhjrXsgQ3wLPYOuhdLVvEQ4wfZptizGgJlTS5crS OtgS+0FFh+rx71f/FvthBXVTgiX47B55+LqIWCJcqw1HnSMKHUWpQ7wOzTafAbMUTVBOGv tBYlKr4OS5iRn0EM7P4rEuGjfsRkyYV0CghOHgZKBZIfpsN7iAXHPjTBE9KawzfE4FVsNy B9DIKgGxxzjmMq9qloLR+CENWlCu/qOqiNC6UNWuUQjTVH/n9hQwD0mQ2wkt4r5axsPR6g X7gsvCUZgd1aSHGy7dBUGTbdi3N2gYfExriLBtojkoEJdVacA86MUSikx8hTpw== 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 88F7B83E59 for ; Tue, 29 Oct 2024 23:49:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t5v1Q-00088S-El; Tue, 29 Oct 2024 18:49:08 -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 1t5v1P-00088F-39 for guix-patches@gnu.org; Tue, 29 Oct 2024 18:49:07 -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 1t5v1O-0007bz-K1 for guix-patches@gnu.org; Tue, 29 Oct 2024 18:49:06 -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=o0CYLFnCX4/D3aMVi0Nm7gbq7LF9IfVKkdrYM7P8q0M=; b=IX631qW5KPLxKC4Dx414yaTEWBbCicvlfpxBN/xb7Oo07zS0b9bOA98WIeA22tY2YktZxlw7CgOSOSVCWbWgdlbVvxoccANT1ZH0/sJHNRDYWoSmYE+QdB39+hupvBYdGGVyWD6XuJBO/W65VDa1rsb0D72CeiPE6pz/Vc09aj37+K+Y/FVa4zl6jqKvto6KDuN7+0D8Y4V+/L6n4NRSvER0zvd3UKantNz5nZpNXJwiL1faxoDFMwo0fuXc4aP12y/Rk/xgW2jCO+3/QZqFsj2HIITU+Lk83vgsKOd0yD6a7E+ipGODd9dEz39Dzz6VDLV+ui5h/skVgLaJODyD9g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t5v1J-0005xW-SL; Tue, 29 Oct 2024 18:49:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73998] [PATCH 1/2] gnu: torbrowser: Update to 14.0.1 [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:49:01 +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.173024214122904 (code B ref 73998); Tue, 29 Oct 2024 22:49:01 +0000 Received: (at 73998) by debbugs.gnu.org; 29 Oct 2024 22:49:01 +0000 Received: from localhost ([127.0.0.1]:59359 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5v1I-0005xH-Ky for submit@debbugs.gnu.org; Tue, 29 Oct 2024 18:49:01 -0400 Received: from mx0.riseup.net ([198.252.153.6]:38318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t5v1D-0005wy-5r for 73998@debbugs.gnu.org; Tue, 29 Oct 2024 18:48:59 -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 4XdQR55yWvz9t8f for <73998@debbugs.gnu.org>; Tue, 29 Oct 2024 22:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1730242129; bh=5VLfWQ1cIyU58qpRtyeLOpGAw12+21W36UX6J6yBC88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VYBf1CT2Shi+gZ3cMSvB+hPBeuePlQLHgi4EiieHtGWR/olW1esITgqONxaPRfbWO kD7oTCpPZNoTRrJSd8dNgL2/5oJ5szsaxpVAo3I6GzeC1l+mxZ3JcVqMlSSJNfrI8S 0/RK3FJUwrwg1Zg//KBMAgjJQ/QWwJtCW3ZFMr50= X-Riseup-User-ID: 2A4E34F03305D03FD7F35DFE4A07AFF251088D58066D560F40F87AF24DEC888E Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4XdQQs4VpPzFwq2; Tue, 29 Oct 2024 22:48:37 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 29 Oct 2024 19:48:25 -0300 Message-ID: <20241029224825.2660-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: 88F7B83E59 X-Migadu-Scanner: mx10.migadu.com X-TUID: l8lGdEEQPPmb Fixes CVEs 2024-10458, 2024-10459, 2024-10460, 2024-10461, 2024-10462, 2024-10463, 2024-10464, 2024-10465, 2024-10466 and 2024-10467. for details. * gnu/packages/tor-browsers.scm (firefox-locales): Update to 878fe6f256d52c7e5b0205b07b061829ccde4f17. (%torbrowser-build-date): Update to 20241028090000. (%torbrowser-version): Update to 14.0.1. (%torbrowser-firefox-version): Update to 128.4.0esr-14.0-1-build2. (torbrowser-translation-base): Update to 3b1be2065b54939ed019d94174f137847bcf3c66. (torbrowser-translation-specific): Update to ba63bd165f3fd4bdd472815c9761413d4671cfb7. (make-torbrowser) [arguments] <#:phases>: On 'apply-guix-specific-patches change icecat-compare-paths.patch to torbrowser-compare-paths.patch as the patched file has changed its name between major versions. On 'remove-cargo-frozen-flag, update the regex to match this newer version string. * gnu/packages/patches: Add torbrowser-compare-paths.patch. * gnu/local.mk: Likewise. --- gnu/local.mk | 1 + .../patches/torbrowser-compare-paths.patch | 24 +++++++++++++++++ gnu/packages/tor-browsers.scm | 26 +++++++++---------- 3 files changed, 38 insertions(+), 13 deletions(-) diff --git a/gnu/local.mk b/gnu/local.mk index 89a795bfbd..e85b3602b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2222,6 +2222,7 @@ dist_patch_DATA = \ %D%/packages/patches/tla2tools-build-xml.patch \ %D%/packages/patches/tlf-support-hamlib-4.2+.patch \ %D%/packages/patches/tofi-32bit-compat.patch \ + %D%/packages/patches/torbrowser-compare-paths.patch \ %D%/packages/patches/tpetra-remove-duplicate-using.patch \ %D%/packages/patches/transcode-ffmpeg.patch \ %D%/packages/patches/transmission-4.0.6-fix-build.patch \ diff --git a/gnu/packages/patches/torbrowser-compare-paths.patch b/gnu/packages/patches/torbrowser-compare-paths.patch new file mode 100644 index 0000000000..7d4d5fdb78 --- /dev/null +++ b/gnu/packages/patches/torbrowser-compare-paths.patch @@ -0,0 +1,24 @@ +See comment in gnu/build/icecat-extension.scm. +This is only needed while icecat and torbrowser remain on +different ESR versions as the patched file has changed its +name. + +--- a/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs ++++ b/toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs +@@ -3606,6 +3606,7 @@ + if ( + newAddon || + oldAddon.updateDate != xpiState.mtime || ++ oldAddon.path != xpiState.path || + (aUpdateCompatibility && this.isAppBundledLocation(installLocation)) + ) { + newAddon = this.updateMetadata( +@@ -3614,8 +3615,6 @@ + xpiState, + newAddon + ); +- } else if (oldAddon.path != xpiState.path) { +- newAddon = this.updatePath(installLocation, oldAddon, xpiState); + } else if (aUpdateCompatibility || aSchemaChange) { + newAddon = this.updateCompatibility( + installLocation, diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index e517f9b214..02e3c0583c 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -92,7 +92,7 @@ (define-module (gnu packages tor-browsers) ;; See browser/locales/l10n-changesets.json for the commit. (define firefox-locales - (let ((commit "d8d587117c7b9dcc6a4fbc38407ed2c831bb008f") + (let ((commit "878fe6f256d52c7e5b0205b07b061829ccde4f17") (revision "0")) (package (name "firefox-locales") @@ -106,7 +106,7 @@ (define firefox-locales (file-name (git-file-name name version)) (sha256 (base32 - "0a2ly29lli02jflqw78zjk7bp7h18fz935cc9csavi0cpdiixjv1")))) + "1ypnzjf5klcj75hf9cp88rwvr6aav3h2939rw19wf9hnyanc4xf1")))) (build-system copy-build-system) (home-page "https://github.com/mozilla-l10n/firefox-l10n") (synopsis "Firefox Locales") @@ -116,16 +116,16 @@ (define firefox-locales ;; We copy the official build id, which is defined at ;; tor-browser-build/rbm.conf (browser_release_date). -(define %torbrowser-build-date "20241008182800") +(define %torbrowser-build-date "20241028090000") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.5.7") +(define %torbrowser-version "14.0.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.16.0esr-13.5-1-build3") +(define %torbrowser-firefox-version "128.4.0esr-14.0-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" @@ -139,11 +139,11 @@ (define torbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "ceb66dd0937da14962cb535699242b2526e11f02"))) + (commit "3b1be2065b54939ed019d94174f137847bcf3c66"))) (file-name "translation-base-browser") (sha256 (base32 - "04ciw4rnl0cj7vz4pqbs1aca8fhva346bp0vahfcxv3isn1nwyy4")))) + "04ckn133w8q6b4rgihl23pzmnd3k6458jn9h4f58fnr18rfh6057")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -151,11 +151,11 @@ (define torbrowser-translation-specific (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "dbf1454fdbd3256d65985cc1c46391ce0ec159e7"))) + (commit "ba63bd165f3fd4bdd472815c9761413d4671cfb7"))) (file-name "translation-tor-browser") (sha256 (base32 - "09zhl6fk0z69qy82l050fm02h0dyb3f8j38fbazmkwnd8x3z6jv0")))) + "0dmsqb57whpq0l05krfmwxv8d31by06a7mpgrmbxjnlv9y3b5nlf")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -171,7 +171,7 @@ (define torbrowser-assets version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1mdi6x0dvdvlk957fws1pw55z9hwkd5x05rv8k2g1vzy9qkvgrf3")))) + "13wx4i4mawm8spyg17lil09fsm37s5g409zs3i5764g0llqwl1hd")))) (arguments (list #:install-plan @@ -213,7 +213,7 @@ (define* (make-torbrowser #:key ".tar.xz")) (sha256 (base32 - "0v4hkxcz7cahbhwwafmspcl67ih2rnkmamcvp06kyx64xvpad00i")))) + "12bnqhn57xpyy2iax4iyfcfpsk25mmj4m2nllwrkkv4lqp3ifbkh")))) (build-system mozilla-build-system) (inputs (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird @@ -383,7 +383,7 @@ (define* (make-torbrowser #:key (for-each (lambda (file) (invoke "patch" "--force" "-p1" "-i" file)) '(#$(local-file - (search-patch "icecat-compare-paths.patch")) + (search-patch "torbrowser-compare-paths.patch")) #$(local-file (search-patch "icecat-use-system-wide-dir.patch")))))) (add-after 'apply-guix-specific-patches 'remove-bundled-libraries @@ -497,7 +497,7 @@ (define (runpaths-of-input label) ;; complain that it's not able to change Cargo.lock. ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373 (substitute* "build/RunCbindgen.py" - (("\"--frozen\",") "")))) + (("args.append\\(\"--frozen\"\\)") "pass")))) (delete 'bootstrap) (add-before 'configure 'setenv (lambda _ -- 2.46.0