Closed Bug 881841 Opened 7 years ago Closed 6 years ago

Update Mozilla 24 to use NSS 3.15.1 (once it's ready)

Categories

(Core :: Security: PSM, defect)

24 Branch
defect
Not set

Tracking

()

RESOLVED FIXED
Tracking Status
firefox24 + fixed

People

(Reporter: KaiE, Assigned: KaiE)

References

Details

Attachments

(1 file, 1 obsolete file)

Update Mozilla 24 to use NSS 3.15.1 (once it's ready)

Starting with beta 1 today.
I have r=wtc to update to NSS_3_15_1_BETA1
Kai, thank you for creating the tag.

The changeset you pushed to mozilla-inbound is missing the dummy change
to nss/coreconf/coreconf.dep. This could be problematic. (It may be fine
because many .c files in nss/lib/ssl are also updated.)
Someone needs to investigate, why client.py update_nss didn't add that dummy change.
philor: thank you for your help. That changeset is missing a change to
security/nss/coreconf/coreconf.dep.  Without that change, that changeset
will break "depend" builds done by Firefox developers or on the
mozilla-central bots.

So we need to either revert that changeset, or add a second changeset to
touch security/nss/coreconf/coreconf.dep. (You can add or remove a blank
line at the end of security/nss/coreconf/coreconf.dep.)
(In reply to Wan-Teh Chang from comment #7)
> So we need to either revert that changeset, or add a second changeset to
> touch security/nss/coreconf/coreconf.dep. (You can add or remove a blank
> line at the end of security/nss/coreconf/coreconf.dep.)

Touched coreconf.dep:
https://hg.mozilla.org/integration/mozilla-inbound/rev/eeb959ae733f
(In reply to Kai Engert (:kaie) from comment #4)
> Someone needs to investigate, why client.py update_nss didn't add that dummy
> change.

The issue is that currently, the script toggles the trailing blank line AFTER we update.

The following can happen:
- checked in to mozilla: has blank line
- updating from nss: doesn't have a blank line
- toggle script: switches to add a blank line
- result: dummy file as checked in previously, no change

We must remember the state prior to updating from HG.
Then, after the update, we must check the new state.
Only if the state is identical, then we should toggle the trailing blank line.
I filed bug 882101 to fix comment 10.
Summary: Update Mozilla 24 to use NSS 3.15.1 (once it's ready) and the necessary NRPS version → Update Mozilla 24 to use NSS 3.15.1 (once it's ready) and the necessary NSPR version
NSS_3_15_1_BETA2 pushed to mozilla-inbound:
https://hg.mozilla.org/integration/mozilla-inbound/rev/06aec3398e05
Duplicate of this bug: 897122
3.15.1 has been released a while ago, it's ready to land on m-c and m-a.
Whiteboard: [leave open]
Attached patch upgrade to 3.15.1 RTM (obsolete) — Splinter Review
Wan-Teh, that's the patch for updating m-c (which still uses beta2) to RTM.
Could you please r+ ?
Assignee: nobody → kaie
Attachment #781669 - Flags: review?(wtc)
Comment on attachment 781669 [details] [diff] [review]
upgrade to 3.15.1 RTM

Justification for requesting approval: FF releases must not use beta versions of NSS.
Attachment #781669 - Flags: approval-mozilla-aurora?
NSS 3.15.1 requires NSPR 4.10, but m-c and m-a already use that NSPR version, so no NSPR upgrade is required, removing that from the bug summary.

Only NSS needs to be updated.
Summary: Update Mozilla 24 to use NSS 3.15.1 (once it's ready) and the necessary NSPR version → Update Mozilla 24 to use NSS 3.15.1 (once it's ready)
Comment on attachment 781669 [details] [diff] [review]
upgrade to 3.15.1 RTM

removing approval request from this patch - this patch is appropriate for m-c 25 -- Aurora 24 needs fewer changes...
Attachment #781669 - Flags: approval-mozilla-aurora?
I noticed we cannot use the usual procedure "upgrade mozilla-central prior to upgrading aurora branch".

Reason is that mozilla-central has already moved forward, but isn't using exactly based on the code proposed for aurora.

I've started the process of getting mozilla-central cleaned up in bug 898431.

Regarding this bug / mozilla 24, I'll attach the small patch specific to aurora 24.
[Approval Request Comment]
Bug caused by (feature/regressing bug #): 
User impact if declined: 
Testing completed (on m-c, etc.): 
Risk to taking this patch (and alternatives if risky): 
String or IDL/UUID changes made by this patch:
Attachment #781669 - Attachment is obsolete: true
Attachment #781669 - Flags: review?(wtc)
Attachment #781702 - Flags: review?(wtc)
Attachment #781702 - Flags: approval-mozilla-aurora?
Comment on attachment 781702 [details] [diff] [review]
p2, update aurora 24 to 3.15.1 rtm

Review of attachment 781702 [details] [diff] [review]:
-----------------------------------------------------------------

r=wtc.
Attachment #781702 - Flags: review?(wtc) → review+
Attachment #781702 - Flags: approval-mozilla-aurora? → approval-mozilla-aurora+
https://hg.mozilla.org/releases/mozilla-aurora/rev/c190484e9e43
Status: NEW → RESOLVED
Closed: 6 years ago
Resolution: --- → FIXED
Comment on attachment 781702 [details] [diff] [review]
p2, update aurora 24 to 3.15.1 rtm

mozilla-central also needs this patch. Pushed to mozilla-inbound:
https://hg.mozilla.org/integration/mozilla-inbound/rev/b25b3c93400f
You need to log in before you can comment on or make changes to this bug.