From owner-svn-ports-head@freebsd.org Mon Jan 29 11:11:32 2018 Return-Path: Delivered-To: svn-ports-head@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 65E9CEE3C0C; Mon, 29 Jan 2018 11:11:32 +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 179836B173; Mon, 29 Jan 2018 11:11:32 +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 1296827536; Mon, 29 Jan 2018 11:11:32 +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 w0TBBVSr070993; Mon, 29 Jan 2018 11:11:31 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0TBBVRi070992; Mon, 29 Jan 2018 11:11:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201801291111.w0TBBVRi070992@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 29 Jan 2018 11:11:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460255 - head/security/nss/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/security/nss/files X-SVN-Commit-Revision: 460255 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jan 2018 11:11:32 -0000 Author: jbeich Date: Mon Jan 29 11:11:31 2018 New Revision: 460255 URL: https://svnweb.freebsd.org/changeset/ports/460255 Log: security/nss: unbreak on aarch64 after r459458 PR: 225326 Submitted by: mikael.urankar@gmail.com Obtained from: upstream (NSS 3.36) MFH: 2018Q1 Added: head/security/nss/files/patch-bug1432455 (contents, props changed) Added: head/security/nss/files/patch-bug1432455 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/nss/files/patch-bug1432455 Mon Jan 29 11:11:31 2018 (r460255) @@ -0,0 +1,27 @@ +commit 1668fafc1db4 +Author: Daiki Ueno +Date: Tue Jan 23 13:29:34 2018 +0100 + + Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer +--- + lib/freebl/Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git lib/freebl/Makefile lib/freebl/Makefile +index 0b3daa2756..6c8e6a2ead 100644 +--- lib/freebl/Makefile ++++ lib/freebl/Makefile +@@ -527,7 +527,12 @@ ifndef NSS_DISABLE_CHACHAPOLY + EXTRA_SRCS += chacha20_vec.c + endif + else +- EXTRA_SRCS += poly1305.c ++ ifeq ($(CPU_ARCH),aarch64) ++ EXTRA_SRCS += Hacl_Poly1305_64.c ++ else ++ EXTRA_SRCS += poly1305.c ++ endif ++ + EXTRA_SRCS += chacha20.c + VERIFIED_SRCS += Hacl_Chacha20.c + endif # x86_64