Contents/CodeResources isn't included in MARs

RESOLVED FIXED in Firefox 14

Status

()

Core
Build Config
RESOLVED FIXED
5 years ago
5 years ago

People

(Reporter: bhearsum, Assigned: bhearsum)

Tracking

unspecified
mozilla16
Points:
---

Firefox Tracking Flags

(firefox14 fixed, firefox15 fixed)

Details

Attachments

(1 attachment)

(Assignee)

Description

5 years ago
This file is a symlink that points to _CodeSignature/CodeResources. After landing bug 723176 and updating from an unsigned build to a signed build, this file wasn't present despite it being in the dmg. I looked at the complete MAR directly and it wasn't there either. I think that the update generation code doesn't what to do with symlinks or something.
(Assignee)

Comment 1

5 years ago
Created attachment 627777 [details] [diff] [review]
copy CodeResources after signing

I tried this without the 'rm' first, and found that OS X created a symlink to _CodeSignature/CodeResources. Couldn't find a way to make cp overwrite it because it was "the same file".
Attachment #627777 - Flags: review?(ted.mielczarek)
Attachment #627777 - Flags: review?(ted.mielczarek) → review+
(Assignee)

Comment 2

5 years ago
Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

http://hg.mozilla.org/mozilla-central/rev/6aab5d7f2cc7
Attachment #627777 - Flags: checkin+
(Assignee)

Comment 3

5 years ago
Landed cleanly.
Status: ASSIGNED → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
(Assignee)

Comment 4

5 years ago
Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

This patch ensures consistency between the two possible CodeResources files in .app bundles. It should let 'codesign -vv' pass on more platforms. It's not critical, but low risk and nice to have.
Attachment #627777 - Flags: approval-mozilla-esr10?
Attachment #627777 - Flags: approval-mozilla-beta?
Attachment #627777 - Flags: approval-mozilla-aurora?

Comment 5

5 years ago
Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

[Triage Comment]
Approving for Aurora/Beta, but we should wait to see if this is necessary on the ESR (depends on whether we end up signing that branch).
Attachment #627777 - Flags: approval-mozilla-beta?
Attachment #627777 - Flags: approval-mozilla-beta+
Attachment #627777 - Flags: approval-mozilla-aurora?
Attachment #627777 - Flags: approval-mozilla-aurora+
(Assignee)

Comment 6

5 years ago
Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

Landed on Aurora & Beta:
https://hg.mozilla.org/releases/mozilla-aurora/rev/b92a17096308
https://tbpl.mozilla.org/?tree=Mozilla-Aurora&rev=b92a17096308
https://hg.mozilla.org/releases/mozilla-beta/rev/6599b65306d2
https://tbpl.mozilla.org/?tree=Mozilla-Beta&rev=6599b65306d2

Updated

5 years ago
status-firefox14: --- → fixed
status-firefox15: --- → fixed
Target Milestone: --- → mozilla16
Standard8, does Thunderbird have somewhere this change should be ported to ? My partial update from 14.0 to 15.0 failed on Mac 10.6.8 with this in the last-update.log:
...
PREPARE PATCH Contents/Info.plist
PREPARE PATCH Contents/CodeResources
PREPARE ADD Contents/MacOS/update-settings.ini
EXECUTE ADD precomplete
EXECUTE PATCH Contents/_CodeSignature/CodeResources
unable to open destination file: Contents/_CodeSignature/CodeResources, err: 2
### execution failed
...
Perhaps that's a red herring, I have
 Contents/CodeResources
 Contents/_CodeSignature/CodeResources
which are both files, and identical. And applying the partial works fine if I reset the update process and make sure I don't have any terminals open in the .app.
(In reply to Nick Thomas [:nthomas] from comment #7)
> Standard8, does Thunderbird have somewhere this change should be ported to ?

Just to answer the question anyway, this code is in toolkit, so we'll pick it up by default anyway.
Comment on attachment 627777 [details] [diff] [review]
copy CodeResources after signing

Waiting for ESR17 to roll this out.
Attachment #627777 - Flags: approval-mozilla-esr10? → approval-mozilla-esr10-
You need to log in before you can comment on or make changes to this bug.