From c0e295b256c7439ee7d8c66cc536d6ccf705bb26 Mon Sep 17 00:00:00 2001
From: Kai Engert <kaie@kuix.de>
Date: Mon, 4 May 2015 21:34:38 +0200
Subject: [PATCH] Bug 1144055, Upgrade Firefox to use NSS 3.19, landing
 NSS_3_19_RTM

---
 configure.in                         | 2 +-
 security/nss/TAG-INFO                | 2 +-
 security/nss/coreconf/coreconf.dep   | 1 -
 security/nss/lib/nss/nss.def         | 2 +-
 security/nss/lib/nss/nss.h           | 4 ++--
 security/nss/lib/softoken/softkver.h | 4 ++--
 security/nss/lib/util/nssutil.h      | 4 ++--
 7 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/configure.in b/configure.in
index 3b74b011e65f..b78ebeecddc6 100644
--- a/configure.in
+++ b/configure.in
@@ -3577,7 +3577,7 @@ MOZ_ARG_WITH_BOOL(system-nss,
     _USE_SYSTEM_NSS=1 )
 
 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
 
 if test -n "$MOZ_NATIVE_NSS"; then
diff --git a/security/nss/TAG-INFO b/security/nss/TAG-INFO
index a59e7c050646..7c164523d3d4 100644
--- a/security/nss/TAG-INFO
+++ b/security/nss/TAG-INFO
@@ -1 +1 @@
-NSS_3_19_BETA5
+NSS_3_19_RTM
diff --git a/security/nss/coreconf/coreconf.dep b/security/nss/coreconf/coreconf.dep
index 590d1bfaeee3..5182f75552c8 100644
--- a/security/nss/coreconf/coreconf.dep
+++ b/security/nss/coreconf/coreconf.dep
@@ -10,4 +10,3 @@
  */
 
 #error "Do not include this header file."
-
diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def
index fdc8a8a152aa..45675bb97587 100644
--- a/security/nss/lib/nss/nss.def
+++ b/security/nss/lib/nss/nss.def
@@ -1070,7 +1070,7 @@ SEC_GetCrlTimes;
 ;+    local:
 ;+       *;
 ;+};
-;+NSS_3.18.1 { 	# NSS 3.18.1 release
+;+NSS_3.19 { 	# NSS 3.19 release
 ;+    global:
 CERT_GetImposedNameConstraints;
 ;+    local:
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h
index 31e4bce91389..0bcf73f47345 100644
--- a/security/nss/lib/nss/nss.h
+++ b/security/nss/lib/nss/nss.h
@@ -33,12 +33,12 @@
  * The format of the version string should be
  *     "<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_VMINOR   19
 #define NSS_VPATCH   0
 #define NSS_VBUILD   0
-#define NSS_BETA     PR_TRUE
+#define NSS_BETA     PR_FALSE
 
 #ifndef RC_INVOKED
 
diff --git a/security/nss/lib/softoken/softkver.h b/security/nss/lib/softoken/softkver.h
index 5643b0202403..8448e5719116 100644
--- a/security/nss/lib/softoken/softkver.h
+++ b/security/nss/lib/softoken/softkver.h
@@ -25,11 +25,11 @@
  * The format of the version string should be
  *     "<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_VMINOR   19
 #define SOFTOKEN_VPATCH   0
 #define SOFTOKEN_VBUILD   0
-#define SOFTOKEN_BETA     PR_TRUE
+#define SOFTOKEN_BETA     PR_FALSE
 
 #endif /* _SOFTKVER_H_ */
diff --git a/security/nss/lib/util/nssutil.h b/security/nss/lib/util/nssutil.h
index a4231754cffa..518f2143c50d 100644
--- a/security/nss/lib/util/nssutil.h
+++ b/security/nss/lib/util/nssutil.h
@@ -19,12 +19,12 @@
  * The format of the version string should be
  *     "<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_VMINOR   19
 #define NSSUTIL_VPATCH   0
 #define NSSUTIL_VBUILD   0
-#define NSSUTIL_BETA     PR_TRUE
+#define NSSUTIL_BETA     PR_FALSE
 
 SEC_BEGIN_PROTOS