From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Sep 2024 14:18:38 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1soimV-003myN-0N for lore@lore.pengutronix.de; Thu, 12 Sep 2024 14:18:38 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1soimU-0001UZ-5j; Thu, 12 Sep 2024 14:18:38 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1soig8-0002NU-7a; Thu, 12 Sep 2024 14:12:04 +0200 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1soig7-007NST-Bs; Thu, 12 Sep 2024 14:12:03 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1soig7-00BHJz-12; Thu, 12 Sep 2024 14:12:03 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 12 Sep 2024 14:12:03 +0200 Message-Id: <20240912121203.2688184-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240901181242.3322149-1-christian.melki@t2data.com> References: <20240901181242.3322149-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] nss: Version bump. 3.102 -> 3.104 X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as adb636d7a8307ce040aa38c8895cafe3e86e67a7. Michael [sent from post-receive hook] On Thu, 12 Sep 2024 14:12:03 +0200, Christian Melki wrote: > 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 > Message-Id: <20240901181242.3322149-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > 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 ec9c342b6755..31820e74b014 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 > 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 b4e5a9f004ba..dabe6c021bbb 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 > 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 1192da18b517..d153dd47318b 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 > 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 253c2e1c4027..e919bf61fadf 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)