ddd3e93eae
Too much changes to list them, just enjoy it. Thanks to the ones who tested the betas/rc. ok jasper@
31 lines
1.4 KiB
Plaintext
31 lines
1.4 KiB
Plaintext
$OpenBSD: patch-services_crypto_modules_WeaveCrypto_js,v 1.1 2011/03/30 21:39:14 landry Exp $
|
|
Fix libnss3 opening
|
|
--- services/crypto/modules/WeaveCrypto.js.orig Thu Mar 3 23:11:56 2011
|
|
+++ services/crypto/modules/WeaveCrypto.js Thu Mar 10 15:39:43 2011
|
|
@@ -133,20 +133,19 @@ WeaveCrypto.prototype = {
|
|
Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports);
|
|
|
|
// Open the NSS library.
|
|
- let path = ctypes.libraryName("nss3");
|
|
+ let path = '${LOCALBASE}/lib/libnss3.so';
|
|
|
|
// XXX really want to be able to pass specific dlopen flags here.
|
|
var nsslib;
|
|
try {
|
|
- this.log("Trying NSS library without path");
|
|
+ this.log("Trying NSS library with path " + path);
|
|
nsslib = ctypes.open(path);
|
|
} catch(e) {
|
|
// In case opening the library without a full path fails,
|
|
// try again with a full path.
|
|
- let file = Services.dirsvc.get("GreD", Ci.nsILocalFile);
|
|
- file.append(path);
|
|
- this.log("Trying again with path " + file.path);
|
|
- nsslib = ctypes.open(file.path);
|
|
+ let path2 = '${LOCALBASE}/lib/libnss3.so.${NSS_SO_VERSION}';
|
|
+ this.log("Trying again with path " + path2);
|
|
+ nsslib = ctypes.open(path2);
|
|
}
|
|
|
|
this.log("Initializing NSS types and function declarations...");
|