~chrisccoulson/nss/nss-3.12.5

## 85_security_load.patch by Mike Hommey <glandium@debian.org>

##

## All lines beginning with `## DP:' are a description of the patch.

## DP: Load modules from $ORIGIN/nss.

Index: nss-3.12.6/mozilla/security/nss/cmd/shlibsign/shlibsign.c

===================================================================

--- nss-3.12.6.orig/mozilla/security/nss/cmd/shlibsign/shlibsign.c	2008-11-20 15:44:12.000000000 +0000

+++ nss-3.12.6/mozilla/security/nss/cmd/shlibsign/shlibsign.c	2010-03-29 12:06:03.560531797 +0100

@@ -769,6 +769,8 @@

     libname = PR_GetLibraryName(NULL, "softokn3");

     assert(libname != NULL);

     lib = PR_LoadLibrary(libname);

+    if (!lib)

+        lib = PR_LoadLibrary("/usr/lib/nss/libsoftokn3.so");

     assert(lib != NULL);

     PR_FreeLibraryName(libname);

Index: nss-3.12.6/mozilla/security/nss/lib/pk11wrap/pk11load.c

===================================================================

--- nss-3.12.6.orig/mozilla/security/nss/lib/pk11wrap/pk11load.c	2009-10-30 09:44:45.000000000 +0000

+++ nss-3.12.6/mozilla/security/nss/lib/pk11wrap/pk11load.c	2010-03-29 12:14:42.600534017 +0100

@@ -393,6 +393,7 @@

     SECStatus rv;

     PRBool alreadyLoaded = PR_FALSE;

     char *disableUnload = NULL;

+    char * tmp;

     if (mod->loaded) return SECSuccess;

@@ -440,6 +441,16 @@

 	 * unload the library if anything goes wrong from here on out...

 	 */

 	library = PR_LoadLibrary(full_name);

+	if (library == NULL) {

+            tmp = rindex(full_name, PR_GetDirectorySeparator());

+            if (tmp)

+                tmp++;

+            else

+                tmp = full_name;

+            library = PORT_LoadLibraryFromOrigin(my_shlib_name,

+                                      (PRFuncPtr) &softoken_LoadDSO,

+                                      tmp);

+	}

 	mod->library = (void *)library;

 	PORT_Free(full_name);

Index: nss-3.12.6/mozilla/security/nss/lib/util/secload.c

===================================================================

--- nss-3.12.6.orig/mozilla/security/nss/lib/util/secload.c	2009-10-30 09:44:47.000000000 +0000

+++ nss-3.12.6/mozilla/security/nss/lib/util/secload.c	2010-03-29 12:06:03.560531797 +0100

@@ -104,9 +104,14 @@

     /* Remove the trailing filename from referencePath and add the new one */

     c = strrchr(referencePath, PR_GetDirectorySeparator());

+    if (!c) { /* referencePath doesn't contain a / means that dladdr gave us argv[0]

+               * and program was called from $PATH. Hack to get libs from /usr/lib */

+        referencePath = "/usr/lib/";

+        c = &referencePath[8]; /* last / */

+    }

     if (c) {

         size_t referencePathSize = 1 + c - referencePath;

-        fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 1);

+        fullName = (char*) PORT_Alloc(strlen(name) + referencePathSize + 5);

         if (fullName) {

             memcpy(fullName, referencePath, referencePathSize);

             strcpy(fullName + referencePathSize, name); 

@@ -116,6 +121,12 @@

 #endif

             libSpec.type = PR_LibSpec_Pathname;

             libSpec.value.pathname = fullName;

+            if ((referencePathSize >= 4) &&

+                (strncmp(fullName + referencePathSize - 4, "bin", 3) == 0)) {

+                memcpy(fullName + referencePathSize -4, "lib", 3);

+            }

+            strcpy(fullName + referencePathSize, "nss/");

+            strcpy(fullName + referencePathSize + 4, name);

             dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL

 #ifdef PR_LD_ALT_SEARCH_PATH

             /* allow library's dependencies to be found in the same directory

@@ -123,6 +134,10 @@

                                           | PR_LD_ALT_SEARCH_PATH 

 #endif

                                           );

+            if (! dlh) {

+                strcpy(fullName + referencePathSize, name);

+                dlh = PR_LoadLibraryWithFlags(libSpec, PR_LD_NOW | PR_LD_LOCAL);

+            }

             PORT_Free(fullName);

         }

     }