- tbb-commits - lists.torproject.org

[builders/tor-browser-build] branch main updated: Bug 40585: Prune the manual more
by gitolite role 12 Oct '22

12 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 2fd9760 Bug 40585: Prune the manual more 2fd9760 is described below commit 2fd9760aa3982e58a2b8c6881cea9046bac49326 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Oct 10 18:45:02 2022 +0200 Bug 40585: Prune the manual more --- projects/manual/build | 14 +++++++++++--- projects/manual/config | 2 +- projects/manual/packagemanual.py | 21 ++++++++++++++++++++- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/projects/manual/build b/projects/manual/build index d569632..d6d5c74 100644 --- a/projects/manual/build +++ b/projects/manual/build @@ -5,7 +5,15 @@ mkdir -p chrome/browser/content/browser/manual unzip $rootdir/[% c('input_files_by_name/manual') %] python3 $rootdir/[% c('input_files_by_name/package_script') %] public chrome/browser/content/browser/manual +pushd chrome/browser/content/browser/manual/static +find -name '*.map' -delete +rm -rf fonts +rm -rf css/digital-climate-strike css/images +# We prune unused images in the Python script, but empty directories remain +find images -type d -empty -delete +popd + [% c('tar', { - tar_src => [ 'chrome' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] + tar_src => [ 'chrome' ], + tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + }) %] diff --git a/projects/manual/config b/projects/manual/config index 4fe9356..9112864 100644 --- a/projects/manual/config +++ b/projects/manual/config @@ -2,7 +2,7 @@ # To update, see doc/how-to-update-the-manual.txt # Remember to update also the package's hash, with the version! version: 50953 -filename: 'manual-[% c("version") %].tar.gz' +filename: 'manual-[% c("version") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 diff --git a/projects/manual/packagemanual.py b/projects/manual/packagemanual.py index f4a3b98..7af5104 100755 --- a/projects/manual/packagemanual.py +++ b/projects/manual/packagemanual.py @@ -31,10 +31,20 @@ def clean_urls(match): return f'href="#{slug}{anchor}"' +remove_images = [] +for p in (source / 'static/images').glob('**/*'): + if p.is_file(): + rel = p.relative_to(source) + remove_images.append(rel) + htmls = source.rglob(f'{PAGE_NAME}/index.html') for page in htmls: with page.open(encoding='utf8') as f: contents = f.read() + + remove_images = list(filter( + lambda im: contents.find(str(im)) == -1, remove_images)) + contents = static_re.sub(f'"{STATIC_PATH}/\\1"', contents) contents = link_re.sub(clean_urls, contents) @@ -46,5 +56,14 @@ for page in htmls: with (target / dest_name).open('w', encoding='utf8') as f: f.write(contents) + +def ignore_images(path, names): + return [ + n + for n in names + if Path(path, n).relative_to(source) in remove_images + ] + + shutil.rmtree(target / 'static', ignore_errors=True) -shutil.copytree(source / 'static', target / 'static') +shutil.copytree(source / 'static', target / 'static', ignore=ignore_images) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch maint-11.5 updated: Bug 41355: Adjust line spacing in YEC 2022 heading
by gitolite role 12 Oct '22

12 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 torbutton. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 042f1687 Bug 41355: Adjust line spacing in YEC 2022 heading 042f1687 is described below commit 042f1687e38915803b1e25bb19b28af2256ca2d2 Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Wed Oct 12 09:58:44 2022 +0100 Bug 41355: Adjust line spacing in YEC 2022 heading --- chrome/skin/aboutTor.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/skin/aboutTor.css b/chrome/skin/aboutTor.css index 2ea6807e..5c75c1f0 100644 --- a/chrome/skin/aboutTor.css +++ b/chrome/skin/aboutTor.css @@ -206,7 +206,7 @@ body:not([showmanual]) .showForManual { * yec-background-image, even if one of the sub-heading elements has long text * content that would normally grow the size of the grid. */ width: 1px; - line-height: 1; + line-height: 1.05; font-family: 'Space Grotesk', sans-serif; font-size: 60px; letter-spacing: -0.05em; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Base Browser's .mozconfigs.
by gitolite role 12 Oct '22

12 Oct '22

This is an automated email from the git hooks/post-receive script. pierov 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 5293cbaea3eb fixup! Base Browser's .mozconfigs. 5293cbaea3eb is described below commit 5293cbaea3eb835ce8173513b4fd862101ad58a5 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Tue Oct 11 19:23:07 2022 +0200 fixup! Base Browser's .mozconfigs. Bug 41131: Disable background tasks in all platforms, and the update agent in Windows and macOS. --- browser/config/mozconfigs/base-browser | 3 +++ mozconfig-macos-x86_64 | 3 +++ mozconfig-windows-i686 | 3 +++ mozconfig-windows-x86_64 | 3 +++ 4 files changed, 12 insertions(+) diff --git a/browser/config/mozconfigs/base-browser b/browser/config/mozconfigs/base-browser index 285f43fec4ef..82b224f43ed1 100644 --- a/browser/config/mozconfigs/base-browser +++ b/browser/config/mozconfigs/base-browser @@ -30,6 +30,9 @@ ac_add_options --enable-proxy-bypass-protection # could allow proxy bypass, and override a number of other preferences we set ac_add_options --disable-system-policies +# See bug #41131 +ac_add_options --disable-backgroundtasks + ac_add_options --enable-base-browser # Disable telemetry diff --git a/mozconfig-macos-x86_64 b/mozconfig-macos-x86_64 index e2286f972e62..b81001df5633 100644 --- a/mozconfig-macos-x86_64 +++ b/mozconfig-macos-x86_64 @@ -2,4 +2,7 @@ ac_add_options --enable-strip +# See bug #41131 +ac_add_options --disable-update-agent + ac_add_options --enable-tor-browser-data-outside-app-dir diff --git a/mozconfig-windows-i686 b/mozconfig-windows-i686 index 78ff05ecc810..afe083885bfc 100644 --- a/mozconfig-windows-i686 +++ b/mozconfig-windows-i686 @@ -9,3 +9,6 @@ ac_add_options --enable-strip ac_add_options --disable-bits-download ac_add_options --disable-maintenance-service ac_add_options --disable-default-browser-agent + +# See bug #41131 +ac_add_options --disable-update-agent diff --git a/mozconfig-windows-x86_64 b/mozconfig-windows-x86_64 index 93b7a28fd361..67bc37c4e5ff 100644 --- a/mozconfig-windows-x86_64 +++ b/mozconfig-windows-x86_64 @@ -9,3 +9,6 @@ ac_add_options --enable-strip ac_add_options --disable-bits-download ac_add_options --disable-maintenance-service ac_add_options --disable-default-browser-agent + +# See bug #41131 +ac_add_options --disable-update-agent -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Bug 40926: Implemented the New Identity feature
by gitolite role 11 Oct '22

11 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 63cfb5cfbc2b fixup! Bug 40926: Implemented the New Identity feature 63cfb5cfbc2b is described below commit 63cfb5cfbc2b770413a7a03d5dd906ef5de1ccbd Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Tue Oct 11 10:57:47 2022 +0100 fixup! Bug 40926: Implemented the New Identity feature --- browser/components/newidentity/content/newidentity.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/components/newidentity/content/newidentity.js b/browser/components/newidentity/content/newidentity.js index 67a00dbc6f75..466cf437d90a 100644 --- a/browser/components/newidentity/content/newidentity.js +++ b/browser/components/newidentity/content/newidentity.js @@ -527,7 +527,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityButton", () => { const askAgain = { value: false }; const confirmed = Services.prompt.confirmEx( - null, + window, "", NewIdentityStrings.new_identity_prompt, flags, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
by gitolite role 11 Oct '22

11 Oct '22

This is an automated email from the git hooks/post-receive script. pierov 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 7151a4d466bc fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing 7151a4d466bc is described below commit 7151a4d466bc3e40aae96831dad5e2cfd0281205 Author: cypherpunks1 <2478-cypherpunks1(a)gitlab.torproject.org> AuthorDate: Fri Sep 30 09:02:51 2022 +0300 fixup! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing --- browser/components/search/extensions/startpage/manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/browser/components/search/extensions/startpage/manifest.json b/browser/components/search/extensions/startpage/manifest.json index 18041d3a2f83..497373ec17a2 100644 --- a/browser/components/search/extensions/startpage/manifest.json +++ b/browser/components/search/extensions/startpage/manifest.json @@ -1,6 +1,6 @@ { "name": "Startpage", - "description": "Start Page", + "description": "Startpage", "manifest_version": 2, "version": "1.0", "applications": { @@ -18,9 +18,9 @@ "chrome_settings_overrides": { "search_provider": { "name": "Startpage", - "search_url": "https://startpage.com/sp/search", - "search_form": "https://startpage.com/sp/search/", - "search_url_post_params": "q={searchTerms}&segment=startpage.tor" + "search_url": "https://www.startpage.com/sp/search", + "search_form": "https://www.startpage.com/sp/search/", + "search_url_post_params": "q={searchTerms}" } } } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Firefox preference overrides.
by gitolite role 10 Oct '22

10 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 1af611fd6b42 fixup! Firefox preference overrides. 1af611fd6b42 is described below commit 1af611fd6b42f9e72a211764e0f25df58ffb5cb7 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Mon Oct 10 14:54:13 2022 +0200 fixup! Firefox preference overrides. Bug 41345: fonts: windows whitelist contains supplemental fonts --- browser/app/profile/001-base-profile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/app/profile/001-base-profile.js b/browser/app/profile/001-base-profile.js index f4524718aa3f..48de619508db 100644 --- a/browser/app/profile/001-base-profile.js +++ b/browser/app/profile/001-base-profile.js @@ -477,7 +477,7 @@ pref("font.name-list.monospace.x-unicode", "Menlo, Courier New, Noto Sans Baline #endif #ifdef XP_WIN -pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, ＭＳゴシック, MS PGothic, ＭＳＰゴシック, MV Boli, Malgun Gothic, Mangal, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, MingLiU, 細明體, PMingLiU, 新細明體, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Bu [...] +pref("font.system.whitelist", "Arial, Cambria Math, Consolas, Courier New, Georgia, Lucida Console, MS Gothic, ＭＳゴシック, MS PGothic, ＭＳＰゴシック, MV Boli, Malgun Gothic, Microsoft Himalaya, Microsoft JhengHei, Microsoft YaHei, 微软雅黑, Segoe UI, SimSun, 宋体, Sylfaen, Tahoma, Times New Roman, Verdana, Twemoji Mozilla, Noto Sans Adlam, Noto Sans Balinese, Noto Sans Bamum, Noto Sans Bassa Vah, Noto Sans Batak, Noto Sans Bengali, Noto Sans Buginese, Noto Sans Buhid, Noto Sans Canadian Aboriginal, No [...] // Arabic pref("font.name-list.serif.ar", "Times New Roman, Noto Naskh Arabic"); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated (93c9881b2a05 -> 0a0945855cb7)
by gitolite role 10 Oct '22

10 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. from 93c9881b2a05 fixup! Base Browser's .mozconfigs. new 6fc29f91fbe8 fixup! TB3: Tor Browser's official .mozconfigs. new d294beea175d Revert "Bug 28044: Integrate Tor Launcher into tor-browser" new ec870ce68851 Bug 40933: Add tor-launcher functionality new 1a64d858c5ab fixup! Bug 40933: Add tor-launcher functionality new 07710cca4425 fixup! Bug 40562: Added Tor-related preferences to 000-tor-browser.js new 2df6696ded66 fixup! Bug 40597: Implement TorSettings module new c3726ddc7c05 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser new eeb101368c6e fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. new 91abcc7a6a7f fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new 0a0945855cb7 fixup! Bug 10760: Integrate TorButton to TorBrowser core The 10 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: browser/app/profile/000-tor-browser.js | 69 ++ browser/components/sessionstore/SessionStore.jsm | 5 - .../torpreferences/content/connectionPane.js | 11 +- .../torpreferences/content/torLogDialog.jsm | 6 +- browser/config/mozconfigs/tor-browser-android | 3 - browser/extensions/moz.build | 3 - browser/installer/Makefile.in | 4 - browser/installer/package-manifest.in | 6 +- browser/modules/BridgeDB.jsm | 2 +- browser/modules/Moat.jsm | 4 +- browser/modules/TorConnect.jsm | 73 +- browser/modules/TorProcessService.jsm | 12 - browser/modules/TorProtocolService.jsm | 510 -------------- browser/modules/TorSettings.jsm | 25 +- browser/modules/moz.build | 2 - moz.configure | 18 - mozconfig-linux-x86_64-dev | 1 - toolkit/components/moz.build | 1 + .../processsingleton/MainProcessSingleton.jsm | 4 - .../tor-launcher/TorBootstrapRequest.jsm | 131 ++++ .../components/tor-launcher/TorLauncherUtil.jsm | 600 +++++++++++++++++ .../components/tor-launcher/TorMonitorService.jsm | 449 ++++++++++++ toolkit/components/tor-launcher/TorParsers.jsm | 275 ++++++++ toolkit/components/tor-launcher/TorProcess.jsm | 552 +++++++++++++++ .../components/tor-launcher/TorProtocolService.jsm | 749 +++++++++++++++++++++ .../components/tor-launcher/TorStartupService.jsm | 90 +++ toolkit/components/tor-launcher/components.conf | 10 + toolkit/components/tor-launcher/moz.build | 17 + .../components/tor-launcher/tor-launcher.manifest | 1 + toolkit/mozapps/update/UpdateService.jsm | 8 +- toolkit/torproject/torbutton | 2 +- 31 files changed, 3003 insertions(+), 640 deletions(-) delete mode 100644 browser/modules/TorProcessService.jsm delete mode 100644 browser/modules/TorProtocolService.jsm create mode 100644 toolkit/components/tor-launcher/TorBootstrapRequest.jsm create mode 100644 toolkit/components/tor-launcher/TorLauncherUtil.jsm create mode 100644 toolkit/components/tor-launcher/TorMonitorService.jsm create mode 100644 toolkit/components/tor-launcher/TorParsers.jsm create mode 100644 toolkit/components/tor-launcher/TorProcess.jsm create mode 100644 toolkit/components/tor-launcher/TorProtocolService.jsm create mode 100644 toolkit/components/tor-launcher/TorStartupService.jsm create mode 100644 toolkit/components/tor-launcher/components.conf create mode 100644 toolkit/components/tor-launcher/moz.build create mode 100644 toolkit/components/tor-launcher/tor-launcher.manifest -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 10

[torbutton] branch main updated (829fab42 -> d96a8864)
by gitolite role 10 Oct '22

10 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository torbutton. from 829fab42 Translation updates new 12c59736 Bug 40730: Do not register localizations in 102 new d96a8864 Bug 40933: Moved tor-launcher to tor-browser.git The 2 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: chrome/content/torbutton.js | 26 ++++++-------- components/startup-observer.js | 78 ++++++++++++++++++++++++------------------ modules/tor-control-port.js | 12 +++---- 3 files changed, 61 insertions(+), 55 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[builders/tor-browser-build] branch main updated: Bug 40636: Remove https-everywhere from projects/browser/config
by gitolite role 10 Oct '22

10 Oct '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 b542c52 Bug 40636: Remove https-everywhere from projects/browser/config b542c52 is described below commit b542c5269e0ddb189a461aa06d75b3f692745b88 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Sun Oct 9 22:48:28 2022 +0200 Bug 40636: Remove https-everywhere from projects/browser/config In af97862c4b857415eade803c6a417474297fc54b we removed https-everywhere from Android builds, but forgot to remove it from projects/browser/config. --- projects/browser/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/browser/config b/projects/browser/config index 03cde94..10b7eb9 100644 --- a/projects/browser/config +++ b/projects/browser/config @@ -76,9 +76,6 @@ input_files: - project: firefox-langpacks name: firefox-langpacks enable: '[% ! c("var/testbuild") && ! c("var/android") %]' - - project: https-everywhere - name: https-everywhere - enable: '[% c("var/android") %]' - project: fonts name: fonts enable: '[% ! c("var/android") %]' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Base Browser's .mozconfigs.
by gitolite role 08 Oct '22

08 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 93c9881b2a05 fixup! Base Browser's .mozconfigs. 93c9881b2a05 is described below commit 93c9881b2a05bb745a772c125e252456d404c7ad Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Sat Oct 8 17:55:29 2022 +0000 fixup! Base Browser's .mozconfigs. Bug 41343: Add -without-wam-sandboxed-libraries to mozconfig-linux-x86_64-dev for local builds --- mozconfig-linux-x86_64-dev | 1 + 1 file changed, 1 insertion(+) diff --git a/mozconfig-linux-x86_64-dev b/mozconfig-linux-x86_64-dev index ce66cd7cdc3e..06d16d40fcf1 100644 --- a/mozconfig-linux-x86_64-dev +++ b/mozconfig-linux-x86_64-dev @@ -12,3 +12,4 @@ ac_add_options --disable-install-strip ac_add_options --enable-tor-launcher ac_add_options --disable-tor-browser-update ac_add_options --with-tor-browser-version=dev-build +ac_add_options --without-wasm-sandboxed-libraries -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: squash! Firefox preference overrides.
by gitolite role 08 Oct '22

08 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 58364b04825f squash! Firefox preference overrides. 58364b04825f is described below commit 58364b04825f023b11617590a404dfcc35e40d21 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Sat Oct 8 01:58:37 2022 +0000 squash! Firefox preference overrides. Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector --- browser/app/profile/001-base-profile.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/001-base-profile.js b/browser/app/profile/001-base-profile.js index 374bc3d1550e..f4524718aa3f 100644 --- a/browser/app/profile/001-base-profile.js +++ b/browser/app/profile/001-base-profile.js @@ -226,6 +226,8 @@ pref("dom.textMetrics.emHeight.enabled", false); pref("dom.textMetrics.fontBoundingBox.enabled", false); pref("pdfjs.enableScripting", false); pref("javascript.options.large_arraybuffers", false); +// Bug 40057: Ensure system colors are not used for CSS4 colors +pref("browser.display.use_system_colors", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation -- 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-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

[tor-browser] branch tor-browser-91.13.0esr-11.5-1 updated: fixup! Bug 10760: Integrate TorButton to TorBrowser core
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 tor-browser-91.13.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.13.0esr-11.5-1 by this push: new e78377c82d2c fixup! Bug 10760: Integrate TorButton to TorBrowser core e78377c82d2c is described below commit e78377c82d2c7f32edd3789ff8b62e1c70a557b6 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Fri Oct 7 18:57:09 2022 +0200 fixup! Bug 10760: Integrate TorButton to TorBrowser core Updated translations. --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 5d7e654bf71f..4c4fdce43730 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 5d7e654bf71f63be44cc38f1db26b82dda7907a7 +Subproject commit 4c4fdce43730d6555d13f432b52ee205625b02de -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[torbutton] branch maint-11.5 updated (5d7e654b -> 4c4fdce4)
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 torbutton. from 5d7e654b Bug 41338: Correct direction of search arrow in right-to-left new bc848d06 Translations update new 4c4fdce4 Added placeholders for about:tor in vi. The 2 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: chrome/locale/ar/aboutTor.dtd | 21 ++++++++- chrome/locale/bn-BD/aboutTor.dtd | 26 ++++++++++- chrome/locale/ca/aboutTor.dtd | 26 ++++++++++- chrome/locale/da/aboutTor.dtd | 26 ++++++++++- chrome/locale/de/aboutTor.dtd | 21 ++++++++- chrome/locale/el/aboutTor.dtd | 21 ++++++++- chrome/locale/es-AR/aboutTor.dtd | 26 ++++++++++- chrome/locale/es-ES/aboutTor.dtd | 21 ++++++++- chrome/locale/eu/aboutTor.dtd | 26 ++++++++++- chrome/locale/fa/aboutTor.dtd | 23 +++++++++- chrome/locale/fr/aboutTor.dtd | 21 ++++++++- chrome/locale/ga-IE/aboutTor.dtd | 28 +++++++++++- chrome/locale/he/aboutTor.dtd | 21 ++++++++- chrome/locale/hu/aboutTor.dtd | 21 ++++++++- chrome/locale/id/aboutTor.dtd | 21 ++++++++- chrome/locale/id/browserOnboarding.properties | 28 ++++++------ chrome/locale/is/aboutTor.dtd | 32 +++++++++++-- chrome/locale/is/torbutton.properties | 38 ++++++++-------- chrome/locale/it/aboutTor.dtd | 21 ++++++++- chrome/locale/ja/aboutTor.dtd | 21 ++++++++- chrome/locale/ka/aboutTor.dtd | 21 ++++++++- chrome/locale/ko/aboutTor.dtd | 21 ++++++++- chrome/locale/lt/aboutTor.dtd | 26 ++++++++++- chrome/locale/mk/aboutTor.dtd | 23 +++++++++- chrome/locale/mk/torbutton.properties | 38 ++++++++-------- chrome/locale/ms/aboutTor.dtd | 26 ++++++++++- chrome/locale/my/aboutTor.dtd | 21 ++++++++- chrome/locale/my/torbutton.dtd | 4 +- chrome/locale/my/torbutton.properties | 58 ++++++++++++------------ chrome/locale/nb-NO/aboutTor.dtd | 26 ++++++++++- chrome/locale/nl/aboutTor.dtd | 26 ++++++++++- chrome/locale/pl/aboutTor.dtd | 23 +++++++++- chrome/locale/pt-BR/aboutTor.dtd | 21 ++++++++- chrome/locale/pt-BR/torbutton.properties | 18 ++++---- chrome/locale/ro/aboutTor.dtd | 21 ++++++++- chrome/locale/ru/aboutTor.dtd | 21 ++++++++- chrome/locale/sv-SE/aboutTor.dtd | 21 ++++++++- chrome/locale/sv-SE/browserOnboarding.properties | 2 +- chrome/locale/sv-SE/torbutton.properties | 12 ++--- chrome/locale/th/aboutTor.dtd | 26 ++++++++++- chrome/locale/tr/aboutTor.dtd | 21 ++++++++- chrome/locale/uk/aboutTor.dtd | 21 ++++++++- chrome/locale/vi/aboutTor.dtd | 26 ++++++++++- chrome/locale/zh-CN/aboutTor.dtd | 21 ++++++++- chrome/locale/zh-TW/aboutTor.dtd | 21 ++++++++- 45 files changed, 911 insertions(+), 143 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[Git][tpo/applications/fenix] Pushed new tag tor-browser-102.2.1-11.5-1-build1
by Pier Angelo Vendrame (＠pierov) 07 Oct '22

07 Oct '22

Pier Angelo Vendrame pushed new tag tor-browser-102.2.1-11.5-1-build1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-102… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix][tor-browser-102.2.1-11.5-1] yec22 home fragment, theming, and timegate toggle
by Dan Ballard (＠dan) 07 Oct '22

07 Oct '22

Dan Ballard pushed to branch tor-browser-102.2.1-11.5-1 at The Tor Project / Applications / fenix Commits: 37ee8038 by Dan Ballard at 2022-10-07T09:04:49-07:00 yec22 home fragment, theming, and timegate toggle - - - - - 11 changed files: - app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt - app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt - + app/src/main/res/drawable/ic_yec22_bg_combined_android_3x.png - + app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml - + app/src/main/res/font/spacegrotesk_light.ttf - + app/src/main/res/font/spacegrotesk_regular.ttf - + app/src/main/res/font/spacegrotesk_semibold.ttf - + app/src/main/res/font/spacemono_bold.ttf - app/src/main/res/layout/fragment_home.xml - app/src/main/res/values/colors.xml - app/src/main/res/values/styles.xml Changes: ===================================== app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt ===================================== @@ -10,11 +10,8 @@ import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.ColorDrawable import android.os.Bundle import android.os.StrictMode -import android.view.Gravity -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.view.ViewTreeObserver +import android.util.Log +import android.view.* import android.widget.Button import android.widget.LinearLayout import android.widget.PopupWindow @@ -22,16 +19,10 @@ import androidx.annotation.VisibleForTesting import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet -import androidx.constraintlayout.widget.ConstraintSet.BOTTOM -import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID -import androidx.constraintlayout.widget.ConstraintSet.TOP +import androidx.constraintlayout.widget.ConstraintSet.* import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.ContextCompat -import androidx.core.view.children -import androidx.core.view.doOnLayout -import androidx.core.view.isGone -import androidx.core.view.isVisible -import androidx.core.view.updateLayoutParams +import androidx.core.view.* import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer @@ -66,15 +57,13 @@ import mozilla.components.service.glean.private.NoExtras import mozilla.components.support.base.feature.ViewBoundFeatureWrapper import mozilla.components.support.ktx.android.content.res.resolveAttribute import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifChanged +import mozilla.components.support.locale.LocaleManager import mozilla.components.ui.tabcounter.TabCounterMenu -import org.mozilla.fenix.BuildConfig -import org.mozilla.fenix.Config +import org.mozilla.fenix.* import org.mozilla.fenix.GleanMetrics.Events import org.mozilla.fenix.GleanMetrics.HomeScreen import org.mozilla.fenix.GleanMetrics.StartOnHome import org.mozilla.fenix.GleanMetrics.Wallpapers -import org.mozilla.fenix.HomeActivity -import org.mozilla.fenix.R import org.mozilla.fenix.browser.BrowserAnimator.Companion.getToolbarNavOptions import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.components.FenixSnackbar @@ -84,12 +73,7 @@ import org.mozilla.fenix.components.appstate.AppAction import org.mozilla.fenix.components.toolbar.FenixTabCounterMenu import org.mozilla.fenix.components.toolbar.ToolbarPosition import org.mozilla.fenix.databinding.FragmentHomeBinding -import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.hideToolbar -import org.mozilla.fenix.ext.nav -import org.mozilla.fenix.ext.requireComponents -import org.mozilla.fenix.ext.runIfFragmentIsAttached -import org.mozilla.fenix.ext.settings +import org.mozilla.fenix.ext.* import org.mozilla.fenix.gleanplumb.DefaultMessageController import org.mozilla.fenix.gleanplumb.MessagingFeature import org.mozilla.fenix.home.mozonline.showPrivacyPopWindow @@ -110,6 +94,7 @@ import org.mozilla.fenix.home.topsites.DefaultTopSitesView import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.onboarding.FenixOnboarding import org.mozilla.fenix.perf.MarkersFragmentLifecycleCallbacks +import org.mozilla.fenix.settings.advanced.getSelectedLocale import org.mozilla.fenix.tabstray.TabsTrayAccessPoint import org.mozilla.fenix.tor.bootstrap.TorQuickStart import org.mozilla.fenix.utils.Settings.Companion.TOP_SITES_PROVIDER_MAX_THRESHOLD @@ -117,6 +102,8 @@ import org.mozilla.fenix.utils.ToolbarPopupWindow import org.mozilla.fenix.utils.allowUndo import org.mozilla.fenix.wallpapers.WallpaperManager import java.lang.ref.WeakReference +import java.util.* +import kotlin.concurrent.schedule import kotlin.math.min @Suppress("TooManyFunctions", "LargeClass") @@ -229,6 +216,13 @@ class HomeFragment : Fragment() { ?.replace(" *([.,。।]) *".toRegex(), "$1\n") ?.trim() + binding.yecPoweredbyprivacy.text = localBinding + .yecPoweredbyprivacy + .text + ?.replace(" *([.,。।]) *".toRegex(), "$1\n") + ?.trim() + + currentMode = CurrentMode( requireContext(), onboarding, @@ -411,6 +405,20 @@ class HomeFragment : Fragment() { adjustHomeFragmentView(currentMode.getCurrentMode()) showSessionControlView() + binding.donateNowButton.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/pbp-${locale}-mobile" + activity.openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } + // DO NOT MOVE ANYTHING BELOW THIS addMarker CALL! requireComponents.core.engine.profiler?.addMarker( MarkersFragmentLifecycleCallbacks.MARKER_NAME, profilerStartTime, "HomeFragment.onCreateView", @@ -424,8 +432,34 @@ class HomeFragment : Fragment() { getMenuButton()?.dismissMenu() displayWallpaperIfEnabled() + + //view.donationmatch.setOnClickListener { + // activity.openToBrowserAndLoad( + // searchTermOrURL = "https://blog.torproject.org/friends-of-tor-match-2020", + // newTab = true, + // from = BrowserDirection.FromHome + // ) + //} + + binding.donateNowButton.setOnClickListener { + val country = LocaleManager.getSelectedLocale(requireContext()).country + var locale = LocaleManager.getSelectedLocale(requireContext()).language + if (country != "") { + locale = "${locale}-${country}" + } + val localeUrl = "https://www.torproject.org/pbp-${locale}-mobile" + (activity as HomeActivity).openToBrowserAndLoad( + searchTermOrURL = localeUrl, + newTab = true, + from = BrowserDirection.FromHome + ) + } } + //private fun dismissTip(tip: Tip) { + // sessionControlInteractor.onCloseTip(tip) + //} + /** * Returns a [TopSitesConfig] which specifies how many top sites to display and whether or * not frequently visited sites should be displayed. @@ -577,14 +611,97 @@ class HomeFragment : Fragment() { } } } + val yec22launched = (activity as? HomeActivity)?.themeManager?.isYECActive ?: false + // Hide the onion pattern during Onboarding, too. binding.onionPatternImage.apply { - visibility = if (onboarding.userHasBeenOnboarded()) { + visibility = if (onboarding.userHasBeenOnboarded() && !yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide tor browser header during onboarding and EOY event + binding.exploreprivately.apply { + visibility = if (onboarding.userHasBeenOnboarded() && !yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + + + // Hide EOY header text during onboarding and before event + binding.yecPoweredbyprivacy.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + + + // Hide the EOY image during Onboarding, and before event + binding.yecActivistImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + binding.yecResistanceImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + binding.yecChangeImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + binding.yecFreedomImage.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide the EOY donate button during Onboarding, and before event + binding.donateNowButton.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + + // Hide EOY donation match text during onboarding and before event + binding.donationmatch.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { View.VISIBLE } else { View.GONE } } + + // Hide the EOY image during Onboarding, and before event + binding.yecImageLayout.apply { + visibility = if (onboarding.userHasBeenOnboarded() && yec22launched) { + View.VISIBLE + } else { + View.GONE + } + } + binding.homeAppBar.apply { visibility = View.VISIBLE @@ -932,7 +1049,11 @@ class HomeFragment : Fragment() { override fun onResume() { super.onResume() if (browsingModeManager.mode == BrowsingMode.Private) { - activity?.window?.setBackgroundDrawableResource(R.drawable.private_home_background_gradient) + if ((activity as? HomeActivity)?.themeManager?.isYECActive ?: false) { + activity?.window?.setBackgroundDrawableResource(R.color.tor_yec_home_background) + } else { + activity?.window?.setBackgroundDrawableResource(R.drawable.private_home_background_gradient) + } } // fenix#40176: Ensure the Home fragment is rendered correctly when we resume. ===================================== app/src/main/java/org/mozilla/fenix/theme/ThemeManager.kt ===================================== @@ -23,18 +23,33 @@ import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R import org.mozilla.fenix.browser.browsingmode.BrowsingMode import org.mozilla.fenix.customtabs.ExternalAppBrowserActivity +import org.mozilla.fenix.home.HomeFragment +import java.util.* abstract class ThemeManager { + // 1663979387091 // 2022 9 21 - testing + // 1665619200000 // 2022 10 13 + private val yec2022LaunchDate = Date(1665619200000) + // 1672531200000 // 2023 01 01 + private val yec2022EndDate = Date(1672531200000) abstract var currentTheme: BrowsingMode + val isYECActive get() = Date().after(yec2022LaunchDate) && Date().before(yec2022EndDate) + /** * Returns the style resource corresponding to the [currentTheme]. */ @get:StyleRes val currentThemeResource get() = when (currentTheme) { BrowsingMode.Normal -> R.style.NormalTheme - BrowsingMode.Private -> R.style.PrivateTheme + BrowsingMode.Private -> { + if (isYECActive) { + R.style.PrivateEOYTheme + } else { + R.style.PrivateTheme + } + } } /** ===================================== app/src/main/res/drawable/ic_yec22_bg_combined_android_3x.png ===================================== Binary files /dev/null and b/app/src/main/res/drawable/ic_yec22_bg_combined_android_3x.png differ ===================================== app/src/main/res/drawable/tor_yec_donate_rounded_corners.xml ===================================== @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> + + + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="#C0FF00" /> + <corners android:radius="10dp" /> +</shape> ===================================== app/src/main/res/font/spacegrotesk_light.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacegrotesk_light.ttf differ ===================================== app/src/main/res/font/spacegrotesk_regular.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacegrotesk_regular.ttf differ ===================================== app/src/main/res/font/spacegrotesk_semibold.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacegrotesk_semibold.ttf differ ===================================== app/src/main/res/font/spacemono_bold.ttf ===================================== Binary files /dev/null and b/app/src/main/res/font/spacemono_bold.ttf differ ===================================== app/src/main/res/layout/fragment_home.xml ===================================== @@ -102,6 +102,144 @@ android:lineSpacingMultiplier="1.1" app:layout_scrollFlags="scroll" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="50dp" + android:layout_weight="1" + android:orientation="vertical"> + + <TextView + android:id="@+id/yec_poweredbyprivacy" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:layout_marginStart="35dp" + android:layout_marginEnd="35dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacemono_bold" + android:importantForAccessibility="no" + android:text="@string/yec2022_powered_by_privacy" + android:lineSpacingMultiplier="0.8" + android:textColor="#C0FF00" + android:textSize="28sp" + app:layout_scrollFlags="scroll" /> + + <RelativeLayout + android:id="@+id/yec_image_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="22dp" + android:layout_marginStart="35dp" + android:layout_marginEnd="35dp" + android:gravity="center" + android:orientation="vertical" > + + <ImageView + android:id="@+id/yec_activist_image" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scaleType="fitCenter" + android:paddingTop="10dp" + android:adjustViewBounds="true" + app:layout_scrollFlags="scroll" + app:srcCompat="@drawable/ic_yec22_bg_combined_android_3x" + tools:ignore="ContentDescription" /> + + <TextView + android:id="@+id/yec_resistance_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:paddingStart="80dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacegrotesk_semibold" + android:importantForAccessibility="no" + android:rotation="-2.25" + android:text="@string/yec2022_resistance" + android:textColor="#FF8AFF" + android:textSize="33sp" + app:layout_scrollFlags="scroll" /> + + <TextView + android:id="@+id/yec_change_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:paddingStart="80dp" + android:layout_alignLeft="@+id/yec_resistance_image" + android:layout_below="@+id/yec_resistance_image" + android:layout_marginTop="-10dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacegrotesk_light" + android:importantForAccessibility="no" + android:rotation="-2.25" + android:text="@string/yec2022_change" + android:textColor="#C0FF00" + android:textSize="33sp" + app:layout_scrollFlags="scroll" /> + + <TextView + android:id="@+id/yec_freedom_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:paddingStart="80dp" + android:layout_alignLeft="@+id/yec_resistance_image" + android:layout_below="@+id/yec_change_image" + android:layout_marginTop="-10dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacegrotesk_semibold" + android:importantForAccessibility="no" + android:rotation="-2.25" + android:text="@string/yec2022_freedom" + android:textColor="#FF8AFF" + android:textSize="33sp" + app:layout_scrollFlags="scroll" /> + </RelativeLayout> + + <Button + android:id="@+id/donate_now_button" + style="@style/TorDonateYecButton" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="35dp" + android:layout_marginRight="35dp" + android:layout_marginTop="22dp" + android:background="@drawable/tor_yec_donate_rounded_corners" + android:text="@string/tor_onboarding_donate_button" + android:textAllCaps="false" + android:textColor="#000000" + android:textSize="18sp" + android:textStyle="bold" + android:visibility="visible" + tools:ignore="ButtonStyleXmlDetector" /> + + <TextView + android:id="@+id/donationmatch" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingTop="22dp" + android:paddingStart="35dp" + android:paddingEnd="35dp" + android:clickable="false" + android:focusable="false" + android:fontFamily="@font/spacemono_bold" + android:importantForAccessibility="no" + android:lineSpacingMultiplier="1.1" + android:text="@string/yec2022_donation_matching" + android:textColor="#FAF5DF" + android:textSize="18sp" + android:gravity="center" + android:visibility="visible" + app:layout_scrollFlags="scroll" /> + + + </LinearLayout> </com.google.android.material.appbar.AppBarLayout> <androidx.recyclerview.widget.RecyclerView ===================================== app/src/main/res/values/colors.xml ===================================== @@ -273,7 +273,7 @@ <color name="sync_disconnected_background_private_theme">#5B5846</color> <color name="onboarding_illustration_deselected_private_theme">#99FBFBFE</color> <color name="prompt_login_edit_text_cursor_color_private_theme">@color/photonViolet50</color> - + <color name="tor_yec_home_background">#0E0625</color>  <color name="accent_normal_theme">@color/photonInk20</color> <color name="accent_high_contrast_normal_theme">@color/photonInk20</color> ===================================== app/src/main/res/values/styles.xml ===================================== @@ -330,6 +330,11 @@ <style name="PrivateTheme" parent="PrivateThemeBase" /> + <style name="PrivateEOYTheme" parent="PrivateThemeBase" > + <item name="android:windowBackground">@color/tor_yec_home_background</item> + <item name="homeBackground">@color/tor_yec_home_background</item> + </style> +  <style name="WindowAnimationTransition"> <item name="android:windowEnterAnimation">@anim/fade_in</item> @@ -368,6 +373,21 @@ <item name="android:textColor">#000000</item> </style> + + <style name="TorDonateYecButton" parent="NeutralButton"> + <item name="android:background">@drawable/tor_yec_donate_rounded_corners</item> + <item name="backgroundTint">#C0FF00</item> + <item name="android:textColor">#000000</item> + <item name="android:fontFamily">@font/spacemono_bold</item> + <item name="fontFamily">@font/spacemono_bold</item> + </style> + + <style name="TorDonateYecButtonText" parent="Base.TextAppearance.MaterialComponents.Badge"> + + <item name="android:textStyle">bold</item> + <item name="android:textColor">#000000</item> + </style> + <style name="DestructiveButton" parent="NeutralButton"> <item name="iconTint">@color/fx_mobile_text_color_warning</item> <item name="android:textColor">@color/fx_mobile_text_color_warning</item> View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/37ee80388b7c5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/commit/37ee80388b7c5… You're receiving this email because of your account on gitlab.torproject.org.

1 0