Update NSS to 3.21 RTM and NSPR to 4.11 RTM

README.chromium

Index: README.chromium
diff --git a/README.chromium b/README.chromium
index 43239817f0994008832777a8a1f48bed4f17e9c1..cf08b7f3bb2235db4a5877a6fb2fe51f4b5c88f6 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,28 +1,27 @@
 Name: Network Security Services (NSS)
 Short Name: nss
 URL: http://www.mozilla.org/projects/security/pki/nss/
-Version: 3.16.5
+Version: 3.21
 License: MPL 2
 License File: nss/COPYING
 Security Critical: yes
 
 Description:
-NSS 3.19 with NSPR 4.10.8
+NSS 3.21 with NSPR 4.11
 
 This copy of NSS has been customized for Chromium.  NSPR is also put here
 rather than in a separate directory to emphasize the fact that Chromium is
 using NSPR strictly as an NSS dependency.
 
-We took a subset of NSS, omitting the SSL and SMIME libraries and the
-built-in root CA certificates module.  This NSS subset satisfies the
-dependencies of the NSS SSL library in src/net/third_party/nss.  Do NOT use
-this copy of NSS on platforms that have NSS as system libraries, such as
-Linux.
+We took a subset of NSS, omitting the SSL and SMIME libraries.
+This NSS subset satisfies the dependencies of the NSS SSL library in
+src/net/third_party/nss.  Do NOT use this copy of NSS on platforms that
+have NSS as system libraries, such as Linux.
 
 The source code was checked out from the mozilla.org CVS or hg repository using
 the nspr-checkout.sh and nss-checkout.sh scripts in the scripts directory.
-The current source code was checked out with the hg tag NSS_3_19_RTM
-and the hg tag NSPR_4_10_8_RTM.
+The current source code was checked out with the hg tag NSS_3_21_RTM
+and the hg tag NSPR_4_11_RTM.
 
 Local Modifications:
 
@@ -45,10 +44,10 @@ We made the following local changes to NSPR.
   DO NOT upstream this patch.
 - patches/nspr-unused-variable.patch: Remove an unused variable. See NSPR

[davidben, 2015/12/11 22:10:58]

I think this patch fell off a while ago.

   bug 1126408 (https://bugzilla.mozilla.org/show_bug.cgi?id=1126408).
-- patches/nspr-overflow.patch: See NSPR bug 1205157
-  (https://bugzilla.mozilla.org/show_bug.cgi?id=1205157).
 
 We made the following local changes to NSS.
+
+Files Added:
 - nss/exports_win.def: The list of exports to use when building nss as a
   dynamic library (crnss.dll).
 - nss/lib/ckfw/builtins/certdata.c: a generated file. Do an upstream NSS
@@ -61,6 +60,8 @@ We made the following local changes to NSS.
 - nss/lib/freebl/mpi/mpi_arm_mac.c: a wrapper file for mpi_arm.c for iOS
   and Mac OS X. This works around the inability to specify target arch
   specific source files in Xcode.
+
+Patches Applied:
 - patches/nss-remove-fortezza.patch: remove Fortezza certificate support
   from PK11_ImportPublicKey.  See NSS bug 668397
   (https://bugzilla.mozilla.org/show_bug.cgi?id=668397).
@@ -73,7 +74,4 @@ We made the following local changes to NSS.
   libpkix (the new certification path validation library) and
   softoken/legacydb (support for the old Berkeley DB databases).  See NSS
   bug 534471 (https://bugzilla.mozilla.org/show_bug.cgi?id=534471).
-- patches/nss-ber-fixes.patch: See NSS bugs 1192028
-  (https://bugzilla.mozilla.org/show_bug.cgi?id=1192028) and 1202868
-  (https://bugzilla.mozilla.org/show_bug.cgi?id=1202868).