From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id SLtiOskFl2YBVwEA62LTzQ:P1 (envelope-from ) for ; Tue, 16 Jul 2024 23:44:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id SLtiOskFl2YBVwEA62LTzQ (envelope-from ) for ; Wed, 17 Jul 2024 01:44:10 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=knGDySH1; dmarc=fail reason="SPF 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=1721173449; 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=wUt0xg4ktvtSL+oQMkQcf4N1v/TSzrPj0nGVUBuwBIE=; b=FHlwlx2HpK8fTbNXWcf1FLqWCRLlsjYZRDrIN+GLZw7rdjm+WQT5e/KuQ7pfBuw0eL1rYY 5sZJwEzNbjpIkXgcg4TgVLBSRIM3BehFo+o3CVTrNj5EvAo02RtSj5XJdD/HPvHL9LzvGU QfL05V/kBMRrX0DvSNdgHM0fR27bp4HBq7sAdbzHRtaZ9j8Rm00ffMC4zoA59vCmpCStAO a8e/YFOWuVgoXtma+eTl7Zf7rHjTCHIfKV6gmoo7TWo9i4zWQKMV+AbGi91sv+ldW6r+SS Xi1XZmsYvjQ5FYWdnYDY4lGVwRfJCf/B5RQ4Y4Zfm3N2lW8MAiOJzsPaqskPAg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1721173449; a=rsa-sha256; cv=none; b=ng8lW44Y/z07I28vsmZ+AxA9d35Z4QlOVLWPYOCvOu7xeF0piTHhErJUSRwimie6CSN2eN VkAlwihCnHKs5Mryv2q503tI9iRIVxAlVcSIf0yN4sAEiTzqOe48TEHPCSFkZA3RE4K328 uCe1ywqPRbHMzHG8+KEMgQiC9Rpn9UdMRHHjTbHRWxNUowB/X9y3h5nC2z2Ve0tZs5p7G6 vuTn2aCddUbJUFDDfwBLcJtdJdP1DDS5cIdgODzOVuQMxejSBjZ3vI3yT2iP0svH2GXu0R vA1XiWuhzN9M4HaWBI16e+50g/MHaiIRklNGwcadi1EX/eUVwxkxKvrKwZjHCA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=riseup.net header.s=squak header.b=knGDySH1; dmarc=fail reason="SPF 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" 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 A52E713EB4 for ; Wed, 17 Jul 2024 01:44:09 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTrpx-0003JK-Om; Tue, 16 Jul 2024 19:44: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 1sTrpw-0003Is-5D for guix-patches@gnu.org; Tue, 16 Jul 2024 19:44:00 -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 1sTrpv-0002vj-TC for guix-patches@gnu.org; Tue, 16 Jul 2024 19:43:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sTrpy-0007zp-KL for guix-patches@gnu.org; Tue, 16 Jul 2024 19:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCHv3 4/4] gnu: mullvadbrowser: Update to 13.5.1 [security fixes]. Resent-From: =?UTF-8?Q?Andr=C3=A9?= Batista Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 16 Jul 2024 23:44: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.172117340330679 (code B ref 71782); Tue, 16 Jul 2024 23:44:02 +0000 Received: (at 71782) by debbugs.gnu.org; 16 Jul 2024 23:43:23 +0000 Received: from localhost ([127.0.0.1]:34620 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTrpK-0007yk-Sx for submit@debbugs.gnu.org; Tue, 16 Jul 2024 19:43:23 -0400 Received: from mx0.riseup.net ([198.252.153.6]:60044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sTrpJ-0007yY-6J for 71782@debbugs.gnu.org; Tue, 16 Jul 2024 19:43:22 -0400 Received: from fews01-sea.riseup.net (fews01-sea-pn.riseup.net [10.0.1.109]) (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 4WNwcJ6TgPz9vbW for <71782@debbugs.gnu.org>; Tue, 16 Jul 2024 23:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1721173392; bh=Vq4GxI9MLTpFcbkeRZtSL5jKjNQ05o1AZZpsJ37YZIc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=knGDySH1+MAJjGj3pLk/PxQ8cG0rpAApAzyKOeZZ4Ky8cHavUV6LVTSW7glTqihH/ 8BU9eKBE3CUQkBAjBdqjDYxUes99zzjZ+PwxARzhv3akHADQNn4uJ4ecsVceKbMJZ4 ul5DRTVdrd5Q48rIzz6uSgnXBVhdjy8Imq+BQoeE= X-Riseup-User-ID: 17F231A730C7E37DB5F353F9483BEC8ABCB5312B27E825362786200095F3D313 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews01-sea.riseup.net (Postfix) with ESMTPSA id 4WNwcJ0HwYzJrV5; Tue, 16 Jul 2024 23:43:11 +0000 (UTC) From: =?UTF-8?Q?Andr=C3=A9?= Batista Date: Tue, 16 Jul 2024 20:43:06 -0300 Message-ID: <20240716234306.4667-1-nandre@riseup.net> In-Reply-To: <20240626133817.21595-1-nandre@riseup.net> References: <20240626133817.21595-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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: A52E713EB4 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -3.91 X-Spam-Score: -3.91 X-TUID: crWE6ye3LX3A Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603 and 2024-6604. See the Mozilla Foundation Security advisory 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 20240708190000. (%mullvadbrowser-version): Update to 13.5.1. (%mullvadbrowser-firefox-version): Update to 115.13.0esr-13.5-1-build3. (mullvadbrowser-translation-base): Update to 6ff73b6f7a6cec4849c2cd1e1ee1dc6fc8894169. (mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales replacement accordingly. Change-Id: I221788e6028375ee40ad7fcfb1d52cb95fc67759 --- 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 8172083957..3d17f6d566 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 "20240708120000") - -;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.5.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.13.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 "15d15edddfbd4611b4922fa1976e753c5be548ca") @@ -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 "20240708120000") + +;; To find the last version, look at https://www.torproject.org/download/. +(define %torbrowser-version "13.5.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.13.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 @@ -831,47 +817,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 "20240708190000") ;; 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.1") ;; 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.13.0esr-13.5-1-build3") ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-base @@ -879,11 +841,11 @@ (define mullvadbrowser-translation-base (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) + (commit "6ff73b6f7a6cec4849c2cd1e1ee1dc6fc8894169"))) (file-name "translation-base-browser") (sha256 (base32 - "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) + "11s4px6izzvja11qrr7g8whbmcn6yrvk2yc0k7jx628562hjwi3d")))) ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-specific @@ -911,7 +873,7 @@ (define mullvadbrowser-assets version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1bpchiz12zjyrzpgyk71naf1jdf3msjcjwggb1mziyawc6pyxj7v")))) + "1g0929852dicdrij5s8bpp97bci0clydg1q4s2sysarjnqki6hk1")))) (arguments (list #:install-plan @@ -954,7 +916,7 @@ (define-public mullvadbrowser %mullvadbrowser-firefox-version ".tar.xz")) (sha256 (base32 - "1xs4qwa3c6nfq6cj5q6asfrzki4brafg65g6hbn0fc9qqcmrhkv5")))) + "19hidpywdiz15q4443jsphd8hbbcz6qajvyivja0vqhy1d6s0avd")))) (arguments (substitute-keyword-arguments (package-arguments mullvadbrowser-base) ((#:phases phases) @@ -976,7 +938,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.1