8 files changed, 63 insertions, 47 deletions

diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
index 2385fd3b9d..5733bb068f 100644
--- a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
+++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
@@ -1,21 +1,21 @@
-From 46ab1ca6e6fb8e1196e0665a54506dff370f8f2a Mon Sep 17 00:00:00 2001
+From c15470d6b52986a8e41f9be4579c88ed80413b44 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 22 Feb 2017 11:36:11 +0200
 Subject: [PATCH] nss: fix support cross compiling
 
 Let some make variables be assigned from outside makefile.
 
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [oe specific]
+
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
-
 ---
  nss/coreconf/arch.mk    | 4 ++--
  nss/lib/freebl/Makefile | 6 ++++++
  2 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
-index 17e9fae..bc4180a 100644
+index 711d19d..a163d24 100644
 --- a/nss/coreconf/arch.mk
 +++ b/nss/coreconf/arch.mk
 @@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
@@ -33,7 +33,7 @@ index 17e9fae..bc4180a 100644
  
  
 diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index eeee90a..7ee8736 100644
+index e744314..0ebfc92 100644
 --- a/nss/lib/freebl/Makefile
 +++ b/nss/lib/freebl/Makefile
 @@ -36,6 +36,12 @@ ifdef USE_64
@@ -49,3 +49,6 @@ index eeee90a..7ee8736 100644
  ifdef USE_ABI32_FPU
         DEFINES += -DNSS_USE_ABI32_FPU
  endif
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch
index 8c715cc447..19fa5a7261 100644
--- a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
+++ b/meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch
@@ -1,11 +1,11 @@
-From 73edfbdf33fe4e41724e7e947033d8caeec8f3d0 Mon Sep 17 00:00:00 2001
+From 621023bc696d3d26a4179dbbafb42d79bef1faf9 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
 Subject: [PATCH] nss:no rpath for cross compiling
 
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [oe specific]
 
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 ---
  nss/cmd/platlibs.mk | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
@@ -26,3 +26,6 @@ index 6401778..e5c4e16 100644
  endif
  endif
  
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch
index 735b06b5ca..61b7565739 100644
--- a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
+++ b/meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch
@@ -1,14 +1,14 @@
-From 2ce67b1f4b1f582d556ae058da10698bbaa0edc1 Mon Sep 17 00:00:00 2001
+From 6aec640342088498cb1b0a2e395eb3da297a48b4 Mon Sep 17 00:00:00 2001
 From: Ovidiu Panait <ovidiu.panait@windriver.com>
 Date: Mon, 13 Jul 2020 12:12:31 +0300
 Subject: [PATCH] nss: fix incorrect shebang of perl
 
 Replace incorrect shebang of perl with `#!/usr/bin/env perl'.
 
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
 Upstream-Status: Pending
-Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
 ---
  nss/cmd/signver/examples/1/form.pl       | 2 +-
  nss/cmd/signver/examples/1/signedForm.pl | 2 +-
@@ -89,3 +89,6 @@ index f29f60a..850332a 100755
  
  ########################################################################
  #
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch
index 4c9bea30c0..fa4c5bacbf 100644
--- a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
+++ b/meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch
@@ -1,7 +1,7 @@
-From f613c9a9107435a40d91329f33f12cfb16927f07 Mon Sep 17 00:00:00 2001
+From 72c3150300975524bb0001b5a731f077852c95ab Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
-Subject: [PATCH] nss,nspr: Add recipes
+Subject: [PATCH] nss: disable Wvarargs with clang
 
 clang 3.9 add this warning to rightly flag undefined
 behavior, we relegate this to be just a warning instead
@@ -20,9 +20,9 @@ see
 https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start
 for more details
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  nss/coreconf/Werror.mk | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -40,3 +40,6 @@ index a569a49..687fe58 100644
        # -Wno-parentheses-equality : because clang warns about macro expansions
        WARNING_CFLAGS += $(call disable_warning,parentheses-equality)
        ifdef BUILD_OPT
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch
index 589b4d5e7f..f12a278ef2 100644
--- a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch
+++ b/meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch
@@ -1,22 +1,22 @@
-From cbd367160338847b28fc801a12c74f1c8b5b03ee Mon Sep 17 00:00:00 2001
+From 5935755eef43ac7cb8f4567e7bed5892180f954c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
-Subject: [PATCH] nss does not build on mips with clang because wrong types are
- used?
+Subject: [PATCH] nss: does not build on mips with clang because wrong types
+ are used
 
 pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
      if (addend < MP_DIGIT_MAX) {
        ~~~~~~ ^ ~~~~~~~~~~~~
 
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
 Upstream-Status: Pending
 
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
 ---
  nss/lib/freebl/pqg.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c
-index 1b03278..ad895b7 100644
+index 62d46b5..8c8665d 100644
 --- a/nss/lib/freebl/pqg.c
 +++ b/nss/lib/freebl/pqg.c
 @@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H)
@@ -30,3 +30,6 @@ index 1b03278..ad895b7 100644
            SECItem *seedout)
  {
      mp_int s, sum, modulus, tmp;
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch
index a1897f88d8..afe11821af 100644
--- a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
+++ b/meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch
@@ -1,4 +1,4 @@
-From f9b2b1c738576a17460aebd005f511f427aa1974 Mon Sep 17 00:00:00 2001
+From 895e76e75dbb993a8f445072c190a9db4ee50d15 Mon Sep 17 00:00:00 2001
 From: Wenzong Fan <wenzong.fan@windriver.com>
 Date: Sat, 7 Mar 2020 08:34:02 -0800
 Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit
@@ -15,17 +15,15 @@ on host to install built files, it doesn't need any cross-compling or
 multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this
 error.
 
-Upstream-Status: Inappropriate [configuration]
+Upstream-Status: Inappropriate [oe specific]
 
 Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
-===================================================
-
 ---
  nss/coreconf/nsinstall/Makefile | 7 +++++++
  1 file changed, 7 insertions(+)
 
 diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
-index 08dfbc2..e97fb5f 100644
+index 337cbeb..dd77fbe 100644
 --- a/nss/coreconf/nsinstall/Makefile
 +++ b/nss/coreconf/nsinstall/Makefile
 @@ -18,6 +18,13 @@ INTERNAL_TOOLS  = 1
@@ -39,6 +37,9 @@ index 08dfbc2..e97fb5f 100644
 +LDFLAGS =
 +# CFLAGS =
 +
- ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
+ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  PROGRAM                =
  TARGETS                =
+-- 
+2.25.1
+
diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
index b7f1b01a14..63f822be25 100644
--- a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
+++ b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
@@ -1,4 +1,4 @@
-From 7c8f367faf8848a43a414079189e10270d6c0fcc Mon Sep 17 00:00:00 2001
+From 459ee39104228a958a0999e1a7d4c43e4e6fe4f0 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 18 Dec 2019 12:29:50 +0100
 Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
@@ -7,15 +7,15 @@ Not all current hardware supports it, particularly anything
 prior to armv8 does not.
 
 Upstream-Status: Pending
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
 ---
  nss/lib/freebl/Makefile | 3 +++
  nss/lib/freebl/gcm.c    | 2 ++
  2 files changed, 5 insertions(+)
 
 diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index 7ee8736..f9b4925 100644
+index 0ebfc92..3ee7623 100644
 --- a/nss/lib/freebl/Makefile
 +++ b/nss/lib/freebl/Makefile
 @@ -142,6 +142,8 @@ endif
@@ -33,10 +33,10 @@ index 7ee8736..f9b4925 100644
  endif
 +endif
  
- ifeq (OS2,$(OS_TARGET))
-     ASFILES  = mpi_x86_os2.s
+ ifeq (,$(filter-out WINNT,$(OS_TARGET)))
+ ifndef USE_64
 diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
-index 2dae724..9ee7fc8 100644
+index a2f63a6..743158e 100644
 --- a/nss/lib/freebl/gcm.c
 +++ b/nss/lib/freebl/gcm.c
 @@ -18,6 +18,7 @@
@@ -53,5 +53,5 @@ index 2dae724..9ee7fc8 100644
  #endif
 +#endif
  
- /* Forward declarations */
- SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
+ #if defined(__ARM_NEON) || defined(__ARM_NEON__)
+ #include <arm_neon.h>
diff --git a/meta-oe/recipes-support/nss/nss_3.98.bb b/meta-oe/recipes-support/nss/nss_3.112.bb
index 01501362e2..cf0b20d48b 100644
--- a/meta-oe/recipes-support/nss/nss_3.98.bb
+++ b/meta-oe/recipes-support/nss/nss_3.112.bb
@@ -22,21 +22,21 @@ VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '
 
 SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \
            file://nss.pc.in \
-           file://0001-nss-fix-support-cross-compiling.patch \
-           file://nss-no-rpath-for-cross-compiling.patch \
-           file://nss-fix-incorrect-shebang-of-perl.patch \
-           file://disable-Wvarargs-with-clang.patch \
-           file://pqg.c-ULL_addend.patch \
            file://blank-cert9.db \
            file://blank-key4.db \
            file://system-pkcs11.txt \
-           file://nss-fix-nsinstall-build.patch \
-           file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
+           file://0001-nss-fix-support-cross-compiling.patch \
+           file://0002-nss-no-rpath-for-cross-compiling.patch \
+           file://0003-nss-fix-incorrect-shebang-of-perl.patch \
+           file://0004-nss-disable-Wvarargs-with-clang.patch \
+           file://0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch  \
+           file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \
+           file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
            "
-SRC_URI[sha256sum] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce"
+SRC_URI[sha256sum] = "33ae72d43b275957252adc8639e84229d3ae692a57b6191b059d9456b8568a68"
 
-UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
-UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
+UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/"
+UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)"
 
 inherit siteinfo
 
@@ -224,7 +224,7 @@ do_install:append() {
     done
 
     install -d ${D}${libdir}/pkgconfig/
-    sed 's/%NSS_VERSION%/${PV}/' ${WORKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc
+    sed 's/%NSS_VERSION%/${PV}/' ${UNPACKDIR}/nss.pc.in | sed 's/%NSPR_VERSION%/4.9.2/' > ${D}${libdir}/pkgconfig/nss.pc
     sed -i s:OEPREFIX:${prefix}:g ${D}${libdir}/pkgconfig/nss.pc
     sed -i s:OEEXECPREFIX:${exec_prefix}:g ${D}${libdir}/pkgconfig/nss.pc
     sed -i s:OELIBDIR:${libdir}:g ${D}${libdir}/pkgconfig/nss.pc
@@ -239,9 +239,9 @@ do_install:append:class-target() {
     # databases by:
     # certutil -N -d sql:/database/path/ --empty-password
     install -d ${D}${sysconfdir}/pki/nssdb/
-    install -m 0644 ${WORKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db
-    install -m 0644 ${WORKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db
-    install -m 0644 ${WORKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt
+    install -m 0644 ${UNPACKDIR}/blank-cert9.db ${D}${sysconfdir}/pki/nssdb/cert9.db
+    install -m 0644 ${UNPACKDIR}/blank-key4.db ${D}${sysconfdir}/pki/nssdb/key4.db
+    install -m 0644 ${UNPACKDIR}/system-pkcs11.txt ${D}${sysconfdir}/pki/nssdb/pkcs11.txt
 }
 
 PACKAGE_WRITE_DEPS += "nss-native"