From owner-svn-ports-all@freebsd.org Thu Mar 3 12:42:51 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 647FF7D4B; Thu, 3 Mar 2016 12:42:51 +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 mx1.freebsd.org (Postfix) with ESMTPS id 413246F; Thu, 3 Mar 2016 12:42:51 +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 u23CgoKq039033; Thu, 3 Mar 2016 12:42:50 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u23Cgo40039029; Thu, 3 Mar 2016 12:42:50 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201603031242.u23Cgo40039029@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Thu, 3 Mar 2016 12:42:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410036 - in head/security/nss: . files X-SVN-Group: ports-head 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.21 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: Thu, 03 Mar 2016 12:42:51 -0000 Author: jbeich Date: Thu Mar 3 12:42:49 2016 New Revision: 410036 URL: https://svnweb.freebsd.org/changeset/ports/410036 Log: security/nss: update to 3.23 Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.23_release_notes Deleted: head/security/nss/files/patch-bug1226179 Modified: head/security/nss/Makefile (contents, props changed) head/security/nss/distinfo (contents, props changed) head/security/nss/files/patch-bug1250891 (contents, props changed) Modified: head/security/nss/Makefile ============================================================================== --- head/security/nss/Makefile Thu Mar 3 12:26:16 2016 (r410035) +++ head/security/nss/Makefile Thu Mar 3 12:42:49 2016 (r410036) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.22.2 +PORTVERSION= 3.23 #DISTVERSIONSUFFIX= -with-ckbi-1.98 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src Modified: head/security/nss/distinfo ============================================================================== --- head/security/nss/distinfo Thu Mar 3 12:26:16 2016 (r410035) +++ head/security/nss/distinfo Thu Mar 3 12:42:49 2016 (r410036) @@ -1,2 +1,2 @@ -SHA256 (nss-3.22.2.tar.gz) = 07d49287c527ac31200f02dcf8494cef19e936d8ed470802749c4dfc782d3650 -SIZE (nss-3.22.2.tar.gz) = 6982164 +SHA256 (nss-3.23.tar.gz) = 94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf +SIZE (nss-3.23.tar.gz) = 7467001 Modified: head/security/nss/files/patch-bug1250891 ============================================================================== --- head/security/nss/files/patch-bug1250891 Thu Mar 3 12:26:16 2016 (r410035) +++ head/security/nss/files/patch-bug1250891 Thu Mar 3 12:42:49 2016 (r410036) @@ -1,5 +1,3 @@ -# Drop poisonous -ansi from default *BSD flags - diff --git a/coreconf/FreeBSD.mk b/coreconf/FreeBSD.mk --- coreconf/FreeBSD.mk +++ coreconf/FreeBSD.mk @@ -36,3 +34,62 @@ diff --git a/coreconf/OpenBSD.mk b/corec OS_LIBS = +diff --git a/coreconf/Werror.mk b/coreconf/Werror.mk +--- coreconf/Werror.mk ++++ coreconf/Werror.mk +@@ -5,6 +5,12 @@ + + # This sets WARNING_CFLAGS for gcc-like compilers. + ++ifndef CC_IS_CLANG ++ CC_IS_CLANG := $(and $(findstring clang, $(shell $(CC) --version 2>&1)), 1) ++ # Export CC_IS_CLANG to save a shell invocation when recursing. ++ export CC_IS_CLANG ++endif ++ + ifndef CC_IS_GCC + CC_IS_GCC := $(shell $(CC) -x c -E -Wall -Werror /dev/null >/dev/null 2>&1 && echo 1) + # Export CC_IS_GCC to save a shell invocation when recursing. +@@ -38,7 +44,7 @@ ifndef WARNING_CFLAGS + disable_warning = $(shell $(CC) -x c -E -Werror -W$(1) /dev/null >/dev/null 2>&1 && echo -Wno-$(1)) + + WARNING_CFLAGS = -Wall +- ifeq ($(CC_NAME),clang) ++ ifdef CC_IS_CLANG + # -Qunused-arguments : clang objects to arguments that it doesn't understand + # and fixing this would require rearchitecture + WARNING_CFLAGS += -Qunused-arguments +@@ -62,10 +68,10 @@ ifndef WARNING_CFLAGS + NSS_ENABLE_WERROR = 0 + $(warning OS_TARGET is Android, disabling -Werror) + else +- ifeq ($(CC_NAME),clang) ++ ifdef CC_IS_CLANG + # Clang reports its version as an older gcc, but it's OK + NSS_ENABLE_WERROR = 1 +- else ifeq ($(CC_NAME),gcc) ++ else ifdef CC_IS_GCC + ifneq (,$(filter 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) + NSS_ENABLE_WERROR = 1 + endif +diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile +--- lib/freebl/Makefile ++++ lib/freebl/Makefile +@@ -484,7 +484,7 @@ endif + + # poly1305-donna-x64-sse2-incremental-source.c requires __int128 support + # in GCC 4.6.0. +-ifeq ($(CC_NAME),clang) ++ifdef CC_IS_CLANG + HAVE_INT128_SUPPORT = 1 + else ifeq (1,$(CC_IS_GCC)) + ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION)))) +@@ -697,7 +697,7 @@ ifdef INTEL_GCM + # symbolic names to registers, for example, + # .set Htbl, %rdi + # So we can't use Clang's integrated assembler with intel-gcm.s. +-ifneq (,$(findstring clang,$(shell $(AS) --version))) ++ifdef CC_IS_CLANG + $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as + endif + endif