summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristophe.ravel.bugs%sun.com <devnull@localhost>2008-01-31 22:25:22 +0000
committerchristophe.ravel.bugs%sun.com <devnull@localhost>2008-01-31 22:25:22 +0000
commitba007ca38f3938f4203d4073cd6dcced203cfde1 (patch)
treee7bd8e3fc98a45cd83793d3258217c33649772c8
parent2765e3640bb2ed6149b33afc99fdf62def9d21d8 (diff)
downloadnss-hg-ba007ca38f3938f4203d4073cd6dcced203cfde1.tar.gz
Prepare NSS 3.11.9.0 RTM.NSS_3_11_9_RTM
Uses NSPR 4.7
-rw-r--r--security/nss/lib/nss/nss.h4
-rw-r--r--security/nss/lib/softoken/softkver.h4
-rw-r--r--security/nss/manifest.mn2
3 files changed, 5 insertions, 5 deletions
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index 95ab36c66..d5ad4ed14 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -70,11 +70,11 @@ SEC_BEGIN_PROTOS
* 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
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index 1a8411d13..be3ce70fe 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -57,10 +57,10 @@
* 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_ */
diff --git a/security/nss/manifest.mn b/security/nss/manifest.mn
index 2b740935b..e20badc40 100644
--- a/security/nss/manifest.mn
+++ b/security/nss/manifest.mn
@@ -37,7 +37,7 @@
CORE_DEPTH = ..
DEPTH = ..
-IMPORTS = nspr20/v4.6.8 \
+IMPORTS = nspr20/v4.7 \
$(NULL)
RELEASE = nss