151671 - Mozilla 1.0.1 should use NSPR 4.2.1

Status: RESOLVED FIXED

(SeaMonkey :: General, defect, P2)

Description

[Wan-Teh Chang]

MOZILLA_1_0_BRANCH is now using a version of NSPR
marked as "4.2 Beta".  It is almost the same as
NSPR 4.2 RTM, plus a few fixes from NSPR 4.2.1.

I would like to check in the remaining NSPR 4.2
and 4.2.1 fixes on the MOZILLA_1_0_BRANCH so that
Mozilla 1.0.1 will be using NSPR 4.2.1.

Comment 1

[Wan-Teh Chang]

Attachment: Proposed NSPR patch for MOZILLA_1_0_BRANCH

Note that for ease of code review, I omitted the
changes to the NSPR files that are not used by
Mozilla.

I would like to check in all the fixes, but am
open to excluding the ones that you consider high
risk.

Comment 2

[David Baron :dbaron: (⌚️UTC-5, no longer working on Mozilla)]

Is it bad to have the config.guess and config.sub changes out of sync with the
other copies in the Mozilla tree?  I recall seawood saying something like that.
 I also recall seawood getting approval to land that patch anyway...

Comment 3

[Christopher Blizzard (:blizzard)]

a=blizzard on behalf of drivers for the 1.0 branch.  Please make sure that you
work with cls to get the config.* files figured out, as dbaron says.

Comment 4

[Wan-Teh Chang]

I can exclude the config.guess and config.sub changes
from this bug and handle them separately.

Comment 5

[Jaime Rodriguez, Jr.]

No visible user benefit = adt1.0.1-.

Comment 6

[Wan-Teh Chang]

The resolution should not be FIXED.  Reopening.

Comment 7

[Wan-Teh Chang]

Marked WONTFIX.

Comment 8

[Christopher Blizzard (:blizzard)]

Yay, my users are going to be impacted by a beta nspr release.

Comment 9

[Wan-Teh Chang]

Attachment: Patch Part I: changes that affect Mozilla

I have a different patch.  The new patch is much
smaller and easier to assess its risk.

I am going to present the patch in two parts.  This
is Part I, which consists of the changes that affect
Mozilla.
1. A fix for bug 135008.
2. New NSPR version number "4.2.1 Beta".

Comment 10

[Wan-Teh Chang]

Attachment: Patch Part II: changes that do not affect Mozilla

Part II of the new patch consists of the changes that
do not affect Mozilla.
1. Update the NSPR binary distribution packaging script
for NSPR 4.2.1.  This script is not used by Mozilla.
2. Remove a blank line from a header file that is not
included by NSPR.
3. Fix incorrect assertions in PR_SendFile.  Mozilla
does not use the PR_SendFile function.
4. Update a test program for NSPR 4.2.1.  The test
program is not shipped with Mozilla.

Comment 11

[Wan-Teh Chang]

Reopened the bug and requesting mozilla1.0.1 and adt1.0.1
approvals for the new patch.

Comment 12

[Paul Wyskoczka]

Adding adt1.0.1+ on behalf of the adt for checkin to the 1.0 branch.  Please get
drivers approval before checking in. When you check this into the branch, please
change the mozilla1.0.1+ keyword to fixed1.0.1

Comment 13

[Christopher Blizzard (:blizzard)]

a=blizzard on behalf of drivers for the 1.0 branch.

Comment 14

[Wan-Teh Chang]

The new patch has been checked into the MOZILLA_1_0_BRANCH.

Comment 15

[lchiang]

stephen - do you know how to verify this fix for branch?

Comment 16

[[e-mail] (gone - use [e-mail] instead)]

I'm not 100% sure, exactly:

C:\branch>cvs co -r MOZILLA_1_0_BRANCH mozilla/client.mk
U mozilla/client.mk

C:\branch>cd mozilla

C:\branch\mozilla>make -f client.mk
make: c:/branch/mozilla/build/unix/abs2rel.pl: Command not found
checkout start: Sat Aug 24 21:30:41 2002
cvs -q -z 3 co -r MOZILLA_1_0_BRANCH -P mozilla/client.mk
mozilla/build/unix/modules.mk
make[1]: c:/branch/mozilla/build/unix/abs2rel.pl: Command not found
make[1]: Entering directory `/cygdrive/c/branch'
cvs -q -z 3 co -P -r MOZILLA_1_0_BRANCH mozilla/nsprpub

I thought I could check the NSPR module under LXR, but it appears to be one
entity, that is: not having a separate MOZILLA_1_0_BRANCH entry like /mozilla
does under http://lxr.mozilla.org by which to query for changes.

Comment 17

[Wan-Teh Chang]

You can verify as follows:

cvs co -r MOZILLA_1_0_BRANCH mozilla/nsprpub/pr/include/prinit.h

Open prinit.h and verify that the value of PR_VERSION is "4.2.1".

Comment 18

[[e-mail] (gone - use [e-mail] instead)]

#define PR_VERSION  "4.2.1"
#define PR_VMAJOR   4
#define PR_VMINOR   2
#define PR_VPATCH   1
#define PR_BETA     PR_FALSE

Verified FIXED for the MOZILLA_1_0_BRANCH.