nss: version bump 3.47 -> 3.51

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

5 files changed, 3 insertions, 44 deletions

diff --git a/patches/nss-3.47/0004-fix-building-on-ARM.patch b/patches/nss-3.47/0004-fix-building-on-ARM.patch
deleted file mode 100644
index 8f1e087d2..000000000
--- a/patches/nss-3.47/0004-fix-building-on-ARM.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Fri, 1 Nov 2019 16:58:55 +0100
-Subject: [PATCH] fix building on ARM
-
-The build-system currently assumes that 'arm' is ARMv8 as well. This is
-completely broken. Fix it by ensuring, that ARMv8 code is only build for
-aarch64.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- nss/lib/freebl/Makefile | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index 5943fb377894..53bf55b57fc8 100644
---- a/nss/lib/freebl/Makefile
-+++ b/nss/lib/freebl/Makefile
-@@ -123,22 +123,6 @@ ifeq ($(CPU_ARCH),aarch64)
-     DEFINES += -DUSE_HW_AES
-     EXTRA_SRCS += aes-armv8.c gcm-aarch64.c
- endif
--ifeq ($(CPU_ARCH),arm)
--    ifdef CC_IS_CLANG
--        DEFINES += -DUSE_HW_AES
--        EXTRA_SRCS += aes-armv8.c
--    else ifeq (1,$(CC_IS_GCC))
--        # Old compiler doesn't support ARM AES.
--        ifneq (,$(filter 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
--            DEFINES += -DUSE_HW_AES
--            EXTRA_SRCS += aes-armv8.c
--        endif
--        ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
--            DEFINES += -DUSE_HW_AES
--            EXTRA_SRCS += aes-armv8.c
--        endif
--    endif
--endif
- 
- ifeq ($(OS_TARGET),OSF1)
-     DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
diff --git a/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.51/0001-nss-fix-nsinstall-build.patch
index ab3f9133e..70223903a 100644
--- a/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch
+++ b/patches/nss-3.51/0001-nss-fix-nsinstall-build.patch
@@ -24,7 +24,7 @@ Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
  1 file changed, 7 insertions(+)
 
 diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
-index 1850bcb93cf7..75297de39ce1 100644
+index 1850bcb93cf7..1343262cc7c9 100644
 --- a/nss/coreconf/nsinstall/Makefile
 +++ b/nss/coreconf/nsinstall/Makefile
 @@ -18,6 +18,13 @@ INTERNAL_TOOLS  = 1
@@ -36,7 +36,7 @@ index 1850bcb93cf7..75297de39ce1 100644
 +# to clean the '-m64' from ARCHFLAG and LDFLAGS.
 +ARCHFLAG =
 +LDFLAGS =
-+CFLAGS =
++CFLAGS = -DLINUX -Dlinux
 +
  ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
  PROGRAM		=
diff --git a/patches/nss-3.47/0002-add-nss.pc.in.patch b/patches/nss-3.51/0002-add-nss.pc.in.patch
index addc805b5..addc805b5 100644
--- a/patches/nss-3.47/0002-add-nss.pc.in.patch
+++ b/patches/nss-3.51/0002-add-nss.pc.in.patch
diff --git a/patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch b/patches/nss-3.51/0003-HACK-don-t-build-the-commands.patch
index 568d8f751..568d8f751 100644
--- a/patches/nss-3.47/0003-HACK-don-t-build-the-commands.patch
+++ b/patches/nss-3.51/0003-HACK-don-t-build-the-commands.patch
diff --git a/patches/nss-3.47/series b/patches/nss-3.51/series
index 44a6b1e96..f7f38f3be 100644
--- a/patches/nss-3.47/series
+++ b/patches/nss-3.51/series
@@ -3,5 +3,4 @@
 0001-nss-fix-nsinstall-build.patch
 0002-add-nss.pc.in.patch
 0003-HACK-don-t-build-the-commands.patch
-0004-fix-building-on-ARM.patch
-# a74f505fdd783f123199d2e6f1a43c32  - git-ptx-patches magic
+# 5a106339b1aacb64732e0a72df6e0416  - git-ptx-patches magic