Replace NSS with Pale Moon's

security/nss/lib/ckfw/dbm/Makefile

@@ -4,6 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 include manifest.mn
-include config.mk
 include $(CORE_DEPTH)/coreconf/config.mk
+
+ifdef BUILD_IDG
+DEFINES += -DNSSDEBUG
+endif
+
 include $(CORE_DEPTH)/coreconf/rules.mk

security/nss/lib/ckfw/dbm/config.mk

@@ -1,8 +0,0 @@
-# 
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-ifdef BUILD_IDG
-DEFINES += -DNSSDEBUG
-endif

security/nss/lib/ckfw/dbm/db.c

@@ -392,19 +392,19 @@ nss_dbm_db_swap_type(
             return type_byte;
         case CKA_MODIFIABLE:
             return type_byte;
-        case CKA_NETSCAPE_URL:
+        case CKA_NSS_URL:
             return type_opaque;
-        case CKA_NETSCAPE_EMAIL:
+        case CKA_NSS_EMAIL:
             return type_opaque;
-        case CKA_NETSCAPE_SMIME_INFO:
+        case CKA_NSS_SMIME_INFO:
             return type_opaque;
-        case CKA_NETSCAPE_SMIME_TIMESTAMP:
+        case CKA_NSS_SMIME_TIMESTAMP:
             return type_opaque;
-        case CKA_NETSCAPE_PKCS8_SALT:
+        case CKA_NSS_PKCS8_SALT:
             return type_opaque;
-        case CKA_NETSCAPE_PASSWORD_CHECK:
+        case CKA_NSS_PASSWORD_CHECK:
             return type_opaque;
-        case CKA_NETSCAPE_EXPIRES:
+        case CKA_NSS_EXPIRES:
             return type_opaque;
         case CKA_TRUST_DIGITAL_SIGNATURE:
             return type_long;
@@ -436,9 +436,9 @@ nss_dbm_db_swap_type(
             return type_long;
         case CKA_TRUST_TIME_STAMPING:
             return type_long;
-        case CKA_NETSCAPE_DB:
+        case CKA_NSS_DB:
             return type_opaque;
-        case CKA_NETSCAPE_TRUST:
+        case CKA_NSS_TRUST:
             return type_opaque;
         default:
             return type_opaque;

security/nss/lib/ckfw/dbm/manifest.mn

@@ -21,5 +21,6 @@ CSRCS =		   \
 REQUIRES = dbm nspr
 
 LIBRARY_NAME = nssckdbm
+LIBRARY = $(NULL)
 
 EXTRA_SHARED_LIBS = -L$(DIST)/lib -lnssckfw -lnssb -ldbm -lnspr4 -lplc4 -lplds4