From patchwork Wed Dec 27 21:12:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Cl=C3=A9ment_Lassieur?= X-Patchwork-Id: 58114 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 E1DA827BBEA; Wed, 27 Dec 2023 21:14:21 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 E42D127BBE9 for ; Wed, 27 Dec 2023 21:14:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIbE7-0003wP-60; Wed, 27 Dec 2023 16:14:07 -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 1rIbE5-0003vn-O3 for guix-patches@gnu.org; Wed, 27 Dec 2023 16:14:05 -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 1rIbE5-0000IW-G0 for guix-patches@gnu.org; Wed, 27 Dec 2023 16:14:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIbE4-00079D-9b for guix-patches@gnu.org; Wed, 27 Dec 2023 16:14:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68067] [PATCH 8/8] gnu: torbrowser: Add bridges. Resent-From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Dec 2023 21:14:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 68067@debbugs.gnu.org Cc: =?utf-8?q?Cl=C3=A9ment?= Lassieur Received: via spool by 68067-submit@debbugs.gnu.org id=B68067.170371159627375 (code B ref 68067); Wed, 27 Dec 2023 21:14:04 +0000 Received: (at 68067) by debbugs.gnu.org; 27 Dec 2023 21:13:16 +0000 Received: from localhost ([127.0.0.1]:37933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIbDH-00077S-De for submit@debbugs.gnu.org; Wed, 27 Dec 2023 16:13:16 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:37531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIbD7-000760-4F for 68067@debbugs.gnu.org; Wed, 27 Dec 2023 16:13:06 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 2508F5C0074; Wed, 27 Dec 2023 16:13:01 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 27 Dec 2023 16:13:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; 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=fm1; t=1703711581; x=1703797981; bh=Vjp9U8C5vMK7NGZY+aHd2SeZeyDtDwTSvKsjLxlT8XA=; b= kA+/+BchQeq72ffE9GrfIKdCQhS72YKMOvQuhh7XTDStaB0Hhq2b8CvJ1fc+R64d JkvLtryIZlh2QKOcYVR8UjODYeR+nN6lsKnd0YjIODlC/5gMCWuko9rTiz3tEhqw BRB1H9hldF999JlBVYtvlLsSL26GrPtJB4+iuAPmib0luEd8vilVhC2ZVJdw3naK XEDko4YB8OSTedglTx1sT+wteGYIcbPeSN2jYOognv/RRNKzi9gLqXlo7RlGn3GM XL+KWsgk77RnYEV0/eDpGBut8yz3Wpz/OmL5D5sruV7SEb17mH11nWBATpH6L0XP O0tY3LqVUbO/9k+/YFt1JQ== 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=fm2; t=1703711581; x= 1703797981; bh=Vjp9U8C5vMK7NGZY+aHd2SeZeyDtDwTSvKsjLxlT8XA=; b=w i7gYZYn2I2x45m0+3d3X6f5PFTfPPbLmqM3ZBPdzJA9LB//YKo2ClBRCB+XYHLkF vMbJb2bgvknvrg1B92PNCcciTpF9i1+1EmRaZbGeLoV8rvT506bxCwSgOS/w3+Ya I0UjrEY0Cw4EZ+58XCMCbOsSFqBIq+WFC6sOt5kOBi9LNCMOvnT4MFayFjIcrYk4 AFPYa/UHBe2VKY8tGkIbvSpkGTzJg5xOv/53tMbDpW85vzHlqhrzjvD6XctmgkKs DDRoLUpTGbUOLmTk2paqBJlrWX+PWFmlYjIs1TD52ezRr5GblZ3WDKAQIwl5rD9O lb+PdWxmc9Z/d9+FRIvVQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvddvledgudegkecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhggtgfgse htkeertdertdejnecuhfhrohhmpeevlhormhgvnhhtucfnrghsshhivghurhcuoegtlhgv mhgvnhhtsehlrghsshhivghurhdrohhrgheqnecuggftrfgrthhtvghrnhepvdevleetff eihfdvvddttefhffetgffhkeetudeiieeghfehjedutdfhueefuddtnecuffhomhgrihhn pehmohiiihhllhgrrdhorhhgpdhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomheptghlvghmvghntheslhgrshhsihgvuhhrrdho rhhg X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 27 Dec 2023 16:13:00 -0500 (EST) From: =?utf-8?q?Cl=C3=A9ment?= Lassieur Date: Wed, 27 Dec 2023 22:12:14 +0100 Message-ID: <248f9616249ce81b90d1fef8257f8efdf2110705.1703711347.git.clement@lassieur.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <87plyrjqzl.fsf@lassieur.org> References: <87plyrjqzl.fsf@lassieur.org> 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 (torbrowser)[arguments]: Add an 'add-bridges' phase, update the 'deploy-assets' phase so to fix the lyrebird path. [inputs]: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird. Change-Id: I17c85486ab44178be9eab31a078f6392857a044f --- gnu/packages/tor.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index bbcc9e15d607..ad44b8f3a2e0 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021-2023 Danial Behzadi ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Jim Newsome +;;; Copyright © 2023 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,6 +53,7 @@ (define-module (gnu packages tor) #:use-module (gnu packages pcre) #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) + #:use-module (gnu packages golang) #:use-module (gnu packages gnuzilla) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -595,14 +597,27 @@ (define-public torbrowser (substitute* "toolkit/locales/en-US/toolkit/about/aboutAddons.ftl" (("addons.mozilla.org") "gnuzilla.gnu.org")))) - (add-after 'install 'deploy-assets + (add-before 'build 'add-bridges ;see deploy.sh (lambda _ + (let ((port (open-file + "browser/app/profile/000-tor-browser.js" "a"))) + (display + "#include ../../../tools/torbrowser/bridges.js" port) + (newline port) + (close port)))) + (add-after 'install 'deploy-assets + (lambda* (#:key inputs #:allow-other-keys) (let ((assets #$(this-package-input "torbrowser-assets")) (lib (in-vicinity #$output "lib/torbrowser")) (tor #$(this-package-input "tor-client"))) ;; TorBrowser/Data/Tor/torrc-defaults (copy-recursively (in-vicinity assets "TorBrowser") (in-vicinity lib "TorBrowser")) + (substitute* + (in-vicinity lib "TorBrowser/Data/Tor/torrc-defaults") + (("exec ./TorBrowser/Tor/PluggableTransports/lyrebird") + (string-append + "exec " (search-input-file inputs "bin/lyrebird")))) ;; The geoip and geoip6 files are in the same directory as ;; torrc-defaults. (See TorProcess.sys.mjs.) (mkdir-p (in-vicinity lib "TorBrowser/Data/Tor")) @@ -752,6 +767,7 @@ (define-public torbrowser (inputs (modify-inputs (package-inputs icecat-minimal) (append bash-minimal + go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird tor-client torbrowser-assets))) (propagated-inputs