mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
* [ptxdist] [PATCH] nss: Version bump. 3.92 -> 3.96
@ 2023-12-18 19:06 Christian Melki
  2024-01-10 16:57 ` [ptxdist] [APPLIED] " Michael Olbrich
  0 siblings, 1 reply; 2+ messages in thread
From: Christian Melki @ 2023-12-18 19:06 UTC (permalink / raw)
  To: ptxdist

Update, bunch of changes.
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_93.html
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_94.html
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_95.html
https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_96.html (expected)

* Forward patchset, fix minor offset, applies cleanly.

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

diff --git a/patches/nss-3.92/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.96/0001-nss-fix-nsinstall-build.patch
similarity index 100%
rename from patches/nss-3.92/0001-nss-fix-nsinstall-build.patch
rename to patches/nss-3.96/0001-nss-fix-nsinstall-build.patch
diff --git a/patches/nss-3.92/0002-add-nss.pc.in.patch b/patches/nss-3.96/0002-add-nss.pc.in.patch
similarity index 100%
rename from patches/nss-3.92/0002-add-nss.pc.in.patch
rename to patches/nss-3.96/0002-add-nss.pc.in.patch
diff --git a/patches/nss-3.92/0003-HACK-don-t-build-commands-that-need-zlib.patch b/patches/nss-3.96/0003-HACK-don-t-build-commands-that-need-zlib.patch
similarity index 87%
rename from patches/nss-3.92/0003-HACK-don-t-build-commands-that-need-zlib.patch
rename to patches/nss-3.96/0003-HACK-don-t-build-commands-that-need-zlib.patch
index c32769392..0447fef00 100644
--- a/patches/nss-3.92/0003-HACK-don-t-build-commands-that-need-zlib.patch
+++ b/patches/nss-3.96/0003-HACK-don-t-build-commands-that-need-zlib.patch
@@ -12,10 +12,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 2 deletions(-)
 
 diff --git a/nss/cmd/manifest.mn b/nss/cmd/manifest.mn
-index aafcf86fdbf5..9caddbc73ae4 100644
+index 06bb99f4f8e0..4eb0024415ee 100644
 --- a/nss/cmd/manifest.mn
 +++ b/nss/cmd/manifest.mn
-@@ -68,7 +68,6 @@ NSS_SRCDIRS = \
+@@ -69,7 +69,6 @@ NSS_SRCDIRS = \
   sdbthreadtst \
   sdrtest \
   selfserv  \
@@ -23,7 +23,7 @@ index aafcf86fdbf5..9caddbc73ae4 100644
   signver \
   smimetools  \
   ssltap  \
-@@ -79,7 +78,6 @@ NSS_SRCDIRS = \
+@@ -80,7 +79,6 @@ NSS_SRCDIRS = \
   validation  \
   vfychain \
   vfyserv \
diff --git a/patches/nss-3.92/0004-HACK-fix-parallel-building-issue.patch b/patches/nss-3.96/0004-HACK-fix-parallel-building-issue.patch
similarity index 100%
rename from patches/nss-3.92/0004-HACK-fix-parallel-building-issue.patch
rename to patches/nss-3.96/0004-HACK-fix-parallel-building-issue.patch
diff --git a/patches/nss-3.92/0005-fix-dependency-generation.patch b/patches/nss-3.96/0005-fix-dependency-generation.patch
similarity index 100%
rename from patches/nss-3.92/0005-fix-dependency-generation.patch
rename to patches/nss-3.96/0005-fix-dependency-generation.patch
diff --git a/patches/nss-3.92/series b/patches/nss-3.96/series
similarity index 100%
rename from patches/nss-3.92/series
rename to patches/nss-3.96/series
diff --git a/rules/nss.make b/rules/nss.make
index 6c0266ceb..8e177aaf0 100644
--- a/rules/nss.make
+++ b/rules/nss.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss
 #
 # Paths and names
 #
-NSS_VERSION	:= 3.92
-NSS_MD5		:= 589167c3be81d09b9e332ff17d46ebca
+NSS_VERSION	:= 3.96
+NSS_MD5		:= aea84f55f53799763bb7b712b250eac0
 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




^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-10 16:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-18 19:06 [ptxdist] [PATCH] nss: Version bump. 3.92 -> 3.96 Christian Melki
2024-01-10 16:57 ` [ptxdist] [APPLIED] " Michael Olbrich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox