January 2023 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Bug 4234: Use the Firefox Update Process for Tor Browser.
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 56584b5d by Pier Angelo Vendrame at 2023-01-23T19:32:07+01:00 fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. Bug 41540: Do not show the build ID for alphas - - - - - 1 changed file: - browser/components/preferences/main.js Changes: ===================================== browser/components/preferences/main.js ===================================== @@ -556,14 +556,8 @@ var gMainPane = { // Initialize the Firefox Updates section. let version = AppConstants.TOR_BROWSER_VERSION; - // Include the build ID if this is an "a#" (nightly) build - if (/a\d+$/.test(version)) { - let buildID = Services.appinfo.appBuildID; - let year = buildID.slice(0, 4); - let month = buildID.slice(4, 6); - let day = buildID.slice(6, 8); - version += ` (${year}-${month}-${day})`; - } + // Tor Browser: do not include the build ID in our alphas, since they are + // not actually related to the build date. // Append "(32-bit)" or "(64-bit)" build architecture to the version number: let bundle = Services.strings.createBundle( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56584b5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/56584b5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.0-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: c6a6f09b by emma peel at 2023-01-23T18:01:22+00:00 fixup! Add TorStrings module for localization replace with more common expression available in wikipedia. reported by translator dfiguera at https://hosted.weblate.org/translate/tor/tb-browseronboardingproperties/en/…, thanks! (cherry picked from commit ff331e83fd3ccced869cff76702eea320fe44e2f) - - - - - 1 changed file: - toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties Changes: ===================================== toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties ===================================== @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Go to Tor Network onboarding.tour-tor-network=Tor Network onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no single point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings onboarding.tour-tor-network.button=Go to Circuit Display View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c6a6f09… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c6a6f09… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 07f08e2e by Pier Angelo Vendrame at 2023-01-23T18:59:27+01:00 fixup! Base Browser's .mozconfigs. Bug 41587: Disable the updater for Base Browser - - - - - 1 changed file: - browser/config/mozconfigs/base-browser Changes: ===================================== browser/config/mozconfigs/base-browser ===================================== @@ -16,6 +16,9 @@ ac_add_options --enable-rust-simd ac_add_options --enable-bundled-fonts +# See bug #41587 +ac_add_options --disable-updater + ac_add_options --disable-tests ac_add_options --disable-debug View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/07f08e2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/07f08e2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] 2 commits: fixup! Base Browser's .mozconfigs.
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: f22c8cc1 by Pier Angelo Vendrame at 2023-01-23T18:52:03+01:00 fixup! Base Browser's .mozconfigs. Bug 41587: Disable the updater for Base Browser - - - - - 3da2c5c8 by Pier Angelo Vendrame at 2023-01-23T18:52:04+01:00 fixup! TB3: Tor Browser's official .mozconfigs. Bug 41587: Disable the updater for Base Browser - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ff331e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ff331e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.7.0esr-12.5-1] fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch tor-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ff331e83 by emma peel at 2023-01-23T18:49:12+01:00 fixup! Add TorStrings module for localization replace with more common expression available in wikipedia. reported by translator dfiguera at https://hosted.weblate.org/translate/tor/tb-browseronboardingproperties/en/…, thanks! - - - - - 1 changed file: - toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties Changes: ===================================== toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties ===================================== @@ -15,7 +15,7 @@ onboarding.tour-tor-privacy.button=Go to Tor Network onboarding.tour-tor-network=Tor Network onboarding.tour-tor-network.title=Travel a decentralized network. -onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no one point of failure or centralized entity you need to trust in order to enjoy the internet privately. +onboarding.tour-tor-network.description=Tor Browser connects you to the Tor network run by thousands of volunteers around the world. Unlike a VPN, there’s no single point of failure or centralized entity you need to trust in order to enjoy the internet privately. onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, including the ability to request bridges where Tor is blocked, can now be found in Preferences. onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings onboarding.tour-tor-network.button=Go to Circuit Display View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ff331e8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ff331e8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40731: Update torbutton directory to apply namecoin-torbutton.patch
by boklm (＠boklm) 23 Jan '23

23 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 76fbfc74 by Nicolas Vigier at 2023-01-23T18:10:58+01:00 Bug 40731: Update torbutton directory to apply namecoin-torbutton.patch - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -94,7 +94,7 @@ fi [% END -%] [% IF c("var/namecoin") %] - pushd toolkit/torproject/torbutton + pushd toolkit/torbutton patch -p1 < $rootdir/namecoin-torbutton.patch popd [% END %] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] 2 commits: Bug 40747: Remove empty line at the top of sha256sums-unsigned-build.txt
by boklm (＠boklm) 23 Jan '23

23 Jan '23

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 76ea72c2 by Nicolas Vigier at 2023-01-23T17:47:56+01:00 Bug 40747: Remove empty line at the top of sha256sums-unsigned-build.txt - - - - - 6c1adab8 by Nicolas Vigier at 2023-01-23T17:48:08+01:00 Bug 40748: Remove warning in dmg2mar when sha256sums-unsigned-build.txt contains an empty line - - - - - 2 changed files: - projects/release/build - tools/dmg2mar Changes: ===================================== projects/release/build ===================================== @@ -51,7 +51,7 @@ RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incremen EOF # empty any existing sh256sums file -echo > sha256sums-unsigned-build.txt +echo -n > sha256sums-unsigned-build.txt # concat sha256sum entry for each file in set for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.json | grep -v '\.incremental\.mar$' | sort) do ===================================== tools/dmg2mar ===================================== @@ -95,6 +95,7 @@ sub get_dmg_files_from_sha256sums { my @files; foreach my $line (read_file('sha256sums-unsigned-build.txt')) { my (undef, $filename) = split ' ', $line; + next unless $filename; chomp $filename; next unless $filename =~ m/^$appname_dmg-(.+)-macos_(.+)\.dmg$/; push @files, { filename => $filename, version => $1, lang => $2 }; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 40747: Remove empty line at the top of sha256sums-unsigned-build.txt
by boklm (＠boklm) 23 Jan '23

23 Jan '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 7f1fcca6 by Nicolas Vigier at 2023-01-23T17:46:39+01:00 Bug 40747: Remove empty line at the top of sha256sums-unsigned-build.txt - - - - - 80d457f7 by Nicolas Vigier at 2023-01-23T17:46:42+01:00 Bug 40748: Remove warning in dmg2mar when sha256sums-unsigned-build.txt contains an empty line - - - - - 2 changed files: - projects/release/build - tools/dmg2mar Changes: ===================================== projects/release/build ===================================== @@ -51,7 +51,7 @@ RewriteRule ^sha256sums.incrementals.txt.asc$ sha256sums-unsigned-build.incremen EOF # empty any existing sh256sums file -echo > sha256sums-unsigned-build.txt +echo -n > sha256sums-unsigned-build.txt # concat sha256sum entry for each file in set for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.json | grep -v '\.incremental\.mar$' | sort) do ===================================== tools/dmg2mar ===================================== @@ -95,6 +95,7 @@ sub get_dmg_files_from_sha256sums { my @files; foreach my $line (read_file('sha256sums-unsigned-build.txt')) { my (undef, $filename) = split ' ', $line; + next unless $filename; chomp $filename; next unless $filename =~ m/^$appname_dmg-(.+)-macos_(.+)\.dmg$/; push @files, { filename => $filename, version => $1, lang => $2 }; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… 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 40723: Use tor-browser-update-responses.git in upload-update_responses-to-staticiforme
by boklm (＠boklm) 23 Jan '23

23 Jan '23

boklm pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 98053ed8 by Nicolas Vigier at 2023-01-19T13:08:57+01:00 Bug 40723: Use tor-browser-update-responses.git in upload-update_responses-to-staticiforme - - - - - 6 changed files: - .gitlab/issue_templates/Release Prep - Alpha.md - .gitlab/issue_templates/Release Prep - Stable.md - tools/signing/do-all-signing - tools/signing/functions - + tools/signing/set-config.update-responses - tools/signing/upload-update_responses-to-staticiforme Changes: ===================================== .gitlab/issue_templates/Release Prep - Alpha.md ===================================== @@ -210,6 +210,8 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - `ssh_host_macos_signer` : ssh hostname of macOS signing machine - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization` - `macos_notarization_user` : the email login for a tor notariser Apple Developer account + - [ ] `set-config.update-responses` + - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git` - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` - `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) - `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) @@ -230,7 +232,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser` - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - - [ ] Enable update responses : `./deploy_update_responses-alpha.sh` + - [ ] Enable update responses : `sudo -u tb-release ./deploy_update_responses-alpha.sh` - [ ] Publish APKs to Google Play: - Log into https://play.google.com/apps/publish - Select `Tor Browser (Alpha)` app ===================================== .gitlab/issue_templates/Release Prep - Stable.md ===================================== @@ -297,6 +297,8 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `ssh_host_macos_signer` : ssh hostname of macOS signing machine - [ ] `tor-browser-build/tools/signing/set-config.macos-notarization` - [ ] `macos_notarization_user` : the email login for a tor notariser Apple Developer account + - [ ] `set-config.update-responses` + - `update_responses_repository_dir` : directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git` - [ ] `tor-browser-build/tools/signing/set-config.tbb-version` - [ ] `tbb_version` : tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`) - [ ] `tbb_version_build` : the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`) @@ -318,8 +320,8 @@ Tor Browser Alpha (and Nightly) are on the `main` branch, while Stable lives in - [ ] `/srv/dist-master.torproject.org/htdocs/torbrowser` - [ ] Static update components : `static-update-component cdn.torproject.org && static-update-component dist.torproject.org` - [ ] Enable update responses : - - [ ] alpha: `./deploy_update_responses-alpha.sh` - - [ ] release: `./deploy_update_responses-release.sh` + - [ ] alpha: `sudo -u tb-release ./deploy_update_responses-alpha.sh` + - [ ] release: `sudo -u tb-release ./deploy_update_responses-release.sh` - [ ] ***(Android Only)*** : Publish APKs to Google Play: - [ ] Log into https://play.google.com/apps/publish - [ ] Select `Tor Browser` app ===================================== tools/signing/do-all-signing ===================================== @@ -2,6 +2,7 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" +source "$script_dir/set-config.update-responses" NON_INTERACTIVE=1 steps_dir="$signed_version_dir.steps" ===================================== tools/signing/functions ===================================== @@ -19,4 +19,16 @@ function check_torbrowser_version_var { return 0 } +function check_update_responses_repository_dir { + if test -z "$update_responses_repository_dir" || ! test -d "$update_responses_repository_dir" + then + cat << 'EOF' > /dev/stderr +$aus1_repository_dir is not defined, or the directory does not exist +You should clone git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git +and set $update_responses_repository_dir in set-config.update-responses +EOF + exit 1 + fi +} + . "$script_dir/set-config" ===================================== tools/signing/set-config.update-responses ===================================== @@ -0,0 +1,7 @@ +# You should clone git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git +# and uncomment the line setting update_responses_repository_dir. +# Don't forget to set user.email and user.name in your git config + +#update_responses_repository_dir=/path/to/tor-browser-update-responses.git + +check_update_responses_repository_dir ===================================== tools/signing/upload-update_responses-to-staticiforme ===================================== @@ -2,6 +2,7 @@ set -e script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) source "$script_dir/functions" +source "$script_dir/set-config.update-responses" check_torbrowser_version_var @@ -17,33 +18,40 @@ else popd > /dev/null fi -update_dir=/srv/aus1-master.torproject.org/htdocs/torbrowser/update_3 +cd $update_responses_repository_dir +git checkout main +git pull --ff-only +test -n "$(git status --porcelain=v1 | grep -v '^?')" \ + && exit_error 'update_responses_repository_dir has modified files' +cd update_3 +rm -Rf "$tbb_version_type" +tar -xf "$update_responses_tar" +git add "$tbb_version_type" +git commit -m "$tbb_version_type: new version, $tbb_version" +update_responses_commit=$(git log -1 --format=%H) + +update_dir=/srv/aus1-master.torproject.org/htdocs/torbrowser deploy_script=$(mktemp) trap "rm -Rf $deploy_script" EXIT cat << EOF > "$deploy_script" #!/bin/bash set -e -tmpdir="\$(mktemp -d)" +echo "Deploying version $tbb_version" +echo "update_responses_commit: $update_responses_commit" -trap "rm -Rf \$tmpdir" EXIT - -rm -Rf "$update_dir/$tbb_version_type.old" -test -d "$update_dir/$tbb_version_type" && \\ - mv -v "$update_dir/$tbb_version_type" "$update_dir/$tbb_version_type.old" - -tar -C "\$tmpdir" -xf ~/$update_responses_tar_filename -chmod 775 "\$tmpdir"/$tbb_version_type -chmod 664 "\$tmpdir"/$tbb_version_type/* "\$tmpdir"/$tbb_version_type/.htaccess -chgrp -R torwww "\$tmpdir"/$tbb_version_type -mv -v "\$tmpdir"/$tbb_version_type "$update_dir/$tbb_version_type" +cd "$update_dir" +git fetch +git checkout "$update_responses_commit" static-update-component aus1.torproject.org EOF chmod +x $deploy_script -scp -p "$update_responses_tar" "$ssh_host_staticiforme:" scp -p $deploy_script $ssh_host_staticiforme:deploy_update_responses-$tbb_version_type.sh +git push + echo 'To enable updates you can now run:' -echo " ssh $ssh_host_staticiforme ./deploy_update_responses-$tbb_version_type.sh" +echo " ssh $ssh_host_staticiforme" +echo " sudo -u tb-release ./deploy_update_responses-$tbb_version_type.sh" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.7.0esr-12.5-1] Bug 41542: Disable the creation of a default profile
by Pier Angelo Vendrame (＠pierov) 23 Jan '23

23 Jan '23

Pier Angelo Vendrame pushed to branch base-browser-102.7.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: a9f50c4e by Pier Angelo Vendrame at 2023-01-23T17:39:28+01:00 Bug 41542: Disable the creation of a default profile Firefox creates a profile as a fallback for old versions. However, we do not need this, so we want to prevent Firefox from creating the related directories. We comment out the code, but should Mozilla be interested in a compile-time flag, we could rewrite the patch to add one. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174. - - - - - 1 changed file: - toolkit/profile/nsToolkitProfileService.cpp Changes: ===================================== toolkit/profile/nsToolkitProfileService.cpp ===================================== @@ -1578,6 +1578,12 @@ nsresult nsToolkitProfileService::SelectStartupProfile( rv = CreateDefaultProfile(getter_AddRefs(mCurrent)); if (NS_SUCCEEDED(rv)) { + // tor-browser#41542: We do not need to support legacy versions. + // For now, we just use an ifdef, but we could write a patch to disable + // this behavior through a build-time flag, should Mozilla be interested + // in taking it. + // See also https://bugzilla.mozilla.org/show_bug.cgi?id=1770174 +#ifndef BASE_BROWSER // If there is only one profile and it isn't meant to be the profile that // older versions of Firefox use then we must create a default profile // for older versions of Firefox to avoid the existing profile being @@ -1589,6 +1595,7 @@ nsresult nsToolkitProfileService::SelectStartupProfile( getter_AddRefs(newProfile)); SetNormalDefault(newProfile); } +#endif rv = Flush(); NS_ENSURE_SUCCESS(rv, rv); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a9f50c4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a9f50c4… You're receiving this email because of your account on gitlab.torproject.org.

1 0