From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 26 Oct 2026 08:57:21 +0100 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 1xLFa5-003Qhi-1R for lore@lore.pengutronix.de; Mon, 26 Oct 2026 08:57:21 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xLFa4-0003Cl-UB; Mon, 26 Oct 2026 08:57:20 +0100 Received: from mx1.white.stw.pengutronix.de ([185.203.200.13]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xLFZz-0003CH-Uv for ptxdist@pengutronix.de; Mon, 26 Oct 2026 08:57:16 +0100 Received: from drehscheibe.grey.stw.pengutronix.de (drehscheibe.grey.stw.pengutronix.de [IPv6:2a0a:edc0:0:c01:1d::a2]) (Authenticated sender: relay-from-drehscheibe.grey.stw.pengutronix.de) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPSA id DEE8D2008E4; Mon, 26 Oct 2026 08:57:15 +0100 (CET) ARC-Seal: i=1; s=20260414; d=pengutronix.de; t=1793001435; a=rsa-sha256; cv=none; b=AstOudfI0X+3welL2qX5J1zk0r2AjF372ELgVuvXRXUZGNdLql4oOyHxq+4k4FCcwdNAJH J/Yp7BJBGjE1fC0LXQN6LBHP2THyxCqTLqujh1MGmk5+5+A99TKwsq+Z4ouuPBujBdu8BW OArIaQkKV8fs/zjhqkFzF+DmdGQiiHdCanoEqgby15UV76frTqt+UAJDj44vo7wg/V/8J/ HoZmSu/6/Jyfkeno0OHpaqM79ltE3dNl/hg/Rm5ByUUPEdyauibgv/IMFny/2CN//4UQ4V ynYAd8XTqY1AC1cTeaZx0nKKfkjxou4UiJXh8Ni7jyPKloT7w3swW4qU0GIk4Q== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=relay-from-drehscheibe.grey.stw.pengutronix.de smtp.mailfrom=mol@pengutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=pengutronix.de; s=20260414; t=1793001435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MS7Y9C6mneU1fzdiQiSyqVMqam1qlai2ZKfnpUrJ+BY=; b=Tk+Z1jeWXdNaO4GepUlO1O885urb6R0cfIlzWtswbC4tR2lzupYqr1eEx4cfcvX3rEdJ5q AsmeEWLHclSegI1RZv/eohsOlqQqA2B45DyYEmp1MJ8hKMdJvzB5I52/JJW3qLC/LXt1WY FF/I822jpzoZfFOvgmnioUyNDdHhpWjncvtYatNxRlzL6cKIOp4UFR+9FLbLMibjd7LwQY ZQ9PKQxcsvDA/+QlUBXW0IvevB0kac935czeJnL8VVz9+0DQT7fxfcpt2g0BFt/vBfYtcu G5XSfH3jC79bz8SFDFDiCLe1CxGFSyZwNq5SRfYwC91WaR3c52O/t2awx67NkA== Received: from pty.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::c5]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xLFZz-001FVl-2g; Mon, 26 Oct 2026 08:57:15 +0100 Received: from mol by pty.whiteo.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1xLFZz-00000003LGh-36cu; Mon, 26 Oct 2026 08:57:15 +0100 Date: Mon, 26 Oct 2026 08:57:15 +0100 From: Michael Olbrich To: Sven =?utf-8?Q?P=C3=BCschel?= Message-ID: Mail-Followup-To: Sven =?utf-8?Q?P=C3=BCschel?= , ptxdist@pengutronix.de References: <20261021-fixemudhra-v1-0-36306b489b2e@pengutronix.de> <20261021-fixemudhra-v1-2-36306b489b2e@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20261021-fixemudhra-v1-2-36306b489b2e@pengutronix.de> X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-IRC: #ptxdist @freenode X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_SOFTFAIL autolearn=no autolearn_force=no version=3.4.2 Subject: Re: [ptxdist] [PATCH 2/3] nss: version bump 3.130 -> 3.131.1 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: ptxdist@pengutronix.de 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 On Wed, Oct 21, 2026 at 11:51:39AM +0200, Sven Püschel wrote: > Bunch of bugfixes in 3.131 > https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_131.html > > With 3.131.1 they only dropped the certs related to the > eMudhra Intermediate CA Compromise [1]: > https://groups.google.com/a/mozilla.org/g/dev-tech-crypto/c/vSxZxnOMMvs > > Also dropped the patch adding a pc file and instead using the already > included PC file and adjusting it's variables with a sed command line. > This is based on the ArchLinux build script [2], but a similar sed can > also be found in `nss/build.sh`. You need to updated host-nns as well. Michael > [1] https://emudhra.we-have-a-problem.com/ > [2] https://gitlab.archlinux.org/archlinux/packaging/packages/nss/-/blob/f01ebfe4f1024af88a59c25586729956591abac0/PKGBUILD#L68 > > Signed-off-by: Sven Püschel > --- > patches/nss-3.130/0002-add-nss.pc.in.patch | 27 ---------------------- > patches/nss-3.130/series | 8 ------- > .../0001-nss-fix-nsinstall-build.patch | 0 > ...HACK-don-t-build-commands-that-need-zlib.patch} | 0 > .../0003-HACK-fix-parallel-building-issue.patch} | 0 > .../0004-fix-dependency-generation.patch} | 0 > patches/nss-3.131.1/series | 7 ++++++ > rules/nss.make | 14 +++++++---- > 8 files changed, 17 insertions(+), 39 deletions(-) > > diff --git a/patches/nss-3.130/0002-add-nss.pc.in.patch b/patches/nss-3.130/0002-add-nss.pc.in.patch > deleted file mode 100644 > index addc805b5d39543f587febae968680276a62470b..0000000000000000000000000000000000000000 > --- a/patches/nss-3.130/0002-add-nss.pc.in.patch > +++ /dev/null > @@ -1,27 +0,0 @@ > -From: Lucas Stach > -Date: Tue, 12 Apr 2016 11:36:26 +0200 > -Subject: [PATCH] add nss.pc.in > - > -Signed-off-by: Michael Olbrich > ---- > - nss/nss.pc.in | 11 +++++++++++ > - 1 file changed, 11 insertions(+) > - create mode 100644 nss/nss.pc.in > - > -diff --git a/nss/nss.pc.in b/nss/nss.pc.in > -new file mode 100644 > -index 000000000000..b80838f8ca0d > ---- /dev/null > -+++ b/nss/nss.pc.in > -@@ -0,0 +1,11 @@ > -+prefix=/usr > -+exec_prefix=${prefix} > -+libdir=${prefix}/lib > -+includedir=${prefix}/include/nss > -+ > -+Name: NSS > -+Description: Mozilla Network Security Services > -+Version: @VERSION@ > -+Requires: nspr > -+Libs: -lnss3 -lnssutil3 -lsmime3 -lssl3 > -+Cflags: -I${includedir} > diff --git a/patches/nss-3.130/series b/patches/nss-3.130/series > deleted file mode 100644 > index 534d0d6d69f823d512f432093a912eb00ff7a666..0000000000000000000000000000000000000000 > --- a/patches/nss-3.130/series > +++ /dev/null > @@ -1,8 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-nss-fix-nsinstall-build.patch > -0002-add-nss.pc.in.patch > -0003-HACK-don-t-build-commands-that-need-zlib.patch > -0004-HACK-fix-parallel-building-issue.patch > -0005-fix-dependency-generation.patch > -# 51749efb4fc421b49999aad3745d75b9 - git-ptx-patches magic > diff --git a/patches/nss-3.130/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.131.1/0001-nss-fix-nsinstall-build.patch > similarity index 100% > rename from patches/nss-3.130/0001-nss-fix-nsinstall-build.patch > rename to patches/nss-3.131.1/0001-nss-fix-nsinstall-build.patch > diff --git a/patches/nss-3.130/0003-HACK-don-t-build-commands-that-need-zlib.patch b/patches/nss-3.131.1/0002-HACK-don-t-build-commands-that-need-zlib.patch > similarity index 100% > rename from patches/nss-3.130/0003-HACK-don-t-build-commands-that-need-zlib.patch > rename to patches/nss-3.131.1/0002-HACK-don-t-build-commands-that-need-zlib.patch > diff --git a/patches/nss-3.130/0004-HACK-fix-parallel-building-issue.patch b/patches/nss-3.131.1/0003-HACK-fix-parallel-building-issue.patch > similarity index 100% > rename from patches/nss-3.130/0004-HACK-fix-parallel-building-issue.patch > rename to patches/nss-3.131.1/0003-HACK-fix-parallel-building-issue.patch > diff --git a/patches/nss-3.130/0005-fix-dependency-generation.patch b/patches/nss-3.131.1/0004-fix-dependency-generation.patch > similarity index 100% > rename from patches/nss-3.130/0005-fix-dependency-generation.patch > rename to patches/nss-3.131.1/0004-fix-dependency-generation.patch > diff --git a/patches/nss-3.131.1/series b/patches/nss-3.131.1/series > new file mode 100644 > index 0000000000000000000000000000000000000000..ed1f6706e1f31ed11d93ed6918ecae72fce35707 > --- /dev/null > +++ b/patches/nss-3.131.1/series > @@ -0,0 +1,7 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-nss-fix-nsinstall-build.patch > +0002-HACK-don-t-build-commands-that-need-zlib.patch > +0003-HACK-fix-parallel-building-issue.patch > +0004-fix-dependency-generation.patch > +# ea27330855ed3ed4aac49b9ec8451c08 - git-ptx-patches magic > diff --git a/rules/nss.make b/rules/nss.make > index 61c4b102c04219e218fb950943679204ec01f501..147d311f24abaeaa90833efb13239451393a965a 100644 > --- a/rules/nss.make > +++ b/rules/nss.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss > # > # Paths and names > # > -NSS_VERSION := 3.130 > -NSS_SHA256 := afab9f82c78bfa3e7e8b4a61ac31922675c58203f67ff385a2714df7fe9bd5c5 > +NSS_VERSION := 3.131.1 > +NSS_SHA256 := b1dbc1d9e7f3f8455dfb6d58ec8f7229d8a8450c629a9e69ef2ef6081f359056 > 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) > @@ -96,8 +96,14 @@ $(STATEDIR)/nss.install: > $(NSS_PKGDIR)/usr/lib/$(lib).so$(ptx/nl)) > > install -d $(NSS_PKGDIR)/usr/lib/pkgconfig/ > - VERSION=$(NSS_VERSION) ptxd_replace_magic \ > - $(NSS_DIR)/nss/nss.pc.in > $(NSS_PKGDIR)/usr/lib/pkgconfig/nss.pc > + sed "$(NSS_DIR)/nss/pkg/pkg-config/nss.pc.in" \ > + -e "s,%prefix%,/usr,g" \ > + -e "s,%exec_prefix%,$${prefix},g" \ > + -e "s,%libdir%,/usr/lib,g" \ > + -e "s,%includedir%,/usr/include/nss,g" \ > + -e "s,%NSPR_VERSION%,$(NSPR_VERSION),g" \ > + -e "s,%NSS_VERSION%,$(NSS_VERSION),g" \ > + > "$(NSS_PKGDIR)/usr/lib/pkgconfig/nss.pc" > > @install -v -d $(NSS_PKGDIR)/usr/include/nss > @install -v -m 644 -t $(NSS_PKGDIR)/usr/include/nss $(NSS_DIR)/dist/public/nss/* > > -- > 2.47.3 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |