- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: e4496e7a by Pier Angelo Vendrame at 2023-01-12T17:28:08+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41572: Check for userContextId also in the circuit display - - - - - 1 changed file: - toolkit/torbutton/chrome/content/tor-circuit-display.js Changes: ===================================== toolkit/torbutton/chrome/content/tor-circuit-display.js ===================================== @@ -306,21 +306,32 @@ let createTorCircuitDisplay = (function() { // Obtains the circuit used by the given browser. let currentCircuitData = function(browser) { if (browser) { - let firstPartyDomain = getDomainForBrowser(browser); - let domain = firstPartyDomain || "--unknown--"; - let domainMap = browserToCredentialsMap.get(browser); - let credentials = domainMap && domainMap.get(domain); + const firstPartyDomain = getDomainForBrowser(browser); + const userContextId = + browser.contentPrincipal.originAttributes.userContextId; + const key = firstPartyDomain + ? `${firstPartyDomain}:${userContextId}` + : "--unknown--"; + const credentialMap = browserToCredentialsMap.get(browser); + const credentials = credentialMap && credentialMap.get(key); if (credentials) { - let [SOCKS_username, SOCKS_password] = credentials; - let nodeData = credentialsToNodeDataMap.get( + const [SOCKS_username, SOCKS_password] = credentials; + const nodeData = credentialsToNodeDataMap.get( `${SOCKS_username}|${SOCKS_password}` ); - let domain = SOCKS_username; - if (browser.documentURI.host.endsWith(".tor.onion")) { - const service = Cc[ - "@torproject.org/onion-alias-service;1" - ].getService(Ci.IOnionAliasService); - domain = service.getOnionAlias(browser.documentURI.host); + let domain = firstPartyDomain; + try { + if (browser.documentURI.host.endsWith(".tor.onion")) { + const service = Cc[ + "@torproject.org/onion-alias-service;1" + ].getService(Ci.IOnionAliasService); + domain = service.getOnionAlias(browser.documentURI.host); + } + } catch (e) { + logger.eclog( + 3, + `[circuit display] Cannot verify if we are visiting an onion alias: ${e.message}\n${e.stack}` + ); } return { domain, nodeData }; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4496e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e4496e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40714: Ship NoScript also in the extension distribution directory
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4e52d507 by Pier Angelo Vendrame at 2023-01-12T15:28:37+01:00 Bug 40714: Ship NoScript also in the extension distribution directory - - - - - 1 changed file: - projects/browser/build Changes: ===================================== projects/browser/build ===================================== @@ -40,10 +40,13 @@ touch "$GENERATEDPREFSPATH" TBDIRS=("$TBDIR") DOCSPATH=[% c('var/ProjectName') %]/Docs - EXTSPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions + EXTSPATH=distribution/extensions TORBINPATH=TorBrowser/Tor TORCONFIGPATH=TorBrowser/Data/Tor + PROFILEPATH=[% c('var/ProjectName') %]/Data/Browser/profile.default/extensions + mkdir -p "$TBDIR/$PROFILEPATH" + mkdir -p "$TBDIR/[% c('var/ProjectName') %]/Data/Browser/Caches" [% END %] @@ -57,6 +60,9 @@ unzip -d $rootdir $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zi MARTOOLS=$rootdir/mar-tools mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" +[% IF !c("var/macos") -%] + cp "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" "$TBDIR/$PROFILEPATH/" +[% END %] [% IF c("var/tor-browser") -%] function mv_tbdir { @@ -91,7 +97,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b # Snowflake's README is a documentation shipped in tor-expert-bundle mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %] mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md" - + # WebTunnel's README is a documentation shipped in tor-expert-bundle mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %] mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Bug 40933: Add tor-launcher functionality
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 847ff5d3 by Pier Angelo Vendrame at 2023-01-12T14:17:24+01:00 fixup! Bug 40933: Add tor-launcher functionality Bug 41569: Launch directly the real tor also on macOS, rather than the shim script Bug 41570: Do not customize environment variables for tor anymore - - - - - 2 changed files: - toolkit/components/tor-launcher/TorLauncherUtil.jsm - toolkit/components/tor-launcher/TorProcess.jsm Changes: ===================================== toolkit/components/tor-launcher/TorLauncherUtil.jsm ===================================== @@ -144,9 +144,10 @@ class TorFile { // Anyway, that macro is also available in AppConstants. if (TorFile.isUserDataOutsideOfAppDir) { if (TorLauncherUtil.isMac) { - torPath = "Contents/Resources/"; + torPath = "Contents/MacOS/Tor"; + } else { + torPath = "TorBrowser/Tor"; } - torPath += "TorBrowser/Tor"; } else { torPath = "Tor"; dataDir = "Data/"; @@ -154,17 +155,16 @@ class TorFile { switch (this.fileType) { case "tor": - if (TorLauncherUtil.isMac) { - this.path = `${torPath}/tor`; - } else { - this.path = - torPath + "/tor" + (TorLauncherUtil.isWindows ? ".exe" : ""); + this.path = `${torPath}/tor`; + if (TorLauncherUtil.isWindows) { + this.path += ".exe"; } break; case "torrc-defaults": - this.path = TorFile.isUserDataOutsideOfAppDir - ? `${torPath}/torrc-defaults` - : `${dataDir}Tor/torrc-defaults`; + this.path = TorLauncherUtil.isMac + ? "Contents/Resources/TorBrowser/Tor" + : `${dataDir}Tor`; + this.path += "/torrc-defaults"; break; case "torrc": this.path = `${dataDir}Tor/torrc`; ===================================== toolkit/components/tor-launcher/TorProcess.jsm ===================================== @@ -93,27 +93,6 @@ class TorProcess { this._args.push("1"); } - // Set an environment variable that points to the Tor data directory. - // This is used by meek-client-torbrowser to find the location for - // the meek browser profile. - const environment = { - TOR_BROWSER_TOR_DATA_DIR: this._dataDir.path, - }; - - // On Windows, prepend the Tor program directory to PATH. This is needed - // so that pluggable transports can find OpenSSL DLLs, etc. - // See https://trac.torproject.org/projects/tor/ticket/10845 - if (TorLauncherUtil.isWindows) { - let path = this._exeFile.parent.path; - const env = Cc["@mozilla.org/process/environment;1"].getService( - Ci.nsIEnvironment - ); - if (env.exists("PATH")) { - path += ";" + env.get("PATH"); - } - environment.PATH = path; - } - this._status = TorProcessStatus.Starting; this._didConnectToTorControlPort = false; @@ -131,10 +110,13 @@ class TorProcess { const options = { command: this._exeFile.path, arguments: this._args, - environment, - environmentAppend: true, stderr: "stdout", }; + if (TorLauncherUtil.isMac) { + // On macOS, we specify pluggable transport relative to the tor + // executable. + options.workdir = this._exeFile.parent.path; + } this._subprocess = await Subprocess.call(options); this._dumpStdout(); this._watchProcess(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/847ff5d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/847ff5d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40695: Do not ship the macOS tor shim anymore
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6da7839e by Pier Angelo Vendrame at 2023-01-12T14:14:50+01:00 Bug 40695: Do not ship the macOS tor shim anymore We moved the requested operations to Tor Browser side. - - - - - 2 changed files: - − projects/browser/Bundle-Data/mac-tor.sh - projects/browser/build Changes: ===================================== projects/browser/Bundle-Data/mac-tor.sh deleted ===================================== @@ -1,15 +0,0 @@ -#!/bin/sh -# Compiled Python modules require a compatible Python, which means 32-bit 2.6. -export VERSIONER_PYTHON_VERSION=2.6 -export DYLD_LIBRARY_PATH=.:$DYLD_LIBRARY_PATH -# Set the current working directory to the directory containing this executable, -# so that pluggable transport executables can be given with relative paths. This -# works around a change in OS X 10.9, where the current working directory is -# otherwise set to "/" when an application bundle is started from Finder.. -# https://trac.torproject.org/projects/tor/ticket/10030 -cd "$(dirname "$0")" -if [ ! -f tor.real -a -d ../../../MacOS/Tor ]; then - # On newer releases of Tor Browser, tor.real is in Contents/MacOS/Tor/.. - cd ../../../MacOS/Tor -fi -exec ./tor.real "$@" ===================================== projects/browser/build ===================================== @@ -211,15 +211,6 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz rm -Rf Bundle-Data/mac mv $SKELETON_TMP Bundle-Data/mac - [% IF c("var/tor-browser") -%] - # Install a "tor" shim that sets the working directory. See #10030. - for tbdir in "${TBDIRS[@]}" - do - mv "$tbdir/$TORBINPATH/tor" "$tbdir/$TORBINPATH/tor.real" - cp Bundle-Data/mac-tor.sh "$tbdir/$TORCONFIGPATH/tor" - done - [% END -%] - tar -C Bundle-Data/mac-applications.dmg -c . | tar -C $TB_STAGE_DIR -x [% END %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Update `Release Prep - Stable`
by boklm (＠boklm) 12 Jan '23

12 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c027f7cb by Nicolas Vigier at 2023-01-12T13:10:42+01:00 Update `Release Prep - Stable` Following changes from tor-browser-build#40734 and tor-browser-build#40735 - - - - - 1 changed file: - .gitlab/issue_templates/Release Prep - Stable.md Changes: ===================================== .gitlab/issue_templates/Release Prep - Stable.md ===================================== @@ -131,10 +131,12 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] Update `projects/firefox/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - - [ ] Update `projects/translation-base-browser/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `base-browser` branch - - [ ] Update `projects/translation-base-browser-fluent/config` - - [ ] `git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch + - [ ] Update `projects/translation/config`: + - [ ] run `make list_translation_updates-release` to get updated hashes + - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch + - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch + - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch + - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch - [ ] ***(Optional)*** Update Android-specific build configs - [ ] ***(Optional)*** Update `projects/geckoview/config` - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 2ec04e75 by Dan Ballard at 2023-01-12T12:53:35+00:00 fixup! Firefox preference overrides. bug 40565: lock security.tls.version.enable-deprecated - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -83,6 +83,9 @@ pref("security.ssl3.ecdhe_rsa_aes_256_sha", false, locked); pref("security.ssl3.rsa_aes_128_sha", false, locked); pref("security.ssl3.rsa_aes_256_sha", false, locked); +// Wrapping a static pref to lock it and prevent changing. +// See tor-browser#40565. +pref("security.tls.version.enable-deprecated", false, locked); // Misc privacy: Remote pref("browser.send_pings", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2ec04e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2ec04e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40735: Add command to list which translation components need to be updated
by boklm (＠boklm) 12 Jan '23

12 Jan '23

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: fe869201 by Nicolas Vigier at 2023-01-12T13:00:48+01:00 Bug 40735: Add command to list which translation components need to be updated - - - - - 3 changed files: - Makefile - projects/translation/config - − tools/get-translation-hashes Changes: ===================================== Makefile ===================================== @@ -223,6 +223,12 @@ dmg2mar-alpha: submodule-update tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha +list_translation_updates-release: + $(rbm) showconf --target release --step list_updates translation list_updates + +list_translation_updates-alpha: + $(rbm) showconf --target alpha --step list_updates translation list_updates + list_toolchain_updates-fenix: submodule-update $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 ===================================== projects/translation/config ===================================== @@ -30,3 +30,17 @@ steps: targets: nightly: git_hash: 'fenix-torbrowserstringsxml' + list_updates: + list_updates: | + [% + FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'fenix' ]; + branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] }); + commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch }); + IF commit_hash == pc(project, "git_hash", { step => component }); + GET '* ' _ component _ " is up to date\n"; + ELSE; + GET '* ' _ component _ ' can be updated: ' _ commit_hash _ "\n"; + END; + END; + -%] + fetch: 1 ===================================== tools/get-translation-hashes deleted ===================================== @@ -1,13 +0,0 @@ -#!/bin/bash - -cd "$(dirname "$0")/../git_clones/translation" -git fetch > /dev/null 2>&1 - -echo -n "base-browser: " -git rev-parse origin/base-browser -echo -n "base-browser-fluent: " -git rev-parse origin/basebrowser-newidentityftl -echo -n "tor-browser: " -git rev-parse origin/tor-browser -echo -n "fenix: " -git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40735: Add command to list which translation components need to be updated
by boklm (＠boklm) 12 Jan '23

12 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: eda7d2c8 by Nicolas Vigier at 2023-01-12T12:29:55+01:00 Bug 40735: Add command to list which translation components need to be updated - - - - - 4 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - Makefile - projects/translation/config - − tools/get-translation-hashes Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -121,7 +121,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `git_hash` : update the `$(BUILD_N)` section to match `tor-browser` tag - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased - [ ] Update `projects/translation/config`: - - [ ] run `tools/get-translation-hashes` to get updated hashes + - [ ] run `make list_translation_updates-alpha` to get updated hashes - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch ===================================== Makefile ===================================== @@ -223,6 +223,12 @@ dmg2mar-alpha: submodule-update tools/update-responses/download_missing_versions alpha CHECK_CODESIGNATURE_EXISTS=1 MAR_SKIP_EXISTING=1 tools/update-responses/gen_incrementals alpha +list_translation_updates-release: + $(rbm) showconf --target release --step list_updates translation list_updates + +list_translation_updates-alpha: + $(rbm) showconf --target alpha --step list_updates translation list_updates + list_toolchain_updates-fenix: submodule-update $(rbm) build fenix --step list_toolchain_updates --target nightly --target torbrowser-android-armv7 ===================================== projects/translation/config ===================================== @@ -30,3 +30,17 @@ steps: targets: nightly: git_hash: 'fenix-torbrowserstringsxml' + list_updates: + list_updates: | + [% + FOREACH component = [ 'base-browser', 'base-browser-fluent', 'tor-browser', 'fenix' ]; + branch = pc(project, 'git_hash', { step => component, target => [ 'nightly' ] }); + commit_hash = exec('git rev-parse ' _ branch, { git_hash => branch }); + IF commit_hash == pc(project, "git_hash", { step => component }); + GET '* ' _ component _ " is up to date\n"; + ELSE; + GET '* ' _ component _ ' can be updated: ' _ commit_hash _ "\n"; + END; + END; + -%] + fetch: 1 ===================================== tools/get-translation-hashes deleted ===================================== @@ -1,13 +0,0 @@ -#!/bin/bash - -cd "$(dirname "$0")/../git_clones/translation" -git fetch > /dev/null 2>&1 - -echo -n "base-browser: " -git rev-parse origin/base-browser -echo -n "base-browser-fluent: " -git rev-parse origin/basebrowser-newidentityftl -echo -n "tor-browser: " -git rev-parse origin/tor-browser -echo -n "fenix: " -git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40713: Inject torbutton translations during the build
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 68b589f8 by Pier Angelo Vendrame at 2023-01-12T08:53:32+01:00 Bug 40713: Inject torbutton translations during the build Co-authored-by: Nicolas Vigier <boklm(a)torproject.org> - - - - - 12 changed files: - projects/fenix/build - projects/fenix/config - projects/firefox/build - projects/firefox/config - − projects/tba-translation/config - − projects/translation-base-browser-fluent/build - − projects/translation-base-browser-fluent/config - − projects/translation-base-browser/build - − projects/translation-base-browser/config - projects/tba-translation/build → projects/translation/build - + projects/translation/config - + tools/get-translation-hashes Changes: ===================================== projects/fenix/build ===================================== @@ -32,7 +32,7 @@ EOF nimbusdir=$builddir-[% c("version") %]/app/build/bin/nimbus mkdir -p $nimbusdir cp $distdir/application-services/nimbus-fml $nimbusdir/ - tar -C $distdir -xf $rootdir/[% c('input_files_by_name/tba-translation') %] + tar -C $distdir -xf $rootdir/[% c('input_files_by_name/translation-fenix') %] [% END %] tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz @@ -60,7 +60,7 @@ v=[% c("variant") %] [% FOREACH lang = c('var/locales_mobile'); SET lang = tmpl(lang); %] # Copy our torbrowser_strings.xml at the right place - cp /var/tmp/dist/tba-translation/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/ + cp /var/tmp/dist/translation-fenix/[% lang %]/torbrowser_strings.xml app/src/main/res/values-[% lang %]/ [% END %] # Prepare Glean dependencies for offline build ===================================== projects/fenix/config ===================================== @@ -46,8 +46,9 @@ input_files: project: geckoview pkg_type: merge_aars enable: '[% !c("var/android_single_arch") %]' - - name: tba-translation - project: tba-translation + - name: translation-fenix + project: translation + pkg_type: fenix - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' ===================================== projects/firefox/build ===================================== @@ -62,6 +62,10 @@ mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %] 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 -%] cd /var/tmp/build/[% project %]-[% c("version") %] cat > .mozconfig << 'MOZCONFIG_EOF' @@ -108,11 +112,6 @@ add_translation () { component=$2 lang=$3 filename=$4 - [% IF c("var/macos") -%] - if [ "$lang" == "ja-JP-mac" ]; then - lang="ja" - fi - [% END-%] mkdir "browser/components/$component/locale/$lang" cp "$transl_dir/$lang/$filename" "browser/components/$component/locale/$lang/" @@ -121,9 +120,25 @@ add_translation () { } supported_locales="[% tmpl(c('var/locales').join(' ')) %]" +[% 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 ===================================== projects/firefox/config ===================================== @@ -181,11 +181,17 @@ input_files: enable: '[% c("var/linux") %]' - filename: start-firefox enable: '[% c("var/linux") %]' - - project: translation-base-browser + - project: translation name: translation-base-browser - - project: translation-base-browser-fluent + pkg_type: base-browser + - project: translation name: translation-base-browser-fluent + pkg_type: base-browser-fluent enable: '[% !c("var/testbuild") %]' + - project: translation + name: translation-tor-browser + pkg_type: tor-browser + enable: '[% c("var/tor-browser") %]' - filename: namecoin-torbutton.patch enable: '[% c("var/namecoin") %]' # TorButton patch authored by Arthur Edelstein, from https://github.com/arthuredelstein/torbutton/ branch 2.1.10-namecoin ===================================== projects/tba-translation/config deleted ===================================== @@ -1,7 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -# We need to bump the commit before releasing but just pointing to a branch -# might cause too much rebuidling of the Firefox part. -git_hash: 34fb5d37834db13ec656e43d2fe7cee41d90ec35 -version: '[% c("abbrev") %]' ===================================== projects/translation-base-browser-fluent/build deleted ===================================== @@ -1,10 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -# We do not need new identity for now, only languageNotification.ftl -find [% project %] -name new-identity.ftl -delete -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/translation-base-browser-fluent/config deleted ===================================== @@ -1,9 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: e1bb5278668e71317ccbf1fdd21cf25c4d56b95c -version: '[% c("abbrev") %]' - -targets: - nightly: - git_hash: 'basebrowser-newidentityftl' ===================================== projects/translation-base-browser/build deleted ===================================== @@ -1,8 +0,0 @@ -#!/bin/bash -[% c("var/set_default_env") -%] -tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] -[% c('tar', { - tar_src => [ project ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), - }) %] ===================================== projects/translation-base-browser/config deleted ===================================== @@ -1,5 +0,0 @@ -# vim: filetype=yaml sw=2 -filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' -git_url: https://gitlab.torproject.org/tpo/translation.git -git_hash: f3c816f0fde87471f98e46515482a493c4eb57dc -version: '[% c("abbrev") %]' ===================================== projects/tba-translation/build → projects/translation/build ===================================== @@ -1,8 +1,9 @@ #!/bin/bash [% c("var/set_default_env") -%] tar xf [% project %]-[% c("version") %].tar.gz -mv [% project %]-[% c("version") %] [% project %] +mv [% project %]-[% c("version") %] [% project %]-[% c("step") %] +[% SET tar_source = project _ '-' _ c('step') -%] [% c('tar', { - tar_src => [ project ], + tar_src => [ tar_source ], tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), }) %] ===================================== projects/translation/config ===================================== @@ -0,0 +1,32 @@ +# vim: filetype=yaml sw=2 +filename: '[% project %]-[% c("step") %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' +git_url: https://gitlab.torproject.org/tpo/translation.git +version: '[% c("abbrev") %]' + +steps: + base-browser: + base-browser: '[% INCLUDE build %]' + git_hash: d1aa584f3da4c2fc6bfe5d289e2783705ee7e015 + targets: + nightly: + git_hash: 'base-browser' + base-browser-fluent: + base-browser-fluent: '[% INCLUDE build %]' + git_hash: d771fd689978f52053e8a14bb622c936aa938769 + targets: + nightly: + git_hash: 'basebrowser-newidentityftl' + tor-browser: + tor-browser: '[% INCLUDE build %]' + git_hash: a73ed9756f5d9a753fb7c3c7676174e4d9b68dee + targets: + nightly: + git_hash: 'tor-browser' + fenix: + fenix: '[% INCLUDE build %]' + # We need to bump the commit before releasing but just pointing to a branch + # might cause too much rebuidling of the Firefox part. + git_hash: 5e1d058123f3a5d34a59799bd6f80db5d71e563e + targets: + nightly: + git_hash: 'fenix-torbrowserstringsxml' ===================================== tools/get-translation-hashes ===================================== @@ -0,0 +1,13 @@ +#!/bin/bash + +cd "$(dirname "$0")/../git_clones/translation" +git fetch > /dev/null 2>&1 + +echo -n "base-browser: " +git rev-parse origin/base-browser +echo -n "base-browser-fluent: " +git rev-parse origin/basebrowser-newidentityftl +echo -n "tor-browser: " +git rev-parse origin/tor-browser +echo -n "fenix: " +git rev-parse origin/fenix-torbrowserstringsxml View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40733: Use the new branding directories
by Pier Angelo Vendrame (＠pierov) 12 Jan '23

12 Jan '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 49af2a8d by Pier Angelo Vendrame at 2023-01-11T12:02:45+01:00 Bug 40733: Use the new branding directories In tor-browser#41428 we decided not to change contents of Firefox branding directories anymore, but to create ours. This commit updates the build files to use the new branding directories. - - - - - 1 changed file: - projects/firefox/config Changes: ===================================== projects/firefox/config ===================================== @@ -15,7 +15,7 @@ var: firefox_version: '[% c("var/firefox_platform_version") %]esr' browser_branch: '12.5-1' browser_build: 1 - branding_directory: 'browser/branding/alpha' + branding_directory: 'browser/branding/tb-alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_osname: '[% c("var/osname") %]' deps: @@ -67,13 +67,13 @@ targets: release: var: - branding_directory: 'browser/branding/official' + branding_directory: 'browser/branding/tb-release' nightly: git_hash: '[% c("var/project-name") %]-[% c("var/firefox_version") %]-[% c("var/browser_branch") %]' tag_gpg_id: 0 var: - branding_directory: 'browser/branding/nightly' + branding_directory: 'browser/branding/tb-nightly' linux-x86_64: var: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0