author | Kai Engert <kaie@kuix.de> |
Mon, 01 Dec 2014 14:34:08 +0100 | |
changeset 218162 | 583a996edc2bc871244fe9f80e552df0ce3cefa1 |
parent 218161 | fd6779c9a336aedfff2982b4335e28ffe3161182 |
child 218163 | 75f3468a4ae7979953415562e2207412965f8b75 |
push id | 27919 |
push user | philringnalda@gmail.com |
push date | Tue, 02 Dec 2014 03:07:26 +0000 |
treeherder | mozilla-central@265e01c7ff55 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1088969 |
milestone | 37.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/configure.in +++ b/configure.in @@ -3595,17 +3595,17 @@ dnl = If NSS was not detected in the sys dnl = use the one in the source tree (mozilla/security/nss) dnl ======================================================== MOZ_ARG_WITH_BOOL(system-nss, [ --with-system-nss Use system installed NSS], _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then - AM_PATH_NSS(3.17.2, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) + AM_PATH_NSS(3.17.3, [MOZ_NATIVE_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi if test -n "$MOZ_NATIVE_NSS"; then NSS_LIBS="$NSS_LIBS -lcrmf" else NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss' if test -z "$GNU_CC" -a "$OS_ARCH" = "WINNT"; then
--- a/security/nss/TAG-INFO +++ b/security/nss/TAG-INFO @@ -1,1 +1,1 @@ -NSS_3_18_BETA4 +NSS_3_17_3_RTM
--- a/security/nss/coreconf/coreconf.dep +++ b/security/nss/coreconf/coreconf.dep @@ -5,9 +5,8 @@ /* * A dummy header file that is a dependency for all the object files. * Used to force a full recompilation of NSS in Mozilla's Tinderbox * depend builds. See comments in rules.mk. */ #error "Do not include this header file." -
--- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -28,22 +28,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.18" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta" +#define NSS_VERSION "3.17.3" _NSS_ECC_STRING _NSS_CUSTOMIZED #define NSS_VMAJOR 3 -#define NSS_VMINOR 18 -#define NSS_VPATCH 0 +#define NSS_VMINOR 17 +#define NSS_VPATCH 3 #define NSS_VBUILD 0 -#define NSS_BETA PR_TRUE +#define NSS_BETA PR_FALSE #ifndef RC_INVOKED #include "seccomon.h" typedef struct NSSInitParametersStr NSSInitParameters; /*
--- a/security/nss/lib/softoken/softkver.h +++ b/security/nss/lib/softoken/softkver.h @@ -20,16 +20,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.18" SOFTOKEN_ECC_STRING " Beta" +#define SOFTOKEN_VERSION "3.17.3" SOFTOKEN_ECC_STRING #define SOFTOKEN_VMAJOR 3 -#define SOFTOKEN_VMINOR 18 -#define SOFTOKEN_VPATCH 0 +#define SOFTOKEN_VMINOR 17 +#define SOFTOKEN_VPATCH 3 #define SOFTOKEN_VBUILD 0 -#define SOFTOKEN_BETA PR_TRUE +#define SOFTOKEN_BETA PR_FALSE #endif /* _SOFTKVER_H_ */
--- a/security/nss/lib/util/nssutil.h +++ b/security/nss/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.18 Beta" +#define NSSUTIL_VERSION "3.17.3" #define NSSUTIL_VMAJOR 3 -#define NSSUTIL_VMINOR 18 -#define NSSUTIL_VPATCH 0 +#define NSSUTIL_VMINOR 17 +#define NSSUTIL_VPATCH 3 #define NSSUTIL_VBUILD 0 -#define NSSUTIL_BETA PR_TRUE +#define NSSUTIL_BETA PR_FALSE SEC_BEGIN_PROTOS /* * Returns a const string of the UTIL library version. */ extern const char *NSSUTIL_GetVersion(void);