[ptxdist] [PATCH] nss: Version bump. 3.102 -> 3.104

[Christian Melki <christian.melki@t2data.com>]

Bugfixes.
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_104.html

* Forward patches with minor fixes to make them apply.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 .../0001-nss-fix-nsinstall-build.patch                        | 4 ++--
 patches/{nss-3.102 => nss-3.104}/0002-add-nss.pc.in.patch     | 0
 .../0003-HACK-don-t-build-commands-that-need-zlib.patch       | 0
 .../0004-HACK-fix-parallel-building-issue.patch               | 4 ++--
 .../0005-fix-dependency-generation.patch                      | 4 ++--
 patches/{nss-3.102 => nss-3.104}/series                       | 0
 rules/nss.make                                                | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)
 rename patches/{nss-3.102 => nss-3.104}/0001-nss-fix-nsinstall-build.patch (93%)
 rename patches/{nss-3.102 => nss-3.104}/0002-add-nss.pc.in.patch (100%)
 rename patches/{nss-3.102 => nss-3.104}/0003-HACK-don-t-build-commands-that-need-zlib.patch (100%)
 rename patches/{nss-3.102 => nss-3.104}/0004-HACK-fix-parallel-building-issue.patch (93%)
 rename patches/{nss-3.102 => nss-3.104}/0005-fix-dependency-generation.patch (92%)
 rename patches/{nss-3.102 => nss-3.104}/series (100%)

diff --git a/patches/nss-3.102/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.104/0001-nss-fix-nsinstall-build.patch
similarity index 93%
rename from patches/nss-3.102/0001-nss-fix-nsinstall-build.patch
rename to patches/nss-3.104/0001-nss-fix-nsinstall-build.patch
index ec9c342b6..31820e74b 100644
--- a/patches/nss-3.102/0001-nss-fix-nsinstall-build.patch
+++ b/patches/nss-3.104/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 5061789ffebd..4e67f56cf0bc 100644
+index 337cbebd78e9..63a2dc566e9b 100644
 --- a/nss/coreconf/nsinstall/Makefile
 +++ b/nss/coreconf/nsinstall/Makefile
 @@ -18,6 +18,13 @@ INTERNAL_TOOLS  = 1
@@ -38,6 +38,6 @@ index 5061789ffebd..4e67f56cf0bc 100644
 +LDFLAGS =
 +CFLAGS = -DLINUX -Dlinux
 +
- ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
+ ifeq (,$(filter-out WIN%,$(OS_TARGET)))
  PROGRAM		=
  TARGETS		=
diff --git a/patches/nss-3.102/0002-add-nss.pc.in.patch b/patches/nss-3.104/0002-add-nss.pc.in.patch
similarity index 100%
rename from patches/nss-3.102/0002-add-nss.pc.in.patch
rename to patches/nss-3.104/0002-add-nss.pc.in.patch
diff --git a/patches/nss-3.102/0003-HACK-don-t-build-commands-that-need-zlib.patch b/patches/nss-3.104/0003-HACK-don-t-build-commands-that-need-zlib.patch
similarity index 100%
rename from patches/nss-3.102/0003-HACK-don-t-build-commands-that-need-zlib.patch
rename to patches/nss-3.104/0003-HACK-don-t-build-commands-that-need-zlib.patch
diff --git a/patches/nss-3.102/0004-HACK-fix-parallel-building-issue.patch b/patches/nss-3.104/0004-HACK-fix-parallel-building-issue.patch
similarity index 93%
rename from patches/nss-3.102/0004-HACK-fix-parallel-building-issue.patch
rename to patches/nss-3.104/0004-HACK-fix-parallel-building-issue.patch
index b4e5a9f00..dabe6c021 100644
--- a/patches/nss-3.102/0004-HACK-fix-parallel-building-issue.patch
+++ b/patches/nss-3.104/0004-HACK-fix-parallel-building-issue.patch
@@ -17,10 +17,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/nss/coreconf/rules.mk b/nss/coreconf/rules.mk
-index a341b8385ae4..2c0a7a3f30b1 100644
+index afd1b75b42d3..6b3862047e62 100644
 --- a/nss/coreconf/rules.mk
 +++ b/nss/coreconf/rules.mk
-@@ -373,8 +373,8 @@ endif
+@@ -367,8 +367,8 @@ endif
  define copy_varlist_into_dir_RULE
  ifdef $(2)
  ifneq (,$$(strip $$($(2))))
diff --git a/patches/nss-3.102/0005-fix-dependency-generation.patch b/patches/nss-3.104/0005-fix-dependency-generation.patch
similarity index 92%
rename from patches/nss-3.102/0005-fix-dependency-generation.patch
rename to patches/nss-3.104/0005-fix-dependency-generation.patch
index 1192da18b..d153dd473 100644
--- a/patches/nss-3.102/0005-fix-dependency-generation.patch
+++ b/patches/nss-3.104/0005-fix-dependency-generation.patch
@@ -18,10 +18,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 insertions(+)
 
 diff --git a/nss/coreconf/rules.mk b/nss/coreconf/rules.mk
-index 2c0a7a3f30b1..a188881df94b 100644
+index 6b3862047e62..37c717f506b7 100644
 --- a/nss/coreconf/rules.mk
 +++ b/nss/coreconf/rules.mk
-@@ -191,6 +191,8 @@ ifeq ($(OS_ARCH),WINNT)
+@@ -185,6 +185,8 @@ ifeq ($(OS_ARCH),WINNT)
  $(IMPORT_LIBRARY): $(SHARED_LIBRARY)
  endif
  
diff --git a/patches/nss-3.102/series b/patches/nss-3.104/series
similarity index 100%
rename from patches/nss-3.102/series
rename to patches/nss-3.104/series
diff --git a/rules/nss.make b/rules/nss.make
index 253c2e1c4..e919bf61f 100644
--- a/rules/nss.make
+++ b/rules/nss.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss
 #
 # Paths and names
 #
-NSS_VERSION	:= 3.102
-NSS_MD5		:= 2e5666d6e33789d38115e5abeceb5bb2
+NSS_VERSION	:= 3.104
+NSS_MD5		:= 031cfed208aad1030cbe8cb163f0e298
 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)
-- 
2.34.1