Date: Tue, 9 Feb 2016 01:34:41 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r408522 - in branches/2016Q1/security: ca_root_nss nss nss/files Message-ID: <201602090134.u191YfxS016271@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Feb 9 01:34:41 2016 New Revision: 408522 URL: https://svnweb.freebsd.org/changeset/ports/408522 Log: MFH: r405494 security/nss: update to 3.21 Temporarily disable gtests as they require C++0x support and install a library that may have conflicting API with devel/googletest. Changes: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.21_release_notes Approved by: ports-secteam (feld) Added: branches/2016Q1/security/nss/files/patch-bug1226179 - copied unchanged from r405494, head/security/nss/files/patch-bug1226179 Modified: branches/2016Q1/security/ca_root_nss/Makefile branches/2016Q1/security/ca_root_nss/distinfo branches/2016Q1/security/nss/Makefile branches/2016Q1/security/nss/distinfo branches/2016Q1/security/nss/files/patch-coreconf_command.mk Directory Properties: branches/2016Q1/ (props changed) Modified: branches/2016Q1/security/ca_root_nss/Makefile ============================================================================== --- branches/2016Q1/security/ca_root_nss/Makefile Tue Feb 9 00:57:34 2016 (r408521) +++ branches/2016Q1/security/ca_root_nss/Makefile Tue Feb 9 01:34:41 2016 (r408522) @@ -32,7 +32,7 @@ PLIST_SUB+= CERTDIR=${CERTDIR} # !!! Please DO NOT submit patches for new version until it has !!! # !!! been committed there first. !!! # !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -VERSION_NSS= 3.20.1 +VERSION_NSS= 3.21 #NSS_SUFFIX= -with-ckbi-1.98 CERTDATA_TXT_PATH= nss-${VERSION_NSS}/nss/lib/ckfw/builtins/certdata.txt BUNDLE_PROCESSOR= MAca-bundle.pl Modified: branches/2016Q1/security/ca_root_nss/distinfo ============================================================================== --- branches/2016Q1/security/ca_root_nss/distinfo Tue Feb 9 00:57:34 2016 (r408521) +++ branches/2016Q1/security/ca_root_nss/distinfo Tue Feb 9 01:34:41 2016 (r408522) @@ -1,2 +1,2 @@ -SHA256 (nss-3.20.1.tar.gz) = ad3c8f11dfd9570c2d04a6140d5ef7c2bdd0fe30d6c9e5548721a4251a5e8c97 -SIZE (nss-3.20.1.tar.gz) = 6958956 +SHA256 (nss-3.21.tar.gz) = 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 +SIZE (nss-3.21.tar.gz) = 6978112 Modified: branches/2016Q1/security/nss/Makefile ============================================================================== --- branches/2016Q1/security/nss/Makefile Tue Feb 9 00:57:34 2016 (r408521) +++ branches/2016Q1/security/nss/Makefile Tue Feb 9 01:34:41 2016 (r408522) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= nss -PORTVERSION= 3.20.2 +PORTVERSION= 3.21 #DISTVERSIONSUFFIX= -with-ckbi-1.98 -PORTREVISION= 1 CATEGORIES= security MASTER_SITES= MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src @@ -28,6 +27,7 @@ USE_PERL5= build MAKE_ENV= LIBRARY_PATH="${LOCALBASE}/lib" \ SQLITE_INCLUDE_DIR="${LOCALBASE}/include" \ FREEBL_LOWHASH=1 \ + NSS_DISABLE_GTESTS=1 \ NSS_USE_SYSTEM_SQLITE=1 CFLAGS+= -I${LOCALBASE}/include/nspr Modified: branches/2016Q1/security/nss/distinfo ============================================================================== --- branches/2016Q1/security/nss/distinfo Tue Feb 9 00:57:34 2016 (r408521) +++ branches/2016Q1/security/nss/distinfo Tue Feb 9 01:34:41 2016 (r408522) @@ -1,2 +1,2 @@ -SHA256 (nss-3.20.2.tar.gz) = 141a3a59d57fbcd00b669bcaa4ccd2fd632a9306e2fb4623e89eed0a2e93f286 -SIZE (nss-3.20.2.tar.gz) = 6959455 +SHA256 (nss-3.21.tar.gz) = 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 +SIZE (nss-3.21.tar.gz) = 6978112 Copied: branches/2016Q1/security/nss/files/patch-bug1226179 (from r405494, head/security/nss/files/patch-bug1226179) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q1/security/nss/files/patch-bug1226179 Tue Feb 9 01:34:41 2016 (r408522, copy of r405494, head/security/nss/files/patch-bug1226179) @@ -0,0 +1,156 @@ +# HG changeset patch +# User Martin Thomson <martin.thomson@gmail.com> +# Date 1451888957 -39600 +# Mon Jan 04 17:29:17 2016 +1100 +# Node ID 7b4febd4ad04d5ffe8858a342f23cff58928ce10 +# Parent afa3eeff3ca6fed718fb29324368a026fbe8ffd8 +Bug 1226179 - Using -Werror on all unix platforms, r?gaston + +diff --git a/coreconf/Darwin.mk b/coreconf/Darwin.mk +--- coreconf/Darwin.mk ++++ coreconf/Darwin.mk +@@ -77,17 +77,17 @@ endif + # The meaning of a common is ambiguous. It may be a true definition: + # int x = 0; + # or it may be a declaration of a symbol defined in another file: + # extern int x; + # Use the -fno-common option to force all commons to become true + # definitions so that the linker can catch multiply-defined symbols. + # Also, common symbols are not allowed with Darwin dynamic libraries. + +-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(WARNING_CFLAGS) -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS) ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) -fno-common -pipe -DDARWIN -DHAVE_STRERROR -DHAVE_BSD_FLOCK $(DARWIN_SDK_CFLAGS) + + ifdef BUILD_OPT + ifeq (11,$(ALLOW_OPT_CODE_SIZE)$(OPT_CODE_SIZE)) + OPTIMIZER = -Oz + else + OPTIMIZER = -O2 + endif + ifdef MOZ_DEBUG_SYMBOLS +diff --git a/coreconf/Linux.mk b/coreconf/Linux.mk +--- coreconf/Linux.mk ++++ coreconf/Linux.mk +@@ -1,15 +1,14 @@ + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + + include $(CORE_DEPTH)/coreconf/UNIX.mk +-include $(CORE_DEPTH)/coreconf/Werror.mk + + # + # The default implementation strategy for Linux is now pthreads + # + ifneq ($(OS_TARGET),Android) + USE_PTHREADS = 1 + endif + +@@ -135,17 +134,17 @@ endif + ifndef COMPILER_TAG + COMPILER_TAG := _$(CC_NAME) + endif + + ifeq ($(USE_PTHREADS),1) + OS_PTHREAD = -lpthread + endif + +-OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) $(WARNING_CFLAGS) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR ++OS_CFLAGS = $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -pipe -ffunction-sections -fdata-sections -DLINUX -Dlinux -DHAVE_STRERROR + OS_LIBS = $(OS_PTHREAD) -ldl -lc + + ifdef USE_PTHREADS + DEFINES += -D_REENTRANT + endif + + ARCH = linux + +diff --git a/coreconf/UNIX.mk b/coreconf/UNIX.mk +--- coreconf/UNIX.mk ++++ coreconf/UNIX.mk +@@ -57,8 +57,10 @@ else + INSTALL = $(NSINSTALL) + INSTALL += -R + endif + endif + + define MAKE_OBJDIR + if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi + endef ++ ++include $(CORE_DEPTH)/coreconf/Werror.mk +diff --git a/coreconf/WIN32.mk b/coreconf/WIN32.mk +--- coreconf/WIN32.mk ++++ coreconf/WIN32.mk +@@ -118,24 +118,24 @@ ifdef NS_USE_GCC + OPTIMIZER += -g + NULLSTRING := + SPACE := $(NULLSTRING) # end of the line + USERNAME := $(subst $(SPACE),_,$(USERNAME)) + USERNAME := $(subst -,_,$(USERNAME)) + DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(USERNAME) + endif + else # !NS_USE_GCC +- OS_CFLAGS += -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \ +- -D_CRT_NONSTDC_NO_WARNINGS ++ WARNING_CFLAGS = -W3 -nologo -D_CRT_SECURE_NO_WARNINGS \ ++ -D_CRT_NONSTDC_NO_WARNINGS + OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS + ifndef NSS_ENABLE_WERROR + NSS_ENABLE_WERROR = 1 + endif + ifeq ($(NSS_ENABLE_WERROR),1) +- OS_CFLAGS += -WX ++ WARNING_CFLAGS += -WX + endif + ifeq ($(_MSC_VER),$(_MSC_VER_6)) + ifndef MOZ_DEBUG_SYMBOLS + OS_DLLFLAGS += -PDB:NONE + endif + endif + ifdef USE_DYNAMICBASE + OS_DLLFLAGS += -DYNAMICBASE +diff --git a/coreconf/Werror.mk b/coreconf/Werror.mk +--- coreconf/Werror.mk ++++ coreconf/Werror.mk +@@ -1,14 +1,14 @@ + # + # This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + +-# This sets warning flags for unix-like operating systems. ++# This sets WARNING_CFLAGS for unix-like operating systems. + + ifndef CC_NAME + CC_NAME := $(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q') + export CC_NAME + endif + + ifndef WARNING_CFLAGS + # This tests to see if enabling the warning is possible before +diff --git a/coreconf/command.mk b/coreconf/command.mk +--- coreconf/command.mk ++++ coreconf/command.mk +@@ -7,18 +7,18 @@ + # Master "Core Components" default command macros; # + # can be overridden in <arch>.mk # + ####################################################################### + + AS = $(CC) + ASFLAGS += $(CFLAGS) + CCF = $(CC) $(CFLAGS) + LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) $(XLDFLAGS) +-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ +- $(XCFLAGS) ++CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \ ++ $(DEFINES) $(INCLUDES) $(XCFLAGS) + PERL = perl + RANLIB = echo + TAR = /bin/tar + # + # For purify + # + NOMD_CFLAGS += $(OPTIMIZER) $(NOMD_OS_CFLAGS) $(XP_DEFINE) $(DEFINES) \ + $(INCLUDES) $(XCFLAGS) Modified: branches/2016Q1/security/nss/files/patch-coreconf_command.mk ============================================================================== --- branches/2016Q1/security/nss/files/patch-coreconf_command.mk Tue Feb 9 00:57:34 2016 (r408521) +++ branches/2016Q1/security/nss/files/patch-coreconf_command.mk Tue Feb 9 01:34:41 2016 (r408522) @@ -1,9 +1,11 @@ --- coreconf/command.mk Mon Oct 10 19:46:12 2005 +++ coreconf/command.mk Wed Jan 18 17:23:28 2006 -@@ -46,5 +46,5 @@ - LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) - LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) --CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ -+CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ - $(XCFLAGS) +@@ -12,7 +12,7 @@ AS = $(CC) + ASFLAGS += $(CFLAGS) + CCF = $(CC) $(CFLAGS) + LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) $(XLDFLAGS) +-CFLAGS = $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \ ++CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(WARNING_CFLAGS) $(XP_DEFINE) \ + $(DEFINES) $(INCLUDES) $(XCFLAGS) + PERL = perl RANLIB = echo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602090134.u191YfxS016271>