set version numbers to 3.40 beta
authorKai Engert <kaie@kuix.de>
Tue, 28 Aug 2018 16:09:08 +0200
changeset 14462 fd99ddaefee2675a93f741b4ade058322597c498
parent 14460 f1156092523ec17cdabf28939fe420e2115e9b2b
child 14466 b41bb7cccf30f0fc6af525a9d1edd826b49a6d3e
push id3172
push userkaie@kuix.de
push dateTue, 28 Aug 2018 14:09:15 +0000
set version numbers to 3.40 beta
automation/abi-check/expected-report-libnss3.so.txt
automation/abi-check/expected-report-libnssutil3.so.txt
automation/abi-check/previous-nss-release
lib/nss/nss.h
lib/softoken/softkver.h
lib/util/nssutil.h
--- 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:
-
-  'function KeyType CERT_GetCertKeyType(const CERTSubjectPublicKeyInfo*)'    {CERT_GetCertKeyType@@NSS_3.39}
-
--- a/automation/abi-check/expected-report-libnssutil3.so.txt
+++ b/automation/abi-check/expected-report-libnssutil3.so.txt
@@ -1,5 +0,0 @@
-
-1 Added function:
-
-  'function char* NSSUTIL_AddNSSFlagToModuleSpec(char*, char*)'    {NSSUTIL_AddNSSFlagToModuleSpec@@NSSUTIL_3.39}
-
--- a/automation/abi-check/previous-nss-release
+++ b/automation/abi-check/previous-nss-release
@@ -1,1 +1,1 @@
-NSS_3_38_BRANCH
+NSS_3_39_BRANCH
--- a/lib/nss/nss.h
+++ b/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.39" _NSS_CUSTOMIZED
+#define NSS_VERSION "3.40" _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 39
+#define NSS_VMINOR 40
 #define NSS_VPATCH 0
 #define NSS_VBUILD 0
-#define NSS_BETA PR_FALSE
+#define NSS_BETA PR_TRUE
 
 #ifndef RC_INVOKED
 
 #include "seccomon.h"
 
 typedef struct NSSInitParametersStr NSSInitParameters;
 
 /*
--- a/lib/softoken/softkver.h
+++ b/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.39" SOFTOKEN_ECC_STRING
+#define SOFTOKEN_VERSION "3.40" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 39
+#define SOFTOKEN_VMINOR 40
 #define SOFTOKEN_VPATCH 0
 #define SOFTOKEN_VBUILD 0
-#define SOFTOKEN_BETA PR_FALSE
+#define SOFTOKEN_BETA PR_TRUE
 
 #endif /* _SOFTKVER_H_ */
--- a/lib/util/nssutil.h
+++ b/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.39"
+#define NSSUTIL_VERSION "3.40 Beta"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 39
+#define NSSUTIL_VMINOR 40
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
-#define NSSUTIL_BETA PR_FALSE
+#define NSSUTIL_BETA PR_TRUE
 
 SEC_BEGIN_PROTOS
 
 /*
  * Returns a const string of the UTIL library version.
  */
 extern const char *NSSUTIL_GetVersion(void);