summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ.C. Jones <jjones@mozilla.com>2020-05-29 13:35:53 -0700
committerJ.C. Jones <jjones@mozilla.com>2020-05-29 13:35:53 -0700
commit1d8478e2409089cf8d1f766524c8419cde4c1faa (patch)
tree7edf3426ce4bd33692de02b2bfacaf0b05703a0d
parentae41b81b5861c7684706f44e271978830f6a6082 (diff)
downloadnss-hg-1d8478e2409089cf8d1f766524c8419cde4c1faa.tar.gz
Set version numbers to 3.54 beta
-rw-r--r--automation/abi-check/expected-report-libnss3.so.txt5
-rw-r--r--automation/abi-check/previous-nss-release2
-rw-r--r--lib/nss/nss.h4
-rw-r--r--lib/softoken/softkver.h4
-rw-r--r--lib/util/nssutil.h4
5 files changed, 7 insertions, 12 deletions
diff --git a/automation/abi-check/expected-report-libnss3.so.txt b/automation/abi-check/expected-report-libnss3.so.txt
index aed6067d8..e69de29bb 100644
--- a/automation/abi-check/expected-report-libnss3.so.txt
+++ b/automation/abi-check/expected-report-libnss3.so.txt
@@ -1,5 +0,0 @@
-
-1 Added function:
-
- [A] 'function PRBool SECMOD_GetSystemFIPSEnabled()' {SECMOD_GetSystemFIPSEnabled@@NSS_3.53}
-
diff --git a/automation/abi-check/previous-nss-release b/automation/abi-check/previous-nss-release
index 268294fb9..6bb53e4ef 100644
--- a/automation/abi-check/previous-nss-release
+++ b/automation/abi-check/previous-nss-release
@@ -1 +1 @@
-NSS_3_52_BRANCH
+NSS_3_53_BRANCH
diff --git a/lib/nss/nss.h b/lib/nss/nss.h
index 6ccf23769..99ab09e6e 100644
--- a/lib/nss/nss.h
+++ b/lib/nss/nss.h
@@ -22,9 +22,9 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
-#define NSS_VERSION "3.53" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.54" _NSS_CUSTOMIZED " Beta"
#define NSS_VMAJOR 3
-#define NSS_VMINOR 53
+#define NSS_VMINOR 54
#define NSS_VPATCH 0
#define NSS_VBUILD 0
#define NSS_BETA PR_TRUE
diff --git a/lib/softoken/softkver.h b/lib/softoken/softkver.h
index 9d955814a..333df7956 100644
--- a/lib/softoken/softkver.h
+++ b/lib/softoken/softkver.h
@@ -17,9 +17,9 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
-#define SOFTOKEN_VERSION "3.53" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.54" SOFTOKEN_ECC_STRING " Beta"
#define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 53
+#define SOFTOKEN_VMINOR 54
#define SOFTOKEN_VPATCH 0
#define SOFTOKEN_VBUILD 0
#define SOFTOKEN_BETA PR_TRUE
diff --git a/lib/util/nssutil.h b/lib/util/nssutil.h
index e0aac06de..165262778 100644
--- a/lib/util/nssutil.h
+++ b/lib/util/nssutil.h
@@ -19,9 +19,9 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
*/
-#define NSSUTIL_VERSION "3.53 Beta"
+#define NSSUTIL_VERSION "3.54 Beta"
#define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 53
+#define NSSUTIL_VMINOR 54
#define NSSUTIL_VPATCH 0
#define NSSUTIL_VBUILD 0
#define NSSUTIL_BETA PR_TRUE