From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id MI/vD/u8smYBzQAAqHPOHw:P1 (envelope-from ) for ; Wed, 07 Aug 2024 00:16:59 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id MI/vD/u8smYBzQAAqHPOHw (envelope-from ) for ; Wed, 07 Aug 2024 02:16:59 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=X4Le2GFa; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b="d13D/D2r"; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722989819; 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=UB8RtvAL8Fkzf7rECnhdNlwaRhLLFU4fHKwxoBFPilY=; b=Q1+1E79wefhV328Ab64+nRmb5ae/09Uhe8QLoTtoMUA4cJvuoPTAMq20leGeFwNrRtHw9a ceyZa06LKIZthbSjkOGOR8KMnbv9sMTmUpGZUWsagOqqx4QwrTAgcOhCnWtSAnNYoiL1Td rrDRqAKCSolyjd074I3H3irpQcR3ofCAhxyfGqsq2W5MJMeSjPG9A2ob/jUlBEKQNt5ANp Pn2LbF0xqTiNCSQ5BngT03ejnj5ForOVs+9wrf23p9qjYRYOr6PKlHbyLhNNGEkznL1EhN NVBI0G6AZBt8pSuxzULXWzE6RbS9d5cVnljroOeu31u93u87ex3FcNriGybCPA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=X4Le2GFa; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b="d13D/D2r"; 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"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=riseup.net (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722989819; a=rsa-sha256; cv=none; b=A5HtaLBqMUhb2awiezuM+wp6Lr5fXF+hrx3d5RihfHn42QK7bl878M+UYCDJAQrj6UMCCm Sd8ebQ6qGsHnd5N3ajcqQd29YFKHTwUq0i8POQa9CBnPl+IrPYnoB4Ooai0lrezqWpFCws P6Oa9fjUS7jiZbl/PbvHuw3GgUfIMyQ7wk8PpneLrbrVubnK/MnhJCu+t4xJR7lIFSS4cx +44wU8kUmdM511yotom8OOdeJZ7icojl3M5NbHXK31EMEiN6+3rArVgFxJHp1ajMHBgWMc 8EXYl9eh/lCklQZ15BpHSc2qAtienog5EzG28V7pD+VXkSCXifQR8WuY1VAoKw== 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 0228B565AC for ; Wed, 7 Aug 2024 02:16:59 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbUMB-0008FR-3j; Tue, 06 Aug 2024 20:16:50 -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 1sbUM3-0007pH-MB for guix-patches@gnu.org; Tue, 06 Aug 2024 20:16:43 -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 1sbUM2-00030P-DU for guix-patches@gnu.org; Tue, 06 Aug 2024 20:16:38 -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=PoAsX80a4z8nRPQM/cvEsKolSCbKIPWBNP7CUGOzmlI=; b=X4Le2GFaq3N6FLtPx5om5TL19n8Y5hk903zSqCFG4TxRJirtDgOOpLNB3sOohfdkvMhzpqLfCP5P+HMSmJcWVe++596Cmn1BJlhPgGBxazufScgC4TiCoDdIhIOgaZjVcvnf0kYZL8nFRr3AJ34TIz173LZ9dWrtNu9mJXQgN6WnRClKMxsSTaZbfMMyBXusMWON1XZxRhX76TTGm+AdvQGZjNSq3nU5GiDZTXVECcykdf762jkcSqufIuHbm9K1N9hNG0yWMuUQ+NqTVh2jXez9ae7cny7EgRJRtNHVKKnZ5dzNCQpdoh0gtgZ+PHoZsW6BxGIxEJamMHpjjmjRYA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sbUMQ-000776-PM for guix-patches@gnu.org; Tue, 06 Aug 2024 20:17:02 -0400 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-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-Queue-Id: 0228B565AC X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -3.94 X-Spam-Score: -3.94 X-TUID: 3OC8qyu/Tu87 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