- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 3 commits: fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
by Richard Pospesel (＠richard) 15 Feb '23

15 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 4d0aac78 by Pier Angelo Vendrame at 2023-02-15T14:40:43+00:00 fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser - - - - - a19c9288 by Pier Angelo Vendrame at 2023-02-15T14:40:43+00:00 squash! Bug 31575: Disable Firefox Home (Activity Stream) Bug 41624: Disable about:pocket-* pages and about:firefoxview. - - - - - bd9cd0a7 by Pier Angelo Vendrame at 2023-02-15T14:40:43+00:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Bug 41624: Disable the about:url-classifier page - - - - - 6 changed files: - browser/components/BrowserGlue.jsm - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/moz.build - docshell/base/nsAboutRedirector.cpp - toolkit/modules/RemotePageAccessManager.jsm Changes: ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -237,26 +237,6 @@ let JSWINDOWACTORS = { matches: ["about:plugins"], }, - AboutPocket: { - parent: { - moduleURI: "resource:///actors/AboutPocketParent.jsm", - }, - child: { - moduleURI: "resource:///actors/AboutPocketChild.jsm", - - events: { - DOMDocElementInserted: { capture: true }, - }, - }, - - matches: [ - "about:pocket-saved*", - "about:pocket-signup*", - "about:pocket-home*", - "about:pocket-style-guide*", - ], - }, - AboutPrivateBrowsing: { parent: { moduleURI: "resource:///actors/AboutPrivateBrowsingParent.jsm", ===================================== browser/components/about/AboutRedirector.cpp ===================================== @@ -75,9 +75,11 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::IS_SECURE_CHROME_UI}, +#ifndef BASE_BROWSER {"firefoxview", "chrome://browser/content/firefoxview.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, +#endif {"policies", "chrome://browser/content/policies/aboutPolicies.html", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, {"privatebrowsing", "chrome://browser/content/aboutPrivateBrowsing.html", @@ -116,6 +118,7 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT}, +#ifndef BASE_BROWSER {"pocket-saved", "chrome://pocket/content/panels/saved.html", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | @@ -132,6 +135,7 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, +#endif {"preferences", "chrome://browser/content/preferences/preferences.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, {"downloads", @@ -156,7 +160,8 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::HIDE_FROM_ABOUTABOUT | nsIAboutModule::IS_SECURE_CHROME_UI}, // The correct URI must be obtained by GetManualChromeURI - {"manual", "about:blank", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + {"manual", "about:blank", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS | nsIAboutModule::IS_SECURE_CHROME_UI}, @@ -176,8 +181,7 @@ static nsAutoCString GetAboutModuleName(nsIURI* aURI) { return path; } -static nsTHashSet<nsCStringHashKey> GetManualLocales() -{ +static nsTHashSet<nsCStringHashKey> GetManualLocales() { nsTHashSet<nsCStringHashKey> locales; RefPtr<nsZipArchive> zip = Omnijar::GetReader(Omnijar::APP); UniquePtr<nsZipFind> find; ===================================== browser/components/about/components.conf ===================================== @@ -12,13 +12,8 @@ pages = [ 'home', 'logins', 'loginsimportreport', - 'firefoxview', 'manual', 'newtab', - 'pocket-home', - 'pocket-saved', - 'pocket-signup', - 'pocket-style-guide', 'policies', 'preferences', 'privatebrowsing', ===================================== browser/components/moz.build ===================================== @@ -43,7 +43,6 @@ DIRS += [ "onionservices", "originattributes", "places", - "pocket", "preferences", "privatebrowsing", "prompts", @@ -69,7 +68,6 @@ DIRS += ["build"] if CONFIG["NIGHTLY_BUILD"]: DIRS += [ "colorways", - "firefoxview", ] ===================================== docshell/base/nsAboutRedirector.cpp ===================================== @@ -165,8 +165,10 @@ static const RedirEntry kRedirMap[] = { #endif {"telemetry", "chrome://global/content/aboutTelemetry.xhtml", nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::IS_SECURE_CHROME_UI}, +#ifndef BASE_BROWSER {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml", nsIAboutModule::ALLOW_SCRIPT}, +#endif {"webrtc", "chrome://global/content/aboutwebrtc/aboutWebrtc.html", nsIAboutModule::ALLOW_SCRIPT}, {"crashparent", "about:blank", nsIAboutModule::HIDE_FROM_ABOUTABOUT}, ===================================== toolkit/modules/RemotePageAccessManager.jsm ===================================== @@ -101,29 +101,6 @@ let RemotePageAccessManager = { "about:plugins": { RPMSendQuery: ["RequestPlugins"], }, - "about:pocket-saved": { - RPMSendAsyncMessage: ["*"], - RPMAddMessageListener: ["*"], - RPMRemoveMessageListener: ["*"], - RPMGetStringPref: ["extensions.pocket.site"], - }, - "about:pocket-signup": { - RPMSendAsyncMessage: ["*"], - RPMAddMessageListener: ["*"], - RPMRemoveMessageListener: ["*"], - RPMGetStringPref: ["extensions.pocket.site"], - }, - "about:pocket-home": { - RPMSendAsyncMessage: ["*"], - RPMAddMessageListener: ["*"], - RPMRemoveMessageListener: ["*"], - RPMGetStringPref: ["extensions.pocket.site"], - }, - "about:pocket-style-guide": { - RPMSendAsyncMessage: ["*"], - RPMAddMessageListener: ["*"], - RPMRemoveMessageListener: ["*"], - }, "about:privatebrowsing": { RPMSendAsyncMessage: [ "OpenPrivateWindow", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a697a2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a697a2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
by Richard Pospesel (＠richard) 15 Feb '23

15 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 9d3722cd by Richard Pospesel at 2023-02-15T13:55:19+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js bug 41627: Enable network.http.referer.hideOnionSource in base-browser (cherry picked from commit a697a2c0dfb46591f6d497ae7178be3a55d55fc7) - - - - - 1 changed file: - browser/app/profile/000-tor-browser.js Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -38,9 +38,6 @@ pref("dom.securecontext.allowlist_onions", true); // Disable HTTPS-Only mode for .onion domains (tor-browser#19850) pref("dom.security.https_only_mode.upgrade_onion", false); -// tor-browser#22320: Hide referer when comming from a .onion address -pref("network.http.referer.hideOnionSource", true); - // Bug 40423/41137: Disable http/3 // We should re-enable it as soon as Tor gets UDP support pref("network.http.http3.enabled", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d3722c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/9d3722c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 15 Feb '23

15 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 8d7cac06 by Richard Pospesel at 2023-02-15T13:54:59+00:00 fixup! Firefox preference overrides. bug 41627: Enable network.http.referer.hideOnionSource in base-browser (cherry picked from commit 90df17dac724c43bbc533a0f449a72ba419d9d67) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -57,6 +57,12 @@ pref("media.memory_cache_max_size", 16384); pref("dom.security.https_only_mode", true); pref("dom.security.https_only_mode_pbm", true); +// tor-browser#22320: Hide referer when comming from a .onion address +// We enable this here (rather than in Tor Browser) in case users of other +// base-browser derived browsers configure it to use a system Tor daemon +// to visit onion services. +pref("network.http.referer.hideOnionSource", true); + // Require Safe Negotiation ( https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/27719 ) // Blocks connections to servers that don't support RFC 5746 [2] as they're potentially vulnerable to a // MiTM attack [3]. A server without RFC 5746 can be safe from the attack if it disables renegotiations View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8d7cac0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8d7cac0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.0-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 15 Feb '23

15 Feb '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 02bb195d by Richard Pospesel at 2023-02-15T13:54:39+00:00 fixup! Firefox preference overrides. bug 41627: Enable network.http.referer.hideOnionSource in base-browser (cherry picked from commit 90df17dac724c43bbc533a0f449a72ba419d9d67) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -57,6 +57,12 @@ pref("media.memory_cache_max_size", 16384); pref("dom.security.https_only_mode", true); pref("dom.security.https_only_mode_pbm", true); +// tor-browser#22320: Hide referer when comming from a .onion address +// We enable this here (rather than in Tor Browser) in case users of other +// base-browser derived browsers configure it to use a system Tor daemon +// to visit onion services. +pref("network.http.referer.hideOnionSource", true); + // Require Safe Negotiation ( https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/27719 ) // Blocks connections to servers that don't support RFC 5746 [2] as they're potentially vulnerable to a // MiTM attack [3]. A server without RFC 5746 can be safe from the attack if it disables renegotiations View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/02bb195… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/02bb195… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 15 Feb '23

15 Feb '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 926c3f33 by Richard Pospesel at 2023-02-15T13:54:12+00:00 fixup! Firefox preference overrides. bug 41627: Enable network.http.referer.hideOnionSource in base-browser (cherry picked from commit 90df17dac724c43bbc533a0f449a72ba419d9d67) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -68,6 +68,12 @@ pref("browser.pagethumbnails.capturing_disabled", true); pref("dom.security.https_only_mode", true); pref("dom.security.https_only_mode_pbm", true); +// tor-browser#22320: Hide referer when comming from a .onion address +// We enable this here (rather than in Tor Browser) in case users of other +// base-browser derived browsers configure it to use a system Tor daemon +// to visit onion services. +pref("network.http.referer.hideOnionSource", true); + // Require Safe Negotiation ( https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/27719 ) // Blocks connections to servers that don't support RFC 5746 [2] as they're potentially vulnerable to a // MiTM attack [3]. A server without RFC 5746 can be safe from the attack if it disables renegotiations View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/926c3f3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/926c3f3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 2 commits: fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 15 Feb '23

15 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 90df17da by Richard Pospesel at 2023-02-15T13:37:32+00:00 fixup! Firefox preference overrides. bug 41627: Enable network.http.referer.hideOnionSource in base-browser - - - - - a697a2c0 by Richard Pospesel at 2023-02-15T13:38:06+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js bug 41627: Enable network.http.referer.hideOnionSource in base-browser - - - - - 2 changed files: - browser/app/profile/000-tor-browser.js - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -38,9 +38,6 @@ pref("dom.securecontext.allowlist_onions", true); // Disable HTTPS-Only mode for .onion domains (tor-browser#19850) pref("dom.security.https_only_mode.upgrade_onion", false); -// tor-browser#22320: Hide referer when comming from a .onion address -pref("network.http.referer.hideOnionSource", true); - // Bug 40423/41137: Disable http/3 // We should re-enable it as soon as Tor gets UDP support pref("network.http.http3.enabled", false); ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -68,6 +68,12 @@ pref("browser.pagethumbnails.capturing_disabled", true); pref("dom.security.https_only_mode", true); pref("dom.security.https_only_mode_pbm", true); +// tor-browser#22320: Hide referer when comming from a .onion address +// We enable this here (rather than in Tor Browser) in case users of other +// base-browser derived browsers configure it to use a system Tor daemon +// to visit onion services. +pref("network.http.referer.hideOnionSource", true); + // Require Safe Negotiation ( https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/27719 ) // Blocks connections to servers that don't support RFC 5746 [2] as they're potentially vulnerable to a // MiTM attack [3]. A server without RFC 5746 can be safe from the attack if it disables renegotiations View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/33b90e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/33b90e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-12.0.3-build1
by Richard Pospesel (＠richard) 15 Feb '23

15 Feb '23

Richard Pospesel pushed new tag tbb-12.0.3-build1 at The Tor Project / Applications / tor-browser-build -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.5-1] 2 commits: fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 15 Feb '23

15 Feb '23

Pier Angelo Vendrame pushed to branch base-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 2de21152 by Pier Angelo Vendrame at 2023-02-15T09:24:19+01:00 fixup! Bug 40925: Implemented the Security Level component Bug 40781 (build): Move l10n files to browser/locales - - - - - 9c96c84b by Pier Angelo Vendrame at 2023-02-15T09:25:44+01:00 fixup! Bug 40926: Implemented the New Identity feature Bug 40781 (build): Move l10n files to browser/locales - - - - - 8 changed files: - browser/components/newidentity/content/newidentity.js - browser/components/newidentity/jar.mn - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/jar.mn - browser/installer/package-manifest.in - browser/components/newidentity/locale/en-US/newIdentity.properties → browser/locales/en-US/chrome/browser/newIdentity.properties - browser/components/securitylevel/locale/en-US/securityLevel.properties → browser/locales/en-US/chrome/browser/securityLevel.properties - browser/locales/jar.mn Changes: ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -24,7 +24,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { let bundle = null; try { bundle = Services.strings.createBundle( - "chrome://newidentity/locale/newIdentity.properties" + "chrome://browser/locale/newIdentity.properties" ); } catch (e) { console.warn("Could not load the New Identity strings"); ===================================== browser/components/newidentity/jar.mn ===================================== @@ -3,14 +3,3 @@ browser.jar: content/browser/newIdentityDialog.xhtml (content/newIdentityDialog.xhtml) content/browser/newIdentityDialog.css (content/newIdentityDialog.css) content/browser/newIdentityDialog.js (content/newIdentityDialog.js) - -newidentity.jar: -# We need to list at least one locale here, to make Firefox load the localized -# copy of properties at chrome://newidentity/locale/newIdentity.properties. -# Ideally, we should use @AB_CD@.jar to automatically copy all the locales -# Firefox is built with. But we only provide English here, and injecting the -# translated files directly to the omni.ja works better for us, for the time -# being. In addition to inject the properties files, we also add the -# corresponding locale line to chrome/chrome.manifest. -% locale newidentity en-US %locale/en-US/ - locale/en-US/newIdentity.properties (locale/en-US/newIdentity.properties) ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -46,7 +46,7 @@ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", () => { let bundle = null; try { bundle = Services.strings.createBundle( - "chrome://securitylevel/locale/securityLevel.properties" + "chrome://browser/locale/securityLevel.properties" ); } catch (e) { console.warn("Could not load the Security Level strings"); ===================================== browser/components/securitylevel/jar.mn ===================================== @@ -4,8 +4,3 @@ browser.jar: content/browser/securitylevel/securityLevelButton.css (content/securityLevelButton.css) content/browser/securitylevel/securityLevelPreferences.css (content/securityLevelPreferences.css) content/browser/securitylevel/securityLevelIcon.svg (content/securityLevelIcon.svg) - -securitylevel.jar: -# See New Identity for further information on how this works -% locale securitylevel en-US %locale/en-US/ - locale/en-US/securityLevel.properties (locale/en-US/securityLevel.properties) ===================================== browser/installer/package-manifest.in ===================================== @@ -245,10 +245,6 @@ #endif ; Base Browser -@RESPATH@/browser/chrome/newidentity.manifest -@RESPATH@/browser/chrome/newidentity/ -@RESPATH@/browser/chrome/securitylevel.manifest -@RESPATH@/browser/chrome/securitylevel/ @RESPATH@/components/SecurityLevel.manifest ; [DevTools Startup Files] ===================================== browser/components/newidentity/locale/en-US/newIdentity.properties → browser/locales/en-US/chrome/browser/newIdentity.properties ===================================== ===================================== browser/components/securitylevel/locale/en-US/securityLevel.properties → browser/locales/en-US/chrome/browser/securityLevel.properties ===================================== ===================================== browser/locales/jar.mn ===================================== @@ -39,6 +39,8 @@ locale/browser/safebrowsing/safebrowsing.properties (%chrome/browser/safebrowsing/safebrowsing.properties) locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties) + locale/browser/securityLevel.properties (%chrome/browser/securityLevel.properties) + locale/browser/newIdentity.properties (%chrome/browser/newIdentity.properties) % locale browser-region @AB_CD@ %locale/browser-region/ # the following files are browser-specific overrides locale/browser/netError.dtd (%chrome/overrides/netError.dtd) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/82f538… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/82f538… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40781: Move translations to new paths
by Pier Angelo Vendrame (＠pierov) 15 Feb '23

15 Feb '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 01391c77 by Pier Angelo Vendrame at 2023-02-14T19:12:26+01:00 Bug 40781: Move translations to new paths - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -57,15 +57,6 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %] -[% IF !c("var/testbuild") -%] - tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %] - transl_base_browser=$rootdir/translation-base-browser - [% IF c("var/tor-browser") -%] - tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %] - transl_tor_browser=$rootdir/translation-tor-browser - [% END -%] -[% END -%] - cd /var/tmp/build/[% project %]-[% c("version") %] cat > .mozconfig << 'MOZCONFIG_EOF' [% INCLUDE mozconfig %] @@ -106,43 +97,6 @@ fi sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torprojec… c("var/nightly_updates_osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in [% END -%] -add_translation () { - transl_dir=$1 - component=$2 - lang=$3 - filename=$4 - - mkdir "browser/components/$component/locale/$lang" - cp "$transl_dir/$lang/$filename" "browser/components/$component/locale/$lang/" - echo "% locale $component $lang %locale/$lang/" >> "browser/components/$component/jar.mn" - echo " locale/$lang/$filename (locale/$lang/$filename)" >> "browser/components/$component/jar.mn" -} - -[% IF c("var/testbuild") -%] - supported_locales="" -[% ELSE -%] - supported_locales="[% tmpl(c('var/locales').join(' ')) %]" -[% END -%] -[% IF c("var/tor-browser") -%] - torbutton_locales="toolkit/torbutton/chrome/locale/" - torbutton_jar="toolkit/torbutton/jar.mn" -[% END -%] -for lang in $supported_locales; do - [% IF c("var/macos") -%] - if [ "$lang" == "ja-JP-mac" ]; then - lang="ja" - fi - [% END-%] - - add_translation $transl_base_browser newidentity $lang newIdentity.properties - add_translation $transl_base_browser securitylevel $lang securityLevel.properties - - [% IF c("var/tor-browser") -%] - mv "$transl_tor_browser/$lang" "$torbutton_locales/" - echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" - echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" - [% END -%] -done rm -f configure rm -f js/src/configure @@ -153,24 +107,60 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system mkdir "$HOME/.mozbuild" [% IF !c("var/testbuild") -%] + supported_locales="[% tmpl(c('var/locales').join(' ')) %]" + l10ncentral="$HOME/.mozbuild/l10n-central" mkdir "$l10ncentral" for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do tar -C "$l10ncentral" -xf "$tarball" done - tar -C $rootdir -xf $rootdir/[% c('input_files_by_name/translation-base-browser-fluent') %] - base_browser_fluent=$rootdir/translation-base-browser-fluent + tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-base-browser') %]" + pushd "$rootdir/translation-base-browser" + ln -s ja ja-JP-mac for lang in $supported_locales; do - source_lang="$lang" - if [ $lang = "ja-JP-mac" ]; then - source_lang="ja" - elif [ $lang = "es-ES" ]; then - source_lang="es" - fi - cp "$base_browser_fluent/$source_lang/languageNotification.ftl" "$l10ncentral/$lang/browser/browser/" + # Please notice that Fluent and DTDs use different directories in + # l10n-central! This is something we have to keep in mind when we will join + # the two branches! + mv $lang/* "$l10ncentral/$lang/browser/chrome/browser/" done -[% END %] + popd + + tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-base-browser-fluent') %]" + pushd "$rootdir/translation-base-browser-fluent" + ln -s ja ja-JP-mac + # TODO: These two sources will be unified eventually; at that point, this link + # will go away, too. + ln -s es es-ES + for lang in $supported_locales; do + mv $lang/languageNotification.ftl "$l10ncentral/$lang/browser/browser/" + done + popd + + [% IF c("var/tor-browser") -%] + # We will have to keep the torbutton.jar until we stop using dtds, because + # if we move them to the browser locale directory, browser.xhtml is not + # loaded. + tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-tor-browser') %]" + transl_tor_browser="$rootdir/translation-tor-browser" + torbutton_locales="toolkit/torbutton/chrome/locale/" + torbutton_jar="toolkit/torbutton/jar.mn" + for lang in $supported_locales; do + central_lang=$lang + [% IF c("var/macos") -%] + if [ "$lang" == "ja-JP-mac" ]; then + lang="ja" + fi + [% END -%] + mv "$transl_tor_browser/$lang/cryptoSafetyPrompt.properties" "$l10ncentral/$central_lang/browser/chrome/browser/" + mv "$transl_tor_browser/$lang" "$torbutton_locales/" + echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar" + echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar" + done + [% END -%] +[% ELSE -%] + supported_locales="" +[% END -%] # PyYAML tries to read files as ASCII, otherwise export LC_ALL=C.UTF-8 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.5-1] 3 commits: fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 15 Feb '23

15 Feb '23

Pier Angelo Vendrame pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 085cb603 by Pier Angelo Vendrame at 2023-02-14T19:13:03+01:00 fixup! Bug 40925: Implemented the Security Level component Bug 40781 (build): Move l10n files to browser/locales - - - - - ecc9d685 by Pier Angelo Vendrame at 2023-02-14T19:13:11+01:00 fixup! Bug 40926: Implemented the New Identity feature Bug 40781 (build): Move l10n files to browser/locales - - - - - 33b90e5e by Pier Angelo Vendrame at 2023-02-14T19:13:19+01:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 41351: Move cryptosafety l10n files with other Firefox files - - - - - 10 changed files: - browser/actors/CryptoSafetyParent.jsm - browser/components/newidentity/content/newidentity.js - browser/components/newidentity/jar.mn - browser/components/securitylevel/content/securityLevel.js - browser/components/securitylevel/jar.mn - browser/installer/package-manifest.in - toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties → browser/locales/en-US/chrome/browser/cryptoSafetyPrompt.properties - browser/components/newidentity/locale/en-US/newIdentity.properties → browser/locales/en-US/chrome/browser/newIdentity.properties - browser/components/securitylevel/locale/en-US/securityLevel.properties → browser/locales/en-US/chrome/browser/securityLevel.properties - browser/locales/jar.mn Changes: ===================================== browser/actors/CryptoSafetyParent.jsm ===================================== @@ -14,14 +14,14 @@ const { XPCOMUtils } = ChromeUtils.import( XPCOMUtils.defineLazyGetter(this, "cryptoSafetyBundle", () => { return Services.strings.createBundle( - "chrome://torbutton/locale/cryptoSafetyPrompt.properties" + "chrome://browser/locale/cryptoSafetyPrompt.properties" ); }); // en-US fallback in case a locale is missing a string. XPCOMUtils.defineLazyGetter(this, "fallbackCryptoSafetyBundle", () => { return Services.strings.createBundle( - "resource://gre/chrome/torbutton/locale/en-US/cryptoSafetyPrompt.properties" + "resource:///chrome/en-US/locale/browser/cryptoSafetyPrompt.properties" ); }); ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -24,7 +24,7 @@ XPCOMUtils.defineLazyGetter(this, "NewIdentityStrings", () => { let bundle = null; try { bundle = Services.strings.createBundle( - "chrome://newidentity/locale/newIdentity.properties" + "chrome://browser/locale/newIdentity.properties" ); } catch (e) { console.warn("Could not load the New Identity strings"); ===================================== browser/components/newidentity/jar.mn ===================================== @@ -3,14 +3,3 @@ browser.jar: content/browser/newIdentityDialog.xhtml (content/newIdentityDialog.xhtml) content/browser/newIdentityDialog.css (content/newIdentityDialog.css) content/browser/newIdentityDialog.js (content/newIdentityDialog.js) - -newidentity.jar: -# We need to list at least one locale here, to make Firefox load the localized -# copy of properties at chrome://newidentity/locale/newIdentity.properties. -# Ideally, we should use @AB_CD@.jar to automatically copy all the locales -# Firefox is built with. But we only provide English here, and injecting the -# translated files directly to the omni.ja works better for us, for the time -# being. In addition to inject the properties files, we also add the -# corresponding locale line to chrome/chrome.manifest. -% locale newidentity en-US %locale/en-US/ - locale/en-US/newIdentity.properties (locale/en-US/newIdentity.properties) ===================================== browser/components/securitylevel/content/securityLevel.js ===================================== @@ -46,7 +46,7 @@ XPCOMUtils.defineLazyGetter(this, "SecurityLevelStrings", () => { let bundle = null; try { bundle = Services.strings.createBundle( - "chrome://securitylevel/locale/securityLevel.properties" + "chrome://browser/locale/securityLevel.properties" ); } catch (e) { console.warn("Could not load the Security Level strings"); ===================================== browser/components/securitylevel/jar.mn ===================================== @@ -4,8 +4,3 @@ browser.jar: content/browser/securitylevel/securityLevelButton.css (content/securityLevelButton.css) content/browser/securitylevel/securityLevelPreferences.css (content/securityLevelPreferences.css) content/browser/securitylevel/securityLevelIcon.svg (content/securityLevelIcon.svg) - -securitylevel.jar: -# See New Identity for further information on how this works -% locale securitylevel en-US %locale/en-US/ - locale/en-US/securityLevel.properties (locale/en-US/securityLevel.properties) ===================================== browser/installer/package-manifest.in ===================================== @@ -251,10 +251,6 @@ @RESPATH@/browser/features/* ; Base Browser -@RESPATH@/browser/chrome/newidentity.manifest -@RESPATH@/browser/chrome/newidentity/ -@RESPATH@/browser/chrome/securitylevel.manifest -@RESPATH@/browser/chrome/securitylevel/ @RESPATH@/components/SecurityLevel.manifest ; [DevTools Startup Files] ===================================== toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties → browser/locales/en-US/chrome/browser/cryptoSafetyPrompt.properties ===================================== ===================================== browser/components/newidentity/locale/en-US/newIdentity.properties → browser/locales/en-US/chrome/browser/newIdentity.properties ===================================== ===================================== browser/components/securitylevel/locale/en-US/securityLevel.properties → browser/locales/en-US/chrome/browser/securityLevel.properties ===================================== ===================================== browser/locales/jar.mn ===================================== @@ -42,6 +42,9 @@ locale/browser/safebrowsing/safebrowsing.properties (%chrome/browser/safebrowsing/safebrowsing.properties) locale/browser/feeds/subscribe.properties (%chrome/browser/feeds/subscribe.properties) locale/browser/syncSetup.properties (%chrome/browser/syncSetup.properties) + locale/browser/securityLevel.properties (%chrome/browser/securityLevel.properties) + locale/browser/newIdentity.properties (%chrome/browser/newIdentity.properties) + locale/browser/cryptoSafetyPrompt.properties (%chrome/browser/cryptoSafetyPrompt.properties) % locale browser-region @AB_CD@ %locale/browser-region/ # the following files are browser-specific overrides locale/browser/netError.dtd (%chrome/overrides/netError.dtd) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1dace7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1dace7… You're receiving this email because of your account on gitlab.torproject.org.

1 0