Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1144055, Upgrade Firefox to use NSS 3.19, landing NSS_3_19_RTM

Browse Source
This commit is contained in:
Kai Engert 2015-05-04 21:34:38 +02:00
parent a792ad70d0
commit c0e295b256
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -3577,7 +3577,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
_USE_SYSTEM_NSS=1 ) _USE_SYSTEM_NSS=1 )
if test -n "$_USE_SYSTEM_NSS"; then if test -n "$_USE_SYSTEM_NSS"; then
AM_PATH_NSS(3.18, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) AM_PATH_NSS(3.19, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])])
fi fi
if test -n "$MOZ_NATIVE_NSS"; then if test -n "$MOZ_NATIVE_NSS"; then

2
security/nss/TAG-INFO
View File

@ -1 +1 @@
NSS_3_19_BETA5 NSS_3_19_RTM

1
security/nss/coreconf/coreconf.dep
View File

@ -10,4 +10,3 @@
*/ */
#error "Do not include this header file." #error "Do not include this header file."

2
security/nss/lib/nss/nss.def
View File

@ -1070,7 +1070,7 @@ SEC_GetCrlTimes;
;+ local: ;+ local:
;+ *; ;+ *;
;+}; ;+};
;+NSS_3.18.1 { # NSS 3.18.1 release ;+NSS_3.19 { # NSS 3.19 release
;+ global: ;+ global:
CERT_GetImposedNameConstraints; CERT_GetImposedNameConstraints;
;+ local: ;+ local:

4
security/nss/lib/nss/nss.h
View File

@ -33,12 +33,12 @@
* The format of the version string should be * The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]" * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/ */
#define NSS_VERSION "3.19" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta" #define NSS_VERSION "3.19" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VMAJOR 3 #define NSS_VMAJOR 3
#define NSS_VMINOR 19 #define NSS_VMINOR 19
#define NSS_VPATCH 0 #define NSS_VPATCH 0
#define NSS_VBUILD 0 #define NSS_VBUILD 0
#define NSS_BETA PR_TRUE #define NSS_BETA PR_FALSE
#ifndef RC_INVOKED #ifndef RC_INVOKED

4
security/nss/lib/softoken/softkver.h
View File

@ -25,11 +25,11 @@
* The format of the version string should be * The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]" * "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/ */
#define SOFTOKEN_VERSION "3.19" SOFTOKEN_ECC_STRING " Beta" #define SOFTOKEN_VERSION "3.19" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3 #define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 19 #define SOFTOKEN_VMINOR 19
#define SOFTOKEN_VPATCH 0 #define SOFTOKEN_VPATCH 0
#define SOFTOKEN_VBUILD 0 #define SOFTOKEN_VBUILD 0
#define SOFTOKEN_BETA PR_TRUE #define SOFTOKEN_BETA PR_FALSE
#endif /* _SOFTKVER_H_ */ #endif /* _SOFTKVER_H_ */

4
security/nss/lib/util/nssutil.h
View File

@ -19,12 +19,12 @@
* The format of the version string should be * The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]" * "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
*/ */
#define NSSUTIL_VERSION "3.19 Beta" #define NSSUTIL_VERSION "3.19"
#define NSSUTIL_VMAJOR 3 #define NSSUTIL_VMAJOR 3
#define NSSUTIL_VMINOR 19 #define NSSUTIL_VMINOR 19
#define NSSUTIL_VPATCH 0 #define NSSUTIL_VPATCH 0
#define NSSUTIL_VBUILD 0 #define NSSUTIL_VBUILD 0
#define NSSUTIL_BETA PR_TRUE #define NSSUTIL_BETA PR_FALSE
SEC_BEGIN_PROTOS SEC_BEGIN_PROTOS