[PR PATCH] [WIP] nss: update to 3.49.2

[PR PATCH] [WIP] nss: update to 3.49.2

[voidlinux-github]

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

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

https://github.com/anjandev/void-packages nss
https://github.com/void-linux/void-packages/pull/18626

[WIP] nss: update to 3.49.2
Had to remove `arm32.patch` because the `patch` program rejected it.

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

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

From dea8e44f739a2770b8bf15c94e868f92ec3cf540 Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 28 Jan 2020 22:32:16 -0800
Subject: [PATCH] nss: update to 3.49.2

---
 srcpkgs/nss/patches/arm32.patch | 11 -----------
 srcpkgs/nss/template            |  4 ++--
 2 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 srcpkgs/nss/patches/arm32.patch

diff --git a/srcpkgs/nss/patches/arm32.patch b/srcpkgs/nss/patches/arm32.patch
deleted file mode 100644
index b7fc799962d..00000000000
--- a/srcpkgs/nss/patches/arm32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nss/lib/freebl/Makefile
-+++ nss/lib/freebl/Makefile
-@@ -782,7 +782,7 @@
- 
- ifeq ($(CPU_ARCH),arm)
- $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8
--$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon
-+# -mfpu=neon will be set by template files for armv7
- endif
- ifeq ($(CPU_ARCH),aarch64)
- $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a+crypto
diff --git a/srcpkgs/nss/template b/srcpkgs/nss/template
index 3d1e709a0ac..dbd7480d603 100644
--- a/srcpkgs/nss/template
+++ b/srcpkgs/nss/template
@@ -3,7 +3,7 @@
 _nsprver=4.24
 
 pkgname=nss
-version=3.49.1
+version=3.49.2
 revision=1
 hostmakedepends="perl"
 makedepends="nspr-devel sqlite-devel zlib-devel"
@@ -13,7 +13,7 @@ maintainer="Doan Tran Cong Danh <congdanhqx@gmail.com>"
 license="MPL-2.0"
 homepage="https://www.mozilla.org/projects/security/pki/nss"
 distfiles="${MOZILLA_SITE}/security/nss/releases/NSS_${version//\./_}_RTM/src/nss-${version}.tar.gz"
-checksum=d9aa42e49e02bb0dc0a2f164604cfc718e11a2a06ddb266cd676376ac21b026e
+checksum=faa7502c3ce9240d4be2aa88f63d88cf7d1cc512060e63ef21a7813c236160b2
 
 do_build() {
 	# Respect LDFLAGS

Re: nss: update to 3.49.2

[voidlinux-github]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/18626#issuecomment-580192561

Comment:
Yes, arm32 patch is no longer need, I added it for 3.49.1.

It's one of those bugs fixed with this release, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1608327

Re: nss: update to 3.49.2

[voidlinux-github]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/18626#issuecomment-580194514

Comment:
FWIW, ./xbps-src check nss passed for both glibc and musl variant of x86_64 

Re: [PR PATCH] [Merged]: nss: update to 3.49.2

[voidlinux-github]

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

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

nss: update to 3.49.2
https://github.com/void-linux/void-packages/pull/18626

Description:
Had to remove `arm32.patch` because the `patch` program rejected it.

Line 783 to 790 of `masterdir/builddir/nss-3.49.2/nss/lib/freebl/Makefile` is:

```
ifeq ($(CPU_ARCH),arm)
# When the compiler uses the softfloat ABI, we want to use the compatible softfp ABI when
# enabling NEON for these objects.
# Confusingly, __SOFTFP__ is the name of the define for the softfloat ABI, not for the softfp ABI.
USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep __SOFTFP__ > /dev/null && echo 1)
$(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
$(OBJDIR)/$(PROG_PREFIX)gcm-arm32-neon$(OBJ_SUFFIX): CFLAGS += -mfpu=neon$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp)
endif
```

As such, I think that `arm32.patch` is no longer needed. Please correct me if I am wrong.