From 79163d2c3c50fb1a7fd3fb3e64a34e9a1d0e3083 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Mar 2024 20:31:16 +0200 Subject: gnu: tor-browser: Build with newest rust-cbindgen. * gnu/packages/tor-browsers.scm (make-torbrowser)[inputs]: Replace rust-cbindgen-0.24 with rust-cbindgen. Change-Id: I6263a11342cb506c6c271e0360b7273c35be585d --- gnu/packages/tor-browsers.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/tor-browsers.scm') diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 6c8113c461..1e59d07544 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -291,7 +291,7 @@ Browser.") (list rust `(,rust "cargo") - rust-cbindgen-0.24 + rust-cbindgen llvm-15 clang-15 perl -- cgit v1.2.3 From 50f6077a4301e49ef0c182845c99fb75852b4baf Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Thu, 21 Mar 2024 12:22:22 +0100 Subject: gnu: make-torbrowser: Make products independent from each other. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/tor-browsers.scm (translation-base-browser): Rename to torbrowser-translation-base. (mullvadbrowser-translation-base): New variable. (translation-tor-browser): Rename to torbrowser-translation-specific. (translation-mullvad-browser): Rename to mullvadbrowser-translation-specific. (make-torbrowser): Add ‘translation-base’ and ‘translation-specific’ parameters and use them. (torbrowser, mullvadbrowser-base): Use the above parameters. (mullvadbrowser): Handle renaming. This allows translation-base-browser (now torbrowser-translation-base) and translation-tor-browser (now torbrowser-translation-specific) to be updated without triggering an update for Mullvad Browser. Change-Id: I2a94636eb6b0531c3a03cdb73c560d68060721ef --- gnu/packages/tor-browsers.scm | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) (limited to 'gnu/packages/tor-browsers.scm') diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 1e59d07544..ed3bbb2eb7 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -161,9 +161,7 @@ (define %torbrowser-firefox-version "115.8.0esr-13.0-1-build2") ;; See tor-browser-build/projects/translation/config. -;; If Tor Browser and Mullvad Browser updates are not synchronized, maybe this -;; will have to be duplicated. -(define translation-base-browser +(define torbrowser-translation-base (origin (method git-fetch) (uri (git-reference @@ -175,7 +173,7 @@ "1452lpzbx0a049ksw84q7fj93bldfpllpp86aa4kggiv7vb3dqxk")))) ;; See tor-browser-build/projects/translation/config. -(define translation-tor-browser +(define torbrowser-translation-specific (origin (method git-fetch) (uri (git-reference @@ -219,6 +217,8 @@ Browser.") moz-app-name moz-app-remotingname branding-directory + translation-base + translation-specific assets locales build-date @@ -567,7 +567,7 @@ Browser.") (let ((l10ncentral ".mozbuild/l10n-central")) ;; Temporary copy so that we can use ‘mv’ to mimic ;; tor-browser-build/projects/firefox/build. - (copy-recursively #$translation-base-browser + (copy-recursively #$translation-base "translation-base-browser") (for-each (lambda (lang) @@ -591,7 +591,7 @@ Browser.") (let ((l10ncentral ".mozbuild/l10n-central")) ;; Temporary copy so that we can use ‘mv’ to mimic ;; tor-browser-build/projects/firefox/build. - (copy-recursively #$translation-tor-browser + (copy-recursively #$translation-specific "translation-tor-browser") (for-each (lambda (lang) @@ -839,6 +839,8 @@ attacks on the privacy of Tor users.") (make-torbrowser #:moz-app-name "torbrowser" #:moz-app-remotingname "Tor Browser" #:branding-directory "browser/branding/tb-release" + #:translation-base torbrowser-translation-base + #:translation-specific torbrowser-translation-specific #:assets torbrowser-assets #:locales %torbrowser-locales #:build-date %torbrowser-build-date @@ -889,7 +891,19 @@ attacks on the privacy of Tor users.") (define %mullvadbrowser-firefox-version "115.8.0esr-13.0-1-build1") ;; See tor-browser-build/projects/translation/config. -(define translation-mullvad-browser +(define mullvadbrowser-translation-base + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.torproject.org/tpo/translation.git") + (commit "16211a4b8524d71525f0ea73c07771c634132b30"))) + (file-name "translation-base-browser") + (sha256 + (base32 + "1452lpzbx0a049ksw84q7fj93bldfpllpp86aa4kggiv7vb3dqxk")))) + +;; See tor-browser-build/projects/translation/config. +(define mullvadbrowser-translation-specific (origin (method git-fetch) (uri (git-reference @@ -935,6 +949,8 @@ Mullvad Browser.") (make-torbrowser #:moz-app-name "mullvadbrowser" #:moz-app-remotingname "Mullvad Browser" #:branding-directory "browser/branding/mb-release" + #:translation-base mullvadbrowser-translation-base + #:translation-specific mullvadbrowser-translation-specific #:assets mullvadbrowser-assets #:locales %mullvadbrowser-locales #:build-date %mullvadbrowser-build-date @@ -976,7 +992,7 @@ Mullvad Browser.") (lambda (lang) (system (format #f "cp -Lr ~a/~a .mozbuild/l10n-central/" - #$translation-mullvad-browser lang))) + #$mullvadbrowser-translation-specific lang))) (map car #$%mullvadbrowser-locales)))) (add-before 'build 'fix-profiles ;; Otherwise the profile would change every time the install -- cgit v1.2.3 From 458b3cd3d4cefa136ce04f84d00060396ea0ff7c Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Thu, 21 Mar 2024 13:09:08 +0100 Subject: gnu: torbrowser: Update to 13.0.12. * gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to 20240318163712. (%torbrowser-version): Update to 13.0.12. (%torbrowser-firefox-version): Update to 115.9.0esr-13.0-1-build3. (torbrowser-translation-base): Update to a4d224e82808529e135259e04fb58fb39b90da2d. (torbrowser-translation-specific): Update to e7aabc54138211e23bc60af1abe492c8bc68ce4b. Change-Id: I878f26149b22f5703e2e9bb7ee0aa1f4c4ada589 --- gnu/packages/tor-browsers.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/tor-browsers.scm') diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index ed3bbb2eb7..38804bf66d 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -149,16 +149,16 @@ ;; We copy the official build id, which can be found there: ;; https://aus1.torproject.org/torbrowser/update_3/release/. -(define %torbrowser-build-date "20240305132801") +(define %torbrowser-build-date "20240318163712") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.0.11") +(define %torbrowser-version "13.0.12") ;; 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.8.0esr-13.0-1-build2") +(define %torbrowser-firefox-version "115.9.0esr-13.0-1-build3") ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base @@ -166,11 +166,11 @@ (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "16211a4b8524d71525f0ea73c07771c634132b30"))) + (commit "a4d224e82808529e135259e04fb58fb39b90da2d"))) (file-name "translation-base-browser") (sha256 (base32 - "1452lpzbx0a049ksw84q7fj93bldfpllpp86aa4kggiv7vb3dqxk")))) + "0lvxjzj86gqgn6gns5593qrwd1gfrfcxdjvp1bl0jf9h3vwsiv5k")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -178,11 +178,11 @@ (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "012f643d2d6b04ebf868bf62cdb7ad5b727734f5"))) + (commit "e7aabc54138211e23bc60af1abe492c8bc68ce4b"))) (file-name "translation-tor-browser") (sha256 (base32 - "1253zrpl59bwy6s71ip3f84k46m2wwid7ixgf72pzqrkkh5lcnkn")))) + "0885scd85vqd0dyyvhasqb6qyi760qb4x08h82svqmnlzm54wsyv")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -198,7 +198,7 @@ version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "0qcl9yqndnaqkvgmmb6f5rrzvwdr323l3r4s3hd9mwv9q1x41h3b")))) + "0l6himzzzyv2ylc78gln6c7s7m073l1v8xndza4vybp0i46xq36q")))) (arguments (list #:install-plan @@ -236,7 +236,7 @@ Browser.") ".tar.xz")) (sha256 (base32 - "0c7jfliznxfdfs5xrwwgib486vgpmpcvq4s54rxxcxfk633kgz67")))) + "0h56g8yhsclh2rvmv94vs2zclj1w3j0p4pna62hmmnjgnwapblgn")))) (build-system mozilla-build-system) (inputs (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird -- cgit v1.2.3 From 2b052fe3c0fa85e9faa8873a581568ad4c78e151 Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Thu, 21 Mar 2024 15:50:32 +0100 Subject: gnu: mullvadbrowser: Update to 13.0.12. * gnu/packages/mullvad-browsers.scm (%mullvadbrowser-build-date): Update to 20240313183935. (%mullvadbrowser-version): Update to 13.0.12. (%mullvadbrowser-firefox-version): Update to 115.9.0esr-13.0-1-build2. (mullvadbrowser-translation-base): Update to 595dcd5efe752cddc1b6ba47082ad9f5f4917fee. (mullvadbrowser-translation-specific): Update to c5361cb496ae7e047fd9226139537f1fcfc7938d. Change-Id: I365d5517cc145c0b66b502b5ed1738bf978a29da --- gnu/packages/tor-browsers.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/tor-browsers.scm') diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 38804bf66d..4176a027da 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -878,17 +878,17 @@ attacks on the privacy of Tor users.") ;; We copy the official build id, which can be found there: ;; https://cdn.mullvad.net/browser/update_responses/update_1/release. -(define %mullvadbrowser-build-date "20240213150358") +(define %mullvadbrowser-build-date "20240313183935") ;; To find the last version, look at ;; https://mullvad.net/en/download/browser/linux. -(define %mullvadbrowser-version "13.0.10") +(define %mullvadbrowser-version "13.0.12") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/mullvadbrowser/<%mullvadbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-mullvad-browser-". -(define %mullvadbrowser-firefox-version "115.8.0esr-13.0-1-build1") +(define %mullvadbrowser-firefox-version "115.9.0esr-13.0-1-build2") ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-base @@ -896,11 +896,11 @@ attacks on the privacy of Tor users.") (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "16211a4b8524d71525f0ea73c07771c634132b30"))) + (commit "595dcd5efe752cddc1b6ba47082ad9f5f4917fee"))) (file-name "translation-base-browser") (sha256 (base32 - "1452lpzbx0a049ksw84q7fj93bldfpllpp86aa4kggiv7vb3dqxk")))) + "0j1sf2qa5y74ki0x6pyb1gp19zzh12i5c7p3qy3fhyxk284qgk22")))) ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-specific @@ -908,11 +908,11 @@ attacks on the privacy of Tor users.") (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "57de1569da0e2c48fd999a13e555f6b522041993"))) + (commit "c5361cb496ae7e047fd9226139537f1fcfc7938d"))) (file-name "translation-mullvad-browser") (sha256 (base32 - "1q3979ac92c5mib573hx9w06x3hrfw7r52wzmj9r75sz2hhsmrq3")))) + "0kxna8hcn6xyj9mq0k8pzmj0xh6drq6fs69vjhk31g9wjjm99hss")))) (define mullvadbrowser-assets ;; This is a prebuilt Mullvad Browser from which we take the assets we need. @@ -928,7 +928,7 @@ attacks on the privacy of Tor users.") version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1dkkk90lhvmhmi89rfjkx2m0ynyj0zajhxhxfmkzjj6bflmzgipv")))) + "1gxbppkjbsmfviw76q45fmx5w45v7z6mv2cf820npnlwv2szgb5a")))) (arguments (list #:install-plan @@ -971,7 +971,7 @@ Mullvad Browser.") %mullvadbrowser-firefox-version ".tar.xz")) (sha256 (base32 - "09wawhb3ci0i7038xs0cqvlm37i90a5iwn9m2p5gaal5cz55dz3n")))) + "1vl7xq7dn5j2vdjhb4q5n6f1w70zsawrrziqg60hxsf0cbmr130f")))) (arguments (substitute-keyword-arguments (package-arguments mullvadbrowser-base) ((#:phases phases) -- cgit v1.2.3 From 46abaa9efa61914978996f1a40351fdd7b731bdb Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sat, 23 Mar 2024 00:32:55 +0100 Subject: gnu: torbrowser: Update to 13.0.13 [fixes CVE-2024-29944]. * gnu/packages/tor-browsers.scm (%torbrowser-build-date): Update to 20240322115718. (%torbrowser-version): Update to 13.0.13. (%torbrowser-firefox-version): Update to 115.9.1esr-13.0-1-build1. (torbrowser-translation-base): Update to 8e04ca3c5f440ed8f16b2069ae9565e4b044ec29. (torbrowser-translation-specific): Update to bf2fac60a6c41aa67b8147f22a638d498ac2dcdd. Change-Id: Ife0cb3b2d42dc5d6b39d5a11827c0a234c950126 --- gnu/packages/tor-browsers.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gnu/packages/tor-browsers.scm') diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 4176a027da..a98c4b511d 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -149,16 +149,16 @@ ;; We copy the official build id, which can be found there: ;; https://aus1.torproject.org/torbrowser/update_3/release/. -(define %torbrowser-build-date "20240318163712") +(define %torbrowser-build-date "20240322115718") ;; To find the last version, look at https://www.torproject.org/download/. -(define %torbrowser-version "13.0.12") +(define %torbrowser-version "13.0.13") ;; 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.9.0esr-13.0-1-build3") +(define %torbrowser-firefox-version "115.9.1esr-13.0-1-build1") ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-base @@ -166,11 +166,11 @@ (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "a4d224e82808529e135259e04fb58fb39b90da2d"))) + (commit "8e04ca3c5f440ed8f16b2069ae9565e4b044ec29"))) (file-name "translation-base-browser") (sha256 (base32 - "0lvxjzj86gqgn6gns5593qrwd1gfrfcxdjvp1bl0jf9h3vwsiv5k")))) + "0as4xjmj17jiyqaqfmqhplwscg39df109pgilkjv560xdpgld10q")))) ;; See tor-browser-build/projects/translation/config. (define torbrowser-translation-specific @@ -178,11 +178,11 @@ (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "e7aabc54138211e23bc60af1abe492c8bc68ce4b"))) + (commit "bf2fac60a6c41aa67b8147f22a638d498ac2dcdd"))) (file-name "translation-tor-browser") (sha256 (base32 - "0885scd85vqd0dyyvhasqb6qyi760qb4x08h82svqmnlzm54wsyv")))) + "0bz50bfrljr139rs3zcx84y64vn7fav78ghl85xzm5bww15jfwl1")))) (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. @@ -198,7 +198,7 @@ version "/tor-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "0l6himzzzyv2ylc78gln6c7s7m073l1v8xndza4vybp0i46xq36q")))) + "1wn1wxiwhhnx4zzs6gr1qvyvjj5nn449vlgw7kcswpymz3r9mclp")))) (arguments (list #:install-plan @@ -236,7 +236,7 @@ Browser.") ".tar.xz")) (sha256 (base32 - "0h56g8yhsclh2rvmv94vs2zclj1w3j0p4pna62hmmnjgnwapblgn")))) + "0pkl6q9hfl52v7if20h1vdd1ydl8a7gs6lk95linknh4kaaaw4qm")))) (build-system mozilla-build-system) (inputs (list go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird -- cgit v1.2.3 From c27fda85b2139e09ea806269cbfd9d4cc96ec94f Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sat, 23 Mar 2024 00:47:36 +0100 Subject: gnu: mullvadbrowser: Update to 13.0.13 [fixes CVE-2024-29944]. * gnu/packages/mullvad-browsers.scm (%mullvadbrowser-build-date): Update to 20240322132912. (%mullvadbrowser-version): Update to 13.0.13. (%mullvadbrowser-firefox-version): Update to 115.9.1esr-13.0-1-build1. (mullvadbrowser-translation-base): Update to 8e04ca3c5f440ed8f16b2069ae9565e4b044ec29. Change-Id: Id19ba361e9867200edd5ee9f35142d8dbe5447ab --- gnu/packages/tor-browsers.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/tor-browsers.scm') diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index a98c4b511d..6706c24745 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -878,17 +878,17 @@ attacks on the privacy of Tor users.") ;; We copy the official build id, which can be found there: ;; https://cdn.mullvad.net/browser/update_responses/update_1/release. -(define %mullvadbrowser-build-date "20240313183935") +(define %mullvadbrowser-build-date "20240322132912") ;; To find the last version, look at ;; https://mullvad.net/en/download/browser/linux. -(define %mullvadbrowser-version "13.0.12") +(define %mullvadbrowser-version "13.0.13") ;; To find the last Firefox version, browse ;; https://archive.torproject.org/tor-package-archive/mullvadbrowser/<%mullvadbrowser-version> ;; There should be only one archive that starts with ;; "src-firefox-mullvad-browser-". -(define %mullvadbrowser-firefox-version "115.9.0esr-13.0-1-build2") +(define %mullvadbrowser-firefox-version "115.9.1esr-13.0-1-build1") ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-base @@ -896,11 +896,11 @@ attacks on the privacy of Tor users.") (method git-fetch) (uri (git-reference (url "https://gitlab.torproject.org/tpo/translation.git") - (commit "595dcd5efe752cddc1b6ba47082ad9f5f4917fee"))) + (commit "8e04ca3c5f440ed8f16b2069ae9565e4b044ec29"))) (file-name "translation-base-browser") (sha256 (base32 - "0j1sf2qa5y74ki0x6pyb1gp19zzh12i5c7p3qy3fhyxk284qgk22")))) + "0as4xjmj17jiyqaqfmqhplwscg39df109pgilkjv560xdpgld10q")))) ;; See tor-browser-build/projects/translation/config. (define mullvadbrowser-translation-specific @@ -928,7 +928,7 @@ attacks on the privacy of Tor users.") version "/mullvad-browser-linux-x86_64-" version ".tar.xz")) (sha256 (base32 - "1gxbppkjbsmfviw76q45fmx5w45v7z6mv2cf820npnlwv2szgb5a")))) + "1w2spwpxsvizn3xsj2pykisvi4b12y669cpqwhjkpxqlbsrlj0h8")))) (arguments (list #:install-plan @@ -971,7 +971,7 @@ Mullvad Browser.") %mullvadbrowser-firefox-version ".tar.xz")) (sha256 (base32 - "1vl7xq7dn5j2vdjhb4q5n6f1w70zsawrrziqg60hxsf0cbmr130f")))) + "05s87838b6smd82jhkpw7czbg3ch8fvqiqa174g7zkqi6p7bwcy3")))) (arguments (substitute-keyword-arguments (package-arguments mullvadbrowser-base) ((#:phases phases) -- cgit v1.2.3