- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 40833: Set update-channel for base-browser nightly
by Richard Pospesel (＠richard) 29 Mar '23

29 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4f6e8b75 by Nicolas Vigier at 2023-03-29T11:32:16+02:00 Bug 40833: Set update-channel for base-browser nightly - - - - - 1 changed file: - projects/firefox/build Changes: ===================================== projects/firefox/build ===================================== @@ -169,7 +169,7 @@ export LANG=C.UTF-8 ./mach configure \ --with-distribution-id=org.torproject \ --with-base-browser-version=[% c("var/torbrowser_version") %] \ - [% IF c("var/tor-browser") -%] + [% IF c("var/updater_enabled") -%] --enable-update-channel=[% c("var/channel") %] \ [% END %] \ [% IF !c("var/base-browser") -%]--with-branding=browser/branding/[% c("var/branding_directory_prefix") %]-[% c("var/channel") %][% END %] \ 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-build][main] Bug 40830: The fontconfig directory is missing in Base Browser
by Pier Angelo Vendrame (＠pierov) 29 Mar '23

29 Mar '23

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 07f09f39 by Pier Angelo Vendrame at 2023-03-29T09:37:33+02:00 Bug 40830: The fontconfig directory is missing in Base Browser - - - - - 2 changed files: - projects/browser/RelativeLink/start-browser - projects/browser/build Changes: ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -338,7 +338,7 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'} [% END -%] # Set up custom bundled fonts. See fonts-conf(5). -export FONTCONFIG_PATH="${HOME}/[% c('var/ProjectName') %]/Data/fontconfig" +export FONTCONFIG_PATH="${HOME}/fontconfig" export FONTCONFIG_FILE="fonts.conf" # Avoid overwriting user's dconf values. Fixes #27903. ===================================== projects/browser/build ===================================== @@ -219,6 +219,10 @@ tar -C ${TB_STAGE_DIR} -xf [% c('input_files_by_name/firefox') %]/browser.tar.gz for tbdir in "${TBDIRS[@]}" do + [% IF c("var/linux") -%] + mv Bundle-Data/linux/Data/fontconfig "$tbdir/" + [% END -%] + mkdir -p "$tbdir/$DOCSPATH" cp -a Bundle-Data/Docs/* "$tbdir/$DOCSPATH" [% IF c("var/tor-browser") -%] 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.9.0esr-12.5-1] fixup! Bug 40458: Implement .tor.onion aliases
by Pier Angelo Vendrame (＠pierov) 28 Mar '23

28 Mar '23

Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: c1b352e3 by Henry Wilkes at 2023-03-28T12:01:14+01:00 fixup! Bug 40458: Implement .tor.onion aliases - - - - - 1 changed file: - browser/components/onionservices/OnionAliasStore.jsm Changes: ===================================== browser/components/onionservices/OnionAliasStore.jsm ===================================== @@ -183,7 +183,7 @@ class Channel { } _makeMappings(rules) { - const toTest = /http[s]?:\/\/[a-zA-Z0-9\.]{56}.onion/; + const toTest = /^https?:\/\/[a-zA-Z0-9\.]{56}\.onion$/; const mappings = []; rules.rulesets.forEach(rule => { if (rule.rule.length != 1) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c1b352e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c1b352e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40826: Correctly set appname_marfile while signing basebrowser nightly
by Richard Pospesel (＠richard) 28 Mar '23

28 Mar '23

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ad634955 by Nicolas Vigier at 2023-03-28T08:28:12+02:00 Bug 40826: Correctly set appname_marfile while signing basebrowser nightly - - - - - 3 changed files: - tools/signing/nightly/config.yml - tools/signing/nightly/sign-nightly - tools/signing/nightly/update-responses-base-config.yml Changes: ===================================== tools/signing/nightly/config.yml ===================================== @@ -11,6 +11,7 @@ torbrowser: - nightly-windows-i686 - nightly-macos nss_db_dir: nssdb + appname_marfile: tor-browser basebrowser: publish_dirs: - basebrowser-nightly-linux-x86_64 @@ -19,6 +20,7 @@ basebrowser: - basebrowser-nightly-windows-i686 - basebrowser-nightly-macos nss_db_dir: nssdb-basebrowser-1 + appname_marfile: base-browser nss_certname: nightly-marsigner gpg_keyring: keyring/torbrowser-nightly.gpg rsync_dest: /srv/tbb-nightlies-master.torproject.org/htdocs/nightly-updates/ ===================================== tools/signing/nightly/sign-nightly ===================================== @@ -244,6 +244,7 @@ sub update_responses { my $ur_config = LoadFile("$FindBin::Bin/update-responses-base-config.yml"); $ur_config->{download}{mars_url} .= "/$publish_dir"; $ur_config->{releases_dir} = "$topdir/nightly/$publish_dir"; + $ur_config->{appname_marfile} = get_config('appname_marfile'); $ur_config->{channels}->{nightly} = $version; $ur_config->{versions}->{$version} = $ur_config->{versions}->{nightly_version}; my $buildinfos = get_buildinfos("$topdir/nightly/$publish_dir/$version/build-infos.json"); ===================================== tools/signing/nightly/update-responses-base-config.yml ===================================== @@ -1,7 +1,6 @@ --- download: mars_url: https://nightlies.tbb.torproject.org/nightly-updates -appname_marfile: tor-browser build_targets: linux32: Linux_x86-gcc3 linux64: Linux_x86_64-gcc3 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… 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 40828: Use archive.debian.org mirror for jessie
by Richard Pospesel (＠richard) 28 Mar '23

28 Mar '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 916d3f45 by Nicolas Vigier at 2023-03-27T17:13:06+00: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/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-build][main] Bug 40828: Use archive.debian.org mirror for jessie
by Richard Pospesel (＠richard) 28 Mar '23

28 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