Set version numbers to 3.67 Beta

sailfishos-mirror · May 28, 2021 · 0abab0d · 0abab0d
1 parent ff2c6ee
commit 0abab0d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 34 deletions.
diff --git a/automation/abi-check/expected-report-libnss3.so.txt b/automation/abi-check/expected-report-libnss3.so.txt
@@ -1,17 +0,0 @@
-
-3 Added functions:
-
-  'function PRBool PK11_ContextGetFIPSStatus(PK11Context*)'    {PK11_ContextGetFIPSStatus@@NSS_3.66}
-  'function PRBool PK11_ObjectGetFIPSStatus(PK11ObjectType, void*)'    {PK11_ObjectGetFIPSStatus@@NSS_3.66}
-  'function PRBool PK11_SlotGetLastFIPSStatus(PK11SlotInfo*)'    {PK11_SlotGetLastFIPSStatus@@NSS_3.66}
-
-1 function with some indirect sub-type change:
-
-  [C]'function SECStatus PK11_GetModInfo(SECMODModule*, CK_INFO*)' at pk11util.c:613:1 has some indirect sub-type changes:
-    parameter 1 of type 'SECMODModule*' has sub-type changes:
-      in pointed to type 'typedef SECMODModule' at secmodt.h:29:1:
-        underlying type 'struct SECMODModuleStr' at secmodt.h:44:1 changed:
-          type size changed from 1664 to 1728 bits
-          1 data member insertion:
-            'CK_NSS_GetFIPSStatus SECMODModuleStr::fipsIndicator', at offset 1664 (in bits) at secmodt.h:79:1
-          no data member changes (2 filtered);

diff --git a/automation/abi-check/expected-report-libssl3.so.txt b/automation/abi-check/expected-report-libssl3.so.txt
@@ -1,10 +0,0 @@
-
-1 function with some indirect sub-type change:
-
-  [C]'function SECStatus SSL_GetChannelInfo(PRFileDesc*, SSLChannelInfo*, PRUintn)' at sslinfo.c:14:1 has some indirect sub-type changes:
-    parameter 2 of type 'SSLChannelInfo*' has sub-type changes:
-      in pointed to type 'typedef SSLChannelInfo' at sslt.h:383:1:
-        underlying type 'struct SSLChannelInfoStr' at sslt.h:299:1 changed:
-          type size changed from 1024 to 1088 bits
-          1 data member insertion:
-            'PRBool SSLChannelInfoStr::isFIPS', at offset 1024 (in bits) at sslt.h:379:1

diff --git a/automation/abi-check/previous-nss-release b/automation/abi-check/previous-nss-release
@@ -1 +1 @@
-NSS_3_65_BRANCH
+NSS_3_66_BRANCH
diff --git 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.66" _NSS_CUSTOMIZED " Beta"
+#define NSS_VERSION "3.67" _NSS_CUSTOMIZED " Beta"
 #define NSS_VMAJOR 3
-#define NSS_VMINOR 66
+#define NSS_VMINOR 67
 #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
@@ -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.66" SOFTOKEN_ECC_STRING " Beta"
+#define SOFTOKEN_VERSION "3.67" SOFTOKEN_ECC_STRING " Beta"
 #define SOFTOKEN_VMAJOR 3
-#define SOFTOKEN_VMINOR 66
+#define SOFTOKEN_VMINOR 67
 #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
@@ -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.66 Beta"
+#define NSSUTIL_VERSION "3.67 Beta"
 #define NSSUTIL_VMAJOR 3
-#define NSSUTIL_VMINOR 66
+#define NSSUTIL_VMINOR 67
 #define NSSUTIL_VPATCH 0
 #define NSSUTIL_VBUILD 0
 #define NSSUTIL_BETA PR_TRUE