Opened 3 years ago

Closed 3 years ago

#20660 closed task (fixed)

The update_responses script should use mar-tools from the release`s directory

Reported by: boklm Owned by: boklm
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Normal Keywords: TorBrowserTeam201612R
Cc: tbb-team Actual Points:
Parent ID: Points:
Reviewer: Sponsor:

Description

The current version of the update_responses script is using the mar-tools from the path ../../../gitian-builder/inputs/mar-tools-linux64.zip.

This works fine when a build with the correct version has been done before from this directory, but this is not always the case.

Instead, it should be using the mar-tools-linux64.zip from the release`s directory.

This should also help for #17381.

Child Tickets

Change History (5)

comment:1 Changed 3 years ago by boklm

The branch bug_20660 has a patch for that:
https://gitweb.torproject.org/user/boklm/tor-browser-bundle.git/commit/?h=bug_20660

I did not test it completely yet. I will do it after we finish releasing 6.0.6 and 6.5a4.

comment:2 Changed 3 years ago by boklm

Keywords: TorBrowserTeam201612R added; TorBrowserTeam201611 removed
Status: newneeds_review

The branch bug_20660_v2 is fixing some issues:
https://gitweb.torproject.org/user/boklm/tor-browser-bundle.git/commit/?h=bug_20660_v2

In addition to that, we should update gitian/gpg/torbrowser.gpg to include the new subkey.

I tested those changes when generating incremental mars, update responses, and download of previous version, which worked, except the downloading of the previous version which fails for an unrelated reason (ticket #20892).

comment:3 Changed 3 years ago by gk

Did you mean to get rid of

sub check_deps {
    foreach my $bin (qw(bunzip2 mar mbsdiff make_incremental_update.sh)) {
        exit_error "Cannot find $bin in PATH" unless which($bin);
    }
}

as well? (it is unused now) Or did you want to have the check somewhere?

comment:4 Changed 3 years ago by boklm

Ah yes, we can remove it. I did that, and also removed the File::Which module which we no longer use, in branch bug_20660_v3:
https://gitweb.torproject.org/user/boklm/tor-browser-bundle.git/commit/?h=bug_20660_v3

comment:5 Changed 3 years ago by gk

Resolution: fixed
Status: needs_reviewclosed

Okay, looks good now. Applied to master and hardened-builds (commits 8e22c3006c81a95a53b0e67cbf5e90e91732d9d9 and 1a8db0805c7532a3be2b8d524fe50956f7709d64).

Note: See TracTickets for help on using tickets.