Prepare NSS 3.11.9.0 RTM. NSS_3_11_BRANCH NSS_3_11_9_RTM
authorchristophe.ravel.bugs%sun.com
Thu, 31 Jan 2008 22:25:22 +0000
branchNSS_3_11_BRANCH
changeset 8350 5a0f11679f74878ce94a74e548e793d13b321e7c
parent 8347 19c904e33d5a6931dafb12c3bb53f09443e4ff2d
child 8351 e420b76ca6fe83d63fad03e255eb055a8ac01562
child 8379 d892244036506b97fc6f27d4c322d06f192b9ad1
push idunknown
push userunknown
push dateunknown
Prepare NSS 3.11.9.0 RTM. Uses NSPR 4.7
security/nss/lib/nss/nss.h
security/nss/lib/softoken/softkver.h
security/nss/manifest.mn
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -65,21 +65,21 @@ SEC_BEGIN_PROTOS
 
 /*
  * NSS's major version, minor version, patch level, and whether
  * this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION  "3.11.9.0" _NSS_ECC_STRING " Beta" _NSS_CUSTOMIZED
+#define NSS_VERSION  "3.11.9.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
 #define NSS_VMAJOR   3
 #define NSS_VMINOR   11
 #define NSS_VPATCH   9
-#define NSS_BETA     PR_TRUE
+#define NSS_BETA     PR_FALSE
 
 /*
  * Return a boolean that indicates whether the underlying library
  * will perform as the caller expects.
  *
  * The only argument is a string, which should be the verson
  * identifier of the NSS library. That string will be compared
  * against a string that represents the actual build version of
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -52,15 +52,15 @@
 
 /*
  * Softoken's major version, minor version, patch level, and whether
  * this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION  "3.11.9.0" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION  "3.11.9.0" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR   3
 #define SOFTOKEN_VMINOR   11
 #define SOFTOKEN_VPATCH   9
-#define SOFTOKEN_BETA     PR_TRUE
+#define SOFTOKEN_BETA     PR_FALSE
 
 #endif /* _SOFTKVER_H_ */
--- a/security/nss/manifest.mn
+++ b/security/nss/manifest.mn
@@ -32,16 +32,16 @@
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 CORE_DEPTH = ..
 DEPTH      = ..
 
-IMPORTS =	nspr20/v4.6.8 \
+IMPORTS =	nspr20/v4.7 \
 		$(NULL)
 
 RELEASE = nss
 
 DIRS = lib cmd