Bunch of changes.
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_124.html
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_125.html
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_126.html
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_127.html
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_128.html
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_129.html
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_130.html

* Forward patchset, slight offset adjustment.

Signed-off-by: Christian Melki <[email protected]>
---
 .../0001-nss-fix-nsinstall-build.patch                      | 0
 patches/{nss-3.123 => nss-3.130}/0002-add-nss.pc.in.patch   | 0
 .../0003-HACK-don-t-build-commands-that-need-zlib.patch     | 6 +++---
 .../0004-HACK-fix-parallel-building-issue.patch             | 0
 .../0005-fix-dependency-generation.patch                    | 0
 patches/{nss-3.123 => nss-3.130}/series                     | 0
 rules/nss.make                                              | 4 ++--
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename patches/{nss-3.123 => nss-3.130}/0001-nss-fix-nsinstall-build.patch 
(100%)
 rename patches/{nss-3.123 => nss-3.130}/0002-add-nss.pc.in.patch (100%)
 rename patches/{nss-3.123 => 
nss-3.130}/0003-HACK-don-t-build-commands-that-need-zlib.patch (87%)
 rename patches/{nss-3.123 => 
nss-3.130}/0004-HACK-fix-parallel-building-issue.patch (100%)
 rename patches/{nss-3.123 => nss-3.130}/0005-fix-dependency-generation.patch 
(100%)
 rename patches/{nss-3.123 => nss-3.130}/series (100%)

diff --git a/patches/nss-3.123/0001-nss-fix-nsinstall-build.patch 
b/patches/nss-3.130/0001-nss-fix-nsinstall-build.patch
similarity index 100%
rename from patches/nss-3.123/0001-nss-fix-nsinstall-build.patch
rename to patches/nss-3.130/0001-nss-fix-nsinstall-build.patch
diff --git a/patches/nss-3.123/0002-add-nss.pc.in.patch 
b/patches/nss-3.130/0002-add-nss.pc.in.patch
similarity index 100%
rename from patches/nss-3.123/0002-add-nss.pc.in.patch
rename to patches/nss-3.130/0002-add-nss.pc.in.patch
diff --git 
a/patches/nss-3.123/0003-HACK-don-t-build-commands-that-need-zlib.patch 
b/patches/nss-3.130/0003-HACK-don-t-build-commands-that-need-zlib.patch
similarity index 87%
rename from 
patches/nss-3.123/0003-HACK-don-t-build-commands-that-need-zlib.patch
rename to patches/nss-3.130/0003-HACK-don-t-build-commands-that-need-zlib.patch
index 54443fd08..dfb0c50b9 100644
--- a/patches/nss-3.123/0003-HACK-don-t-build-commands-that-need-zlib.patch
+++ b/patches/nss-3.130/0003-HACK-don-t-build-commands-that-need-zlib.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich <[email protected]>
  1 file changed, 2 deletions(-)
 
 diff --git a/nss/cmd/manifest.mn b/nss/cmd/manifest.mn
-index 1af88bf4951c..2bb47e638064 100644
+index 8c5cc2a50785..e7e776c81b83 100644
 --- a/nss/cmd/manifest.mn
 +++ b/nss/cmd/manifest.mn
-@@ -70,7 +70,6 @@ NSS_SRCDIRS = \
+@@ -69,7 +69,6 @@ NSS_SRCDIRS = \
   sdbthreadtst \
   sdrtest \
   selfserv  \
@@ -23,7 +23,7 @@ index 1af88bf4951c..2bb47e638064 100644
   signver \
   smimetools  \
   ssltap  \
-@@ -81,7 +80,6 @@ NSS_SRCDIRS = \
+@@ -80,7 +79,6 @@ NSS_SRCDIRS = \
   validation  \
   vfychain \
   vfyserv \
diff --git a/patches/nss-3.123/0004-HACK-fix-parallel-building-issue.patch 
b/patches/nss-3.130/0004-HACK-fix-parallel-building-issue.patch
similarity index 100%
rename from patches/nss-3.123/0004-HACK-fix-parallel-building-issue.patch
rename to patches/nss-3.130/0004-HACK-fix-parallel-building-issue.patch
diff --git a/patches/nss-3.123/0005-fix-dependency-generation.patch 
b/patches/nss-3.130/0005-fix-dependency-generation.patch
similarity index 100%
rename from patches/nss-3.123/0005-fix-dependency-generation.patch
rename to patches/nss-3.130/0005-fix-dependency-generation.patch
diff --git a/patches/nss-3.123/series b/patches/nss-3.130/series
similarity index 100%
rename from patches/nss-3.123/series
rename to patches/nss-3.130/series
diff --git a/rules/nss.make b/rules/nss.make
index 64e042e02..61c4b102c 100644
--- a/rules/nss.make
+++ b/rules/nss.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss
 #
 # Paths and names
 #
-NSS_VERSION    := 3.123
-NSS_SHA256     := 
2145113398a269779a7390515a1638800836b130248e33f93243268c026d4e49
+NSS_VERSION    := 3.130
+NSS_SHA256     := 
afab9f82c78bfa3e7e8b4a61ac31922675c58203f67ff385a2714df7fe9bd5c5
 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.43.0


Reply via email to