From patchwork Thu Jan 18 23:19:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 59108 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 E578027BBE2; Thu, 18 Jan 2024 23:21:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 570C827BBE9 for ; Thu, 18 Jan 2024 23:21:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rQbh2-0003rU-37; Thu, 18 Jan 2024 18:21:04 -0500 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 1rQbh0-0003qo-OY for guix-patches@gnu.org; Thu, 18 Jan 2024 18:21:02 -0500 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 1rQbh0-0007R8-7E for guix-patches@gnu.org; Thu, 18 Jan 2024 18:21:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rQbh0-0006eF-6W; Thu, 18 Jan 2024 18:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68577] [PATCH 2/2] gnu: Add mullvad-browser. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: mhw@netris.org, nandre@riseup.net, jonathan.brielmaier@web.de, ian@retrospec.tv, guix-patches@gnu.org Resent-Date: Thu, 18 Jan 2024 23:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68577 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68577@debbugs.gnu.org Cc: =?utf-8?q?Cl=C3=A9ment?= Lassieur , Mark H Weaver , =?utf-8?b?QW5kcsOp?= Batista , Jonathan Brielmaier , Ian Eure X-Debbugs-Original-Xcc: Mark H Weaver , =?utf-8?b?QW5kcsOp?= Batista , Jonathan Brielmaier , Ian Eure Received: via spool by 68577-submit@debbugs.gnu.org id=B68577.170562004925521 (code B ref 68577); Thu, 18 Jan 2024 23:21:02 +0000 Received: (at 68577) by debbugs.gnu.org; 18 Jan 2024 23:20:49 +0000 Received: from localhost ([127.0.0.1]:56965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQbgm-0006dZ-Pm for submit@debbugs.gnu.org; Thu, 18 Jan 2024 18:20:49 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQbgi-0006d7-5c for 68577@debbugs.gnu.org; Thu, 18 Jan 2024 18:20:45 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 1C9905C0129; Thu, 18 Jan 2024 18:20:37 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Thu, 18 Jan 2024 18:20:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm2; t=1705620037; x= 1705706437; bh=gsqWj5yN6ChSQ4Dk1AAHn6epb2gyJjBjYmvMLuYy810=; b=C Z/oqZQT+use7IykYFqtXiy8cLzHKRIOSoQnkyS9LNycC40kx0AHXQZ2lvUWUB3Pw 3eq7wcBpAqaZxGWudtYZMJfv0SDZKMP/gpEM7tJYw67/8H3H+1vCNFht/5fTe10z Ofyc/C4C8D4feVYg6vj/3rlf56XlrREm8bBLTBGuiquoCQvfdxn1oEYOM9Kt9wuI q+7sg1LgM98BOLVQQ1R3pq+I2fgc032XBLF7+4GUmBt8f5Xuyr/sTpv8OkyoT5V0 D1y1qxgWyiyoKvqtGC/YAbaYj1w1wP5MSnxJ9j47h1cvMzy4svWZiy7JQK7pjk// lHiSAi1cI6o30TV36Q0JQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=fm3; t=1705620037; x= 1705706437; bh=gsqWj5yN6ChSQ4Dk1AAHn6epb2gyJjBjYmvMLuYy810=; b=n wrEd0MdlhpXVELTJjXJa0M0Vvike2mxPbJpcrr88cjjlQHTUpBxxnfxCEb2pW8/Q ZQQWAZxGxS9LG1OCQJ0+O8M7Eb3Nvh72GcEeDLLFjcfbipWUGbUho+y39XEfh4GW sh32IzE7dm9bJi5qLsnmv5m8+rotcgxONwdvSAkzOLFyB9CzI0rxvRNrxc0lUviB EOAFS49IJVY5rGalJFbpt7o7oLWQSxsn2PxmQV2N7juEb3dfRd7Oud3v30BHGgro hSVI99pQmI7Wm1bsHCjROpJ3TRHjMTmg8zNMPg2EWbm+p48AgV9A/LxCmYZC7SQQ zNdU2VX3GL4FHTncceCKw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejledgtdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertdejnecuhfhrohhmpeevlhormhgvnhhtucfnrghsshhivghurhcuoegtlhgvmhgv nhhtsehlrghsshhivghurhdrohhrgheqnecuggftrfgrthhtvghrnheptdejleegkeevie evhfduudfgvefggeejvdejtedutedtvedujeetffefheffieejnecuffhomhgrihhnpehm uhhllhhvrggurdhnvghtpdhtohhrphhrohhjvggtthdrohhrghenucevlhhushhtvghruf hiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegtlhgvmhgvnhhtsehlrghsshhi vghurhdrohhrgh X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Jan 2024 18:20:36 -0500 (EST) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Fri, 19 Jan 2024 00:19:59 +0100 Message-ID: <174f8492bd3c72fa1bd186ee29e66eb837684768.1705619435.git.clement@lassieur.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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.scm (%mullvadbrowser-version, %mullvadbrowser-firefox-version, %mullvadbrowser-locales, translation-mullvad-browser, mullvadbrowser-assets, mullvadbrowser-base, mullvadbrowser): New variables. Change-Id: Ie6d48823b3794710f60f0ae201a0297925221f66 --- gnu/packages/tor.scm | 131 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 131 insertions(+) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 6eb0c7609f0b..357b561874c7 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -879,3 +879,134 @@ (define-public torbrowser #:assets torbrowser-assets #:locales %torbrowser-locales #:base-browser-version %torbrowser-version)) + +;; To find the last version, look at +;; https://mullvad.net/en/download/browser/linux. +(define %mullvadbrowser-version "13.0.7") + +;; 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.6.0esr-13.0-1-build1") + +;; Use the list in tor-browser-build/rbm.conf. +(define %mullvadbrowser-locales + '("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")) + +;; See tor-browser-build/projects/translation/config. +(define translation-mullvad-browser + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.torproject.org/tpo/translation.git") + (commit "57de1569da0e2c48fd999a13e555f6b522041993"))) + (file-name "translation-mullvad-browser") + (sha256 + (base32 + "1q3979ac92c5mib573hx9w06x3hrfw7r52wzmj9r75sz2hhsmrq3")))) + +(define-public mullvadbrowser-assets + ;; This is a prebuilt Mullvad Browser from which we take the assets we need. + (package + (name "mullvadbrowser-assets") + (version %mullvadbrowser-version) + (source + (origin + (method url-fetch) + (uri + (string-append + "https://archive.torproject.org/tor-package-archive/mullvadbrowser/" + version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) + (sha256 + (base32 + "1i7vf7cn6s5iajsp4999jpxxn8qblljrrmfs4nswmc2swdmi07gk")))) + (arguments + (list + #:install-plan + ''(("Browser" "." #:include-regexp + ("^\\./fonts/" + "^\\./fontconfig/fonts.conf" + ;; Mullvad Browser Extension + "^\\./distribution/extensions/\\{d19a89b9-76c1-4a61-bcd4-49e8de916403\\}.xpi" + ))))) + (build-system copy-build-system) + (home-page "https://www.torproject.org") + (synopsis "Mullvad Browser assets") + (description "This package contains fonts and configuration files for +Mullvad Browser.") + (license license:silofl1.1))) + +(define mullvadbrowser-base + (make-torbrowser #:moz-app-name "mullvadbrowser" + #:moz-app-remotingname "Mullvad Browser" + #:branding-directory "browser/branding/mb-release" + #:assets mullvadbrowser-assets + #:locales %mullvadbrowser-locales + #:base-browser-version %mullvadbrowser-version)) + +(define-public mullvadbrowser + (package + (inherit mullvadbrowser-base) + (name "mullvadbrowser") + (version %mullvadbrowser-version) + (source + (origin + (method url-fetch) + (uri + (string-append + "https://archive.torproject.org/tor-package-archive/mullvadbrowser/" + version "/src-firefox-mullvad-browser-" + %mullvadbrowser-firefox-version ".tar.xz")) + (sha256 + (base32 + "1hhmq0sh949vzs3mhh0pmpd2llgw149mv7kzzg2ylj8h2628y0px")))) + (arguments + (substitute-keyword-arguments (package-arguments mullvadbrowser-base) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'ublock-private-allowed + (lambda _ + (substitute* "toolkit/components/extensions/Extension.sys.mjs" + ;; The code that gives the correct permission only applies to + ;; distribution add-ons (see installDistributionAddon() in + ;; XPIProvider.jsm). + (("this.isNoScript") + "this.isNoScript || this.id === \"uBlock0@raymondhill.net\"")))) + ;; See tor-browser-build/projects/firefox/build. + (replace 'copy-torbrowser-locales + (lambda _ + (for-each + (lambda (lang) + (system + (format #f "cp -Lr ~a/~a .mozbuild/l10n-central/" + #$translation-mullvad-browser lang))) + '#$%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 + ;; values are already the default values for Icecat and Tor + ;; Browser. + (lambda _ + (substitute* "browser/moz.configure" + (("\"MOZ_DEDICATED_PROFILES\", True") + "\"MOZ_DEDICATED_PROFILES\", False") + (("\"MOZ_BLOCK_PROFILE_DOWNGRADE\", True") + "\"MOZ_BLOCK_PROFILE_DOWNGRADE\", False")))) + (add-after 'deploy-fonts 'deploy-extension + (lambda* (#:key inputs #:allow-other-keys) + (let ((lib (in-vicinity #$output "lib/mullvadbrowser"))) + ;; Mullvad Browser Extension (FIXME: package it) + (copy-recursively + (in-vicinity #$mullvadbrowser-assets "distribution") + (in-vicinity lib "distribution"))))) + (delete 'deploy-tor-assets) + (delete 'autoconfig-tor))))) + (inputs (package-inputs icecat-minimal)) + (propagated-inputs + (list noscript/icecat + ublock-origin/icecat)) + (synopsis "Privacy-focused browser") + (description "Mullvad Browser is a privacy-focused web browser designed to +be used with a trustworthy VPN instead of the Tor Network.")))