[PR PATCH] nss: update to 3.61.

[PR PATCH] nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1575 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages nss-3.61
https://github.com/void-linux/void-packages/pull/28287

nss: update to 3.61.
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/28287.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nss-3.61-28287.patch --]
[-- Type: text/x-diff, Size: 2250 bytes --]

From 9624f25b6605cb555cc885265d4bbde6ef22dde3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 27 Jan 2021 08:48:38 +0700
Subject: [PATCH] nss: update to 3.61.

---
 srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch | 12 ++++++++++++
 srcpkgs/nss/template                                 |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch

diff --git a/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch b/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch
new file mode 100644
index 00000000000..72fc5252cde
--- /dev/null
+++ b/srcpkgs/nss/patches/freebl_gtest-depends-gtest.patch
@@ -0,0 +1,12 @@
+Index: nss/gtests/manifest.mn
+===================================================================
+--- nss/gtests/manifest.mn.orig
++++ nss/gtests/manifest.mn
+@@ -41,6 +41,7 @@ certdb_gtest: common
+ certhigh_gtest: common
+ cryptohi_gtest: common
+ der_gtest: common
++freebl_gtest: common
+ pk11_gtest: common pkcs11testmodule
+ smime_gtest: common
+ softoken_gtest: common
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index b203db3b956..fbcdc67dc58 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.29
 
 pkgname=nss
-version=3.60.1
+version=3.61
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=2051c20b61112df24bad533ac37f6c66c1bc0d6ea70bb9d9cad102d20324279d
+checksum=312e2d804b34ccf0fec70b57cf8cd6ac853f8ced60df53e30ebb0a7bcd0e1370
 
 export NS_USE_GCC=1
 export LIBRUNPATH=
@@ -55,6 +55,8 @@ do_build() {
 	make ${makejobs} LD=$BUILD_LD LDFLAGS="$BUILD_LDFLAGS" ${_native_use64} -C coreconf
 
 	if [ "$CROSS_BUILD" ]; then
+		# We don't run test in cross build
+		export NSS_DISABLE_GTESTS=1
 		if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
 			CFLAGS+=" -DNS_PTR_GT_32"
 			_target_use64="USE_64=1"

Re: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-769186405

Comment:
The test is being run.

Re: nss: update to 3.61.

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-769187697

Comment:
> 			aarch64*|ppc*|x86_64*)

I don't know if this is important, but does this work with the ppcle arch?

@q66

Re: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 225 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-769196805

Comment:
@ericonr 
```
coreconf/Linux.mk:52:ifeq (,$(filter-out ppc64 ppc64le,$(OS_TEST)))
```

Re: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-769196805

Comment:
@ericonr 
```
coreconf/Linux.mk:52:ifeq (,$(filter-out ppc64 ppc64le,$(OS_TEST)))
```

---
Ah, you meant ppcle without 64

Re: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 297 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-769201144

Comment:
Should be harmless, the `OS_TEST` is used to enable architecture specific optimization, for `ppc` it's `gcm-ppc.c`.
Current setup will use C fallback for ppcle

Re: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-769481026

Comment:
Well, after spending a whole day to figure out what wrong with the build system, now I need to figure out what wrong with the test.

Re: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-769481026

Comment:
Well, after spending a whole day to figure out what wrong with the build system, now I need to figure out what wrong with the test.

Re: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 360 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-769507265

Comment:
Waiting confirmation from https://bugzilla.mozilla.org/show_bug.cgi?id=1689508

Note that Mozilla staff usually build with gyp and their comments in `all.sh` indicates that `chain.sh` is usually not run when built by gyp.

Re: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 504 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-769507265

Comment:
Waiting confirmation from https://bugzilla.mozilla.org/show_bug.cgi?id=1689508

Note that Mozilla staff usually build with gyp and their comments in `all.sh` indicates that `chain.sh` is usually not run when built by gyp.

---

It's weird that diff between 3.60.1 and 3.61 is very small. I'm gonna rebuild nss-3.61 with gcc 9.3.0 and nss-3.60.1 with gcc 10.2.1.

Re: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/28287#issuecomment-770172396

Comment:
As analysed, the failed test is really Mozilla ships broken cert.

Re: [PR PATCH] [Merged]: nss: update to 3.61.

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]

There's a merged pull request on the void-packages repository

nss: update to 3.61.
https://github.com/void-linux/void-packages/pull/28287

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->