external/nss/nss-more-static.patch

   1 --- a/a/nss/lib/freebl/loader.c
   2 +++ a/a/nss/lib/freebl/loader.c
   3 @@ -114,6 +114,7 @@
   4
   5  #include "genload.c"
   6
   7 +extern FREEBLGetVectorFn FREEBL_GetVector;
   8  /* This function must be run only once. */
   9  /*  determine if hybrid platform, then actually load the DSO. */
  10  static PRStatus
  11 @@ -136,9 +136,9 @@
  12      return PR_FAILURE;
  13    }
  14
  15 -  handle = loader_LoadLibrary(name);
  16 -  if (handle) {
  17 -    PRFuncPtr address = PR_FindFunctionSymbol(handle, "FREEBL_GetVector");
  18 +  handle = 0;
  19 +  {
  20 +    PRFuncPtr address = FREEBL_GetVector;
  21      PRStatus status;
  22      if (address) {
  23        FREEBLGetVectorFn  * getVector = (FREEBLGetVectorFn *)address;
  24 @@ -887,6 +887,7 @@
  25  void
  26  BL_Unload(void)
  27  {
  28 +#if 0
  29    /* This function is not thread-safe, but doesn't need to be, because it is
  30     * only called from functions that are also defined as not thread-safe,
  31     * namely C_Finalize in softoken, and the SSL bypass shutdown callback called
  32 @@ -905,6 +905,7 @@
  33        blLib = NULL;
  34    }
  35    loadFreeBLOnce = pristineCallOnce;
  36 +#endif
  37  }
  38
  39  /* ============== New for 3.003 =============================== */