Opened 4 years ago

Closed 4 years ago

Last modified 4 years ago

#16181 closed defect (fixed)

OS X bundling in Gitian is broken with ESR 38

Reported by: gk Owned by: gk
Priority: Medium Milestone:
Component: Applications/Tor Browser Version:
Severity: Keywords: tbb-gitian, ff38-esr, tbb-5.0a3-essential, TorBrowserTeam201506
Cc: brade, mcs Actual Points:
Parent ID: #15772 Points:
Reviewer: Sponsor:

Description

Our current bundling step breaks for OS X as the directory layout got changed (probably due to the changes for the v2 code signing).

Child Tickets

Attachments (3)

0001-Bug-16181-Gitian-changes-for-ESR-38-on-OSX.patch (22.8 KB) - added by gk 4 years ago.
precomplete (135.1 KB) - added by gk 4 years ago.
0001-Bug-16181-Gitian-changes-for-ESR-38-on-OS-X.patch (25.3 KB) - added by gk 4 years ago.

Download all attachments as: .zip

Change History (15)

comment:1 Changed 4 years ago by mcs

Cc: brade mcs added

comment:2 Changed 4 years ago by gk

Attached is the patch for the tor-browser-bundle side. It currently contains a libfaketime patch as well. I hope I get it upstreamed until we switch to ESR 38.

comment:3 Changed 4 years ago by gk

The fix for #16150 needs to get applied before.

comment:4 Changed 4 years ago by mcs

Kathy and I reviewed your changes. A couple small things that we noticed:

  1. The precomplete file has been moved (see Mozilla bug #1059467) so you will need to make a few additional changes to gitian/descriptors/mac/gitian-bundle.yml.
  1. In gitian/descriptors/mac/gitian-firefox.yml, the following lines need to be changed (the omni.ja files are all under Contents/Resources now):
    • ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/omni.ja
    • ~/build/re-dzip.sh TorBrowser.app/Contents/MacOS/webapprt/omni.ja

comment:5 Changed 4 years ago by gk

Status: newneeds_revision

Note to self: Don't break the other descriptors that still need the old SDK (or test that building with the new one there is fine).

comment:6 Changed 4 years ago by mikeperry

Keywords: tbb-5.0a3-essential added

Tag the set of things we should aim to understand/fix for the fist FF38-based TBB (5.0a3, on June 30th).

comment:7 Changed 4 years ago by mikeperry

Keywords: TorBrowserTeam201506 added

Ensure all tbb-5.0a items are on the June radar.

comment:8 in reply to:  4 ; Changed 4 years ago by gk

Replying to mcs:

Kathy and I reviewed your changes. A couple small things that we noticed:

  1. The precomplete file has been moved (see Mozilla bug #1059467) so you will need to make a few additional changes to gitian/descriptors/mac/gitian-bundle.yml.

I am not sure about that. I compared the precomplete file in TorBrowser.app/Contents/Resources with the one found in a default Firefox.app and it looked sane. The one we create and put into TorBrowser.app/ looks sane to me as well (I attached it). What did you have in mind?

Changed 4 years ago by gk

Attachment: precomplete added

comment:9 in reply to:  8 ; Changed 4 years ago by mcs

Replying to gk:

I am not sure about that. I compared the precomplete file in TorBrowser.app/Contents/Resources with the one found in a default Firefox.app and it looked sane. The one we create and put into TorBrowser.app/ looks sane to me as well (I attached it). What did you have in mind?

I am saying there should only be one precomplete file (the one we create) and it should be under TorBrowser.app/Contents/Resources/

comment:10 in reply to:  9 Changed 4 years ago by gk

Status: needs_revisionneeds_review

Replying to mcs:

Replying to gk:

I am not sure about that. I compared the precomplete file in TorBrowser.app/Contents/Resources with the one found in a default Firefox.app and it looked sane. The one we create and put into TorBrowser.app/ looks sane to me as well (I attached it). What did you have in mind?

I am saying there should only be one precomplete file (the one we create) and it should be under TorBrowser.app/Contents/Resources/

Sorry, I should have read the bug you linked to earlier (so much about my awesomeness ;) ). Attached is an updated patch that should address all the issues found by you, Kathy and me.

comment:11 Changed 4 years ago by mcs

r=mcs, r=brade

comment:12 Changed 4 years ago by gk

Resolution: fixed
Status: needs_reviewclosed

This is fixed in commit ff23e83bcc9e5ade5fcbf954c449446c4044df78. Sadly, I had to revert the libfaketime commit we use and include the patch I upstreamed for OS X only. For some reason this broke our Linux builds. Given that libfaketime issues are not so easy to debug and we probably won't have to use libfaketime anymore starting with our switch to esr45 I decided that this workaround is enough for now.

Last edited 4 years ago by gk (previous) (diff)
Note: See TracTickets for help on using tickets.