October 2022 - tor-commits - lists.torproject.org

[builders/tor-browser-build] annotated tag tbb-11.5.4-build2 created (now c1e0678)
by gitolite role 08 Oct '22

08 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag tbb-11.5.4-build2 in repository builders/tor-browser-build. at c1e0678 (tag) tagging f63875fdf8e0e924f5ab19eafc8f689cfd85002c (commit) replaces tbb-11.5.4-build1 by Pier Angelo Vendrame on Sat Oct 8 17:19:46 2022 +0000 - Log ----------------------------------------------------------------- Tagging build2 for 11.5.4 -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCY0GxMgAKCRDwdW0XkBKI kaT4AP9M3yjttOxkjf0Ovn2lVG0NxtFtyL17luYC07ZJHXf97QD/dk+3ok/DB63I 7SqB95BNXN2V0GdNPwQ90/zXKyywjAU= =XhmP -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- 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 (25c2068 -> f63875f)
by gitolite role 08 Oct '22

08 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch maint-11.5 in repository builders/tor-browser-build. from 25c2068 fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e new 903e43e Update rbm for rbm#40043 new 2479296 Bug 40608: Updated TBA toolchains for 11.5.4 new f63875f fixup! Bug 40608: Prepare stable release 11.5.4 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: projects/android-components/build | 7 + projects/android-components/config | 8 +- .../gradle-dependencies-list.txt | 492 ++++----- projects/application-services/bug40485.patch | 23 +- projects/application-services/build | 2 +- projects/application-services/config | 14 +- projects/cbindgen/build | 2 +- projects/cbindgen/config | 19 +- projects/clang/build | 21 +- projects/fenix/config | 8 +- projects/fenix/gradle-dependencies-list.txt | 1071 ++++++++++---------- projects/geckoview/build | 4 +- projects/geckoview/config | 6 +- projects/geckoview/gradle-dependencies-list.txt | 20 +- projects/geckoview/list_toolchain_updates_checks | 23 +- projects/llvm-project/config | 4 +- projects/rust/config | 4 +- projects/sqlcipher/config | 4 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 + rbm | 2 +- rbm.conf | 6 +- 21 files changed, 929 insertions(+), 817 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
by gitolite role 07 Oct '22

07 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push: new 5b3b50e96dd6 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds 5b3b50e96dd6 is described below commit 5b3b50e96dd65bcd3b062a83f300a4a634437651 Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Fri Sep 30 15:04:37 2022 +0100 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. --- build/moz.configure/init.configure | 10 ++++++++++ intl/l10n/Localization.h | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index a85df3393c16..e64852eb3ac0 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -1094,6 +1094,16 @@ set_define("MOZ_UPDATE_CHANNEL", update_channel) add_old_configure_assignment("MOZ_UPDATE_CHANNEL", update_channel) +# Add a TOR_BROWSER_NIGHTLY_BUILD flag to use when MOZ_UPDATE_CHANNEL cannot be +# used. For example, for the C++ preprocessor. See tor-browser#41340 +@depends("--enable-update-channel") +def tor_browser_nightly_build(channel): + if channel and channel[0] in ["default", "nightly"]: + return True + +set_define("TOR_BROWSER_NIGHTLY_BUILD", tor_browser_nightly_build) + + option( env="MOZBUILD_STATE_PATH", nargs=1, diff --git a/intl/l10n/Localization.h b/intl/l10n/Localization.h index 54c78f68dbe7..ebe285be4772 100644 --- a/intl/l10n/Localization.h +++ b/intl/l10n/Localization.h @@ -51,7 +51,8 @@ namespace intl { return true; } -#if defined(NIGHTLY_BUILD) || defined(MOZ_DEV_EDITION) || defined(DEBUG) + // See tor-browser#41285 +#if defined(NIGHTLY_BUILD) || defined(MOZ_DEV_EDITION) || defined(DEBUG) || defined(TOR_BROWSER_NIGHTLY_BUILD) dom::Document* doc = nullptr; if (aGlobal) { nsPIDOMWindowInner* innerWindow = aGlobal->AsInnerWindow(); -- 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: fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e
by gitolite role 07 Oct '22

07 Oct '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 25c2068 fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e 25c2068 is described below commit 25c2068f0ddd0595cf649a3830b60a670a5b9e72 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Fri Oct 7 19:13:12 2022 +0000 fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e Moved use_container declaration out of /var and into / for new refaction-utls project --- projects/refraction-utls/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/refraction-utls/config b/projects/refraction-utls/config index e6974b4..c354437 100644 --- a/projects/refraction-utls/config +++ b/projects/refraction-utls/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/refraction-networking/utls git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0 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: - container: - use_container: 1 go_lib: github.com/refraction-networking/utls go_lib_deps: - goxcrypto -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e
by gitolite role 07 Oct '22

07 Oct '22

This is an automated email from the git hooks/post-receive script. richard 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 56cadcd fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e 56cadcd is described below commit 56cadcd8f00119eaacbecfa6f9c0329e93f5b875 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Fri Oct 7 19:13:12 2022 +0000 fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e Moved use_container declaration out of /var and into / for new refaction-utls project --- projects/refraction-utls/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/refraction-utls/config b/projects/refraction-utls/config index e6974b4..c354437 100644 --- a/projects/refraction-utls/config +++ b/projects/refraction-utls/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/refraction-networking/utls git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0 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: - container: - use_container: 1 go_lib: github.com/refraction-networking/utls go_lib_deps: - goxcrypto -- 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 40631: Stop bundling HTTPS Everywhere on Android (see tor-browser#41160)
by gitolite role 07 Oct '22

07 Oct '22

This is an automated email from the git hooks/post-receive script. richard 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 af97862 Bug 40631: Stop bundling HTTPS Everywhere on Android (see tor-browser#41160) af97862 is described below commit af97862c4b857415eade803c6a417474297fc54b Author: Giorgio Maone <ma1(a)torproject.org> AuthorDate: Thu Sep 29 21:55:02 2022 +0000 Bug 40631: Stop bundling HTTPS Everywhere on Android (see tor-browser#41160) --- projects/browser/build.android | 16 +++++++------- projects/browser/verify_allowed_addons.py | 3 --- projects/https-everywhere/build | 8 ------- projects/https-everywhere/config | 36 ------------------------------- tools/fetch_allowed_addons.py | 6 ------ 5 files changed, 8 insertions(+), 61 deletions(-) diff --git a/projects/browser/build.android b/projects/browser/build.android index a8c5a08..08a4046 100644 --- a/projects/browser/build.android +++ b/projects/browser/build.android @@ -10,19 +10,19 @@ test_in_apk=$rootdir/fenix/app-*-androidTest.apk tar xavf $rootdir/[% c('input_files_by_name/fenix') %] -# Bundle our extensions. We treat HTTPS-Everywhere and NoScript differently as -# the former should be an internal extension without getting any updates besides -# from Tor Browser releases. NoScript will be copied over to the profile folder -# being a "regular" browser extension. +# Bundle our extensioni(s). +# NoScript will be copied over to the profile folder +# as a "regular" browser extension receiving regular AMO updates. +noscript_path="$ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" + mkdir -p /var/tmp/build/$ext_dir [% dest_dir _ '/' _ c('filename') %] cd /var/tmp/build -unzip -d $ext_dir/https-everywhere $rootdir/[% c('input_files_by_name/https-everywhere') %] -mv $rootdir/[% c('input_files_by_name/noscript') %] $ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi +mv $rootdir/[% c('input_files_by_name/noscript') %] "$noscript_path" [% IF c("var/verify_allowed_addons") %] - # Check that allowed_addons.json contains the right versions of NoScript and HTTPS Everywhere + # Check that allowed_addons.json contains the right versions of our bundled extension(s). # If so, replace the default allowed_addons.json by ours in the apk assets folder. - $rootdir/verify_allowed_addons.py "$rootdir/allowed_addons.json" "$ext_dir/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$rootdir/[% c('input_files_by_name/https-everywhere') %]" + $rootdir/verify_allowed_addons.py "$rootdir/allowed_addons.json" "$noscript_path" [% END %] mv $rootdir/allowed_addons.json $assets_dir/allowed_addons.json diff --git a/projects/browser/verify_allowed_addons.py b/projects/browser/verify_allowed_addons.py index b0e89a5..c78e998 100755 --- a/projects/browser/verify_allowed_addons.py +++ b/projects/browser/verify_allowed_addons.py @@ -31,7 +31,6 @@ def read_extension_manifest(path): def main(argv): allowed_addons_path = argv[0] noscript_path = argv[1] - https_everywhere_path = argv[2] addons = None with open(allowed_addons_path, 'r') as file: @@ -42,11 +41,9 @@ def main(argv): noscript_hash = "sha256:" + hashlib.sha256(file.read()).hexdigest() noscript_version = read_extension_manifest(noscript_path)["version"] - https_everywhere_version = read_extension_manifest(https_everywhere_path)["version"] verify_extension_hash(addons, '{73a6fe31-595d-460b-a920-fcc0f8843232}', noscript_hash) verify_extension_version(addons, '{73a6fe31-595d-460b-a920-fcc0f8843232}', noscript_version) - verify_extension_version(addons, 'https-everywhere-eff(a)eff.org', https_everywhere_version) if __name__ == "__main__": main(sys.argv[1:]) diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build deleted file mode 100644 index 10dd4bf..0000000 --- a/projects/https-everywhere/build +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c('version') %].tar.gz -cd [% project %]-[% c('version') %] -./make.sh -# Since 5.0.2 a .xpi for AMO is built, too. We don't need it. -rm pkg/*-amo.xpi -mv pkg/*.xpi [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config deleted file mode 100644 index e980cf3..0000000 --- a/projects/https-everywhere/config +++ /dev/null @@ -1,36 +0,0 @@ -# vim: filetype=yaml sw=2 -version: 2021.7.13 -git_url: https://github.com/EFForg/https-everywhere.git -git_hash: '[% c("version") %]' -git_submodule: 1 -gpg_keyring: https-everywhere.gpg -tag_gpg_id: 1 -filename: "[% project %]-[% c('version') %]-[% c('var/build_id') %].xpi" -container: - use_container: 1 -var: - # HTTPS Everywhere is expected to be the same on all platforms. To avoid - # building the same thing 4 times, using 4 different container images - # (each one with a different suite or architecture), we set the container - # to bullseye/amd64 for all platforms. This allows us to create only one - # container image, and also build the extension only one time as the - # filename does not contain the platform, and var/build_id should be - # the same since there is now nothing platform specific in the build - # inputs. This allows us to save a little time and disk space. - container: - suite: bullseye - arch: amd64 - deps: - - git - - libxslt1.1 - - libxml2-utils - - sqlite3 - - rsync - - zip - - unzip - - python3 - - python3-distutils - pre_pkginst: '' - -input_files: - - project: container-image diff --git a/tools/fetch_allowed_addons.py b/tools/fetch_allowed_addons.py index ff82537..15d3d7f 100755 --- a/tools/fetch_allowed_addons.py +++ b/tools/fetch_allowed_addons.py @@ -24,17 +24,11 @@ def fetch_and_embed_icons(addons): icon_data = fetch(addon['icon_url']) addon['icon_url'] = 'data:image/png;base64,' + str(base64.b64encode(icon_data), 'utf8') -def patch_https_everywhere(addons): - addon = find_addon(addons, 'https-everywhere(a)eff.org') - addon['guid'] = 'https-everywhere-eff(a)eff.org' - addon['url'] = 'https://www.eff.org/https-everywhere' - def main(argv): amo_collection = argv[0] if argv else '83a9cccfe6e24a34bd7b155ff9ee32' url = 'https://services.addons.mozilla.org/api/v4/accounts/account/mozilla/collect…' + amo_collection + '/addons/' data = json.loads(fetch(url)) fetch_and_embed_icons(data) - patch_https_everywhere(data) data['results'].sort(key=lambda x: x['addon']['guid']) find_addon(data, '{73a6fe31-595d-460b-a920-fcc0f8843232}') # Check that NoScript is present print(json.dumps(data, indent=2, ensure_ascii=False)) -- 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 40633: Remove Team Cymru hard-coded bridges
by gitolite role 07 Oct '22

07 Oct '22

This is an automated email from the git hooks/post-receive script. pierov 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 0b502a8 Bug 40633: Remove Team Cymru hard-coded bridges 0b502a8 is described below commit 0b502a8db9889e40c9b68b7a0fa6288111c06185 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Oct 4 17:49:30 2022 +0200 Bug 40633: Remove Team Cymru hard-coded bridges --- projects/common/bridges_list.obfs4.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/projects/common/bridges_list.obfs4.txt b/projects/common/bridges_list.obfs4.txt index 238a1a8..c97c76c 100644 --- a/projects/common/bridges_list.obfs4.txt +++ b/projects/common/bridges_list.obfs4.txt @@ -1,6 +1,4 @@ obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1 -obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1 -obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1 obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0 obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0 obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] annotated tag tbb-11.5.4-build1 created (now 0c6c366)
by gitolite role 07 Oct '22

07 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag tbb-11.5.4-build1 in repository builders/tor-browser-build. at 0c6c366 (tag) tagging b1b85af0f22d5959f5141ce4fdcda3732629f7ce (commit) replaces tbb-11.5.3-build1 by Pier Angelo Vendrame on Fri Oct 7 17:06:43 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 11.5.4 -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCY0BcowAKCRDwdW0XkBKI kfeSAQDz9W/cgASqHjPCXkXdQYE7T2OZNtfaePTeEXU3BMvNUQD/Yk8DL3Rjibt+ P4o3L/Y+c7gtVzSvwdwcYz/zLeE30A0= =N1j+ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- 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 (38afab6 -> b1b85af)
by gitolite role 07 Oct '22

07 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch maint-11.5 in repository builders/tor-browser-build. from 38afab6 Bug 40613: Prepare stable release (Android Only) 11.5.3 new 4b13dbb Bug 40629: Bump snowflake version to 9ce1de4eee4e new 24738a7 Bug 40633: Remove Team Cymru hard-coded bridges new b1b85af Bug 40608: Prepare stable release 11.5.4 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: projects/common/bridges_list.obfs4.txt | 2 - projects/firefox/config | 2 +- projects/geckoview/config | 4 +- projects/go/config | 4 +- projects/goxtext/config | 3 + projects/manual/config | 4 +- projects/{gocheck => refraction-utls}/config | 16 +- projects/snowflake/build | 1 + projects/snowflake/config | 6 +- projects/tba-translation/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 100 +++++++++ projects/tor-browser/allowed_addons.json | 234 ++++++++++----------- projects/tor-browser/config | 4 +- rbm.conf | 4 +- 14 files changed, 245 insertions(+), 141 deletions(-) copy projects/{gocheck => refraction-utls}/config (53%) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor-browser] annotated tag tor-browser-91.13.0esr-11.5-1-build4 created (now 12f979bb421c)
by gitolite role 07 Oct '22

07 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag tor-browser-91.13.0esr-11.5-1-build4 in repository tor-browser. at 12f979bb421c (tag) tagging e78377c82d2c7f32edd3789ff8b62e1c70a557b6 (commit) replaces tor-browser-91.13.0esr-11.5-1-build3 by Pier Angelo Vendrame on Fri Oct 7 18:58:39 2022 +0200 - Log ----------------------------------------------------------------- Tagging build4 for 91.13esr-based stable -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCY0BavwAKCRDwdW0XkBKI kcfMAQD8eN396w3Emsz4sBpplqaL3D9G+W6BVvViOnC+1F2dbQEAgyM7P5V9CCWV ik9JF845P9PJkFJEXYiYhfpqULhEkwQ= =P0kI -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0