gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
;;; GNU Guix --- Functional package management for GNU
|
|
|
|
|
;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
|
|
|
|
|
;;; Copyright © 2013-2022 Ludovic Courtès <ludo@gnu.org>
|
|
|
|
|
;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Mark H Weaver <mhw@netris.org>
|
|
|
|
|
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
|
|
|
|
;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner <efraim@flashner.co.il>
|
|
|
|
|
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
|
|
|
|
;;; Copyright © 2017, 2023, 2024 Clément Lassieur <clement@lassieur.org>
|
|
|
|
|
;;; Copyright © 2017, 2018 Nikita <nikita@n0.is>
|
|
|
|
|
;;; Copyright © 2017, 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
|
|
|
|
|
;;; Copyright © 2018, 2020 Ricardo Wurmus <rekado@elephly.net>
|
|
|
|
|
;;; Copyright © 2019 Ivan Petkov <ivanppetkov@gmail.com>
|
|
|
|
|
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
|
|
|
|
|
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
|
|
|
|
|
;;; Copyright © 2019, 2020 Adrian Malacoda <malacoda@monarch-pass.net>
|
|
|
|
|
;;; Copyright © 2020-2023 Jonathan Brielmaier <jonathan.brielmaier@web.de>
|
|
|
|
|
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
|
|
|
|
|
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
|
|
|
|
|
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
|
|
|
|
|
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
|
|
|
|
;;; Copyright © 2021 Baptiste Strazzul <bstrazzull@hotmail.fr>
|
|
|
|
|
;;; Copyright © 2022 SeerLite <seerlite@disroot.org>
|
|
|
|
|
;;; Copyright © 2024 Aleksandr Vityazev <avityazew@gmail.com>
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
;;; Copyright © 2020, 2021, 2024 André Batista <nandre@riseup.net>
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
;;;
|
|
|
|
|
;;; This file is part of GNU Guix.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is free software; you can redistribute it and/or modify it
|
|
|
|
|
;;; under the terms of the GNU General Public License as published by
|
|
|
|
|
;;; the Free Software Foundation; either version 3 of the License, or (at
|
|
|
|
|
;;; your option) any later version.
|
|
|
|
|
;;;
|
|
|
|
|
;;; GNU Guix is distributed in the hope that it will be useful, but
|
|
|
|
|
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
;;; GNU General Public License for more details.
|
|
|
|
|
;;;
|
|
|
|
|
;;; You should have received a copy of the GNU General Public License
|
|
|
|
|
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
(define-module (gnu packages tor-browsers)
|
|
|
|
|
#:use-module ((guix licenses) #:prefix license:)
|
|
|
|
|
#:use-module (gnu packages assembly)
|
|
|
|
|
#:use-module (gnu packages base)
|
2024-06-24 10:09:26 -04:00
|
|
|
|
#:use-module (gnu packages bash)
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
#:use-module (gnu packages browser-extensions)
|
|
|
|
|
#:use-module (gnu packages compression)
|
|
|
|
|
#:use-module (gnu packages cups)
|
2024-02-03 14:42:36 -05:00
|
|
|
|
#:use-module (gnu packages freedesktop)
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
#:use-module (gnu packages fontutils)
|
|
|
|
|
#:use-module (gnu packages gl)
|
|
|
|
|
#:use-module (gnu packages glib)
|
|
|
|
|
#:use-module (gnu packages gnome)
|
|
|
|
|
#:use-module (gnu packages golang)
|
|
|
|
|
#:use-module (gnu packages gtk)
|
|
|
|
|
#:use-module (gnu packages hunspell)
|
2024-02-13 15:34:03 -05:00
|
|
|
|
#:use-module (gnu packages icu4c)
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
#:use-module (gnu packages image)
|
|
|
|
|
#:use-module (gnu packages kerberos)
|
|
|
|
|
#:use-module (gnu packages libcanberra)
|
|
|
|
|
#:use-module (gnu packages libevent)
|
|
|
|
|
#:use-module (gnu packages libffi)
|
|
|
|
|
#:use-module (gnu packages linux)
|
|
|
|
|
#:use-module (gnu packages llvm)
|
|
|
|
|
#:use-module (gnu packages m4)
|
|
|
|
|
#:use-module (gnu packages node)
|
|
|
|
|
#:use-module (gnu packages nss)
|
|
|
|
|
#:use-module (gnu packages pciutils)
|
|
|
|
|
#:use-module (gnu packages perl)
|
|
|
|
|
#:use-module (gnu packages pkg-config)
|
|
|
|
|
#:use-module (gnu packages pulseaudio)
|
|
|
|
|
#:use-module (gnu packages python)
|
|
|
|
|
#:use-module (gnu packages rust)
|
|
|
|
|
#:use-module (gnu packages rust-apps)
|
|
|
|
|
#:use-module (gnu packages sqlite)
|
|
|
|
|
#:use-module (gnu packages tor)
|
|
|
|
|
#:use-module (gnu packages video)
|
|
|
|
|
#:use-module (gnu packages xdisorg)
|
|
|
|
|
#:use-module (gnu packages xorg)
|
|
|
|
|
#:use-module (gnu packages)
|
|
|
|
|
#:use-module (guix build-system cargo)
|
|
|
|
|
#:use-module (guix build-system copy)
|
|
|
|
|
#:use-module (guix build-system gnu)
|
|
|
|
|
#:use-module (guix build-system mozilla)
|
|
|
|
|
#:use-module (guix download)
|
|
|
|
|
#:use-module (guix gexp)
|
|
|
|
|
#:use-module (guix git-download)
|
|
|
|
|
#:use-module (guix hg-download)
|
|
|
|
|
#:use-module (guix packages)
|
|
|
|
|
#:use-module (ice-9 regex)
|
|
|
|
|
#:use-module (guix utils))
|
|
|
|
|
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
;; 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 "https://github.com/mozilla-l10n/firefox-l10n")
|
|
|
|
|
(commit commit)))
|
|
|
|
|
(file-name (git-file-name name version))
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
|
|
|
|
"0a2ly29lli02jflqw78zjk7bp7h18fz935cc9csavi0cpdiixjv1"))))
|
|
|
|
|
(build-system copy-build-system)
|
|
|
|
|
(home-page "https://github.com/mozilla-l10n/firefox-l10n")
|
|
|
|
|
(synopsis "Firefox Locales")
|
|
|
|
|
(description "This package contains localized messages for all
|
|
|
|
|
Firefox locales.")
|
|
|
|
|
(license license:mpl2.0))))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
;; We copy the official build id, which is defined at
|
|
|
|
|
;; tor-browser-build/rbm.conf (browser_release_date).
|
|
|
|
|
(define %torbrowser-build-date "20240903073000")
|
|
|
|
|
|
|
|
|
|
;; To find the last version, look at https://www.torproject.org/download/.
|
|
|
|
|
(define %torbrowser-version "13.5.3")
|
|
|
|
|
|
|
|
|
|
;; 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.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" "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"))
|
|
|
|
|
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
;; See tor-browser-build/projects/translation/config.
|
2024-03-21 07:22:22 -04:00
|
|
|
|
(define torbrowser-translation-base
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(origin
|
|
|
|
|
(method git-fetch)
|
|
|
|
|
(uri (git-reference
|
|
|
|
|
(url "https://gitlab.torproject.org/tpo/translation.git")
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
(commit "daed2afc487d1b20efc17feb153156524c6f714b")))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(file-name "translation-base-browser")
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
"0psmmgw9dnjwdhjbqkd69q5q7sdwyjcwagh93ffrjk0v7ybc79dq"))))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
|
|
|
|
|
;; See tor-browser-build/projects/translation/config.
|
2024-03-21 07:22:22 -04:00
|
|
|
|
(define torbrowser-translation-specific
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(origin
|
|
|
|
|
(method git-fetch)
|
|
|
|
|
(uri (git-reference
|
|
|
|
|
(url "https://gitlab.torproject.org/tpo/translation.git")
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
(commit "6374e3b09c0894b8452fa1ba0b99c807722fc805")))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(file-name "translation-tor-browser")
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
"1wd9iwcj2h70bp017pcdhgfiw2bs8zi68kljmpnk69pssd6cn8l3"))))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
|
|
|
|
|
(define torbrowser-assets
|
|
|
|
|
;; This is a prebuilt Torbrowser from which we take the assets we need.
|
|
|
|
|
(package
|
|
|
|
|
(name "torbrowser-assets")
|
|
|
|
|
(version %torbrowser-version)
|
|
|
|
|
(source
|
|
|
|
|
(origin
|
|
|
|
|
(method url-fetch)
|
|
|
|
|
(uri
|
|
|
|
|
(string-append
|
|
|
|
|
"https://archive.torproject.org/tor-package-archive/torbrowser/"
|
|
|
|
|
version "/tor-browser-linux-x86_64-" version ".tar.xz"))
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
"0laz6yrm310iidddnas2w1s5wad183n9axjkgrf5cm5paj615343"))))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(arguments
|
|
|
|
|
(list
|
|
|
|
|
#:install-plan
|
|
|
|
|
''(("Browser" "." #:include-regexp
|
|
|
|
|
("^\\./TorBrowser/Data/Tor/torrc-defaults"
|
|
|
|
|
"^\\./fonts/"
|
|
|
|
|
"^\\./fontconfig/fonts.conf")))))
|
|
|
|
|
(build-system copy-build-system)
|
|
|
|
|
(home-page "https://www.torproject.org")
|
|
|
|
|
(synopsis "Tor Browser assets")
|
|
|
|
|
(description "This package contains fonts and configuration files for Tor
|
|
|
|
|
Browser.")
|
|
|
|
|
(license license:silofl1.1)))
|
|
|
|
|
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
;;; A LLD wrapper that can be used as a (near) drop-in replacement to GNU ld.
|
|
|
|
|
(define lld-as-ld-wrapper-16
|
|
|
|
|
(make-lld-wrapper lld-16 #:lld-as-ld? #t))
|
|
|
|
|
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(define* (make-torbrowser #:key
|
|
|
|
|
moz-app-name
|
|
|
|
|
moz-app-remotingname
|
|
|
|
|
branding-directory
|
2024-03-21 07:22:22 -04:00
|
|
|
|
translation-base
|
|
|
|
|
translation-specific
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
assets
|
|
|
|
|
locales
|
2023-12-12 10:46:03 -05:00
|
|
|
|
build-date
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
base-browser-version)
|
|
|
|
|
(package
|
|
|
|
|
(name "torbrowser")
|
|
|
|
|
(version %torbrowser-version)
|
|
|
|
|
(source
|
|
|
|
|
(origin
|
|
|
|
|
(method url-fetch)
|
|
|
|
|
(uri
|
|
|
|
|
(string-append
|
|
|
|
|
"https://archive.torproject.org/tor-package-archive/torbrowser/"
|
|
|
|
|
version "/src-firefox-tor-browser-" %torbrowser-firefox-version
|
|
|
|
|
".tar.xz"))
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
"13b9ni6anv279drhbb5m95nnmgslrp6frsm0y4028nfqiprs7vj5"))))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(build-system mozilla-build-system)
|
|
|
|
|
(inputs
|
|
|
|
|
(list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
firefox-locales
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
tor-client
|
|
|
|
|
alsa-lib
|
2024-06-24 00:36:56 -04:00
|
|
|
|
bash-minimal ;for wrap-program
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
bzip2
|
|
|
|
|
cups
|
|
|
|
|
dbus-glib
|
|
|
|
|
gdk-pixbuf
|
|
|
|
|
glib
|
|
|
|
|
gtk+
|
|
|
|
|
;; UNBUNDLE-ME! graphite2
|
|
|
|
|
cairo
|
|
|
|
|
pango
|
|
|
|
|
freetype
|
|
|
|
|
;; UNBUNDLE-ME! harfbuzz
|
|
|
|
|
libcanberra
|
|
|
|
|
libgnome
|
|
|
|
|
libjpeg-turbo
|
|
|
|
|
libpng-apng
|
|
|
|
|
;; UNBUNDLE-ME! libogg
|
|
|
|
|
;; UNBUNDLE-ME! libtheora ; wants theora-1.2, not yet released
|
|
|
|
|
;; UNBUNDLE-ME! libvorbis
|
|
|
|
|
libxft
|
|
|
|
|
libevent
|
|
|
|
|
libxinerama
|
|
|
|
|
libxscrnsaver
|
|
|
|
|
libxcomposite
|
|
|
|
|
libxt
|
|
|
|
|
libffi
|
2024-06-01 11:31:33 -04:00
|
|
|
|
ffmpeg
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
libvpx
|
2024-02-13 15:34:03 -05:00
|
|
|
|
icu4c-73
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
pixman
|
|
|
|
|
pulseaudio
|
|
|
|
|
mesa
|
|
|
|
|
pciutils
|
|
|
|
|
mit-krb5
|
|
|
|
|
hunspell
|
|
|
|
|
libnotify
|
|
|
|
|
nspr
|
|
|
|
|
;; UNBUNDLE-ME! nss (pending upgrade of 'nss' to 3.90 or later)
|
|
|
|
|
shared-mime-info
|
|
|
|
|
sqlite
|
|
|
|
|
eudev
|
|
|
|
|
unzip
|
|
|
|
|
zip
|
|
|
|
|
zlib))
|
|
|
|
|
(native-inputs
|
|
|
|
|
(list
|
|
|
|
|
rust
|
|
|
|
|
`(,rust "cargo")
|
2024-03-11 14:31:16 -04:00
|
|
|
|
rust-cbindgen
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
lld-as-ld-wrapper-16 ; for cargo rustc
|
|
|
|
|
llvm-16
|
|
|
|
|
clang-16
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
perl
|
|
|
|
|
node-lts
|
|
|
|
|
python-wrapper
|
|
|
|
|
yasm
|
|
|
|
|
nasm ; XXX FIXME: only needed on x86_64 and i686
|
|
|
|
|
pkg-config
|
|
|
|
|
m4
|
|
|
|
|
which))
|
|
|
|
|
(arguments
|
|
|
|
|
(list
|
|
|
|
|
#:tests? #f ;not worth the cost
|
|
|
|
|
|
|
|
|
|
;; Some dynamic lib was determined at runtime, so rpath check may fail.
|
|
|
|
|
#:validate-runpath? #f
|
|
|
|
|
|
|
|
|
|
#:configure-flags
|
|
|
|
|
#~(list
|
|
|
|
|
"--without-relative-data-dir" ;store is read-only
|
|
|
|
|
"--disable-base-browser-update"
|
|
|
|
|
;; Default is "default", which is the same as "nightly".
|
|
|
|
|
"--enable-update-channel=release"
|
|
|
|
|
;; This is useless right now but it might be used in the future.
|
|
|
|
|
;; (See nsAppFileLocationProvider.cpp.)
|
|
|
|
|
(string-append "--with-user-appdir=." #$moz-app-name)
|
|
|
|
|
(string-append "--with-branding=" #$branding-directory)
|
|
|
|
|
(string-append "--prefix=" #$output)
|
|
|
|
|
(string-append "--with-base-browser-version="
|
|
|
|
|
#$base-browser-version)
|
|
|
|
|
|
|
|
|
|
"--enable-application=browser"
|
|
|
|
|
"--with-distribution-id=org.gnu"
|
|
|
|
|
"--enable-geckodriver"
|
|
|
|
|
;; Do not require addons in the global app or system directories to
|
|
|
|
|
;; be signed by Mozilla.
|
|
|
|
|
"--with-unsigned-addon-scopes=app,system"
|
|
|
|
|
"--allow-addon-sideload"
|
|
|
|
|
|
|
|
|
|
"--enable-pulseaudio"
|
|
|
|
|
|
|
|
|
|
"--disable-tests"
|
|
|
|
|
"--disable-updater"
|
|
|
|
|
"--disable-crashreporter"
|
|
|
|
|
;; The --disable-eme option is not available on aarch64.
|
|
|
|
|
#$(if (target-aarch64?) "" "--disable-eme")
|
|
|
|
|
|
|
|
|
|
;; Building with debugging symbols takes ~5GiB, so disable it.
|
|
|
|
|
"--disable-debug"
|
|
|
|
|
"--disable-debug-symbols"
|
|
|
|
|
|
|
|
|
|
"--enable-rust-simd"
|
|
|
|
|
"--enable-release"
|
|
|
|
|
"--enable-optimize"
|
|
|
|
|
"--enable-strip"
|
|
|
|
|
"--disable-elf-hack"
|
|
|
|
|
|
|
|
|
|
;; Clang is needed to build Stylo, Mozilla's new CSS engine. We must
|
|
|
|
|
;; specify the clang paths manually, because otherwise the Mozilla
|
|
|
|
|
;; build system looks in the directories returned by llvm-config
|
|
|
|
|
;; --bindir and llvm-config --libdir, which return paths in the llvm
|
|
|
|
|
;; package where clang is not found.
|
|
|
|
|
(string-append "--with-clang-path="
|
|
|
|
|
(search-input-file %build-inputs "bin/clang"))
|
|
|
|
|
(string-append "--with-libclang-path="
|
|
|
|
|
(dirname (search-input-file %build-inputs
|
|
|
|
|
"lib/libclang.so")))
|
|
|
|
|
|
|
|
|
|
;; Hack to work around missing "unofficial" branding in icecat.
|
|
|
|
|
"--enable-official-branding"
|
|
|
|
|
|
|
|
|
|
;; TODO: Add support for wasm sandboxed libraries.
|
|
|
|
|
"--without-wasm-sandboxed-libraries"
|
|
|
|
|
|
|
|
|
|
;; Avoid bundled libraries.
|
|
|
|
|
"--with-system-jpeg" ;must be libjpeg-turbo
|
|
|
|
|
"--with-system-png" ;must be libpng-apng
|
|
|
|
|
"--with-system-zlib"
|
|
|
|
|
;; UNBUNDLE-ME! "--with-system-bz2"
|
|
|
|
|
;; UNBUNDLE-ME! "--with-system-libevent"
|
|
|
|
|
;; UNBUNDLE-ME! "--with-system-ogg"
|
|
|
|
|
;; UNBUNDLE-ME! "--with-system-vorbis"
|
|
|
|
|
;; UNBUNDLE-ME! "--with-system-theora" ; wants theora-1.2, not yet released
|
|
|
|
|
;; UNBUNDLE-ME! "--with-system-libvpx"
|
|
|
|
|
"--with-system-icu"
|
|
|
|
|
"--with-system-nspr"
|
|
|
|
|
;; UNBUNDLE-ME! "--with-system-nss" ; pending upgrade of 'nss' to 3.90
|
|
|
|
|
|
|
|
|
|
;; UNBUNDLE-ME! "--with-system-harfbuzz"
|
|
|
|
|
;; UNBUNDLE-ME! "--with-system-graphite2"
|
|
|
|
|
"--enable-system-pixman"
|
|
|
|
|
"--enable-system-ffi"
|
|
|
|
|
;; UNBUNDLE-ME! "--enable-system-sqlite"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
#:imported-modules %cargo-utils-modules ;for `generate-all-checksums'
|
|
|
|
|
|
|
|
|
|
#:modules `((ice-9 ftw)
|
|
|
|
|
(ice-9 match)
|
|
|
|
|
(srfi srfi-1)
|
|
|
|
|
(srfi srfi-26)
|
|
|
|
|
(rnrs bytevectors)
|
|
|
|
|
(rnrs io ports)
|
|
|
|
|
(guix elf)
|
|
|
|
|
(guix build gremlin)
|
2023-10-09 11:10:48 -04:00
|
|
|
|
,@%default-gnu-imported-modules)
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
#:phases
|
|
|
|
|
#~(modify-phases %standard-phases
|
|
|
|
|
(add-after 'unpack 'apply-guix-specific-patches
|
|
|
|
|
(lambda _
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (file) (invoke "patch" "--force" "-p1" "-i" file))
|
|
|
|
|
'(#$(local-file
|
|
|
|
|
(search-patch "icecat-compare-paths.patch"))
|
|
|
|
|
#$(local-file
|
|
|
|
|
(search-patch "icecat-use-system-wide-dir.patch"))))))
|
|
|
|
|
(add-after 'apply-guix-specific-patches 'remove-bundled-libraries
|
|
|
|
|
(lambda _
|
|
|
|
|
;; Remove bundled libraries that we don't use, since they may
|
|
|
|
|
;; contain unpatched security flaws, they waste disk space and
|
|
|
|
|
;; memory, and may cause confusion.
|
|
|
|
|
(for-each (lambda (file)
|
|
|
|
|
(format #t "deleting '~a'...~%" file)
|
|
|
|
|
(delete-file-recursively file))
|
|
|
|
|
'( ;; FIXME: Removing the bundled icu breaks configure.
|
|
|
|
|
;; * The bundled icu headers are used in some places.
|
|
|
|
|
;; * The version number is taken from the bundled copy.
|
|
|
|
|
;;"intl/icu"
|
|
|
|
|
;;
|
|
|
|
|
;; FIXME: A script from the bundled nspr is used.
|
|
|
|
|
;;"nsprpub"
|
|
|
|
|
;;
|
|
|
|
|
;; FIXME: Some of the bundled NSS sources are used
|
|
|
|
|
;; to build third_party/prio.
|
|
|
|
|
;;"security/nss"
|
|
|
|
|
;;
|
|
|
|
|
;; TODO: Use more system media libraries. See:
|
|
|
|
|
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=517422>
|
|
|
|
|
;; * libtheora: esr60 wants v1.2, not yet released.
|
|
|
|
|
;; * soundtouch: avoiding the bundled library would
|
|
|
|
|
;; result in some loss of functionality. There's
|
|
|
|
|
;; also an issue with exception handling
|
|
|
|
|
;; configuration. It seems that this is needed in
|
|
|
|
|
;; some moz.build:
|
|
|
|
|
;; DEFINES['ST_NO_EXCEPTION_HANDLING'] = 1
|
|
|
|
|
;; * libopus
|
|
|
|
|
;; * speex
|
|
|
|
|
;;
|
|
|
|
|
"modules/freetype2"
|
|
|
|
|
;; "media/libjpeg" ; needed for now, because media/libjpeg/moz.build is referenced from config/external/moz.build
|
|
|
|
|
;; UNBUNDLE-ME! "modules/zlib"
|
|
|
|
|
;; UNBUNDLE-ME! "ipc/chromium/src/third_party/libevent"
|
|
|
|
|
;; UNBUNDLE-ME! "media/libvpx"
|
|
|
|
|
;; UNBUNDLE-ME! "media/libogg"
|
|
|
|
|
;; UNBUNDLE-ME! "media/libvorbis"
|
|
|
|
|
;; UNBUNDLE-ME! "media/libtheora" ; wants theora-1.2, not yet released
|
|
|
|
|
;; UNBUNDLE-ME! "media/libtremor"
|
|
|
|
|
;; UNBUNDLE-ME! "gfx/harfbuzz"
|
|
|
|
|
;; UNBUNDLE-ME! "gfx/graphite2"
|
|
|
|
|
"js/src/ctypes/libffi"
|
|
|
|
|
;; UNBUNDLE-ME! "db/sqlite3"
|
|
|
|
|
))))
|
|
|
|
|
(add-after 'remove-bundled-libraries 'fix-ffmpeg-runtime-linker
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
;; Arrange to load libavcodec.so by its absolute file name.
|
|
|
|
|
(substitute* "dom/media/platforms/ffmpeg/FFmpegRuntimeLinker.cpp"
|
|
|
|
|
(("libavcodec\\.so")
|
|
|
|
|
(search-input-file inputs "lib/libavcodec.so")))))
|
|
|
|
|
(add-after 'fix-ffmpeg-runtime-linker 'build-sandbox-whitelist
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(define (runpath-of lib)
|
|
|
|
|
(call-with-input-file lib
|
|
|
|
|
(compose elf-dynamic-info-runpath
|
|
|
|
|
elf-dynamic-info
|
|
|
|
|
parse-elf
|
|
|
|
|
get-bytevector-all)))
|
|
|
|
|
(define (runpaths-of-input label)
|
|
|
|
|
(let* ((dir (string-append (assoc-ref inputs label) "/lib"))
|
|
|
|
|
(libs (find-files dir "\\.so$")))
|
|
|
|
|
(append-map runpath-of libs)))
|
|
|
|
|
;; Populate the sandbox read-path whitelist as needed by ffmpeg.
|
|
|
|
|
(let* ((whitelist
|
|
|
|
|
(map (cut string-append <> "/")
|
|
|
|
|
(delete-duplicates
|
|
|
|
|
`(,(string-append (assoc-ref inputs "shared-mime-info")
|
|
|
|
|
"/share/mime")
|
|
|
|
|
,@(append-map runpaths-of-input
|
|
|
|
|
'("mesa" "ffmpeg"))))))
|
|
|
|
|
(whitelist-string (string-join whitelist ",")))
|
|
|
|
|
(with-output-to-file "whitelist.txt"
|
|
|
|
|
(lambda ()
|
|
|
|
|
(display whitelist-string))))))
|
|
|
|
|
(add-after 'patch-source-shebangs 'patch-cargo-checksums
|
|
|
|
|
(lambda _
|
|
|
|
|
(use-modules (guix build cargo-utils))
|
|
|
|
|
(let ((null-hash "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
|
|
|
|
|
(for-each (lambda (file)
|
|
|
|
|
(format #t "patching checksums in ~a~%" file)
|
|
|
|
|
(substitute* file
|
|
|
|
|
(("^checksum = \".*\"")
|
|
|
|
|
(string-append "checksum = \"" null-hash "\""))))
|
|
|
|
|
(find-files "." "Cargo.lock$"))
|
|
|
|
|
(for-each generate-all-checksums
|
|
|
|
|
'("services"
|
|
|
|
|
"js"
|
|
|
|
|
"third_party/rust"
|
|
|
|
|
"dom/media"
|
|
|
|
|
"dom/webauthn"
|
|
|
|
|
"toolkit"
|
|
|
|
|
"gfx"
|
|
|
|
|
"storage"
|
|
|
|
|
"modules"
|
|
|
|
|
"xpcom/rust"
|
|
|
|
|
"media"
|
|
|
|
|
"mozglue/static/rust"
|
|
|
|
|
"netwerk"
|
|
|
|
|
"remote"
|
|
|
|
|
"intl"
|
|
|
|
|
"servo"
|
|
|
|
|
"security/manager/ssl"
|
|
|
|
|
"build")))))
|
|
|
|
|
(add-after 'patch-cargo-checksums 'remove-cargo-frozen-flag
|
|
|
|
|
(lambda _
|
|
|
|
|
;; Remove --frozen flag from cargo invokation, otherwise it'll
|
|
|
|
|
;; complain that it's not able to change Cargo.lock.
|
|
|
|
|
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373
|
|
|
|
|
(substitute* "build/RunCbindgen.py"
|
|
|
|
|
(("\"--frozen\",") ""))))
|
|
|
|
|
(delete 'bootstrap)
|
|
|
|
|
(add-before 'configure 'setenv
|
|
|
|
|
(lambda _
|
|
|
|
|
(setenv "CONFIG_SHELL" (which "bash"))
|
|
|
|
|
;; Install location is prefix/lib/$MOZ_APP_NAME. Also
|
|
|
|
|
;; $MOZ_APP_NAME is the executable name. Default is
|
|
|
|
|
;; "firefox".
|
|
|
|
|
(setenv "MOZ_APP_NAME" #$moz-app-name)
|
|
|
|
|
;; Profile location (relative to "~/."). Default is
|
|
|
|
|
;; lower($MOZ_APP_VENDOR/$MOZ_APP_BASENAME), which is:
|
|
|
|
|
;; ~/.tor project/firefox.
|
|
|
|
|
(setenv "MOZ_APP_PROFILE" #$(in-vicinity
|
|
|
|
|
moz-app-name "browser"))
|
|
|
|
|
;; WM_CLASS (default is "$MOZ_APP_NAME-$MOZ_UPDATE_CHANNEL").
|
|
|
|
|
(setenv "MOZ_APP_REMOTINGNAME" #$moz-app-remotingname)
|
|
|
|
|
;; Persistent state directory for the build system (default is
|
|
|
|
|
;; $HOME/.mozbuild).
|
|
|
|
|
(setenv "MOZBUILD_STATE_PATH"
|
|
|
|
|
(in-vicinity (getcwd) ".mozbuild"))
|
|
|
|
|
(setenv "MOZ_CHROME_MULTILOCALE"
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
(string-join (list #$@locales)))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
;; Make build reproducible.
|
2023-12-12 10:46:03 -05:00
|
|
|
|
(setenv "MOZ_BUILD_DATE" #$build-date)))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(add-before 'configure 'mozconfig
|
|
|
|
|
(lambda* (#:key configure-flags #:allow-other-keys)
|
|
|
|
|
(with-output-to-file "mozconfig"
|
|
|
|
|
(lambda ()
|
|
|
|
|
(format #t ". $topsrcdir/mozconfig-linux-x86_64~%")
|
|
|
|
|
(for-each (lambda (flag)
|
|
|
|
|
(format #t "ac_add_options ~a~%" flag))
|
|
|
|
|
configure-flags)))))
|
|
|
|
|
;; See tor-browser-build/projects/firefox/build.
|
|
|
|
|
(add-before 'configure 'copy-firefox-locales
|
|
|
|
|
(lambda _
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
(let ((l10ncentral ".mozbuild/l10n-central")
|
|
|
|
|
(ff-locales #$(this-package-input "firefox-locales")))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(mkdir-p l10ncentral)
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (lang)
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
(copy-recursively (string-append ff-locales "/" lang)
|
|
|
|
|
(in-vicinity l10ncentral lang)))
|
|
|
|
|
(list #$@locales)))))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(add-after 'copy-firefox-locales 'copy-basebrowser-locales
|
|
|
|
|
(lambda _
|
|
|
|
|
(let ((l10ncentral ".mozbuild/l10n-central"))
|
|
|
|
|
;; Temporary copy so that we can use ‘mv’ to mimic
|
|
|
|
|
;; tor-browser-build/projects/firefox/build.
|
2024-03-21 07:22:22 -04:00
|
|
|
|
(copy-recursively #$translation-base
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
"translation-base-browser")
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (lang)
|
|
|
|
|
(system
|
|
|
|
|
(format
|
|
|
|
|
#f (string-join
|
|
|
|
|
'("mv"
|
|
|
|
|
"translation-base-browser/~a/base-browser.ftl"
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
"~a/~a/toolkit/toolkit/global/"))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
lang l10ncentral lang))
|
|
|
|
|
(system
|
|
|
|
|
(format
|
|
|
|
|
#f (string-join
|
|
|
|
|
'("mv"
|
|
|
|
|
"translation-base-browser/~a/*"
|
|
|
|
|
"~a/~a/browser/chrome/browser/"))
|
|
|
|
|
lang l10ncentral lang)))
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
(list #$@locales)))))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(add-after 'copy-basebrowser-locales 'copy-torbrowser-locales
|
|
|
|
|
(lambda _
|
|
|
|
|
(let ((l10ncentral ".mozbuild/l10n-central"))
|
|
|
|
|
;; Temporary copy so that we can use ‘mv’ to mimic
|
|
|
|
|
;; tor-browser-build/projects/firefox/build.
|
2024-03-21 07:22:22 -04:00
|
|
|
|
(copy-recursively #$translation-specific
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
"translation-tor-browser")
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (lang)
|
|
|
|
|
(system
|
|
|
|
|
(format
|
|
|
|
|
#f (string-join
|
|
|
|
|
'("mv"
|
|
|
|
|
"translation-tor-browser/~a/tor-browser.ftl"
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
"~a/~a/toolkit/toolkit/global/"))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
lang l10ncentral lang))
|
|
|
|
|
(system
|
|
|
|
|
(format
|
|
|
|
|
#f (string-join
|
|
|
|
|
'("mv"
|
|
|
|
|
"translation-tor-browser/~a/cryptoSafetyPrompt.properties"
|
|
|
|
|
"~a/~a/browser/chrome/browser/"))
|
|
|
|
|
lang l10ncentral lang))
|
|
|
|
|
(system
|
|
|
|
|
(format
|
|
|
|
|
#f (string-join
|
|
|
|
|
'("mv"
|
|
|
|
|
"translation-tor-browser/~a"
|
|
|
|
|
"toolkit/torbutton/chrome/locale/"))
|
|
|
|
|
lang))
|
|
|
|
|
(let ((port (open-file "toolkit/torbutton/jar.mn" "a")))
|
|
|
|
|
(format port "% locale torbutton ~a %locale/~a/~%"
|
|
|
|
|
lang lang)
|
|
|
|
|
(format port " locale/~a/ (chrome/locale/~a/*)~%"
|
|
|
|
|
lang lang)
|
|
|
|
|
(close port)))
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
(list #$@locales)))))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(replace 'configure
|
|
|
|
|
(lambda _
|
|
|
|
|
(invoke "./mach" "configure")))
|
|
|
|
|
(add-before 'build 'fix-addons-placeholder
|
|
|
|
|
(lambda _
|
|
|
|
|
(substitute*
|
|
|
|
|
"toolkit/locales/en-US/toolkit/about/aboutAddons.ftl"
|
|
|
|
|
(("addons.mozilla.org") "gnuzilla.gnu.org"))))
|
|
|
|
|
(replace 'build
|
|
|
|
|
(lambda* (#:key (make-flags '()) (parallel-build? #t)
|
|
|
|
|
#:allow-other-keys)
|
|
|
|
|
(apply invoke "./mach" "build"
|
|
|
|
|
;; mach will use a wide parallel build if possible by
|
|
|
|
|
;; default, so reign it in if requested.
|
|
|
|
|
`(,(string-append
|
|
|
|
|
"-j" (number->string (if parallel-build?
|
|
|
|
|
(parallel-job-count)
|
|
|
|
|
1)))
|
|
|
|
|
,@make-flags))))
|
|
|
|
|
;; See tor-browser-build/projects/firefox/build.
|
|
|
|
|
(add-after 'build 'build-locales
|
|
|
|
|
(lambda _
|
|
|
|
|
(system (string-join '("./mach package-multi-locale --locales"
|
|
|
|
|
"en-US $MOZ_CHROME_MULTILOCALE")))))
|
|
|
|
|
(add-after 'build-locales 'neutralise-store-references
|
|
|
|
|
(lambda _
|
|
|
|
|
;; Mangle the store references to compilers & other build tools in
|
|
|
|
|
;; about:buildconfig, reducing IceCat's closure by 1 GiB on x86-64.
|
|
|
|
|
(let* ((obj-dir (match (scandir "." (cut string-prefix? "obj-" <>))
|
|
|
|
|
((dir) dir)))
|
|
|
|
|
(file (string-append
|
|
|
|
|
obj-dir
|
|
|
|
|
"/dist/bin/chrome/toolkit/content/global/buildconfig.html")))
|
|
|
|
|
(substitute* file
|
|
|
|
|
(("[0-9a-df-np-sv-z]{32}" hash)
|
|
|
|
|
(string-append (string-take hash 8)
|
|
|
|
|
"<!-- Guix: not a runtime dependency -->"
|
|
|
|
|
(string-drop hash 8)))))))
|
|
|
|
|
(replace 'install
|
|
|
|
|
(lambda* (#:key outputs #:allow-other-keys)
|
|
|
|
|
(invoke "./mach" "install")
|
|
|
|
|
;; The geckodriver binary is not installed by the above, for some
|
|
|
|
|
;; reason. Use 'find-files' to avoid having to deal with the
|
|
|
|
|
;; system/architecture-specific file name.
|
|
|
|
|
(install-file (first (find-files "." "geckodriver"))
|
|
|
|
|
(string-append #$output "/bin"))))
|
|
|
|
|
(add-after 'install 'wrap-program
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(let* ((gtk #$(this-package-input "gtk+"))
|
|
|
|
|
(gtk-share (string-append gtk "/share"))
|
|
|
|
|
(fonts.conf (format #f "~a/lib/~a/fontconfig/fonts.conf"
|
|
|
|
|
#$output #$moz-app-name))
|
|
|
|
|
(ld-libs '#$(cons
|
|
|
|
|
(file-append
|
|
|
|
|
(this-package-input "libcanberra")
|
|
|
|
|
"/lib/gtk-3.0/modules")
|
|
|
|
|
(map (lambda (label)
|
|
|
|
|
(file-append (this-package-input label) "/lib"))
|
|
|
|
|
'("libpng-apng"
|
|
|
|
|
"libxscrnsaver"
|
|
|
|
|
"mesa"
|
|
|
|
|
"pciutils"
|
|
|
|
|
"mit-krb5"
|
|
|
|
|
"eudev"
|
|
|
|
|
"pulseaudio"
|
|
|
|
|
;; For the integration of native notifications
|
|
|
|
|
;; (same reason as icedove)
|
|
|
|
|
"libnotify")))))
|
|
|
|
|
(wrap-program (format #f "~a/lib/~a/~a"
|
|
|
|
|
#$output #$moz-app-name #$moz-app-name)
|
|
|
|
|
`("XDG_DATA_DIRS" prefix (,gtk-share))
|
|
|
|
|
;; The following line is commented out because the icecat
|
|
|
|
|
;; package on guix has been observed to be unstable when
|
|
|
|
|
;; using wayland, and the bundled extensions stop working.
|
|
|
|
|
;; `("MOZ_ENABLE_WAYLAND" = ("1"))
|
|
|
|
|
`("LD_LIBRARY_PATH" prefix ,ld-libs)
|
|
|
|
|
`("FONTCONFIG_FILE" prefix (,fonts.conf))))))
|
|
|
|
|
(add-after 'wrap-program 'install-desktop-entry
|
|
|
|
|
(lambda _
|
|
|
|
|
(let ((apps (in-vicinity #$output "share/applications")))
|
|
|
|
|
(mkdir-p apps)
|
|
|
|
|
(make-desktop-entry-file
|
|
|
|
|
(string-append apps "/" #$moz-app-name ".desktop")
|
|
|
|
|
#:name #$moz-app-remotingname
|
|
|
|
|
#:exec (format #f "~a/bin/~a %u" #$output #$moz-app-name)
|
|
|
|
|
#:categories '("Network" "WebBrowser" "Security")
|
|
|
|
|
#:startup-w-m-class #$moz-app-remotingname
|
|
|
|
|
#:icon #$moz-app-name))))
|
|
|
|
|
(add-after 'install-desktop-entry 'install-icons
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(for-each
|
|
|
|
|
(lambda (size)
|
|
|
|
|
(let ((oldpath (string-append
|
|
|
|
|
#$branding-directory "/default" size ".png"))
|
|
|
|
|
(newpath (string-append
|
|
|
|
|
#$output "/share/icons/hicolor/" size "x"
|
|
|
|
|
size "/apps/" #$moz-app-name ".png")))
|
|
|
|
|
(mkdir-p (dirname newpath))
|
|
|
|
|
(copy-file oldpath newpath)))
|
|
|
|
|
'("16" "22" "24" "32" "48" "64" "128" "256"))))
|
|
|
|
|
(add-after 'install 'deploy-fonts
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(let ((lib (string-append #$output "/lib/" #$moz-app-name)))
|
|
|
|
|
;; Fonts
|
|
|
|
|
(copy-recursively (in-vicinity #$assets "fontconfig")
|
|
|
|
|
(in-vicinity lib "fontconfig"))
|
|
|
|
|
(substitute* (in-vicinity lib "fontconfig/fonts.conf")
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
(("<dir prefix=\"cwd\">fonts</dir>")
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(format #f "<dir>~a</dir>" (in-vicinity lib "fonts"))))
|
|
|
|
|
(delete-file-recursively (in-vicinity lib "fonts"))
|
|
|
|
|
(copy-recursively (in-vicinity #$assets "fonts")
|
|
|
|
|
(in-vicinity lib "fonts")))))
|
|
|
|
|
(add-after 'deploy-fonts 'deploy-tor-assets
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(let ((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"))
|
|
|
|
|
(copy-file (in-vicinity tor "share/tor/geoip6")
|
|
|
|
|
(in-vicinity lib "TorBrowser/Data/Tor/geoip6"))
|
|
|
|
|
(copy-file (in-vicinity tor "share/tor/geoip")
|
|
|
|
|
(in-vicinity lib "TorBrowser/Data/Tor/geoip")))))
|
|
|
|
|
(add-after 'install 'autoconfig
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(let ((lib (string-append #$output "/lib/" #$moz-app-name))
|
|
|
|
|
(config-file (string-append #$moz-app-name ".cfg")))
|
|
|
|
|
(with-output-to-file (in-vicinity
|
|
|
|
|
lib "defaults/pref/autoconfig.js")
|
|
|
|
|
(lambda ()
|
|
|
|
|
(format #t "// first line must be a comment~%")
|
|
|
|
|
(format #t "pref(~s, ~s);~%"
|
|
|
|
|
"general.config.filename" config-file)
|
|
|
|
|
(format #t "pref(~s, ~a);~%"
|
|
|
|
|
"general.config.obscure_value" "0")))
|
|
|
|
|
(with-output-to-file (in-vicinity lib config-file)
|
|
|
|
|
(lambda ()
|
|
|
|
|
(format #t "// first line must be a comment~%")
|
|
|
|
|
;; Required for Guix packaged extensions
|
|
|
|
|
;; SCOPE_PROFILE=1, SCOPE_APPLICATION=4, SCOPE_SYSTEM=8
|
|
|
|
|
;; Default is 5.
|
|
|
|
|
(format #t "pref(~s, ~a);~%"
|
|
|
|
|
"extensions.enabledScopes" "13")
|
|
|
|
|
(format #t "pref(~s, ~s);~%"
|
|
|
|
|
"security.sandbox.content.read_path_whitelist"
|
|
|
|
|
(call-with-input-file "whitelist.txt"
|
|
|
|
|
get-string-all))
|
|
|
|
|
;; Add-ons pannel (see settings.js in Icecat source).
|
|
|
|
|
(format #t "pref(~s, ~s);~%"
|
|
|
|
|
"extensions.getAddons.search.browseURL"
|
|
|
|
|
"https://gnuzilla.gnu.org/mozzarella")
|
|
|
|
|
(format #t "pref(~s, ~s);~%"
|
|
|
|
|
"extensions.getAddons.get.url"
|
|
|
|
|
"https://gnuzilla.gnu.org/mozzarella")
|
|
|
|
|
(format #t "pref(~s, ~s);~%"
|
|
|
|
|
"extensions.getAddons.link.url"
|
|
|
|
|
"https://gnuzilla.gnu.org/mozzarella")
|
|
|
|
|
(format #t "pref(~s, ~s);~%"
|
|
|
|
|
"extensions.getAddons.discovery.api_url"
|
|
|
|
|
"https://gnuzilla.gnu.org/mozzarella")
|
|
|
|
|
(format #t "pref(~s, ~s);~%"
|
|
|
|
|
"extensions.getAddons.langpacks.url"
|
|
|
|
|
"https://gnuzilla.gnu.org/mozzarella")
|
|
|
|
|
(format #t "pref(~s, ~s);~%"
|
|
|
|
|
"lightweightThemes.getMoreURL"
|
gnu: torbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
for details.
* gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to
20240903073000.
(%torbrowser-version): Update to 13.5.3.
(%torbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build3.
(%torbrowser-locales): Change it to be a plain list of supported 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 to the
new %torbrowser-locales format.
copy-basebrowser-locales, copy-torbrowser-locales: Likewise and adjust
fluent file path.
deploy-fonts: Adjust regex expression.
autoconfig: Remove file-picker configuration workaround. See #71181.
Change-Id: Idf182607798d9111c30db63fe926b7f8cb3ce300
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:03 -04:00
|
|
|
|
"https://gnuzilla.gnu.org/mozzarella"))))))
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
(add-after 'autoconfig 'autoconfig-tor
|
|
|
|
|
(lambda* (#:key inputs #:allow-other-keys)
|
|
|
|
|
(let ((lib (in-vicinity #$output "lib/torbrowser"))
|
|
|
|
|
(config-file (string-append #$moz-app-name ".cfg")))
|
|
|
|
|
(let ((port (open-file (in-vicinity lib config-file) "a")))
|
|
|
|
|
(format port "pref(~s, ~s);~%"
|
|
|
|
|
"extensions.torlauncher.torrc-defaults_path"
|
|
|
|
|
(in-vicinity
|
|
|
|
|
lib "TorBrowser/Data/Tor/torrc-defaults"))
|
|
|
|
|
(format port "pref(~s, ~s);~%"
|
|
|
|
|
"extensions.torlauncher.tor_path"
|
|
|
|
|
(search-input-file inputs "bin/tor"))
|
|
|
|
|
(close port))))))))
|
|
|
|
|
(propagated-inputs
|
|
|
|
|
(list noscript/icecat))
|
|
|
|
|
(native-search-paths
|
|
|
|
|
(list (search-path-specification
|
|
|
|
|
(variable "ICECAT_SYSTEM_DIR")
|
|
|
|
|
(separator #f) ;single entry
|
|
|
|
|
(files '("lib/icecat")))))
|
|
|
|
|
(home-page "https://www.torproject.org")
|
|
|
|
|
(synopsis "Anonymous browser derived from Mozilla Firefox")
|
|
|
|
|
(description
|
|
|
|
|
"Tor Browser is the Tor Project version of Firefox browser. It is the
|
|
|
|
|
only recommended way to anonymously browse the web that is supported by the
|
2024-05-30 12:08:11 -04:00
|
|
|
|
project. It modifies Firefox in order to avoid many known application level
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
attacks on the privacy of Tor users.")
|
|
|
|
|
(license license:mpl2.0))) ;And others, see
|
|
|
|
|
;toolkit/content/license.html
|
|
|
|
|
|
|
|
|
|
(define-public torbrowser
|
|
|
|
|
(make-torbrowser #:moz-app-name "torbrowser"
|
|
|
|
|
#:moz-app-remotingname "Tor Browser"
|
|
|
|
|
#:branding-directory "browser/branding/tb-release"
|
2024-03-21 07:22:22 -04:00
|
|
|
|
#:translation-base torbrowser-translation-base
|
|
|
|
|
#:translation-specific torbrowser-translation-specific
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
#:assets torbrowser-assets
|
|
|
|
|
#:locales %torbrowser-locales
|
2023-12-12 10:46:03 -05:00
|
|
|
|
#:build-date %torbrowser-build-date
|
gnu: torbrowser: Stop inheriting Icecat.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add packages/tor-browsers.scm.
* gnu/packages/gnupg.scm: Remove fix for dependency loop (fixed because we use
a new file).
* gnu/packages/tor-browsers.scm (mozilla-locale, mozilla-locales,
%torbrowser-locales, %moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): New variables.
(make-torbrowser): New procedure, which is a merge of ‘make-torbrowser’ (from
tor.scm) with ‘icecat-minimal’ (from gnuzilla.scm).
* gnu/packages/tor.scm (%moz-build-date, %torbrowser-version,
%torbrowser-firefox-version, %torbrowser-locales, translation-base-browser,
translation-tor-browser, torbrowser-assets, torbrowser): Remove variables.
Change-Id: I5fcf73e53fe4481a18e13cdeb3515c3dc4430090
2024-01-17 06:56:03 -05:00
|
|
|
|
#:base-browser-version %torbrowser-version))
|
2023-12-12 10:46:03 -05:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;; See tor-browser-build/rbm.conf for the list.
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
(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"))
|
2023-12-12 10:46:03 -05:00
|
|
|
|
|
|
|
|
|
;; We copy the official build id, which can be found there:
|
|
|
|
|
;; https://cdn.mullvad.net/browser/update_responses/update_1/release.
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
(define %mullvadbrowser-build-date "20240903073000")
|
2023-12-12 10:46:03 -05:00
|
|
|
|
|
|
|
|
|
;; To find the last version, look at
|
|
|
|
|
;; https://mullvad.net/en/download/browser/linux.
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
(define %mullvadbrowser-version "13.5.3")
|
2023-12-12 10:46:03 -05:00
|
|
|
|
|
|
|
|
|
;; 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-".
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
(define %mullvadbrowser-firefox-version "115.15.0esr-13.5-1-build2")
|
2023-12-12 10:46:03 -05:00
|
|
|
|
|
|
|
|
|
;; See tor-browser-build/projects/translation/config.
|
2024-03-21 07:22:22 -04:00
|
|
|
|
(define mullvadbrowser-translation-base
|
|
|
|
|
(origin
|
|
|
|
|
(method git-fetch)
|
|
|
|
|
(uri (git-reference
|
|
|
|
|
(url "https://gitlab.torproject.org/tpo/translation.git")
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
(commit "daed2afc487d1b20efc17feb153156524c6f714b")))
|
2024-03-21 07:22:22 -04:00
|
|
|
|
(file-name "translation-base-browser")
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
"0psmmgw9dnjwdhjbqkd69q5q7sdwyjcwagh93ffrjk0v7ybc79dq"))))
|
2024-03-21 07:22:22 -04:00
|
|
|
|
|
|
|
|
|
;; See tor-browser-build/projects/translation/config.
|
|
|
|
|
(define mullvadbrowser-translation-specific
|
2023-12-12 10:46:03 -05:00
|
|
|
|
(origin
|
|
|
|
|
(method git-fetch)
|
|
|
|
|
(uri (git-reference
|
|
|
|
|
(url "https://gitlab.torproject.org/tpo/translation.git")
|
2024-06-12 14:31:22 -04:00
|
|
|
|
(commit "bff8092bbe5ae93b2c162ade300d739b2cd9e92d")))
|
2023-12-12 10:46:03 -05:00
|
|
|
|
(file-name "translation-mullvad-browser")
|
|
|
|
|
(sha256
|
|
|
|
|
(base32
|
2024-06-12 14:31:22 -04:00
|
|
|
|
"0742ylhz80445a28ssp2hpshy0dvr12h2c1mcv5pjdipzcwhgil8"))))
|
2023-12-12 10:46:03 -05:00
|
|
|
|
|
|
|
|
|
(define 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
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
"17sqin4fnvq96plarv0iv8r801i19gh7v7szg2vrmcynay8qx4mc"))))
|
2023-12-12 10:46:03 -05:00
|
|
|
|
(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"
|
2024-03-21 07:22:22 -04:00
|
|
|
|
#:translation-base mullvadbrowser-translation-base
|
|
|
|
|
#:translation-specific mullvadbrowser-translation-specific
|
2023-12-12 10:46:03 -05:00
|
|
|
|
#:assets mullvadbrowser-assets
|
|
|
|
|
#:locales %mullvadbrowser-locales
|
|
|
|
|
#:build-date %mullvadbrowser-build-date
|
|
|
|
|
#: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
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
"1c6jjw0x8bjz74q15a7vskrd0ji5ic19mzr9f2laivhznjy0r12c"))))
|
2023-12-12 10:46:03 -05:00
|
|
|
|
(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")
|
|
|
|
|
(format #f "this.isNoScript || this.id === ~s"
|
|
|
|
|
"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/"
|
2024-03-21 07:22:22 -04:00
|
|
|
|
#$mullvadbrowser-translation-specific lang)))
|
gnu: mullvadbrowser: Update to 13.5.3 [security fixes].
Fixes CVEs 2024-6600, 2024-6601, 2024-6602, 2024-6603, 2024-6604,
2024-7519, 2024-7521, 2024-7522, 2024-7524, 2024-7525, 2024-7526,
2024-7527, 2024-7529, 2024-7531, 2024-8381, 2024-8382, 2024-8383 and
2024-8384.
See the Mozilla Foundation Security advisories
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-30/>,
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-34/> and
<https://www.mozilla.org/en-US/security/advisories/mfsa2024-41/>
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 20240903073000.
(%mullvadbrowser-version): Update to 13.5.3.
(%mullvadbrowser-firefox-version): Update to 115.15.0esr-13.5-1-build2.
(mullvadbrowser-translation-base): Update to
daed2afc487d1b20efc17feb153156524c6f714b.
(mullvadbrowser) [arguments] <#:phases>: Adjust copy-torbrowser-locales
replacement accordingly.
Change-Id: I5acf486d5f22da9145827b12b48c6c764daaa9bf
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2024-09-05 19:18:25 -04:00
|
|
|
|
(list #$@%mullvadbrowser-locales))))
|
2023-12-12 10:46:03 -05:00
|
|
|
|
(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 _
|
|
|
|
|
(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
|
|
|
|
|
(modify-inputs (package-inputs torbrowser)
|
|
|
|
|
(delete go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird)))
|
|
|
|
|
(propagated-inputs
|
|
|
|
|
(modify-inputs (package-propagated-inputs torbrowser)
|
|
|
|
|
(append ublock-origin/icecat)))
|
|
|
|
|
(home-page "https://mullvad.net/en/browser")
|
|
|
|
|
(synopsis "Privacy-focused web browser")
|
|
|
|
|
(description "Mullvad Browser is a privacy-focused web browser developed
|
|
|
|
|
in collaboration between Mullvad VPN and the Tor Project. It’s produced to
|
|
|
|
|
minimize tracking and fingerprinting.")))
|