nss: Add upstream patches to fix the build with clang

Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>

3 files changed, 99 insertions, 0 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-support/nss/nss/0001-Bug-1661378-pkix-Do-not-use-NULL-where-0-is-needed.patch b/dynamic-layers/openembedded-layer/recipes-support/nss/nss/0001-Bug-1661378-pkix-Do-not-use-NULL-where-0-is-needed.patch
new file mode 100644
index 0000000..65158b3
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/nss/nss/0001-Bug-1661378-pkix-Do-not-use-NULL-where-0-is-needed.patch
@@ -0,0 +1,44 @@
+From b2ad4a0d31083a5fc1dbfb65b51bff14b2b7942f Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 2 Sep 2020 10:45:48 -0700
+Subject: [PATCH] Bug 1661378 - pkix: Do not use NULL where 0 is needed Clang
+ finds this error
+
+pkix_logger.c:316:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast]
+        logger->logComponent = (PKIX_ERRORCLASS)NULL;
+                               ^~~~~~~~~~~~~~~~~~~~~
+pkix_logger.c:617:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast]
+        logger->logComponent = (PKIX_ERRORCLASS)NULL;
+                               ^~~~~~~~~~~~~~~~~~~~~
+2 errors generated.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/nss/libpkix/pkix/util/pkix_logger.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/nss/lib/nss/libpkix/pkix/util/pkix_logger.c b/nss/lib/libpkix/pkix/util/pkix_logger.c
+index a916e6e4f..10f537a31 100644
+--- a/nss/lib/nss/libpkix/pkix/util/pkix_logger.c
++++ b/nss/lib/libpkix/pkix/util/pkix_logger.c
+@@ -313,7 +313,7 @@ pkix_Logger_Destroy(
+ 
+         logger->callback = NULL;
+         PKIX_DECREF(logger->context);
+-        logger->logComponent = (PKIX_ERRORCLASS)NULL;
++        logger->logComponent = (PKIX_ERRORCLASS)0;
+ 
+ cleanup:
+ 
+@@ -614,7 +614,7 @@ PKIX_Logger_Create(
+ 
+         logger->callback = callback;
+         logger->maxLevel = 0;
+-        logger->logComponent = (PKIX_ERRORCLASS)NULL;
++        logger->logComponent = (PKIX_ERRORCLASS)0;
+ 
+         PKIX_INCREF(loggerContext);
+         logger->context = loggerContext;
+-- 
+2.41.0
+
diff --git a/dynamic-layers/openembedded-layer/recipes-support/nss/nss/0001-Bug-1738028-avoid-a-clang-13-unused-variable-warning.patch b/dynamic-layers/openembedded-layer/recipes-support/nss/nss/0001-Bug-1738028-avoid-a-clang-13-unused-variable-warning.patch
new file mode 100644
index 0000000..ff7829e
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/nss/nss/0001-Bug-1738028-avoid-a-clang-13-unused-variable-warning.patch
@@ -0,0 +1,49 @@
+Upstream-status: Backport
+
+The warnings below are actual errors when building.
+
+Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
+---
+From 99c69dc3ca363ce9ff909531f8581252189905d0 Mon Sep 17 00:00:00 2001
+From: "John M. Schanck" <jschanck@mozilla.com>
+Date: Mon, 13 Dec 2021 16:35:17 +0000
+Subject: [PATCH] Bug 1738028: avoid a clang 13 unused variable warning in opt
+ build. r=bbeurdouche
+
+Differential Revision: https://phabricator.services.mozilla.com/D130309
+
+--HG--
+extra : moz-landing-system : lando
+---
+ lib/certhigh/certvfypkix.c | 2 ++
+ lib/freebl/shvfy.c         | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/nss/lib/certhigh/certvfypkix.c b/nss/lib/certhigh/certvfypkix.c
+index 95d88b53f..7c8784f4e 100644
+--- a/nss/lib/certhigh/certvfypkix.c
++++ b/nss/lib/certhigh/certvfypkix.c
+@@ -817,6 +817,8 @@ cert_PkixErrorToNssCode(
+     void *plContext)
+ {
+     int errLevel = 0;
++    (void)errLevel; /* Suppress unused var warning (Bug 1738028) */
++
+     PKIX_Int32 nssErr = 0;
+     PKIX_Error *errPtr = error;
+ 
+diff --git a/nss/lib/freebl/shvfy.c b/nss/lib/freebl/shvfy.c
+index da42467fd..0428bf6c0 100644
+--- a/nss/lib/freebl/shvfy.c
++++ b/nss/lib/freebl/shvfy.c
+@@ -335,6 +335,7 @@ blapi_SHVerifyFile(const char *shName, PRBool self)
+     SECStatus rv;
+     DSAPublicKey key;
+     int count;
++    (void)count; /* Suppress unused var warning (Bug 1738028) */
+ #ifdef FREEBL_USE_PRELINK
+     int pid = 0;
+ #endif
+-- 
+2.41.0
+
diff --git a/dynamic-layers/openembedded-layer/recipes-support/nss/nss_3.51.1.bbappend b/dynamic-layers/openembedded-layer/recipes-support/nss/nss_3.51.1.bbappend
new file mode 100644
index 0000000..a4731ff
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-support/nss/nss_3.51.1.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI:append:toolchain-clang = "\
+file://0001-Bug-1738028-avoid-a-clang-13-unused-variable-warning.patch \
+file://0001-Bug-1661378-pkix-Do-not-use-NULL-where-0-is-needed.patch \
+"