From b2ed969338a4630531b5b00147f5745864d3abf9 Mon Sep 17 00:00:00 2001
From: Jan Beich <jbeich@FreeBSD.org>
Date: Mon, 7 May 2018 22:01:29 +0000
Subject: [PATCH] MFH: r469336

security/nss: unbreak armv6 after r469333

cd FreeBSD11.1_OPT.OBJ ; sh 'nss/cmd/shlibsign/.'/sign.sh 'nss/cmd/shlibsign/../../../dist/FreeBSD11.1_OPT.OBJ' \
'nss/cmd/shlibsign/FreeBSD11.1_OPT.OBJ' FreeBSD \
'nss/cmd/shlibsign/../../../dist/FreeBSD11.1_OPT.OBJ/lib' 'nss/cmd/shlibsign/../../../dist/FreeBSD11.1_OPT.OBJ/lib/libsoftokn3.so'
nss/cmd/shlibsign/FreeBSD11.1_OPT.OBJ/shlibsign -v -i nss/cmd/shlibsign/../../../dist/FreeBSD11.1_OPT.OBJ/lib/libsoftokn3.so
C_Initialize failed: 0x00000030, CKR_DEVICE_ERROR
NSPR error code: -5977: Failure to load dynamic library
Initiailzing softoken failed: 0x00000030, CKR_DEVICE_ERROR
NSPR error code: -5977: Failure to load dynamic library
moduleSpec configdir='' certPrefix='' keyPrefix='' secmod='' flags=noCertDB, noModDB
gmake[3]: *** [Makefile:92: ../../../dist/FreeBSD11.1_OPT.OBJ/lib/libsoftokn3.chk] Error 1

Approved by:	ports-secteam blanket
---
 security/nss/files/patch-bug1459739 | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 security/nss/files/patch-bug1459739

diff --git a/security/nss/files/patch-bug1459739 b/security/nss/files/patch-bug1459739
new file mode 100644
index 000000000000..183c391079b7
--- /dev/null
+++ b/security/nss/files/patch-bug1459739
@@ -0,0 +1,14 @@
+diff --git lib/freebl/Makefile lib/freebl/Makefile
+index e6a94d35c4..0aecd2fbe7 100644
+--- lib/freebl/Makefile
++++ lib/freebl/Makefile
+@@ -539,6 +539,9 @@ ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
+ else
+     # All non intel architectures get the generic 32 bit implementation (slow!)
+     ECL_SRCS += curve25519_32.c
++ifndef NSS_DISABLE_CHACHAPOLY
++        VERIFIED_SRCS += FStar.c
++endif
+ endif
+ 
+ #######################################################################