Closed Bug 816392 Opened 7 years ago Closed 7 years ago

Import NSS 3.14.1 BETA 1 (NSS_3_14_1_BETA1) into mozilla-central

Categories

(Core :: Security: PSM, defect, blocker)

defect
Not set
blocker

Tracking

()

RESOLVED FIXED
B2G C2 (20nov-10dec)
blocking-basecamp -

People

(Reporter: briansmith, Assigned: briansmith)

References

Details

Attachments

(1 file)

We need to update NSS in mozilla-central so we can land the patches for the bugs depending on this one.

We also need to backport the fixes for bug 683266, bug 808218, and bug 812802 to mozilla-beta. The attached patch does this backporting.

We need to do one or the other for mozilla-aurora.
Attachment #686412 - Flags: review?(wtc)
JP Rosevear [:jpr] wrote in bug 804663 comment 12:
> I think its unlikely we should take an NSS update at this late date.
(In reply to Brian Smith (:bsmith) from comment #1)
> JP Rosevear [:jpr] wrote in bug 804663 comment 12:
> > I think its unlikely we should take an NSS update at this late date.

Given that you have talked about multiple branches, you should probably clarify to which branch this statement does apply.
(In reply to Kai Engert (:kaie) from comment #2)
> (In reply to Brian Smith (:bsmith) from comment #1)
> > JP Rosevear [:jpr] wrote in bug 804663 comment 12:
> > > I think its unlikely we should take an NSS update at this late date.
> 
> Given that you have talked about multiple branches, you should probably
> clarify to which branch this statement does apply.

I am sure JP was talking about mozilla-beta and not mozilla-central. Not sure about mozilla-aurora.
I agree that we should limit the changes that we take on Aurora/Beta to the minimal changeset necessary for B2G, as that's the only driver for uplifting in the first place. Thanks for limiting risk in FF18/19.
Comment on attachment 686412 [details] [diff] [review]
Backport required built-time-only fixes to mozilla-aurora and mozilla-beta

r+

NOTES: The following are also incorporated in the patch for bug 683266 :
 ckfw/builtins/config.mk
 ckfw/builtins/Makefile
 ckfw/builtins/Readme
 ckfw/builtins/certdata.perl

ckfw/builtins/addbuiltin.c and ckfw/builtins/certdata.c were not included in the patch for bug 683266. The latter should have been.

The const stuff looks new (does not seem to overlap with the stuff I reviewed before), but there may be some collisions.

bob
Attachment #686412 - Flags: review+
Comment on attachment 686412 [details] [diff] [review]
Backport required built-time-only fixes to mozilla-aurora and mozilla-beta

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

::: security/nss/lib/ckfw/builtins/certdata.perl
@@ -128,5 @@
>  
>  sub doprint {
>  my $i;
>  
> -open(CFILE, ">certdata.c") || die "Can't open certdata.c: $!";

I wonder if we can reduce the changes to this file by simply setting
  CFILE = STDOUT;
Attachment #686412 - Flags: review?(wtc) → review+
Blocks a blocker.
blocking-basecamp: --- → ?
Summary: Import NSS 3.14.1 CVS snapshot into mozilla-central → Import NSS 3.14.1 BETA 1 (NSS_3_14_1_BETA1) into mozilla-central
Backed out because Android (and B2G?) crash at startup: https://hg.mozilla.org/integration/mozilla-inbound/rev/5302f7fc78ae
Depends on: 817233
This is a pretty scary change to uplift to m-a and m-b, isn't it?
Please read comment 0. The only change we're uplifting to m-a and m-b is the small built-system-only patch that is attached to this bug.
If you do different things based on area, then you should consider to have separate tracking bugs for the patch that lands into branches, and for the trunk action.
NSS 3.14.1 BETA 1 (NSS_3_14_1_BETA1) should not land on m-a or m-b.

if you want to uplift the patches to m-a and m-b, please file another bug and ask for it being blocking-basecamp, or mark the patch as approval requests.
blocking-basecamp: ? → -
https://hg.mozilla.org/integration/mozilla-inbound/rev/5d514385c585

The backporting to mozilla-aurora and mozilla-beta was done in bug 818717.
Status: NEW → RESOLVED
Closed: 7 years ago
Resolution: --- → FIXED
Reopening because this landed on -inbound but not -central yet.
Status: RESOLVED → REOPENED
Resolution: FIXED → ---
https://hg.mozilla.org/mozilla-central/rev/5d514385c585
Status: REOPENED → RESOLVED
Closed: 7 years ago7 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.