- tbb-commits - lists.torproject.org

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Bug 40933: Add tor-launcher functionality
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new ab28234080bc fixup! Bug 40933: Add tor-launcher functionality ab28234080bc is described below commit ab28234080bca4bebe36bcbee081fa63c6ccf661 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Nov 8 11:18:14 2022 +0100 fixup! Bug 40933: Add tor-launcher functionality Bug 41436: Fixed handling of settings array They were using a newline as a splitter, rather than repeating the key. Also, improved the logging to be more useful. Finally, linted again and switched from a `new Array` to `[]`. --- toolkit/components/tor-launcher/TorProtocolService.jsm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/toolkit/components/tor-launcher/TorProtocolService.jsm b/toolkit/components/tor-launcher/TorProtocolService.jsm index 3ccffd6883f5..de9c54c71137 100644 --- a/toolkit/components/tor-launcher/TorProtocolService.jsm +++ b/toolkit/components/tor-launcher/TorProtocolService.jsm @@ -233,11 +233,14 @@ const TorProtocolService = { this._returnConnection(); } else { // Connection is bad. + logger.warn( + "sendCommand returned an empty response, taking the connection as broken and closing it." + ); this._closeConnection(); } } } catch (e) { - logger.error("Cannot send a command", e); + logger.error(`Cannot send the command ${cmd}`, e); this._closeConnection(); } } catch (e) { @@ -299,7 +302,7 @@ const TorProtocolService = { if (valType === "boolean") { rv += val ? "1" : "0"; } else if (Array.isArray(val)) { - rv += val.map(TorParsers.escapeString).join("\n"); + rv += val.map(TorParsers.escapeString).join(` ${key}=`); } else if (valType === "string") { rv += TorParsers.escapeString(val); } else { @@ -666,7 +669,7 @@ const TorProtocolService = { const salt = Array.from(crypto.getRandomValues(new Uint8Array(8))); // Convert hex-encoded password to an array of bytes. - const password = new Array(); + const password = []; for (let i = 0; i < aHexPassword.length; i += 2) { password.push(parseInt(aHexPassword.substring(i, i + 2), 16)); } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.5 updated: Bug 40622: Update obfs4proxy 0.0.14
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch maint-11.5 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 01f22b55 Bug 40622: Update obfs4proxy 0.0.14 01f22b55 is described below commit 01f22b559060db64f1c8f34d1d967f14de3f8faf Author: meskio <meskio(a)torproject.org> AuthorDate: Thu Oct 20 20:11:02 2022 +0200 Bug 40622: Update obfs4proxy 0.0.14 Use our own copy of the repo that includes uTLS support. --- projects/{gocompress => andybalholm-brotli}/config | 9 ++--- projects/gobsaes/config | 30 ----------------- projects/goutls/config | 38 ---------------------- projects/goxcrypto/config | 2 +- projects/goxnet/config | 2 +- projects/{gocompress => klauspost-compress}/config | 9 ++--- projects/obfs4/build | 2 +- projects/obfs4/config | 12 +++---- projects/refraction-utls/config | 11 ++++++- 9 files changed, 29 insertions(+), 86 deletions(-) diff --git a/projects/gocompress/config b/projects/andybalholm-brotli/config similarity index 63% copy from projects/gocompress/config copy to projects/andybalholm-brotli/config index 799c6b63..7b695cf2 100644 --- a/projects/gocompress/config +++ b/projects/andybalholm-brotli/config @@ -1,15 +1,16 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dsnet/compress -git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f +version: 1.0.4 +git_url: https://github.com/andybalholm/brotli.git +git_hash: '1d750214c25205863625bb3eb8190a51b2cef26d' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + container: use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - go_lib: github.com/dsnet/compress + go_lib: github.com/andybalholm/brotli input_files: - project: container-image diff --git a/projects/gobsaes/config b/projects/gobsaes/config deleted file mode 100644 index a3d2b280..00000000 --- a/projects/gobsaes/config +++ /dev/null @@ -1,30 +0,0 @@ -# vim: filetype=yaml sw=2 -git_url: https://gitlab.com/yawning/bsaes.git -version: '[% c("abbrev") %]' -git_hash: 0a714cd429ec754482b4001e918db30cd2094405 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -container: - use_container: 1 - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - go_lib: gitlab.com/yawning/bsaes.git - go_lib_deps: - - goxsys - -targets: - android: - var: - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goxsys - project: goxsys - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/android") %]' diff --git a/projects/goutls/config b/projects/goutls/config deleted file mode 100644 index 91df0b7c..00000000 --- a/projects/goutls/config +++ /dev/null @@ -1,38 +0,0 @@ -# vim: filetype=yaml sw=2 -git_url: https://gitlab.com/yawning/utls.git -version: 0.0.12-1 -git_hash: 'v[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: yawning.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -container: - use_container: 1 - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - go_lib: gitlab.com/yawning/utls.git - go_lib_deps: - - goxcrypto - - gocompress - - gobsaes - -targets: - android: - var: - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goxcrypto - project: goxcrypto - - name: gocompress - project: gocompress - - name: gobsaes - project: gobsaes - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/android") %]' diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index 036cc869..a10ae9a0 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 +git_hash: c86fa9a7ed909e2f2a8ab8298254fca727aba16a filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 diff --git a/projects/goxnet/config b/projects/goxnet/config index 77813dd3..7ae6e784 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net -git_hash: da137c7871d730100384dbcf36e6f8fa493aef5b +git_hash: bea034e7d591acfddd606603cf48fae48bbdd340 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 diff --git a/projects/gocompress/config b/projects/klauspost-compress/config similarity index 63% rename from projects/gocompress/config rename to projects/klauspost-compress/config index 799c6b63..44461f9d 100644 --- a/projects/gocompress/config +++ b/projects/klauspost-compress/config @@ -1,15 +1,16 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dsnet/compress -git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f +version: 1.15.9 +git_url: https://github.com/klauspost/compress.git +git_hash: '9559b037e79ad673c71f6ef7c732c00949014cd2' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + container: use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - go_lib: github.com/dsnet/compress + go_lib: github.com/klauspost/compress input_files: - project: container-image diff --git a/projects/obfs4/build b/projects/obfs4/build index 3aa2167e..93ff80f1 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -18,7 +18,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/edwards25519-extra') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/refraction-utls') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] mkdir -p /var/tmp/build diff --git a/projects/obfs4/config b/projects/obfs4/config index 99041b90..f8a34092 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 -version: 0.0.12 -git_url: https://gitlab.com/yawning/obfs4.git +version: 0.0.14-tor2 +git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs… git_hash: 'obfs4proxy-[% c("version") %]' tag_gpg_id: 1 -gpg_keyring: yawning.gpg +gpg_keyring: anti-censorship.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: @@ -11,7 +11,7 @@ container: targets: nightly: - git_hash: master + git_hash: main version: '[% c("abbrev") %]' tag_gpg_id: 0 @@ -31,8 +31,8 @@ input_files: project: goxcrypto - name: goxnet project: goxnet - - name: goutls - project: goutls + - name: refraction-utls + project: refraction-utls - name: goxtext project: goxtext - name: '[% c("var/compiler") %]' diff --git a/projects/refraction-utls/config b/projects/refraction-utls/config index c354437b..7991d982 100644 --- a/projects/refraction-utls/config +++ b/projects/refraction-utls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/refraction-networking/utls -git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0 +git_hash: 862fe372d939c53bb10cb4fd11263f3766589892 #v1.1.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -12,6 +12,9 @@ var: go_lib: github.com/refraction-networking/utls go_lib_deps: - goxcrypto + - goxnet + - klauspost-compress + - andybalholm-brotli input_files: - project: container-image @@ -19,3 +22,9 @@ input_files: project: go - name: goxcrypto project: goxcrypto + - name: goxnet + project: goxnet + - name: klauspost-compress + project: klauspost-compress + - name: andybalholm-brotli + project: andybalholm-brotli -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40622: Update obfs4proxy 0.0.14
by gitolite role 08 Nov '22

08 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 02d54d8c Bug 40622: Update obfs4proxy 0.0.14 02d54d8c is described below commit 02d54d8cb233b34c167d7a246e6e34fafcb604af Author: meskio <meskio(a)torproject.org> AuthorDate: Thu Oct 20 20:11:02 2022 +0200 Bug 40622: Update obfs4proxy 0.0.14 Use our own copy of the repo that includes uTLS support. --- projects/{gocompress => andybalholm-brotli}/config | 9 ++--- projects/gobsaes/config | 30 ----------------- projects/goutls/config | 38 ---------------------- projects/goxcrypto/config | 2 +- projects/goxnet/config | 2 +- projects/{gocompress => klauspost-compress}/config | 9 ++--- projects/obfs4/build | 2 +- projects/obfs4/config | 12 +++---- projects/refraction-utls/config | 11 ++++++- 9 files changed, 29 insertions(+), 86 deletions(-) diff --git a/projects/gocompress/config b/projects/andybalholm-brotli/config similarity index 63% copy from projects/gocompress/config copy to projects/andybalholm-brotli/config index 799c6b63..7b695cf2 100644 --- a/projects/gocompress/config +++ b/projects/andybalholm-brotli/config @@ -1,15 +1,16 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dsnet/compress -git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f +version: 1.0.4 +git_url: https://github.com/andybalholm/brotli.git +git_hash: '1d750214c25205863625bb3eb8190a51b2cef26d' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + container: use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - go_lib: github.com/dsnet/compress + go_lib: github.com/andybalholm/brotli input_files: - project: container-image diff --git a/projects/gobsaes/config b/projects/gobsaes/config deleted file mode 100644 index a3d2b280..00000000 --- a/projects/gobsaes/config +++ /dev/null @@ -1,30 +0,0 @@ -# vim: filetype=yaml sw=2 -git_url: https://gitlab.com/yawning/bsaes.git -version: '[% c("abbrev") %]' -git_hash: 0a714cd429ec754482b4001e918db30cd2094405 -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -container: - use_container: 1 - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - go_lib: gitlab.com/yawning/bsaes.git - go_lib_deps: - - goxsys - -targets: - android: - var: - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goxsys - project: goxsys - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/android") %]' diff --git a/projects/goutls/config b/projects/goutls/config deleted file mode 100644 index 91df0b7c..00000000 --- a/projects/goutls/config +++ /dev/null @@ -1,38 +0,0 @@ -# vim: filetype=yaml sw=2 -git_url: https://gitlab.com/yawning/utls.git -version: 0.0.12-1 -git_hash: 'v[% c("version") %]' -tag_gpg_id: 1 -gpg_keyring: yawning.gpg -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -container: - use_container: 1 - -build: '[% c("projects/go/var/build_go_lib") %]' - -var: - go_lib: gitlab.com/yawning/utls.git - go_lib_deps: - - goxcrypto - - gocompress - - gobsaes - -targets: - android: - var: - build_go_lib_pre: | - [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] - -input_files: - - project: container-image - - name: go - project: go - - name: goxcrypto - project: goxcrypto - - name: gocompress - project: gocompress - - name: gobsaes - project: gobsaes - - name: '[% c("var/compiler") %]' - project: '[% c("var/compiler") %]' - enable: '[% c("var/android") %]' diff --git a/projects/goxcrypto/config b/projects/goxcrypto/config index 036cc869..a10ae9a0 100644 --- a/projects/goxcrypto/config +++ b/projects/goxcrypto/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/crypto -git_hash: 69ecbb4d6d5dab05e49161c6e77ea40a030884e1 +git_hash: c86fa9a7ed909e2f2a8ab8298254fca727aba16a filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 diff --git a/projects/goxnet/config b/projects/goxnet/config index 77813dd3..7ae6e784 100644 --- a/projects/goxnet/config +++ b/projects/goxnet/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://go.googlesource.com/net -git_hash: da137c7871d730100384dbcf36e6f8fa493aef5b +git_hash: bea034e7d591acfddd606603cf48fae48bbdd340 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 diff --git a/projects/gocompress/config b/projects/klauspost-compress/config similarity index 63% rename from projects/gocompress/config rename to projects/klauspost-compress/config index 799c6b63..44461f9d 100644 --- a/projects/gocompress/config +++ b/projects/klauspost-compress/config @@ -1,15 +1,16 @@ # vim: filetype=yaml sw=2 -version: '[% c("abbrev") %]' -git_url: https://github.com/dsnet/compress -git_hash: cc9eb1d7ad760af14e8f918698f745e80377af4f +version: 1.15.9 +git_url: https://github.com/klauspost/compress.git +git_hash: '9559b037e79ad673c71f6ef7c732c00949014cd2' filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' + container: use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - go_lib: github.com/dsnet/compress + go_lib: github.com/klauspost/compress input_files: - project: container-image diff --git a/projects/obfs4/build b/projects/obfs4/build index d063d4f1..acd62b61 100644 --- a/projects/obfs4/build +++ b/projects/obfs4/build @@ -17,7 +17,7 @@ tar -C /var/tmp/dist -xf [% c('input_files_by_name/edwards25519-extra') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/siphash') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxcrypto') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxnet') %] -tar -C /var/tmp/dist -xf [% c('input_files_by_name/goutls') %] +tar -C /var/tmp/dist -xf [% c('input_files_by_name/refraction-utls') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goxtext') %] mkdir -p /var/tmp/build diff --git a/projects/obfs4/config b/projects/obfs4/config index 99041b90..f8a34092 100644 --- a/projects/obfs4/config +++ b/projects/obfs4/config @@ -1,9 +1,9 @@ # vim: filetype=yaml sw=2 -version: 0.0.12 -git_url: https://gitlab.com/yawning/obfs4.git +version: 0.0.14-tor2 +git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/obfs… git_hash: 'obfs4proxy-[% c("version") %]' tag_gpg_id: 1 -gpg_keyring: yawning.gpg +gpg_keyring: anti-censorship.gpg filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: @@ -11,7 +11,7 @@ container: targets: nightly: - git_hash: master + git_hash: main version: '[% c("abbrev") %]' tag_gpg_id: 0 @@ -31,8 +31,8 @@ input_files: project: goxcrypto - name: goxnet project: goxnet - - name: goutls - project: goutls + - name: refraction-utls + project: refraction-utls - name: goxtext project: goxtext - name: '[% c("var/compiler") %]' diff --git a/projects/refraction-utls/config b/projects/refraction-utls/config index c354437b..7991d982 100644 --- a/projects/refraction-utls/config +++ b/projects/refraction-utls/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://github.com/refraction-networking/utls -git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0 +git_hash: 862fe372d939c53bb10cb4fd11263f3766589892 #v1.1.5 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 @@ -12,6 +12,9 @@ var: go_lib: github.com/refraction-networking/utls go_lib_deps: - goxcrypto + - goxnet + - klauspost-compress + - andybalholm-brotli input_files: - project: container-image @@ -19,3 +22,9 @@ input_files: project: go - name: goxcrypto project: goxcrypto + - name: goxnet + project: goxnet + - name: klauspost-compress + project: klauspost-compress + - name: andybalholm-brotli + project: andybalholm-brotli -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: fixup! Bug 40597: Implement TorSettings module
by gitolite role 07 Nov '22

07 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new d3f95b228a5a fixup! Bug 40597: Implement TorSettings module d3f95b228a5a is described below commit d3f95b228a5a6e831cb9fc1fe7ab653d01c0db59 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Nov 7 19:13:46 2022 +0100 fixup! Bug 40597: Implement TorSettings module Bug 41429: Initialize TorConnect and TorSettings once --- browser/modules/TorConnect.jsm | 1 - browser/modules/TorSettings.jsm | 1 - 2 files changed, 2 deletions(-) diff --git a/browser/modules/TorConnect.jsm b/browser/modules/TorConnect.jsm index 7c458a41c17d..cb09c1dbefef 100644 --- a/browser/modules/TorConnect.jsm +++ b/browser/modules/TorConnect.jsm @@ -1077,6 +1077,5 @@ const TorConnect = (() => { return redirectUrls; }, }; - retval.init(); return retval; })(); /* TorConnect */ diff --git a/browser/modules/TorSettings.jsm b/browser/modules/TorSettings.jsm index 4084ee71a1ce..97f1d07a5fef 100644 --- a/browser/modules/TorSettings.jsm +++ b/browser/modules/TorSettings.jsm @@ -778,6 +778,5 @@ const TorSettings = (() => { }; }, }; - self.init(); return self; })(); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated (7d6a2d1b -> 98b4184d)
by gitolite role 07 Nov '22

07 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch main in repository builders/tor-browser-build. from 7d6a2d1b Bug 40676: Remove HTTPS-Everywhere from the repackage script new 87987543 Bug 40641: Add projects/firefox-l10n new 1e12d726 Bug 40641: Use packaged locales on Firefox new 98b4184d Bug 40641: Remove langpacks and single-locale support The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: README | 4 +- projects/browser/build | 154 ++------------------------------------ projects/browser/config | 3 - projects/firefox-l10n/build | 6 ++ projects/firefox-l10n/config | 45 +++++++++++ projects/firefox-langpacks/build | 16 ---- projects/firefox-langpacks/config | 50 ------------- projects/firefox/build | 16 +++- projects/firefox/config | 5 ++ rbm | 2 +- rbm.conf | 1 - tools/signing/check_file_counts | 7 -- 12 files changed, 80 insertions(+), 229 deletions(-) create mode 100644 projects/firefox-l10n/build create mode 100644 projects/firefox-l10n/config delete mode 100644 projects/firefox-langpacks/build delete mode 100644 projects/firefox-langpacks/config -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[builders/tor-browser-build] branch maint-11.5 updated: fixup! Bug 41413: make injected intl.locale.requested sticky
by gitolite role 07 Nov '22

07 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch maint-11.5 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 89a99e58 fixup! Bug 41413: make injected intl.locale.requested sticky 89a99e58 is described below commit 89a99e58fc5002cc43651fb7ecb6338683ca52eb Author: Dan Ballard <dan(a)mindstab.net> AuthorDate: Mon Nov 7 09:13:46 2022 -0800 fixup! Bug 41413: make injected intl.locale.requested sticky Bug 41413: add sticky to intl.locale.requested --- projects/tor-browser/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 691bac90..e639ae30 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -184,7 +184,7 @@ cp defaults/preferences/000-tor-browser.js $rootdir rm -rf chrome [% END %] # Set the locale of the bundle. -echo "pref(\"intl.locale.requested\", \"en-US\");" >> defaults/preferences/000-tor-browser.js +echo "pref(\"intl.locale.requested\", \"en-US\", sticky);" >> defaults/preferences/000-tor-browser.js [% c("touch") %] defaults/preferences/000-tor-browser.js zip -Xm omni.ja defaults/preferences/000-tor-browser.js rm -rf defaults -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch maint-11.5 updated: Bug 41105: Match tb-102 use of ClearDataService flags, including proper call to PreflightCacheCleaner included in CLEAR_ALL
by gitolite role 07 Nov '22

07 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch maint-11.5 in repository torbutton. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 7d789f2c Bug 41105: Match tb-102 use of ClearDataService flags, including proper call to PreflightCacheCleaner included in CLEAR_ALL 7d789f2c is described below commit 7d789f2ce6595232486456fb8570a4a8d5f01471 Author: Dan Ballard <dan(a)mindstab.net> AuthorDate: Fri Nov 4 14:38:11 2022 -0700 Bug 41105: Match tb-102 use of ClearDataService flags, including proper call to PreflightCacheCleaner included in CLEAR_ALL --- chrome/content/torbutton.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/chrome/content/torbutton.js b/chrome/content/torbutton.js index 3bfaa1f8..2f6ff1ee 100644 --- a/chrome/content/torbutton.js +++ b/chrome/content/torbutton.js @@ -571,9 +571,7 @@ async function torbutton_do_new_identity() { try { await clearData( - Services.clearData.CLEAR_DOM_STORAGES | - Services.clearData.CLEAR_MEDIA_DEVICES | - Services.clearData.CLEAR_PREDICTOR_NETWORK_DATA + Services.clearData.CLEAR_ALL ^ Services.clearData.CLEAR_PASSWORDS ); } catch (e) { torbutton_log(5, "Exception on storage clearing: " + e); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.4.0esr-12.0-2 updated: Bug 41417: Always prompt users to restart after changing language
by gitolite role 07 Nov '22

07 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-102.4.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.4.0esr-12.0-2 by this push: new de019e3edec0 Bug 41417: Always prompt users to restart after changing language de019e3edec0 is described below commit de019e3edec0f4ead853b5ddb25fd0423d03e916 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Nov 4 14:10:49 2022 +0100 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. --- browser/components/preferences/main.js | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js index eab384264c4e..af53fa0403f7 100644 --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js @@ -1202,18 +1202,17 @@ var gMainPane = { gMainPane.recordBrowserLanguagesTelemetry("reorder"); switch (gMainPane.getLanguageSwitchTransitionType(newLocales)) { + // tor-browser#41417: Always prompt for the restart, until we switch to + // Fluent, since the current way we use to update languages does not allow + // live-reload. We could also call showConfirmLanguageChangeMessageBar in + // the official live-reload case, but the result is inconsistent and makes + // handling the locales-match case harder. case "requires-restart": + case "live-reload": // Prepare to change the locales, as they were different. gMainPane.showConfirmLanguageChangeMessageBar(newLocales); gMainPane.updatePrimaryBrowserLanguageUI(newLocales[0]); break; - case "live-reload": - Services.locale.requestedLocales = newLocales; - gMainPane.updatePrimaryBrowserLanguageUI( - Services.locale.appLocaleAsBCP47 - ); - gMainPane.hideConfirmLanguageChangeMessageBar(); - break; case "locales-match": // They matched, so we can reset the UI. gMainPane.updatePrimaryBrowserLanguageUI( @@ -1466,18 +1465,12 @@ var gMainPane = { } switch (gMainPane.getLanguageSwitchTransitionType(selected)) { + // tor-browser#41417: see onPrimaryBrowserLanguageMenuChange case "requires-restart": + case "live-reload": gMainPane.showConfirmLanguageChangeMessageBar(selected); gMainPane.updatePrimaryBrowserLanguageUI(selected[0]); break; - case "live-reload": - Services.locale.requestedLocales = selected; - - gMainPane.updatePrimaryBrowserLanguageUI( - Services.locale.appLocaleAsBCP47 - ); - gMainPane.hideConfirmLanguageChangeMessageBar(); - break; case "locales-match": // They matched, so we can reset the UI. gMainPane.updatePrimaryBrowserLanguageUI( -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40676: Remove HTTPS-Everywhere from the repackage script
by gitolite role 07 Nov '22

07 Nov '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 7d6a2d1b Bug 40676: Remove HTTPS-Everywhere from the repackage script 7d6a2d1b is described below commit 7d6a2d1becb5b78d30eb1cbd2e710280539a50df Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Nov 4 09:46:06 2022 +0100 Bug 40676: Remove HTTPS-Everywhere from the repackage script We do not bundle HTTPS Everywhere anymore, so we do not need to add it to local builds anymore. --- tools/repackage_browser.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/repackage_browser.sh b/tools/repackage_browser.sh index 47876735..5498bd24 100755 --- a/tools/repackage_browser.sh +++ b/tools/repackage_browser.sh @@ -48,14 +48,6 @@ do strip "$LIB" done -# Repackage https-everywhere extension -mkdir _omni/ -unzip tor-browser_en-US/Browser/omni.ja -d _omni/ -cd _omni/ -zip -Xmr ../firefox/omni.ja chrome/torbutton/content/extensions/https-everywhere/ -cd .. -rm -rf _omni/ - # Overwrite extracted tor-browser with locally built files and move to _repackaged folder cp -r firefox/* tor-browser_en-US/Browser rm -rf firefox "${TOR_FILENAME}" -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch main updated: Bug 41293: Use the new Fluent API to register Torbutton as a l10n source
by gitolite role 04 Nov '22

04 Nov '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch main in repository torbutton. The following commit(s) were added to refs/heads/main by this push: new 004b629b Bug 41293: Use the new Fluent API to register Torbutton as a l10n source 004b629b is described below commit 004b629b21c83133d7c90e0a3656f90d44562746 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Thu Nov 3 17:13:34 2022 +0100 Bug 41293: Use the new Fluent API to register Torbutton as a l10n source With Firefox 102, we have switched from a JS implementation of Fluent to a Rust one, and the related API has slightly changed. Anyway. since we are switching to packaged locales, we can register them with the jar.mn, rather than using the API. --- components/startup-observer.js | 38 -------------------------------------- jar.mn | 1 + 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/components/startup-observer.js b/components/startup-observer.js index 090eb7b8..8f9b8cc2 100644 --- a/components/startup-observer.js +++ b/components/startup-observer.js @@ -28,42 +28,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", }); -let registerTranslations = () => {}; -if (parseInt(AppConstants.TOR_BROWSER_VERSION) < 102) { - XPCOMUtils.defineLazyModuleGetters(this, { - FileUtils: "resource://gre/modules/FileUtils.jsm", - FileSource: "resource://gre/modules/L10nRegistry.jsm", - L10nRegistry: "resource://gre/modules/L10nRegistry.jsm", - }); - registerTranslations = () => { - // Using all possible locales so that we do not have to change this list every time we support - // a new one. - /* eslint-disable */ - const allLocales = [ - "en-US", "ach", "af", "an", "ar", "ast", "az", "be", "bg", "bn", "br", "bs", "ca", "cak", - "crh", "cs", "cy", "da", "de", "dsb", "el", "en-CA", "en-GB", "eo", "es-AR", "es-CL", - "es-ES", "es-MX", "et", "eu", "fa", "ff", "fi", "fr", "fy-NL", "ga-IE", "gd", "gl", "gn", - "gu-IN", "he", "hi-IN", "hr", "hsb", "hu", "hy-AM", "ia", "id", "is", "it", "ja", - "ja-JP-mac", "ka", "kab", "kk", "km", "kn", "ko", "lij", "lo", "lt", "ltg", "lv", "mk", "mr", - "ms", "my", "nb-NO", "ne-NP", "nl", "nn-NO", "oc", "pa-IN", "pl", "pt-BR", "pt-PT", "rm", - "ro", "ru", "si", "sk", "sl", "son", "sq", "sr", "sv-SE", "ta", "te", "th", "tl", "tr", - "trs", "uk", "ur", "uz", "vi", "wo", "xh", "zh-CN", "zh-TW" - ]; - /* eslint-enable */ - let torSource = new FileSource( - "torbutton", - allLocales, - "resource://torbutton/locale/{locale}/", - true // skip this FileSource locales when computing Services.locale.availableLocales - ); - if (L10nRegistry.registerSources) { - L10nRegistry.registerSources([torSource]); - } else { - L10nRegistry.registerSource(torSource); - } - }; -} - // Module specific constants const kMODULE_NAME = "Startup"; const kMODULE_CONTRACTID = "@torproject.org/startup-observer;1"; @@ -118,8 +82,6 @@ function StartupObserver() { } cleanupCookies(); - - registerTranslations(); } StartupObserver.prototype = { diff --git a/jar.mn b/jar.mn index 8441f006..06caec8f 100644 --- a/jar.mn +++ b/jar.mn @@ -23,6 +23,7 @@ torbutton.jar: # browser branding % override chrome://branding/locale/brand.dtd chrome://torbutton/locale/brand.dtd % override chrome://branding/locale/brand.properties chrome://torbutton/locale/brand.properties +% category l10n-registry torbutton resource://torbutton/locale/{locale}/ # Strings for the about:tbupdate page % override chrome://browser/locale/aboutTBUpdate.dtd chrome://torbutton/locale/aboutTBUpdate.dtd -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0