From owner-svn-ports-all@freebsd.org Mon May 7 22:01:30 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0D4D9FBE323; Mon, 7 May 2018 22:01:30 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AF9F17AF5D; Mon, 7 May 2018 22:01:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AA79E21285; Mon, 7 May 2018 22:01:29 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w47M1TZ3050298; Mon, 7 May 2018 22:01:29 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w47M1TJm050297; Mon, 7 May 2018 22:01:29 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805072201.w47M1TJm050297@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 7 May 2018 22:01:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r469337 - branches/2018Q2/security/nss/files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q2/security/nss/files X-SVN-Commit-Revision: 469337 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 May 2018 22:01:30 -0000 Author: jbeich Date: Mon May 7 22:01:29 2018 New Revision: 469337 URL: https://svnweb.freebsd.org/changeset/ports/469337 Log: 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 Added: branches/2018Q2/security/nss/files/patch-bug1459739 - copied unchanged from r469336, head/security/nss/files/patch-bug1459739 Modified: Directory Properties: branches/2018Q2/ (props changed) Copied: branches/2018Q2/security/nss/files/patch-bug1459739 (from r469336, head/security/nss/files/patch-bug1459739) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q2/security/nss/files/patch-bug1459739 Mon May 7 22:01:29 2018 (r469337, copy of r469336, head/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 + + #######################################################################