Browse Source

Fix internal nss version

Frank-Rainer Grahl 2 months ago
parent
commit
e32a2f2f63
1 changed files with 75 additions and 2 deletions
  1. 75 2
      mozilla-release/patches/TOP-1909714-NSS3904-11514.patch

+ 75 - 2
mozilla-release/patches/TOP-1909714-NSS3904-11514.patch

@@ -2,7 +2,7 @@
 # User John Schanck <jschanck@mozilla.com>
 # User John Schanck <jschanck@mozilla.com>
 # Date 1721858565 0
 # Date 1721858565 0
 # Node ID bd4eca15906eafec82fbd13037012eaca985d8a0
 # Node ID bd4eca15906eafec82fbd13037012eaca985d8a0
-# Parent  ac053f4f561a993ccf839a39d00979ee2a627844
+# Parent  10deccac3e31731febf5941ddbae3e7fe9522535
 Bug 1909714 - land NSS NSS_3_90_4_RTM UPGRADE_NSS_RELEASE, r=keeler a=dmeehan
 Bug 1909714 - land NSS NSS_3_90_4_RTM UPGRADE_NSS_RELEASE, r=keeler a=dmeehan
 
 
 Differential Revision: https://phabricator.services.mozilla.com/D217594
 Differential Revision: https://phabricator.services.mozilla.com/D217594
@@ -158,4 +158,77 @@ diff --git a/security/nss/lib/freebl/chacha20poly1305.c b/security/nss/lib/freeb
          goto finish;
          goto finish;
      }
      }
  
  
-
+diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
+--- a/security/nss/lib/nss/nss.h
++++ b/security/nss/lib/nss/nss.h
+@@ -17,20 +17,20 @@
+ 
+ /*
+  * 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.90.3" _NSS_CUSTOMIZED
++#define NSS_VERSION "3.90.4" _NSS_CUSTOMIZED
+ #define NSS_VMAJOR 3
+ #define NSS_VMINOR 90
+-#define NSS_VPATCH 3
++#define NSS_VPATCH 4
+ #define NSS_VBUILD 0
+ #define NSS_BETA PR_FALSE
+ 
+ #ifndef RC_INVOKED
+ 
+ #include "seccomon.h"
+ 
+ typedef struct NSSInitParametersStr NSSInitParameters;
+diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
+--- 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.90.3" SOFTOKEN_ECC_STRING
++#define SOFTOKEN_VERSION "3.90.4" SOFTOKEN_ECC_STRING
+ #define SOFTOKEN_VMAJOR 3
+ #define SOFTOKEN_VMINOR 90
+-#define SOFTOKEN_VPATCH 3
++#define SOFTOKEN_VPATCH 4
+ #define SOFTOKEN_VBUILD 0
+ #define SOFTOKEN_BETA PR_FALSE
+ 
+ #endif /* _SOFTKVER_H_ */
+diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
+--- a/security/nss/lib/util/nssutil.h
++++ b/security/nss/lib/util/nssutil.h
+@@ -14,20 +14,20 @@
+ 
+ /*
+  * 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.90.3"
++#define NSSUTIL_VERSION "3.90.4"
+ #define NSSUTIL_VMAJOR 3
+ #define NSSUTIL_VMINOR 90
+-#define NSSUTIL_VPATCH 3
++#define NSSUTIL_VPATCH 4
+ #define NSSUTIL_VBUILD 0
+ #define NSSUTIL_BETA PR_FALSE
+ 
+ SEC_BEGIN_PROTOS
+ 
+ /*
+  * Returns a const string of the UTIL library version.
+  */