nss: version bump 3.54 -> 3.58

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

8 files changed, 38 insertions, 28 deletions

diff --git a/patches/nss-3.54/0003-HACK-don-t-build-the-commands.patch b/patches/nss-3.54/0003-HACK-don-t-build-the-commands.patch
deleted file mode 100644
index 6588dae8c..000000000
--- a/patches/nss-3.54/0003-HACK-don-t-build-the-commands.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Mon, 15 Apr 2019 18:11:49 +0200
-Subject: [PATCH] HACK: don't build the commands
-
-They are not needed or installed and have zlib as extra dependency.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- nss/manifest.mn | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/nss/manifest.mn b/nss/manifest.mn
-index dada8abab094..671aa03fed18 100644
---- a/nss/manifest.mn
-+++ b/nss/manifest.mn
-@@ -10,7 +10,7 @@ IMPORTS =	nspr20/v4.8 \
- 
- RELEASE = nss
- 
--DIRS = coreconf lib cmd cpputil gtests
-+DIRS = coreconf lib cpputil gtests
- 
- lib: coreconf
- cmd: lib
diff --git a/patches/nss-3.54/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.58/0001-nss-fix-nsinstall-build.patch
index 6787295ce..6787295ce 100644
--- a/patches/nss-3.54/0001-nss-fix-nsinstall-build.patch
+++ b/patches/nss-3.58/0001-nss-fix-nsinstall-build.patch
diff --git a/patches/nss-3.54/0002-add-nss.pc.in.patch b/patches/nss-3.58/0002-add-nss.pc.in.patch
index addc805b5..addc805b5 100644
--- a/patches/nss-3.54/0002-add-nss.pc.in.patch
+++ b/patches/nss-3.58/0002-add-nss.pc.in.patch
diff --git a/patches/nss-3.58/0003-HACK-don-t-build-commands-that-need-zlib.patch b/patches/nss-3.58/0003-HACK-don-t-build-commands-that-need-zlib.patch
new file mode 100644
index 000000000..623e97076
--- /dev/null
+++ b/patches/nss-3.58/0003-HACK-don-t-build-commands-that-need-zlib.patch
@@ -0,0 +1,33 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 28 Oct 2020 12:08:39 +0100
+Subject: [PATCH] HACK: don't build commands that need zlib
+
+This avoids a zlib dependency. Skipping all commands no longer works:
+Otherwise secutil.h is not copied to dist/private/nss/ and building fails
+because it is needed by nss/lib/pk11wrap/pk11hpke.c.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ nss/cmd/manifest.mn | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/nss/cmd/manifest.mn b/nss/cmd/manifest.mn
+index 695177c9dccf..004c7f819198 100644
+--- a/nss/cmd/manifest.mn
++++ b/nss/cmd/manifest.mn
+@@ -67,7 +67,6 @@ NSS_SRCDIRS = \
+  rsapoptst \
+  sdrtest \
+  selfserv  \
+- signtool \
+  signver \
+  smimetools  \
+  ssltap  \
+@@ -77,7 +76,6 @@ NSS_SRCDIRS = \
+  tstclnt  \
+  vfychain \
+  vfyserv \
+- modutil \
+  $(NULL)
+ 
+ ifndef NSS_DISABLE_LIBPKIX
diff --git a/patches/nss-3.54/0004-HACK-fix-parallel-building-issue.patch b/patches/nss-3.58/0004-HACK-fix-parallel-building-issue.patch
index b2273008a..b2273008a 100644
--- a/patches/nss-3.54/0004-HACK-fix-parallel-building-issue.patch
+++ b/patches/nss-3.58/0004-HACK-fix-parallel-building-issue.patch
diff --git a/patches/nss-3.54/0005-fix-dependency-generation.patch b/patches/nss-3.58/0005-fix-dependency-generation.patch
index c97c3fb60..c97c3fb60 100644
--- a/patches/nss-3.54/0005-fix-dependency-generation.patch
+++ b/patches/nss-3.58/0005-fix-dependency-generation.patch
diff --git a/patches/nss-3.54/series b/patches/nss-3.58/series
index 740530c43..534d0d6d6 100644
--- a/patches/nss-3.54/series
+++ b/patches/nss-3.58/series
@@ -2,7 +2,7 @@
 #tag:base --start-number 1
 0001-nss-fix-nsinstall-build.patch
 0002-add-nss.pc.in.patch
-0003-HACK-don-t-build-the-commands.patch
+0003-HACK-don-t-build-commands-that-need-zlib.patch
 0004-HACK-fix-parallel-building-issue.patch
 0005-fix-dependency-generation.patch
-# 368d349ba2a6a8da375a3b8825a4b6f3  - git-ptx-patches magic
+# 51749efb4fc421b49999aad3745d75b9  - git-ptx-patches magic
diff --git a/rules/nss.make b/rules/nss.make
index 9364755f6..9a134387d 100644
--- a/rules/nss.make
+++ b/rules/nss.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss
 #
 # Paths and names
 #
-NSS_VERSION	:= 3.54
-NSS_MD5		:= f02eddf6aa8449187e7ffe1c8f470734
+NSS_VERSION	:= 3.58
+NSS_MD5		:= 0012ef80308f70e35ab1babc6153cee5
 NSS		:= nss-$(NSS_VERSION)
 NSS_SUFFIX	:= tar.gz
 NSS_URL		:= https://ftp.mozilla.org/pub/security/nss/releases/NSS_$(subst .,_,$(NSS_VERSION))_RTM/src/$(NSS).$(NSS_SUFFIX)
@@ -56,6 +56,7 @@ NSS_MAKE_ENV := \
 	NSS_USE_SYSTEM_SQLITE=1 \
 	NSS_ENABLE_ECC=1 \
 	NSS_DISABLE_ARM32_NEON=$(call ptx/ifdef, PTXCONF_ARCH_ARM_NEON,,1) \
+	NSS_DISABLE_AVX2=$(call ptx/ifdef, PTXCONF_ARCH_X86_64,,1) \
 	NSS_DISABLE_GTESTS=1 \
 	NSPR_INCLUDE_DIR=$(SYSROOT)/usr/include/nspr \
 	USE_64=$(call ptx/ifdef, PTXCONF_ARCH_LP64,1)