363070 - Upgrade NSS on trunk and branches

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Benjamin Smedberg]

I'd like to upgrade the NSS on trunk, 1.8branch, and 1.8.0branch to pick up the build-config fix from bug 345482.

Can we create a NSS tag of NSS_3_11_4_RTM plus the following revisions, for the trunk and 1.8 branch?

security/coreconf/rules.mk 1.66.2.4
security/nss/cmd/shlibsign/Makefile 1.13.2.3
security/nss/lib/freebl/Makefile 1.70.2.12
security/nss/lib/pk11wrap/Makefile 1.6.28.1

The 1.8.0branch is currently using MOZILLA_1_8_0_BRANCH pull of NSS: can I just check this change in on that branch (with appropriate mozilla driver approval, of course)?

Comment 1

[Jesse Ruderman]

Will this pick up the fix for bug 331404 / bug 330271?

Comment 2

[Wan-Teh Chang]

For bug 331404 we can only use a workaround in this new NSS tag.
My workaround is still waiting for code reviews.

Comment 3

[Benjamin Smedberg]

wtc, can you create this new mini-tag? Or how can I move forward on this?

Comment 4

[Wan-Teh Chang]

Attachment: Upgrade to NSS 3.11.5 Beta 1 on the Mozilla trunk

Comment 5

[Kai Engert [:KaiE:]]

Comment on attachment 250642 [details] [diff] [review]
Upgrade to NSS 3.11.5 Beta 1 on the Mozilla trunk

r=kengert

Comment 6

[Wan-Teh Chang]

Comment on attachment 250642 [details] [diff] [review]
Upgrade to NSS 3.11.5 Beta 1 on the Mozilla trunk

I checked in this patch on the Mozilla trunk (Mozilla 1.9 Alpha 2).
Let's wait a day or two before checking in this patch on the branches.
Please request the approvals you need.

Comment 7

[Daniel Veditz [:dveditz]]

Does this include the fix for bug 364319 (or bug 364323 for that matter, though for Firefox we don't care as much about that one)?  If it doesn't include those fixes then we'll just need another patch to update it again.

Do you just want this patch for testing and then we'll get another? Or is this intended to be final?

Comment 8

[Benjamin Smedberg]

NSS_3_11_5_BETA1 does contain sslcon.c revision 1.28.2.7, which is bug 364319. This tag does not include the fix for bug 364323 (which I don't think was ever checked in on the NSS_3_11_BRANCH.

Comment 9

[Wan-Teh Chang]

Dan, this patch is for testing.  We'll give you the final
patch, with the NSS_3_11_5_RTM tag, before Jan. 18.

Comment 10

[Daniel Veditz [:dveditz]]

Comment on attachment 250642 [details] [diff] [review]
Upgrade to NSS 3.11.5 Beta 1 on the Mozilla trunk

If this is for testing and we need a final version then please don't add the "fixed" keywords when you check in.

Approved for 1.8/1.8.0 branches, a=dveditz for drivers

Comment 11

[Wan-Teh Chang]

I upgraded NSPR and NSS on the MOZILLA_1_8_BRANCH and
MOZILLA_1_8_0_BRANCH to NSPR 4.6.5 Beta 1 and NSS 3.11.5 Beta 1.

Checking in client.mk;
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.245.2.29; previous revision: 1.245.2.28
done

Checking in client.mk;
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.245.2.6.24.6; previous revision: 1.245.2.6.24.5
done

Comment 12

[Daniel Veditz [:dveditz]]

Adding blocking tag to make sure we don't forget to pick up the final

Comment 13

[Wan-Teh Chang]

I upgraded NSPR and NSS on the MOZILLA_1_8_BRANCH and
MOZILLA_1_8_0_BRANCH to NSPR 4.6.5 final and NSS 3.11.5 final.

Checking in client.mk;
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.245.2.34; previous revision: 1.245.2.33
done

Checking in client.mk;
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.245.2.6.24.11; previous revision: 1.245.2.6.24.10
done

Comment 14

[Jay Patel [:jay]]

v.fixed after talking to Preed and checking logs to make sure we are pulling with the new NSPR and NSS versions.