723 bytes, patch
|Details | Diff | Splinter Review|
568 bytes, patch
|Details | Diff | Splinter Review|
34.79 KB, patch
|Details | Diff | Splinter Review|
As of today, 1.8 uses the NSS 3.11.3 release plus some selected patches. In order to synch the 1.8 branch to a supported NSS snapshot, let's make use Mozilla PSM go to NSS_3_11_20060926_TAG, which is the first snapshot after the 3.11.3 release that contains all the patches we need at this time. I will attached a diff between the current Mozilla 1.8 branch snapshot and the new proposed snapshot: cvs diff -u -r MOZILLA_1_8_BRANCH -r NSS_3_11_20060926_TAG mozilla/security/nss mozilla/security/coreconf That diff will contain a lot of noise, because NSS sources make use of CVS variables like $Id. And it will list differences in areas not built by Mozilla like nss/cmd and nss/tests. Because of that I will also attach a diff that has the noise removed - for illustration of the real changes. Finally I will attach the patch that I'm proposing to check in: A change to mozilla/client.mk to pull that tag. This will change the 1.8 branch to pull from the direct NSS source tag (which is guaranteed not to be a moving tag). Switching to that approach will simplify future landing of updated stable security snapshots on the branch - there would be no more checkins to MOZILLA_1_x_BRANCHes for mozilla/security/nss
(In reply to comment #0) > cvs diff -u -r MOZILLA_1_8_BRANCH -r NSS_3_11_20060926_TAG > mozilla/security/nss mozilla/security/coreconf cvs rdiff
Created attachment 242820 [details] [diff] [review] Patch v1 Proposed patch for check in to 1.8 branch.
Clarifying summary of bug. This change is intended for the stable Mozilla branches ONLY. Not for trunk. (The proposed snapshot had landed on the trunk with bug 354378. By now the trunk already uses a newer snapshot of NSS.)
Summary: Update PSM to use NSS_3_11_20060926_TAG → Branches only: Update PSM to use NSS_3_11_20060926_TAG
Comment on attachment 242820 [details] [diff] [review] Patch v1 I'm assuming this is what we want to do for Mozilla 1.8 (FF 2.0.x) and Mozilla 1.8.0 (FF 1.5.0.x). Can you please review / approve? Not sure whether this should go into 188.8.131.52 or 184.108.40.206.
Comment on attachment 242820 [details] [diff] [review] Patch v1 Not 220.127.116.11, we're code complete, wouldn't take this huge change w/out more testing time. Will leave on the table for 18.104.22.168
Comment on attachment 242820 [details] [diff] [review] Patch v1 Kai, you can use the -kk option for cvs diff to omit the changes to RCS keywords. Nelson should review this patch. I'm not sure if it's acceptable to use a non-release snapshot of NSS in a Firefox release. Note that the Mozilla 1.8 branch doesn't use the NSS_CO_TAG to pull mozilla/dbm. This is not a serious problem. In fact, pulling mozilla/dbm by the NSS_3_11_20060926_TAG may undo the MPL/GPL/LGPL tri-licensing in mozilla/dbm.
Attachment #242820 - Flags: review?(wtchang) → review?(nelson)
Comment on attachment 242820 [details] [diff] [review] Patch v1 Kai, let's wait until we have NSS_3_11_4_RTM to do this. This patch would only work for the MOZILLA_1_8_BRANCH. The MOZILLA_1_8_0_BRANCH also needs the patch for bug 317620 because of the new freebl shared libraries added in NSS 3.11. There is another good reason for the MOZILLA_1_8_0_BRANCH to upgrade to NSS 3.11.x -- to pick up the NSS crypto module that is undergoing FIPS 140-2 validation. But I'm afraid that backporting the patch for bug 317620 is a lot of work.
When diffing two sets of files with different tags in the repository (as opposed to diffing files in one's work area against the respository) you can use the -kk option to cvs diff to suppress all diffs in RCS keywords.
How close are you to 3.11.4 rtm? Given we're shipping 22.214.171.124 soon with or without 3.11.4 is it better to take Kai's proposed tag or leave it alone and get 3.11.4 in 126.96.36.199? We seem to be pretty close to 3.11.3 plus certdata changes and one other bug. Agreed we need to move 1.8.0 onto a supported NSS 3.11 release, but is now the right time? what more do we need to do beyond updating the tag in the makefile?
Summary: Branches only: Update PSM to use NSS_3_11_20060926_TAG → Branches only: build using supported NSS tag (NSS_3_11_20060926_TAG?)
Dan, when will you stop accepting fixes for FF 188.8.131.52? We need 3-5 days for NSS release QA. We do have a NSS_3_11_4_BETA1 CVS tag now, but I need to make sure FF 184.108.40.206 uses an NSS RTM tag. So if I have the FF 220.127.116.11 checkin cutoff date, I can do some planning. Another good reason for FF 2.0.0.x to take NSS 3.11.4 is that it is our best prediction of what will be FIPS validated.
That'll make it, I think we're shooting for being done by Thanksgiving so we can start builds when we get back. Does this work for the 1.8.0 branch as well? Do we need to change our NSPR to match?
We're not going to block 18.104.22.168 for this, but we'd like to do it if you think you can pull it off. If not there's always 22.214.171.124 coming down the pike. Jay says the code freeze is Nov 17, the week before Thanksgiving.
Flags: blocking126.96.36.199? → blocking188.8.131.52-
The MOZILLA_1_8_0_BRANCH needs more work because we need to modify all the installer/package files to add the freebl3 shared library, which was added in NSS 3.11. We will try to release NSS 3.11.4 on Nov. 17. Our release build and QA process takes three days, so we may miss the FF 184.108.40.206 code freeze deadline. NSS 3.11.4 will require NSPR 4.6.4. The MOZILLA_1_8_BRANCH is using NSPR 4.6.3 now. NSPR 4.6.4 has four bug fixes listed in http://www.mozilla.org/projects/nspr/release-notes/nspr464.html#What%27s
Created attachment 246042 [details] [diff] [review] Patch for the MOZILLA_1_8_BRANCH to use NSPR 4.6.4 and NSS 3.11.4 We released NSS 3.11.4 and NSPR 4.6.4 last Friday evening (2006-11-17). You can verify that all the bug fixes received two code reviews. NSPR changes: see comment 15. NSS changes: Bug 353475 (VC 2005 build) Bug 352041 (coverity) Bug 356309 Bug 357197 Bug 350200 Bug 353422 (coverity, klockwork) Bug 115951 (coverity) Bug 355297 (FIPS) Bug 353896 Bug 335454 Bug 353608 Bug 354313 (memory leak) Bug 353572 (memory leak) Bug 353749 (FIPS) Bug 356073 (FIPS) Bug 354900 (FIPS) Bug 353910 (memory leak) Bug 127960 Bug 359484
Summary: Branches only: build using supported NSS tag (NSS_3_11_20060926_TAG?) → Branches only: build using a supported NSS 3.11 tag
Comment on attachment 246042 [details] [diff] [review] Patch for the MOZILLA_1_8_BRANCH to use NSPR 4.6.4 and NSS 3.11.4 r=dveditz approved for 1.8 branch, a=dveditz for drivers
Created attachment 246083 [details] [diff] [review] Patch for the Mozilla trunk to use NSS 3.11.4 To satisfy the trunk testing requirement, I checked in this patch on the Mozilla trunk first. Checking in client.mk; /cvsroot/mozilla/client.mk,v <-- client.mk new revision: 1.302; previous revision: 1.301 done The Mozilla trunk is using NSPRPUB_PRE_4_2_CLIENT_BRANCH, which is NSPR 4.7 pre-release and newer than NSPR 4.6.4. Therefore I didn't change NSPR_CO_TAG in this patch.
I checked in the patch for the MOZILLA_1_8_BRANCH. Checking in client.mk; /cvsroot/mozilla/client.mk,v <-- client.mk new revision: 220.127.116.11; previous revision: 18.104.22.168 done
Status: NEW → RESOLVED
Last Resolved: 11 years ago
Resolution: --- → FIXED
The patch for the MOZILLA_1_8_BRANCH broke the tinderboxes because the tinderboxes check out the NSPR CVS tag with the -D flag. I actually thought of this potential problem and filed bug 361332, but I didn't realize I would encounter this bug in action.
Status: RESOLVED → REOPENED
Depends on: 361332
Resolution: FIXED → ---
Since I wasn't sure if I will receive the necessary code reviews for my patch in bug 361332 this week, at 17:55 PST (-0800) yesterday (2006-11-20) I landed NSPR 4.6.4 and NSS 3.11.4 on the MOZILLA_1_8_BRANCH. This interim measure ensures that Firefox 22.214.171.124 will use an official NSS release.
Assignee: kengert → wtchang
Status: REOPENED → NEW
(In reply to comment #21) > Since I wasn't sure if I will receive the necessary code reviews > for my patch in bug 361332 this week, at 17:55 PST (-0800) yesterday > (2006-11-20) I landed NSPR 4.6.4 and NSS 3.11.4 on the MOZILLA_1_8_BRANCH. > This interim measure ensures that Firefox 126.96.36.199 will use an official > NSS release. So, does this mean this bug is now completely fixed for the 1.8 branch?
Status: NEW → ASSIGNED
No, this bug isn't completely fixed until the patches in this bug and bug 361332 have been checked in. I am waiting for the necessary code reviews for the patch for bug 361332.
I checked in the patch for the MOZILLA_1_8_BRANCH. Checking in client.mk; /cvsroot/mozilla/client.mk,v <-- client.mk new revision: 188.8.131.52; previous revision: 184.108.40.206 done
Status: ASSIGNED → RESOLVED
Last Resolved: 11 years ago → 11 years ago
Resolution: --- → FIXED
Status: RESOLVED → VERIFIED
Keywords: fixed220.127.116.11 → verified18.104.22.168
(In reply to comment #24) > I checked in the patch for the MOZILLA_1_8_BRANCH. > > Checking in client.mk; > /cvsroot/mozilla/client.mk,v <-- client.mk > new revision: 22.214.171.124; previous revision: 126.96.36.199 > done > This appears to have broken branch builds for BeOS, with the following error: make: Entering directory `/boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/nsprpub/pr/src/io' gcc -o prfdcach.o -c -pipe -O3 -march=i686 -mcpu=i686 -UDEBUG -DMOZILLA_CLIENT=1 -DNDEBUG=1 -DXP_BEOS=1 -DBeOS=1 -DBEOS=1 -D_POSIX_SOURCE=1 -DHAVE_STRERROR=1 -DFORCE_PR_LOG -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM -D_NSPR_BUILD_ -I/boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/dist/include/nspr -I/boot/home/develop/FirefoxTwoOh/mozilla/nsprpub/pr/include -I/boot/home/develop/FirefoxTwoOh/mozilla/nsprpub/pr/include/private /boot/home/develop/FirefoxTwoOh/mozilla/nsprpub/pr/src/io/prfdcach.c In file included from /boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/dist/include/nspr/md/prosdep.h:164, from /boot/home/develop/FirefoxTwoOh/mozilla/nsprpub/pr/include/private/primpl.h:78, from /boot/home/develop/FirefoxTwoOh/mozilla/nsprpub/pr/src/io/prfdcach.c:38: /boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/dist/include/nspr/md/_pth.h:154: #error "pthreads is not supported for this architecture" /boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/dist/include/nspr/md/_pth.h:267: #error "pthreads is not supported for this architecture" /boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/dist/include/nspr/md/_pth.h:300: #error "Need to define _PT_PTHREAD_YIELD for this platform" make: *** [prfdcach.o] Error 1 make: Leaving directory `/boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/nsprpub/pr/src/io' make: *** [export] Error 2 make: Leaving directory `/boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/nsprpub/pr/src' make: *** [export] Error 2 make: Leaving directory `/boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/nsprpub/pr' make: *** [export] Error 2 make: Leaving directory `/boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta/nsprpub' make: *** [nspr] Error 2 make: Leaving directory `/boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta' make: *** [default] Error 2 make: Leaving directory `/boot/home/develop/FirefoxTwoOh/mozilla/opt-FF2Zeta' make: *** [build] Error 2 make: Leaving directory `/boot/home/develop/FirefoxTwoOh/mozilla' make: *** [build] Error 2 $ Either my build environment is broken or this NSPR doesn't recognize BeOS and tries instead to build using pthreads instead of BeOS' bthreads code.
Doug: none of the changes in mozilla/nsprpub between FIREFOX_2_0_RELEASE and NSPR_4_6_4_RTM affects BeOS.
(In reply to comment #26) > Doug: none of the changes in mozilla/nsprpub between > FIREFOX_2_0_RELEASE and NSPR_4_6_4_RTM affects BeOS. > Please excuse my stupidity on this one. A software update unrelated to Mozilla slipped an experimental (and apparently not very functional) pthreads implementation onto my system. This confused the build system and caused the error. The bezilla team will need to consider whether to introduce checks to make sure we use bthreads unless we explicitly state otherwise.
Doug: please open an NSPR bug on the BeOS pthreads issue. The NSPR macro _PR_PTHREADS can only be used on Unix. So the code related to the _HAVE_PTHREADS test in mozilla/nspprub/configure.in needs to be disabled for BeOS.
Created attachment 248835 [details] [diff] [review] Patch for the MOZILLA_1_8_0_BRANCH to use NSPR 4.6.4 and NSS 3.11.4 This patch also includes the patches for the pre-requisites: - bug 317620: to add the new freebl3.dll, freebl3.chk files of NSS 3.11.x to the various Mozilla installer and package files. - bug 361332: allow mozilla/client.mk to pull static NSPR and NSS tags without the -D <date> flags. Note that I excluded the patch for bug 288647, which was checked in at the same time as the patch for bug 317620 but is really independent. This patch is just the MOZILLA_1_8_BRANCH patches backported to the MOZILLA_1_8_0_BRANCH. The original MOZILLA_1_8_BRANCH all have the necessary code reviews, so I hope we don't need to review this patch again. (I have reviewed it thoroughly.) I only had to tweak the changes to two files for the MOZILLA_1_8_0_BRANCH: - mozilla/security/manager/Makefile.in - mozilla/toolkit/mozapps/installer/packager.mk
Attachment #248835 - Flags: approval188.8.131.52?
The danger in 184.108.40.206 is not the NSS changes themselves but making sure all the right bits make in into the packaging/release steps. The install changes are part of the patch, is there any hidden part of the release or update process that needs to know about the new file as well?
Flags: blocking220.127.116.11? → blocking18.104.22.168+
Comment on attachment 248835 [details] [diff] [review] Patch for the MOZILLA_1_8_0_BRANCH to use NSPR 4.6.4 and NSS 3.11.4 I'll be happy to work with the Mozilla release engineers to test this patch. I did my best to examine the MOZILLA_1_8_BRANCH and MOZILLA_1_8_0_BRANCH trees checked out with MOZ_CO_PROJECT=all. There are two issues not yet addressed by my patch 1. The patch for Camino bug 328522 needs to be backported to the MOZILLA_1_8_0_BRANCH. I have requested help in that bug. 2. If Minimo developers are still using the MOZILLA_1_8_0_BRANCH, two files may need to be updated to add the new freebl3.dll file: - mozilla/minimo/config/wince_package.sh - mozilla/minimo/base/Minimo.cpp Bug 362404 is the only known regression of NSS 3.11.4. NSS 3.11.4 fails to initialize on Windows 95 OSR2.x computers that were installed by manually removing IE from the installer. I marked that bug WONTFIX because of the small number of such computers in use today but prepared a response statement with suggested workarounds. If Firefox 1.5.0.x officially supports Windows 95, you should review my response statement in bug 362404 and bug 362404 comment 31.
Doug Turner says Minimo does not build nor is supported on MOZILLA_1_8_0_BRANCH. So we don't need to update those two files in mozilla/minimo.
Comment on attachment 248835 [details] [diff] [review] Patch for the MOZILLA_1_8_0_BRANCH to use NSPR 4.6.4 and NSS 3.11.4 approved for 1.8.0 branch, a=dveditz for drivers
Attachment #248835 - Flags: approval22.214.171.124? → approval126.96.36.199+
Created attachment 249154 [details] [diff] [review] Patch for the MOZILLA_1_8_0_BRANCH to use NSPR 4.6.4 and NSS 3.11.4 (as checked in) I checked in this patch on the MOZILLA_1_8_0_BRANCH for 188.8.131.52. This patch includes the Camino Xcode project file change (bug 328522). I also modified mozilla/minimo/config/wince_package.sh.
Attachment #248835 - Attachment is obsolete: true
v.fixed for 1.8.0 branch based on latest comments.
Keywords: fixed184.108.40.206 → verified220.127.116.11
You need to log in before you can comment on or make changes to this bug.