Re: [ptxdist] [APPLIED] nss: Version bump. 3.89.1 -> 3.91

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as 387883b61215df81ec205054ca51876167dbb819.

Michael

[sent from post-receive hook]

On Sat, 08 Jul 2023 09:02:51 +0200, Christian Melki <christian.melki@t2data.com> wrote:
> Minor bugfixes.
> https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_90.html
> https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_91.html
> 
> * Forward patchset applies cleanly. Remove GCC 13 patch. Included in the release.
> 
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> Message-Id: <20230702210507.3845291-1-christian.melki@t2data.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/nss-3.89.1/0006-fix-building-with-gcc-13.patch b/patches/nss-3.89.1/0006-fix-building-with-gcc-13.patch
> deleted file mode 100644
> index 90b0771a263e..000000000000
> --- a/patches/nss-3.89.1/0006-fix-building-with-gcc-13.patch
> +++ /dev/null
> @@ -1,50 +0,0 @@
> -From: Michael Olbrich <m.olbrich@pengutronix.de>
> -Date: Sun, 28 May 2023 13:13:33 +0200
> -Subject: [PATCH] fix building with gcc 13
> -
> -Without this building fails with:
> -
> -ecperf.c: In function 'genericThread':
> -ecperf.c:99:24: error: storing the address of local variable 'sig' in '*threadData.p2' [-Werror=dangling-pointer=]
> -ecperf.c:91:13: note: 'sig' declared here
> -ecperf.c:86:21: note: 'data' declared here
> -ecperf.c: In function 'PKCS11Thread':
> -ecperf.c:71:24: error: storing the address of local variable 'sig' in '*threadData.p2' [-Werror=dangling-pointer=]
> -ecperf.c:53:13: note: 'sig' declared here
> -ecperf.c:47:20: note: 'data' declared here
> -cc1: all warnings being treated as errors
> -
> -threadData is a pointer argument so any member variable that is set may
> -be used after the function ends. So in theory, setting threadData->p2
> -can be a problem.
> -
> -It's not actually used after the end of the function so just clear it
> -again to make the compiler happy.
> -
> -Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ----
> - nss/cmd/ecperf/ecperf.c | 4 ++++
> - 1 file changed, 4 insertions(+)
> -
> -diff --git a/nss/cmd/ecperf/ecperf.c b/nss/cmd/ecperf/ecperf.c
> -index 705d68f358f4..418e2b20c2e7 100644
> ---- a/nss/cmd/ecperf/ecperf.c
> -+++ b/nss/cmd/ecperf/ecperf.c
> -@@ -79,6 +79,8 @@ PKCS11Thread(void *data)
> -         }
> -         threadData->count++;
> -     }
> -+    if (threadData->isSign)
> -+        threadData->p2 = NULL;
> -     return;
> - }
> - 
> -@@ -107,6 +109,8 @@ genericThread(void *data)
> -         }
> -         threadData->count++;
> -     }
> -+    if (threadData->isSign)
> -+        threadData->p2 = NULL;
> -     return;
> - }
> - 
> diff --git a/patches/nss-3.89.1/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.91/0001-nss-fix-nsinstall-build.patch
> similarity index 100%
> rename from patches/nss-3.89.1/0001-nss-fix-nsinstall-build.patch
> rename to patches/nss-3.91/0001-nss-fix-nsinstall-build.patch
> diff --git a/patches/nss-3.89.1/0002-add-nss.pc.in.patch b/patches/nss-3.91/0002-add-nss.pc.in.patch
> similarity index 100%
> rename from patches/nss-3.89.1/0002-add-nss.pc.in.patch
> rename to patches/nss-3.91/0002-add-nss.pc.in.patch
> diff --git a/patches/nss-3.89.1/0003-HACK-don-t-build-commands-that-need-zlib.patch b/patches/nss-3.91/0003-HACK-don-t-build-commands-that-need-zlib.patch
> similarity index 100%
> rename from patches/nss-3.89.1/0003-HACK-don-t-build-commands-that-need-zlib.patch
> rename to patches/nss-3.91/0003-HACK-don-t-build-commands-that-need-zlib.patch
> diff --git a/patches/nss-3.89.1/0004-HACK-fix-parallel-building-issue.patch b/patches/nss-3.91/0004-HACK-fix-parallel-building-issue.patch
> similarity index 100%
> rename from patches/nss-3.89.1/0004-HACK-fix-parallel-building-issue.patch
> rename to patches/nss-3.91/0004-HACK-fix-parallel-building-issue.patch
> diff --git a/patches/nss-3.89.1/0005-fix-dependency-generation.patch b/patches/nss-3.91/0005-fix-dependency-generation.patch
> similarity index 100%
> rename from patches/nss-3.89.1/0005-fix-dependency-generation.patch
> rename to patches/nss-3.91/0005-fix-dependency-generation.patch
> diff --git a/patches/nss-3.89.1/series b/patches/nss-3.91/series
> similarity index 72%
> rename from patches/nss-3.89.1/series
> rename to patches/nss-3.91/series
> index aba5ce40892d..534d0d6d69f8 100644
> --- a/patches/nss-3.89.1/series
> +++ b/patches/nss-3.91/series
> @@ -5,5 +5,4 @@
>  0003-HACK-don-t-build-commands-that-need-zlib.patch
>  0004-HACK-fix-parallel-building-issue.patch
>  0005-fix-dependency-generation.patch
> -0006-fix-building-with-gcc-13.patch
> -# 49d396aebdf3361484f7d43c92213908  - git-ptx-patches magic
> +# 51749efb4fc421b49999aad3745d75b9  - git-ptx-patches magic
> diff --git a/rules/nss.make b/rules/nss.make
> index 64c1e5777c87..e768af1be00b 100644
> --- a/rules/nss.make
> +++ b/rules/nss.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_NSS) += nss
>  #
>  # Paths and names
>  #
> -NSS_VERSION	:= 3.89.1
> -NSS_MD5		:= c7e06669859cd27af7405ce6ab62cbfb
> +NSS_VERSION	:= 3.91
> +NSS_MD5		:= a8168bc23c9e9b5419aede4984ba259e
>  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)