From patchwork Thu Oct 24 21:25:33 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: 69428 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 D659A27BBEA; Thu, 24 Oct 2024 22:26:49 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4ABDB27BBE2 for ; Thu, 24 Oct 2024 22:26:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t45Ln-00054y-04; Thu, 24 Oct 2024 17:26:35 -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 1t45Lk-00054j-CQ for guix-patches@gnu.org; Thu, 24 Oct 2024 17:26:32 -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 1t45Lk-00051Y-24 for guix-patches@gnu.org; Thu, 24 Oct 2024 17:26:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=nlRg/sO+vmMU2u0Vx5PHY1o4I8J27a5M2AftEOgNA4Q=; b=VsoxVQidsUQY3D47LG0tb8I5r3PbGEE9+P5ltDdwFuG89LotRtJKUW4aj0uSYRQUHuJb5SL8GoooDKj7fZrSgeCpvo5EP+PqUbSJfTUaTsIo8oF3TrlEEH4O2RGlPaXWAcHc/jb22nzzikTjkCk8U04eaRk9jP6DS64YbC/DVu53DLDSuPXywkltI193NoDh5mwYJ5ZrPulISd/SyES8deZ09v68d/QcftE2ZWlm1CXTP+3zsIx4I6Qn8/AZPvwlwQYQ2k2CK96jebvPJU2EjZVjv+Yjx5rAL5D68tpvYfeEAUElHUtHSPSjGUADjlbwF7eTJg1ak56Y6O+GC7pB2w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t45ME-0001Rm-F1; Thu, 24 Oct 2024 17:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73998] [PATCH] gnu: torbrowser: Update to 14.0. Resent-From: =?utf-8?b?QW5kcsOp?= Batista Original-Sender: "Debbugs-submit" Resent-CC: jonathan.brielmaier@web.de, mhw@netris.org, guix-patches@gnu.org Resent-Date: Thu, 24 Oct 2024 21:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73998 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73998@debbugs.gnu.org Cc: =?utf-8?b?QW5kcsOp?= Batista , jonathan.brielmaier@web.de, mhw@netris.org X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: jonathan.brielmaier@web.de, mhw@netris.org Received: via spool by submit@debbugs.gnu.org id=B.17298051855493 (code B ref -1); Thu, 24 Oct 2024 21:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 24 Oct 2024 21:26:25 +0000 Received: from localhost ([127.0.0.1]:36368 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t45Lc-0001QU-6Y for submit@debbugs.gnu.org; Thu, 24 Oct 2024 17:26:25 -0400 Received: from lists.gnu.org ([209.51.188.17]:41052) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t45LZ-0001QL-QU for submit@debbugs.gnu.org; Thu, 24 Oct 2024 17:26:22 -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 1t45L4-0004y5-EM for guix-patches@gnu.org; Thu, 24 Oct 2024 17:25:50 -0400 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t45L2-0004xB-IA for guix-patches@gnu.org; Thu, 24 Oct 2024 17:25:50 -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 4XZJqb2TcjzDqTH for ; Thu, 24 Oct 2024 21:25:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1729805147; bh=sCOUOxbG7kd5Jy44dRMuORKJV2711PcriqBlG4gI2cU=; h=From:To:Cc:Subject:Date:From; b=O76XH2jXnsEu44NlfjUYHnxwiXfRR9YKfJ1hw74Notwj55eZyNYsYjrQ+NsxBTlkx Ohigw8DNU98EIeCqJslOPzM+80usN4CaPPPDtITcuSDNXlpjsCsRAM8IO8dMvciUrG JDsfcswtsFlZ2HhULjojq3apRjEd5k6VCQMVxRGI= X-Riseup-User-ID: 1059FFD27B03D40E45EFD1413477AC06051A9DDB5F0E4ADCFEFF1C1D0E2CB19B Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4XZJqZ07XTzFpXZ; Thu, 24 Oct 2024 21:25:45 +0000 (UTC) From: =?utf-8?b?QW5kcsOp?= Batista Date: Thu, 24 Oct 2024 18:25:33 -0300 Message-ID: <20241024212533.1480-1-nandre@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=nandre@riseup.net; helo=mx1.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, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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/tor-browsers.scm (firefox-locales): Update to eded3303744e8f5ca85f0d14710f198cd77fd23f. (%torbrowser-build-date): Update to 20241016164500. (%torbrowser-version): Update to 14.0. (%torbrowser-firefox-version): Update to 128.3.0esr-14.0-1-build6. (torbrowser-translation-base): Update to 547400dd678f476ec38efde2cf703d57c1a3e8c7. (torbrowser-translation-specific): Update to 38d5c3b11cfb96833ae2c7dc3122829b29583d6f. (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. Change-Id: Idc442a89d95198d0794b179a45f47d0546e720c4 --- gnu/local.mk | 1 + .../patches/torbrowser-compare-paths.patch | 24 +++++++++++++++++ gnu/packages/tor-browsers.scm | 26 +++++++++---------- 3 files changed, 38 insertions(+), 13 deletions(-) base-commit: 59b2a60d0041882d732e1766e28f0df5a1ef1ac1 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..55d4c1dca4 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 "eded3303744e8f5ca85f0d14710f198cd77fd23f") (revision "0")) (package (name "firefox-locales") @@ -106,7 +106,7 @@ (define firefox-locales (file-name (git-file-name name version)) (sha256 (base32 - "0a2ly29lli02jflqw78zjk7bp7h18fz935cc9csavi0cpdiixjv1")))) + "1zvq6z79rv6cr6vwi04w6j47rn0hfjjzbgcbjhdaabgla88d5gz2")))) (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 "20241016164500") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.5.7") +(define %torbrowser-version "14.0") ;; 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.3.0esr-14.0-1-build6") ;; 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 "547400dd678f476ec38efde2cf703d57c1a3e8c7"))) (file-name "translation-base-browser") (sha256 (base32 - "04ciw4rnl0cj7vz4pqbs1aca8fhva346bp0vahfcxv3isn1nwyy4")))) + "0g7s2365dl71yl0y29vx503jhiqji91vb8jc2dqn6yf7ip7wy75g")))) ;; 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 "38d5c3b11cfb96833ae2c7dc3122829b29583d6f"))) (file-name "translation-tor-browser") (sha256 (base32 - "09zhl6fk0z69qy82l050fm02h0dyb3f8j38fbazmkwnd8x3z6jv0")))) + "0rlhaa4npzcy3lc5xs0m8p4mdcv13wah4c7df81j4g37r5xql81w")))) (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")))) + "18jm7x2r4ayy0f1kyaxvnlvj17d7ma0bbvl8jh25sgy7ry7i7ns4")))) (arguments (list #:install-plan @@ -213,7 +213,7 @@ (define* (make-torbrowser #:key ".tar.xz")) (sha256 (base32 - "0v4hkxcz7cahbhwwafmspcl67ih2rnkmamcvp06kyx64xvpad00i")))) + "0i4bnd65xd865manks1xkapymylz2gb3sxlyai04fi8kx1m4wj87")))) (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 _