Update to NSS 3.12.7 and NSPR 4.8.6....

nss/patches/nss-static.patch

Index: nss/patches/nss-static.patch
===================================================================
--- nss/patches/nss-static.patch	(revision 55475)
+++ nss/patches/nss-static.patch	(working copy)
@@ -1,10 +1,10 @@
 Index: mozilla/security/nss/lib/certhigh/certvfy.c
 ===================================================================
 RCS file: /cvsroot/mozilla/security/nss/lib/certhigh/certvfy.c,v
-retrieving revision 1.69
-diff -p -u -8 -r1.69 certvfy.c
---- mozilla/security/nss/lib/certhigh/certvfy.c	13 Mar 2009 02:59:04 -0000	1.69
-+++ mozilla/security/nss/lib/certhigh/certvfy.c	9 Jan 2010 03:02:21 -0000
+retrieving revision 1.71
+diff -p -u -8 -r1.71 certvfy.c
+--- mozilla/security/nss/lib/certhigh/certvfy.c	30 Apr 2010 07:47:48 -0000	1.71
++++ mozilla/security/nss/lib/certhigh/certvfy.c	9 Aug 2010 22:29:25 -0000
 @@ -40,27 +40,71 @@
  #include "secoid.h"
  #include "sslerr.h"
@@ -83,7 +83,7 @@
 retrieving revision 1.1
 diff -p -u -8 -r1.1 blapii.h
 --- mozilla/security/nss/lib/freebl/blapii.h	3 Feb 2009 05:34:40 -0000	1.1
-+++ mozilla/security/nss/lib/freebl/blapii.h	9 Jan 2010 03:02:21 -0000
++++ mozilla/security/nss/lib/freebl/blapii.h	9 Aug 2010 22:29:25 -0000
 @@ -39,19 +39,19 @@
  #define _BLAPII_H_
  
@@ -112,7 +112,7 @@
 retrieving revision 1.39
 diff -p -u -8 -r1.39 rsa.c
 --- mozilla/security/nss/lib/freebl/rsa.c	3 Feb 2009 05:34:41 -0000	1.39
-+++ mozilla/security/nss/lib/freebl/rsa.c	9 Jan 2010 03:02:22 -0000
++++ mozilla/security/nss/lib/freebl/rsa.c	9 Aug 2010 22:29:25 -0000
 @@ -967,18 +967,25 @@ void RSA_Cleanup(void)
   * free_bl may have allocated along the way. Currently only RSA does this,
   * so I've put it here for now.
@@ -144,10 +144,10 @@
 Index: mozilla/security/nss/lib/freebl/shvfy.c
 ===================================================================
 RCS file: /cvsroot/mozilla/security/nss/lib/freebl/shvfy.c,v
-retrieving revision 1.11
-diff -p -u -8 -r1.11 shvfy.c
---- mozilla/security/nss/lib/freebl/shvfy.c	18 Nov 2008 19:48:24 -0000	1.11
-+++ mozilla/security/nss/lib/freebl/shvfy.c	9 Jan 2010 03:02:22 -0000
+retrieving revision 1.13
+diff -p -u -8 -r1.13 shvfy.c
+--- mozilla/security/nss/lib/freebl/shvfy.c	29 Apr 2010 00:17:52 -0000	1.13
++++ mozilla/security/nss/lib/freebl/shvfy.c	9 Aug 2010 22:29:25 -0000
 @@ -97,19 +97,29 @@ readItem(PRFileDesc *fd, SECItem *item)
  	PORT_Free(item->data);
  	item->data = NULL;
@@ -206,13 +206,13 @@
 Index: mozilla/security/nss/lib/nss/nssinit.c
 ===================================================================
 RCS file: /cvsroot/mozilla/security/nss/lib/nss/nssinit.c,v
-retrieving revision 1.103
-diff -p -u -8 -r1.103 nssinit.c
---- mozilla/security/nss/lib/nss/nssinit.c	29 Oct 2009 21:33:10 -0000	1.103
-+++ mozilla/security/nss/lib/nss/nssinit.c	9 Jan 2010 03:02:22 -0000
-@@ -49,19 +49,22 @@
- #include "ssl.h"
- #include "sslproto.h"
+retrieving revision 1.106
+diff -p -u -8 -r1.106 nssinit.c
+--- mozilla/security/nss/lib/nss/nssinit.c	3 Apr 2010 20:06:00 -0000	1.106
++++ mozilla/security/nss/lib/nss/nssinit.c	9 Aug 2010 22:29:26 -0000
+@@ -47,19 +47,22 @@
+ #include "cert.h"
+ #include "key.h"
  #include "secmod.h"
  #include "secoid.h"
  #include "nss.h"
@@ -233,7 +233,7 @@
  #include "ocspi.h"
  
  /*
-@@ -532,18 +535,20 @@ nss_Init(const char *configdir, const ch
+@@ -530,18 +533,20 @@ nss_Init(const char *configdir, const ch
  		 NSSInitParameters *initParams,
  		 PRBool readOnly, PRBool noCertDB, 
  		 PRBool noModDB, PRBool forceOpen, PRBool noRootInit,
@@ -254,7 +254,7 @@
      /* if we are trying to init with a traditional NSS_Init call, maintain
       * the traditional idempotent behavior. */
      if (!initContextPtr && nssIsInitted) {
-@@ -662,28 +667,30 @@ nss_Init(const char *configdir, const ch
+@@ -660,28 +665,30 @@ nss_Init(const char *configdir, const ch
  		    nss_FindExternalRoot(dbpath, secmodName);
  		}
  	    }
@@ -285,7 +285,7 @@
       * Now mark the appropriate init state. If initContextPtr was passed
       * in, then return the new context pointer and add it to the
       * nssInitContextList. Otherwise set the global nss_isInitted flag
-@@ -1026,17 +1033,19 @@ nss_Shutdown(void)
+@@ -1024,17 +1031,19 @@ nss_Shutdown(void)
  
      rv = nss_ShutdownShutdownList();
      if (rv != SECSuccess) {
@@ -308,10 +308,10 @@
 Index: mozilla/security/nss/lib/pk11wrap/pk11load.c
 ===================================================================
 RCS file: /cvsroot/mozilla/security/nss/lib/pk11wrap/pk11load.c,v
-retrieving revision 1.28
-diff -p -u -8 -r1.28 pk11load.c
---- mozilla/security/nss/lib/pk11wrap/pk11load.c	30 Oct 2009 09:44:45 -0000	1.28
-+++ mozilla/security/nss/lib/pk11wrap/pk11load.c	9 Jan 2010 03:02:22 -0000
+retrieving revision 1.30
+diff -p -u -8 -r1.30 pk11load.c
+--- mozilla/security/nss/lib/pk11wrap/pk11load.c	30 Apr 2010 07:22:54 -0000	1.30
++++ mozilla/security/nss/lib/pk11wrap/pk11load.c	9 Aug 2010 22:29:26 -0000
 @@ -344,46 +344,54 @@ SECMOD_SetRootCerts(PK11SlotInfo *slot, 
  	   mod->slotInfo = psi_list;
  	   mod->slotInfoCount++;
@@ -422,7 +422,7 @@
       * mod->loaded = PR_FALSE; */
      if (mod->internal) {
 +#if 0  /* STATIC LIBRARIES */
-         if (0 == PR_AtomicDecrement(&softokenLoadCount)) {
+         if (0 == PR_ATOMIC_DECREMENT(&softokenLoadCount)) {
            if (softokenLib) {
                disableUnload = PR_GetEnv("NSS_DISABLE_UNLOAD");
                if (!disableUnload) {
@@ -448,7 +448,7 @@
 retrieving revision 1.13
 diff -p -u -8 -r1.13 lgglue.c
 --- mozilla/security/nss/lib/softoken/lgglue.c	16 Apr 2009 18:19:26 -0000	1.13
-+++ mozilla/security/nss/lib/softoken/lgglue.c	9 Jan 2010 03:02:23 -0000
++++ mozilla/security/nss/lib/softoken/lgglue.c	9 Aug 2010 22:29:26 -0000
 @@ -50,16 +50,17 @@
  
  static LGOpenFunc legacy_glue_open = NULL;
@@ -573,7 +573,7 @@
 retrieving revision 1.4
 diff -p -u -8 -r1.4 lgglue.h
 --- mozilla/security/nss/lib/softoken/lgglue.h	16 Apr 2009 18:19:26 -0000	1.4
-+++ mozilla/security/nss/lib/softoken/lgglue.h	9 Jan 2010 03:02:23 -0000
++++ mozilla/security/nss/lib/softoken/lgglue.h	9 Aug 2010 22:29:26 -0000
 @@ -65,16 +65,35 @@ typedef SECStatus (*LGDeleteSecmodFunc)(
  			const char *dbname, char *params, PRBool rw);
  typedef SECStatus (*LGAddSecmodFunc)(const char *appName, 
@@ -616,7 +616,7 @@
 retrieving revision 1.23
 diff -p -u -8 -r1.23 secport.h
 --- mozilla/security/nss/lib/util/secport.h	30 Oct 2009 09:44:47 -0000	1.23
-+++ mozilla/security/nss/lib/util/secport.h	9 Jan 2010 03:02:23 -0000
++++ mozilla/security/nss/lib/util/secport.h	9 Aug 2010 22:29:26 -0000
 @@ -238,16 +238,17 @@ sec_port_iso88591_utf8_conversion_functi
    unsigned int maxOutBufLen,
    unsigned int *outBufLen