From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 2KWfFBgc22ZfnQAAe85BDQ:P1 (envelope-from ) for ; Fri, 06 Sep 2024 15:13:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id 2KWfFBgc22ZfnQAAe85BDQ (envelope-from ) for ; Fri, 06 Sep 2024 17:13:28 +0200 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=WtHn53KK; dkim=fail ("headers rsa verify failed") header.d=retrospec.tv header.s=fm3 header.b=dCXWngEq; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="L ThD9II"; 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=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1725635608; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: 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=CmCrJ3Zv11+ADDTp3NEmkecUYPRjTRVmP60Oz/1biGQ=; b=TtuqrZarzWRhYmF3drXXe+xNA6tZgqkAMeZitaJRdl8hmBcj8zAL25INP+4sdJNCu4eKXZ F4kqhkAdhaHrDhgvGFL/2YN+mt7tdp1jV+i2htyF56KJ4JFtDo63+mysWJssMesGrG7iy7 atgtJvawOgKzabJWh+YDXXFA3wV0cGHZrDllNTQrdyd82uXY7zjlwr/tJHiXlTkJ51pr/v 6SeVs1RjHP2Kw35NtqlfsFrGB/1PapfPVL09mdUg4DFU3AyW0AywWA6KMHC8kJ/rcGxT4o fKnco/AwfIzlqfXB0x4aAAtBoDYzQm3YzTECaGBSUaxm/mIlqrqX2M5Ee4x8xw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=WtHn53KK; dkim=fail ("headers rsa verify failed") header.d=retrospec.tv header.s=fm3 header.b=dCXWngEq; dkim=fail ("headers rsa verify failed") header.d=messagingengine.com header.s=fm1 header.b="L ThD9II"; 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=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1725635608; a=rsa-sha256; cv=none; b=BxdIWBj9Egj9/R6y2NUJJ1s/Y1NkQn2qRqwmbxoUc56W3M/m6y4BAzmLqMvuvUtUhGeluQ 70ueHcjc+AqJmdlS68PoQL/WZr6jp0rN4S1RAvDeCVZpf5KccxMpCT0EJJUJICu7jH/coL iMKtz/LKQsYEvfosGf5lS67ClBL9v4lk1CJD8wtIkc+gPCa0IBLvgveRUYxc58MMVsrU7z dX7FydY/Xm/gJP7IJN7VyEc8/wYXhAzR6CjVnaU17mpChC3wgj8/7db3UOXery9IPak/Pz 70W3yirYFjgrWGzsgtWEzqXu8knrhiFfEoFNXU5GnAvmJ8UrryIXkbXClxhoAw== 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 6773A6D7B9 for ; Fri, 06 Sep 2024 17:13:27 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smae0-00075t-8Z; Fri, 06 Sep 2024 11:13: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 1smady-00075k-Ki for guix-patches@gnu.org; Fri, 06 Sep 2024 11:13: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 1smady-0003xd-AM for guix-patches@gnu.org; Fri, 06 Sep 2024 11:13: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:In-reply-to:Date:From:References:To:Subject; bh=CmCrJ3Zv11+ADDTp3NEmkecUYPRjTRVmP60Oz/1biGQ=; b=WtHn53KKFVaBmYts1STbjGtEu8SQIjdeCkuROjuqoJaLlaoWCQZ2jpwlUW4jO2tI1k/HvGB2XX1rh7AHk5w1UOvRb3wI9mmVKhrszjySD8xdpYJgAmt5t/8qVAuKaj0n8mqyp0eZvvCt/9XqJeQUxm4IlX6pvhHoV/i+X2SaYvPVUCQkPatDF+CxykXM2L47ADqHeATPdfRsdpglxId1X3ULl544hE6ZHCKdbApNnvfVDrCGj6cBm3a3ls9QXasFhKdgtw7Wp8oSyGloV2RcAI2ryY5Ue32YwS+d7y456jwV16Fy8oeeD3PXcOxkixWlM244AnGPioguXOR5gE6TSw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1smadx-0005Lx-Q8 for guix-patches@gnu.org; Fri, 06 Sep 2024 11:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71782] [PATCH v5 3/4] gnu: torbrowser: Update to 13.5.3 [security fixes]. Resent-From: Ian Eure Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 06 Sep 2024 15:13:01 +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: =?UTF-8?Q?Andr=C3=A9?= Batista Cc: mhw@netris.org, jonathan.brielmaier@web.de, 71782@debbugs.gnu.org Received: via spool by 71782-submit@debbugs.gnu.org id=B71782.172563555620532 (code B ref 71782); Fri, 06 Sep 2024 15:13:01 +0000 Received: (at 71782) by debbugs.gnu.org; 6 Sep 2024 15:12:36 +0000 Received: from localhost ([127.0.0.1]:53845 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smadX-0005L4-8J for submit@debbugs.gnu.org; Fri, 06 Sep 2024 11:12:36 -0400 Received: from fhigh7-smtp.messagingengine.com ([103.168.172.158]:34795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1smadT-0005Ki-9p for 71782@debbugs.gnu.org; Fri, 06 Sep 2024 11:12:34 -0400 Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id CA4DB1140113; Fri, 6 Sep 2024 11:12:25 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Fri, 06 Sep 2024 11:12:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=retrospec.tv; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1725635545; x=1725721945; bh=CmCrJ3Zv11+ADDTp3NEmkecUYPRjTRVmP60Oz/1biGQ=; b= dCXWngEqTb6Vezo8mrtB5bV8KsBW2qy3PNgFC6EGqZiY9wkyYTMzq4ptgaCYd4VZ RnzM0pl6nj/pbXC2B3Q7WJAHx+utbyQG+SCKWUE0PuUVDcZcFphnkAwrYQx4PVjE 6493dxLJscyY5ItITushxf5z/Z3EEYchpSVg6mfQHvjBlUvuofrd9P8PpGtnxv1e To6ypCbWjG+lnVeFOTtGbl6fu+gsbUPYGspIZUpellVDPLmfYnRHdJxtG7g2qZZM 4zLLU6YFMkibw/YjRyr4KS8uKJm7/s0epDqoXzTf45sF52YS8H3mS9u/X57Ma5Qe BHPyEmcXAVsjYfYTFVeAUg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1725635545; x= 1725721945; bh=CmCrJ3Zv11+ADDTp3NEmkecUYPRjTRVmP60Oz/1biGQ=; b=L ThD9IIqz72Wp5Yd27UdEcgNb9y0O7swkHE42kHyuMI8Yzr3cAK14Yg0FUFcPBG6U FtarieId+4/rxgd1hainYlZfcxOxtYufD30AOmDziOumOz4y4b8GhqUJTQPkaZDr nlsrDKHEhjEngITQuq05X4bRwZu4MbG5Bmudqup7BzX6wKqh7y0tFD0sShN+untb VymmUPPPPoKtTcGkjzNO3N37JlMABx+wMOVDrwE/nDTK44zOU2kUfNOF7beoVCIW 1LQkhkxi3b4zZSj+M3/M/xXdlbZ3CTx7Q5SC2oxHxAvMl2rjaHciU/nfMBtAl9vU +pt0TJHdnhITeT2Wd+v+w== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddrudeiuddgkeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhepfhgfhffvvefuffgjkfggtgfgsehtqhertddtreej necuhfhrohhmpefkrghnucfguhhrvgcuoehirghnsehrvghtrhhoshhpvggtrdhtvheqne cuggftrfgrthhtvghrnhepvefgiedtffelgeeuvdeifeetveeuieejjedvveehfedtffet jefhkedvveelgeegnecuffhomhgrihhnpehmohiiihhllhgrrdhorhhgpdhtohhrphhroh hjvggtthdrohhrghdpghhithhhuhgsrdgtohhmpdhgnhhurdhorhhgnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepihgrnhesrhgvthhrohhsph gvtgdrthhvpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphht thhopehmhhifsehnvghtrhhishdrohhrghdprhgtphhtthhopehjohhnrghthhgrnhdrsg hrihgvlhhmrghivghrseifvggsrdguvgdprhgtphhtthhopeejudejkedvseguvggssghu ghhsrdhgnhhurdhorhhgpdhrtghpthhtohepnhgrnhgurhgvsehrihhsvghuphdrnhgvth X-ME-Proxy: Feedback-ID: id9014242:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 6 Sep 2024 11:12:24 -0400 (EDT) References: <20240905230801.5772-1-nandre@riseup.net> <20240905231807.5950-1-nandre@riseup.net> User-agent: mu4e 1.8.13; emacs 28.2 From: Ian Eure Date: Fri, 06 Sep 2024 08:05:28 -0700 In-reply-to: <20240905231807.5950-1-nandre@riseup.net> Message-ID: <878qw424vb.fsf@meson> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable 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: 6773A6D7B9 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -10.12 X-Spam-Score: -10.12 X-TUID: VbkUlWQZVcag Hi Andr=C3=A9, This all looks good to me. I built and ran both browsers and they=20 seem to be working how I=E2=80=99d expect. My only question is around the locale handling -- (gnu packages=20 gnuzilla) has a setup for these which I was able to reuse for=20 LibreWolf. Is that possible for mullvad and torbrowser? It would=20 be nice to have a unified way of handling this, instead of each=20 browser implementing its own strategy. That work can follow the merge of this patch series, but I think=20 it=E2=80=99s worth discussing. Thanks, =E2=80=94 Ian Andr=C3=A9 Batista writes: > Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603,=20 > 2024-6604, > 2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525,=20 > 2024-7526, > 2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383=20 > and > 2024-8384. > > See the Mozilla Foundation Security advisories > , > =20 > and > > for details. > > * gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update=20 > to > 20240903073000. > (%torbrowser-version): Update to 13.5.3. > (%torbrowser-firefox-version): Update to=20 > 115.15.0esr-13.5-1-build3. > (%torbrowser-locales): Change it to be a plain list of supported=20 > locales. > (firefox-locales): New variable. > (torbrowser-translation-base): Update to > daed2afc487d1b20efc17feb153156524c6f714b. > (torbrowser-translation-specific): Update to > 6374e3b09c0894b8452fa1ba0b99c807722fc805. > (lld-as-ld-wrapper-16): New variable. > (make-torbrowser)[native-inputs]: Add lld-as-ld-wrapper-16. Use > llvm-16 and clang-16. > [inputs]: Add firefox-locales. > [arguments] <#:phases>: Remove add-bridges. > setenv, copy-firefox-locales: Update MOZ_CHROME_MULTILOCALE=20 > to the > new %torbrowser-locales format. > copy-basebrowser-locales, copy-torbrowser-locales: Likewise=20 > and adjust > fluent file path. > deploy-fonts: Adjust regex expression. > autoconfig: Remove file-picker configuration workaround. See=20 > #71181. > > Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300 > --- > gnu/packages/tor-browsers.scm | 141=20 > +++++++++++++++------------------- > 1 file changed, 60 insertions(+), 81 deletions(-) > > diff --git a/gnu/packages/tor-browsers.scm=20 > b/gnu/packages/tor-browsers.scm > index ba6bbaa873..180dae6317 100644 > --- a/gnu/packages/tor-browsers.scm > +++ b/gnu/packages/tor-browsers.scm > @@ -21,7 +21,7 @@ > ;;; Copyright =C2=A9 2021 Baptiste Strazzul > ;;; Copyright =C2=A9 2022 SeerLite > ;;; Copyright =C2=A9 2024 Aleksandr Vityazev > -;;; Copyright =C2=A9 2020, 2021 Andr=C3=A9 Batista > +;;; Copyright =C2=A9 2020, 2021, 2024 Andr=C3=A9 Batista=20 > > ;;; > ;;; This file is part of GNU Guix. > ;;; > @@ -104,63 +104,48 @@ (define-syntax-rule (mozilla-locales=20 > (hash-string changeset locale) ...) > #~(list (cons #$locale #$(mozilla-locale locale changeset=20 > hash-string)) > ...)) >=20=20 > -;; 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=20 > updating changeset. > -(define %torbrowser-locales > - (mozilla-locales > - ;; sha256=20 > changeset locale > -=20 > ;;-----------------------------------------------------------------------= ---- > - ("1218mldjxybhgzdi0myzkwjr2fgnysl71pl847kr7wyn1j8wk3a5"=20 > "c25d00080479" "ar") > - ("11c96jhfzd3h46qhblhvn2acsn895ykynarai8r5pf0655nfjs0j"=20 > "2de60e3d6d0c" "ca") > - ("0yhycgb3s3kydbzy6f2q7f7g2lp975spr092prf9xp8ha62ghby7"=20 > "609edd15f9a9" "cs") > - ("1kzx94n36c5vv954j7w65djvb37c178zazy25b35l71q2rvhmlhj"=20 > "2197a99c9a08" "da") > - ("13h7hk11bbd0yq8gqdv7ndbizkgwlm3ybz225l3x2b5cnyjxyg14"=20 > "b7a533e5edc9" "de") > - ("13ay27vdrqfv2ysyi7c2jmz50lps7rff9rmnws1z7jkj0a5chwrn"=20 > "20baf15379d8" "el") > - ("0mdr5b6pqxjmg9c8064x3hpf53h6w9j8ghl32655sx9jh4v3ykza"=20 > "beff1baac7c5" "es-ES") > - ("1pnyg09j6r15w8m62lwj89x6rz4br877z60p8s1hlrb9hj2s3vdx"=20 > "ebe0b60b0b36" "fa") > - ("067r505626cvlrsalnndf2ykz3nnkiy0b8yaxzf1rracpzmp0hni"=20 > "d5ae6a933d71" "fi") > - ("0026zzjv2bqc8sg06yvyd0mhny6mwwvhpvzjrhv2fi5v4wkxapdj"=20 > "496c2eb73b82" "fr") > - ("1dxcp26y8siap4k54zsw7mqa7k0l4f1505rdf4hnnxrzf9a643g5"=20 > "2fcccb5b19b3" "ga-IE") > - ("14v6xnlyj65hzaz2rmzxcl4skjgm48426jgr9mwkwiqis587lp4a"=20 > "c53cea027f8f" "he") > - ("04fdw2gzb64fb51bvs0bwsidzlvkdahmcy76vdg3gfcxslnlpi3y"=20 > "5a76dd3b5d5c" "hu") > - ("0bpyxpclfy74bcsjrs1ajh2am4zv6j6j9q4gc4vz8pgvzy9354zp"=20 > "6e6de17dcac4" "id") > - ("131ph8n235kr6nj1pszk0m00nh6kl360r4qvx4hjm8s22mw0k8qd"=20 > "536265635dfe" "is") > - ("03fbp4vgkwyimfmbm4n8blx1m16yhms2wm8j4wlx2h3cpxp5r71k"=20 > "91951e37e2b8" "it") > - ("0ncm531d7ih7phcn9d83zwq0dfphvmzg3gmhqmrrkkbydi1g3pbb"=20 > "895dcf8bb524" "ja") > - ("1x3110v730ak522zfm8j3r3v1x5lq3ig82kcgyxkc49xywajy0ni"=20 > "d0819a64fc40" "ka") > - ("14rc9mr4ngxdzwpjagzhz47jazgp1a6vwb0vbwj31yxv9iwkrgzi"=20 > "6ef881aff44b" "ko") > - ("1gl85z550amhbaxp39zdj6yyvashj9xd4ampfhm9jdpbf6n5j2l8"=20 > "afcbc29a15e5" "lt") > - ("1hz5g3iprfkbd88ncppyksbhlws73lhs75nf62hangw8l73wdn69"=20 > "84f3d6c7e2da" "mk") > - ("14aq37ngnav5m2kcb4wavxwhp28ad4jzdkzc7i64h0qvvxq5n3hf"=20 > "c9ec27a5db3d" "ms") > - ("0h7dlnawm5mbcx4qdlz5c7n4axz2dpa677v13ljdgm2b5w76msmq"=20 > "5c1480ccc040" "my") > - ("1b12azc1n8j1i2l20v66r74q79zqjvc5sf9pd8rmj3xd0fkxzdp2"=20 > "fc1896a0a24d" "nb-NO") > - ("1fh4dhlb6hynlpb2997gssv9v8zk5b7qrw0sclggczb5pcpjk6wc"=20 > "7e6da4f01bdb" "nl") > - ("1w8x3jjrd28f6g6ywwxldizpiipfkr63dzqd74kjpg24s2lqzp80"=20 > "e86a451a9cb5" "pl") > - ("1v3v4n82sn7a4h2d9n653fmgc31mikacf59lvdj6gbwvzpjb5yfa"=20 > "94c3dbb67a5d" "pt-BR") > - ("061a4z0lffgks3wlr6yh5z7x9arcn804mjwvffcmibs106vzamyq"=20 > "470b13b5805b" "ro") > - ("1fxgh7nfxpg2zknvfff8igq9q1vm5n4q033v7lm2c0xn3dbl8m28"=20 > "402b2ecbf04d" "ru") > - ("1i119g6dnhzxmpaz5r2jr9yzm1v24v2q6m3z6bfz2yihj0w7m133"=20 > "f637484e72b6" "sq") > - ("1nllh3ax323sxwhj7xvwvbfnh4179332pcmpfyybw1vaid3nr39k"=20 > "bb2d5d96d69e" "sv-SE") > - ("136m68fd0641k3qqmsw6zp016cvvd0sipsyv6rx2b9nli56agz57"=20 > "0e6c56bf2ac9" "th") > - ("0q8p8bwq8an65yfdwzm4dhl6km68r83bv5i17kay2gak8msxxhsb"=20 > "91e611ae3f19" "tr") > - ("1f2g7rnxpr2gjzngfsv19g11vk9zqpyrv01pz07mw2z3ffbkxf0j"=20 > "99d5ffa0b81e" "uk") > - ("1rizwsfgr7vxm31bin3i7bwhcqa67wcylak3xa387dvgf1y9057i"=20 > "5fd44724e22d" "vi") > - ("02ifa94jfii5f166rwdvv8si3bazm4bcf4qhi59c8f1hxbavb52h"=20 > "081aeb1aa308" "zh-CN") > - ("0qx9sh56pqc2x5qrh386cp1fi1gidhcmxxpvqkg9nh2jbizahznr"=20 > "9015a180602e" "zh-TW"))) > - > ;; We copy the official build id, which is defined at > ;; tor-browser-build/rbm.conf (browser_release_date). > -(define %torbrowser-build-date "20240510190000") > +(define %torbrowser-build-date "20240903073000") >=20=20 > ;; To find the last version, look at=20 > https://www.torproject.org/download/. > -(define %torbrowser-version "13.0.16") > +(define %torbrowser-version "13.5.3") >=20=20 > ;; To find the last Firefox version, browse > ;;=20 > https://archive.torproject.org/tor-package-archive/torbrowser/<%torbrows= er-version> > ;; There should be only one archive that starts with > ;; "src-firefox-tor-browser-". > -(define %torbrowser-firefox-version=20 > "115.12.0esr-13.0-1-build1") > +(define %torbrowser-firefox-version=20 > "115.15.0esr-13.5-1-build3") > + > +;; See tor-browser-build/rbm.conf for the list. > +(define %torbrowser-locales (list "ar" "ca" "cs" "da" "de" "el"=20 > "es-ES" "fa" "fi" "fr" > + "ga-IE" "he" "hu" "id" "is"=20 > "it" "ja" "ka" "ko" "lt" > + "mk" "ms" "my" "nb-NO" "nl"=20 > "pl" "pt-BR" "ro" "ru" > + "sq" "sv-SE" "th" "tr" "uk"=20 > "vi" "zh-CN" "zh-TW")) > + > +;; See browser/locales/l10n-changesets.json for the commit. > +(define firefox-locales > + (let ((commit "d8d587117c7b9dcc6a4fbc38407ed2c831bb008f") > + (revision "0")) > + (package > + (name "firefox-locales") > + (version (git-version "0.0.0" revision commit)) > + (source > + (origin > + (method git-fetch) > + (uri (git-reference > + (url=20 > "https://github.com/mozilla-l10n/firefox-l10n") > + (commit commit))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > +=20 > "0a2ly29lli02jflqw78zjk7bp7h18fz935cc9csavi0cpdiixjv1")))) > + (build-system copy-build-system) > + (home-page=20 > "https://github.com/mozilla-l10n/firefox-l10n") > + (synopsis "Firefox Locales") > + (description "This package contains localized messages=20 > for all > +Firefox locales.") > + (license license:mpl2.0)))) >=20=20 > ;; See tor-browser-build/projects/translation/config. > (define torbrowser-translation-base > @@ -168,11 +153,11 @@ (define torbrowser-translation-base > (method git-fetch) > (uri (git-reference > (url=20 > "https://gitlab.torproject.org/tpo/translation.git") > - (commit "f28525699864f4e3d764c354130bd898ce5b20aa"))) > + (commit "daed2afc487d1b20efc17feb153156524c6f714b"))) > (file-name "translation-base-browser") > (sha256 > (base32 > -=20 > "1vf6nl7fdmlmg2gskf3w1xlsgcm0pxi54z2daz5nwr6q9gyi0lkf")))) > +=20 > "0psmmgw9dnjwdhjbqkd69q5q7sdwyjcwagh93ffrjk0v7ybc79dq")))) >=20=20 > ;; See tor-browser-build/projects/translation/config. > (define torbrowser-translation-specific > @@ -180,11 +165,11 @@ (define torbrowser-translation-specific > (method git-fetch) > (uri (git-reference > (url=20 > "https://gitlab.torproject.org/tpo/translation.git") > - (commit "b5d79336411e5a59c4861341ef9aa7353e0bcad9"))) > + (commit "6374e3b09c0894b8452fa1ba0b99c807722fc805"))) > (file-name "translation-tor-browser") > (sha256 > (base32 > -=20 > "0ahz69pxhgik7ynmdkbnx7v5l2v392i6dswjz057g4hwnd7d34fb")))) > +=20 > "1wd9iwcj2h70bp017pcdhgfiw2bs8zi68kljmpnk69pssd6cn8l3")))) >=20=20 > (define torbrowser-assets > ;; This is a prebuilt Torbrowser from which we take the=20 > assets we need. > @@ -200,7 +185,7 @@ (define torbrowser-assets > version "/tor-browser-linux-x86_64-" version=20 > ".tar.xz")) > (sha256 > (base32 > -=20 > "1kffam66bsaahzx212hw9lb03jwfr24hivzg067iyzilsldpc9c1")))) > +=20 > "0laz6yrm310iidddnas2w1s5wad183n9axjkgrf5cm5paj615343")))) > (arguments > (list > #:install-plan > @@ -215,6 +200,10 @@ (define torbrowser-assets > Browser.") > (license license:silofl1.1))) >=20=20 > +;;; A LLD wrapper that can be used as a (near) drop-in=20 > replacement to GNU ld. > +(define lld-as-ld-wrapper-16 > + (make-lld-wrapper lld-16 #:lld-as-ld? #t)) > + > (define* (make-torbrowser #:key > moz-app-name > moz-app-remotingname > @@ -238,10 +227,11 @@ (define* (make-torbrowser #:key > ".tar.xz")) > (sha256 > (base32 > -=20 > "1b70zyjyai6kk4y1kkl8jvrs56gg7z31kkad6bmdpd8jw4n71grx")))) > +=20 > "13b9ni6anv279drhbb5m95nnmgslrp6frsm0y4028nfqiprs7vj5")))) > (build-system mozilla-build-system) > (inputs > (list=20 > go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-l= yrebird > + firefox-locales > tor-client > alsa-lib > bash-minimal ;for wrap-program > @@ -293,8 +283,9 @@ (define* (make-torbrowser #:key > rust > `(,rust "cargo") > rust-cbindgen > - llvm-15 > - clang-15 > + lld-as-ld-wrapper-16 ; for cargo rustc > + llvm-16 > + clang-16 > perl > node-lts > python-wrapper > @@ -541,7 +532,7 @@ (define (runpaths-of-input label) > (setenv "MOZBUILD_STATE_PATH" > (in-vicinity (getcwd) ".mozbuild")) > (setenv "MOZ_CHROME_MULTILOCALE" > - (string-join (map car #$locales))) > + (string-join (list #$@locales))) > ;; Make build reproducible. > (setenv "MOZ_BUILD_DATE" #$build-date))) > (add-before 'configure 'mozconfig > @@ -555,14 +546,14 @@ (define (runpaths-of-input label) > ;; See tor-browser-build/projects/firefox/build. > (add-before 'configure 'copy-firefox-locales > (lambda _ > - (let ((l10ncentral ".mozbuild/l10n-central")) > + (let ((l10ncentral ".mozbuild/l10n-central") > + (ff-locales #$(this-package-input=20 > "firefox-locales"))) > (mkdir-p l10ncentral) > (for-each > (lambda (lang) > - (copy-recursively (cdr lang) > - (in-vicinity l10ncentral > - (car lang)))) > - #$locales)))) > + (copy-recursively (string-append ff-locales=20 > "/" lang) > + (in-vicinity l10ncentral=20 > lang))) > + (list #$@locales))))) > (add-after 'copy-firefox-locales=20 > 'copy-basebrowser-locales > (lambda _ > (let ((l10ncentral ".mozbuild/l10n-central")) > @@ -577,7 +568,7 @@ (define (runpaths-of-input label) > #f (string-join > '("mv" > "translation-base-browser/~a/base-browser.ftl" > - "~a/~a/browser/browser/")) > + "~a/~a/toolkit/toolkit/global/")) > lang l10ncentral lang)) > (system > (format > @@ -586,7 +577,7 @@ (define (runpaths-of-input label) > "translation-base-browser/~a/*" > "~a/~a/browser/chrome/browser/")) > lang l10ncentral lang))) > - (map car #$locales))))) > + (list #$@locales))))) > (add-after 'copy-basebrowser-locales=20 > 'copy-torbrowser-locales > (lambda _ > (let ((l10ncentral ".mozbuild/l10n-central")) > @@ -601,7 +592,7 @@ (define (runpaths-of-input label) > #f (string-join > '("mv" > "translation-tor-browser/~a/tor-browser.ftl" > - "~a/~a/browser/browser/")) > + "~a/~a/toolkit/toolkit/global/")) > lang l10ncentral lang)) > (system > (format > @@ -623,7 +614,7 @@ (define (runpaths-of-input label) > (format port " locale/~a/=20 > (chrome/locale/~a/*)~%" > lang lang) > (close port))) > - (map car #$locales))))) > + (list #$@locales))))) > (replace 'configure > (lambda _ > (invoke "./mach" "configure"))) > @@ -632,14 +623,6 @@ (define (runpaths-of-input label) > (substitute* > "toolkit/locales/en-US/toolkit/about/aboutAddons.ftl" > (("addons.mozilla.org") "gnuzilla.gnu.org")))) > - (add-before 'build 'add-bridges ;see deploy.sh > - (lambda _ > - (let ((port (open-file > -=20 > "browser/app/profile/000-tor-browser.js" "a"))) > - (display > - "#include=20 > ../../../tools/torbrowser/bridges.js" port) > - (newline port) > - (close port)))) > (replace 'build > (lambda* (#:key (make-flags '()) (parallel-build?=20 > #t) > #:allow-other-keys) > @@ -739,7 +722,7 @@ (define (runpaths-of-input label) > (copy-recursively (in-vicinity #$assets=20 > "fontconfig") > (in-vicinity lib=20 > "fontconfig")) > (substitute* (in-vicinity lib=20 > "fontconfig/fonts.conf") > - (("fonts") > + (("fonts") > (format #f "~a" (in-vicinity lib=20 > "fonts")))) > (delete-file-recursively (in-vicinity lib=20 > "fonts")) > (copy-recursively (in-vicinity #$assets=20 > "fonts") > @@ -805,11 +788,7 @@ (define (runpaths-of-input label) > "https://gnuzilla.gnu.org/mozzarella") > (format #t "pref(~s, ~s);~%" > "lightweightThemes.getMoreURL" > -=20 > "https://gnuzilla.gnu.org/mozzarella") > - ;; FIXME:=20 > https://github.com/NixOS/nixpkgs/issues/307095 > - (format #t "pref(~s, ~a);~%" > -=20 > "widget.use-xdg-desktop-portal.file-picker" > - "1")))))) > +=20 > "https://gnuzilla.gnu.org/mozzarella")))))) > (add-after 'autoconfig 'autoconfig-tor > (lambda* (#:key inputs #:allow-other-keys) > (let ((lib (in-vicinity #$output=20 > "lib/torbrowser"))