March 2023 - tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 40828: Use archive.debian.org mirror for jessie
by Richard Pospesel (＠richard) 27 Mar '23

27 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8ea251b1 by Nicolas Vigier at 2023-03-27T16:46:58+02:00 Bug 40828: Use archive.debian.org mirror for jessie - - - - - 1 changed file: - projects/mmdebstrap-image/config Changes: ===================================== projects/mmdebstrap-image/config ===================================== @@ -47,9 +47,8 @@ targets: suite: jessie arch: amd64 debian_mirror: > - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie main" - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://deb.debian.org/debian jessie-updates main" - "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://security.debian.org/debian-security jessie/updates main" + "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://archive.debian.org/debian-archive/debian/ jessie main" + "deb [signed-by=/usr/share/keyrings/debian-archive-removed-keys.gpg] http://archive.debian.org/debian-archive/debian-security/ jessie/updates main" bullseye-amd64: var: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Deleted branch main-s131
by Richard Pospesel (＠richard) 27 Mar '23

27 Mar '23

Richard Pospesel deleted branch main-s131 at The Tor Project / Applications / tor-browser-build -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch main-s131
by Richard Pospesel (＠richard) 27 Mar '23

27 Mar '23

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

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40827: MAR generation uses (mostly) hard-coded MAR update channel
by Richard Pospesel (＠richard) 27 Mar '23

27 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: d2179847 by Richard Pospesel at 2023-03-27T09:59:36+00:00 Bug 40827: MAR generation uses (mostly) hard-coded MAR update channel - - - - - 7 changed files: - projects/browser/build - projects/release/dmg2mar - projects/release/update_responses_config.yml - rbm.conf - tools/dmg2mar - tools/marsigning_check.sh - tools/update-responses/update_responses Changes: ===================================== projects/browser/build ===================================== @@ -345,7 +345,7 @@ cd $distdir [% SET mar_file = c("var/project-name") _ '-' _ c("var/mar_osname") _ '-' _ c("var/torbrowser_version") _ '_${PKG_LOCALE}.mar' %] MAR=$MARTOOLS/mar \ MOZ_PRODUCT_VERSION=[% c("var/torbrowser_version") %] \ - MAR_CHANNEL_ID=torbrowser-torproject-[% c("var/channel") %] \ + MAR_CHANNEL_ID=[% c("var/mar_channel_id") %] \ $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "$TBDIR" [% END -%] ===================================== projects/release/dmg2mar ===================================== @@ -5,4 +5,4 @@ cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version export TOR_APPNAME_BUNDLE_OSX='[% c("var/Project_Name") -%]' export TOR_APPNAME_DMGFILE='[% c("var/ProjectName") -%]' export TOR_APPNAME_MARFILE='[% c("var/project-name") -%]' -[% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/channel") %] +[% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/mar_channel_id") %] ===================================== projects/release/update_responses_config.yml ===================================== @@ -31,6 +31,7 @@ versions: [% IF c("var/create_unsigned_incrementals") -%] releases_dir: [% path(c('output_dir')) %]/unsigned [% END -%] + mar_channel_id: [% c('var/mar_channel_id') %] platformVersion: [% pc('firefox', 'var/firefox_platform_version') %] detailsURL: https://blog.torproject.org/new-release-tor-browser-[% c("var/torbrowser_version") FILTER remove('\.') %] incremental_from: ===================================== rbm.conf ===================================== @@ -77,6 +77,8 @@ var: - 12.5a3 updater_enabled: 1 build_mar: 1 + mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' + # By default, we sort the list of installed packages. This allows sharing # containers with identical list of packages, even if they are not listed # in the same order. In the cases where the installation order is ===================================== tools/dmg2mar ===================================== @@ -104,7 +104,7 @@ sub get_dmg_files_from_sha256sums { } sub convert_files { - my ($channel) = @_; + my ($mar_channel_id) = @_; my $pm = Parallel::ForkManager->new(get_nbprocs); $pm->run_on_finish( sub { @@ -149,7 +149,7 @@ sub convert_files { unlink $output; local $ENV{MOZ_PRODUCT_VERSION} = $file->{version}; - local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{MAR_CHANNEL_ID} = $mar_channel_id; local $ENV{TMPDIR} = $tmpdir; (undef, $err, $success) = capture_exec('make_full_update.sh', '-q', $output, $appdir); @@ -178,9 +178,9 @@ sub remove_incremental_mars { $ENV{LC_ALL} = 'C'; -exit_error "Please specify update channel" unless @ARGV == 1; -my $channel = $ARGV[0]; +exit_error "Please specify the mar channel id" unless @ARGV == 1; +my $mar_channel_id = $ARGV[0]; extract_martools; -convert_files $channel; +convert_files $mar_channel_id; remove_incremental_mars; ===================================== tools/marsigning_check.sh ===================================== @@ -35,7 +35,7 @@ # 2) Let LD_LIBRARY_PATH point to the mar-tools directory # 3) Let NSS_DB_DIR point to the directory containing the database with the # signing certificate to check against. -# 4) Let CHANNEL be the expected update channel +# 4) Let MAR_CHANNEL_ID be the expected update channel (eg: torbrowser-torproject-alpha) # # To create the database to use for signature checking import the # release*.der certificate of your choice found in @@ -45,9 +45,9 @@ # certutil -d nssdb -N --empty-password # certutil -A -n "marsigner" -t,, -d nssdb -i /path/to/.der # -# 4) Change into the directory containing the MAR files and the +# 5) Change into the directory containing the MAR files and the # sha256sums-unsigned-build.txt/sha256sums-unsigned-build.incrementals.txt. -# 5) Run /path/to/marsigning_check.sh +# 6) Run /path/to/marsigning_check.sh if [ -z "$SIGNMAR" ] then @@ -67,9 +67,9 @@ then exit 1 fi -if [ -z "$CHANNEL" ] +if [ -z "$MAR_CHANNEL_ID" ] then - echo "The update channel is missing! ([nightly|alpha|release])" + echo "The update channel is missing! (torbrowser-torproject-[nightly|alpha|release])" exit 1 fi @@ -106,7 +106,7 @@ for f in *.mar; do fi # Test 1.5: Is the MAR file correctly signed by the correct channel key? - if [ ! "$($SIGNMAR -T "$f" | grep "MAR channel name")" = " - MAR channel name: torbrowser-torproject-${CHANNEL}" ]; then + if [ ! "$($SIGNMAR -T "$f" | grep "MAR channel name")" = " - MAR channel name: ${MAR_CHANNEL_ID}" ]; then echo "$f contains wrong update channel!" fi ===================================== tools/update-responses/update_responses ===================================== @@ -264,7 +264,7 @@ sub create_incremental_mar { } } local $ENV{MOZ_PRODUCT_VERSION} = $new_version; - local $ENV{MAR_CHANNEL_ID} = "torbrowser-torproject-$channel"; + local $ENV{MAR_CHANNEL_ID} = get_config($config, $new_version, $os, 'mar_channel_id'); local $ENV{TMPDIR} = $tmpdir; my ($out, $err, $success) = capture_exec('make_incremental_update.sh', $mar_file_path, "$tmpdir/A", "$tmpdir/B"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40824: dmg2mar script using hardcoded project names for paths
by Richard Pospesel (＠richard) 24 Mar '23

24 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 6ca5fba3 by Richard Pospesel at 2023-03-24T12:46:19+00:00 Bug 40824: dmg2mar script using hardcoded project names for paths - - - - - 1 changed file: - projects/release/dmg2mar Changes: ===================================== projects/release/dmg2mar ===================================== @@ -1,4 +1,8 @@ #!/bin/bash [% c("var/set_default_env") -%] cd [% shell_quote(path(dest_dir)) %]/[% c("var/signed_status") %]/[% c("version") %] + +export TOR_APPNAME_BUNDLE_OSX='[% c("var/Project_Name") -%]' +export TOR_APPNAME_DMGFILE='[% c("var/ProjectName") -%]' +export TOR_APPNAME_MARFILE='[% c("var/project-name") -%]' [% shell_quote(c("basedir")) %]/tools/dmg2mar [% c("var/channel") %] 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] Deleted branch main-s131
by Richard Pospesel (＠richard) 24 Mar '23

24 Mar '23

Richard Pospesel deleted branch main-s131 at The Tor Project / Applications / tor-browser-build -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new branch main-s131
by Richard Pospesel (＠richard) 24 Mar '23

24 Mar '23

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

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40823: Update appname_* variables in projects/release/update_responses_config.yml
by Richard Pospesel (＠richard) 24 Mar '23

24 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c9fa59f3 by Richard Pospesel at 2023-03-24T10:52:36+00:00 Bug 40823: Update appname_* variables in projects/release/update_responses_config.yml - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -1,18 +1,18 @@ --- tmp_dir: '[% c("tmp_dir") %]' create_downloads_json: 1 -appname_marfile: tor-browser -appname_bundle_android: tor-browser -appname_bundle_macos: TorBrowser -appname_bundle_linux: tor-browser -appname_bundle_win32: torbrowser-install -appname_bundle_win64: torbrowser-install-win64 +appname_marfile: '[% c("var/project-name") %]' +appname_bundle_android: '[% c("var/project-name") %]' +appname_bundle_macos: '[% c("var/ProjectName") %]' +appname_bundle_linux: '[% c("var/project-name") %]' +appname_bundle_win32: '[% c("var/projectname") %]-install' +appname_bundle_win64: '[% c("var/projectname") %]-install-win64' releases_dir: [% path(c('output_dir')) %][% IF ! c("var/nightly") %]/signed[% END %] download: - archive_url: https://archive.torproject.org/tor-package-archive/torbrowser + archive_url: 'https://archive.torproject.org/tor-package-archive/[% c("var/projectname") %]' gpg_keyring: ../../keyring/torbrowser.gpg - bundles_url: https://dist.torproject.org/torbrowser - mars_url: https://cdn.torproject.org/aus1/torbrowser + bundles_url: 'https://dist.torproject.org/[% c("var/projectname") %]' + mars_url: 'https://cdn.torproject.org/aus1/[% c("var/projectname") %]' build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 @@ -61,6 +61,8 @@ versions: minSupportedInstructionSet: SSE2 mar_compression: xz tag: 'tbb-[% c("var/torbrowser_version") %]-[% c("var/torbrowser_build") %]' + +[% IF c("var/tor-browser") -%] htaccess_rewrite_rules: alpha: | # bug 26569: Redirect pre-8.0a9 alpha users to a separate update directory @@ -75,3 +77,4 @@ htaccess_rewrite_rules: RewriteRule ^[^/]+/11\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] RewriteRule ^[^/]+/11\.5/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] RewriteRule ^[^/]+/11\.5\.[01234567]/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] +[% END -%] 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][base-browser-102.9.0esr-12.5-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 22 Mar '23

22 Mar '23

Pier Angelo Vendrame pushed to branch base-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: ea93a41f by Pier Angelo Vendrame at 2023-03-22T15:22:35+00:00 fixup! Firefox preference overrides. Bug 41689: Do not customize startup.homepage_override_url in Base Browser. (cherry picked from commit eff20896dedc966b4162bfa098a6dc065faf30eb) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -17,13 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); // Disable Firefox Welcome Dialog pref("browser.aboutwelcome.enabled", false); -// Set a generic, default URL that will be opened in a tab after an update. -// Typically, this will not be used; instead, the <update> element within -// each update manifest should contain attributes similar to: -// actions="showURL" -// openURL="https://blog.torproject.org/tor-browser-55a2-released" -pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); - // Bug 41668: allow users to apply updates. This is set also in firefox.js for // all platforms, except for Windows. As explained on firefox.js, Firefox uses a // per-installation preference on Windows. However, we patch this behavior, and View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ea93a41… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ea93a41… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.9.0esr-12.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 22 Mar '23

22 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: eff20896 by Pier Angelo Vendrame at 2023-03-22T15:40:02+01:00 fixup! Firefox preference overrides. Bug 41689: Do not customize startup.homepage_override_url in Base Browser. - - - - - 2af5abfc by Pier Angelo Vendrame at 2023-03-22T15:42:49+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser Bug 41689: Move the generic updated URL to the right place - - - - - 4 changed files: - browser/app/profile/001-base-profile.js - browser/branding/tb-alpha/pref/firefox-branding.js - browser/branding/tb-nightly/pref/firefox-branding.js - browser/branding/tb-release/pref/firefox-branding.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -17,13 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); // Disable Firefox Welcome Dialog pref("browser.aboutwelcome.enabled", false); -// Set a generic, default URL that will be opened in a tab after an update. -// Typically, this will not be used; instead, the <update> element within -// each update manifest should contain attributes similar to: -// actions="showURL" -// openURL="https://blog.torproject.org/tor-browser-55a2-released" -pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); - // Bug 41668: allow users to apply updates. This is set also in firefox.js for // all platforms, except for Windows. As explained on firefox.js, Firefox uses a // per-installation preference on Windows. However, we patch this behavior, and ===================================== browser/branding/tb-alpha/pref/firefox-branding.js ===================================== @@ -4,11 +4,16 @@ // This file contains branding-specific prefs. -pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OL…"); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/"); +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); +pref("startup.homepage_welcome_url", "about:welcome"); pref("startup.homepage_welcome_url.additional", ""); // The time interval between checks for a new version (in seconds) -pref("app.update.interval", 7200); // 2 hours +pref("app.update.interval", 43200); // 12 hours // Give the user x seconds to react before showing the big UI. default=12 hours pref("app.update.promptWaitTime", 43200); // URL user can browse to manually if for some reason all update installation ===================================== browser/branding/tb-nightly/pref/firefox-branding.js ===================================== @@ -4,11 +4,16 @@ // This file contains branding-specific prefs. -pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OL…"); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/"); +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); +pref("startup.homepage_welcome_url", "about:welcome"); pref("startup.homepage_welcome_url.additional", ""); // The time interval between checks for a new version (in seconds) -pref("app.update.interval", 7200); // 2 hours +pref("app.update.interval", 14400); // 4 hours // Give the user x seconds to react before showing the big UI. default=12 hours pref("app.update.promptWaitTime", 43200); // URL user can browse to manually if for some reason all update installation ===================================== browser/branding/tb-release/pref/firefox-branding.js ===================================== @@ -4,7 +4,12 @@ // This file contains branding-specific prefs. -pref("startup.homepage_override_url", ""); +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); pref("startup.homepage_welcome_url", "about:welcome"); pref("startup.homepage_welcome_url.additional", ""); // Interval: Time between checks for a new version (in seconds) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cbc864… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cbc864… You're receiving this email because of your account on gitlab.torproject.org.

1 0