nss.patch

diff --git a/nspr/pr/include/md/_linux.h b/nspr/pr/include/md/_linux.h
index ad57d08..19fee25 100644
--- a/nspr/pr/include/md/_linux.h
+++ b/nspr/pr/include/md/_linux.h
@@ -94,11 +94,9 @@
 /*
  * Elf linux supports dl* functions
  */
-#define HAVE_DLL
-#define USE_DLFCN
-#if defined(ANDROID)
-#define NO_DLOPEN_NULL
-#endif
+#undef HAVE_DLL
+#undef USE_DLFCN
+#undef NO_DLOPEN_NULL
 
 #if defined(__FreeBSD_kernel__) || defined(__GNU__)
 #define _PR_HAVE_SOCKADDR_LEN
diff --git a/nss/cmd/certutil/certutil.gyp b/nss/cmd/certutil/certutil.gyp
index d8f1b5d..c147dfd 100644
--- a/nss/cmd/certutil/certutil.gyp
+++ b/nss/cmd/certutil/certutil.gyp
@@ -18,15 +18,20 @@
       'dependencies': [
         '<(DEPTH)/exports.gyp:dbm_exports',
         '<(DEPTH)/exports.gyp:nss_exports'
-      ]
+      ],
     }
   ],
   'target_defaults': {
     'defines': [
-      'NSPR20'
+      'NSPR20',
+      'SECKEY_PQGParamsTemplate=certutil_SECKEY_PQGParamsTemplate',
+      'CERT_OidSeqTemplate=certutil_CERT_OidSeqTemplate',
+    ],
+    'ldflags': [
+      '-static'
     ]
   },
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/nss/cmd/platlibs.gypi b/nss/cmd/platlibs.gypi
index 9963bdd..0fac8e4 100644
--- a/nss/cmd/platlibs.gypi
+++ b/nss/cmd/platlibs.gypi
@@ -12,7 +12,6 @@
     'conditions': [
       ['moz_fold_libs==0', {
         'dependencies': [
-          '<(DEPTH)/lib/util/util.gyp:nssutil3',
         ],
       }],
       ['<(use_static_libs)==1', {
@@ -25,15 +24,16 @@
           '<(DEPTH)/lib/pkcs7/pkcs7.gyp:pkcs7',
           '<(DEPTH)/lib/certhigh/certhigh.gyp:certhi',
           '<(DEPTH)/lib/cryptohi/cryptohi.gyp:cryptohi',
-          '<(DEPTH)/lib/pk11wrap/pk11wrap.gyp:pk11wrap',
-          '<(DEPTH)/lib/softoken/softoken.gyp:softokn',
+          '<(DEPTH)/lib/pk11wrap/pk11wrap.gyp:pk11wrap_static',
+          '<(DEPTH)/lib/softoken/softoken.gyp:softokn_static',
           '<(DEPTH)/lib/certdb/certdb.gyp:certdb',
           '<(DEPTH)/lib/pki/pki.gyp:nsspki',
           '<(DEPTH)/lib/dev/dev.gyp:nssdev',
           '<(DEPTH)/lib/base/base.gyp:nssb',
           '<(DEPTH)/lib/freebl/freebl.gyp:freebl',
-          '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite3',
+          '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite',
           '<(DEPTH)/lib/libpkix/libpkix.gyp:libpkix',
+          '<(DEPTH)/lib/util/util.gyp:nssutil',
         ],
         'conditions': [
           [ 'disable_dbm==0', {
@@ -49,6 +49,7 @@
                 '<(DEPTH)/lib/ssl/ssl.gyp:ssl3',
                 '<(DEPTH)/lib/smime/smime.gyp:smime3',
                 '<(DEPTH)/lib/nss/nss.gyp:nss3',
+                '<(DEPTH)/lib/util/util.gyp:nssutil3',
               ],
             }, {
               'libraries': [
diff --git a/nss/lib/softoken/softoken.gyp b/nss/lib/softoken/softoken.gyp
index 83413a0..425986a 100644
--- a/nss/lib/softoken/softoken.gyp
+++ b/nss/lib/softoken/softoken.gyp
@@ -35,7 +35,7 @@
       'dependencies': [
         'softokn_base',
         '<(DEPTH)/exports.gyp:nss_exports',
-        '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite3',
+        '<(DEPTH)/lib/sqlite/sqlite.gyp:sqlite',
         '<(DEPTH)/lib/freebl/freebl.gyp:freebl',
       ]
     },
diff --git a/nss/lib/sqlite/sqlite.gyp b/nss/lib/sqlite/sqlite.gyp
index 6a9ab3a..244db9b 100644
--- a/nss/lib/sqlite/sqlite.gyp
+++ b/nss/lib/sqlite/sqlite.gyp
@@ -27,7 +27,7 @@
           ]
         },
         {
-          'target_name': 'sqlite3',
+          'target_name': 'sqlite3-undef',
           'type': 'shared_library',
           'dependencies': [
             'sqlite'