510436 - Add macros for build numbers (4th component of version number) to nssutil.h, softkver.h, and nss.h

Status: RESOLVED FIXED

(NSS :: Build, defect)

Description

[Wan-Teh Chang]

NSS version strings now usually consist of four components, for
example, "3.12.4.5".  We're using the fourth component for the
build numbers.  We should add a macro for that component.  This
has two advantages:

1. Avoid the mistake of updating the VPATCH macro when we bump
the build number.  For example,
http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/security/nss/lib/nss/nss.h&rev=1.68&mark=69,72#62

2. The resource scripts (*.rc) can include the build number macro
so that Windows Explorer shows "3.12.4.5" instead of "3.12.4.0".
The "0" is hardcoded right now.  For example,
http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/security/nss/lib/nss/nss.rc&rev=1.3&mark=74-75#68

Comment 1

[Wan-Teh Chang]

Attachment: Proposed patch for NSS except softoken

Comment 2

[Wan-Teh Chang]

Attachment: Proposed patch for SOFTOKEN_3_13_BRANCH

Comment 3

[Christophe Ravel]

Comment on attachment 398818 [details] [diff] [review]
Proposed patch for NSS except softoken

r=christophe

Comment 4

[Nelson Bolyard (seldom reads bugmail)]

Comment on attachment 398818 [details] [diff] [review]
Proposed patch for NSS except softoken

r=nelson

Comment 5

[Wan-Teh Chang]

Attachment: Proposed patch for NSS except softoken (as checked in)

While reviewing the patch myself, I found that I missed
some comments that needed updating.  This patch is what
I actually checked in on the NSS trunk (NSS 3.12.5).

Checking in lib/nss/nss.h;
/cvsroot/mozilla/security/nss/lib/nss/nss.h,v  <--  nss.h
new revision: 1.71; previous revision: 1.70
done
Checking in lib/nss/nss.rc;
/cvsroot/mozilla/security/nss/lib/nss/nss.rc,v  <--  nss.rc
new revision: 1.4; previous revision: 1.3
done
Checking in lib/nss/nssinit.c;
/cvsroot/mozilla/security/nss/lib/nss/nssinit.c,v  <--  nssinit.c
new revision: 1.100; previous revision: 1.99
done
Checking in lib/smime/smime.rc;
/cvsroot/mozilla/security/nss/lib/smime/smime.rc,v  <--  smime.rc
new revision: 1.4; previous revision: 1.3
done
Checking in lib/ssl/ssl.rc;
/cvsroot/mozilla/security/nss/lib/ssl/ssl.rc,v  <--  ssl.rc
new revision: 1.4; previous revision: 1.3
done
Checking in lib/util/nssutil.h;
/cvsroot/mozilla/security/nss/lib/util/nssutil.h,v  <--  nssutil.h
new revision: 1.9; previous revision: 1.8
done
Checking in lib/util/nssutil.rc;
/cvsroot/mozilla/security/nss/lib/util/nssutil.rc,v  <--  nssutil.rc
new revision: 1.3; previous revision: 1.2
done

Comment 6

[Wan-Teh Chang]

For NSS 3.12.5, this bug is fixed.  I'll check in the
softoken patch on the SOFTOKEN_3_13_BRANCH after Bob
reviews it.

Just FYI: I did some research on the definitions of the
four components of a version string.  Two conventions
are the most common.

1. major.minor.build.revision

This convention is used by Microsoft.  For example, see
http://msdn.microsoft.com/en-us/library/bb427352(VS.85).aspx
http://msdn.microsoft.com/en-us/library/kstyaxxh(VS.100).aspx
http://msdn.microsoft.com/en-us/library/ms998223.aspx

2. major.minor.patch.build

Note that the components for "build number" are
different in these two conventions.  Since we
already call the third component of our version
string the "patch level", we have to use convention 2.

Comment 7

[Robert Relyea]

Comment on attachment 398819 [details] [diff] [review]
Proposed patch for SOFTOKEN_3_13_BRANCH

r+

Comment 8

[Wan-Teh Chang]

Attachment: Proposed patch for SOFTOKEN_3_13_BRANCH (as checked in)

I checked in this patch on the SOFTOKEN_3_13_BRANCH for Softoken 3.13.

Checking in lib/freebl/freebl.rc;
/cvsroot/mozilla/security/nss/lib/freebl/freebl.rc,v  <--  freebl.rc
new revision: 1.3.56.1; previous revision: 1.3
done
Checking in lib/softoken/softkver.h;
/cvsroot/mozilla/security/nss/lib/softoken/softkver.h,v  <--  softkver.h
new revision: 1.15.2.2; previous revision: 1.15.2.1
done
Checking in lib/softoken/softokn.rc;
/cvsroot/mozilla/security/nss/lib/softoken/softokn.rc,v  <--  softokn.rc
new revision: 1.11.56.1; previous revision: 1.11
done
Checking in lib/softoken/legacydb/nssdbm.rc;
/cvsroot/mozilla/security/nss/lib/softoken/legacydb/nssdbm.rc,v  <--  nssdbm.rc
new revision: 1.1.54.1; previous revision: 1.1
done

Comment 9

[Wan-Teh Chang]

Attachment: Proposed patch for Softoken 3.12.7 on the NSS trunk (checked in)

This patch backports the softoken patch (attachment 402391 [details] [diff] [review])
to Softoken 3.12.7 on the NSS trunk.

Bob, please approve this patch for FIPS2010.  It not only
changes the softoken version string to "3.12.7.0 Beta"
but also adds a SOFTOKEN_VBUILD macro for the fourth component
of the version string.

Comment 10

[Robert Relyea]

Comment on attachment 448881 [details] [diff] [review]
Proposed patch for Softoken 3.12.7 on the NSS trunk (checked in)

r+

If this is for the 3.13 branch, though, shouldn't it be softoken 3.13?

bob

Comment 11

[Robert Relyea]

Oh never mind, read the wrong description. r+ for FIPS2010 (3.12.7 branch).

bob

Comment 12

[Wan-Teh Chang]

Comment on attachment 448881 [details] [diff] [review]
Proposed patch for Softoken 3.12.7 on the NSS trunk (checked in)

Bob, this patch is for the NSS trunk (Softoken 3.12.7), not for the SOFTOKEN_3_13_BRANCH.

Do you still approve this patch?

Comment 13

[Robert Relyea]

yes (see comment 11).

Comment 14

[Wan-Teh Chang]

Comment on attachment 448881 [details] [diff] [review]
Proposed patch for Softoken 3.12.7 on the NSS trunk (checked in)

I checked in this patch on the NSS trunk (Softoken 3.12.7).

Checking in lib/freebl/freebl.rc;
/cvsroot/mozilla/security/nss/lib/freebl/freebl.rc,v  <--  freebl.rc
new revision: 1.4; previous revision: 1.3
done
Checking in lib/softoken/softkver.h;
/cvsroot/mozilla/security/nss/lib/softoken/softkver.h,v  <--  softkver.h
new revision: 1.17; previous revision: 1.16
done
Checking in lib/softoken/softokn.rc;
/cvsroot/mozilla/security/nss/lib/softoken/softokn.rc,v  <--  softokn.rc
new revision: 1.12; previous revision: 1.11
done
Checking in lib/softoken/legacydb/nssdbm.rc;
/cvsroot/mozilla/security/nss/lib/softoken/legacydb/nssdbm.rc,v  <--  nssdbm.rc
new revision: 1.2; previous revision: 1.1
done