Some cleanups and fixes. https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_107.html https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_108.html https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_109.html https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_110.html
* Forward patchset with slight offset adjustment. Applies cleanly. Signed-off-by: Christian Melki <[email protected]> --- .../0001-nss-fix-nsinstall-build.patch | 0 patches/{nss-3.106 => nss-3.110}/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.106 => nss-3.110}/series | 0 rules/nss.make | 4 ++-- 7 files changed, 5 insertions(+), 5 deletions(-) rename patches/{nss-3.106 => nss-3.110}/0001-nss-fix-nsinstall-build.patch (100%) rename patches/{nss-3.106 => nss-3.110}/0002-add-nss.pc.in.patch (100%) rename patches/{nss-3.106 => nss-3.110}/0003-HACK-don-t-build-commands-that-need-zlib.patch (87%) rename patches/{nss-3.106 => nss-3.110}/0004-HACK-fix-parallel-building-issue.patch (100%) rename patches/{nss-3.106 => nss-3.110}/0005-fix-dependency-generation.patch (100%) rename patches/{nss-3.106 => nss-3.110}/series (100%) diff --git a/patches/nss-3.106/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.110/0001-nss-fix-nsinstall-build.patch similarity index 100% rename from patches/nss-3.106/0001-nss-fix-nsinstall-build.patch rename to patches/nss-3.110/0001-nss-fix-nsinstall-build.patch diff --git a/patches/nss-3.106/0002-add-nss.pc.in.patch b/patches/nss-3.110/0002-add-nss.pc.in.patch similarity index 100% rename from patches/nss-3.106/0002-add-nss.pc.in.patch rename to patches/nss-3.110/0002-add-nss.pc.in.patch diff --git a/patches/nss-3.106/0003-HACK-don-t-build-commands-that-need-zlib.patch b/patches/nss-3.110/0003-HACK-don-t-build-commands-that-need-zlib.patch similarity index 87% rename from patches/nss-3.106/0003-HACK-don-t-build-commands-that-need-zlib.patch rename to patches/nss-3.110/0003-HACK-don-t-build-commands-that-need-zlib.patch index 0447fef00..54443fd08 100644 --- a/patches/nss-3.106/0003-HACK-don-t-build-commands-that-need-zlib.patch +++ b/patches/nss-3.110/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 06bb99f4f8e0..4eb0024415ee 100644 +index 1af88bf4951c..2bb47e638064 100644 --- a/nss/cmd/manifest.mn +++ b/nss/cmd/manifest.mn -@@ -69,7 +69,6 @@ NSS_SRCDIRS = \ +@@ -70,7 +70,6 @@ NSS_SRCDIRS = \ sdbthreadtst \ sdrtest \ selfserv \ @@ -23,7 +23,7 @@ index 06bb99f4f8e0..4eb0024415ee 100644 signver \ smimetools \ ssltap \ -@@ -80,7 +79,6 @@ NSS_SRCDIRS = \ +@@ -81,7 +80,6 @@ NSS_SRCDIRS = \ validation \ vfychain \ vfyserv \ diff --git a/patches/nss-3.106/0004-HACK-fix-parallel-building-issue.patch b/patches/nss-3.110/0004-HACK-fix-parallel-building-issue.patch similarity index 100% rename from patches/nss-3.106/0004-HACK-fix-parallel-building-issue.patch rename to patches/nss-3.110/0004-HACK-fix-parallel-building-issue.patch diff --git a/patches/nss-3.106/0005-fix-dependency-generation.patch b/patches/nss-3.110/0005-fix-dependency-generation.patch similarity index 100% rename from patches/nss-3.106/0005-fix-dependency-generation.patch rename to patches/nss-3.110/0005-fix-dependency-generation.patch diff --git a/patches/nss-3.106/series b/patches/nss-3.110/series similarity index 100% rename from patches/nss-3.106/series rename to patches/nss-3.110/series diff --git a/rules/nss.make b/rules/nss.make index 7c234ddc3..c515307c1 100644 --- a/rules/nss.make +++ b/rules/nss.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss # # Paths and names # -NSS_VERSION := 3.106 -NSS_MD5 := 5beed92d43d33b03faf0ec5efd44d1b0 +NSS_VERSION := 3.110 +NSS_MD5 := 2396fd2b783037689f89e2e0813c318c 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
