Bug 1512719 - land NSS NSS_3_42_RTM UPGRADE_NSS_RELEASE. r=me, a=jcristau DEVEDITION_66_0b3_BUILD1 DEVEDITION_66_0b3_RELEASE FENNEC_66_0b3_BUILD1 FENNEC_66_0b3_RELEASE FIREFOX_66_0b3_BUILD1 FIREFOX_66_0b3_RELEASE
authorJ.C. Jones <jc@mozilla.com>
Sun, 27 Jan 2019 18:15:27 +0000
changeset 512721 0aee0dd24221ae1713034dfbc2903164fe52a3b3
parent 512720 69a3d7c8d04bb6959e105b0c46d0aed4dda85ad9
child 512722 dadba863ac654c98e18819c6823147a3853b80f4
push id10567
push userjcristau@mozilla.com
push dateMon, 28 Jan 2019 14:37:34 +0000
treeherdermozilla-beta@0aee0dd24221 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, jcristau
bugs1512719
milestone66.0
Bug 1512719 - land NSS NSS_3_42_RTM UPGRADE_NSS_RELEASE. r=me, a=jcristau
security/nss/TAG-INFO
security/nss/coreconf/coreconf.dep
security/nss/lib/nss/nss.h
security/nss/lib/softoken/softkver.h
security/nss/lib/util/nssutil.h
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1,1 +1,1 @@
-NSS_3_42_BETA2
+NSS_3_42_RTM
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@@ -5,9 +5,8 @@
 
 /*
  * A dummy header file that is a dependency for all the object files.
  * Used to force a full recompilation of NSS in Mozilla's Tinderbox
  * depend builds.  See comments in rules.mk.
  */
 
 #error "Do not include this header file."
-
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -17,22 +17,22 @@
 
 /*
  * NSS's major version, minor version, patch level, build number, and whether
  * this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define NSS_VERSION "3.42" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.42" _NSS_CUSTOMIZED
 #define NSS_VMAJOR 3
 #define NSS_VMINOR 42
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
-#define NSS_BETA PR_TRUE
+#define NSS_BETA PR_FALSE
 
 #ifndef RC_INVOKED
 
 #include "seccomon.h"
 
 typedef struct NSSInitParametersStr NSSInitParameters;
 
 /*
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -12,16 +12,16 @@
 
 /*
  * Softoken's major version, minor version, patch level, build number,
  * and whether this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
  */
-#define SOFTOKEN_VERSION "3.42" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.42" SOFTOKEN_ECC_STRING
 #define SOFTOKEN_VMAJOR 3
 #define SOFTOKEN_VMINOR 42
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
-#define SOFTOKEN_BETA PR_TRUE
+#define SOFTOKEN_BETA PR_FALSE
 
 #endif /* _SOFTKVER_H_ */
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -14,22 +14,22 @@
 
 /*
  * NSS utilities's major version, minor version, patch level, build number,
  * and whether this is a beta release.
  *
  * The format of the version string should be
  *     "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
  */
-#define NSSUTIL_VERSION "3.42 Beta"
+#define NSSUTIL_VERSION "3.42"
 #define NSSUTIL_VMAJOR 3
 #define NSSUTIL_VMINOR 42
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
-#define NSSUTIL_BETA PR_TRUE
+#define NSSUTIL_BETA PR_FALSE
 
 SEC_BEGIN_PROTOS
 
 /*
  * Returns a const string of the UTIL library version.
  */
 extern const char *NSSUTIL_GetVersion(void);