re-introduce old nss im too tired for this

security/nss/lib/libpkix/pkix_pl_nss/system/Makefile

@@ -26,6 +26,7 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (4) Include "local" platform-dependent assignments (OPTIONAL).      #
 #######################################################################
 
+include config.mk
 
 #######################################################################
 # (5) Execute "global" rules. (OPTIONAL)                              #
@@ -43,5 +44,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
+export:: private_export
 
 

security/nss/lib/libpkix/pkix_pl_nss/system/config.mk

@@ -0,0 +1,15 @@
+#
+# 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/.
+
+#
+#  Override TARGETS variable so that only static libraries
+#  are specifed as dependencies within rules.mk.
+#
+
+TARGETS        = $(LIBRARY)
+SHARED_LIBRARY =
+IMPORT_LIBRARY =
+PROGRAM        =
+

security/nss/lib/libpkix/pkix_pl_nss/system/manifest.mn

@@ -4,6 +4,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 CORE_DEPTH = ../../../..
 
+EXPORTS = \
+	$(NULL)
+
 PRIVATE_EXPORTS = \
 	pkix_pl_common.h \
 	pkix_pl_mem.h \
@@ -40,4 +43,4 @@ CSRCS = \
 	$(NULL)
 
 LIBRARY_NAME = pkixsystem
-SHARED_LIBRARY = $(NULL)
+

security/nss/lib/libpkix/pkix_pl_nss/system/pkix_pl_string.c

@@ -439,8 +439,7 @@ PKIX_PL_Sprintf(
 
                                 tempString = va_arg(args, PKIX_PL_String *);
                                 if (tempString != NULL) {
-                                        PKIX_CHECK_NO_GOTO(
-                                                PKIX_PL_String_GetEncoded
+                                        PKIX_CHECK(PKIX_PL_String_GetEncoded
                                                 ((PKIX_PL_String*)
                                                 tempString,
                                                 PKIX_ESCASCII,
@@ -448,12 +447,6 @@ PKIX_PL_Sprintf(
                                                 &dummyLen,
                                                 plContext),
                                                 PKIX_STRINGGETENCODEDFAILED);
-                                        /* need to cleanup var args before
-                                         * we ditch out to cleanup. */
-                                        if (pkixErrorResult) {
-                                            va_end(args);
-                                            goto cleanup;
-                                        }
                                 } else {
                                         /* there may be a NULL in var_args */
                                         pArg = NULL;