From: "Clément Lassieur" <clement@lassieur.org>
To: 68067@debbugs.gnu.org
Cc: "Clément Lassieur" <clement@lassieur.org>
Subject: [bug#68067] [PATCH 8/8] gnu: torbrowser: Add bridges.
Date: Wed, 27 Dec 2023 22:12:14 +0100 [thread overview]
Message-ID: <248f9616249ce81b90d1fef8257f8efdf2110705.1703711347.git.clement@lassieur.org> (raw)
In-Reply-To: <87plyrjqzl.fsf@lassieur.org>
* 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 <dani.behzi@ubuntu.com>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Jim Newsome <jnewsome@torproject.org>
+;;; Copyright © 2023 Clément Lassieur <clement@lassieur.org>
;;;
;;; 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
--
2.41.0
next prev parent reply other threads:[~2023-12-27 21:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-27 21:05 [bug#68067] gnu: torbrowser: Add bridges Clément Lassieur
2023-12-27 21:12 ` [bug#68067] [PATCH 1/8] gnu: Add go-gitlab-com-yawning-edwards25519-extra Clément Lassieur
2023-12-27 21:12 ` [bug#68067] [PATCH 2/8] gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-goptlib Clément Lassieur
2023-12-27 21:12 ` [bug#68067] [PATCH 3/8] gnu: Add go-github-com-gaukas-godicttls Clément Lassieur
2023-12-27 21:12 ` [bug#68067] [PATCH 4/8] gnu: Add go-github-com-bwesterb-go-ristretto Clément Lassieur
2023-12-27 21:12 ` [bug#68067] [PATCH 5/8] gnu: Add go-github-com-cloudflare-circl Clément Lassieur
2023-12-27 21:12 ` [bug#68067] [PATCH 6/8] gnu: Add go-github-com-refraction-networking-utls Clément Lassieur
2023-12-27 21:12 ` [bug#68067] [PATCH 7/8] gnu: Add go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird Clément Lassieur
2023-12-27 21:12 ` Clément Lassieur [this message]
2024-01-12 18:03 ` bug#68067: gnu: torbrowser: Add bridges Clément Lassieur
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=248f9616249ce81b90d1fef8257f8efdf2110705.1703711347.git.clement@lassieur.org \
--to=clement@lassieur.org \
--cc=68067@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).